From a868b6ae56e5d586f31a445f47b45f5ac039c74a Mon Sep 17 00:00:00 2001 From: Julgodis <> Date: Tue, 30 Mar 2021 01:58:08 +0200 Subject: [PATCH] re-generate with bug fixes --- defs/module0.py | 7178 ++++++++--------- libs/JSystem/J2DGraph/J2DAnimation.cpp | 43 +- libs/JSystem/J2DGraph/J2DAnmLoader.cpp | 29 +- libs/JSystem/J2DGraph/J2DGrafContext.cpp | 8 +- libs/JSystem/J2DGraph/J2DMatBlock.cpp | 29 +- libs/JSystem/J2DGraph/J2DMaterial.cpp | 29 +- libs/JSystem/J2DGraph/J2DMaterialFactory.cpp | 16 +- libs/JSystem/J2DGraph/J2DOrthoGraph.cpp | 15 +- libs/JSystem/J2DGraph/J2DPane.cpp | 50 +- libs/JSystem/J2DGraph/J2DPicture.cpp | 40 +- libs/JSystem/J2DGraph/J2DPictureEx.cpp | 40 +- libs/JSystem/J2DGraph/J2DPrint.cpp | 15 +- libs/JSystem/J2DGraph/J2DScreen.cpp | 60 +- libs/JSystem/J2DGraph/J2DTevs.cpp | 26 +- libs/JSystem/J2DGraph/J2DTextBox.cpp | 40 +- libs/JSystem/J2DGraph/J2DTextBoxEx.cpp | 54 +- libs/JSystem/J2DGraph/J2DWindow.cpp | 28 +- libs/JSystem/J2DGraph/J2DWindowEx.cpp | 74 +- .../JSystem/J3DGraphAnimator/J3DAnimation.cpp | 22 +- libs/JSystem/J3DGraphAnimator/J3DCluster.cpp | 28 +- libs/JSystem/J3DGraphAnimator/J3DJoint.cpp | 12 +- .../JSystem/J3DGraphAnimator/J3DJointTree.cpp | 4 - .../J3DGraphAnimator/J3DMaterialAnm.cpp | 6 +- .../J3DGraphAnimator/J3DMaterialAttach.cpp | 6 +- libs/JSystem/J3DGraphAnimator/J3DModel.cpp | 5 - .../JSystem/J3DGraphAnimator/J3DModelData.cpp | 3 - .../JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp | 3 +- .../J3DGraphAnimator/J3DSkinDeform.cpp | 4 +- libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp | 12 +- libs/JSystem/J3DGraphBase/J3DGD.cpp | 21 +- libs/JSystem/J3DGraphBase/J3DMatBlock.cpp | 44 +- libs/JSystem/J3DGraphBase/J3DMaterial.cpp | 37 +- libs/JSystem/J3DGraphBase/J3DPacket.cpp | 10 - libs/JSystem/J3DGraphBase/J3DShape.cpp | 21 +- libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp | 17 +- libs/JSystem/J3DGraphBase/J3DStruct.cpp | 2 +- libs/JSystem/J3DGraphBase/J3DSys.cpp | 15 +- libs/JSystem/J3DGraphBase/J3DTevs.cpp | 37 +- libs/JSystem/J3DGraphBase/J3DTexture.cpp | 8 +- libs/JSystem/J3DGraphBase/J3DTransform.cpp | 8 +- libs/JSystem/J3DGraphBase/J3DVertex.cpp | 1 - libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp | 38 +- .../J3DGraphLoader/J3DClusterLoader.cpp | 1 - .../J3DGraphLoader/J3DMaterialFactory.cpp | 39 +- .../J3DGraphLoader/J3DMaterialFactory_v21.cpp | 13 +- .../JSystem/J3DGraphLoader/J3DModelLoader.cpp | 13 +- .../J3DGraphLoader/J3DModelLoaderCalcSize.cpp | 6 +- .../J3DGraphLoader/J3DShapeFactory.cpp | 8 - libs/JSystem/J3DU/J3DUClipper.cpp | 22 +- libs/JSystem/JAudio2/JAIAudible.cpp | 2 - libs/JSystem/JAudio2/JAIAudience.cpp | 2 - libs/JSystem/JAudio2/JAISe.cpp | 8 +- libs/JSystem/JAudio2/JAISeMgr.cpp | 16 +- libs/JSystem/JAudio2/JAISeq.cpp | 8 +- libs/JSystem/JAudio2/JAISeqDataMgr.cpp | 3 - libs/JSystem/JAudio2/JAISeqMgr.cpp | 14 +- libs/JSystem/JAudio2/JAISound.cpp | 22 +- libs/JSystem/JAudio2/JAISoundChild.cpp | 2 +- libs/JSystem/JAudio2/JAISoundInfo.cpp | 1 - libs/JSystem/JAudio2/JAISoundParams.cpp | 4 +- libs/JSystem/JAudio2/JAISoundStarter.cpp | 1 - libs/JSystem/JAudio2/JAIStream.cpp | 12 +- libs/JSystem/JAudio2/JAIStreamDataMgr.cpp | 3 - libs/JSystem/JAudio2/JAIStreamMgr.cpp | 12 +- libs/JSystem/JAudio2/JASAiCtrl.cpp | 19 +- libs/JSystem/JAudio2/JASAramStream.cpp | 17 +- libs/JSystem/JAudio2/JASAudioReseter.cpp | 5 +- libs/JSystem/JAudio2/JASAudioThread.cpp | 9 - libs/JSystem/JAudio2/JASBNKParser.cpp | 11 +- libs/JSystem/JAudio2/JASBank.cpp | 11 +- libs/JSystem/JAudio2/JASBasicBank.cpp | 2 - libs/JSystem/JAudio2/JASBasicInst.cpp | 2 - libs/JSystem/JAudio2/JASBasicWaveBank.cpp | 4 - libs/JSystem/JAudio2/JASCalc.cpp | 16 +- libs/JSystem/JAudio2/JASChannel.cpp | 42 +- libs/JSystem/JAudio2/JASDSPChannel.cpp | 1 - libs/JSystem/JAudio2/JASDSPInterface.cpp | 5 +- libs/JSystem/JAudio2/JASDrumSet.cpp | 3 +- libs/JSystem/JAudio2/JASDvdThread.cpp | 3 - libs/JSystem/JAudio2/JASHeapCtrl.cpp | 3 - libs/JSystem/JAudio2/JASLfo.cpp | 10 +- libs/JSystem/JAudio2/JASOscillator.cpp | 10 +- libs/JSystem/JAudio2/JASProbe.cpp | 8 +- libs/JSystem/JAudio2/JASReport.cpp | 1 - libs/JSystem/JAudio2/JASSeqCtrl.cpp | 1 - libs/JSystem/JAudio2/JASSeqParser.cpp | 26 +- libs/JSystem/JAudio2/JASSimpleWaveBank.cpp | 3 - libs/JSystem/JAudio2/JASSoundParams.cpp | 6 +- libs/JSystem/JAudio2/JASTaskThread.cpp | 2 - libs/JSystem/JAudio2/JASTrack.cpp | 50 +- libs/JSystem/JAudio2/JASVoiceBank.cpp | 3 - libs/JSystem/JAudio2/JASWSParser.cpp | 2 - libs/JSystem/JAudio2/JAUAudioArcLoader.cpp | 3 - libs/JSystem/JAudio2/JAUInitializer.cpp | 16 - libs/JSystem/JAudio2/JAUSectionHeap.cpp | 18 +- libs/JSystem/JAudio2/JAUSeqCollection.cpp | 5 +- libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp | 6 +- libs/JSystem/JAudio2/JAUStreamFileTable.cpp | 2 - libs/JSystem/JAudio2/osdsp.cpp | 2 - libs/JSystem/JAudio2/osdsp_task.cpp | 7 - libs/JSystem/JFramework/JFWDisplay.cpp | 26 +- libs/JSystem/JFramework/JFWSystem.cpp | 19 +- libs/JSystem/JGadget/binary.cpp | 1 - libs/JSystem/JKernel/JKRAram.cpp | 10 +- libs/JSystem/JKernel/JKRAramArchive.cpp | 6 - libs/JSystem/JKernel/JKRAramPiece.cpp | 8 +- libs/JSystem/JKernel/JKRAramStream.cpp | 4 - libs/JSystem/JKernel/JKRArchivePri.cpp | 5 - libs/JSystem/JKernel/JKRArchivePub.cpp | 7 - libs/JSystem/JKernel/JKRAssertHeap.cpp | 1 - libs/JSystem/JKernel/JKRCompArchive.cpp | 5 - libs/JSystem/JKernel/JKRDecomp.cpp | 1 - libs/JSystem/JKernel/JKRDvdAramRipper.cpp | 5 - libs/JSystem/JKernel/JKRDvdArchive.cpp | 4 - libs/JSystem/JKernel/JKRDvdFile.cpp | 3 - libs/JSystem/JKernel/JKRDvdRipper.cpp | 3 - libs/JSystem/JKernel/JKRExpHeap.cpp | 9 +- libs/JSystem/JKernel/JKRFileCache.cpp | 5 - libs/JSystem/JKernel/JKRFileLoader.cpp | 5 - libs/JSystem/JKernel/JKRHeap.cpp | 12 - libs/JSystem/JKernel/JKRMemArchive.cpp | 3 - libs/JSystem/JKernel/JKRSolidHeap.cpp | 12 +- libs/JSystem/JKernel/JKRThread.cpp | 19 +- libs/JSystem/JMath/JMATrigonometric.cpp | 31 +- libs/JSystem/JMath/JMath.cpp | 2 - libs/JSystem/JMessage/data.cpp | 2 - libs/JSystem/JMessage/processor.cpp | 2 - libs/JSystem/JMessage/resource.cpp | 2 - libs/JSystem/JParticle/JPABaseShape.cpp | 35 +- libs/JSystem/JParticle/JPAChildShape.cpp | 4 +- libs/JSystem/JParticle/JPADynamicsBlock.cpp | 12 +- libs/JSystem/JParticle/JPAEmitter.cpp | 8 +- libs/JSystem/JParticle/JPAEmitterManager.cpp | 21 +- libs/JSystem/JParticle/JPAExtraShape.cpp | 26 +- libs/JSystem/JParticle/JPAFieldBlock.cpp | 15 +- libs/JSystem/JParticle/JPAKeyBlock.cpp | 4 +- libs/JSystem/JParticle/JPAMath.cpp | 5 +- libs/JSystem/JParticle/JPAParticle.cpp | 20 +- libs/JSystem/JParticle/JPAResource.cpp | 20 +- libs/JSystem/JStage/JSGActor.cpp | 14 +- libs/JSystem/JStage/JSGAmbientLight.cpp | 2 - libs/JSystem/JStage/JSGCamera.cpp | 15 +- libs/JSystem/JStage/JSGFog.cpp | 3 - libs/JSystem/JStage/JSGLight.cpp | 2 - libs/JSystem/JStage/JSGObject.cpp | 14 +- libs/JSystem/JStage/JSGSystem.cpp | 6 +- libs/JSystem/JStudio/JStudio/ctb-data.cpp | 2 - libs/JSystem/JStudio/JStudio/ctb.cpp | 56 +- .../JSystem/JStudio/JStudio/functionvalue.cpp | 44 +- libs/JSystem/JStudio/JStudio/fvb-data.cpp | 2 - libs/JSystem/JStudio/JStudio/fvb.cpp | 10 - .../JStudio/JStudio/jstudio-control.cpp | 46 +- libs/JSystem/JStudio/JStudio/jstudio-data.cpp | 2 - libs/JSystem/JStudio/JStudio/jstudio-math.cpp | 20 +- .../JStudio/JStudio/jstudio-object.cpp | 83 +- .../JStudio/JStudio/stb-data-parse.cpp | 2 - libs/JSystem/JStudio/JStudio/stb-data.cpp | 3 - libs/JSystem/JStudio/JStudio/stb.cpp | 56 +- .../JStudio/JStudio_JAudio2/control.cpp | 2 - .../JStudio/JStudio_JAudio2/object-sound.cpp | 13 +- .../JStudio/JStudio_JParticle/control.cpp | 2 - .../JStudio_JParticle/object-particle.cpp | 31 +- .../JStudio/JStudio_JStage/control.cpp | 30 +- .../JStudio/JStudio_JStage/object-actor.cpp | 36 +- .../JStudio_JStage/object-ambientlight.cpp | 3 - .../JStudio/JStudio_JStage/object-camera.cpp | 23 +- .../JStudio/JStudio_JStage/object-fog.cpp | 6 - .../JStudio/JStudio_JStage/object-light.cpp | 32 +- libs/JSystem/JSupport/JSUFileStream.cpp | 6 - libs/JSystem/JSupport/JSUInputStream.cpp | 4 - libs/JSystem/JSupport/JSUMemoryStream.cpp | 2 - libs/JSystem/JUtility/JUTAssert.cpp | 12 +- libs/JSystem/JUtility/JUTCacheFont.cpp | 16 +- libs/JSystem/JUtility/JUTConsole.cpp | 26 +- libs/JSystem/JUtility/JUTDbPrint.cpp | 13 +- libs/JSystem/JUtility/JUTDirectPrint.cpp | 47 +- libs/JSystem/JUtility/JUTException.cpp | 10 +- libs/JSystem/JUtility/JUTFader.cpp | 6 +- libs/JSystem/JUtility/JUTFont.cpp | 2 - .../JUtility/JUTFontData_Ascfont_fix12.cpp | 2 - libs/JSystem/JUtility/JUTGamePad.cpp | 43 +- libs/JSystem/JUtility/JUTGraphFifo.cpp | 1 - libs/JSystem/JUtility/JUTNameTab.cpp | 2 - libs/JSystem/JUtility/JUTPalette.cpp | 2 - libs/JSystem/JUtility/JUTProcBar.cpp | 42 +- libs/JSystem/JUtility/JUTResFont.cpp | 24 +- libs/JSystem/JUtility/JUTResource.cpp | 8 +- libs/JSystem/JUtility/JUTTexture.cpp | 12 +- libs/JSystem/JUtility/JUTVideo.cpp | 6 - libs/JSystem/JUtility/JUTXfb.cpp | 4 - .../MSL_Common/Src/FILE_POS.cpp | 2 - .../MSL_Common/Src/abort_exit.cpp | 8 - .../MSL_Common/Src/alloc.cpp | 2 - .../MSL_Common/Src/ansi_files.cpp | 2 - .../MSL_Common/Src/ctype.cpp | 4 - .../MSL_Common/Src/errno.cpp | 2 - .../MSL_Common/Src/extras.cpp | 2 - .../MSL_Common/Src/file_io.cpp | 2 - .../MSL_Common/Src/float.cpp | 6 - .../MSL_Common/Src/misc_io.cpp | 2 - .../MSL_Common/Src/printf.cpp | 5 - .../MSL_Common/Src/strtoul.cpp | 4 - .../MSL_Common_Embedded/Src/ansi_fp.cpp | 2 - .../Math/Double_precision/e_acos.cpp | 66 +- .../Math/Double_precision/e_asin.cpp | 70 +- .../Math/Double_precision/e_atan2.cpp | 40 +- .../Math/Double_precision/e_exp.cpp | 56 +- .../Math/Double_precision/e_pow.cpp | 135 +- .../Math/Double_precision/e_rem_pio2.cpp | 40 +- .../Math/Double_precision/e_sqrt.cpp | 7 +- .../Math/Double_precision/k_cos.cpp | 36 +- .../Math/Double_precision/k_rem_pio2.cpp | 28 +- .../Math/Double_precision/k_sin.cpp | 28 +- .../Math/Double_precision/k_tan.cpp | 24 +- .../Math/Double_precision/s_atan.cpp | 20 +- .../Math/Double_precision/s_ceil.cpp | 4 +- .../Math/Double_precision/s_floor.cpp | 4 +- .../Math/Double_precision/s_frexp.cpp | 4 +- .../Math/Double_precision/s_ldexp.cpp | 16 +- libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp | 2 - libs/Runtime.PPCEABI.H/NMWException.cpp | 13 - .../__init_cpp_exceptions.cpp | 12 - libs/Runtime.PPCEABI.H/ptmf.cpp | 2 - libs/SSystem/SComponent/c_API.cpp | 2 - .../SComponent/c_API_controller_pad.cpp | 2 - libs/SSystem/SComponent/c_API_graphic.cpp | 2 - libs/SSystem/SComponent/c_angle.cpp | 28 +- libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp | 1 - libs/SSystem/SComponent/c_bg_s_lin_chk.cpp | 2 - libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp | 1 - libs/SSystem/SComponent/c_bg_w.cpp | 4 +- libs/SSystem/SComponent/c_cc_d.cpp | 87 +- libs/SSystem/SComponent/c_cc_s.cpp | 31 +- libs/SSystem/SComponent/c_counter.cpp | 1 - libs/SSystem/SComponent/c_lib.cpp | 23 +- libs/SSystem/SComponent/c_m2d.cpp | 17 +- libs/SSystem/SComponent/c_m3d.cpp | 50 +- libs/SSystem/SComponent/c_m3d_g_aab.cpp | 4 +- libs/SSystem/SComponent/c_m3d_g_cps.cpp | 1 - libs/SSystem/SComponent/c_m3d_g_cyl.cpp | 1 - libs/SSystem/SComponent/c_m3d_g_lin.cpp | 2 - libs/SSystem/SComponent/c_m3d_g_pla.cpp | 2 - libs/SSystem/SComponent/c_malloc.cpp | 2 - libs/SSystem/SComponent/c_math.cpp | 28 +- libs/SSystem/SComponent/c_sxyz.cpp | 7 +- libs/SSystem/SComponent/c_xyz.cpp | 25 +- .../MetroTRK/Portable/main_TRK.cpp | 2 - .../MetroTRK/Portable/mainloop.cpp | 2 - .../MetroTRK/Portable/msgbuf.cpp | 2 - .../MetroTRK/Portable/msghndlr.cpp | 3 - .../MetroTRK/Portable/nubinit.cpp | 4 - .../MetroTRK/Portable/serpoll.cpp | 2 - .../Os/dolphin/dolphin_trk.cpp | 6 - .../Os/dolphin/dolphin_trk_glue.cpp | 4 - .../Os/dolphin/target_options.cpp | 2 - .../ppc/Generic/mpc_7xx_603e.cpp | 3 - .../ppc/Generic/targimpl.cpp | 5 - libs/Z2AudioLib/Z2Audience.cpp | 114 +- libs/Z2AudioLib/Z2AudioArcLoader.cpp | 6 - libs/Z2AudioLib/Z2AudioMgr.cpp | 74 +- libs/Z2AudioLib/Z2Calc.cpp | 17 +- libs/Z2AudioLib/Z2Creature.cpp | 80 +- libs/Z2AudioLib/Z2EnvSeMgr.cpp | 151 +- libs/Z2AudioLib/Z2FxLineMgr.cpp | 16 +- libs/Z2AudioLib/Z2LinkMgr.cpp | 104 +- libs/Z2AudioLib/Z2Param.cpp | 179 +- libs/Z2AudioLib/Z2SceneMgr.cpp | 32 +- libs/Z2AudioLib/Z2SeMgr.cpp | 216 +- libs/Z2AudioLib/Z2SeqMgr.cpp | 82 +- libs/Z2AudioLib/Z2SoundHandles.cpp | 4 - libs/Z2AudioLib/Z2SoundInfo.cpp | 32 +- libs/Z2AudioLib/Z2SoundMgr.cpp | 29 +- libs/Z2AudioLib/Z2SoundObjMgr.cpp | 23 +- libs/Z2AudioLib/Z2SoundObject.cpp | 35 +- libs/Z2AudioLib/Z2SoundStarter.cpp | 21 +- libs/Z2AudioLib/Z2SpeechMgr2.cpp | 36 +- libs/Z2AudioLib/Z2StatusMgr.cpp | 27 +- libs/Z2AudioLib/Z2WolfHowlMgr.cpp | 74 +- libs/dolphin/card/CARDBios.cpp | 3 - libs/dolphin/card/CARDBlock.cpp | 2 - libs/dolphin/card/CARDCheck.cpp | 2 - libs/dolphin/card/CARDCreate.cpp | 2 - libs/dolphin/card/CARDDir.cpp | 2 - libs/dolphin/card/CARDFormat.cpp | 2 - libs/dolphin/card/CARDMount.cpp | 3 - libs/dolphin/card/CARDNet.cpp | 2 - libs/dolphin/card/CARDOpen.cpp | 3 - libs/dolphin/card/CARDRdwr.cpp | 2 - libs/dolphin/card/CARDRead.cpp | 2 - libs/dolphin/card/CARDUnlock.cpp | 2 - libs/dolphin/card/CARDWrite.cpp | 2 - libs/dolphin/dsp/dsp.cpp | 5 - libs/dolphin/dsp/dsp_task.cpp | 6 - libs/dolphin/dvd/dvd.cpp | 4 - libs/dolphin/dvd/dvdfs.cpp | 3 - libs/dolphin/gd/GDBase.cpp | 2 - libs/dolphin/gd/GDGeometry.cpp | 2 - libs/dolphin/gf/GFGeometry.cpp | 1 - libs/dolphin/gf/GFPixel.cpp | 14 +- libs/dolphin/gx/GXAttr.cpp | 2 - libs/dolphin/gx/GXBump.cpp | 2 - libs/dolphin/gx/GXDisplayList.cpp | 2 - libs/dolphin/gx/GXFifo.cpp | 4 - libs/dolphin/gx/GXFrameBuf.cpp | 12 +- libs/dolphin/gx/GXGeometry.cpp | 2 - libs/dolphin/gx/GXInit.cpp | 21 +- libs/dolphin/gx/GXLight.cpp | 24 +- libs/dolphin/gx/GXMisc.cpp | 6 - libs/dolphin/gx/GXPerf.cpp | 3 - libs/dolphin/gx/GXPixel.cpp | 16 +- libs/dolphin/gx/GXTev.cpp | 6 - libs/dolphin/gx/GXTexture.cpp | 16 +- libs/dolphin/gx/GXTransform.cpp | 8 +- libs/dolphin/mtx/mtx.cpp | 10 +- libs/dolphin/mtx/mtx44.cpp | 10 +- libs/dolphin/mtx/quat.cpp | 6 +- libs/dolphin/mtx/vec.cpp | 6 +- libs/dolphin/os/OS.cpp | 9 - libs/dolphin/os/OSAlloc.cpp | 2 - libs/dolphin/os/OSError.cpp | 16 - libs/dolphin/os/OSExec.cpp | 2 - libs/dolphin/os/OSInterrupt.cpp | 5 - libs/dolphin/os/OSMemory.cpp | 2 - libs/dolphin/os/OSReset.cpp | 2 - libs/dolphin/os/OSResetSW.cpp | 3 - libs/dolphin/os/OSThread.cpp | 6 - libs/dolphin/os/__ppc_eabi_init.cpp | 5 - libs/dolphin/pad/Pad.cpp | 4 - libs/dolphin/pad/Padclamp.cpp | 24 +- libs/dolphin/si/SIBios.cpp | 16 - libs/dolphin/vi/vi.cpp | 3 - libs/exi/EXIBios.cpp | 15 - .../src/OdemuExi2Lib/DebuggerDriver.cpp | 2 - rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp | 61 +- rel/d/a/b/d_a_b_bh/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp | 133 +- rel/d/a/b/d_a_b_bq/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp | 115 +- rel/d/a/b/d_a_b_dr/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp | 100 +- rel/d/a/b/d_a_b_dre/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp | 144 +- rel/d/a/b/d_a_b_ds/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp | 115 +- rel/d/a/b/d_a_b_gg/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp | 97 +- rel/d/a/b/d_a_b_gm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp | 168 +- rel/d/a/b/d_a_b_gnd/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_go/d_a_b_go.cpp | 23 +- rel/d/a/b/d_a_b_go/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp | 24 +- rel/d/a/b/d_a_b_gos/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp | 63 +- rel/d/a/b/d_a_b_mgn/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp | 157 +- rel/d/a/b/d_a_b_ob/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp | 66 +- rel/d/a/b/d_a_b_oh/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp | 14 +- rel/d/a/b/d_a_b_oh2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp | 123 +- rel/d/a/b/d_a_b_tn/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp | 118 +- rel/d/a/b/d_a_b_yo/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp | 26 +- rel/d/a/b/d_a_b_yo_ice/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp | 111 +- rel/d/a/b/d_a_b_zant/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp | 18 - rel/d/a/b/d_a_b_zant_magic/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp | 24 +- rel/d/a/b/d_a_b_zant_mobile/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp | 12 +- rel/d/a/b/d_a_b_zant_sima/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp | 15 +- rel/d/a/d_a_L7demo_dr/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp | 17 +- rel/d/a/d_a_L7low_dr/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp | 19 +- rel/d/a/d_a_L7op_demo_dr/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_alldie/d_a_alldie.cpp | 4 - rel/d/a/d_a_alldie/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_andsw/d_a_andsw.cpp | 4 - rel/d/a/d_a_andsw/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_andsw2/d_a_andsw2.cpp | 4 - rel/d/a/d_a_andsw2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_arrow/d_a_arrow.cpp | 69 - rel/d/a/d_a_arrow/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp | 7 - rel/d/a/d_a_balloon_2D/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_bd/d_a_bd.cpp | 64 +- rel/d/a/d_a_bd/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../d_a_bd/unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_bg/d_a_bg.cpp | 18 +- rel/d/a/d_a_bg/executor.cpp | 3 - .../d_a_bg/unknown_translation_unit_ctors.cpp | 9 +- .../d_a_bg/unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp | 22 +- rel/d/a/d_a_bg_obj/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_boomerang/d_a_boomerang.cpp | 87 +- rel/d/a/d_a_boomerang/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_bullet/d_a_bullet.cpp | 21 +- rel/d/a/d_a_bullet/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_canoe/d_a_canoe.cpp | 65 - rel/d/a/d_a_canoe/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp | 6 - rel/d/a/d_a_coach_2D/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp | 18 +- rel/d/a/d_a_coach_fire/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_cow/d_a_cow.cpp | 88 +- rel/d/a/d_a_cow/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_crod/d_a_crod.cpp | 19 +- rel/d/a/d_a_crod/executor.cpp | 3 - .../d_a_crod/unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_cstaf/d_a_cstaF.cpp | 41 +- rel/d/a/d_a_cstaf/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_cstatue/d_a_cstatue.cpp | 97 +- rel/d/a/d_a_cstatue/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/d_a_demo00/d_a_demo00.cpp | 91 +- rel/d/a/d_a_demo00/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_demo_item/d_a_demo_item.cpp | 63 +- rel/d/a/d_a_demo_item/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_disappear/d_a_disappear.cpp | 11 +- rel/d/a/d_a_disappear/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_dmidna/d_a_dmidna.cpp | 10 +- rel/d/a/d_a_dmidna/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_do/d_a_do.cpp | 96 +- rel/d/a/d_a_do/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../d_a_do/unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_dshutter/d_a_dshutter.cpp | 61 - rel/d/a/d_a_dshutter/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_econt/d_a_econt.cpp | 6 - rel/d/a/d_a_econt/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_ep/d_a_ep.cpp | 24 - rel/d/a/d_a_ep/executor.cpp | 3 - .../d_a_ep/unknown_translation_unit_ctors.cpp | 9 +- .../d_a_ep/unknown_translation_unit_dtors.cpp | 9 +- .../a/d_a_formation_mng/d_a_formation_mng.cpp | 9 - rel/d/a/d_a_formation_mng/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_fr/d_a_fr.cpp | 27 +- rel/d/a/d_a_fr/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../d_a_fr/unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_grass/d_a_grass.cpp | 81 +- rel/d/a/d_a_grass/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp | 4 - rel/d/a/d_a_guard_mng/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_hitobj/d_a_hitobj.cpp | 10 - rel/d/a/d_a_hitobj/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_horse/d_a_horse.cpp | 107 +- rel/d/a/d_a_horse/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_hozelda/d_a_hozelda.cpp | 22 +- rel/d/a/d_a_hozelda/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp | 8 - rel/d/a/d_a_izumi_gate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_kago/d_a_kago.cpp | 68 +- rel/d/a/d_a_kago/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_mant/d_a_mant.cpp | 22 +- rel/d/a/d_a_mant/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp | 91 +- rel/d/a/d_a_mg_fish/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp | 67 +- rel/d/a/d_a_mg_fshop/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp | 72 +- rel/d/a/d_a_mg_rod/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_midna/d_a_midna.cpp | 41 +- rel/d/a/d_a_midna/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_mirror/d_a_mirror.cpp | 17 - rel/d/a/d_a_mirror/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_movie_player/d_a_movie_player.cpp | 63 - rel/d/a/d_a_movie_player/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_myna/d_a_myna.cpp | 81 +- rel/d/a/d_a_myna/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_nbomb/d_a_nbomb.cpp | 69 +- rel/d/a/d_a_nbomb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_ni/d_a_ni.cpp | 81 +- rel/d/a/d_a_ni/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../d_a_ni/unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp | 5 - rel/d/a/d_a_passer_mng/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_path_line/d_a_path_line.cpp | 5 - rel/d/a/d_a_path_line/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_peru/d_a_peru.cpp | 75 +- rel/d/a/d_a_peru/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp | 51 +- rel/d/a/d_a_ppolamp/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp | 7 - rel/d/a/d_a_scene_exit/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp | 12 +- rel/d/a/d_a_scene_exit2/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp | 5 - rel/d/a/d_a_set_bgobj/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_shop_item/d_a_shop_item.cpp | 15 - rel/d/a/d_a_shop_item/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp | 4 - rel/d/a/d_a_skip_2D/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_spinner/d_a_spinner.cpp | 81 +- rel/d/a/d_a_spinner/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/d_a_sq/d_a_sq.cpp | 22 +- rel/d/a/d_a_sq/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../d_a_sq/unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp | 6 - rel/d/a/d_a_startAndGoal/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_suspend/d_a_suspend.cpp | 4 - rel/d/a/d_a_suspend/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_swBall/d_a_swBall.cpp | 5 - rel/d/a/d_a_swBall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_swLBall/d_a_swLBall.cpp | 5 - rel/d/a/d_a_swLBall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_swTime/d_a_swTime.cpp | 4 - rel/d/a/d_a_swTime/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_swc00/d_a_swc00.cpp | 13 - rel/d/a/d_a_swc00/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_swhit0/d_a_swhit0.cpp | 17 +- rel/d/a/d_a_swhit0/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_talk/d_a_talk.cpp | 5 - rel/d/a/d_a_talk/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_tbox/d_a_tbox.cpp | 70 +- rel/d/a/d_a_tbox/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_tbox2/d_a_tbox2.cpp | 17 - rel/d/a/d_a_tbox2/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp | 4 - rel/d/a/d_a_tboxSw/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_title/d_a_title.cpp | 15 - rel/d/a/d_a_title/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/d_a_vrbox/d_a_vrbox.cpp | 9 - rel/d/a/d_a_vrbox/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp | 9 - rel/d/a/d_a_vrbox2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp | 6 - rel/d/a/d_a_warp_bug/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/d_a_ykgr/d_a_ykgr.cpp | 58 +- rel/d/a/d_a_ykgr/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp | 16 - rel/d/a/door/d_a_door_boss/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../door/d_a_door_bossL5/d_a_door_bossL5.cpp | 13 - rel/d/a/door/d_a_door_bossL5/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../door/d_a_door_bossl1/d_a_door_bossL1.cpp | 17 +- rel/d/a/door/d_a_door_bossl1/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_door_dbdoor00/d_a_door_dbdoor00.cpp | 23 +- rel/d/a/door/d_a_door_dbdoor00/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../door/d_a_door_knob00/d_a_door_knob00.cpp | 12 - rel/d/a/door/d_a_door_knob00/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_door_mbossL1/d_a_door_mbossL1.cpp | 22 +- rel/d/a/door/d_a_door_mbossL1/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/door/d_a_door_push/d_a_door_push.cpp | 13 - rel/d/a/door/d_a_door_push/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_door_shutter/d_a_door_shutter.cpp | 22 +- rel/d/a/door/d_a_door_shutter/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../door/d_a_door_spiral/d_a_door_spiral.cpp | 5 - rel/d/a/door/d_a_door_spiral/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp | 25 +- rel/d/a/e/d_a_e_ai/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp | 65 +- rel/d/a/e/d_a_e_arrow/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp | 22 +- rel/d/a/e/d_a_e_ba/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp | 57 - rel/d/a/e/d_a_e_bee/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp | 36 +- rel/d/a/e/d_a_e_bg/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp | 69 +- rel/d/a/e/d_a_e_bi/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp | 11 +- rel/d/a/e/d_a_e_bi_leaf/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp | 30 +- rel/d/a/e/d_a_e_bs/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp | 36 +- rel/d/a/e/d_a_e_bu/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp | 50 - rel/d/a/e/d_a_e_bug/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp | 27 +- rel/d/a/e/d_a_e_cr/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp | 23 +- rel/d/a/e/d_a_e_cr_egg/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_db/d_a_e_db.cpp | 36 +- rel/d/a/e/d_a_e_db/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp | 11 +- rel/d/a/e/d_a_e_db_leaf/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp | 33 +- rel/d/a/e/d_a_e_dd/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_df/d_a_e_df.cpp | 31 +- rel/d/a/e/d_a_e_df/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp | 29 +- rel/d/a/e/d_a_e_dk/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp | 79 +- rel/d/a/e/d_a_e_dn/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp | 106 +- rel/d/a/e/d_a_e_dt/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp | 60 +- rel/d/a/e/d_a_e_fb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp | 69 +- rel/d/a/e/d_a_e_fk/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp | 68 +- rel/d/a/e/d_a_e_fm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp | 68 +- rel/d/a/e/d_a_e_fs/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp | 21 - rel/d/a/e/d_a_e_fz/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp | 14 +- rel/d/a/e/d_a_e_ga/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp | 26 +- rel/d/a/e/d_a_e_gb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp | 29 +- rel/d/a/e/d_a_e_ge/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp | 35 +- rel/d/a/e/d_a_e_gi/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp | 72 +- rel/d/a/e/d_a_e_gm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp | 86 +- rel/d/a/e/d_a_e_gob/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp | 12 +- rel/d/a/e/d_a_e_gs/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp | 36 +- rel/d/a/e/d_a_e_hb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp | 11 +- rel/d/a/e/d_a_e_hb_leaf/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp | 79 +- rel/d/a/e/d_a_e_hm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp | 34 +- rel/d/a/e/d_a_e_hp/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp | 75 +- rel/d/a/e/d_a_e_hz/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp | 27 +- rel/d/a/e/d_a_e_hzelda/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_is/d_a_e_is.cpp | 23 +- rel/d/a/e/d_a_e_is/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp | 31 +- rel/d/a/e/d_a_e_kg/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp | 32 +- rel/d/a/e/d_a_e_kk/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp | 40 +- rel/d/a/e/d_a_e_kr/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp | 69 +- rel/d/a/e/d_a_e_mb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_md/d_a_e_md.cpp | 25 +- rel/d/a/e/d_a_e_md/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp | 82 +- rel/d/a/e/d_a_e_mf/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp | 70 +- rel/d/a/e/d_a_e_mk/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp | 61 +- rel/d/a/e/d_a_e_mk_bo/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp | 28 +- rel/d/a/e/d_a_e_mm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp | 24 +- rel/d/a/e/d_a_e_mm_mt/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp | 69 +- rel/d/a/e/d_a_e_ms/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp | 21 - rel/d/a/e/d_a_e_nest/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp | 59 +- rel/d/a/e/d_a_e_nz/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp | 87 +- rel/d/a/e/d_a_e_oc/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp | 67 +- rel/d/a/e/d_a_e_oct_bg/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp | 69 +- rel/d/a/e/d_a_e_ot/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp | 30 +- rel/d/a/e/d_a_e_ph/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp | 90 +- rel/d/a/e/d_a_e_pm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_po/d_a_e_po.cpp | 76 +- rel/d/a/e/d_a_e_po/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp | 86 +- rel/d/a/e/d_a_e_pz/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp | 23 +- rel/d/a/e/d_a_e_rb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp | 189 +- rel/d/a/e/d_a_e_rd/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp | 102 +- rel/d/a/e/d_a_e_rdb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp | 161 +- rel/d/a/e/d_a_e_rdy/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp | 98 +- rel/d/a/e/d_a_e_s1/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp | 72 +- rel/d/a/e/d_a_e_sb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp | 79 +- rel/d/a/e/d_a_e_sf/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp | 75 +- rel/d/a/e/d_a_e_sg/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp | 30 +- rel/d/a/e/d_a_e_sh/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp | 71 +- rel/d/a/e/d_a_e_sm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp | 83 +- rel/d/a/e/d_a_e_sm2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_st/d_a_e_st.cpp | 81 +- rel/d/a/e/d_a_e_st/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp | 24 - rel/d/a/e/d_a_e_st_line/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp | 63 +- rel/d/a/e/d_a_e_sw/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_th/d_a_e_th.cpp | 66 +- rel/d/a/e/d_a_e_th/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp | 17 - rel/d/a/e/d_a_e_th_ball/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp | 25 +- rel/d/a/e/d_a_e_tk/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp | 25 +- rel/d/a/e/d_a_e_tk2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp | 24 +- rel/d/a/e/d_a_e_tk_ball/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp | 78 +- rel/d/a/e/d_a_e_tt/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp | 110 +- rel/d/a/e/d_a_e_vt/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/e/d_a_e_warpappear/d_a_e_warpappear.cpp | 108 +- rel/d/a/e/d_a_e_warpappear/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp | 271 +- rel/d/a/e/d_a_e_wb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp | 28 +- rel/d/a/e/d_a_e_ws/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp | 82 +- rel/d/a/e/d_a_e_ww/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp | 28 +- rel/d/a/e/d_a_e_yc/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp | 38 +- rel/d/a/e/d_a_e_yd/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp | 12 +- rel/d/a/e/d_a_e_yd_leaf/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp | 74 +- rel/d/a/e/d_a_e_yg/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp | 36 +- rel/d/a/e/d_a_e_yh/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp | 24 +- rel/d/a/e/d_a_e_yk/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp | 34 +- rel/d/a/e/d_a_e_ym/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp | 3 - rel/d/a/e/d_a_e_ym_tag/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp | 100 +- rel/d/a/e/d_a_e_ymb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp | 41 +- rel/d/a/e/d_a_e_yr/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp | 79 +- rel/d/a/e/d_a_e_zh/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp | 31 +- rel/d/a/e/d_a_e_zm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp | 25 +- rel/d/a/e/d_a_e_zs/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp | 14 - rel/d/a/kytag/d_a_kytag00/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp | 8 - rel/d/a/kytag/d_a_kytag01/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp | 7 - rel/d/a/kytag/d_a_kytag02/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp | 16 +- rel/d/a/kytag/d_a_kytag03/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp | 15 +- rel/d/a/kytag/d_a_kytag04/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp | 4 - rel/d/a/kytag/d_a_kytag05/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp | 57 +- rel/d/a/kytag/d_a_kytag06/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp | 4 - rel/d/a/kytag/d_a_kytag07/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp | 14 +- rel/d/a/kytag/d_a_kytag08/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp | 12 +- rel/d/a/kytag/d_a_kytag09/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp | 13 +- rel/d/a/kytag/d_a_kytag10/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag11/d_a_kytag11.cpp | 8 - rel/d/a/kytag/d_a_kytag11/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp | 39 - rel/d/a/kytag/d_a_kytag12/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp | 11 - rel/d/a/kytag/d_a_kytag13/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp | 7 - rel/d/a/kytag/d_a_kytag14/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp | 8 - rel/d/a/kytag/d_a_kytag15/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp | 14 - rel/d/a/kytag/d_a_kytag16/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp | 5 - rel/d/a/kytag/d_a_kytag17/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp | 87 +- rel/d/a/npc/d_a_npc_aru/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp | 41 +- rel/d/a/npc/d_a_npc_ash/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp | 50 +- rel/d/a/npc/d_a_npc_ashB/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp | 42 +- rel/d/a/npc/d_a_npc_bans/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp | 51 +- rel/d/a/npc/d_a_npc_besu/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp | 47 +- rel/d/a/npc/d_a_npc_blue_ns/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp | 53 +- rel/d/a/npc/d_a_npc_bou/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp | 80 +- rel/d/a/npc/d_a_npc_bouS/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp | 29 +- rel/d/a/npc/d_a_npc_cdn3/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp | 92 +- rel/d/a/npc/d_a_npc_chat/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp | 56 +- rel/d/a/npc/d_a_npc_chin/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp | 33 +- rel/d/a/npc/d_a_npc_clerka/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp | 53 +- rel/d/a/npc/d_a_npc_clerkb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp | 37 +- rel/d/a/npc/d_a_npc_clerkt/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp | 45 +- rel/d/a/npc/d_a_npc_coach/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp | 49 - rel/d/a/npc/d_a_npc_df/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp | 93 +- rel/d/a/npc/d_a_npc_doc/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp | 39 +- rel/d/a/npc/d_a_npc_doorboy/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp | 31 +- rel/d/a/npc/d_a_npc_drainSol/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp | 29 +- rel/d/a/npc/d_a_npc_du/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp | 53 +- rel/d/a/npc/d_a_npc_fairy/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_npc_fairy_seirei.cpp | 32 +- rel/d/a/npc/d_a_npc_fairy_seirei/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp | 20 +- rel/d/a/npc/d_a_npc_fguard/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp | 8 - rel/d/a/npc/d_a_npc_fish/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp | 39 +- rel/d/a/npc/d_a_npc_gnd/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp | 118 +- rel/d/a/npc/d_a_npc_gra/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp | 103 +- rel/d/a/npc/d_a_npc_grc/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp | 90 +- rel/d/a/npc/d_a_npc_grd/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp | 37 +- rel/d/a/npc/d_a_npc_grm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp | 37 +- rel/d/a/npc/d_a_npc_grmc/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp | 93 +- rel/d/a/npc/d_a_npc_gro/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp | 91 +- rel/d/a/npc/d_a_npc_grr/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp | 90 +- rel/d/a/npc/d_a_npc_grs/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp | 103 +- rel/d/a/npc/d_a_npc_grz/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp | 29 +- rel/d/a/npc/d_a_npc_guard/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp | 108 +- rel/d/a/npc/d_a_npc_gwolf/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp | 99 +- rel/d/a/npc/d_a_npc_hanjo/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp | 120 +- rel/d/a/npc/d_a_npc_henna/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_henna0/d_a_npc_henna0.cpp | 5 - rel/d/a/npc/d_a_npc_henna0/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp | 39 +- rel/d/a/npc/d_a_npc_hoz/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp | 40 +- rel/d/a/npc/d_a_npc_impal/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp | 18 +- rel/d/a/npc/d_a_npc_inko/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp | 46 +- rel/d/a/npc/d_a_npc_ins/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp | 95 +- rel/d/a/npc/d_a_npc_jagar/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp | 102 +- rel/d/a/npc/d_a_npc_kakashi/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp | 70 +- rel/d/a/npc/d_a_npc_kasi_hana/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp | 76 +- rel/d/a/npc/d_a_npc_kasi_kyu/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp | 76 +- rel/d/a/npc/d_a_npc_kasi_mich/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_kdk/d_a_npc_kdk.cpp | 5 - rel/d/a/npc/d_a_npc_kdk/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp | 50 +- rel/d/a/npc/d_a_npc_kkri/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp | 144 +- rel/d/a/npc/d_a_npc_kn/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp | 34 +- rel/d/a/npc/d_a_npc_knj/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp | 87 +- rel/d/a/npc/d_a_npc_kolin/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp | 45 +- rel/d/a/npc/d_a_npc_kolinb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp | 119 +- rel/d/a/npc/d_a_npc_ks/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp | 40 +- rel/d/a/npc/d_a_npc_kyury/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp | 53 +- rel/d/a/npc/d_a_npc_len/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp | 20 +- rel/d/a/npc/d_a_npc_lf/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp | 49 +- rel/d/a/npc/d_a_npc_lud/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp | 42 +- rel/d/a/npc/d_a_npc_maro/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp | 40 +- rel/d/a/npc/d_a_npc_midp/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_mk/d_a_npc_mk.cpp | 4 - rel/d/a/npc/d_a_npc_mk/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp | 100 +- rel/d/a/npc/d_a_npc_moi/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp | 56 +- rel/d/a/npc/d_a_npc_moir/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp | 84 +- rel/d/a/npc/d_a_npc_myna2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp | 84 +- rel/d/a/npc/d_a_npc_ne/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_p2/d_a_npc_p2.cpp | 4 - rel/d/a/npc/d_a_npc_p2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp | 89 +- rel/d/a/npc/d_a_npc_pachi_besu/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp | 44 +- rel/d/a/npc/d_a_npc_pachi_maro/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp | 47 +- rel/d/a/npc/d_a_npc_pachi_taro/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp | 24 +- rel/d/a/npc/d_a_npc_passer/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp | 18 +- rel/d/a/npc/d_a_npc_passer2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp | 87 +- rel/d/a/npc/d_a_npc_post/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp | 54 +- rel/d/a/npc/d_a_npc_pouya/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp | 24 +- rel/d/a/npc/d_a_npc_prayer/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp | 49 +- rel/d/a/npc/d_a_npc_raca/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp | 53 +- rel/d/a/npc/d_a_npc_rafrel/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp | 50 +- rel/d/a/npc/d_a_npc_saru/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp | 32 +- rel/d/a/npc/d_a_npc_seib/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp | 32 +- rel/d/a/npc/d_a_npc_seic/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp | 32 +- rel/d/a/npc/d_a_npc_seid/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp | 41 +- rel/d/a/npc/d_a_npc_seira/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp | 40 +- rel/d/a/npc/d_a_npc_seira2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp | 39 +- rel/d/a/npc/d_a_npc_seirei/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp | 46 +- rel/d/a/npc/d_a_npc_shad/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp | 51 +- rel/d/a/npc/d_a_npc_shaman/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp | 38 +- rel/d/a/npc/d_a_npc_shoe/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp | 17 +- rel/d/a/npc/d_a_npc_shop0/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_npc_shop_maro/d_a_npc_shop_maro.cpp | 12 +- rel/d/a/npc/d_a_npc_shop_maro/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp | 36 +- rel/d/a/npc/d_a_npc_sola/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp | 76 +- rel/d/a/npc/d_a_npc_soldierA/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp | 76 +- rel/d/a/npc/d_a_npc_soldierB/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp | 31 +- rel/d/a/npc/d_a_npc_sq/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp | 101 +- rel/d/a/npc/d_a_npc_taro/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp | 44 +- rel/d/a/npc/d_a_npc_the/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp | 44 +- rel/d/a/npc/d_a_npc_theB/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp | 84 +- rel/d/a/npc/d_a_npc_tk/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp | 45 +- rel/d/a/npc/d_a_npc_tkc/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp | 38 +- rel/d/a/npc/d_a_npc_tkj/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp | 35 +- rel/d/a/npc/d_a_npc_tkj2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp | 57 +- rel/d/a/npc/d_a_npc_tks/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp | 100 +- rel/d/a/npc/d_a_npc_toby/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp | 21 +- rel/d/a/npc/d_a_npc_tr/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp | 96 +- rel/d/a/npc/d_a_npc_uri/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp | 12 - rel/d/a/npc/d_a_npc_worm/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp | 51 +- rel/d/a/npc/d_a_npc_wrestler/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp | 40 +- rel/d/a/npc/d_a_npc_yamid/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp | 40 +- rel/d/a/npc/d_a_npc_yamis/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp | 40 +- rel/d/a/npc/d_a_npc_yamit/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp | 39 +- rel/d/a/npc/d_a_npc_yelia/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp | 111 +- rel/d/a/npc/d_a_npc_ykm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp | 113 +- rel/d/a/npc/d_a_npc_ykw/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp | 49 +- rel/d/a/npc/d_a_npc_zanb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp | 36 +- rel/d/a/npc/d_a_npc_zant/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp | 43 +- rel/d/a/npc/d_a_npc_zelR/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp | 39 +- rel/d/a/npc/d_a_npc_zelRo/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp | 49 +- rel/d/a/npc/d_a_npc_zelda/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp | 126 +- rel/d/a/npc/d_a_npc_zra/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp | 93 +- rel/d/a/npc/d_a_npc_zrc/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp | 110 +- rel/d/a/npc/d_a_npc_zrz/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp | 18 +- rel/d/a/obj/d_a_obj_Lv5Key/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp | 17 - rel/d/a/obj/d_a_obj_Turara/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp | 20 +- rel/d/a/obj/d_a_obj_TvCdlst/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp | 56 - rel/d/a/obj/d_a_obj_Y_taihou/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- .../d_a_obj_amiShutter/d_a_obj_amiShutter.cpp | 21 +- rel/d/a/obj/d_a_obj_amiShutter/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp | 38 +- rel/d/a/obj/d_a_obj_ari/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_automata/d_a_obj_automata.cpp | 34 +- rel/d/a/obj/d_a_obj_automata/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_avalanche/d_a_obj_avalanche.cpp | 14 +- rel/d/a/obj/d_a_obj_avalanche/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp | 59 +- rel/d/a/obj/d_a_obj_balloon/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp | 16 - rel/d/a/obj/d_a_obj_barDesk/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp | 33 +- rel/d/a/obj/d_a_obj_batta/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp | 14 - rel/d/a/obj/d_a_obj_bbox/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp | 12 +- rel/d/a/obj/d_a_obj_bed/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp | 76 +- rel/d/a/obj/d_a_obj_bemos/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp | 21 +- rel/d/a/obj/d_a_obj_bhashi/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp | 16 +- rel/d/a/obj/d_a_obj_bhbridge/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp | 8 - rel/d/a/obj/d_a_obj_bk_leaf/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp | 16 +- rel/d/a/obj/d_a_obj_bkdoor/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp | 15 - rel/d/a/obj/d_a_obj_bky_rock/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp | 16 - rel/d/a/obj/d_a_obj_bmWindow/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_bmshutter/d_a_obj_bmshutter.cpp | 16 +- rel/d/a/obj/d_a_obj_bmshutter/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp | 10 +- rel/d/a/obj/d_a_obj_bombf/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp | 24 - rel/d/a/obj/d_a_obj_bosswarp/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp | 22 +- rel/d/a/obj/d_a_obj_boumato/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp | 20 +- rel/d/a/obj/d_a_obj_brakeeff/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp | 63 +- rel/d/a/obj/d_a_obj_brg/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp | 10 - rel/d/a/obj/d_a_obj_bsGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_bubblePilar.cpp | 20 +- rel/d/a/obj/d_a_obj_bubblePilar/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp | 12 - rel/d/a/obj/d_a_obj_burnbox/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp | 34 +- rel/d/a/obj/d_a_obj_carry/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp | 9 - rel/d/a/obj/d_a_obj_catdoor/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp | 23 +- rel/d/a/obj/d_a_obj_cb/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp | 69 - rel/d/a/obj/d_a_obj_cblock/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp | 9 +- rel/d/a/obj/d_a_obj_cboard/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp | 17 +- rel/d/a/obj/d_a_obj_cdoor/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_chandelier/d_a_obj_chandelier.cpp | 16 +- rel/d/a/obj/d_a_obj_chandelier/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp | 22 +- rel/d/a/obj/d_a_obj_chest/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp | 32 +- rel/d/a/obj/d_a_obj_cho/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp | 11 +- rel/d/a/obj/d_a_obj_cowdoor/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp | 16 +- rel/d/a/obj/d_a_obj_crope/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp | 23 +- rel/d/a/obj/d_a_obj_crvfence/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp | 29 +- rel/d/a/obj/d_a_obj_crvgate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp | 19 +- rel/d/a/obj/d_a_obj_crvhahen/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp | 19 +- rel/d/a/obj/d_a_obj_crvlh_down/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp | 22 +- rel/d/a/obj/d_a_obj_crvlh_up/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp | 15 +- rel/d/a/obj/d_a_obj_crvsteel/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp | 11 +- rel/d/a/obj/d_a_obj_crystal/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp | 61 - rel/d/a/obj/d_a_obj_cwall/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp | 5 - rel/d/a/obj/d_a_obj_damCps/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp | 28 +- rel/d/a/obj/d_a_obj_dan/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp | 10 +- rel/d/a/obj/d_a_obj_digholl/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_digplace/d_a_obj_digplace.cpp | 13 +- rel/d/a/obj/d_a_obj_digplace/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp | 19 +- rel/d/a/obj/d_a_obj_digsnow/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_dmelevator/d_a_obj_dmelevator.cpp | 51 - rel/d/a/obj/d_a_obj_dmelevator/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp | 32 +- rel/d/a/obj/d_a_obj_drop/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp | 17 +- rel/d/a/obj/d_a_obj_dust/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp | 12 +- rel/d/a/obj/d_a_obj_eff/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_enemy_create.cpp | 4 - rel/d/a/obj/d_a_obj_enemy_create/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp | 14 +- rel/d/a/obj/d_a_obj_fallobj/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp | 18 +- rel/d/a/obj/d_a_obj_fan/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp | 24 +- rel/d/a/obj/d_a_obj_fchain/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp | 17 +- rel/d/a/obj/d_a_obj_fireWood/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_fireWood2/d_a_obj_fireWood2.cpp | 17 +- rel/d/a/obj/d_a_obj_fireWood2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_firepillar/d_a_obj_firepillar.cpp | 13 - rel/d/a/obj/d_a_obj_firepillar/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_firepillar2.cpp | 21 +- rel/d/a/obj/d_a_obj_firepillar2/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp | 11 - rel/d/a/obj/d_a_obj_flag/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp | 21 - rel/d/a/obj/d_a_obj_flag2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp | 20 - rel/d/a/obj/d_a_obj_flag3/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp | 11 +- rel/d/a/obj/d_a_obj_fmobj/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp | 24 +- rel/d/a/obj/d_a_obj_food/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp | 12 +- rel/d/a/obj/d_a_obj_fw/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp | 59 +- rel/d/a/obj/d_a_obj_gadget/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_ganonwall/d_a_obj_ganonwall.cpp | 8 - rel/d/a/obj/d_a_obj_ganonwall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp | 9 - rel/d/a/obj/d_a_obj_ganonwall2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp | 18 +- rel/d/a/obj/d_a_obj_gb/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp | 21 +- rel/d/a/obj/d_a_obj_geyser/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_glowSphere/d_a_obj_glowSphere.cpp | 55 - rel/d/a/obj/d_a_obj_glowSphere/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp | 16 - rel/d/a/obj/d_a_obj_gm/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp | 10 - rel/d/a/obj/d_a_obj_goGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp | 30 +- rel/d/a/obj/d_a_obj_gomikabe/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp | 19 - rel/d/a/obj/d_a_obj_gptaru/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp | 115 +- rel/d/a/obj/d_a_obj_gra2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp | 10 - rel/d/a/obj/d_a_obj_graWall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp | 22 +- rel/d/a/obj/d_a_obj_gra_rock/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_grave_stone.cpp | 28 +- rel/d/a/obj/d_a_obj_grave_stone/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_groundwater.cpp | 14 +- rel/d/a/obj/d_a_obj_groundwater/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp | 12 +- rel/d/a/obj/d_a_obj_grz_rock/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp | 59 +- rel/d/a/obj/d_a_obj_h_saku/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp | 19 +- rel/d/a/obj/d_a_obj_hakai_brl/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp | 17 +- rel/d/a/obj/d_a_obj_hakai_ftr/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp | 14 +- rel/d/a/obj/d_a_obj_hasu2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp | 13 +- rel/d/a/obj/d_a_obj_hata/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp | 25 +- rel/d/a/obj/d_a_obj_hb/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp | 21 +- rel/d/a/obj/d_a_obj_hbombkoya/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp | 12 - rel/d/a/obj/d_a_obj_heavySw/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp | 57 +- rel/d/a/obj/d_a_obj_hfuta/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp | 26 +- rel/d/a/obj/d_a_obj_hhashi/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp | 10 +- rel/d/a/obj/d_a_obj_hsTarget/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp | 16 +- rel/d/a/obj/d_a_obj_ice_l/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp | 16 +- rel/d/a/obj/d_a_obj_ice_s/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp | 18 - rel/d/a/obj/d_a_obj_iceblock/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp | 26 +- rel/d/a/obj/d_a_obj_iceleaf/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp | 13 +- rel/d/a/obj/d_a_obj_ihasi/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp | 17 +- rel/d/a/obj/d_a_obj_ikada/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp | 17 +- rel/d/a/obj/d_a_obj_inobone/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp | 13 - rel/d/a/obj/d_a_obj_ita/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp | 20 +- rel/d/a/obj/d_a_obj_itamato/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp | 25 +- rel/d/a/obj/d_a_obj_ito/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp | 32 +- rel/d/a/obj/d_a_obj_kabuto/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp | 34 +- rel/d/a/obj/d_a_obj_kag/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp | 12 +- rel/d/a/obj/d_a_obj_kage/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp | 61 +- rel/d/a/obj/d_a_obj_kago/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp | 25 +- rel/d/a/obj/d_a_obj_kaisou/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp | 30 +- rel/d/a/obj/d_a_obj_kamakiri/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp | 72 +- rel/d/a/obj/d_a_obj_kanban2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp | 25 +- rel/d/a/obj/d_a_obj_kantera/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_katatsumuri.cpp | 37 +- rel/d/a/obj/d_a_obj_katatsumuri/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp | 15 - rel/d/a/obj/d_a_obj_kazeneko/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp | 22 +- rel/d/a/obj/d_a_obj_kbacket/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp | 65 +- rel/d/a/obj/d_a_obj_kbox/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp | 17 - rel/d/a/obj/d_a_obj_key/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp | 60 +- rel/d/a/obj/d_a_obj_keyhole/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp | 21 +- rel/d/a/obj/d_a_obj_kgate/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp | 15 +- rel/d/a/obj/d_a_obj_ki/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp | 5 - rel/d/a/obj/d_a_obj_kiPot/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp | 18 +- rel/d/a/obj/d_a_obj_kita/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp | 13 +- rel/d/a/obj/d_a_obj_kjgjs/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp | 19 +- rel/d/a/obj/d_a_obj_kkanban/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp | 19 - rel/d/a/obj/d_a_obj_klift00/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp | 15 +- rel/d/a/obj/d_a_obj_knBullet/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp | 13 - rel/d/a/obj/d_a_obj_kshutter/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp | 18 +- rel/d/a/obj/d_a_obj_ktonfire/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp | 30 +- rel/d/a/obj/d_a_obj_kuwagata/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp | 18 +- rel/d/a/obj/d_a_obj_kwheel00/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp | 14 +- rel/d/a/obj/d_a_obj_kwheel01/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp | 17 +- rel/d/a/obj/d_a_obj_kznkarm/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp | 12 - rel/d/a/obj/d_a_obj_ladder/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp | 18 - rel/d/a/obj/d_a_obj_laundry/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_laundry_rope.cpp | 18 +- rel/d/a/obj/d_a_obj_laundry_rope/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp | 16 - rel/d/a/obj/d_a_obj_lbox/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_life_container.cpp | 28 +- .../a/obj/d_a_obj_life_container/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp | 55 +- rel/d/a/obj/d_a_obj_lp/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv1Candle00.cpp | 20 +- rel/d/a/obj/d_a_obj_lv1Candle00/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv1Candle01.cpp | 20 +- rel/d/a/obj/d_a_obj_lv1Candle01/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp | 19 +- rel/d/a/obj/d_a_obj_lv2candle/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp | 20 +- rel/d/a/obj/d_a_obj_lv3Candle/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp | 15 +- rel/d/a/obj/d_a_obj_lv3Water/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp | 16 +- rel/d/a/obj/d_a_obj_lv3Water2/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp | 13 +- rel/d/a/obj/d_a_obj_lv3WaterB/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp | 9 +- rel/d/a/obj/d_a_obj_lv3saka00/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv3waterEff.cpp | 11 +- rel/d/a/obj/d_a_obj_lv3waterEff/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv4CandleDemoTag.cpp | 6 - .../obj/d_a_obj_lv4CandleDemoTag/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv4CandleTag.cpp | 7 - rel/d/a/obj/d_a_obj_lv4CandleTag/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv4EdShutter.cpp | 15 +- rel/d/a/obj/d_a_obj_lv4EdShutter/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp | 10 - rel/d/a/obj/d_a_obj_lv4Gate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv4HsTarget.cpp | 11 +- rel/d/a/obj/d_a_obj_lv4HsTarget/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp | 10 - rel/d/a/obj/d_a_obj_lv4PoGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv4RailWall.cpp | 17 - rel/d/a/obj/d_a_obj_lv4RailWall/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv4SlideWall.cpp | 10 - rel/d/a/obj/d_a_obj_lv4SlideWall/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp | 12 - rel/d/a/obj/d_a_obj_lv4bridge/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv4chandelier.cpp | 21 - .../a/obj/d_a_obj_lv4chandelier/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp | 19 +- rel/d/a/obj/d_a_obj_lv4digsand/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp | 14 +- rel/d/a/obj/d_a_obj_lv4floor/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp | 9 - rel/d/a/obj/d_a_obj_lv4gear/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp | 13 +- rel/d/a/obj/d_a_obj_lv4prelvtr/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp | 10 - rel/d/a/obj/d_a_obj_lv4prwall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp | 16 +- rel/d/a/obj/d_a_obj_lv4sand/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv5FloorBoard.cpp | 19 +- .../a/obj/d_a_obj_lv5FloorBoard/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp | 20 +- rel/d/a/obj/d_a_obj_lv5IceWall/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp | 20 +- rel/d/a/obj/d_a_obj_lv5SwIce/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp | 25 +- rel/d/a/obj/d_a_obj_lv5ychndlr/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv5yiblltray.cpp | 22 +- rel/d/a/obj/d_a_obj_lv5yiblltray/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv6ChangeGate.cpp | 20 +- .../a/obj/d_a_obj_lv6ChangeGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv6FurikoTrap.cpp | 19 +- .../a/obj/d_a_obj_lv6FurikoTrap/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp | 14 +- rel/d/a/obj/d_a_obj_lv6Lblock/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp | 19 +- rel/d/a/obj/d_a_obj_lv6SwGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp | 10 - rel/d/a/obj/d_a_obj_lv6SzGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp | 14 +- rel/d/a/obj/d_a_obj_lv6Tenbin/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv6TogeRoll.cpp | 26 +- rel/d/a/obj/d_a_obj_lv6TogeRoll/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv6TogeTrap.cpp | 27 +- rel/d/a/obj/d_a_obj_lv6TogeTrap/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp | 20 - rel/d/a/obj/d_a_obj_lv6bemos/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp | 27 +- rel/d/a/obj/d_a_obj_lv6bemos2/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp | 19 +- rel/d/a/obj/d_a_obj_lv6egate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp | 14 +- rel/d/a/obj/d_a_obj_lv6elevta/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp | 12 - rel/d/a/obj/d_a_obj_lv6swturn/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp | 9 - rel/d/a/obj/d_a_obj_lv7BsGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv7PropellerY.cpp | 13 +- .../a/obj/d_a_obj_lv7PropellerY/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp | 15 - rel/d/a/obj/d_a_obj_lv7bridge/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_lv8KekkaiTrap.cpp | 13 +- .../a/obj/d_a_obj_lv8KekkaiTrap/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp | 19 +- rel/d/a/obj/d_a_obj_lv8Lift/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv8OptiLift.cpp | 19 +- rel/d/a/obj/d_a_obj_lv8OptiLift/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp | 9 - rel/d/a/obj/d_a_obj_lv8UdFloor/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_lv9SwShutter.cpp | 14 +- rel/d/a/obj/d_a_obj_lv9SwShutter/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp | 18 +- rel/d/a/obj/d_a_obj_magLift/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp | 14 +- rel/d/a/obj/d_a_obj_magLiftRot/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_magne_arm/d_a_obj_magne_arm.cpp | 67 +- rel/d/a/obj/d_a_obj_magne_arm/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp | 17 +- rel/d/a/obj/d_a_obj_maki/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_master_sword.cpp | 18 - rel/d/a/obj/d_a_obj_master_sword/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp | 17 +- rel/d/a/obj/d_a_obj_mato/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp | 17 +- rel/d/a/obj/d_a_obj_metalbox/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp | 13 - rel/d/a/obj/d_a_obj_mgate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp | 18 +- rel/d/a/obj/d_a_obj_mhole/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp | 58 +- rel/d/a/obj/d_a_obj_mie/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp | 85 +- rel/d/a/obj/d_a_obj_movebox/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp | 59 +- rel/d/a/obj/d_a_obj_msima/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp | 12 - rel/d/a/obj/d_a_obj_mvstair/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp | 11 +- rel/d/a/obj/d_a_obj_myogan/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp | 25 +- rel/d/a/obj/d_a_obj_nagaisu/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_nameplate/d_a_obj_nameplate.cpp | 14 - rel/d/a/obj/d_a_obj_nameplate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp | 31 +- rel/d/a/obj/d_a_obj_nan/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp | 17 +- rel/d/a/obj/d_a_obj_ndoor/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp | 18 +- rel/d/a/obj/d_a_obj_nougu/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp | 34 +- rel/d/a/obj/d_a_obj_octhashi/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp | 19 +- rel/d/a/obj/d_a_obj_oiltubo/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp | 8 - rel/d/a/obj/d_a_obj_onsen/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_onsenFire/d_a_obj_onsenFire.cpp | 12 +- rel/d/a/obj/d_a_obj_onsenFire/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp | 16 - rel/d/a/obj/d_a_obj_onsenTaru/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_ornament_cloth.cpp | 11 - .../a/obj/d_a_obj_ornament_cloth/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp | 12 - rel/d/a/obj/d_a_obj_pdoor/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp | 19 - rel/d/a/obj/d_a_obj_pdtile/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp | 10 - rel/d/a/obj/d_a_obj_pdwall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_picture/d_a_obj_picture.cpp | 28 +- rel/d/a/obj/d_a_obj_picture/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp | 16 - rel/d/a/obj/d_a_obj_pillar/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp | 17 +- rel/d/a/obj/d_a_obj_pleaf/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp | 15 +- rel/d/a/obj/d_a_obj_poCandle/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp | 15 +- rel/d/a/obj/d_a_obj_poFire/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp | 14 +- rel/d/a/obj/d_a_obj_poTbox/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp | 11 +- rel/d/a/obj/d_a_obj_prop/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp | 21 +- rel/d/a/obj/d_a_obj_pumpkin/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp | 12 +- rel/d/a/obj/d_a_obj_rcircle/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp | 11 - rel/d/a/obj/d_a_obj_rfHole/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp | 23 +- rel/d/a/obj/d_a_obj_rgate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_riverrock/d_a_obj_riverrock.cpp | 19 +- rel/d/a/obj/d_a_obj_riverrock/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp | 13 - rel/d/a/obj/d_a_obj_rock/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_rope_bridge.cpp | 30 +- rel/d/a/obj/d_a_obj_rope_bridge/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_rotBridge/d_a_obj_rotBridge.cpp | 9 - rel/d/a/obj/d_a_obj_rotBridge/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp | 15 - rel/d/a/obj/d_a_obj_rotTrap/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp | 17 +- rel/d/a/obj/d_a_obj_roten/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp | 13 - rel/d/a/obj/d_a_obj_rstair/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp | 20 - rel/d/a/obj/d_a_obj_rw/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp | 14 +- rel/d/a/obj/d_a_obj_saidan/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp | 13 - rel/d/a/obj/d_a_obj_sakuita/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_sakuita_rope.cpp | 16 +- rel/d/a/obj/d_a_obj_sakuita_rope/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp | 11 - rel/d/a/obj/d_a_obj_scannon/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_scannon_crs.cpp | 18 +- rel/d/a/obj/d_a_obj_scannon_crs/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_scannon_ten.cpp | 11 - rel/d/a/obj/d_a_obj_scannon_ten/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp | 11 - rel/d/a/obj/d_a_obj_sekidoor/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp | 9 - rel/d/a/obj/d_a_obj_sekizo/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp | 93 +- rel/d/a/obj/d_a_obj_sekizoa/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp | 20 - rel/d/a/obj/d_a_obj_shield/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp | 17 +- rel/d/a/obj/d_a_obj_sm_door/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp | 27 +- rel/d/a/obj/d_a_obj_smallkey/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp | 12 - rel/d/a/obj/d_a_obj_smgdoor/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp | 11 +- rel/d/a/obj/d_a_obj_smoke/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp | 12 +- rel/d/a/obj/d_a_obj_smtile/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_smw_stone/d_a_obj_smw_stone.cpp | 13 +- rel/d/a/obj/d_a_obj_smw_stone/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp | 14 +- rel/d/a/obj/d_a_obj_snowEffTag/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_snow_soup/d_a_obj_snow_soup.cpp | 13 +- rel/d/a/obj/d_a_obj_snow_soup/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp | 16 - rel/d/a/obj/d_a_obj_so/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp | 9 - rel/d/a/obj/d_a_obj_spinLift/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp | 23 +- rel/d/a/obj/d_a_obj_ss_drink/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp | 17 +- rel/d/a/obj/d_a_obj_ss_item/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_stairBlock/d_a_obj_stairBlock.cpp | 18 +- rel/d/a/obj/d_a_obj_stairBlock/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp | 18 +- rel/d/a/obj/d_a_obj_stick/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp | 29 +- rel/d/a/obj/d_a_obj_stone/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_stonemark/d_a_obj_stoneMark.cpp | 13 +- rel/d/a/obj/d_a_obj_stonemark/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp | 56 - rel/d/a/obj/d_a_obj_stopper/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- .../obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp | 13 +- rel/d/a/obj/d_a_obj_stopper2/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp | 13 +- rel/d/a/obj/d_a_obj_suisya/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp | 21 +- rel/d/a/obj/d_a_obj_sw/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp | 14 +- rel/d/a/obj/d_a_obj_swBallA/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp | 15 +- rel/d/a/obj/d_a_obj_swBallB/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp | 18 +- rel/d/a/obj/d_a_obj_swBallC/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp | 20 - rel/d/a/obj/d_a_obj_swLight/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_sWallShutter.cpp | 11 - rel/d/a/obj/d_a_obj_swallshutter/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp | 19 - rel/d/a/obj/d_a_obj_swchain/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp | 17 - rel/d/a/obj/d_a_obj_swhang/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp | 15 - rel/d/a/obj/d_a_obj_sword/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_swpropeller.cpp | 20 +- rel/d/a/obj/d_a_obj_swpropeller/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp | 56 +- rel/d/a/obj/d_a_obj_swpush/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- .../a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp | 21 +- rel/d/a/obj/d_a_obj_swpush2/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp | 51 - rel/d/a/obj/d_a_obj_swpush5/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- .../d_a_obj_swspinner/d_a_obj_swspinner.cpp | 10 - rel/d/a/obj/d_a_obj_swspinner/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp | 11 - rel/d/a/obj/d_a_obj_swturn/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp | 18 - rel/d/a/obj/d_a_obj_syRock/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp | 14 +- rel/d/a/obj/d_a_obj_szbridge/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp | 16 - rel/d/a/obj/d_a_obj_taFence/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp | 10 - rel/d/a/obj/d_a_obj_table/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_takaraDai/d_a_obj_takaraDai.cpp | 13 +- rel/d/a/obj/d_a_obj_takaraDai/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp | 14 - rel/d/a/obj/d_a_obj_tatigi/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp | 31 +- rel/d/a/obj/d_a_obj_ten/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_testcube/d_a_obj_testcube.cpp | 5 - rel/d/a/obj/d_a_obj_testcube/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp | 9 - rel/d/a/obj/d_a_obj_tgake/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp | 63 +- rel/d/a/obj/d_a_obj_thashi/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp | 15 - rel/d/a/obj/d_a_obj_thdoor/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp | 12 +- rel/d/a/obj/d_a_obj_timeFire/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp | 8 - rel/d/a/obj/d_a_obj_timer/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp | 48 +- rel/d/a/obj/d_a_obj_tks/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp | 8 - rel/d/a/obj/d_a_obj_tmoon/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp | 12 +- rel/d/a/obj/d_a_obj_toaru_maki/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp | 53 +- rel/d/a/obj/d_a_obj_toby/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp | 56 - rel/d/a/obj/d_a_obj_tobyhouse/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 9 +- .../obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp | 15 - rel/d/a/obj/d_a_obj_togeTrap/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp | 36 +- rel/d/a/obj/d_a_obj_tombo/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp | 19 +- rel/d/a/obj/d_a_obj_tornado/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp | 21 +- rel/d/a/obj/d_a_obj_tornado2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp | 41 +- rel/d/a/obj/d_a_obj_tp/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp | 10 - rel/d/a/obj/d_a_obj_treesh/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp | 11 +- rel/d/a/obj/d_a_obj_twGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp | 18 +- rel/d/a/obj/d_a_obj_udoor/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp | 11 +- rel/d/a/obj/d_a_obj_usaku/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_vground/d_a_obj_vground.cpp | 13 +- rel/d/a/obj/d_a_obj_vground/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_volcball/d_a_obj_volcball.cpp | 23 +- rel/d/a/obj/d_a_obj_volcball/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp | 25 +- rel/d/a/obj/d_a_obj_volcbom/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp | 25 +- rel/d/a/obj/d_a_obj_warp_kbrg/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp | 19 +- rel/d/a/obj/d_a_obj_warp_obrg/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_waterGate/d_a_obj_waterGate.cpp | 14 +- rel/d/a/obj/d_a_obj_waterGate/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_waterPillar.cpp | 22 +- rel/d/a/obj/d_a_obj_waterPillar/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_waterfall/d_a_obj_waterfall.cpp | 13 - rel/d/a/obj/d_a_obj_waterfall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp | 28 +- rel/d/a/obj/d_a_obj_wchain/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp | 19 - rel/d/a/obj/d_a_obj_wdStick/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp | 18 +- rel/d/a/obj/d_a_obj_web0/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp | 18 +- rel/d/a/obj/d_a_obj_web1/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_well_cover/d_a_obj_well_cover.cpp | 11 - rel/d/a/obj/d_a_obj_well_cover/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp | 21 +- rel/d/a/obj/d_a_obj_wflag/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_wind_stone/d_a_obj_wind_stone.cpp | 15 +- rel/d/a/obj/d_a_obj_wind_stone/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp | 14 - rel/d/a/obj/d_a_obj_window/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_wood_pendulum.cpp | 13 - .../a/obj/d_a_obj_wood_pendulum/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_wood_statue.cpp | 26 +- rel/d/a/obj/d_a_obj_wood_statue/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp | 16 +- rel/d/a/obj/d_a_obj_wsword/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp | 61 +- rel/d/a/obj/d_a_obj_yel_bag/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp | 15 - rel/d/a/obj/d_a_obj_yobikusa/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp | 72 +- rel/d/a/obj/d_a_obj_yousei/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp | 14 +- rel/d/a/obj/d_a_obj_ystone/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp | 11 - rel/d/a/obj/d_a_obj_zcloth/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp | 22 +- rel/d/a/obj/d_a_obj_zdoor/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp | 19 +- rel/d/a/obj/d_a_obj_zrTurara/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_obj_zrTuraraRock.cpp | 17 +- rel/d/a/obj/d_a_obj_zrTuraraRock/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp | 22 +- rel/d/a/obj/d_a_obj_zraMark/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp | 17 +- rel/d/a/obj/d_a_obj_zra_freeze/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp | 12 +- rel/d/a/obj/d_a_obj_zra_rock/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_mirror_6pole.cpp | 10 - .../mirror/d_a_obj_mirror_6pole/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_mirror_chain.cpp | 21 +- .../mirror/d_a_obj_mirror_chain/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_mirror_sand.cpp | 14 +- .../mirror/d_a_obj_mirror_sand/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_mirror_screw.cpp | 15 +- .../mirror/d_a_obj_mirror_screw/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_obj_mirror_table.cpp | 15 +- .../mirror/d_a_obj_mirror_table/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp | 10 - rel/d/a/tag/d_a_tag_Lv6Gate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp | 15 +- rel/d/a/tag/d_a_tag_Lv7Gate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp | 10 - rel/d/a/tag/d_a_tag_Lv8Gate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp | 16 +- rel/d/a/tag/d_a_tag_TWgate/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp | 4 - rel/d/a/tag/d_a_tag_ajnot/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp | 7 - rel/d/a/tag/d_a_tag_allmato/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp | 4 - rel/d/a/tag/d_a_tag_arena/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_assistance/d_a_tag_assistance.cpp | 4 - rel/d/a/tag/d_a_tag_assistance/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_attack_item.cpp | 14 +- rel/d/a/tag/d_a_tag_attack_item/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_attention/d_a_tag_attention.cpp | 5 - rel/d/a/tag/d_a_tag_attention/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_bottle_item.cpp | 4 - rel/d/a/tag/d_a_tag_bottle_item/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp | 8 - rel/d/a/tag/d_a_tag_camera/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_chgrestart/d_a_tag_chgrestart.cpp | 5 - rel/d/a/tag/d_a_tag_chgrestart/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp | 7 - rel/d/a/tag/d_a_tag_chkpoint/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp | 6 - rel/d/a/tag/d_a_tag_cstasw/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp | 27 +- rel/d/a/tag/d_a_tag_csw/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp | 4 - rel/d/a/tag/d_a_tag_escape/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp | 7 - rel/d/a/tag/d_a_tag_event/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp | 7 - rel/d/a/tag/d_a_tag_evt/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp | 9 - rel/d/a/tag/d_a_tag_evtarea/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp | 7 - rel/d/a/tag/d_a_tag_evtmsg/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 7 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../tag/d_a_tag_firewall/d_a_tag_firewall.cpp | 15 +- rel/d/a/tag/d_a_tag_firewall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp | 5 - rel/d/a/tag/d_a_tag_gra/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp | 4 - rel/d/a/tag/d_a_tag_gstart/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp | 3 - rel/d/a/tag/d_a_tag_guard/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp | 5 - rel/d/a/tag/d_a_tag_hinit/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp | 14 +- rel/d/a/tag/d_a_tag_hjump/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp | 6 - rel/d/a/tag/d_a_tag_howl/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp | 6 - rel/d/a/tag/d_a_tag_hstop/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_tag_instruction.cpp | 4 - rel/d/a/tag/d_a_tag_instruction/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_kago_fall/d_a_tag_kago_fall.cpp | 9 - rel/d/a/tag/d_a_tag_kago_fall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp | 5 - rel/d/a/tag/d_a_tag_kmsg/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp | 5 - rel/d/a/tag/d_a_tag_lantern/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- .../d_a_tag_lightball/d_a_tag_lightball.cpp | 5 - rel/d/a/tag/d_a_tag_lightball/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp | 8 - rel/d/a/tag/d_a_tag_lv2prchk/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp | 5 - rel/d/a/tag/d_a_tag_lv5soup/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp | 6 - rel/d/a/tag/d_a_tag_lv6CstaSw/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp | 5 - rel/d/a/tag/d_a_tag_magne/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp | 9 - rel/d/a/tag/d_a_tag_mhint/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp | 6 - rel/d/a/tag/d_a_tag_mist/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp | 6 - rel/d/a/tag/d_a_tag_mmsg/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp | 7 - rel/d/a/tag/d_a_tag_msg/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp | 7 - rel/d/a/tag/d_a_tag_mstop/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp | 6 - rel/d/a/tag/d_a_tag_mwait/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp | 6 - rel/d/a/tag/d_a_tag_myna2/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_myna_light/d_a_tag_myna_light.cpp | 12 +- rel/d/a/tag/d_a_tag_myna_light/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp | 9 - rel/d/a/tag/d_a_tag_pachi/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp | 4 - rel/d/a/tag/d_a_tag_poFire/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp | 5 - rel/d/a/tag/d_a_tag_push/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp | 11 - rel/d/a/tag/d_a_tag_qs/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp | 5 - rel/d/a/tag/d_a_tag_ret_room/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_river_back/d_a_tag_river_back.cpp | 7 - rel/d/a/tag/d_a_tag_river_back/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp | 5 - rel/d/a/tag/d_a_tag_rmbit_sw/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../tag/d_a_tag_schedule/d_a_tag_schedule.cpp | 4 - rel/d/a/tag/d_a_tag_schedule/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp | 4 - rel/d/a/tag/d_a_tag_setBall/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_setrestart/d_a_tag_setrestart.cpp | 7 - rel/d/a/tag/d_a_tag_setrestart/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_shop_camera.cpp | 3 - rel/d/a/tag/d_a_tag_shop_camera/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_shop_item/d_a_tag_shop_item.cpp | 6 - rel/d/a/tag/d_a_tag_shop_item/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp | 10 +- rel/d/a/tag/d_a_tag_smk_emt/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp | 10 +- rel/d/a/tag/d_a_tag_spinner/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp | 16 +- rel/d/a/tag/d_a_tag_sppath/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp | 7 - rel/d/a/tag/d_a_tag_spring/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp | 4 - rel/d/a/tag/d_a_tag_ss_drink/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_statue_evt/d_a_tag_statue_evt.cpp | 15 +- rel/d/a/tag/d_a_tag_statue_evt/executor.cpp | 3 - .../unknown_translation_unit_bss.cpp | 2 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp | 6 - rel/d/a/tag/d_a_tag_stream/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp | 4 - rel/d/a/tag/d_a_tag_telop/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_theB_hint/d_a_tag_theB_hint.cpp | 4 - rel/d/a/tag/d_a_tag_theB_hint/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_wara_howl/d_a_tag_wara_howl.cpp | 4 - rel/d/a/tag/d_a_tag_wara_howl/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp | 4 - rel/d/a/tag/d_a_tag_watchge/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- .../d_a_tag_waterfall/d_a_tag_waterfall.cpp | 6 - rel/d/a/tag/d_a_tag_waterfall/executor.cpp | 4 - .../global_destructor_chain.cpp | 10 +- .../unknown_translation_unit_ctors.cpp | 7 +- rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp | 7 - rel/d/a/tag/d_a_tag_wljump/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp | 12 - rel/d/a/tag/d_a_tag_yami/executor.cpp | 3 - .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- rel/f_pc/f_pc_profile_lst/executor.cpp | 3 - .../f_pc_profile_lst/f_pc_profile_lst.cpp | 794 -- .../unknown_translation_unit_ctors.cpp | 9 +- .../unknown_translation_unit_dtors.cpp | 9 +- src/DynamicLink.cpp | 6 +- src/a/npc/d_a_npc_cd.cpp | 36 +- src/a/npc/d_a_npc_cd2.cpp | 63 +- src/a/obj/d_a_obj_item.cpp | 98 +- src/c/c_damagereaction.cpp | 14 +- src/c/c_dylink.cpp | 2 - src/d/a/d_a_alink.cpp | 1014 ++- src/d/a/d_a_horse_static.cpp | 2 - src/d/a/d_a_itembase.cpp | 27 +- src/d/a/d_a_itembase_static.cpp | 4 - src/d/a/d_a_no_chg_room.cpp | 12 +- src/d/a/d_a_npc.cpp | 171 +- src/d/a/d_a_obj.cpp | 37 +- src/d/a/d_a_player.cpp | 52 +- src/d/a/d_a_shop_item_static.cpp | 2 - src/d/bg/d_bg_s.cpp | 10 +- src/d/bg/d_bg_s_acch.cpp | 29 +- src/d/bg/d_bg_s_gnd_chk.cpp | 4 - src/d/bg/d_bg_s_movebg_actor.cpp | 8 +- src/d/bg/d_bg_s_roof_chk.cpp | 2 +- src/d/bg/d_bg_s_sph_chk.cpp | 1 - src/d/bg/d_bg_s_spl_grp_chk.cpp | 2 +- src/d/bg/d_bg_s_wtr_chk.cpp | 2 - src/d/bg/d_bg_w.cpp | 38 +- src/d/bg/d_bg_w_kcol.cpp | 77 +- src/d/bg/d_bg_w_sv.cpp | 22 +- src/d/cc/d_cc_d.cpp | 73 +- src/d/cc/d_cc_mass_s.cpp | 36 +- src/d/cc/d_cc_s.cpp | 36 +- src/d/cc/d_cc_uty.cpp | 27 +- src/d/com/d_com_inf_actor.cpp | 3 - src/d/com/d_com_inf_game.cpp | 50 +- src/d/com/d_com_static.cpp | 32 - src/d/d_att_dist.cpp | 2 - src/d/d_attention.cpp | 87 +- src/d/d_bright_check.cpp | 8 +- src/d/d_cam_param.cpp | 131 +- src/d/d_camera.cpp | 366 +- src/d/d_demo.cpp | 65 +- src/d/d_drawlist.cpp | 154 +- src/d/d_envse.cpp | 9 - src/d/d_error_msg.cpp | 38 +- src/d/d_ev_camera.cpp | 405 +- src/d/d_eye_hl.cpp | 12 +- src/d/d_gameover.cpp | 50 +- src/d/d_insect.cpp | 14 +- src/d/d_item.cpp | 13 +- src/d/d_item_data.cpp | 5 - src/d/d_jnt_col.cpp | 49 +- src/d/d_k_wmark.cpp | 52 +- src/d/d_k_wpillar.cpp | 18 +- src/d/d_kantera_icon_meter.cpp | 21 +- src/d/d_ky_thunder.cpp | 76 +- src/d/d_kyeff.cpp | 17 +- src/d/d_kyeff2.cpp | 3 - src/d/d_lib.cpp | 7 - src/d/d_model.cpp | 8 - src/d/d_name.cpp | 28 +- src/d/d_npc_lib.cpp | 30 +- src/d/d_path.cpp | 14 +- src/d/d_resorce.cpp | 19 +- src/d/d_scope.cpp | 32 +- src/d/d_select_cursor.cpp | 25 +- src/d/d_select_icon.cpp | 16 +- src/d/d_simple_model.cpp | 17 +- src/d/d_spline_path.cpp | 8 +- src/d/d_stage.cpp | 58 +- src/d/d_timer.cpp | 55 +- src/d/d_tresure.cpp | 20 +- src/d/d_vib_pattern.cpp | 5 - src/d/d_vibration.cpp | 12 +- src/d/event/d_event.cpp | 16 +- src/d/event/d_event_data.cpp | 30 +- src/d/event/d_event_lib.cpp | 1 - src/d/event/d_event_manager.cpp | 43 +- src/d/file/d_file_sel_info.cpp | 7 +- src/d/file/d_file_sel_warning.cpp | 14 +- src/d/file/d_file_select.cpp | 114 +- src/d/kankyo/d_kankyo.cpp | 356 +- src/d/kankyo/d_kankyo_data.cpp | 3 - src/d/kankyo/d_kankyo_rain.cpp | 570 +- src/d/kankyo/d_kankyo_wether.cpp | 110 +- src/d/map/d_map.cpp | 52 +- src/d/map/d_map_path.cpp | 18 +- src/d/map/d_map_path_dmap.cpp | 44 +- src/d/map/d_map_path_fmap.cpp | 17 +- src/d/menu/d_menu_calibration.cpp | 13 +- src/d/menu/d_menu_collect.cpp | 116 +- src/d/menu/d_menu_dmap.cpp | 85 +- src/d/menu/d_menu_dmap_map.cpp | 46 +- src/d/menu/d_menu_fishing.cpp | 22 +- src/d/menu/d_menu_fmap.cpp | 59 +- src/d/menu/d_menu_fmap2D.cpp | 56 +- src/d/menu/d_menu_fmap_map.cpp | 44 +- src/d/menu/d_menu_insect.cpp | 48 +- src/d/menu/d_menu_item_explain.cpp | 62 +- src/d/menu/d_menu_letter.cpp | 48 +- src/d/menu/d_menu_map_common.cpp | 26 +- src/d/menu/d_menu_option.cpp | 53 +- src/d/menu/d_menu_ring.cpp | 78 +- src/d/menu/d_menu_save.cpp | 45 +- src/d/menu/d_menu_skill.cpp | 40 +- src/d/menu/d_menu_window.cpp | 39 +- src/d/menu/d_menu_window_HIO.cpp | 4 - src/d/meter/d_meter2.cpp | 39 +- src/d/meter/d_meter2_draw.cpp | 164 +- src/d/meter/d_meter2_info.cpp | 36 +- src/d/meter/d_meter_HIO.cpp | 310 +- src/d/meter/d_meter_button.cpp | 75 +- src/d/meter/d_meter_haihai.cpp | 44 +- src/d/meter/d_meter_hakusha.cpp | 29 +- src/d/meter/d_meter_map.cpp | 23 +- src/d/meter/d_meter_string.cpp | 29 +- src/d/msg/d_msg_class.cpp | 65 +- src/d/msg/d_msg_flow.cpp | 23 +- src/d/msg/d_msg_object.cpp | 101 +- src/d/msg/d_msg_out_font.cpp | 38 +- src/d/msg/d_msg_string.cpp | 16 +- src/d/msg/d_msg_string_base.cpp | 28 +- src/d/msg/d_msg_unit.cpp | 14 +- src/d/ovlp/d_ovlp_fade.cpp | 12 - src/d/ovlp/d_ovlp_fade2.cpp | 37 +- src/d/ovlp/d_ovlp_fade3.cpp | 32 +- src/d/pane/d_pane_class.cpp | 34 +- src/d/pane/d_pane_class_alpha.cpp | 20 +- src/d/pane/d_pane_class_ex.cpp | 4 +- src/d/particle/d_particle.cpp | 128 +- src/d/particle/d_particle_copoly.cpp | 23 +- src/d/particle/d_particle_name.cpp | 3 - src/d/s/d_s_logo.cpp | 37 +- src/d/s/d_s_menu.cpp | 5 - src/d/s/d_s_name.cpp | 29 +- src/d/s/d_s_play.cpp | 45 +- src/d/s/d_s_room.cpp | 13 - src/d/s/d_s_title.cpp | 6 - src/d/save/d_save.cpp | 9 +- src/d/save/d_save_HIO.cpp | 3 - src/d/shop/d_shop_camera.cpp | 33 +- src/d/shop/d_shop_item_ctrl.cpp | 29 +- src/d/shop/d_shop_system.cpp | 66 +- src/f_ap/f_ap_game.cpp | 6 +- src/f_op/f_op_actor.cpp | 35 +- src/f_op/f_op_actor_iter.cpp | 1 - src/f_op/f_op_actor_mng.cpp | 77 +- src/f_op/f_op_actor_tag.cpp | 1 - src/f_op/f_op_camera.cpp | 3 - src/f_op/f_op_draw_iter.cpp | 2 - src/f_op/f_op_draw_tag.cpp | 1 - src/f_op/f_op_kankyo.cpp | 3 - src/f_op/f_op_kankyo_mng.cpp | 7 +- src/f_op/f_op_msg.cpp | 2 - src/f_op/f_op_msg_mng.cpp | 20 +- src/f_op/f_op_overlap.cpp | 1 - src/f_op/f_op_scene.cpp | 1 - src/f_op/f_op_scene_iter.cpp | 1 - src/f_op/f_op_scene_tag.cpp | 1 - src/f_op/f_op_view.cpp | 1 - src/f_pc/f_pc_create_iter.cpp | 1 - src/f_pc/f_pc_create_tag.cpp | 1 - src/f_pc/f_pc_delete_tag.cpp | 1 - src/f_pc/f_pc_deletor.cpp | 2 - src/f_pc/f_pc_draw.cpp | 1 - src/f_pc/f_pc_executor.cpp | 1 - src/f_pc/f_pc_leaf.cpp | 3 - src/f_pc/f_pc_line.cpp | 1 - src/f_pc/f_pc_line_iter.cpp | 1 - src/f_pc/f_pc_line_tag.cpp | 1 - src/f_pc/f_pc_manager.cpp | 5 - src/f_pc/f_pc_node.cpp | 2 - src/f_pc/f_pc_pause.cpp | 1 - src/f_pc/f_pc_priority.cpp | 1 - src/f_pc/f_pc_profile.cpp | 1 - src/f_pc/f_pc_stdcreate_req.cpp | 1 - src/init.cpp | 6 - src/m_Do/m_Do_DVDError.cpp | 1 - src/m_Do/m_Do_MemCard.cpp | 3 - src/m_Do/m_Do_MemCardRWmng.cpp | 4 - src/m_Do/m_Do_Reset.cpp | 11 - src/m_Do/m_Do_audio.cpp | 54 +- src/m_Do/m_Do_controller_pad.cpp | 18 +- src/m_Do/m_Do_dvd_thread.cpp | 2 - src/m_Do/m_Do_ext.cpp | 104 +- src/m_Do/m_Do_graphic.cpp | 119 +- src/m_Do/m_Do_lib.cpp | 27 +- src/m_Do/m_Do_machine.cpp | 36 +- src/m_Do/m_Do_machine_exception.cpp | 15 - src/m_Do/m_Do_main.cpp | 59 +- src/m_Do/m_Do_mtx.cpp | 15 +- src/m_Do/m_Do_printf.cpp | 5 - src/msg/scrn/d_msg_scrn_3select.cpp | 35 +- src/msg/scrn/d_msg_scrn_arrow.cpp | 9 +- src/msg/scrn/d_msg_scrn_base.cpp | 4 +- src/msg/scrn/d_msg_scrn_boss.cpp | 6 +- src/msg/scrn/d_msg_scrn_explain.cpp | 46 +- src/msg/scrn/d_msg_scrn_howl.cpp | 46 +- src/msg/scrn/d_msg_scrn_item.cpp | 53 +- src/msg/scrn/d_msg_scrn_jimaku.cpp | 6 +- src/msg/scrn/d_msg_scrn_kanban.cpp | 10 +- src/msg/scrn/d_msg_scrn_light.cpp | 10 +- src/msg/scrn/d_msg_scrn_place.cpp | 6 +- src/msg/scrn/d_msg_scrn_staff.cpp | 6 +- src/msg/scrn/d_msg_scrn_talk.cpp | 43 +- src/msg/scrn/d_msg_scrn_tree.cpp | 10 +- src/unknown_translation_unit.cpp | 3 - 3631 files changed, 20347 insertions(+), 42325 deletions(-) diff --git a/defs/module0.py b/defs/module0.py index f5788cb07a2..7637f7a2566 100644 --- a/defs/module0.py +++ b/defs/module0.py @@ -17277,7 +17277,7 @@ SYMBOLS = [ {'addr':0x803790B0,'size':16,'pad':0,'label':"d_com_d_com_static__stringBase0",'name':"@stringBase0",'lib':0,'tu':75,'section':3,'r':[2,0,0],'sh':[0,0,0],'type':"StringBase"}, {'addr':0x803790C0,'size':370,'pad':2,'label':"tempBitLabels__20dSv_event_tmp_flag_c",'name':"tempBitLabels__20dSv_event_tmp_flag_c",'lib':0,'tu':79,'section':3,'r':[0,17,7],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80379234,'size':98,'pad':2,'label':"d_save_d_save__stringBase0",'name':"@stringBase0",'lib':0,'tu':79,'section':3,'r':[8,0,0],'sh':[0,0,0],'type':"StringBase"}, - {'addr':0x80379298,'size':16,'pad':0,'label':"zero_quat",'name':"zero_quat$3920",'lib':0,'tu':82,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80379298,'size':16,'pad':0,'label':"zero_quat",'name':"zero_quat$3920",'lib':0,'tu':82,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x803792A8,'size':7,'pad':1,'label':"d_a_d_a_obj__stringBase0",'name':"@stringBase0",'lib':0,'tu':82,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"StringBase"}, {'addr':0x803792B0,'size':56,'pad':0,'label':"m_data__12daItemBase_c",'name':"m_data__12daItemBase_c",'lib':0,'tu':83,'section':3,'r':[0,1,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x803792E8,'size':1104,'pad':0,'label':"mData__12daShopItem_c",'name':"mData__12daShopItem_c",'lib':0,'tu':85,'section':3,'r':[1,0,9],'sh':[0,0,0],'type':"ReferenceArray"}, @@ -17528,7 +17528,7 @@ SYMBOLS = [ {'addr':0x803919E4,'size':12,'pad':0,'label':"localPaddleTop",'name':"localPaddleTop$20605",'lib':0,'tu':141,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x803919F0,'size':12,'pad':0,'label':"underOffsetY",'name':"underOffsetY$23302",'lib':0,'tu':141,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x803919FC,'size':12,'pad':0,'label':"hsVec",'name':"hsVec$28749",'lib':0,'tu':141,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80391A08,'size':12,'pad':0,'label':"hookRoot",'name':"hookRoot$29726",'lib':0,'tu':141,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80391A08,'size':12,'pad':0,'label':"hookRoot",'name':"hookRoot$29726",'lib':0,'tu':141,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80391A14,'size':12,'pad':0,'label':"bottleTop",'name':"bottleTop$32160",'lib':0,'tu':141,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80391A20,'size':12,'pad':0,'label':"kandelaarOffset",'name':"kandelaarOffset$32655",'lib':0,'tu':141,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80391A2C,'size':12,'pad':0,'label':"lit_33690",'name':"@33690",'lib':0,'tu':141,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -18091,7 +18091,7 @@ SYMBOLS = [ {'addr':0x8039AB88,'size':32,'pad':0,'label':"gauDataSize_TEParagraph_data__Q37JStudio3stb4data",'name':"gauDataSize_TEParagraph_data__Q37JStudio3stb4data",'lib':8,'tu':323,'section':3,'r':[0,1,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8039ABA8,'size':12,'pad':4,'label':"lit_1172",'name':"@1172",'lib':11,'tu':324,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8039ABB8,'size':1024,'pad':0,'label':"CUTOFF_TO_IIR_TABLE__7JASCalc",'name':"CUTOFF_TO_IIR_TABLE__7JASCalc",'lib':12,'tu':333,'section':3,'r':[0,4,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8039AFB8,'size':24,'pad':0,'label':"__two_to_x",'name':"__two_to_x$982",'lib':12,'tu':333,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x8039AFB8,'size':24,'pad':0,'label':"__two_to_x",'name':"__two_to_x$982",'lib':12,'tu':333,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8039AFD0,'size':24,'pad':0,'label':"sAdsTable__8JASTrack",'name':"sAdsTable__8JASTrack",'lib':12,'tu':342,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8039AFE8,'size':24,'pad':0,'label':"sEnvOsc__8JASTrack",'name':"sEnvOsc__8JASTrack",'lib':12,'tu':342,'section':3,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8039B000,'size':24,'pad':0,'label':"sPitchEnvOsc__8JASTrack",'name':"sPitchEnvOsc__8JASTrack",'lib':12,'tu':342,'section':3,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -21972,9 +21972,9 @@ SYMBOLS = [ {'addr':0x8045067A,'size':4,'pad':0,'label':"pad_8045067A",'name':None,'lib':0,'tu':108,'section':6,'r':[0,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80450680,'size':8,'pad':0,'label':"data_80450680",'name':None,'lib':0,'tu':108,'section':6,'r':[0,2,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80450688,'size':8,'pad':0,'label':"data_80450688",'name':None,'lib':0,'tu':108,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80450690,'size':4,'pad':0,'label':"l_autoUpHeight",'name':"l_autoUpHeight",'lib':0,'tu':141,'section':6,'r':[20,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450694,'size':4,'pad':0,'label':"l_autoDownHeight",'name':"l_autoDownHeight",'lib':0,'tu':141,'section':6,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450698,'size':4,'pad':0,'label':"l_ladderAnmBaseTransY",'name':"l_ladderAnmBaseTransY",'lib':0,'tu':141,'section':6,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80450690,'size':4,'pad':0,'label':"l_autoUpHeight",'name':"l_autoUpHeight",'lib':0,'tu':141,'section':6,'r':[20,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450694,'size':4,'pad':0,'label':"l_autoDownHeight",'name':"l_autoDownHeight",'lib':0,'tu':141,'section':6,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450698,'size':4,'pad':0,'label':"l_ladderAnmBaseTransY",'name':"l_ladderAnmBaseTransY",'lib':0,'tu':141,'section':6,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045069C,'size':8,'pad':0,'label':"grassWhistleArcName",'name':"grassWhistleArcName$33096",'lib':0,'tu':141,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ReferenceArray"}, {'addr':0x804506A4,'size':4,'pad':0,'label':"nColor0",'name':"nColor0$42525",'lib':0,'tu':141,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804506A8,'size':4,'pad':4,'label':"m_timer_max__8daItem_c",'name':"m_timer_max__8daItem_c",'lib':0,'tu':147,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, @@ -22022,62 +22022,62 @@ SYMBOLS = [ {'addr':0x804507A0,'size':8,'pad':0,'label':"p_dl",'name':"p_dl",'lib':6,'tu':290,'section':6,'r':[3,0,0],'sh':[0,0,0],'type':"ReferenceArray"}, {'addr':0x804507A8,'size':4,'pad':0,'label':"data_804507A8",'name':None,'lib':12,'tu':362,'section':6,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804507AC,'size':4,'pad':0,'label':"sMixMode__9JASDriver",'name':"sMixMode__9JASDriver",'lib':12,'tu':362,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507B0,'size':4,'pad':0,'label':"sDacRate__9JASDriver",'name':"sDacRate__9JASDriver",'lib':12,'tu':362,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804507B0,'size':4,'pad':0,'label':"sDacRate__9JASDriver",'name':"sDacRate__9JASDriver",'lib':12,'tu':362,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804507B4,'size':4,'pad':0,'label':"sSubFrames__9JASDriver",'name':"sSubFrames__9JASDriver",'lib':12,'tu':362,'section':6,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804507B8,'size':4,'pad':4,'label':"one__11JASWaveInfo",'name':"one__11JASWaveInfo",'lib':12,'tu':366,'section':6,'r':[0,5,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804507C0,'size':2,'pad':2,'label':"MAX_MIXERLEVEL__9JASDriver",'name':"MAX_MIXERLEVEL__9JASDriver",'lib':12,'tu':367,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804507C4,'size':4,'pad':0,'label':"JAS_SYSTEM_OUTPUT_MODE__9JASDriver",'name':"JAS_SYSTEM_OUTPUT_MODE__9JASDriver",'lib':12,'tu':367,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804507C8,'size':2,'pad':6,'label':"DSP_MIXERLEVEL",'name':"DSP_MIXERLEVEL",'lib':12,'tu':369,'section':6,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804507D0,'size':4,'pad':4,'label':"lit_2588",'name':"@2588",'lib':12,'tu':395,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804507D8,'size':4,'pad':0,'label':"DISTANCE_MAX__7Z2Param",'name':"DISTANCE_MAX__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,4,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507DC,'size':4,'pad':0,'label':"MAX_VOLUME_DISTANCE__7Z2Param",'name':"MAX_VOLUME_DISTANCE__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507E0,'size':4,'pad':0,'label':"DOLBY_CENTER_VALUE__7Z2Param",'name':"DOLBY_CENTER_VALUE__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507E4,'size':4,'pad':0,'label':"DOLBY_FLONT_DISTANCE_MAX__7Z2Param",'name':"DOLBY_FLONT_DISTANCE_MAX__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507E8,'size':4,'pad':0,'label':"DOLBY_BEHIND_DISTANCE_MAX__7Z2Param",'name':"DOLBY_BEHIND_DISTANCE_MAX__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507EC,'size':4,'pad':0,'label':"DISTANCE_FX_PARAM__7Z2Param",'name':"DISTANCE_FX_PARAM__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507F0,'size':4,'pad':0,'label':"SONIC_SPEED__7Z2Param",'name':"SONIC_SPEED__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507F4,'size':4,'pad':0,'label':"VOL_BGM_DEFAULT__7Z2Param",'name':"VOL_BGM_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507F8,'size':4,'pad':0,'label':"VOL_SE_SYSTEM_DEFAULT__7Z2Param",'name':"VOL_SE_SYSTEM_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,2,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804507FC,'size':4,'pad':0,'label':"VOL_SE_LINK_VOICE_DEFAULT__7Z2Param",'name':"VOL_SE_LINK_VOICE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450800,'size':4,'pad':0,'label':"VOL_SE_LINK_MOTION_DEFAULT__7Z2Param",'name':"VOL_SE_LINK_MOTION_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450804,'size':4,'pad':0,'label':"VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param",'name':"VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450808,'size':4,'pad':0,'label':"VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param",'name':"VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045080C,'size':4,'pad':0,'label':"VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param",'name':"VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450810,'size':4,'pad':0,'label':"VOL_SE_OBJECT_DEFAULT__7Z2Param",'name':"VOL_SE_OBJECT_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450814,'size':4,'pad':0,'label':"VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param",'name':"VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450818,'size':4,'pad':0,'label':"VOL_BGM_TALKING__7Z2Param",'name':"VOL_BGM_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045081C,'size':4,'pad':0,'label':"VOL_SE_SYSTEM_TALKING__7Z2Param",'name':"VOL_SE_SYSTEM_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450820,'size':4,'pad':0,'label':"VOL_SE_LINK_VOICE_TALKING__7Z2Param",'name':"VOL_SE_LINK_VOICE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450824,'size':4,'pad':0,'label':"VOL_SE_LINK_MOTION_TALKING__7Z2Param",'name':"VOL_SE_LINK_MOTION_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450828,'size':4,'pad':0,'label':"VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param",'name':"VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045082C,'size':4,'pad':0,'label':"VOL_SE_CHAR_VOICE_TALKING__7Z2Param",'name':"VOL_SE_CHAR_VOICE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450830,'size':4,'pad':0,'label':"VOL_SE_CHAR_MOVE_TALKING__7Z2Param",'name':"VOL_SE_CHAR_MOVE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450834,'size':4,'pad':0,'label':"VOL_SE_OBJECT_TALKING__7Z2Param",'name':"VOL_SE_OBJECT_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450838,'size':4,'pad':0,'label':"VOL_SE_ATMOSPHERE_TALKING__7Z2Param",'name':"VOL_SE_ATMOSPHERE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045083C,'size':4,'pad':0,'label':"VOL_BGM_PAUSING__7Z2Param",'name':"VOL_BGM_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450840,'size':4,'pad':0,'label':"VOL_SE_SYSTEM_PAUSING__7Z2Param",'name':"VOL_SE_SYSTEM_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450844,'size':4,'pad':0,'label':"VOL_SE_LINK_VOICE_PAUSING__7Z2Param",'name':"VOL_SE_LINK_VOICE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450848,'size':4,'pad':0,'label':"VOL_SE_LINK_MOTION_PAUSING__7Z2Param",'name':"VOL_SE_LINK_MOTION_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045084C,'size':4,'pad':0,'label':"VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param",'name':"VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450850,'size':4,'pad':0,'label':"VOL_SE_CHAR_VOICE_PAUSING__7Z2Param",'name':"VOL_SE_CHAR_VOICE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450854,'size':4,'pad':0,'label':"VOL_SE_CHAR_MOVE_PAUSING__7Z2Param",'name':"VOL_SE_CHAR_MOVE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450858,'size':4,'pad':0,'label':"VOL_SE_OBJECT_PAUSING__7Z2Param",'name':"VOL_SE_OBJECT_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045085C,'size':4,'pad':0,'label':"VOL_SE_ATMOSPHERE_PAUSING__7Z2Param",'name':"VOL_SE_ATMOSPHERE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804507D8,'size':4,'pad':0,'label':"DISTANCE_MAX__7Z2Param",'name':"DISTANCE_MAX__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,4,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507DC,'size':4,'pad':0,'label':"MAX_VOLUME_DISTANCE__7Z2Param",'name':"MAX_VOLUME_DISTANCE__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507E0,'size':4,'pad':0,'label':"DOLBY_CENTER_VALUE__7Z2Param",'name':"DOLBY_CENTER_VALUE__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507E4,'size':4,'pad':0,'label':"DOLBY_FLONT_DISTANCE_MAX__7Z2Param",'name':"DOLBY_FLONT_DISTANCE_MAX__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507E8,'size':4,'pad':0,'label':"DOLBY_BEHIND_DISTANCE_MAX__7Z2Param",'name':"DOLBY_BEHIND_DISTANCE_MAX__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507EC,'size':4,'pad':0,'label':"DISTANCE_FX_PARAM__7Z2Param",'name':"DISTANCE_FX_PARAM__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507F0,'size':4,'pad':0,'label':"SONIC_SPEED__7Z2Param",'name':"SONIC_SPEED__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507F4,'size':4,'pad':0,'label':"VOL_BGM_DEFAULT__7Z2Param",'name':"VOL_BGM_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507F8,'size':4,'pad':0,'label':"VOL_SE_SYSTEM_DEFAULT__7Z2Param",'name':"VOL_SE_SYSTEM_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,2,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804507FC,'size':4,'pad':0,'label':"VOL_SE_LINK_VOICE_DEFAULT__7Z2Param",'name':"VOL_SE_LINK_VOICE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450800,'size':4,'pad':0,'label':"VOL_SE_LINK_MOTION_DEFAULT__7Z2Param",'name':"VOL_SE_LINK_MOTION_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450804,'size':4,'pad':0,'label':"VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param",'name':"VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450808,'size':4,'pad':0,'label':"VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param",'name':"VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045080C,'size':4,'pad':0,'label':"VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param",'name':"VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450810,'size':4,'pad':0,'label':"VOL_SE_OBJECT_DEFAULT__7Z2Param",'name':"VOL_SE_OBJECT_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450814,'size':4,'pad':0,'label':"VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param",'name':"VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450818,'size':4,'pad':0,'label':"VOL_BGM_TALKING__7Z2Param",'name':"VOL_BGM_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045081C,'size':4,'pad':0,'label':"VOL_SE_SYSTEM_TALKING__7Z2Param",'name':"VOL_SE_SYSTEM_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450820,'size':4,'pad':0,'label':"VOL_SE_LINK_VOICE_TALKING__7Z2Param",'name':"VOL_SE_LINK_VOICE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450824,'size':4,'pad':0,'label':"VOL_SE_LINK_MOTION_TALKING__7Z2Param",'name':"VOL_SE_LINK_MOTION_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450828,'size':4,'pad':0,'label':"VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param",'name':"VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045082C,'size':4,'pad':0,'label':"VOL_SE_CHAR_VOICE_TALKING__7Z2Param",'name':"VOL_SE_CHAR_VOICE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450830,'size':4,'pad':0,'label':"VOL_SE_CHAR_MOVE_TALKING__7Z2Param",'name':"VOL_SE_CHAR_MOVE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450834,'size':4,'pad':0,'label':"VOL_SE_OBJECT_TALKING__7Z2Param",'name':"VOL_SE_OBJECT_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450838,'size':4,'pad':0,'label':"VOL_SE_ATMOSPHERE_TALKING__7Z2Param",'name':"VOL_SE_ATMOSPHERE_TALKING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045083C,'size':4,'pad':0,'label':"VOL_BGM_PAUSING__7Z2Param",'name':"VOL_BGM_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450840,'size':4,'pad':0,'label':"VOL_SE_SYSTEM_PAUSING__7Z2Param",'name':"VOL_SE_SYSTEM_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450844,'size':4,'pad':0,'label':"VOL_SE_LINK_VOICE_PAUSING__7Z2Param",'name':"VOL_SE_LINK_VOICE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450848,'size':4,'pad':0,'label':"VOL_SE_LINK_MOTION_PAUSING__7Z2Param",'name':"VOL_SE_LINK_MOTION_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045084C,'size':4,'pad':0,'label':"VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param",'name':"VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450850,'size':4,'pad':0,'label':"VOL_SE_CHAR_VOICE_PAUSING__7Z2Param",'name':"VOL_SE_CHAR_VOICE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450854,'size':4,'pad':0,'label':"VOL_SE_CHAR_MOVE_PAUSING__7Z2Param",'name':"VOL_SE_CHAR_MOVE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450858,'size':4,'pad':0,'label':"VOL_SE_OBJECT_PAUSING__7Z2Param",'name':"VOL_SE_OBJECT_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045085C,'size':4,'pad':0,'label':"VOL_SE_ATMOSPHERE_PAUSING__7Z2Param",'name':"VOL_SE_ATMOSPHERE_PAUSING__7Z2Param",'lib':14,'tu':407,'section':6,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80450860,'size':4,'pad':0,'label':"struct_80450860",'name':None,'lib':14,'tu':407,'section':6,'r':[0,15,0],'sh':[0,0,0],'type':"Structure"}, {'addr':0x80450864,'size':4,'pad':0,'label':"struct_80450864",'name':None,'lib':14,'tu':407,'section':6,'r':[0,2,0],'sh':[0,0,0],'type':"Structure"}, {'addr':0x80450868,'size':4,'pad':0,'label':"struct_80450868",'name':None,'lib':14,'tu':407,'section':6,'r':[0,5,0],'sh':[0,0,0],'type':"Structure"}, {'addr':0x8045086C,'size':4,'pad':0,'label':"data_8045086C",'name':None,'lib':14,'tu':407,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450870,'size':4,'pad':0,'label':"sDeathMtBottom",'name':"sDeathMtBottom",'lib':14,'tu':412,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450874,'size':4,'pad':0,'label':"sDeathMtTop",'name':"sDeathMtTop",'lib':14,'tu':412,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80450870,'size':4,'pad':0,'label':"sDeathMtBottom",'name':"sDeathMtBottom",'lib':14,'tu':412,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450874,'size':4,'pad':0,'label':"sDeathMtTop",'name':"sDeathMtTop",'lib':14,'tu':412,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80450878,'size':4,'pad':4,'label':"sUnderWaterDepthMax",'name':"sUnderWaterDepthMax",'lib':14,'tu':412,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80450880,'size':4,'pad':0,'label':"cPitchDown",'name':"cPitchDown",'lib':14,'tu':423,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80450884,'size':4,'pad':0,'label':"cPitchCenter",'name':"cPitchCenter",'lib':14,'tu':423,'section':6,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80450888,'size':4,'pad':0,'label':"cPitchUp",'name':"cPitchUp",'lib':14,'tu':423,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x8045088C,'size':4,'pad':0,'label':"struct_8045088C",'name':None,'lib':14,'tu':423,'section':6,'r':[4,0,0],'sh':[0,0,0],'type':"Structure"}, - {'addr':0x80450890,'size':4,'pad':0,'label':"cR_FlatWidth",'name':"cR_FlatWidth",'lib':14,'tu':423,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80450890,'size':4,'pad':0,'label':"cR_FlatWidth",'name':"cR_FlatWidth",'lib':14,'tu':423,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80450894,'size':4,'pad':0,'label':"struct_80450894",'name':None,'lib':14,'tu':423,'section':6,'r':[3,0,0],'sh':[0,0,0],'type':"Structure"}, - {'addr':0x80450898,'size':4,'pad':0,'label':"sStickHigh",'name':"sStickHigh",'lib':14,'tu':423,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045089C,'size':4,'pad':0,'label':"sStickCenter",'name':"sStickCenter",'lib':14,'tu':423,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80450898,'size':4,'pad':0,'label':"sStickHigh",'name':"sStickHigh",'lib':14,'tu':423,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045089C,'size':4,'pad':0,'label':"sStickCenter",'name':"sStickCenter",'lib':14,'tu':423,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804508A0,'size':8,'pad':0,'label':"sHowlTobikusa",'name':"sHowlTobikusa",'lib':14,'tu':423,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804508A8,'size':4,'pad':4,'label':"cm2hw",'name':"cm2hw$539",'lib':15,'tu':426,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804508B0,'size':8,'pad':0,'label':"data_804508B0",'name':None,'lib':15,'tu':426,'section':6,'r':[0,2,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -22089,14 +22089,14 @@ SYMBOLS = [ {'addr':0x804508D4,'size':4,'pad':0,'label':"sSZSBufferSize__16JKRDvdAramRipper",'name':"sSZSBufferSize__16JKRDvdAramRipper",'lib':16,'tu':453,'section':6,'r':[1,1,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804508D8,'size':4,'pad':0,'label':"sStickMode__10JUTGamePad",'name':"sStickMode__10JUTGamePad",'lib':19,'tu':471,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804508DC,'size':4,'pad':0,'label':"sClampMode__10JUTGamePad",'name':"sClampMode__10JUTGamePad",'lib':19,'tu':471,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804508E0,'size':4,'pad':0,'label':"sPressPoint__Q210JUTGamePad6CStick",'name':"sPressPoint__Q210JUTGamePad6CStick",'lib':19,'tu':471,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804508E4,'size':4,'pad':0,'label':"sReleasePoint__Q210JUTGamePad6CStick",'name':"sReleasePoint__Q210JUTGamePad6CStick",'lib':19,'tu':471,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804508E0,'size':4,'pad':0,'label':"sPressPoint__Q210JUTGamePad6CStick",'name':"sPressPoint__Q210JUTGamePad6CStick",'lib':19,'tu':471,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804508E4,'size':4,'pad':0,'label':"sReleasePoint__Q210JUTGamePad6CStick",'name':"sReleasePoint__Q210JUTGamePad6CStick",'lib':19,'tu':471,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804508E8,'size':4,'pad':0,'label':"sResetPattern__Q210JUTGamePad13C3ButtonReset",'name':"sResetPattern__Q210JUTGamePad13C3ButtonReset",'lib':19,'tu':471,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804508EC,'size':4,'pad':0,'label':"sResetMaskPattern__Q210JUTGamePad13C3ButtonReset",'name':"sResetMaskPattern__Q210JUTGamePad13C3ButtonReset",'lib':19,'tu':471,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804508F0,'size':4,'pad':4,'label':"sMessageBuffer__12JUTException",'name':"sMessageBuffer__12JUTException",'lib':19,'tu':472,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804508F8,'size':8,'pad':0,'label':"data_804508F8",'name':None,'lib':19,'tu':472,'section':6,'r':[0,3,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80450900,'size':4,'pad':0,'label':"oneFrameRate",'name':"oneFrameRate",'lib':19,'tu':478,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80450904,'size':4,'pad':0,'label':"oneFrameRateUser",'name':"oneFrameRateUser",'lib':19,'tu':478,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80450900,'size':4,'pad':0,'label':"oneFrameRate",'name':"oneFrameRate",'lib':19,'tu':478,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80450904,'size':4,'pad':0,'label':"oneFrameRateUser",'name':"oneFrameRateUser",'lib':19,'tu':478,'section':6,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80450908,'size':4,'pad':0,'label':"cm2hw",'name':"cm2hw$552",'lib':21,'tu':500,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045090C,'size':8,'pad':0,'label':"J3DGDTexMode0Ids",'name':"J3DGDTexMode0Ids",'lib':21,'tu':500,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80450914,'size':8,'pad':0,'label':"J3DGDTexMode1Ids",'name':"J3DGDTexMode1Ids",'lib':21,'tu':500,'section':6,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -22975,167 +22975,167 @@ SYMBOLS = [ {'addr':0x804519DC,'size':4,'pad':0,'label':"RecvDataLeng",'name':"RecvDataLeng",'lib':43,'tu':703,'section':7,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804519E0,'size':4,'pad':0,'label':"pEXIInputFlag",'name':"pEXIInputFlag",'lib':43,'tu':703,'section':7,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804519E4,'size':4,'pad':0,'label':"data_804519E4",'name':None,'lib':43,'tu':703,'section':7,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451A00,'size':4,'pad':0,'label':"lit_3884",'name':"@3884",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A04,'size':4,'pad':0,'label':"lit_3885",'name':"@3885",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451A00,'size':4,'pad':0,'label':"lit_3884",'name':"@3884",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A04,'size':4,'pad':0,'label':"lit_3885",'name':"@3885",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451A08,'size':4,'pad':0,'label':"lit_3886",'name':"@3886",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451A0C,'size':4,'pad':0,'label':"lit_3887",'name':"@3887",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451A0C,'size':4,'pad':0,'label':"lit_3887",'name':"@3887",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451A10,'size':4,'pad':4,'label':"lit_3888",'name':"@3888",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451A18,'size':8,'pad':0,'label':"lit_3890",'name':"@3890",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451A20,'size':4,'pad':0,'label':"lit_3709",'name':"@3709",'lib':0,'tu':5,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A24,'size':4,'pad':0,'label':"lit_3710",'name':"@3710",'lib':0,'tu':5,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451A18,'size':8,'pad':0,'label':"lit_3890",'name':"@3890",'lib':0,'tu':2,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A20,'size':4,'pad':0,'label':"lit_3709",'name':"@3709",'lib':0,'tu':5,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A24,'size':4,'pad':0,'label':"lit_3710",'name':"@3710",'lib':0,'tu':5,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451A28,'size':4,'pad':4,'label':"lit_3711",'name':"@3711",'lib':0,'tu':5,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451A30,'size':8,'pad':0,'label':"lit_3713",'name':"@3713",'lib':0,'tu':5,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451A30,'size':8,'pad':0,'label':"lit_3713",'name':"@3713",'lib':0,'tu':5,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451A38,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':0,'tu':6,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451A3C,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':0,'tu':6,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A40,'size':4,'pad':0,'label':"lit_4105",'name':"@4105",'lib':0,'tu':6,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A44,'size':4,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A48,'size':4,'pad':0,'label':"lit_4422",'name':"@4422",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A4C,'size':4,'pad':0,'label':"lit_4423",'name':"@4423",'lib':0,'tu':6,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A50,'size':4,'pad':0,'label':"lit_4424",'name':"@4424",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A54,'size':4,'pad':0,'label':"lit_4425",'name':"@4425",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A58,'size':8,'pad':0,'label':"lit_4426",'name':"@4426",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451A60,'size':8,'pad':0,'label':"lit_4427",'name':"@4427",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451A3C,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':0,'tu':6,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A40,'size':4,'pad':0,'label':"lit_4105",'name':"@4105",'lib':0,'tu':6,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A44,'size':4,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A48,'size':4,'pad':0,'label':"lit_4422",'name':"@4422",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A4C,'size':4,'pad':0,'label':"lit_4423",'name':"@4423",'lib':0,'tu':6,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A50,'size':4,'pad':0,'label':"lit_4424",'name':"@4424",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A54,'size':4,'pad':0,'label':"lit_4425",'name':"@4425",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A58,'size':8,'pad':0,'label':"lit_4426",'name':"@4426",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A60,'size':8,'pad':0,'label':"lit_4427",'name':"@4427",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451A68,'size':8,'pad':0,'label':"lit_4428",'name':"@4428",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451A70,'size':4,'pad':0,'label':"lit_4429",'name':"@4429",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A74,'size':4,'pad':0,'label':"lit_4430",'name':"@4430",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A78,'size':4,'pad':0,'label':"lit_4431",'name':"@4431",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A7C,'size':4,'pad':0,'label':"lit_4432",'name':"@4432",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A80,'size':4,'pad':0,'label':"lit_4433",'name':"@4433",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A84,'size':4,'pad':0,'label':"lit_4434",'name':"@4434",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A88,'size':4,'pad':0,'label':"lit_4435",'name':"@4435",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A8C,'size':4,'pad':0,'label':"lit_4436",'name':"@4436",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A90,'size':4,'pad':0,'label':"lit_4437",'name':"@4437",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A94,'size':4,'pad':0,'label':"lit_4438",'name':"@4438",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A98,'size':4,'pad':0,'label':"lit_4439",'name':"@4439",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451A9C,'size':4,'pad':0,'label':"lit_4440",'name':"@4440",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AA0,'size':4,'pad':0,'label':"lit_4441",'name':"@4441",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AA4,'size':4,'pad':0,'label':"lit_4442",'name':"@4442",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AA8,'size':4,'pad':0,'label':"lit_4480",'name':"@4480",'lib':0,'tu':6,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AAC,'size':4,'pad':0,'label':"lit_4481",'name':"@4481",'lib':0,'tu':6,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451A70,'size':4,'pad':0,'label':"lit_4429",'name':"@4429",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A74,'size':4,'pad':0,'label':"lit_4430",'name':"@4430",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A78,'size':4,'pad':0,'label':"lit_4431",'name':"@4431",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A7C,'size':4,'pad':0,'label':"lit_4432",'name':"@4432",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A80,'size':4,'pad':0,'label':"lit_4433",'name':"@4433",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A84,'size':4,'pad':0,'label':"lit_4434",'name':"@4434",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A88,'size':4,'pad':0,'label':"lit_4435",'name':"@4435",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A8C,'size':4,'pad':0,'label':"lit_4436",'name':"@4436",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A90,'size':4,'pad':0,'label':"lit_4437",'name':"@4437",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A94,'size':4,'pad':0,'label':"lit_4438",'name':"@4438",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A98,'size':4,'pad':0,'label':"lit_4439",'name':"@4439",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451A9C,'size':4,'pad':0,'label':"lit_4440",'name':"@4440",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AA0,'size':4,'pad':0,'label':"lit_4441",'name':"@4441",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AA4,'size':4,'pad':0,'label':"lit_4442",'name':"@4442",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AA8,'size':4,'pad':0,'label':"lit_4480",'name':"@4480",'lib':0,'tu':6,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AAC,'size':4,'pad':0,'label':"lit_4481",'name':"@4481",'lib':0,'tu':6,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451AB0,'size':4,'pad':0,'label':"lit_4505",'name':"@4505",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451AB4,'size':4,'pad':0,'label':"lit_4528",'name':"@4528",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451AB8,'size':4,'pad':0,'label':"data_80451AB8",'name':None,'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451ABC,'size':4,'pad':0,'label':"lit_4592",'name':"@4592",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451ABC,'size':4,'pad':0,'label':"lit_4592",'name':"@4592",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451AC0,'size':4,'pad':4,'label':"lit_4593",'name':"@4593",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451AC8,'size':8,'pad':0,'label':"lit_4595",'name':"@4595",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451AD0,'size':4,'pad':0,'label':"lit_4641",'name':"@4641",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AD4,'size':4,'pad':0,'label':"lit_4642",'name':"@4642",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AD8,'size':4,'pad':0,'label':"lit_5023",'name':"@5023",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451ADC,'size':4,'pad':0,'label':"lit_5024",'name':"@5024",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AE0,'size':4,'pad':0,'label':"lit_5025",'name':"@5025",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AE4,'size':4,'pad':0,'label':"lit_5026",'name':"@5026",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AE8,'size':4,'pad':0,'label':"lit_5027",'name':"@5027",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AEC,'size':4,'pad':0,'label':"lit_5028",'name':"@5028",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AF0,'size':4,'pad':0,'label':"lit_5029",'name':"@5029",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451AF4,'size':4,'pad':0,'label':"lit_5030",'name':"@5030",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451AC8,'size':8,'pad':0,'label':"lit_4595",'name':"@4595",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AD0,'size':4,'pad':0,'label':"lit_4641",'name':"@4641",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AD4,'size':4,'pad':0,'label':"lit_4642",'name':"@4642",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AD8,'size':4,'pad':0,'label':"lit_5023",'name':"@5023",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451ADC,'size':4,'pad':0,'label':"lit_5024",'name':"@5024",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AE0,'size':4,'pad':0,'label':"lit_5025",'name':"@5025",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AE4,'size':4,'pad':0,'label':"lit_5026",'name':"@5026",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AE8,'size':4,'pad':0,'label':"lit_5027",'name':"@5027",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AEC,'size':4,'pad':0,'label':"lit_5028",'name':"@5028",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AF0,'size':4,'pad':0,'label':"lit_5029",'name':"@5029",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451AF4,'size':4,'pad':0,'label':"lit_5030",'name':"@5030",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451AF8,'size':4,'pad':4,'label':"lit_5031",'name':"@5031",'lib':0,'tu':6,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451B00,'size':4,'pad':0,'label':"lit_3940",'name':"@3940",'lib':0,'tu':7,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B04,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':0,'tu':7,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B08,'size':4,'pad':0,'label':"lit_3676",'name':"@3676",'lib':0,'tu':8,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451B00,'size':4,'pad':0,'label':"lit_3940",'name':"@3940",'lib':0,'tu':7,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B04,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':0,'tu':7,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B08,'size':4,'pad':0,'label':"lit_3676",'name':"@3676",'lib':0,'tu':8,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451B0C,'size':4,'pad':0,'label':"lit_3677",'name':"@3677",'lib':0,'tu':8,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451B10,'size':4,'pad':4,'label':"lit_3840",'name':"@3840",'lib':0,'tu':8,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451B18,'size':4,'pad':0,'label':"lit_3847",'name':"@3847",'lib':0,'tu':9,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451B18,'size':4,'pad':0,'label':"lit_3847",'name':"@3847",'lib':0,'tu':9,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451B1C,'size':4,'pad':0,'label':"lit_3876",'name':"@3876",'lib':0,'tu':9,'section':8,'r':[22,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451B20,'size':8,'pad':0,'label':"lit_3878",'name':"@3878",'lib':0,'tu':9,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451B28,'size':4,'pad':0,'label':"lit_5939",'name':"@5939",'lib':0,'tu':9,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B2C,'size':4,'pad':0,'label':"lit_6819",'name':"@6819",'lib':0,'tu':9,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451B20,'size':8,'pad':0,'label':"lit_3878",'name':"@3878",'lib':0,'tu':9,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B28,'size':4,'pad':0,'label':"lit_5939",'name':"@5939",'lib':0,'tu':9,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B2C,'size':4,'pad':0,'label':"lit_6819",'name':"@6819",'lib':0,'tu':9,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451B30,'size':4,'pad':4,'label':"lit_7404",'name':"@7404",'lib':0,'tu':9,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451B38,'size':8,'pad':0,'label':"lit_7406",'name':"@7406",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451B40,'size':4,'pad':0,'label':"lit_7624",'name':"@7624",'lib':0,'tu':9,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B44,'size':4,'pad':0,'label':"lit_7625",'name':"@7625",'lib':0,'tu':9,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B48,'size':8,'pad':0,'label':"lit_7919",'name':"@7919",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451B50,'size':8,'pad':0,'label':"lit_7920",'name':"@7920",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451B38,'size':8,'pad':0,'label':"lit_7406",'name':"@7406",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B40,'size':4,'pad':0,'label':"lit_7624",'name':"@7624",'lib':0,'tu':9,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B44,'size':4,'pad':0,'label':"lit_7625",'name':"@7625",'lib':0,'tu':9,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B48,'size':8,'pad':0,'label':"lit_7919",'name':"@7919",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B50,'size':8,'pad':0,'label':"lit_7920",'name':"@7920",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451B58,'size':8,'pad':0,'label':"lit_7921",'name':"@7921",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451B60,'size':4,'pad':0,'label':"lit_7922",'name':"@7922",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B64,'size':4,'pad':0,'label':"lit_7923",'name':"@7923",'lib':0,'tu':9,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451B60,'size':4,'pad':0,'label':"lit_7922",'name':"@7922",'lib':0,'tu':9,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B64,'size':4,'pad':0,'label':"lit_7923",'name':"@7923",'lib':0,'tu':9,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451B68,'size':4,'pad':4,'label':"lit_7924",'name':"@7924",'lib':0,'tu':9,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451B70,'size':4,'pad':0,'label':"lit_3634",'name':"@3634",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B74,'size':4,'pad':0,'label':"lit_3635",'name':"@3635",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B78,'size':8,'pad':0,'label':"lit_3638",'name':"@3638",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451B80,'size':4,'pad':0,'label':"lit_3739",'name':"@3739",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451B70,'size':4,'pad':0,'label':"lit_3634",'name':"@3634",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B74,'size':4,'pad':0,'label':"lit_3635",'name':"@3635",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B78,'size':8,'pad':0,'label':"lit_3638",'name':"@3638",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B80,'size':4,'pad':0,'label':"lit_3739",'name':"@3739",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451B84,'size':4,'pad':0,'label':"lit_3784",'name':"@3784",'lib':0,'tu':10,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451B88,'size':4,'pad':0,'label':"lit_3785",'name':"@3785",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B8C,'size':4,'pad':0,'label':"lit_3786",'name':"@3786",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B90,'size':4,'pad':0,'label':"lit_3787",'name':"@3787",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B94,'size':4,'pad':0,'label':"lit_3788",'name':"@3788",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B98,'size':4,'pad':0,'label':"lit_3789",'name':"@3789",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451B9C,'size':4,'pad':0,'label':"lit_3790",'name':"@3790",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451B88,'size':4,'pad':0,'label':"lit_3785",'name':"@3785",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B8C,'size':4,'pad':0,'label':"lit_3786",'name':"@3786",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B90,'size':4,'pad':0,'label':"lit_3787",'name':"@3787",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B94,'size':4,'pad':0,'label':"lit_3788",'name':"@3788",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B98,'size':4,'pad':0,'label':"lit_3789",'name':"@3789",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451B9C,'size':4,'pad':0,'label':"lit_3790",'name':"@3790",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451BA0,'size':4,'pad':4,'label':"lit_3791",'name':"@3791",'lib':0,'tu':10,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451BA8,'size':4,'pad':0,'label':"lit_3731",'name':"@3731",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451BA8,'size':4,'pad':0,'label':"lit_3731",'name':"@3731",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451BAC,'size':4,'pad':0,'label':"lit_3732",'name':"@3732",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451BB0,'size':4,'pad':0,'label':"lit_3733",'name':"@3733",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451BB4,'size':4,'pad':0,'label':"lit_3734",'name':"@3734",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451BB8,'size':8,'pad':0,'label':"lit_3736",'name':"@3736",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451BC0,'size':4,'pad':0,'label':"lit_3689",'name':"@3689",'lib':0,'tu':19,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451BC4,'size':4,'pad':0,'label':"lit_3690",'name':"@3690",'lib':0,'tu':19,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451BC8,'size':4,'pad':0,'label':"lit_4324",'name':"@4324",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451BCC,'size':4,'pad':0,'label':"lit_4325",'name':"@4325",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451BD0,'size':4,'pad':0,'label':"lit_4431",'name':"@4431",'lib':0,'tu':20,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451BD4,'size':4,'pad':0,'label':"lit_4432",'name':"@4432",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451BD8,'size':8,'pad':0,'label':"lit_4434",'name':"@4434",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451BB0,'size':4,'pad':0,'label':"lit_3733",'name':"@3733",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BB4,'size':4,'pad':0,'label':"lit_3734",'name':"@3734",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BB8,'size':8,'pad':0,'label':"lit_3736",'name':"@3736",'lib':0,'tu':17,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BC0,'size':4,'pad':0,'label':"lit_3689",'name':"@3689",'lib':0,'tu':19,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BC4,'size':4,'pad':0,'label':"lit_3690",'name':"@3690",'lib':0,'tu':19,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BC8,'size':4,'pad':0,'label':"lit_4324",'name':"@4324",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BCC,'size':4,'pad':0,'label':"lit_4325",'name':"@4325",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BD0,'size':4,'pad':0,'label':"lit_4431",'name':"@4431",'lib':0,'tu':20,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BD4,'size':4,'pad':0,'label':"lit_4432",'name':"@4432",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451BD8,'size':8,'pad':0,'label':"lit_4434",'name':"@4434",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451BE0,'size':4,'pad':4,'label':"lit_4505",'name':"@4505",'lib':0,'tu':20,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451BE8,'size':8,'pad':0,'label':"lit_4507",'name':"@4507",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451BE8,'size':8,'pad':0,'label':"lit_4507",'name':"@4507",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451BF0,'size':4,'pad':0,'label':"lit_4555",'name':"@4555",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451BF4,'size':4,'pad':0,'label':"lit_4556",'name':"@4556",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451BF4,'size':4,'pad':0,'label':"lit_4556",'name':"@4556",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451BF8,'size':4,'pad':4,'label':"lit_4557",'name':"@4557",'lib':0,'tu':20,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451C00,'size':4,'pad':0,'label':"lit_4263",'name':"@4263",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451C00,'size':4,'pad':0,'label':"lit_4263",'name':"@4263",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451C04,'size':4,'pad':0,'label':"lit_4645",'name':"@4645",'lib':0,'tu':23,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451C08,'size':8,'pad':0,'label':"lit_4745",'name':"@4745",'lib':0,'tu':23,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451C10,'size':8,'pad':0,'label':"lit_4746",'name':"@4746",'lib':0,'tu':23,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451C08,'size':8,'pad':0,'label':"lit_4745",'name':"@4745",'lib':0,'tu':23,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C10,'size':8,'pad':0,'label':"lit_4746",'name':"@4746",'lib':0,'tu':23,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451C18,'size':8,'pad':0,'label':"lit_4747",'name':"@4747",'lib':0,'tu':23,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451C20,'size':4,'pad':0,'label':"lit_4922",'name':"@4922",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C24,'size':4,'pad':0,'label':"lit_4923",'name':"@4923",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C28,'size':4,'pad':0,'label':"lit_5584",'name':"@5584",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C2C,'size':4,'pad':0,'label':"lit_5711",'name':"@5711",'lib':0,'tu':23,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C30,'size':4,'pad':0,'label':"lit_5808",'name':"@5808",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C34,'size':4,'pad':0,'label':"lit_5809",'name':"@5809",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C38,'size':4,'pad':0,'label':"lit_5810",'name':"@5810",'lib':0,'tu':23,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C3C,'size':4,'pad':0,'label':"lit_5811",'name':"@5811",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C40,'size':4,'pad':0,'label':"lit_5812",'name':"@5812",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C44,'size':4,'pad':0,'label':"lit_5845",'name':"@5845",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C48,'size':4,'pad':0,'label':"lit_6035",'name':"@6035",'lib':0,'tu':23,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C4C,'size':4,'pad':0,'label':"lit_6068",'name':"@6068",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451C20,'size':4,'pad':0,'label':"lit_4922",'name':"@4922",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C24,'size':4,'pad':0,'label':"lit_4923",'name':"@4923",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C28,'size':4,'pad':0,'label':"lit_5584",'name':"@5584",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C2C,'size':4,'pad':0,'label':"lit_5711",'name':"@5711",'lib':0,'tu':23,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C30,'size':4,'pad':0,'label':"lit_5808",'name':"@5808",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C34,'size':4,'pad':0,'label':"lit_5809",'name':"@5809",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C38,'size':4,'pad':0,'label':"lit_5810",'name':"@5810",'lib':0,'tu':23,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C3C,'size':4,'pad':0,'label':"lit_5811",'name':"@5811",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C40,'size':4,'pad':0,'label':"lit_5812",'name':"@5812",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C44,'size':4,'pad':0,'label':"lit_5845",'name':"@5845",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C48,'size':4,'pad':0,'label':"lit_6035",'name':"@6035",'lib':0,'tu':23,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C4C,'size':4,'pad':0,'label':"lit_6068",'name':"@6068",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451C50,'size':4,'pad':0,'label':"hamon_name",'name':"hamon_name$6107",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451C54,'size':4,'pad':0,'label':"lit_6174",'name':"@6174",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C58,'size':4,'pad':0,'label':"lit_6353",'name':"@6353",'lib':0,'tu':23,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C5C,'size':4,'pad':0,'label':"lit_6517",'name':"@6517",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451C54,'size':4,'pad':0,'label':"lit_6174",'name':"@6174",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C58,'size':4,'pad':0,'label':"lit_6353",'name':"@6353",'lib':0,'tu':23,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C5C,'size':4,'pad':0,'label':"lit_6517",'name':"@6517",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451C60,'size':4,'pad':4,'label':"lit_6538",'name':"@6538",'lib':0,'tu':23,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451C68,'size':4,'pad':4,'label':"lit_3713",'name':"@3713",'lib':0,'tu':37,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451C70,'size':4,'pad':0,'label':"lit_3902",'name':"@3902",'lib':0,'tu':38,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451C74,'size':4,'pad':0,'label':"lit_4167",'name':"@4167",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C78,'size':4,'pad':0,'label':"lit_4298",'name':"@4298",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C7C,'size':4,'pad':0,'label':"lit_4299",'name':"@4299",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C80,'size':4,'pad':0,'label':"lit_4300",'name':"@4300",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C84,'size':4,'pad':0,'label':"lit_4301",'name':"@4301",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C88,'size':8,'pad':0,'label':"lit_4303",'name':"@4303",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451C74,'size':4,'pad':0,'label':"lit_4167",'name':"@4167",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C78,'size':4,'pad':0,'label':"lit_4298",'name':"@4298",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C7C,'size':4,'pad':0,'label':"lit_4299",'name':"@4299",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C80,'size':4,'pad':0,'label':"lit_4300",'name':"@4300",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C84,'size':4,'pad':0,'label':"lit_4301",'name':"@4301",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C88,'size':8,'pad':0,'label':"lit_4303",'name':"@4303",'lib':0,'tu':38,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451C90,'size':4,'pad':0,'label':"lit_4270",'name':"@4270",'lib':0,'tu':72,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451C94,'size':4,'pad':0,'label':"lit_5315",'name':"@5315",'lib':0,'tu':72,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451C98,'size':8,'pad':0,'label':"lit_5317",'name':"@5317",'lib':0,'tu':72,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451CA0,'size':4,'pad':0,'label':"lit_3745",'name':"@3745",'lib':0,'tu':73,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451CA4,'size':4,'pad':0,'label':"lit_3746",'name':"@3746",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451C94,'size':4,'pad':0,'label':"lit_5315",'name':"@5315",'lib':0,'tu':72,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451C98,'size':8,'pad':0,'label':"lit_5317",'name':"@5317",'lib':0,'tu':72,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451CA0,'size':4,'pad':0,'label':"lit_3745",'name':"@3745",'lib':0,'tu':73,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451CA4,'size':4,'pad':0,'label':"lit_3746",'name':"@3746",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451CA8,'size':4,'pad':4,'label':"lit_3747",'name':"@3747",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451CB0,'size':8,'pad':0,'label':"lit_3749",'name':"@3749",'lib':0,'tu':73,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451CB8,'size':8,'pad':0,'label':"lit_3751",'name':"@3751",'lib':0,'tu':73,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451CB0,'size':8,'pad':0,'label':"lit_3749",'name':"@3749",'lib':0,'tu':73,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451CB8,'size':8,'pad':0,'label':"lit_3751",'name':"@3751",'lib':0,'tu':73,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451CC0,'size':5,'pad':3,'label':"l_lineWidthPatOff",'name':"l_lineWidthPatOff$3899",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451CC8,'size':5,'pad':3,'label':"l_lineWidthPatOn",'name':"l_lineWidthPatOn$3900",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451CD0,'size':5,'pad':3,'label':"l_lineWidthPatStay",'name':"l_lineWidthPatStay$3901",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451CD8,'size':4,'pad':0,'label':"borderColor0",'name':"borderColor0$3975",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451CDC,'size':4,'pad':0,'label':"borderColor1",'name':"borderColor1$3976",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451CE0,'size':4,'pad':0,'label':"lit_4284",'name':"@4284",'lib':0,'tu':73,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451CE0,'size':4,'pad':0,'label':"lit_4284",'name':"@4284",'lib':0,'tu':73,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451CE4,'size':4,'pad':0,'label':"lit_4321",'name':"@4321",'lib':0,'tu':73,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451CE8,'size':4,'pad':0,'label':"lit_4503",'name':"@4503",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451CEC,'size':4,'pad':0,'label':"lit_4688",'name':"@4688",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451CF0,'size':4,'pad':0,'label':"lit_4689",'name':"@4689",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451CF4,'size':4,'pad':0,'label':"lit_4690",'name':"@4690",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451CF8,'size':4,'pad':0,'label':"lit_4691",'name':"@4691",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451CFC,'size':4,'pad':0,'label':"lit_4692",'name':"@4692",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D00,'size':4,'pad':0,'label':"lit_5090",'name':"@5090",'lib':0,'tu':74,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451CE8,'size':4,'pad':0,'label':"lit_4503",'name':"@4503",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451CEC,'size':4,'pad':0,'label':"lit_4688",'name':"@4688",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451CF0,'size':4,'pad':0,'label':"lit_4689",'name':"@4689",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451CF4,'size':4,'pad':0,'label':"lit_4690",'name':"@4690",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451CF8,'size':4,'pad':0,'label':"lit_4691",'name':"@4691",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451CFC,'size':4,'pad':0,'label':"lit_4692",'name':"@4692",'lib':0,'tu':73,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D00,'size':4,'pad':0,'label':"lit_5090",'name':"@5090",'lib':0,'tu':74,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451D04,'size':4,'pad':0,'label':"lit_5226",'name':"@5226",'lib':0,'tu':74,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451D08,'size':4,'pad':4,'label':"lit_6335",'name':"@6335",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451D10,'size':8,'pad':0,'label':"lit_6337",'name':"@6337",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451D18,'size':4,'pad':0,'label':"lit_6980",'name':"@6980",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D1C,'size':4,'pad':0,'label':"lit_6981",'name':"@6981",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D20,'size':8,'pad':0,'label':"lit_7580",'name':"@7580",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451D10,'size':8,'pad':0,'label':"lit_6337",'name':"@6337",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D18,'size':4,'pad':0,'label':"lit_6980",'name':"@6980",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D1C,'size':4,'pad':0,'label':"lit_6981",'name':"@6981",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D20,'size':8,'pad':0,'label':"lit_7580",'name':"@7580",'lib':0,'tu':74,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451D28,'size':8,'pad':0,'label':"M_dir_base__Q212daObjMovebox5Act_c",'name':"M_dir_base__Q212daObjMovebox5Act_c",'lib':0,'tu':75,'section':8,'r':[0,0,3],'sh':[0,0,0],'type':"ReferenceArray"}, {'addr':0x80451D30,'size':4,'pad':0,'label':"OPEN_SIZE__7daDsh_c",'name':"OPEN_SIZE__7daDsh_c",'lib':0,'tu':75,'section':8,'r':[0,0,3],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451D34,'size':4,'pad':0,'label':"OPEN_ACCEL__7daDsh_c",'name':"OPEN_ACCEL__7daDsh_c",'lib':0,'tu':75,'section':8,'r':[0,0,1],'sh':[0,0,0],'type':"Integer"}, @@ -23147,59 +23147,59 @@ SYMBOLS = [ {'addr':0x80451D4C,'size':4,'pad':0,'label':"CLOSE_BOUND_SPEED__7daDsh_c",'name':"CLOSE_BOUND_SPEED__7daDsh_c",'lib':0,'tu':75,'section':8,'r':[0,0,1],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451D50,'size':4,'pad':0,'label':"CLOSE_BOUND_RATIO__7daDsh_c",'name':"CLOSE_BOUND_RATIO__7daDsh_c",'lib':0,'tu':75,'section':8,'r':[0,0,1],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451D54,'size':4,'pad':0,'label':"lit_4338",'name':"@4338",'lib':0,'tu':75,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451D58,'size':4,'pad':0,'label':"lit_3775",'name':"@3775",'lib':0,'tu':79,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451D58,'size':4,'pad':0,'label':"lit_3775",'name':"@3775",'lib':0,'tu':79,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451D5C,'size':4,'pad':0,'label':"lit_3813",'name':"@3813",'lib':0,'tu':79,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451D60,'size':4,'pad':0,'label':"lit_3655",'name':"@3655",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D64,'size':4,'pad':0,'label':"lit_4141",'name':"@4141",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D68,'size':4,'pad':4,'label':"lit_4142",'name':"@4142",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451D70,'size':8,'pad':0,'label':"lit_4143",'name':"@4143",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451D78,'size':8,'pad':0,'label':"lit_4144",'name':"@4144",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451D60,'size':4,'pad':0,'label':"lit_3655",'name':"@3655",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D64,'size':4,'pad':0,'label':"lit_4141",'name':"@4141",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D68,'size':4,'pad':4,'label':"lit_4142",'name':"@4142",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D70,'size':8,'pad':0,'label':"lit_4143",'name':"@4143",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D78,'size':8,'pad':0,'label':"lit_4144",'name':"@4144",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451D80,'size':8,'pad':0,'label':"lit_4145",'name':"@4145",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451D88,'size':4,'pad':0,'label':"lit_4146",'name':"@4146",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D8C,'size':4,'pad':0,'label':"lit_4147",'name':"@4147",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D90,'size':4,'pad':0,'label':"lit_4148",'name':"@4148",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D94,'size':4,'pad':0,'label':"lit_4149",'name':"@4149",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D98,'size':4,'pad':0,'label':"lit_3671",'name':"@3671",'lib':0,'tu':82,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451D9C,'size':4,'pad':0,'label':"lit_3714",'name':"@3714",'lib':0,'tu':82,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451D88,'size':4,'pad':0,'label':"lit_4146",'name':"@4146",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D8C,'size':4,'pad':0,'label':"lit_4147",'name':"@4147",'lib':0,'tu':81,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D90,'size':4,'pad':0,'label':"lit_4148",'name':"@4148",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D94,'size':4,'pad':0,'label':"lit_4149",'name':"@4149",'lib':0,'tu':81,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D98,'size':4,'pad':0,'label':"lit_3671",'name':"@3671",'lib':0,'tu':82,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451D9C,'size':4,'pad':0,'label':"lit_3714",'name':"@3714",'lib':0,'tu':82,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451DA0,'size':4,'pad':0,'label':"lit_3801",'name':"@3801",'lib':0,'tu':82,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451DA4,'size':4,'pad':0,'label':"lit_3836",'name':"@3836",'lib':0,'tu':82,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451DA4,'size':4,'pad':0,'label':"lit_3836",'name':"@3836",'lib':0,'tu':82,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451DA8,'size':4,'pad':4,'label':"lit_3956",'name':"@3956",'lib':0,'tu':82,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451DB0,'size':4,'pad':0,'label':"lit_4040",'name':"@4040",'lib':0,'tu':87,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451DB4,'size':4,'pad':0,'label':"lit_4041",'name':"@4041",'lib':0,'tu':87,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451DB8,'size':8,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':87,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451DC0,'size':4,'pad':0,'label':"lit_4152",'name':"@4152",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451DC4,'size':4,'pad':0,'label':"lit_4553",'name':"@4553",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451DC8,'size':4,'pad':0,'label':"lit_4554",'name':"@4554",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451DCC,'size':4,'pad':0,'label':"lit_4567",'name':"@4567",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451DD0,'size':4,'pad':0,'label':"lit_4642",'name':"@4642",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451DD4,'size':4,'pad':0,'label':"lit_4655",'name':"@4655",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451DB4,'size':4,'pad':0,'label':"lit_4041",'name':"@4041",'lib':0,'tu':87,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451DB8,'size':8,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':87,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451DC0,'size':4,'pad':0,'label':"lit_4152",'name':"@4152",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451DC4,'size':4,'pad':0,'label':"lit_4553",'name':"@4553",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451DC8,'size':4,'pad':0,'label':"lit_4554",'name':"@4554",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451DCC,'size':4,'pad':0,'label':"lit_4567",'name':"@4567",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451DD0,'size':4,'pad':0,'label':"lit_4642",'name':"@4642",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451DD4,'size':4,'pad':0,'label':"lit_4655",'name':"@4655",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451DD8,'size':4,'pad':4,'label':"lit_4710",'name':"@4710",'lib':0,'tu':87,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451DE0,'size':8,'pad':0,'label':"lit_5123",'name':"@5123",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451DE0,'size':8,'pad':0,'label':"lit_5123",'name':"@5123",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451DE8,'size':4,'pad':4,'label':"lit_5322",'name':"@5322",'lib':0,'tu':87,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451DF0,'size':8,'pad':0,'label':"l_alphaCompInfo",'name':"l_alphaCompInfo$3775",'lib':0,'tu':89,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451DF8,'size':8,'pad':0,'label':"lit_4277",'name':"@4277",'lib':0,'tu':89,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451DF8,'size':8,'pad':0,'label':"lit_4277",'name':"@4277",'lib':0,'tu':89,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451E00,'size':4,'pad':4,'label':"lit_4333",'name':"@4333",'lib':0,'tu':89,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451E08,'size':4,'pad':0,'label':"lit_3836",'name':"@3836",'lib':0,'tu':90,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451E0C,'size':4,'pad':0,'label':"lit_3846",'name':"@3846",'lib':0,'tu':90,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451E10,'size':4,'pad':0,'label':"lit_3847",'name':"@3847",'lib':0,'tu':90,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451E14,'size':4,'pad':0,'label':"lit_3848",'name':"@3848",'lib':0,'tu':90,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451E18,'size':8,'pad':0,'label':"lit_3850",'name':"@3850",'lib':0,'tu':90,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451E20,'size':4,'pad':4,'label':"lit_3894",'name':"@3894",'lib':0,'tu':91,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451E0C,'size':4,'pad':0,'label':"lit_3846",'name':"@3846",'lib':0,'tu':90,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451E10,'size':4,'pad':0,'label':"lit_3847",'name':"@3847",'lib':0,'tu':90,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451E14,'size':4,'pad':0,'label':"lit_3848",'name':"@3848",'lib':0,'tu':90,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451E18,'size':8,'pad':0,'label':"lit_3850",'name':"@3850",'lib':0,'tu':90,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451E20,'size':4,'pad':4,'label':"lit_3894",'name':"@3894",'lib':0,'tu':91,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451E28,'size':4,'pad':0,'label':"lit_3796",'name':"@3796",'lib':0,'tu':92,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451E2C,'size':4,'pad':0,'label':"lit_3887",'name':"@3887",'lib':0,'tu':92,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451E30,'size':8,'pad':0,'label':"lit_3957",'name':"@3957",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451E2C,'size':4,'pad':0,'label':"lit_3887",'name':"@3887",'lib':0,'tu':92,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451E30,'size':8,'pad':0,'label':"lit_3957",'name':"@3957",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451E38,'size':4,'pad':4,'label':"lit_4202",'name':"@4202",'lib':0,'tu':92,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451E40,'size':8,'pad':0,'label':"lit_4211",'name':"@4211",'lib':0,'tu':92,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451E40,'size':8,'pad':0,'label':"lit_4211",'name':"@4211",'lib':0,'tu':92,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451E48,'size':4,'pad':0,'label':"l_mapBaseColor",'name':"l_mapBaseColor$4239",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451E4C,'size':4,'pad':0,'label':"lit_4264",'name':"@4264",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451E50,'size':4,'pad':0,'label':"lit_4265",'name':"@4265",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451E54,'size':4,'pad':0,'label':"lit_4266",'name':"@4266",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451E4C,'size':4,'pad':0,'label':"lit_4264",'name':"@4264",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451E50,'size':4,'pad':0,'label':"lit_4265",'name':"@4265",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451E54,'size':4,'pad':0,'label':"lit_4266",'name':"@4266",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451E58,'size':4,'pad':0,'label':"l_doorWhite",'name':"l_doorWhite",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451E5C,'size':4,'pad':0,'label':"l_doorWhiteNoStay",'name':"l_doorWhiteNoStay",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451E60,'size':4,'pad':0,'label':"l_doorWhite2",'name':"l_doorWhite2",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451E64,'size':4,'pad':0,'label':"l_doorWhiteNoStay2",'name':"l_doorWhiteNoStay2",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451E68,'size':8,'pad':0,'label':"l_tex0",'name':"l_tex0$4406",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451E70,'size':4,'pad':0,'label':"lit_4484",'name':"@4484",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451E70,'size':4,'pad':0,'label':"lit_4484",'name':"@4484",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451E74,'size':4,'pad':0,'label':"l_entranceStartColor",'name':"l_entranceStartColor",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451E78,'size':4,'pad':0,'label':"l_entranceLv8StartColor",'name':"l_entranceLv8StartColor",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451E7C,'size':4,'pad':0,'label':"l_treasureStartColor",'name':"l_treasureStartColor",'lib':0,'tu':92,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, @@ -23212,57 +23212,57 @@ SYMBOLS = [ {'addr':0x80451E98,'size':4,'pad':0,'label':"l_tksStartColor",'name':"l_tksStartColor",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451E9C,'size':8,'pad':0,'label':"l_iconTex0_4523",'name':"l_iconTex0$4523",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451EA4,'size':4,'pad':0,'label':"tboxNotStayColor_4542",'name':"tboxNotStayColor$4542",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451EA8,'size':4,'pad':0,'label':"lit_4600",'name':"@4600",'lib':0,'tu':92,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451EA8,'size':4,'pad':0,'label':"lit_4600",'name':"@4600",'lib':0,'tu':92,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451EAC,'size':8,'pad':0,'label':"l_iconTex0_4605",'name':"l_iconTex0$4605",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451EB4,'size':4,'pad':0,'label':"tboxNotStayColor_4624",'name':"tboxNotStayColor$4624",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451EB8,'size':4,'pad':4,'label':"lit_4731",'name':"@4731",'lib':0,'tu':92,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451EC0,'size':4,'pad':0,'label':"lit_4361",'name':"@4361",'lib':0,'tu':93,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451EC4,'size':4,'pad':0,'label':"lit_4904",'name':"@4904",'lib':0,'tu':93,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451EC8,'size':4,'pad':0,'label':"lit_5013",'name':"@5013",'lib':0,'tu':93,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451EC0,'size':4,'pad':0,'label':"lit_4361",'name':"@4361",'lib':0,'tu':93,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451EC4,'size':4,'pad':0,'label':"lit_4904",'name':"@4904",'lib':0,'tu':93,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451EC8,'size':4,'pad':0,'label':"lit_5013",'name':"@5013",'lib':0,'tu':93,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451ECC,'size':4,'pad':0,'label':"lit_5095",'name':"@5095",'lib':0,'tu':93,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451ED0,'size':4,'pad':0,'label':"lit_4264",'name':"@4264",'lib':0,'tu':94,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451ED4,'size':4,'pad':0,'label':"lit_4265",'name':"@4265",'lib':0,'tu':94,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451ED8,'size':8,'pad':0,'label':"lit_4267",'name':"@4267",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451ED4,'size':4,'pad':0,'label':"lit_4265",'name':"@4265",'lib':0,'tu':94,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451ED8,'size':8,'pad':0,'label':"lit_4267",'name':"@4267",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451EE0,'size':4,'pad':4,'label':"lit_4460",'name':"@4460",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451EE8,'size':8,'pad':0,'label':"lit_4461",'name':"@4461",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451EF0,'size':4,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':94,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451EF4,'size':4,'pad':0,'label':"lit_4669",'name':"@4669",'lib':0,'tu':94,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451EF8,'size':4,'pad':0,'label':"lit_5057",'name':"@5057",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451EFC,'size':4,'pad':0,'label':"lit_5200",'name':"@5200",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F00,'size':4,'pad':4,'label':"lit_4398",'name':"@4398",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451F08,'size':8,'pad':0,'label':"lit_4399",'name':"@4399",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451F10,'size':8,'pad':0,'label':"lit_4400",'name':"@4400",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451EE8,'size':8,'pad':0,'label':"lit_4461",'name':"@4461",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451EF0,'size':4,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':94,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451EF4,'size':4,'pad':0,'label':"lit_4669",'name':"@4669",'lib':0,'tu':94,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451EF8,'size':4,'pad':0,'label':"lit_5057",'name':"@5057",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451EFC,'size':4,'pad':0,'label':"lit_5200",'name':"@5200",'lib':0,'tu':94,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F00,'size':4,'pad':4,'label':"lit_4398",'name':"@4398",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F08,'size':8,'pad':0,'label':"lit_4399",'name':"@4399",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F10,'size':8,'pad':0,'label':"lit_4400",'name':"@4400",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451F18,'size':8,'pad':0,'label':"lit_4401",'name':"@4401",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451F20,'size':4,'pad':0,'label':"lit_4402",'name':"@4402",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F24,'size':4,'pad':0,'label':"lit_4403",'name':"@4403",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F28,'size':4,'pad':0,'label':"lit_4404",'name':"@4404",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F2C,'size':4,'pad':0,'label':"lit_5025",'name':"@5025",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F30,'size':4,'pad':0,'label':"lit_5026",'name':"@5026",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F34,'size':4,'pad':0,'label':"lit_5055",'name':"@5055",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F38,'size':4,'pad':4,'label':"lit_3763",'name':"@3763",'lib':0,'tu':97,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451F40,'size':4,'pad':0,'label':"lit_3880",'name':"@3880",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F44,'size':4,'pad':0,'label':"lit_3881",'name':"@3881",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F48,'size':8,'pad':0,'label':"lit_3883",'name':"@3883",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451F20,'size':4,'pad':0,'label':"lit_4402",'name':"@4402",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F24,'size':4,'pad':0,'label':"lit_4403",'name':"@4403",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F28,'size':4,'pad':0,'label':"lit_4404",'name':"@4404",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F2C,'size':4,'pad':0,'label':"lit_5025",'name':"@5025",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F30,'size':4,'pad':0,'label':"lit_5026",'name':"@5026",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F34,'size':4,'pad':0,'label':"lit_5055",'name':"@5055",'lib':0,'tu':95,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F38,'size':4,'pad':4,'label':"lit_3763",'name':"@3763",'lib':0,'tu':97,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F40,'size':4,'pad':0,'label':"lit_3880",'name':"@3880",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F44,'size':4,'pad':0,'label':"lit_3881",'name':"@3881",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F48,'size':8,'pad':0,'label':"lit_3883",'name':"@3883",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451F50,'size':4,'pad':0,'label':"lit_3964",'name':"@3964",'lib':0,'tu':98,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451F54,'size':4,'pad':0,'label':"lit_4048",'name':"@4048",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F58,'size':4,'pad':0,'label':"lit_4049",'name':"@4049",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F5C,'size':4,'pad':0,'label':"lit_4090",'name':"@4090",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451F54,'size':4,'pad':0,'label':"lit_4048",'name':"@4048",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F58,'size':4,'pad':0,'label':"lit_4049",'name':"@4049",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F5C,'size':4,'pad':0,'label':"lit_4090",'name':"@4090",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451F60,'size':4,'pad':4,'label':"lit_4091",'name':"@4091",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80451F68,'size':8,'pad':0,'label':"lit_4093",'name':"@4093",'lib':0,'tu':98,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451F70,'size':4,'pad':0,'label':"lit_4391",'name':"@4391",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451F68,'size':8,'pad':0,'label':"lit_4093",'name':"@4093",'lib':0,'tu':98,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F70,'size':4,'pad':0,'label':"lit_4391",'name':"@4391",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451F74,'size':4,'pad':0,'label':"lit_4473",'name':"@4473",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451F78,'size':4,'pad':0,'label':"lit_4474",'name':"@4474",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451F7C,'size':4,'pad':0,'label':"lit_4482",'name':"@4482",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451F80,'size':4,'pad':0,'label':"lit_4483",'name':"@4483",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F84,'size':4,'pad':0,'label':"lit_4518",'name':"@4518",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F88,'size':4,'pad':0,'label':"lit_4519",'name':"@4519",'lib':0,'tu':98,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F8C,'size':4,'pad':0,'label':"lit_5066",'name':"@5066",'lib':0,'tu':98,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451F84,'size':4,'pad':0,'label':"lit_4518",'name':"@4518",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F88,'size':4,'pad':0,'label':"lit_4519",'name':"@4519",'lib':0,'tu':98,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F8C,'size':4,'pad':0,'label':"lit_5066",'name':"@5066",'lib':0,'tu':98,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451F90,'size':4,'pad':0,'label':"particleID",'name':"particleID$5076",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451F94,'size':4,'pad':0,'label':"lit_5140",'name':"@5140",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F98,'size':4,'pad':0,'label':"lit_5141",'name':"@5141",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451F9C,'size':4,'pad':0,'label':"lit_5142",'name':"@5142",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FA0,'size':8,'pad':0,'label':"lit_5143",'name':"@5143",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80451FA8,'size':8,'pad':0,'label':"lit_5144",'name':"@5144",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80451F94,'size':4,'pad':0,'label':"lit_5140",'name':"@5140",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F98,'size':4,'pad':0,'label':"lit_5141",'name':"@5141",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451F9C,'size':4,'pad':0,'label':"lit_5142",'name':"@5142",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FA0,'size':8,'pad':0,'label':"lit_5143",'name':"@5143",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FA8,'size':8,'pad':0,'label':"lit_5144",'name':"@5144",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80451FB0,'size':8,'pad':0,'label':"lit_5145",'name':"@5145",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80451FB8,'size':4,'pad':0,'label':"lit_5189",'name':"@5189",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451FBC,'size':4,'pad':0,'label':"lit_5190",'name':"@5190",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, @@ -23272,728 +23272,728 @@ SYMBOLS = [ {'addr':0x80451FCC,'size':4,'pad':0,'label':"lit_5375",'name':"@5375",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451FD0,'size':4,'pad':0,'label':"lit_5383",'name':"@5383",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80451FD4,'size':4,'pad':0,'label':"lit_5384",'name':"@5384",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FD8,'size':4,'pad':0,'label':"lit_6075",'name':"@6075",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FDC,'size':4,'pad':0,'label':"lit_6076",'name':"@6076",'lib':0,'tu':98,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FE0,'size':4,'pad':0,'label':"lit_6077",'name':"@6077",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FE4,'size':4,'pad':0,'label':"lit_6078",'name':"@6078",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FE8,'size':4,'pad':0,'label':"lit_6079",'name':"@6079",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FEC,'size':4,'pad':0,'label':"lit_6350",'name':"@6350",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FF0,'size':4,'pad':0,'label':"lit_6351",'name':"@6351",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FF4,'size':4,'pad':0,'label':"lit_6846",'name':"@6846",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80451FF8,'size':4,'pad':4,'label':"lit_3672",'name':"@3672",'lib':0,'tu':100,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452000,'size':4,'pad':4,'label':"lit_3685",'name':"@3685",'lib':0,'tu':101,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452008,'size':4,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':102,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045200C,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452010,'size':4,'pad':4,'label':"lit_4074",'name':"@4074",'lib':0,'tu':102,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452018,'size':8,'pad':0,'label':"lit_4076",'name':"@4076",'lib':0,'tu':102,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452020,'size':8,'pad':0,'label':"lit_4079",'name':"@4079",'lib':0,'tu':102,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452028,'size':4,'pad':0,'label':"lit_4270",'name':"@4270",'lib':0,'tu':102,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80451FD8,'size':4,'pad':0,'label':"lit_6075",'name':"@6075",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FDC,'size':4,'pad':0,'label':"lit_6076",'name':"@6076",'lib':0,'tu':98,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FE0,'size':4,'pad':0,'label':"lit_6077",'name':"@6077",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FE4,'size':4,'pad':0,'label':"lit_6078",'name':"@6078",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FE8,'size':4,'pad':0,'label':"lit_6079",'name':"@6079",'lib':0,'tu':98,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FEC,'size':4,'pad':0,'label':"lit_6350",'name':"@6350",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FF0,'size':4,'pad':0,'label':"lit_6351",'name':"@6351",'lib':0,'tu':98,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FF4,'size':4,'pad':0,'label':"lit_6846",'name':"@6846",'lib':0,'tu':98,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80451FF8,'size':4,'pad':4,'label':"lit_3672",'name':"@3672",'lib':0,'tu':100,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452000,'size':4,'pad':4,'label':"lit_3685",'name':"@3685",'lib':0,'tu':101,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452008,'size':4,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':102,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045200C,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452010,'size':4,'pad':4,'label':"lit_4074",'name':"@4074",'lib':0,'tu':102,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452018,'size':8,'pad':0,'label':"lit_4076",'name':"@4076",'lib':0,'tu':102,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452020,'size':8,'pad':0,'label':"lit_4079",'name':"@4079",'lib':0,'tu':102,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452028,'size':4,'pad':0,'label':"lit_4270",'name':"@4270",'lib':0,'tu':102,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045202C,'size':4,'pad':0,'label':"lit_4284",'name':"@4284",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452030,'size':4,'pad':0,'label':"lit_4360",'name':"@4360",'lib':0,'tu':102,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452034,'size':4,'pad':0,'label':"lit_4791",'name':"@4791",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452038,'size':4,'pad':0,'label':"lit_4792",'name':"@4792",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045203C,'size':4,'pad':0,'label':"lit_4793",'name':"@4793",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452040,'size':8,'pad':0,'label':"lit_4794",'name':"@4794",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452048,'size':4,'pad':0,'label':"lit_4806",'name':"@4806",'lib':0,'tu':102,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045204C,'size':4,'pad':0,'label':"lit_4876",'name':"@4876",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452050,'size':4,'pad':0,'label':"lit_5061",'name':"@5061",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452054,'size':4,'pad':0,'label':"lit_5062",'name':"@5062",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452058,'size':4,'pad':0,'label':"lit_5127",'name':"@5127",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045205C,'size':4,'pad':0,'label':"lit_5128",'name':"@5128",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452060,'size':4,'pad':0,'label':"lit_5129",'name':"@5129",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452064,'size':4,'pad':0,'label':"lit_5130",'name':"@5130",'lib':0,'tu':102,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452068,'size':4,'pad':0,'label':"lit_5155",'name':"@5155",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045206C,'size':4,'pad':0,'label':"lit_5156",'name':"@5156",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452070,'size':4,'pad':0,'label':"lit_5267",'name':"@5267",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452074,'size':4,'pad':0,'label':"lit_5268",'name':"@5268",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452030,'size':4,'pad':0,'label':"lit_4360",'name':"@4360",'lib':0,'tu':102,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452034,'size':4,'pad':0,'label':"lit_4791",'name':"@4791",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452038,'size':4,'pad':0,'label':"lit_4792",'name':"@4792",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045203C,'size':4,'pad':0,'label':"lit_4793",'name':"@4793",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452040,'size':8,'pad':0,'label':"lit_4794",'name':"@4794",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452048,'size':4,'pad':0,'label':"lit_4806",'name':"@4806",'lib':0,'tu':102,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045204C,'size':4,'pad':0,'label':"lit_4876",'name':"@4876",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452050,'size':4,'pad':0,'label':"lit_5061",'name':"@5061",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452054,'size':4,'pad':0,'label':"lit_5062",'name':"@5062",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452058,'size':4,'pad':0,'label':"lit_5127",'name':"@5127",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045205C,'size':4,'pad':0,'label':"lit_5128",'name':"@5128",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452060,'size':4,'pad':0,'label':"lit_5129",'name':"@5129",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452064,'size':4,'pad':0,'label':"lit_5130",'name':"@5130",'lib':0,'tu':102,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452068,'size':4,'pad':0,'label':"lit_5155",'name':"@5155",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045206C,'size':4,'pad':0,'label':"lit_5156",'name':"@5156",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452070,'size':4,'pad':0,'label':"lit_5267",'name':"@5267",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452074,'size':4,'pad':0,'label':"lit_5268",'name':"@5268",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452078,'size':4,'pad':4,'label':"lit_5269",'name':"@5269",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80452080,'size':8,'pad':0,'label':"lit_5270",'name':"@5270",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452088,'size':8,'pad':0,'label':"lit_5271",'name':"@5271",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452080,'size':8,'pad':0,'label':"lit_5270",'name':"@5270",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452088,'size':8,'pad':0,'label':"lit_5271",'name':"@5271",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452090,'size':8,'pad':0,'label':"lit_5272",'name':"@5272",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452098,'size':4,'pad':0,'label':"lit_5273",'name':"@5273",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045209C,'size':4,'pad':0,'label':"lit_5274",'name':"@5274",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520A0,'size':4,'pad':0,'label':"lit_5275",'name':"@5275",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520A4,'size':4,'pad':0,'label':"lit_5375",'name':"@5375",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520A8,'size':4,'pad':0,'label':"lit_5376",'name':"@5376",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520AC,'size':4,'pad':0,'label':"lit_5377",'name':"@5377",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520B0,'size':4,'pad':0,'label':"lit_5378",'name':"@5378",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452098,'size':4,'pad':0,'label':"lit_5273",'name':"@5273",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045209C,'size':4,'pad':0,'label':"lit_5274",'name':"@5274",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520A0,'size':4,'pad':0,'label':"lit_5275",'name':"@5275",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520A4,'size':4,'pad':0,'label':"lit_5375",'name':"@5375",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520A8,'size':4,'pad':0,'label':"lit_5376",'name':"@5376",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520AC,'size':4,'pad':0,'label':"lit_5377",'name':"@5377",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520B0,'size':4,'pad':0,'label':"lit_5378",'name':"@5378",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804520B4,'size':4,'pad':0,'label':"lit_5433",'name':"@5433",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520B8,'size':4,'pad':0,'label':"lit_5551",'name':"@5551",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520BC,'size':4,'pad':0,'label':"lit_5552",'name':"@5552",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520C0,'size':4,'pad':0,'label':"lit_5553",'name':"@5553",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804520B8,'size':4,'pad':0,'label':"lit_5551",'name':"@5551",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520BC,'size':4,'pad':0,'label':"lit_5552",'name':"@5552",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520C0,'size':4,'pad':0,'label':"lit_5553",'name':"@5553",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804520C4,'size':6,'pad':2,'label':"l_zSortId",'name':"l_zSortId$5668",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804520CC,'size':4,'pad':0,'label':"lit_5747",'name':"@5747",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520D0,'size':4,'pad':0,'label':"lit_5809",'name':"@5809",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520D4,'size':4,'pad':0,'label':"lit_5810",'name':"@5810",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520D8,'size':4,'pad':0,'label':"lit_5811",'name':"@5811",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520DC,'size':4,'pad':0,'label':"lit_5838",'name':"@5838",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804520CC,'size':4,'pad':0,'label':"lit_5747",'name':"@5747",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520D0,'size':4,'pad':0,'label':"lit_5809",'name':"@5809",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520D4,'size':4,'pad':0,'label':"lit_5810",'name':"@5810",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520D8,'size':4,'pad':0,'label':"lit_5811",'name':"@5811",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520DC,'size':4,'pad':0,'label':"lit_5838",'name':"@5838",'lib':0,'tu':102,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804520E0,'size':4,'pad':0,'label':"lit_4378",'name':"@4378",'lib':0,'tu':104,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804520E4,'size':4,'pad':0,'label':"lit_4379",'name':"@4379",'lib':0,'tu':104,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520E8,'size':4,'pad':0,'label':"lit_4610",'name':"@4610",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520EC,'size':4,'pad':0,'label':"lit_4611",'name':"@4611",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520F0,'size':4,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520F4,'size':4,'pad':0,'label':"lit_4669",'name':"@4669",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804520F8,'size':8,'pad':0,'label':"lit_4671",'name':"@4671",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452100,'size':4,'pad':0,'label':"lit_4761",'name':"@4761",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452104,'size':4,'pad':0,'label':"lit_4762",'name':"@4762",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452108,'size':4,'pad':0,'label':"lit_4763",'name':"@4763",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045210C,'size':4,'pad':0,'label':"lit_4764",'name':"@4764",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452110,'size':4,'pad':0,'label':"lit_4765",'name':"@4765",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452114,'size':4,'pad':0,'label':"lit_4766",'name':"@4766",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452118,'size':4,'pad':0,'label':"lit_4767",'name':"@4767",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045211C,'size':4,'pad':0,'label':"lit_4768",'name':"@4768",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452120,'size':4,'pad':0,'label':"lit_4769",'name':"@4769",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452124,'size':4,'pad':0,'label':"lit_4770",'name':"@4770",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452128,'size':4,'pad':0,'label':"lit_4771",'name':"@4771",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045212C,'size':4,'pad':0,'label':"lit_4772",'name':"@4772",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452130,'size':4,'pad':0,'label':"lit_5181",'name':"@5181",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452134,'size':4,'pad':0,'label':"lit_5182",'name':"@5182",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452138,'size':4,'pad':0,'label':"lit_5183",'name':"@5183",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045213C,'size':4,'pad':0,'label':"lit_5184",'name':"@5184",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452140,'size':4,'pad':0,'label':"lit_5185",'name':"@5185",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452144,'size':4,'pad':0,'label':"lit_5186",'name':"@5186",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452148,'size':4,'pad':0,'label':"lit_5187",'name':"@5187",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045214C,'size':4,'pad':0,'label':"lit_5188",'name':"@5188",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452150,'size':4,'pad':0,'label':"lit_5189",'name':"@5189",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452154,'size':4,'pad':0,'label':"lit_5190",'name':"@5190",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452158,'size':4,'pad':0,'label':"lit_5191",'name':"@5191",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045215C,'size':4,'pad':0,'label':"lit_5192",'name':"@5192",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452160,'size':4,'pad':0,'label':"lit_5193",'name':"@5193",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452164,'size':4,'pad':0,'label':"lit_5361",'name':"@5361",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452168,'size':4,'pad':0,'label':"lit_5362",'name':"@5362",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045216C,'size':4,'pad':0,'label':"lit_5363",'name':"@5363",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804520E4,'size':4,'pad':0,'label':"lit_4379",'name':"@4379",'lib':0,'tu':104,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520E8,'size':4,'pad':0,'label':"lit_4610",'name':"@4610",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520EC,'size':4,'pad':0,'label':"lit_4611",'name':"@4611",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520F0,'size':4,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520F4,'size':4,'pad':0,'label':"lit_4669",'name':"@4669",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804520F8,'size':8,'pad':0,'label':"lit_4671",'name':"@4671",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452100,'size':4,'pad':0,'label':"lit_4761",'name':"@4761",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452104,'size':4,'pad':0,'label':"lit_4762",'name':"@4762",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452108,'size':4,'pad':0,'label':"lit_4763",'name':"@4763",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045210C,'size':4,'pad':0,'label':"lit_4764",'name':"@4764",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452110,'size':4,'pad':0,'label':"lit_4765",'name':"@4765",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452114,'size':4,'pad':0,'label':"lit_4766",'name':"@4766",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452118,'size':4,'pad':0,'label':"lit_4767",'name':"@4767",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045211C,'size':4,'pad':0,'label':"lit_4768",'name':"@4768",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452120,'size':4,'pad':0,'label':"lit_4769",'name':"@4769",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452124,'size':4,'pad':0,'label':"lit_4770",'name':"@4770",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452128,'size':4,'pad':0,'label':"lit_4771",'name':"@4771",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045212C,'size':4,'pad':0,'label':"lit_4772",'name':"@4772",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452130,'size':4,'pad':0,'label':"lit_5181",'name':"@5181",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452134,'size':4,'pad':0,'label':"lit_5182",'name':"@5182",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452138,'size':4,'pad':0,'label':"lit_5183",'name':"@5183",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045213C,'size':4,'pad':0,'label':"lit_5184",'name':"@5184",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452140,'size':4,'pad':0,'label':"lit_5185",'name':"@5185",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452144,'size':4,'pad':0,'label':"lit_5186",'name':"@5186",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452148,'size':4,'pad':0,'label':"lit_5187",'name':"@5187",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045214C,'size':4,'pad':0,'label':"lit_5188",'name':"@5188",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452150,'size':4,'pad':0,'label':"lit_5189",'name':"@5189",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452154,'size':4,'pad':0,'label':"lit_5190",'name':"@5190",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452158,'size':4,'pad':0,'label':"lit_5191",'name':"@5191",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045215C,'size':4,'pad':0,'label':"lit_5192",'name':"@5192",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452160,'size':4,'pad':0,'label':"lit_5193",'name':"@5193",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452164,'size':4,'pad':0,'label':"lit_5361",'name':"@5361",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452168,'size':4,'pad':0,'label':"lit_5362",'name':"@5362",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045216C,'size':4,'pad':0,'label':"lit_5363",'name':"@5363",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452170,'size':4,'pad':4,'label':"lit_5364",'name':"@5364",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80452178,'size':8,'pad':0,'label':"lit_5524",'name':"@5524",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452180,'size':8,'pad':0,'label':"lit_5525",'name':"@5525",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452178,'size':8,'pad':0,'label':"lit_5524",'name':"@5524",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452180,'size':8,'pad':0,'label':"lit_5525",'name':"@5525",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452188,'size':8,'pad':0,'label':"lit_5526",'name':"@5526",'lib':0,'tu':104,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452190,'size':4,'pad':0,'label':"lit_5527",'name':"@5527",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452194,'size':4,'pad':0,'label':"lit_5528",'name':"@5528",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452198,'size':4,'pad':0,'label':"lit_5529",'name':"@5529",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045219C,'size':4,'pad':0,'label':"lit_5530",'name':"@5530",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521A0,'size':4,'pad':0,'label':"lit_5531",'name':"@5531",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521A4,'size':4,'pad':0,'label':"lit_5630",'name':"@5630",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452190,'size':4,'pad':0,'label':"lit_5527",'name':"@5527",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452194,'size':4,'pad':0,'label':"lit_5528",'name':"@5528",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452198,'size':4,'pad':0,'label':"lit_5529",'name':"@5529",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045219C,'size':4,'pad':0,'label':"lit_5530",'name':"@5530",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521A0,'size':4,'pad':0,'label':"lit_5531",'name':"@5531",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521A4,'size':4,'pad':0,'label':"lit_5630",'name':"@5630",'lib':0,'tu':104,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804521A8,'size':4,'pad':4,'label':"lit_5855",'name':"@5855",'lib':0,'tu':104,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804521B0,'size':8,'pad':0,'label':"lit_3953",'name':"@3953",'lib':0,'tu':105,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804521B8,'size':4,'pad':0,'label':"lit_3954",'name':"@3954",'lib':0,'tu':105,'section':8,'r':[31,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804521BC,'size':4,'pad':0,'label':"lit_3970",'name':"@3970",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521C0,'size':4,'pad':0,'label':"lit_3992",'name':"@3992",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521C4,'size':4,'pad':0,'label':"lit_3993",'name':"@3993",'lib':0,'tu':105,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521C8,'size':8,'pad':0,'label':"lit_3995",'name':"@3995",'lib':0,'tu':105,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804521D0,'size':4,'pad':0,'label':"lit_4103",'name':"@4103",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521D4,'size':4,'pad':0,'label':"lit_4104",'name':"@4104",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521D8,'size':4,'pad':0,'label':"lit_4105",'name':"@4105",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521DC,'size':4,'pad':0,'label':"lit_4106",'name':"@4106",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521E0,'size':4,'pad':0,'label':"lit_4107",'name':"@4107",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521E4,'size':4,'pad':0,'label':"lit_4108",'name':"@4108",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521E8,'size':8,'pad':0,'label':"lit_4109",'name':"@4109",'lib':0,'tu':105,'section':8,'r':[17,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804521F0,'size':8,'pad':0,'label':"lit_4110",'name':"@4110",'lib':0,'tu':105,'section':8,'r':[17,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804521F8,'size':4,'pad':0,'label':"lit_4111",'name':"@4111",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804521FC,'size':4,'pad':0,'label':"lit_4112",'name':"@4112",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452200,'size':4,'pad':0,'label':"lit_4113",'name':"@4113",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452204,'size':4,'pad':0,'label':"lit_4114",'name':"@4114",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452208,'size':4,'pad':0,'label':"lit_4126",'name':"@4126",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045220C,'size':4,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452210,'size':4,'pad':0,'label':"lit_4353",'name':"@4353",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452214,'size':4,'pad':0,'label':"lit_4354",'name':"@4354",'lib':0,'tu':105,'section':8,'r':[26,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452218,'size':4,'pad':0,'label':"lit_4355",'name':"@4355",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045221C,'size':4,'pad':0,'label':"lit_4356",'name':"@4356",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452220,'size':4,'pad':0,'label':"lit_4357",'name':"@4357",'lib':0,'tu':105,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452224,'size':4,'pad':0,'label':"lit_4358",'name':"@4358",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452228,'size':4,'pad':0,'label':"lit_4359",'name':"@4359",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045222C,'size':4,'pad':0,'label':"lit_4360",'name':"@4360",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452230,'size':4,'pad':0,'label':"lit_4361",'name':"@4361",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452234,'size':4,'pad':0,'label':"lit_4362",'name':"@4362",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452238,'size':4,'pad':0,'label':"lit_4363",'name':"@4363",'lib':0,'tu':105,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045223C,'size':4,'pad':0,'label':"lit_4364",'name':"@4364",'lib':0,'tu':105,'section':8,'r':[18,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452240,'size':4,'pad':0,'label':"lit_4365",'name':"@4365",'lib':0,'tu':105,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452244,'size':4,'pad':0,'label':"lit_4366",'name':"@4366",'lib':0,'tu':105,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452248,'size':4,'pad':0,'label':"lit_4367",'name':"@4367",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045224C,'size':4,'pad':0,'label':"lit_4368",'name':"@4368",'lib':0,'tu':105,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452250,'size':4,'pad':0,'label':"lit_4369",'name':"@4369",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452254,'size':4,'pad':0,'label':"lit_4370",'name':"@4370",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452258,'size':4,'pad':0,'label':"lit_4371",'name':"@4371",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045225C,'size':4,'pad':0,'label':"lit_4372",'name':"@4372",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452260,'size':4,'pad':0,'label':"lit_4373",'name':"@4373",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452264,'size':4,'pad':0,'label':"lit_4374",'name':"@4374",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452268,'size':4,'pad':0,'label':"lit_4375",'name':"@4375",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045226C,'size':4,'pad':0,'label':"lit_4376",'name':"@4376",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452270,'size':8,'pad':0,'label':"lit_4379",'name':"@4379",'lib':0,'tu':105,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452278,'size':4,'pad':0,'label':"lit_4430",'name':"@4430",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045227C,'size':4,'pad':0,'label':"lit_4467",'name':"@4467",'lib':0,'tu':105,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452280,'size':4,'pad':0,'label':"lit_4468",'name':"@4468",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452284,'size':4,'pad':0,'label':"lit_5096",'name':"@5096",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452288,'size':4,'pad':0,'label':"lit_5097",'name':"@5097",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045228C,'size':4,'pad':0,'label':"lit_5098",'name':"@5098",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452290,'size':4,'pad':0,'label':"lit_5099",'name':"@5099",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452294,'size':4,'pad':0,'label':"lit_5100",'name':"@5100",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452298,'size':4,'pad':0,'label':"lit_5101",'name':"@5101",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045229C,'size':4,'pad':0,'label':"lit_5102",'name':"@5102",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522A0,'size':4,'pad':0,'label':"lit_5103",'name':"@5103",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522A4,'size':4,'pad':0,'label':"lit_5104",'name':"@5104",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522A8,'size':4,'pad':0,'label':"lit_5105",'name':"@5105",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522AC,'size':4,'pad':0,'label':"lit_5106",'name':"@5106",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522B0,'size':4,'pad':0,'label':"lit_5107",'name':"@5107",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522B4,'size':4,'pad':0,'label':"lit_5108",'name':"@5108",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522B8,'size':4,'pad':0,'label':"lit_5109",'name':"@5109",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522BC,'size':4,'pad':0,'label':"lit_5110",'name':"@5110",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522C0,'size':4,'pad':0,'label':"lit_5111",'name':"@5111",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522C4,'size':4,'pad':0,'label':"lit_5112",'name':"@5112",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522C8,'size':4,'pad':0,'label':"lit_5113",'name':"@5113",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522CC,'size':4,'pad':0,'label':"lit_5114",'name':"@5114",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522D0,'size':4,'pad':0,'label':"lit_5115",'name':"@5115",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522D4,'size':4,'pad':0,'label':"lit_5116",'name':"@5116",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522D8,'size':4,'pad':0,'label':"lit_5117",'name':"@5117",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522DC,'size':4,'pad':0,'label':"lit_5118",'name':"@5118",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522E0,'size':4,'pad':0,'label':"lit_5119",'name':"@5119",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522E4,'size':4,'pad':0,'label':"lit_5120",'name':"@5120",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522E8,'size':4,'pad':0,'label':"lit_5121",'name':"@5121",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522EC,'size':4,'pad':0,'label':"lit_5122",'name':"@5122",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522F0,'size':4,'pad':0,'label':"lit_5123",'name':"@5123",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522F4,'size':4,'pad':0,'label':"lit_5124",'name':"@5124",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522F8,'size':4,'pad':0,'label':"lit_5125",'name':"@5125",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804522FC,'size':4,'pad':0,'label':"lit_5126",'name':"@5126",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452300,'size':4,'pad':0,'label':"lit_5127",'name':"@5127",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452304,'size':4,'pad':0,'label':"lit_5128",'name':"@5128",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452308,'size':4,'pad':0,'label':"lit_5129",'name':"@5129",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045230C,'size':4,'pad':0,'label':"lit_5130",'name':"@5130",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452310,'size':4,'pad':0,'label':"lit_5131",'name':"@5131",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452314,'size':4,'pad':0,'label':"lit_5132",'name':"@5132",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452318,'size':4,'pad':0,'label':"lit_5133",'name':"@5133",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045231C,'size':4,'pad':0,'label':"lit_5134",'name':"@5134",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452320,'size':4,'pad':0,'label':"lit_5716",'name':"@5716",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452324,'size':4,'pad':0,'label':"lit_5717",'name':"@5717",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452328,'size':4,'pad':0,'label':"lit_5718",'name':"@5718",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045232C,'size':4,'pad':0,'label':"lit_5719",'name':"@5719",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452330,'size':4,'pad':0,'label':"lit_5720",'name':"@5720",'lib':0,'tu':105,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452334,'size':4,'pad':0,'label':"lit_5721",'name':"@5721",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452338,'size':4,'pad':0,'label':"lit_5722",'name':"@5722",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045233C,'size':4,'pad':0,'label':"lit_5723",'name':"@5723",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452340,'size':4,'pad':0,'label':"lit_5724",'name':"@5724",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452344,'size':4,'pad':0,'label':"lit_5725",'name':"@5725",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452348,'size':4,'pad':0,'label':"lit_5726",'name':"@5726",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045234C,'size':4,'pad':0,'label':"lit_5727",'name':"@5727",'lib':0,'tu':105,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452350,'size':4,'pad':0,'label':"lit_5728",'name':"@5728",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452354,'size':4,'pad':0,'label':"lit_5729",'name':"@5729",'lib':0,'tu':105,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452358,'size':4,'pad':0,'label':"lit_5730",'name':"@5730",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045235C,'size':4,'pad':0,'label':"lit_5731",'name':"@5731",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452360,'size':4,'pad':0,'label':"lit_5732",'name':"@5732",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452364,'size':4,'pad':0,'label':"lit_5733",'name':"@5733",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452368,'size':4,'pad':0,'label':"lit_5734",'name':"@5734",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045236C,'size':4,'pad':0,'label':"lit_5735",'name':"@5735",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452370,'size':4,'pad':0,'label':"lit_5736",'name':"@5736",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452374,'size':4,'pad':0,'label':"lit_5737",'name':"@5737",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452378,'size':4,'pad':0,'label':"lit_5738",'name':"@5738",'lib':0,'tu':105,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045237C,'size':4,'pad':0,'label':"lit_5739",'name':"@5739",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452380,'size':4,'pad':0,'label':"lit_5740",'name':"@5740",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452384,'size':4,'pad':0,'label':"lit_5741",'name':"@5741",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452388,'size':4,'pad':0,'label':"lit_5742",'name':"@5742",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045238C,'size':4,'pad':0,'label':"lit_5743",'name':"@5743",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452390,'size':4,'pad':0,'label':"lit_5744",'name':"@5744",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452394,'size':4,'pad':0,'label':"lit_5745",'name':"@5745",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452398,'size':4,'pad':0,'label':"lit_5746",'name':"@5746",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045239C,'size':4,'pad':0,'label':"lit_5747",'name':"@5747",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523A0,'size':4,'pad':0,'label':"lit_5748",'name':"@5748",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523A4,'size':4,'pad':0,'label':"lit_6355",'name':"@6355",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523A8,'size':4,'pad':0,'label':"lit_6356",'name':"@6356",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523AC,'size':4,'pad':0,'label':"lit_6357",'name':"@6357",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523B0,'size':4,'pad':0,'label':"lit_6358",'name':"@6358",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523B4,'size':4,'pad':0,'label':"lit_6359",'name':"@6359",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523B8,'size':4,'pad':0,'label':"lit_6360",'name':"@6360",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523BC,'size':4,'pad':0,'label':"lit_6361",'name':"@6361",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523C0,'size':4,'pad':0,'label':"lit_6362",'name':"@6362",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523C4,'size':4,'pad':0,'label':"lit_6363",'name':"@6363",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804521BC,'size':4,'pad':0,'label':"lit_3970",'name':"@3970",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521C0,'size':4,'pad':0,'label':"lit_3992",'name':"@3992",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521C4,'size':4,'pad':0,'label':"lit_3993",'name':"@3993",'lib':0,'tu':105,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521C8,'size':8,'pad':0,'label':"lit_3995",'name':"@3995",'lib':0,'tu':105,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521D0,'size':4,'pad':0,'label':"lit_4103",'name':"@4103",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521D4,'size':4,'pad':0,'label':"lit_4104",'name':"@4104",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521D8,'size':4,'pad':0,'label':"lit_4105",'name':"@4105",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521DC,'size':4,'pad':0,'label':"lit_4106",'name':"@4106",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521E0,'size':4,'pad':0,'label':"lit_4107",'name':"@4107",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521E4,'size':4,'pad':0,'label':"lit_4108",'name':"@4108",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521E8,'size':8,'pad':0,'label':"lit_4109",'name':"@4109",'lib':0,'tu':105,'section':8,'r':[17,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521F0,'size':8,'pad':0,'label':"lit_4110",'name':"@4110",'lib':0,'tu':105,'section':8,'r':[17,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521F8,'size':4,'pad':0,'label':"lit_4111",'name':"@4111",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804521FC,'size':4,'pad':0,'label':"lit_4112",'name':"@4112",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452200,'size':4,'pad':0,'label':"lit_4113",'name':"@4113",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452204,'size':4,'pad':0,'label':"lit_4114",'name':"@4114",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452208,'size':4,'pad':0,'label':"lit_4126",'name':"@4126",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045220C,'size':4,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452210,'size':4,'pad':0,'label':"lit_4353",'name':"@4353",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452214,'size':4,'pad':0,'label':"lit_4354",'name':"@4354",'lib':0,'tu':105,'section':8,'r':[26,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452218,'size':4,'pad':0,'label':"lit_4355",'name':"@4355",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045221C,'size':4,'pad':0,'label':"lit_4356",'name':"@4356",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452220,'size':4,'pad':0,'label':"lit_4357",'name':"@4357",'lib':0,'tu':105,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452224,'size':4,'pad':0,'label':"lit_4358",'name':"@4358",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452228,'size':4,'pad':0,'label':"lit_4359",'name':"@4359",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045222C,'size':4,'pad':0,'label':"lit_4360",'name':"@4360",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452230,'size':4,'pad':0,'label':"lit_4361",'name':"@4361",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452234,'size':4,'pad':0,'label':"lit_4362",'name':"@4362",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452238,'size':4,'pad':0,'label':"lit_4363",'name':"@4363",'lib':0,'tu':105,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045223C,'size':4,'pad':0,'label':"lit_4364",'name':"@4364",'lib':0,'tu':105,'section':8,'r':[18,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452240,'size':4,'pad':0,'label':"lit_4365",'name':"@4365",'lib':0,'tu':105,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452244,'size':4,'pad':0,'label':"lit_4366",'name':"@4366",'lib':0,'tu':105,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452248,'size':4,'pad':0,'label':"lit_4367",'name':"@4367",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045224C,'size':4,'pad':0,'label':"lit_4368",'name':"@4368",'lib':0,'tu':105,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452250,'size':4,'pad':0,'label':"lit_4369",'name':"@4369",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452254,'size':4,'pad':0,'label':"lit_4370",'name':"@4370",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452258,'size':4,'pad':0,'label':"lit_4371",'name':"@4371",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045225C,'size':4,'pad':0,'label':"lit_4372",'name':"@4372",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452260,'size':4,'pad':0,'label':"lit_4373",'name':"@4373",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452264,'size':4,'pad':0,'label':"lit_4374",'name':"@4374",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452268,'size':4,'pad':0,'label':"lit_4375",'name':"@4375",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045226C,'size':4,'pad':0,'label':"lit_4376",'name':"@4376",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452270,'size':8,'pad':0,'label':"lit_4379",'name':"@4379",'lib':0,'tu':105,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452278,'size':4,'pad':0,'label':"lit_4430",'name':"@4430",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045227C,'size':4,'pad':0,'label':"lit_4467",'name':"@4467",'lib':0,'tu':105,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452280,'size':4,'pad':0,'label':"lit_4468",'name':"@4468",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452284,'size':4,'pad':0,'label':"lit_5096",'name':"@5096",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452288,'size':4,'pad':0,'label':"lit_5097",'name':"@5097",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045228C,'size':4,'pad':0,'label':"lit_5098",'name':"@5098",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452290,'size':4,'pad':0,'label':"lit_5099",'name':"@5099",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452294,'size':4,'pad':0,'label':"lit_5100",'name':"@5100",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452298,'size':4,'pad':0,'label':"lit_5101",'name':"@5101",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045229C,'size':4,'pad':0,'label':"lit_5102",'name':"@5102",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522A0,'size':4,'pad':0,'label':"lit_5103",'name':"@5103",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522A4,'size':4,'pad':0,'label':"lit_5104",'name':"@5104",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522A8,'size':4,'pad':0,'label':"lit_5105",'name':"@5105",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522AC,'size':4,'pad':0,'label':"lit_5106",'name':"@5106",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522B0,'size':4,'pad':0,'label':"lit_5107",'name':"@5107",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522B4,'size':4,'pad':0,'label':"lit_5108",'name':"@5108",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522B8,'size':4,'pad':0,'label':"lit_5109",'name':"@5109",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522BC,'size':4,'pad':0,'label':"lit_5110",'name':"@5110",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522C0,'size':4,'pad':0,'label':"lit_5111",'name':"@5111",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522C4,'size':4,'pad':0,'label':"lit_5112",'name':"@5112",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522C8,'size':4,'pad':0,'label':"lit_5113",'name':"@5113",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522CC,'size':4,'pad':0,'label':"lit_5114",'name':"@5114",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522D0,'size':4,'pad':0,'label':"lit_5115",'name':"@5115",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522D4,'size':4,'pad':0,'label':"lit_5116",'name':"@5116",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522D8,'size':4,'pad':0,'label':"lit_5117",'name':"@5117",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522DC,'size':4,'pad':0,'label':"lit_5118",'name':"@5118",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522E0,'size':4,'pad':0,'label':"lit_5119",'name':"@5119",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522E4,'size':4,'pad':0,'label':"lit_5120",'name':"@5120",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522E8,'size':4,'pad':0,'label':"lit_5121",'name':"@5121",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522EC,'size':4,'pad':0,'label':"lit_5122",'name':"@5122",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522F0,'size':4,'pad':0,'label':"lit_5123",'name':"@5123",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522F4,'size':4,'pad':0,'label':"lit_5124",'name':"@5124",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522F8,'size':4,'pad':0,'label':"lit_5125",'name':"@5125",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804522FC,'size':4,'pad':0,'label':"lit_5126",'name':"@5126",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452300,'size':4,'pad':0,'label':"lit_5127",'name':"@5127",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452304,'size':4,'pad':0,'label':"lit_5128",'name':"@5128",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452308,'size':4,'pad':0,'label':"lit_5129",'name':"@5129",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045230C,'size':4,'pad':0,'label':"lit_5130",'name':"@5130",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452310,'size':4,'pad':0,'label':"lit_5131",'name':"@5131",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452314,'size':4,'pad':0,'label':"lit_5132",'name':"@5132",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452318,'size':4,'pad':0,'label':"lit_5133",'name':"@5133",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045231C,'size':4,'pad':0,'label':"lit_5134",'name':"@5134",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452320,'size':4,'pad':0,'label':"lit_5716",'name':"@5716",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452324,'size':4,'pad':0,'label':"lit_5717",'name':"@5717",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452328,'size':4,'pad':0,'label':"lit_5718",'name':"@5718",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045232C,'size':4,'pad':0,'label':"lit_5719",'name':"@5719",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452330,'size':4,'pad':0,'label':"lit_5720",'name':"@5720",'lib':0,'tu':105,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452334,'size':4,'pad':0,'label':"lit_5721",'name':"@5721",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452338,'size':4,'pad':0,'label':"lit_5722",'name':"@5722",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045233C,'size':4,'pad':0,'label':"lit_5723",'name':"@5723",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452340,'size':4,'pad':0,'label':"lit_5724",'name':"@5724",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452344,'size':4,'pad':0,'label':"lit_5725",'name':"@5725",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452348,'size':4,'pad':0,'label':"lit_5726",'name':"@5726",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045234C,'size':4,'pad':0,'label':"lit_5727",'name':"@5727",'lib':0,'tu':105,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452350,'size':4,'pad':0,'label':"lit_5728",'name':"@5728",'lib':0,'tu':105,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452354,'size':4,'pad':0,'label':"lit_5729",'name':"@5729",'lib':0,'tu':105,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452358,'size':4,'pad':0,'label':"lit_5730",'name':"@5730",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045235C,'size':4,'pad':0,'label':"lit_5731",'name':"@5731",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452360,'size':4,'pad':0,'label':"lit_5732",'name':"@5732",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452364,'size':4,'pad':0,'label':"lit_5733",'name':"@5733",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452368,'size':4,'pad':0,'label':"lit_5734",'name':"@5734",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045236C,'size':4,'pad':0,'label':"lit_5735",'name':"@5735",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452370,'size':4,'pad':0,'label':"lit_5736",'name':"@5736",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452374,'size':4,'pad':0,'label':"lit_5737",'name':"@5737",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452378,'size':4,'pad':0,'label':"lit_5738",'name':"@5738",'lib':0,'tu':105,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045237C,'size':4,'pad':0,'label':"lit_5739",'name':"@5739",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452380,'size':4,'pad':0,'label':"lit_5740",'name':"@5740",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452384,'size':4,'pad':0,'label':"lit_5741",'name':"@5741",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452388,'size':4,'pad':0,'label':"lit_5742",'name':"@5742",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045238C,'size':4,'pad':0,'label':"lit_5743",'name':"@5743",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452390,'size':4,'pad':0,'label':"lit_5744",'name':"@5744",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452394,'size':4,'pad':0,'label':"lit_5745",'name':"@5745",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452398,'size':4,'pad':0,'label':"lit_5746",'name':"@5746",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045239C,'size':4,'pad':0,'label':"lit_5747",'name':"@5747",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523A0,'size':4,'pad':0,'label':"lit_5748",'name':"@5748",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523A4,'size':4,'pad':0,'label':"lit_6355",'name':"@6355",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523A8,'size':4,'pad':0,'label':"lit_6356",'name':"@6356",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523AC,'size':4,'pad':0,'label':"lit_6357",'name':"@6357",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523B0,'size':4,'pad':0,'label':"lit_6358",'name':"@6358",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523B4,'size':4,'pad':0,'label':"lit_6359",'name':"@6359",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523B8,'size':4,'pad':0,'label':"lit_6360",'name':"@6360",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523BC,'size':4,'pad':0,'label':"lit_6361",'name':"@6361",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523C0,'size':4,'pad':0,'label':"lit_6362",'name':"@6362",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523C4,'size':4,'pad':0,'label':"lit_6363",'name':"@6363",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804523C8,'size':4,'pad':4,'label':"lit_6364",'name':"@6364",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804523D0,'size':8,'pad':0,'label':"lit_6365",'name':"@6365",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804523D8,'size':4,'pad':0,'label':"lit_6366",'name':"@6366",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523DC,'size':4,'pad':0,'label':"lit_6367",'name':"@6367",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523E0,'size':4,'pad':0,'label':"lit_6368",'name':"@6368",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523E4,'size':4,'pad':0,'label':"lit_6720",'name':"@6720",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523E8,'size':4,'pad':0,'label':"lit_6721",'name':"@6721",'lib':0,'tu':105,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523EC,'size':4,'pad':0,'label':"lit_6722",'name':"@6722",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523F0,'size':4,'pad':0,'label':"lit_6723",'name':"@6723",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523F4,'size':4,'pad':0,'label':"lit_6724",'name':"@6724",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523F8,'size':4,'pad':0,'label':"lit_6725",'name':"@6725",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804523FC,'size':4,'pad':0,'label':"lit_6726",'name':"@6726",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452400,'size':4,'pad':0,'label':"lit_6727",'name':"@6727",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452404,'size':4,'pad':0,'label':"lit_6728",'name':"@6728",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452408,'size':4,'pad':0,'label':"lit_6729",'name':"@6729",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045240C,'size':4,'pad':0,'label':"lit_6730",'name':"@6730",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452410,'size':4,'pad':0,'label':"lit_6731",'name':"@6731",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452414,'size':4,'pad':0,'label':"lit_6732",'name':"@6732",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452418,'size':4,'pad':0,'label':"lit_6733",'name':"@6733",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045241C,'size':4,'pad':0,'label':"lit_6734",'name':"@6734",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452420,'size':4,'pad':0,'label':"lit_6735",'name':"@6735",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452424,'size':4,'pad':0,'label':"lit_6736",'name':"@6736",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452428,'size':4,'pad':0,'label':"lit_6947",'name':"@6947",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045242C,'size':4,'pad':0,'label':"lit_6948",'name':"@6948",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804523D0,'size':8,'pad':0,'label':"lit_6365",'name':"@6365",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523D8,'size':4,'pad':0,'label':"lit_6366",'name':"@6366",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523DC,'size':4,'pad':0,'label':"lit_6367",'name':"@6367",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523E0,'size':4,'pad':0,'label':"lit_6368",'name':"@6368",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523E4,'size':4,'pad':0,'label':"lit_6720",'name':"@6720",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523E8,'size':4,'pad':0,'label':"lit_6721",'name':"@6721",'lib':0,'tu':105,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523EC,'size':4,'pad':0,'label':"lit_6722",'name':"@6722",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523F0,'size':4,'pad':0,'label':"lit_6723",'name':"@6723",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523F4,'size':4,'pad':0,'label':"lit_6724",'name':"@6724",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523F8,'size':4,'pad':0,'label':"lit_6725",'name':"@6725",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804523FC,'size':4,'pad':0,'label':"lit_6726",'name':"@6726",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452400,'size':4,'pad':0,'label':"lit_6727",'name':"@6727",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452404,'size':4,'pad':0,'label':"lit_6728",'name':"@6728",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452408,'size':4,'pad':0,'label':"lit_6729",'name':"@6729",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045240C,'size':4,'pad':0,'label':"lit_6730",'name':"@6730",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452410,'size':4,'pad':0,'label':"lit_6731",'name':"@6731",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452414,'size':4,'pad':0,'label':"lit_6732",'name':"@6732",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452418,'size':4,'pad':0,'label':"lit_6733",'name':"@6733",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045241C,'size':4,'pad':0,'label':"lit_6734",'name':"@6734",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452420,'size':4,'pad':0,'label':"lit_6735",'name':"@6735",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452424,'size':4,'pad':0,'label':"lit_6736",'name':"@6736",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452428,'size':4,'pad':0,'label':"lit_6947",'name':"@6947",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045242C,'size':4,'pad':0,'label':"lit_6948",'name':"@6948",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452430,'size':4,'pad':4,'label':"lit_6949",'name':"@6949",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80452438,'size':8,'pad':0,'label':"lit_6950",'name':"@6950",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452440,'size':4,'pad':0,'label':"lit_6951",'name':"@6951",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452444,'size':4,'pad':0,'label':"lit_6952",'name':"@6952",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452448,'size':4,'pad':0,'label':"lit_6953",'name':"@6953",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045244C,'size':4,'pad':0,'label':"lit_6954",'name':"@6954",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452450,'size':4,'pad':0,'label':"lit_6955",'name':"@6955",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452454,'size':4,'pad':0,'label':"lit_7208",'name':"@7208",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452458,'size':4,'pad':0,'label':"lit_7209",'name':"@7209",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045245C,'size':4,'pad':0,'label':"lit_7210",'name':"@7210",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452460,'size':4,'pad':0,'label':"lit_7211",'name':"@7211",'lib':0,'tu':105,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452464,'size':4,'pad':0,'label':"lit_7212",'name':"@7212",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452468,'size':4,'pad':0,'label':"lit_7213",'name':"@7213",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045246C,'size':4,'pad':0,'label':"lit_7545",'name':"@7545",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452470,'size':4,'pad':0,'label':"lit_7546",'name':"@7546",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452474,'size':4,'pad':0,'label':"lit_7547",'name':"@7547",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452478,'size':4,'pad':0,'label':"lit_7548",'name':"@7548",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045247C,'size':4,'pad':0,'label':"lit_7882",'name':"@7882",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452480,'size':4,'pad':0,'label':"lit_7883",'name':"@7883",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452484,'size':4,'pad':0,'label':"lit_7884",'name':"@7884",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452488,'size':4,'pad':0,'label':"lit_7885",'name':"@7885",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045248C,'size':4,'pad':0,'label':"lit_7886",'name':"@7886",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452490,'size':4,'pad':0,'label':"lit_7887",'name':"@7887",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452494,'size':4,'pad':0,'label':"lit_7888",'name':"@7888",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452498,'size':4,'pad':0,'label':"lit_7889",'name':"@7889",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045249C,'size':4,'pad':0,'label':"lit_7890",'name':"@7890",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524A0,'size':4,'pad':0,'label':"lit_7891",'name':"@7891",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524A4,'size':4,'pad':0,'label':"lit_7892",'name':"@7892",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524A8,'size':4,'pad':0,'label':"lit_7893",'name':"@7893",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524AC,'size':4,'pad':0,'label':"lit_7894",'name':"@7894",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524B0,'size':4,'pad':0,'label':"lit_8211",'name':"@8211",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524B4,'size':4,'pad':0,'label':"lit_8212",'name':"@8212",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524B8,'size':4,'pad':0,'label':"lit_8213",'name':"@8213",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524BC,'size':4,'pad':0,'label':"lit_8214",'name':"@8214",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524C0,'size':4,'pad':0,'label':"lit_8215",'name':"@8215",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524C4,'size':4,'pad':0,'label':"lit_8360",'name':"@8360",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524C8,'size':4,'pad':0,'label':"lit_8361",'name':"@8361",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452438,'size':8,'pad':0,'label':"lit_6950",'name':"@6950",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452440,'size':4,'pad':0,'label':"lit_6951",'name':"@6951",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452444,'size':4,'pad':0,'label':"lit_6952",'name':"@6952",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452448,'size':4,'pad':0,'label':"lit_6953",'name':"@6953",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045244C,'size':4,'pad':0,'label':"lit_6954",'name':"@6954",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452450,'size':4,'pad':0,'label':"lit_6955",'name':"@6955",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452454,'size':4,'pad':0,'label':"lit_7208",'name':"@7208",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452458,'size':4,'pad':0,'label':"lit_7209",'name':"@7209",'lib':0,'tu':105,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045245C,'size':4,'pad':0,'label':"lit_7210",'name':"@7210",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452460,'size':4,'pad':0,'label':"lit_7211",'name':"@7211",'lib':0,'tu':105,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452464,'size':4,'pad':0,'label':"lit_7212",'name':"@7212",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452468,'size':4,'pad':0,'label':"lit_7213",'name':"@7213",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045246C,'size':4,'pad':0,'label':"lit_7545",'name':"@7545",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452470,'size':4,'pad':0,'label':"lit_7546",'name':"@7546",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452474,'size':4,'pad':0,'label':"lit_7547",'name':"@7547",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452478,'size':4,'pad':0,'label':"lit_7548",'name':"@7548",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045247C,'size':4,'pad':0,'label':"lit_7882",'name':"@7882",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452480,'size':4,'pad':0,'label':"lit_7883",'name':"@7883",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452484,'size':4,'pad':0,'label':"lit_7884",'name':"@7884",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452488,'size':4,'pad':0,'label':"lit_7885",'name':"@7885",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045248C,'size':4,'pad':0,'label':"lit_7886",'name':"@7886",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452490,'size':4,'pad':0,'label':"lit_7887",'name':"@7887",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452494,'size':4,'pad':0,'label':"lit_7888",'name':"@7888",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452498,'size':4,'pad':0,'label':"lit_7889",'name':"@7889",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045249C,'size':4,'pad':0,'label':"lit_7890",'name':"@7890",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524A0,'size':4,'pad':0,'label':"lit_7891",'name':"@7891",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524A4,'size':4,'pad':0,'label':"lit_7892",'name':"@7892",'lib':0,'tu':105,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524A8,'size':4,'pad':0,'label':"lit_7893",'name':"@7893",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524AC,'size':4,'pad':0,'label':"lit_7894",'name':"@7894",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524B0,'size':4,'pad':0,'label':"lit_8211",'name':"@8211",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524B4,'size':4,'pad':0,'label':"lit_8212",'name':"@8212",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524B8,'size':4,'pad':0,'label':"lit_8213",'name':"@8213",'lib':0,'tu':105,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524BC,'size':4,'pad':0,'label':"lit_8214",'name':"@8214",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524C0,'size':4,'pad':0,'label':"lit_8215",'name':"@8215",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524C4,'size':4,'pad':0,'label':"lit_8360",'name':"@8360",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524C8,'size':4,'pad':0,'label':"lit_8361",'name':"@8361",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804524CC,'size':4,'pad':0,'label':"lit_8393",'name':"@8393",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804524D0,'size':4,'pad':0,'label':"lit_8394",'name':"@8394",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524D4,'size':4,'pad':0,'label':"lit_8917",'name':"@8917",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524D8,'size':4,'pad':0,'label':"lit_8918",'name':"@8918",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524DC,'size':4,'pad':0,'label':"lit_8919",'name':"@8919",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524E0,'size':4,'pad':0,'label':"lit_8920",'name':"@8920",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524E4,'size':4,'pad':0,'label':"lit_8921",'name':"@8921",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524E8,'size':4,'pad':0,'label':"lit_8922",'name':"@8922",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524EC,'size':4,'pad':0,'label':"lit_8923",'name':"@8923",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524F0,'size':4,'pad':0,'label':"lit_8924",'name':"@8924",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524F4,'size':4,'pad':0,'label':"lit_8925",'name':"@8925",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524F8,'size':4,'pad':0,'label':"lit_8926",'name':"@8926",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804524FC,'size':4,'pad':0,'label':"lit_8927",'name':"@8927",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804524D4,'size':4,'pad':0,'label':"lit_8917",'name':"@8917",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524D8,'size':4,'pad':0,'label':"lit_8918",'name':"@8918",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524DC,'size':4,'pad':0,'label':"lit_8919",'name':"@8919",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524E0,'size':4,'pad':0,'label':"lit_8920",'name':"@8920",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524E4,'size':4,'pad':0,'label':"lit_8921",'name':"@8921",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524E8,'size':4,'pad':0,'label':"lit_8922",'name':"@8922",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524EC,'size':4,'pad':0,'label':"lit_8923",'name':"@8923",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524F0,'size':4,'pad':0,'label':"lit_8924",'name':"@8924",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524F4,'size':4,'pad':0,'label':"lit_8925",'name':"@8925",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524F8,'size':4,'pad':0,'label':"lit_8926",'name':"@8926",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804524FC,'size':4,'pad':0,'label':"lit_8927",'name':"@8927",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452500,'size':4,'pad':0,'label':"lit_8939",'name':"@8939",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80452504,'size':4,'pad':0,'label':"lit_8940",'name':"@8940",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452508,'size':4,'pad':0,'label':"lit_9384",'name':"@9384",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045250C,'size':4,'pad':0,'label':"lit_9385",'name':"@9385",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452510,'size':4,'pad':0,'label':"lit_9386",'name':"@9386",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452514,'size':4,'pad':0,'label':"lit_9387",'name':"@9387",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452518,'size':4,'pad':0,'label':"lit_9388",'name':"@9388",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045251C,'size':4,'pad':0,'label':"lit_9389",'name':"@9389",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452520,'size':4,'pad':0,'label':"lit_9390",'name':"@9390",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452524,'size':4,'pad':0,'label':"lit_9391",'name':"@9391",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452528,'size':4,'pad':0,'label':"lit_9392",'name':"@9392",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045252C,'size':4,'pad':0,'label':"lit_9393",'name':"@9393",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452530,'size':4,'pad':0,'label':"lit_9394",'name':"@9394",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452534,'size':4,'pad':0,'label':"lit_9395",'name':"@9395",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452538,'size':4,'pad':0,'label':"lit_9396",'name':"@9396",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045253C,'size':4,'pad':0,'label':"lit_9397",'name':"@9397",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452540,'size':4,'pad':0,'label':"lit_9398",'name':"@9398",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452544,'size':4,'pad':0,'label':"lit_9399",'name':"@9399",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452548,'size':4,'pad':0,'label':"lit_9400",'name':"@9400",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045254C,'size':4,'pad':0,'label':"lit_9401",'name':"@9401",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452550,'size':4,'pad':0,'label':"lit_9402",'name':"@9402",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452554,'size':4,'pad':0,'label':"lit_9833",'name':"@9833",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452558,'size':4,'pad':0,'label':"lit_9834",'name':"@9834",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045255C,'size':4,'pad':0,'label':"lit_9835",'name':"@9835",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452560,'size':4,'pad':0,'label':"lit_9836",'name':"@9836",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452564,'size':4,'pad':0,'label':"lit_9837",'name':"@9837",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452508,'size':4,'pad':0,'label':"lit_9384",'name':"@9384",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045250C,'size':4,'pad':0,'label':"lit_9385",'name':"@9385",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452510,'size':4,'pad':0,'label':"lit_9386",'name':"@9386",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452514,'size':4,'pad':0,'label':"lit_9387",'name':"@9387",'lib':0,'tu':105,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452518,'size':4,'pad':0,'label':"lit_9388",'name':"@9388",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045251C,'size':4,'pad':0,'label':"lit_9389",'name':"@9389",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452520,'size':4,'pad':0,'label':"lit_9390",'name':"@9390",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452524,'size':4,'pad':0,'label':"lit_9391",'name':"@9391",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452528,'size':4,'pad':0,'label':"lit_9392",'name':"@9392",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045252C,'size':4,'pad':0,'label':"lit_9393",'name':"@9393",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452530,'size':4,'pad':0,'label':"lit_9394",'name':"@9394",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452534,'size':4,'pad':0,'label':"lit_9395",'name':"@9395",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452538,'size':4,'pad':0,'label':"lit_9396",'name':"@9396",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045253C,'size':4,'pad':0,'label':"lit_9397",'name':"@9397",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452540,'size':4,'pad':0,'label':"lit_9398",'name':"@9398",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452544,'size':4,'pad':0,'label':"lit_9399",'name':"@9399",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452548,'size':4,'pad':0,'label':"lit_9400",'name':"@9400",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045254C,'size':4,'pad':0,'label':"lit_9401",'name':"@9401",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452550,'size':4,'pad':0,'label':"lit_9402",'name':"@9402",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452554,'size':4,'pad':0,'label':"lit_9833",'name':"@9833",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452558,'size':4,'pad':0,'label':"lit_9834",'name':"@9834",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045255C,'size':4,'pad':0,'label':"lit_9835",'name':"@9835",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452560,'size':4,'pad':0,'label':"lit_9836",'name':"@9836",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452564,'size':4,'pad':0,'label':"lit_9837",'name':"@9837",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452568,'size':4,'pad':0,'label':"lit_9850",'name':"@9850",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x8045256C,'size':4,'pad':0,'label':"lit_9851",'name':"@9851",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80452570,'size':4,'pad':0,'label':"lit_9852",'name':"@9852",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452574,'size':4,'pad':0,'label':"lit_10030",'name':"@10030",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452578,'size':4,'pad':0,'label':"lit_10031",'name':"@10031",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045257C,'size':4,'pad':0,'label':"lit_10593",'name':"@10593",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452580,'size':4,'pad':0,'label':"lit_10594",'name':"@10594",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452584,'size':4,'pad':0,'label':"lit_10595",'name':"@10595",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452588,'size':4,'pad':0,'label':"lit_10596",'name':"@10596",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045258C,'size':4,'pad':0,'label':"lit_10597",'name':"@10597",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452590,'size':4,'pad':0,'label':"lit_10598",'name':"@10598",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452594,'size':4,'pad':0,'label':"lit_10599",'name':"@10599",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452598,'size':4,'pad':0,'label':"lit_10600",'name':"@10600",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045259C,'size':4,'pad':0,'label':"lit_10601",'name':"@10601",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525A0,'size':4,'pad':0,'label':"lit_10602",'name':"@10602",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525A4,'size':4,'pad':0,'label':"lit_10603",'name':"@10603",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525A8,'size':4,'pad':0,'label':"lit_10604",'name':"@10604",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525AC,'size':4,'pad':0,'label':"lit_10732",'name':"@10732",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525B0,'size':4,'pad':0,'label':"lit_10733",'name':"@10733",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525B4,'size':4,'pad':0,'label':"lit_10734",'name':"@10734",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525B8,'size':4,'pad':0,'label':"lit_10735",'name':"@10735",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525BC,'size':4,'pad':0,'label':"lit_10736",'name':"@10736",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525C0,'size':4,'pad':0,'label':"lit_10737",'name':"@10737",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525C4,'size':4,'pad':0,'label':"lit_10738",'name':"@10738",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525C8,'size':4,'pad':0,'label':"lit_10739",'name':"@10739",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525CC,'size':4,'pad':0,'label':"lit_10872",'name':"@10872",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525D0,'size':4,'pad':0,'label':"lit_10873",'name':"@10873",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525D4,'size':4,'pad':0,'label':"lit_11302",'name':"@11302",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525D8,'size':4,'pad':0,'label':"lit_11508",'name':"@11508",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525DC,'size':4,'pad':0,'label':"lit_11509",'name':"@11509",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525E0,'size':4,'pad':0,'label':"lit_11882",'name':"@11882",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525E4,'size':4,'pad':0,'label':"lit_11883",'name':"@11883",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525E8,'size':4,'pad':0,'label':"lit_11884",'name':"@11884",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525EC,'size':4,'pad':0,'label':"lit_11885",'name':"@11885",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525F0,'size':4,'pad':0,'label':"lit_11886",'name':"@11886",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525F4,'size':4,'pad':0,'label':"lit_11887",'name':"@11887",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525F8,'size':4,'pad':0,'label':"lit_11953",'name':"@11953",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804525FC,'size':4,'pad':0,'label':"lit_12252",'name':"@12252",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452600,'size':4,'pad':0,'label':"lit_12253",'name':"@12253",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452604,'size':4,'pad':0,'label':"lit_12254",'name':"@12254",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452608,'size':4,'pad':0,'label':"lit_12255",'name':"@12255",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045260C,'size':4,'pad':0,'label':"lit_12256",'name':"@12256",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452610,'size':4,'pad':0,'label':"lit_12257",'name':"@12257",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452614,'size':4,'pad':0,'label':"lit_12258",'name':"@12258",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452618,'size':4,'pad':0,'label':"lit_12259",'name':"@12259",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045261C,'size':4,'pad':0,'label':"lit_12260",'name':"@12260",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452620,'size':8,'pad':0,'label':"lit_3756",'name':"@3756",'lib':0,'tu':106,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452628,'size':4,'pad':0,'label':"lit_4061",'name':"@4061",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045262C,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452630,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452634,'size':4,'pad':0,'label':"lit_4064",'name':"@4064",'lib':0,'tu':108,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452638,'size':4,'pad':0,'label':"lit_4065",'name':"@4065",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045263C,'size':4,'pad':0,'label':"lit_4066",'name':"@4066",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452640,'size':4,'pad':0,'label':"lit_4067",'name':"@4067",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452644,'size':4,'pad':0,'label':"lit_4068",'name':"@4068",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452648,'size':4,'pad':0,'label':"lit_4069",'name':"@4069",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045264C,'size':4,'pad':0,'label':"lit_4070",'name':"@4070",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452574,'size':4,'pad':0,'label':"lit_10030",'name':"@10030",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452578,'size':4,'pad':0,'label':"lit_10031",'name':"@10031",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045257C,'size':4,'pad':0,'label':"lit_10593",'name':"@10593",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452580,'size':4,'pad':0,'label':"lit_10594",'name':"@10594",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452584,'size':4,'pad':0,'label':"lit_10595",'name':"@10595",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452588,'size':4,'pad':0,'label':"lit_10596",'name':"@10596",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045258C,'size':4,'pad':0,'label':"lit_10597",'name':"@10597",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452590,'size':4,'pad':0,'label':"lit_10598",'name':"@10598",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452594,'size':4,'pad':0,'label':"lit_10599",'name':"@10599",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452598,'size':4,'pad':0,'label':"lit_10600",'name':"@10600",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045259C,'size':4,'pad':0,'label':"lit_10601",'name':"@10601",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525A0,'size':4,'pad':0,'label':"lit_10602",'name':"@10602",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525A4,'size':4,'pad':0,'label':"lit_10603",'name':"@10603",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525A8,'size':4,'pad':0,'label':"lit_10604",'name':"@10604",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525AC,'size':4,'pad':0,'label':"lit_10732",'name':"@10732",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525B0,'size':4,'pad':0,'label':"lit_10733",'name':"@10733",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525B4,'size':4,'pad':0,'label':"lit_10734",'name':"@10734",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525B8,'size':4,'pad':0,'label':"lit_10735",'name':"@10735",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525BC,'size':4,'pad':0,'label':"lit_10736",'name':"@10736",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525C0,'size':4,'pad':0,'label':"lit_10737",'name':"@10737",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525C4,'size':4,'pad':0,'label':"lit_10738",'name':"@10738",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525C8,'size':4,'pad':0,'label':"lit_10739",'name':"@10739",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525CC,'size':4,'pad':0,'label':"lit_10872",'name':"@10872",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525D0,'size':4,'pad':0,'label':"lit_10873",'name':"@10873",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525D4,'size':4,'pad':0,'label':"lit_11302",'name':"@11302",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525D8,'size':4,'pad':0,'label':"lit_11508",'name':"@11508",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525DC,'size':4,'pad':0,'label':"lit_11509",'name':"@11509",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525E0,'size':4,'pad':0,'label':"lit_11882",'name':"@11882",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525E4,'size':4,'pad':0,'label':"lit_11883",'name':"@11883",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525E8,'size':4,'pad':0,'label':"lit_11884",'name':"@11884",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525EC,'size':4,'pad':0,'label':"lit_11885",'name':"@11885",'lib':0,'tu':105,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525F0,'size':4,'pad':0,'label':"lit_11886",'name':"@11886",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525F4,'size':4,'pad':0,'label':"lit_11887",'name':"@11887",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525F8,'size':4,'pad':0,'label':"lit_11953",'name':"@11953",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804525FC,'size':4,'pad':0,'label':"lit_12252",'name':"@12252",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452600,'size':4,'pad':0,'label':"lit_12253",'name':"@12253",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452604,'size':4,'pad':0,'label':"lit_12254",'name':"@12254",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452608,'size':4,'pad':0,'label':"lit_12255",'name':"@12255",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045260C,'size':4,'pad':0,'label':"lit_12256",'name':"@12256",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452610,'size':4,'pad':0,'label':"lit_12257",'name':"@12257",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452614,'size':4,'pad':0,'label':"lit_12258",'name':"@12258",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452618,'size':4,'pad':0,'label':"lit_12259",'name':"@12259",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045261C,'size':4,'pad':0,'label':"lit_12260",'name':"@12260",'lib':0,'tu':105,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452620,'size':8,'pad':0,'label':"lit_3756",'name':"@3756",'lib':0,'tu':106,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452628,'size':4,'pad':0,'label':"lit_4061",'name':"@4061",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045262C,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452630,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452634,'size':4,'pad':0,'label':"lit_4064",'name':"@4064",'lib':0,'tu':108,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452638,'size':4,'pad':0,'label':"lit_4065",'name':"@4065",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045263C,'size':4,'pad':0,'label':"lit_4066",'name':"@4066",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452640,'size':4,'pad':0,'label':"lit_4067",'name':"@4067",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452644,'size':4,'pad':0,'label':"lit_4068",'name':"@4068",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452648,'size':4,'pad':0,'label':"lit_4069",'name':"@4069",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045264C,'size':4,'pad':0,'label':"lit_4070",'name':"@4070",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452650,'size':4,'pad':0,'label':"lit_4071",'name':"@4071",'lib':0,'tu':108,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452654,'size':4,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452658,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':108,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045265C,'size':4,'pad':0,'label':"lit_4084",'name':"@4084",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452660,'size':4,'pad':0,'label':"lit_4085",'name':"@4085",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452664,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452654,'size':4,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452658,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':108,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045265C,'size':4,'pad':0,'label':"lit_4084",'name':"@4084",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452660,'size':4,'pad':0,'label':"lit_4085",'name':"@4085",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452664,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452668,'size':4,'pad':4,'label':"lit_4448",'name':"@4448",'lib':0,'tu':108,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80452670,'size':8,'pad':0,'label':"lit_4450",'name':"@4450",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452678,'size':8,'pad':0,'label':"lit_4514",'name':"@4514",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452680,'size':8,'pad':0,'label':"lit_4515",'name':"@4515",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452670,'size':8,'pad':0,'label':"lit_4450",'name':"@4450",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452678,'size':8,'pad':0,'label':"lit_4514",'name':"@4514",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452680,'size':8,'pad':0,'label':"lit_4515",'name':"@4515",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452688,'size':8,'pad':0,'label':"lit_4516",'name':"@4516",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452690,'size':4,'pad':0,'label':"lit_4562",'name':"@4562",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452694,'size':4,'pad':0,'label':"lit_4563",'name':"@4563",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452698,'size':4,'pad':0,'label':"lit_5137",'name':"@5137",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045269C,'size':4,'pad':0,'label':"lit_5138",'name':"@5138",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452690,'size':4,'pad':0,'label':"lit_4562",'name':"@4562",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452694,'size':4,'pad':0,'label':"lit_4563",'name':"@4563",'lib':0,'tu':108,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452698,'size':4,'pad':0,'label':"lit_5137",'name':"@5137",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045269C,'size':4,'pad':0,'label':"lit_5138",'name':"@5138",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804526A0,'size':4,'pad':4,'label':"lit_5668",'name':"@5668",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804526A8,'size':8,'pad':0,'label':"lit_5670",'name':"@5670",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804526B0,'size':4,'pad':0,'label':"lit_5784",'name':"@5784",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804526B4,'size':4,'pad':0,'label':"lit_5785",'name':"@5785",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804526A8,'size':8,'pad':0,'label':"lit_5670",'name':"@5670",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804526B0,'size':4,'pad':0,'label':"lit_5784",'name':"@5784",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804526B4,'size':4,'pad':0,'label':"lit_5785",'name':"@5785",'lib':0,'tu':108,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804526B8,'size':4,'pad':4,'label':"lit_3738",'name':"@3738",'lib':0,'tu':112,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804526C0,'size':4,'pad':0,'label':"lit_4025",'name':"@4025",'lib':0,'tu':113,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804526C4,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':113,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804526C8,'size':4,'pad':0,'label':"lit_4090",'name':"@4090",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804526CC,'size':4,'pad':0,'label':"lit_4091",'name':"@4091",'lib':0,'tu':113,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804526D0,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804526D4,'size':4,'pad':0,'label':"lit_4424",'name':"@4424",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804526D8,'size':4,'pad':0,'label':"lit_4554",'name':"@4554",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804526DC,'size':4,'pad':0,'label':"lit_4555",'name':"@4555",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804526C4,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':113,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804526C8,'size':4,'pad':0,'label':"lit_4090",'name':"@4090",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804526CC,'size':4,'pad':0,'label':"lit_4091",'name':"@4091",'lib':0,'tu':113,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804526D0,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804526D4,'size':4,'pad':0,'label':"lit_4424",'name':"@4424",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804526D8,'size':4,'pad':0,'label':"lit_4554",'name':"@4554",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804526DC,'size':4,'pad':0,'label':"lit_4555",'name':"@4555",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804526E0,'size':4,'pad':4,'label':"lit_4762",'name':"@4762",'lib':0,'tu':113,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804526E8,'size':4,'pad':0,'label':"lit_319",'name':"@319",'lib':0,'tu':120,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804526EC,'size':4,'pad':0,'label':"lit_320",'name':"@320",'lib':0,'tu':120,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804526EC,'size':4,'pad':0,'label':"lit_320",'name':"@320",'lib':0,'tu':120,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804526F0,'size':4,'pad':0,'label':"lit_316",'name':"@316",'lib':0,'tu':122,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804526F4,'size':4,'pad':0,'label':"lit_333",'name':"@333",'lib':0,'tu':122,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804526F4,'size':4,'pad':0,'label':"lit_333",'name':"@333",'lib':0,'tu':122,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804526F8,'size':4,'pad':0,'label':"lit_3717",'name':"@3717",'lib':0,'tu':124,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804526FC,'size':4,'pad':0,'label':"lit_3935",'name':"@3935",'lib':0,'tu':124,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452700,'size':4,'pad':0,'label':"lit_3936",'name':"@3936",'lib':0,'tu':124,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452704,'size':4,'pad':0,'label':"lit_3937",'name':"@3937",'lib':0,'tu':124,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452708,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':124,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045270C,'size':4,'pad':0,'label':"lit_4271",'name':"@4271",'lib':0,'tu':124,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804526FC,'size':4,'pad':0,'label':"lit_3935",'name':"@3935",'lib':0,'tu':124,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452700,'size':4,'pad':0,'label':"lit_3936",'name':"@3936",'lib':0,'tu':124,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452704,'size':4,'pad':0,'label':"lit_3937",'name':"@3937",'lib':0,'tu':124,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452708,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':124,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045270C,'size':4,'pad':0,'label':"lit_4271",'name':"@4271",'lib':0,'tu':124,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452710,'size':4,'pad':4,'label':"lit_4962",'name':"@4962",'lib':0,'tu':124,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452718,'size':4,'pad':0,'label':"lit_4187",'name':"@4187",'lib':0,'tu':126,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045271C,'size':4,'pad':0,'label':"lit_4188",'name':"@4188",'lib':0,'tu':126,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452720,'size':4,'pad':0,'label':"lit_4189",'name':"@4189",'lib':0,'tu':126,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452724,'size':4,'pad':0,'label':"lit_4190",'name':"@4190",'lib':0,'tu':126,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452728,'size':4,'pad':0,'label':"lit_4191",'name':"@4191",'lib':0,'tu':126,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045272C,'size':4,'pad':0,'label':"lit_4293",'name':"@4293",'lib':0,'tu':126,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452730,'size':8,'pad':0,'label':"lit_5298",'name':"@5298",'lib':0,'tu':126,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452738,'size':8,'pad':0,'label':"lit_5299",'name':"@5299",'lib':0,'tu':126,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x8045271C,'size':4,'pad':0,'label':"lit_4188",'name':"@4188",'lib':0,'tu':126,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452720,'size':4,'pad':0,'label':"lit_4189",'name':"@4189",'lib':0,'tu':126,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452724,'size':4,'pad':0,'label':"lit_4190",'name':"@4190",'lib':0,'tu':126,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452728,'size':4,'pad':0,'label':"lit_4191",'name':"@4191",'lib':0,'tu':126,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045272C,'size':4,'pad':0,'label':"lit_4293",'name':"@4293",'lib':0,'tu':126,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452730,'size':8,'pad':0,'label':"lit_5298",'name':"@5298",'lib':0,'tu':126,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452738,'size':8,'pad':0,'label':"lit_5299",'name':"@5299",'lib':0,'tu':126,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452740,'size':8,'pad':0,'label':"lit_5300",'name':"@5300",'lib':0,'tu':126,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80452748,'size':4,'pad':4,'label':"lit_5301",'name':"@5301",'lib':0,'tu':126,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80452750,'size':8,'pad':0,'label':"lit_6099",'name':"@6099",'lib':0,'tu':126,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452750,'size':8,'pad':0,'label':"lit_6099",'name':"@6099",'lib':0,'tu':126,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452758,'size':4,'pad':0,'label':"lit_3807",'name':"@3807",'lib':0,'tu':127,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045275C,'size':4,'pad':0,'label':"lit_3808",'name':"@3808",'lib':0,'tu':127,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045275C,'size':4,'pad':0,'label':"lit_3808",'name':"@3808",'lib':0,'tu':127,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452760,'size':4,'pad':0,'label':"lit_3627",'name':"@3627",'lib':0,'tu':129,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452764,'size':4,'pad':0,'label':"lit_3724",'name':"@3724",'lib':0,'tu':129,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452768,'size':4,'pad':0,'label':"lit_3780",'name':"@3780",'lib':0,'tu':129,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045276C,'size':4,'pad':0,'label':"lit_3899",'name':"@3899",'lib':0,'tu':129,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452770,'size':4,'pad':0,'label':"lit_3900",'name':"@3900",'lib':0,'tu':129,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452774,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':0,'tu':129,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452764,'size':4,'pad':0,'label':"lit_3724",'name':"@3724",'lib':0,'tu':129,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452768,'size':4,'pad':0,'label':"lit_3780",'name':"@3780",'lib':0,'tu':129,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045276C,'size':4,'pad':0,'label':"lit_3899",'name':"@3899",'lib':0,'tu':129,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452770,'size':4,'pad':0,'label':"lit_3900",'name':"@3900",'lib':0,'tu':129,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452774,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':0,'tu':129,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452778,'size':4,'pad':0,'label':"lit_3705",'name':"@3705",'lib':0,'tu':130,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045277C,'size':4,'pad':0,'label':"lit_3924",'name':"@3924",'lib':0,'tu':130,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045277C,'size':4,'pad':0,'label':"lit_3924",'name':"@3924",'lib':0,'tu':130,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452780,'size':4,'pad':4,'label':"lit_3925",'name':"@3925",'lib':0,'tu':130,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80452788,'size':8,'pad':0,'label':"lit_3927",'name':"@3927",'lib':0,'tu':130,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452788,'size':8,'pad':0,'label':"lit_3927",'name':"@3927",'lib':0,'tu':130,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452790,'size':4,'pad':4,'label':"lit_4336",'name':"@4336",'lib':0,'tu':130,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80452798,'size':4,'pad':4,'label':"lit_4212",'name':"@4212",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804527A0,'size':8,'pad':0,'label':"lit_4213",'name':"@4213",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804527A8,'size':8,'pad':0,'label':"lit_4214",'name':"@4214",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452798,'size':4,'pad':4,'label':"lit_4212",'name':"@4212",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804527A0,'size':8,'pad':0,'label':"lit_4213",'name':"@4213",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804527A8,'size':8,'pad':0,'label':"lit_4214",'name':"@4214",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804527B0,'size':8,'pad':0,'label':"lit_4215",'name':"@4215",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804527B8,'size':4,'pad':0,'label':"lit_4216",'name':"@4216",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804527BC,'size':4,'pad':0,'label':"lit_4217",'name':"@4217",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804527B8,'size':4,'pad':0,'label':"lit_4216",'name':"@4216",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804527BC,'size':4,'pad':0,'label':"lit_4217",'name':"@4217",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804527C0,'size':4,'pad':4,'label':"lit_4218",'name':"@4218",'lib':0,'tu':131,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804527C8,'size':4,'pad':4,'label':"lit_3769",'name':"@3769",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804527D0,'size':8,'pad':0,'label':"lit_3770",'name':"@3770",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804527D8,'size':8,'pad':0,'label':"lit_3771",'name':"@3771",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804527E0,'size':8,'pad':0,'label':"lit_3772",'name':"@3772",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804527E8,'size':8,'pad':0,'label':"lit_3773",'name':"@3773",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804527C8,'size':4,'pad':4,'label':"lit_3769",'name':"@3769",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804527D0,'size':8,'pad':0,'label':"lit_3770",'name':"@3770",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804527D8,'size':8,'pad':0,'label':"lit_3771",'name':"@3771",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804527E0,'size':8,'pad':0,'label':"lit_3772",'name':"@3772",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804527E8,'size':8,'pad':0,'label':"lit_3773",'name':"@3773",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804527F0,'size':8,'pad':0,'label':"lit_3774",'name':"@3774",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804527F8,'size':8,'pad':0,'label':"lit_3775",'name':"@3775",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452800,'size':8,'pad':0,'label':"lit_3776",'name':"@3776",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452808,'size':8,'pad':0,'label':"lit_3777",'name':"@3777",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452810,'size':4,'pad':0,'label':"lit_3791",'name':"@3791",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452814,'size':4,'pad':0,'label':"lit_3807",'name':"@3807",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452818,'size':4,'pad':0,'label':"lit_3991",'name':"@3991",'lib':0,'tu':132,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045281C,'size':4,'pad':0,'label':"lit_3992",'name':"@3992",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452820,'size':4,'pad':0,'label':"lit_4001",'name':"@4001",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452824,'size':4,'pad':0,'label':"lit_4002",'name':"@4002",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452828,'size':4,'pad':0,'label':"lit_4003",'name':"@4003",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045282C,'size':4,'pad':0,'label':"lit_4004",'name':"@4004",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452830,'size':4,'pad':0,'label':"lit_4005",'name':"@4005",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452834,'size':4,'pad':0,'label':"lit_4006",'name':"@4006",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452838,'size':4,'pad':0,'label':"lit_4007",'name':"@4007",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045283C,'size':4,'pad':0,'label':"lit_4008",'name':"@4008",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452840,'size':4,'pad':0,'label':"lit_4009",'name':"@4009",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452844,'size':4,'pad':0,'label':"lit_4010",'name':"@4010",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452848,'size':4,'pad':0,'label':"lit_4011",'name':"@4011",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045284C,'size':4,'pad':0,'label':"lit_4012",'name':"@4012",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452850,'size':4,'pad':0,'label':"lit_4013",'name':"@4013",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452854,'size':4,'pad':0,'label':"lit_4014",'name':"@4014",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452858,'size':4,'pad':0,'label':"lit_4058",'name':"@4058",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045285C,'size':4,'pad':0,'label':"lit_4119",'name':"@4119",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452860,'size':4,'pad':0,'label':"lit_4120",'name':"@4120",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452864,'size':4,'pad':0,'label':"lit_4121",'name':"@4121",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452868,'size':4,'pad':0,'label':"lit_4122",'name':"@4122",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045286C,'size':4,'pad':0,'label':"lit_4123",'name':"@4123",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452870,'size':4,'pad':0,'label':"lit_4124",'name':"@4124",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452874,'size':4,'pad':0,'label':"lit_4125",'name':"@4125",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452878,'size':4,'pad':0,'label':"lit_4126",'name':"@4126",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045287C,'size':4,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452880,'size':4,'pad':0,'label':"lit_4128",'name':"@4128",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452884,'size':4,'pad':0,'label':"lit_4129",'name':"@4129",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452888,'size':4,'pad':0,'label':"lit_4130",'name':"@4130",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045288C,'size':4,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452890,'size':4,'pad':0,'label':"lit_4132",'name':"@4132",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452894,'size':4,'pad':0,'label':"lit_4133",'name':"@4133",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452898,'size':4,'pad':0,'label':"lit_4134",'name':"@4134",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045289C,'size':4,'pad':0,'label':"lit_4135",'name':"@4135",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804528A0,'size':4,'pad':0,'label':"lit_4136",'name':"@4136",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804528A4,'size':4,'pad':0,'label':"lit_4137",'name':"@4137",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804528A8,'size':4,'pad':0,'label':"lit_4138",'name':"@4138",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804528AC,'size':4,'pad':0,'label':"lit_4139",'name':"@4139",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804528B0,'size':4,'pad':0,'label':"lit_4140",'name':"@4140",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804528B4,'size':4,'pad':0,'label':"lit_4173",'name':"@4173",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804528B8,'size':4,'pad':4,'label':"lit_5141",'name':"@5141",'lib':0,'tu':133,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804528C0,'size':8,'pad':0,'label':"lit_5142",'name':"@5142",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804528C8,'size':8,'pad':0,'label':"lit_5143",'name':"@5143",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804527F8,'size':8,'pad':0,'label':"lit_3775",'name':"@3775",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452800,'size':8,'pad':0,'label':"lit_3776",'name':"@3776",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452808,'size':8,'pad':0,'label':"lit_3777",'name':"@3777",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452810,'size':4,'pad':0,'label':"lit_3791",'name':"@3791",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452814,'size':4,'pad':0,'label':"lit_3807",'name':"@3807",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452818,'size':4,'pad':0,'label':"lit_3991",'name':"@3991",'lib':0,'tu':132,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045281C,'size':4,'pad':0,'label':"lit_3992",'name':"@3992",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452820,'size':4,'pad':0,'label':"lit_4001",'name':"@4001",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452824,'size':4,'pad':0,'label':"lit_4002",'name':"@4002",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452828,'size':4,'pad':0,'label':"lit_4003",'name':"@4003",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045282C,'size':4,'pad':0,'label':"lit_4004",'name':"@4004",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452830,'size':4,'pad':0,'label':"lit_4005",'name':"@4005",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452834,'size':4,'pad':0,'label':"lit_4006",'name':"@4006",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452838,'size':4,'pad':0,'label':"lit_4007",'name':"@4007",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045283C,'size':4,'pad':0,'label':"lit_4008",'name':"@4008",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452840,'size':4,'pad':0,'label':"lit_4009",'name':"@4009",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452844,'size':4,'pad':0,'label':"lit_4010",'name':"@4010",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452848,'size':4,'pad':0,'label':"lit_4011",'name':"@4011",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045284C,'size':4,'pad':0,'label':"lit_4012",'name':"@4012",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452850,'size':4,'pad':0,'label':"lit_4013",'name':"@4013",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452854,'size':4,'pad':0,'label':"lit_4014",'name':"@4014",'lib':0,'tu':132,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452858,'size':4,'pad':0,'label':"lit_4058",'name':"@4058",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045285C,'size':4,'pad':0,'label':"lit_4119",'name':"@4119",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452860,'size':4,'pad':0,'label':"lit_4120",'name':"@4120",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452864,'size':4,'pad':0,'label':"lit_4121",'name':"@4121",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452868,'size':4,'pad':0,'label':"lit_4122",'name':"@4122",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045286C,'size':4,'pad':0,'label':"lit_4123",'name':"@4123",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452870,'size':4,'pad':0,'label':"lit_4124",'name':"@4124",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452874,'size':4,'pad':0,'label':"lit_4125",'name':"@4125",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452878,'size':4,'pad':0,'label':"lit_4126",'name':"@4126",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045287C,'size':4,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452880,'size':4,'pad':0,'label':"lit_4128",'name':"@4128",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452884,'size':4,'pad':0,'label':"lit_4129",'name':"@4129",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452888,'size':4,'pad':0,'label':"lit_4130",'name':"@4130",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045288C,'size':4,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452890,'size':4,'pad':0,'label':"lit_4132",'name':"@4132",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452894,'size':4,'pad':0,'label':"lit_4133",'name':"@4133",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452898,'size':4,'pad':0,'label':"lit_4134",'name':"@4134",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045289C,'size':4,'pad':0,'label':"lit_4135",'name':"@4135",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528A0,'size':4,'pad':0,'label':"lit_4136",'name':"@4136",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528A4,'size':4,'pad':0,'label':"lit_4137",'name':"@4137",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528A8,'size':4,'pad':0,'label':"lit_4138",'name':"@4138",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528AC,'size':4,'pad':0,'label':"lit_4139",'name':"@4139",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528B0,'size':4,'pad':0,'label':"lit_4140",'name':"@4140",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528B4,'size':4,'pad':0,'label':"lit_4173",'name':"@4173",'lib':0,'tu':132,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528B8,'size':4,'pad':4,'label':"lit_5141",'name':"@5141",'lib':0,'tu':133,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528C0,'size':8,'pad':0,'label':"lit_5142",'name':"@5142",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528C8,'size':8,'pad':0,'label':"lit_5143",'name':"@5143",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804528D0,'size':8,'pad':0,'label':"lit_5144",'name':"@5144",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804528D8,'size':4,'pad':0,'label':"lit_5145",'name':"@5145",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804528DC,'size':4,'pad':0,'label':"lit_5346",'name':"@5346",'lib':0,'tu':133,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804528D8,'size':4,'pad':0,'label':"lit_5145",'name':"@5145",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804528DC,'size':4,'pad':0,'label':"lit_5346",'name':"@5346",'lib':0,'tu':133,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804528E0,'size':4,'pad':4,'label':"lit_5844",'name':"@5844",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804528E8,'size':8,'pad':0,'label':"lit_5846",'name':"@5846",'lib':0,'tu':133,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804528E8,'size':8,'pad':0,'label':"lit_5846",'name':"@5846",'lib':0,'tu':133,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804528F0,'size':4,'pad':4,'label':"lit_5959",'name':"@5959",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804528F8,'size':8,'pad':0,'label':"lit_5962",'name':"@5962",'lib':0,'tu':133,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452900,'size':4,'pad':0,'label':"lit_6682",'name':"@6682",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452904,'size':4,'pad':0,'label':"lit_6683",'name':"@6683",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452908,'size':4,'pad':0,'label':"lit_7334",'name':"@7334",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045290C,'size':4,'pad':0,'label':"lit_7335",'name':"@7335",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452910,'size':4,'pad':0,'label':"lit_7336",'name':"@7336",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452914,'size':4,'pad':0,'label':"lit_7337",'name':"@7337",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452918,'size':4,'pad':0,'label':"lit_7338",'name':"@7338",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045291C,'size':4,'pad':0,'label':"lit_7339",'name':"@7339",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452920,'size':4,'pad':0,'label':"lit_7340",'name':"@7340",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452924,'size':4,'pad':0,'label':"lit_7341",'name':"@7341",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452928,'size':4,'pad':0,'label':"lit_7342",'name':"@7342",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045292C,'size':4,'pad':0,'label':"lit_7343",'name':"@7343",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452930,'size':4,'pad':0,'label':"lit_7344",'name':"@7344",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452934,'size':4,'pad':0,'label':"lit_7345",'name':"@7345",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452938,'size':4,'pad':0,'label':"lit_7346",'name':"@7346",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045293C,'size':4,'pad':0,'label':"lit_7347",'name':"@7347",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452940,'size':4,'pad':0,'label':"lit_7357",'name':"@7357",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452944,'size':4,'pad':0,'label':"lit_8178",'name':"@8178",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452948,'size':4,'pad':0,'label':"lit_8179",'name':"@8179",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045294C,'size':4,'pad':0,'label':"lit_8180",'name':"@8180",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452950,'size':4,'pad':0,'label':"lit_8181",'name':"@8181",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452954,'size':4,'pad':0,'label':"lit_8182",'name':"@8182",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452958,'size':4,'pad':0,'label':"lit_8183",'name':"@8183",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045295C,'size':4,'pad':0,'label':"lit_8184",'name':"@8184",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452960,'size':4,'pad':0,'label':"lit_8185",'name':"@8185",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452964,'size':4,'pad':0,'label':"lit_8186",'name':"@8186",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452968,'size':4,'pad':0,'label':"lit_8187",'name':"@8187",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045296C,'size':4,'pad':0,'label':"lit_8188",'name':"@8188",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452970,'size':4,'pad':0,'label':"lit_8189",'name':"@8189",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452974,'size':4,'pad':0,'label':"lit_8190",'name':"@8190",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452978,'size':4,'pad':0,'label':"lit_8191",'name':"@8191",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045297C,'size':4,'pad':0,'label':"lit_8192",'name':"@8192",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452980,'size':4,'pad':0,'label':"lit_8193",'name':"@8193",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452984,'size':4,'pad':0,'label':"lit_8194",'name':"@8194",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452988,'size':4,'pad':0,'label':"lit_8195",'name':"@8195",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045298C,'size':4,'pad':0,'label':"lit_8196",'name':"@8196",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452990,'size':4,'pad':0,'label':"lit_8197",'name':"@8197",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452994,'size':4,'pad':0,'label':"lit_8198",'name':"@8198",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452998,'size':4,'pad':0,'label':"lit_8199",'name':"@8199",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045299C,'size':4,'pad':0,'label':"lit_8200",'name':"@8200",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529A0,'size':4,'pad':0,'label':"lit_8201",'name':"@8201",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529A4,'size':4,'pad':0,'label':"lit_8202",'name':"@8202",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529A8,'size':4,'pad':0,'label':"lit_8203",'name':"@8203",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529AC,'size':4,'pad':0,'label':"lit_8204",'name':"@8204",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529B0,'size':4,'pad':0,'label':"lit_8205",'name':"@8205",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529B4,'size':4,'pad':0,'label':"lit_8206",'name':"@8206",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529B8,'size':4,'pad':0,'label':"lit_8207",'name':"@8207",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529BC,'size':4,'pad':0,'label':"lit_8208",'name':"@8208",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529C0,'size':4,'pad':0,'label':"lit_8209",'name':"@8209",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529C4,'size':4,'pad':0,'label':"lit_8210",'name':"@8210",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529C8,'size':4,'pad':0,'label':"lit_8211",'name':"@8211",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529CC,'size':4,'pad':0,'label':"lit_8212",'name':"@8212",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529D0,'size':4,'pad':0,'label':"lit_8213",'name':"@8213",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529D4,'size':4,'pad':0,'label':"lit_8214",'name':"@8214",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529D8,'size':4,'pad':0,'label':"lit_8215",'name':"@8215",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529DC,'size':4,'pad':0,'label':"lit_8216",'name':"@8216",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529E0,'size':4,'pad':0,'label':"lit_8217",'name':"@8217",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529E4,'size':4,'pad':0,'label':"lit_8218",'name':"@8218",'lib':0,'tu':133,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529E8,'size':4,'pad':0,'label':"lit_8219",'name':"@8219",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529EC,'size':4,'pad':0,'label':"lit_8220",'name':"@8220",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529F0,'size':4,'pad':0,'label':"lit_8221",'name':"@8221",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529F4,'size':4,'pad':0,'label':"lit_8222",'name':"@8222",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529F8,'size':4,'pad':0,'label':"lit_8223",'name':"@8223",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804529FC,'size':4,'pad':0,'label':"lit_8224",'name':"@8224",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A00,'size':4,'pad':0,'label':"lit_8225",'name':"@8225",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A04,'size':4,'pad':0,'label':"lit_8226",'name':"@8226",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A08,'size':4,'pad':0,'label':"lit_8722",'name':"@8722",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A0C,'size':4,'pad':0,'label':"lit_8723",'name':"@8723",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A10,'size':4,'pad':0,'label':"lit_8724",'name':"@8724",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A14,'size':4,'pad':0,'label':"lit_8725",'name':"@8725",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A18,'size':4,'pad':0,'label':"lit_8726",'name':"@8726",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A1C,'size':4,'pad':0,'label':"lit_8727",'name':"@8727",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A20,'size':4,'pad':0,'label':"lit_8728",'name':"@8728",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A24,'size':4,'pad':0,'label':"lit_8729",'name':"@8729",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A28,'size':4,'pad':0,'label':"lit_8730",'name':"@8730",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A2C,'size':4,'pad':0,'label':"lit_8731",'name':"@8731",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A30,'size':4,'pad':0,'label':"lit_8732",'name':"@8732",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A34,'size':4,'pad':0,'label':"lit_8733",'name':"@8733",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A38,'size':4,'pad':0,'label':"lit_8734",'name':"@8734",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A3C,'size':4,'pad':0,'label':"lit_8735",'name':"@8735",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A40,'size':4,'pad':0,'label':"lit_8736",'name':"@8736",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A44,'size':4,'pad':0,'label':"lit_8737",'name':"@8737",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A48,'size':4,'pad':0,'label':"lit_8738",'name':"@8738",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A4C,'size':4,'pad':0,'label':"lit_8739",'name':"@8739",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A50,'size':4,'pad':0,'label':"lit_8740",'name':"@8740",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A54,'size':4,'pad':0,'label':"lit_8741",'name':"@8741",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A58,'size':4,'pad':0,'label':"lit_8742",'name':"@8742",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A5C,'size':4,'pad':0,'label':"lit_8743",'name':"@8743",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A60,'size':4,'pad':0,'label':"lit_8744",'name':"@8744",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A64,'size':4,'pad':0,'label':"lit_8745",'name':"@8745",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A68,'size':4,'pad':0,'label':"lit_8746",'name':"@8746",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A6C,'size':4,'pad':0,'label':"lit_8747",'name':"@8747",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A70,'size':4,'pad':0,'label':"lit_8748",'name':"@8748",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A74,'size':4,'pad':0,'label':"lit_8749",'name':"@8749",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A78,'size':4,'pad':0,'label':"lit_8750",'name':"@8750",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A7C,'size':4,'pad':0,'label':"lit_8751",'name':"@8751",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A80,'size':4,'pad':0,'label':"lit_8752",'name':"@8752",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A84,'size':4,'pad':0,'label':"lit_8753",'name':"@8753",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A88,'size':4,'pad':0,'label':"lit_9395",'name':"@9395",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A8C,'size':4,'pad':0,'label':"lit_9396",'name':"@9396",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A90,'size':4,'pad':0,'label':"lit_9397",'name':"@9397",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A94,'size':4,'pad':0,'label':"lit_9398",'name':"@9398",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A98,'size':4,'pad':0,'label':"lit_9399",'name':"@9399",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452A9C,'size':4,'pad':0,'label':"lit_9400",'name':"@9400",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AA0,'size':4,'pad':0,'label':"lit_9401",'name':"@9401",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AA4,'size':4,'pad':0,'label':"lit_9402",'name':"@9402",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AA8,'size':4,'pad':0,'label':"lit_9403",'name':"@9403",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AAC,'size':4,'pad':0,'label':"lit_9404",'name':"@9404",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AB0,'size':4,'pad':0,'label':"lit_9405",'name':"@9405",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AB4,'size':4,'pad':0,'label':"lit_9406",'name':"@9406",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AB8,'size':4,'pad':0,'label':"lit_9407",'name':"@9407",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452ABC,'size':4,'pad':0,'label':"lit_9408",'name':"@9408",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AC0,'size':4,'pad':0,'label':"lit_9409",'name':"@9409",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AC4,'size':4,'pad':0,'label':"lit_9410",'name':"@9410",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AC8,'size':4,'pad':0,'label':"lit_9411",'name':"@9411",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452ACC,'size':4,'pad':0,'label':"lit_9412",'name':"@9412",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AD0,'size':4,'pad':0,'label':"lit_9413",'name':"@9413",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AD4,'size':4,'pad':0,'label':"lit_9414",'name':"@9414",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AD8,'size':4,'pad':0,'label':"lit_9415",'name':"@9415",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452ADC,'size':4,'pad':0,'label':"lit_9416",'name':"@9416",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AE0,'size':4,'pad':0,'label':"lit_9417",'name':"@9417",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AE4,'size':4,'pad':0,'label':"lit_9418",'name':"@9418",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AE8,'size':4,'pad':0,'label':"lit_9419",'name':"@9419",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AEC,'size':4,'pad':0,'label':"lit_9420",'name':"@9420",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AF0,'size':4,'pad':0,'label':"lit_9421",'name':"@9421",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AF4,'size':4,'pad':0,'label':"lit_9422",'name':"@9422",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AF8,'size':4,'pad':0,'label':"lit_9423",'name':"@9423",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452AFC,'size':4,'pad':0,'label':"lit_9424",'name':"@9424",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B00,'size':4,'pad':0,'label':"lit_9425",'name':"@9425",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B04,'size':4,'pad':0,'label':"lit_9426",'name':"@9426",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B08,'size':4,'pad':0,'label':"lit_9427",'name':"@9427",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B0C,'size':4,'pad':0,'label':"lit_9428",'name':"@9428",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B10,'size':4,'pad':0,'label':"lit_9429",'name':"@9429",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B14,'size':4,'pad':0,'label':"lit_9430",'name':"@9430",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B18,'size':4,'pad':0,'label':"lit_9431",'name':"@9431",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B1C,'size':4,'pad':0,'label':"lit_9432",'name':"@9432",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B20,'size':4,'pad':0,'label':"lit_9433",'name':"@9433",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B24,'size':4,'pad':0,'label':"lit_9434",'name':"@9434",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B28,'size':4,'pad':0,'label':"lit_9435",'name':"@9435",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B2C,'size':4,'pad':0,'label':"lit_9436",'name':"@9436",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B30,'size':4,'pad':0,'label':"lit_9437",'name':"@9437",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B34,'size':4,'pad':0,'label':"lit_9438",'name':"@9438",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B38,'size':4,'pad':0,'label':"lit_9439",'name':"@9439",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B3C,'size':4,'pad':0,'label':"lit_9440",'name':"@9440",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B40,'size':4,'pad':0,'label':"lit_9441",'name':"@9441",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B44,'size':4,'pad':0,'label':"lit_9798",'name':"@9798",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B48,'size':4,'pad':0,'label':"lit_9799",'name':"@9799",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B4C,'size':4,'pad':0,'label':"lit_9800",'name':"@9800",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B50,'size':4,'pad':0,'label':"lit_9801",'name':"@9801",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B54,'size':4,'pad':0,'label':"lit_10118",'name':"@10118",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B58,'size':4,'pad':0,'label':"lit_10119",'name':"@10119",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B5C,'size':4,'pad':0,'label':"lit_10120",'name':"@10120",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B60,'size':4,'pad':0,'label':"lit_10121",'name':"@10121",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B64,'size':4,'pad':0,'label':"lit_10122",'name':"@10122",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B68,'size':4,'pad':0,'label':"lit_10123",'name':"@10123",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B6C,'size':4,'pad':0,'label':"lit_10124",'name':"@10124",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B70,'size':4,'pad':0,'label':"lit_10125",'name':"@10125",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B74,'size':4,'pad':0,'label':"lit_10126",'name':"@10126",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B78,'size':4,'pad':0,'label':"lit_10278",'name':"@10278",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B7C,'size':4,'pad':0,'label':"lit_10279",'name':"@10279",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B80,'size':4,'pad':0,'label':"lit_10280",'name':"@10280",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B84,'size':4,'pad':0,'label':"lit_10281",'name':"@10281",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B88,'size':4,'pad':0,'label':"lit_10282",'name':"@10282",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B8C,'size':4,'pad':0,'label':"lit_10283",'name':"@10283",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B90,'size':4,'pad':0,'label':"lit_10284",'name':"@10284",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B94,'size':4,'pad':0,'label':"lit_10437",'name':"@10437",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B98,'size':4,'pad':0,'label':"lit_10780",'name':"@10780",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452B9C,'size':4,'pad':0,'label':"lit_10781",'name':"@10781",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BA0,'size':4,'pad':0,'label':"lit_10782",'name':"@10782",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BA4,'size':4,'pad':0,'label':"lit_11068",'name':"@11068",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BA8,'size':4,'pad':0,'label':"lit_11415",'name':"@11415",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BAC,'size':4,'pad':0,'label':"lit_11416",'name':"@11416",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BB0,'size':4,'pad':0,'label':"lit_11417",'name':"@11417",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BB4,'size':4,'pad':0,'label':"lit_11418",'name':"@11418",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BB8,'size':4,'pad':0,'label':"lit_11419",'name':"@11419",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BBC,'size':4,'pad':0,'label':"lit_11420",'name':"@11420",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BC0,'size':4,'pad':0,'label':"lit_11421",'name':"@11421",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BC4,'size':4,'pad':0,'label':"lit_11422",'name':"@11422",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BC8,'size':8,'pad':0,'label':"lit_3632",'name':"@3632",'lib':0,'tu':134,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452BD0,'size':4,'pad':0,'label':"lit_3684",'name':"@3684",'lib':0,'tu':134,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BD4,'size':4,'pad':0,'label':"lit_3685",'name':"@3685",'lib':0,'tu':134,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BD8,'size':4,'pad':0,'label':"lit_3655",'name':"@3655",'lib':0,'tu':136,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BDC,'size':4,'pad':0,'label':"lit_3794",'name':"@3794",'lib':0,'tu':136,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452BE0,'size':8,'pad':0,'label':"lit_3828",'name':"@3828",'lib':0,'tu':136,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452BE8,'size':4,'pad':0,'label':"lit_3839",'name':"@3839",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804528F8,'size':8,'pad':0,'label':"lit_5962",'name':"@5962",'lib':0,'tu':133,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452900,'size':4,'pad':0,'label':"lit_6682",'name':"@6682",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452904,'size':4,'pad':0,'label':"lit_6683",'name':"@6683",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452908,'size':4,'pad':0,'label':"lit_7334",'name':"@7334",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045290C,'size':4,'pad':0,'label':"lit_7335",'name':"@7335",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452910,'size':4,'pad':0,'label':"lit_7336",'name':"@7336",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452914,'size':4,'pad':0,'label':"lit_7337",'name':"@7337",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452918,'size':4,'pad':0,'label':"lit_7338",'name':"@7338",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045291C,'size':4,'pad':0,'label':"lit_7339",'name':"@7339",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452920,'size':4,'pad':0,'label':"lit_7340",'name':"@7340",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452924,'size':4,'pad':0,'label':"lit_7341",'name':"@7341",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452928,'size':4,'pad':0,'label':"lit_7342",'name':"@7342",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045292C,'size':4,'pad':0,'label':"lit_7343",'name':"@7343",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452930,'size':4,'pad':0,'label':"lit_7344",'name':"@7344",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452934,'size':4,'pad':0,'label':"lit_7345",'name':"@7345",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452938,'size':4,'pad':0,'label':"lit_7346",'name':"@7346",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045293C,'size':4,'pad':0,'label':"lit_7347",'name':"@7347",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452940,'size':4,'pad':0,'label':"lit_7357",'name':"@7357",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452944,'size':4,'pad':0,'label':"lit_8178",'name':"@8178",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452948,'size':4,'pad':0,'label':"lit_8179",'name':"@8179",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045294C,'size':4,'pad':0,'label':"lit_8180",'name':"@8180",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452950,'size':4,'pad':0,'label':"lit_8181",'name':"@8181",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452954,'size':4,'pad':0,'label':"lit_8182",'name':"@8182",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452958,'size':4,'pad':0,'label':"lit_8183",'name':"@8183",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045295C,'size':4,'pad':0,'label':"lit_8184",'name':"@8184",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452960,'size':4,'pad':0,'label':"lit_8185",'name':"@8185",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452964,'size':4,'pad':0,'label':"lit_8186",'name':"@8186",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452968,'size':4,'pad':0,'label':"lit_8187",'name':"@8187",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045296C,'size':4,'pad':0,'label':"lit_8188",'name':"@8188",'lib':0,'tu':133,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452970,'size':4,'pad':0,'label':"lit_8189",'name':"@8189",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452974,'size':4,'pad':0,'label':"lit_8190",'name':"@8190",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452978,'size':4,'pad':0,'label':"lit_8191",'name':"@8191",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045297C,'size':4,'pad':0,'label':"lit_8192",'name':"@8192",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452980,'size':4,'pad':0,'label':"lit_8193",'name':"@8193",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452984,'size':4,'pad':0,'label':"lit_8194",'name':"@8194",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452988,'size':4,'pad':0,'label':"lit_8195",'name':"@8195",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045298C,'size':4,'pad':0,'label':"lit_8196",'name':"@8196",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452990,'size':4,'pad':0,'label':"lit_8197",'name':"@8197",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452994,'size':4,'pad':0,'label':"lit_8198",'name':"@8198",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452998,'size':4,'pad':0,'label':"lit_8199",'name':"@8199",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045299C,'size':4,'pad':0,'label':"lit_8200",'name':"@8200",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529A0,'size':4,'pad':0,'label':"lit_8201",'name':"@8201",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529A4,'size':4,'pad':0,'label':"lit_8202",'name':"@8202",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529A8,'size':4,'pad':0,'label':"lit_8203",'name':"@8203",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529AC,'size':4,'pad':0,'label':"lit_8204",'name':"@8204",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529B0,'size':4,'pad':0,'label':"lit_8205",'name':"@8205",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529B4,'size':4,'pad':0,'label':"lit_8206",'name':"@8206",'lib':0,'tu':133,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529B8,'size':4,'pad':0,'label':"lit_8207",'name':"@8207",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529BC,'size':4,'pad':0,'label':"lit_8208",'name':"@8208",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529C0,'size':4,'pad':0,'label':"lit_8209",'name':"@8209",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529C4,'size':4,'pad':0,'label':"lit_8210",'name':"@8210",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529C8,'size':4,'pad':0,'label':"lit_8211",'name':"@8211",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529CC,'size':4,'pad':0,'label':"lit_8212",'name':"@8212",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529D0,'size':4,'pad':0,'label':"lit_8213",'name':"@8213",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529D4,'size':4,'pad':0,'label':"lit_8214",'name':"@8214",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529D8,'size':4,'pad':0,'label':"lit_8215",'name':"@8215",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529DC,'size':4,'pad':0,'label':"lit_8216",'name':"@8216",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529E0,'size':4,'pad':0,'label':"lit_8217",'name':"@8217",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529E4,'size':4,'pad':0,'label':"lit_8218",'name':"@8218",'lib':0,'tu':133,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529E8,'size':4,'pad':0,'label':"lit_8219",'name':"@8219",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529EC,'size':4,'pad':0,'label':"lit_8220",'name':"@8220",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529F0,'size':4,'pad':0,'label':"lit_8221",'name':"@8221",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529F4,'size':4,'pad':0,'label':"lit_8222",'name':"@8222",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529F8,'size':4,'pad':0,'label':"lit_8223",'name':"@8223",'lib':0,'tu':133,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804529FC,'size':4,'pad':0,'label':"lit_8224",'name':"@8224",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A00,'size':4,'pad':0,'label':"lit_8225",'name':"@8225",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A04,'size':4,'pad':0,'label':"lit_8226",'name':"@8226",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A08,'size':4,'pad':0,'label':"lit_8722",'name':"@8722",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A0C,'size':4,'pad':0,'label':"lit_8723",'name':"@8723",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A10,'size':4,'pad':0,'label':"lit_8724",'name':"@8724",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A14,'size':4,'pad':0,'label':"lit_8725",'name':"@8725",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A18,'size':4,'pad':0,'label':"lit_8726",'name':"@8726",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A1C,'size':4,'pad':0,'label':"lit_8727",'name':"@8727",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A20,'size':4,'pad':0,'label':"lit_8728",'name':"@8728",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A24,'size':4,'pad':0,'label':"lit_8729",'name':"@8729",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A28,'size':4,'pad':0,'label':"lit_8730",'name':"@8730",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A2C,'size':4,'pad':0,'label':"lit_8731",'name':"@8731",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A30,'size':4,'pad':0,'label':"lit_8732",'name':"@8732",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A34,'size':4,'pad':0,'label':"lit_8733",'name':"@8733",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A38,'size':4,'pad':0,'label':"lit_8734",'name':"@8734",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A3C,'size':4,'pad':0,'label':"lit_8735",'name':"@8735",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A40,'size':4,'pad':0,'label':"lit_8736",'name':"@8736",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A44,'size':4,'pad':0,'label':"lit_8737",'name':"@8737",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A48,'size':4,'pad':0,'label':"lit_8738",'name':"@8738",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A4C,'size':4,'pad':0,'label':"lit_8739",'name':"@8739",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A50,'size':4,'pad':0,'label':"lit_8740",'name':"@8740",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A54,'size':4,'pad':0,'label':"lit_8741",'name':"@8741",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A58,'size':4,'pad':0,'label':"lit_8742",'name':"@8742",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A5C,'size':4,'pad':0,'label':"lit_8743",'name':"@8743",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A60,'size':4,'pad':0,'label':"lit_8744",'name':"@8744",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A64,'size':4,'pad':0,'label':"lit_8745",'name':"@8745",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A68,'size':4,'pad':0,'label':"lit_8746",'name':"@8746",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A6C,'size':4,'pad':0,'label':"lit_8747",'name':"@8747",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A70,'size':4,'pad':0,'label':"lit_8748",'name':"@8748",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A74,'size':4,'pad':0,'label':"lit_8749",'name':"@8749",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A78,'size':4,'pad':0,'label':"lit_8750",'name':"@8750",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A7C,'size':4,'pad':0,'label':"lit_8751",'name':"@8751",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A80,'size':4,'pad':0,'label':"lit_8752",'name':"@8752",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A84,'size':4,'pad':0,'label':"lit_8753",'name':"@8753",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A88,'size':4,'pad':0,'label':"lit_9395",'name':"@9395",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A8C,'size':4,'pad':0,'label':"lit_9396",'name':"@9396",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A90,'size':4,'pad':0,'label':"lit_9397",'name':"@9397",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A94,'size':4,'pad':0,'label':"lit_9398",'name':"@9398",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A98,'size':4,'pad':0,'label':"lit_9399",'name':"@9399",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452A9C,'size':4,'pad':0,'label':"lit_9400",'name':"@9400",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AA0,'size':4,'pad':0,'label':"lit_9401",'name':"@9401",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AA4,'size':4,'pad':0,'label':"lit_9402",'name':"@9402",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AA8,'size':4,'pad':0,'label':"lit_9403",'name':"@9403",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AAC,'size':4,'pad':0,'label':"lit_9404",'name':"@9404",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AB0,'size':4,'pad':0,'label':"lit_9405",'name':"@9405",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AB4,'size':4,'pad':0,'label':"lit_9406",'name':"@9406",'lib':0,'tu':133,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AB8,'size':4,'pad':0,'label':"lit_9407",'name':"@9407",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452ABC,'size':4,'pad':0,'label':"lit_9408",'name':"@9408",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AC0,'size':4,'pad':0,'label':"lit_9409",'name':"@9409",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AC4,'size':4,'pad':0,'label':"lit_9410",'name':"@9410",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AC8,'size':4,'pad':0,'label':"lit_9411",'name':"@9411",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452ACC,'size':4,'pad':0,'label':"lit_9412",'name':"@9412",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AD0,'size':4,'pad':0,'label':"lit_9413",'name':"@9413",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AD4,'size':4,'pad':0,'label':"lit_9414",'name':"@9414",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AD8,'size':4,'pad':0,'label':"lit_9415",'name':"@9415",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452ADC,'size':4,'pad':0,'label':"lit_9416",'name':"@9416",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AE0,'size':4,'pad':0,'label':"lit_9417",'name':"@9417",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AE4,'size':4,'pad':0,'label':"lit_9418",'name':"@9418",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AE8,'size':4,'pad':0,'label':"lit_9419",'name':"@9419",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AEC,'size':4,'pad':0,'label':"lit_9420",'name':"@9420",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AF0,'size':4,'pad':0,'label':"lit_9421",'name':"@9421",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AF4,'size':4,'pad':0,'label':"lit_9422",'name':"@9422",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AF8,'size':4,'pad':0,'label':"lit_9423",'name':"@9423",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452AFC,'size':4,'pad':0,'label':"lit_9424",'name':"@9424",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B00,'size':4,'pad':0,'label':"lit_9425",'name':"@9425",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B04,'size':4,'pad':0,'label':"lit_9426",'name':"@9426",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B08,'size':4,'pad':0,'label':"lit_9427",'name':"@9427",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B0C,'size':4,'pad':0,'label':"lit_9428",'name':"@9428",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B10,'size':4,'pad':0,'label':"lit_9429",'name':"@9429",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B14,'size':4,'pad':0,'label':"lit_9430",'name':"@9430",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B18,'size':4,'pad':0,'label':"lit_9431",'name':"@9431",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B1C,'size':4,'pad':0,'label':"lit_9432",'name':"@9432",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B20,'size':4,'pad':0,'label':"lit_9433",'name':"@9433",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B24,'size':4,'pad':0,'label':"lit_9434",'name':"@9434",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B28,'size':4,'pad':0,'label':"lit_9435",'name':"@9435",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B2C,'size':4,'pad':0,'label':"lit_9436",'name':"@9436",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B30,'size':4,'pad':0,'label':"lit_9437",'name':"@9437",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B34,'size':4,'pad':0,'label':"lit_9438",'name':"@9438",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B38,'size':4,'pad':0,'label':"lit_9439",'name':"@9439",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B3C,'size':4,'pad':0,'label':"lit_9440",'name':"@9440",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B40,'size':4,'pad':0,'label':"lit_9441",'name':"@9441",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B44,'size':4,'pad':0,'label':"lit_9798",'name':"@9798",'lib':0,'tu':133,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B48,'size':4,'pad':0,'label':"lit_9799",'name':"@9799",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B4C,'size':4,'pad':0,'label':"lit_9800",'name':"@9800",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B50,'size':4,'pad':0,'label':"lit_9801",'name':"@9801",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B54,'size':4,'pad':0,'label':"lit_10118",'name':"@10118",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B58,'size':4,'pad':0,'label':"lit_10119",'name':"@10119",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B5C,'size':4,'pad':0,'label':"lit_10120",'name':"@10120",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B60,'size':4,'pad':0,'label':"lit_10121",'name':"@10121",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B64,'size':4,'pad':0,'label':"lit_10122",'name':"@10122",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B68,'size':4,'pad':0,'label':"lit_10123",'name':"@10123",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B6C,'size':4,'pad':0,'label':"lit_10124",'name':"@10124",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B70,'size':4,'pad':0,'label':"lit_10125",'name':"@10125",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B74,'size':4,'pad':0,'label':"lit_10126",'name':"@10126",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B78,'size':4,'pad':0,'label':"lit_10278",'name':"@10278",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B7C,'size':4,'pad':0,'label':"lit_10279",'name':"@10279",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B80,'size':4,'pad':0,'label':"lit_10280",'name':"@10280",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B84,'size':4,'pad':0,'label':"lit_10281",'name':"@10281",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B88,'size':4,'pad':0,'label':"lit_10282",'name':"@10282",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B8C,'size':4,'pad':0,'label':"lit_10283",'name':"@10283",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B90,'size':4,'pad':0,'label':"lit_10284",'name':"@10284",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B94,'size':4,'pad':0,'label':"lit_10437",'name':"@10437",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B98,'size':4,'pad':0,'label':"lit_10780",'name':"@10780",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452B9C,'size':4,'pad':0,'label':"lit_10781",'name':"@10781",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BA0,'size':4,'pad':0,'label':"lit_10782",'name':"@10782",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BA4,'size':4,'pad':0,'label':"lit_11068",'name':"@11068",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BA8,'size':4,'pad':0,'label':"lit_11415",'name':"@11415",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BAC,'size':4,'pad':0,'label':"lit_11416",'name':"@11416",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BB0,'size':4,'pad':0,'label':"lit_11417",'name':"@11417",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BB4,'size':4,'pad':0,'label':"lit_11418",'name':"@11418",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BB8,'size':4,'pad':0,'label':"lit_11419",'name':"@11419",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BBC,'size':4,'pad':0,'label':"lit_11420",'name':"@11420",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BC0,'size':4,'pad':0,'label':"lit_11421",'name':"@11421",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BC4,'size':4,'pad':0,'label':"lit_11422",'name':"@11422",'lib':0,'tu':133,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BC8,'size':8,'pad':0,'label':"lit_3632",'name':"@3632",'lib':0,'tu':134,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BD0,'size':4,'pad':0,'label':"lit_3684",'name':"@3684",'lib':0,'tu':134,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BD4,'size':4,'pad':0,'label':"lit_3685",'name':"@3685",'lib':0,'tu':134,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BD8,'size':4,'pad':0,'label':"lit_3655",'name':"@3655",'lib':0,'tu':136,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BDC,'size':4,'pad':0,'label':"lit_3794",'name':"@3794",'lib':0,'tu':136,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BE0,'size':8,'pad':0,'label':"lit_3828",'name':"@3828",'lib':0,'tu':136,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BE8,'size':4,'pad':0,'label':"lit_3839",'name':"@3839",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452BEC,'size':4,'pad':0,'label':"lit_3840",'name':"@3840",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452BF0,'size':8,'pad':0,'label':"lit_3841",'name':"@3841",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452BF8,'size':8,'pad':0,'label':"lit_3842",'name':"@3842",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452BF0,'size':8,'pad':0,'label':"lit_3841",'name':"@3841",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452BF8,'size':8,'pad':0,'label':"lit_3842",'name':"@3842",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452C00,'size':8,'pad':0,'label':"lit_3843",'name':"@3843",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452C08,'size':8,'pad':0,'label':"lit_3845",'name':"@3845",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452C10,'size':4,'pad':0,'label':"lit_3862",'name':"@3862",'lib':0,'tu':139,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C14,'size':4,'pad':0,'label':"lit_3863",'name':"@3863",'lib':0,'tu':139,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452C08,'size':8,'pad':0,'label':"lit_3845",'name':"@3845",'lib':0,'tu':137,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C10,'size':4,'pad':0,'label':"lit_3862",'name':"@3862",'lib':0,'tu':139,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C14,'size':4,'pad':0,'label':"lit_3863",'name':"@3863",'lib':0,'tu':139,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452C18,'size':4,'pad':0,'label':"lit_3758",'name':"@3758",'lib':0,'tu':140,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452C1C,'size':4,'pad':0,'label':"lit_3759",'name':"@3759",'lib':0,'tu':140,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C20,'size':4,'pad':0,'label':"lit_3760",'name':"@3760",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C24,'size':4,'pad':0,'label':"lit_3761",'name':"@3761",'lib':0,'tu':140,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C28,'size':4,'pad':0,'label':"lit_3762",'name':"@3762",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C2C,'size':4,'pad':0,'label':"lit_3763",'name':"@3763",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C30,'size':4,'pad':0,'label':"lit_3764",'name':"@3764",'lib':0,'tu':140,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C34,'size':4,'pad':0,'label':"lit_3765",'name':"@3765",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C38,'size':4,'pad':0,'label':"lit_3766",'name':"@3766",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C3C,'size':4,'pad':0,'label':"lit_3767",'name':"@3767",'lib':0,'tu':140,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C40,'size':8,'pad':0,'label':"lit_3769",'name':"@3769",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452C1C,'size':4,'pad':0,'label':"lit_3759",'name':"@3759",'lib':0,'tu':140,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C20,'size':4,'pad':0,'label':"lit_3760",'name':"@3760",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C24,'size':4,'pad':0,'label':"lit_3761",'name':"@3761",'lib':0,'tu':140,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C28,'size':4,'pad':0,'label':"lit_3762",'name':"@3762",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C2C,'size':4,'pad':0,'label':"lit_3763",'name':"@3763",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C30,'size':4,'pad':0,'label':"lit_3764",'name':"@3764",'lib':0,'tu':140,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C34,'size':4,'pad':0,'label':"lit_3765",'name':"@3765",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C38,'size':4,'pad':0,'label':"lit_3766",'name':"@3766",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C3C,'size':4,'pad':0,'label':"lit_3767",'name':"@3767",'lib':0,'tu':140,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C40,'size':8,'pad':0,'label':"lit_3769",'name':"@3769",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452C48,'size':4,'pad':4,'label':"lit_3835",'name':"@3835",'lib':0,'tu':140,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452C50,'size':5,'pad':3,'label':"l_wArcName",'name':"l_wArcName",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80452C58,'size':5,'pad':3,'label':"l_bArcName",'name':"l_bArcName",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -24004,261 +24004,261 @@ SYMBOLS = [ {'addr':0x80452C80,'size':6,'pad':2,'label':"l_cWShdArcName",'name':"l_cWShdArcName",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80452C88,'size':6,'pad':2,'label':"l_sWShdArcName",'name':"l_sWShdArcName",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80452C90,'size':6,'pad':2,'label':"l_arcName",'name':"l_arcName",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452C98,'size':4,'pad':0,'label':"lit_5943",'name':"@5943",'lib':0,'tu':141,'section':8,'r':[102,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452C9C,'size':4,'pad':0,'label':"lit_5944",'name':"@5944",'lib':0,'tu':141,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CA0,'size':4,'pad':0,'label':"lit_5945",'name':"@5945",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CA4,'size':4,'pad':0,'label':"lit_6021",'name':"@6021",'lib':0,'tu':141,'section':8,'r':[122,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CA8,'size':4,'pad':0,'label':"lit_6022",'name':"@6022",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CAC,'size':4,'pad':0,'label':"lit_6023",'name':"@6023",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CB0,'size':8,'pad':0,'label':"lit_6025",'name':"@6025",'lib':0,'tu':141,'section':8,'r':[117,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452CB8,'size':4,'pad':0,'label':"lit_6040",'name':"@6040",'lib':0,'tu':141,'section':8,'r':[327,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CBC,'size':4,'pad':0,'label':"lit_6041",'name':"@6041",'lib':0,'tu':141,'section':8,'r':[182,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452C98,'size':4,'pad':0,'label':"lit_5943",'name':"@5943",'lib':0,'tu':141,'section':8,'r':[102,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452C9C,'size':4,'pad':0,'label':"lit_5944",'name':"@5944",'lib':0,'tu':141,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CA0,'size':4,'pad':0,'label':"lit_5945",'name':"@5945",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CA4,'size':4,'pad':0,'label':"lit_6021",'name':"@6021",'lib':0,'tu':141,'section':8,'r':[122,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CA8,'size':4,'pad':0,'label':"lit_6022",'name':"@6022",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CAC,'size':4,'pad':0,'label':"lit_6023",'name':"@6023",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CB0,'size':8,'pad':0,'label':"lit_6025",'name':"@6025",'lib':0,'tu':141,'section':8,'r':[117,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CB8,'size':4,'pad':0,'label':"lit_6040",'name':"@6040",'lib':0,'tu':141,'section':8,'r':[327,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CBC,'size':4,'pad':0,'label':"lit_6041",'name':"@6041",'lib':0,'tu':141,'section':8,'r':[182,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452CC0,'size':4,'pad':0,'label':"lit_6108",'name':"@6108",'lib':0,'tu':141,'section':8,'r':[674,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452CC4,'size':4,'pad':0,'label':"lit_6109",'name':"@6109",'lib':0,'tu':141,'section':8,'r':[137,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CC8,'size':4,'pad':0,'label':"lit_6183",'name':"@6183",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CCC,'size':4,'pad':0,'label':"lit_6237",'name':"@6237",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CD0,'size':4,'pad':0,'label':"lit_6238",'name':"@6238",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CD4,'size':4,'pad':0,'label':"lit_6398",'name':"@6398",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CD8,'size':4,'pad':0,'label':"lit_6399",'name':"@6399",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452CDC,'size':4,'pad':0,'label':"lit_6400",'name':"@6400",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452CC4,'size':4,'pad':0,'label':"lit_6109",'name':"@6109",'lib':0,'tu':141,'section':8,'r':[137,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CC8,'size':4,'pad':0,'label':"lit_6183",'name':"@6183",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CCC,'size':4,'pad':0,'label':"lit_6237",'name':"@6237",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CD0,'size':4,'pad':0,'label':"lit_6238",'name':"@6238",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CD4,'size':4,'pad':0,'label':"lit_6398",'name':"@6398",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CD8,'size':4,'pad':0,'label':"lit_6399",'name':"@6399",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CDC,'size':4,'pad':0,'label':"lit_6400",'name':"@6400",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452CE0,'size':4,'pad':4,'label':"lit_6845",'name':"@6845",'lib':0,'tu':141,'section':8,'r':[59,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80452CE8,'size':8,'pad':0,'label':"lit_6846",'name':"@6846",'lib':0,'tu':141,'section':8,'r':[84,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452CF0,'size':8,'pad':0,'label':"lit_6847",'name':"@6847",'lib':0,'tu':141,'section':8,'r':[84,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80452CE8,'size':8,'pad':0,'label':"lit_6846",'name':"@6846",'lib':0,'tu':141,'section':8,'r':[84,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452CF0,'size':8,'pad':0,'label':"lit_6847",'name':"@6847",'lib':0,'tu':141,'section':8,'r':[84,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452CF8,'size':8,'pad':0,'label':"lit_6848",'name':"@6848",'lib':0,'tu':141,'section':8,'r':[84,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452D00,'size':4,'pad':0,'label':"lit_6895",'name':"@6895",'lib':0,'tu':141,'section':8,'r':[47,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D04,'size':4,'pad':0,'label':"lit_6896",'name':"@6896",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D08,'size':4,'pad':0,'label':"lit_7174",'name':"@7174",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D0C,'size':4,'pad':0,'label':"lit_7305",'name':"@7305",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D10,'size':4,'pad':0,'label':"lit_7306",'name':"@7306",'lib':0,'tu':141,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D14,'size':4,'pad':0,'label':"lit_7307",'name':"@7307",'lib':0,'tu':141,'section':8,'r':[57,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D18,'size':4,'pad':0,'label':"lit_7308",'name':"@7308",'lib':0,'tu':141,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D1C,'size':4,'pad':0,'label':"lit_7448",'name':"@7448",'lib':0,'tu':141,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D20,'size':4,'pad':0,'label':"lit_7449",'name':"@7449",'lib':0,'tu':141,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D24,'size':4,'pad':0,'label':"lit_7450",'name':"@7450",'lib':0,'tu':141,'section':8,'r':[38,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D28,'size':4,'pad':0,'label':"lit_7451",'name':"@7451",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D2C,'size':4,'pad':0,'label':"lit_7624",'name':"@7624",'lib':0,'tu':141,'section':8,'r':[28,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D30,'size':4,'pad':0,'label':"lit_7625",'name':"@7625",'lib':0,'tu':141,'section':8,'r':[67,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D34,'size':4,'pad':0,'label':"lit_7710",'name':"@7710",'lib':0,'tu':141,'section':8,'r':[36,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D38,'size':4,'pad':0,'label':"lit_7807",'name':"@7807",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D3C,'size':4,'pad':0,'label':"lit_7808",'name':"@7808",'lib':0,'tu':141,'section':8,'r':[82,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D40,'size':4,'pad':0,'label':"lit_7945",'name':"@7945",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D44,'size':4,'pad':0,'label':"lit_7977",'name':"@7977",'lib':0,'tu':141,'section':8,'r':[27,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D48,'size':4,'pad':0,'label':"lit_8130",'name':"@8130",'lib':0,'tu':141,'section':8,'r':[21,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D4C,'size':4,'pad':0,'label':"lit_8131",'name':"@8131",'lib':0,'tu':141,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D50,'size':4,'pad':0,'label':"lit_8247",'name':"@8247",'lib':0,'tu':141,'section':8,'r':[39,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D54,'size':4,'pad':0,'label':"lit_8248",'name':"@8248",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D58,'size':4,'pad':0,'label':"lit_8249",'name':"@8249",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D5C,'size':4,'pad':0,'label':"lit_8322",'name':"@8322",'lib':0,'tu':141,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D60,'size':4,'pad':0,'label':"lit_8369",'name':"@8369",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D64,'size':4,'pad':0,'label':"lit_8370",'name':"@8370",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D68,'size':4,'pad':0,'label':"lit_8472",'name':"@8472",'lib':0,'tu':141,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D6C,'size':4,'pad':0,'label':"lit_8473",'name':"@8473",'lib':0,'tu':141,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D70,'size':4,'pad':0,'label':"lit_8501",'name':"@8501",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D74,'size':4,'pad':0,'label':"lit_8502",'name':"@8502",'lib':0,'tu':141,'section':8,'r':[21,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D78,'size':4,'pad':0,'label':"lit_8676",'name':"@8676",'lib':0,'tu':141,'section':8,'r':[31,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D7C,'size':4,'pad':0,'label':"lit_8779",'name':"@8779",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D80,'size':4,'pad':0,'label':"lit_8780",'name':"@8780",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D84,'size':4,'pad':0,'label':"lit_8781",'name':"@8781",'lib':0,'tu':141,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D88,'size':4,'pad':0,'label':"lit_8782",'name':"@8782",'lib':0,'tu':141,'section':8,'r':[29,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D8C,'size':4,'pad':0,'label':"lit_8783",'name':"@8783",'lib':0,'tu':141,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D90,'size':4,'pad':0,'label':"lit_8784",'name':"@8784",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D94,'size':4,'pad':0,'label':"lit_8785",'name':"@8785",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D98,'size':4,'pad':0,'label':"lit_8786",'name':"@8786",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452D9C,'size':4,'pad':0,'label':"lit_9053",'name':"@9053",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DA0,'size':4,'pad':0,'label':"lit_9054",'name':"@9054",'lib':0,'tu':141,'section':8,'r':[43,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DA4,'size':4,'pad':0,'label':"lit_9138",'name':"@9138",'lib':0,'tu':141,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DA8,'size':4,'pad':0,'label':"lit_9652",'name':"@9652",'lib':0,'tu':141,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DAC,'size':4,'pad':0,'label':"lit_9828",'name':"@9828",'lib':0,'tu':141,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DB0,'size':4,'pad':0,'label':"lit_10039",'name':"@10039",'lib':0,'tu':141,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DB4,'size':4,'pad':0,'label':"lit_10040",'name':"@10040",'lib':0,'tu':141,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DB8,'size':4,'pad':0,'label':"lit_10041",'name':"@10041",'lib':0,'tu':141,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DBC,'size':4,'pad':0,'label':"lit_10042",'name':"@10042",'lib':0,'tu':141,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DC0,'size':4,'pad':0,'label':"lit_10193",'name':"@10193",'lib':0,'tu':141,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DC4,'size':4,'pad':0,'label':"lit_10194",'name':"@10194",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DC8,'size':4,'pad':0,'label':"lit_10286",'name':"@10286",'lib':0,'tu':141,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DCC,'size':4,'pad':0,'label':"lit_10532",'name':"@10532",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DD0,'size':4,'pad':0,'label':"lit_11122",'name':"@11122",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DD4,'size':4,'pad':0,'label':"lit_11442",'name':"@11442",'lib':0,'tu':141,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DD8,'size':4,'pad':0,'label':"lit_11470",'name':"@11470",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DDC,'size':4,'pad':0,'label':"lit_11471",'name':"@11471",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DE0,'size':4,'pad':0,'label':"lit_11673",'name':"@11673",'lib':0,'tu':141,'section':8,'r':[17,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DE4,'size':4,'pad':0,'label':"lit_12328",'name':"@12328",'lib':0,'tu':141,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DE8,'size':4,'pad':0,'label':"lit_12475",'name':"@12475",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DEC,'size':4,'pad':0,'label':"lit_13119",'name':"@13119",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DF0,'size':4,'pad':0,'label':"lit_13382",'name':"@13382",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DF4,'size':4,'pad':0,'label':"lit_13699",'name':"@13699",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DF8,'size':4,'pad':0,'label':"lit_13700",'name':"@13700",'lib':0,'tu':141,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452DFC,'size':4,'pad':0,'label':"lit_13701",'name':"@13701",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E00,'size':4,'pad':0,'label':"lit_13702",'name':"@13702",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E04,'size':4,'pad':0,'label':"lit_13794",'name':"@13794",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E08,'size':4,'pad':0,'label':"lit_14064",'name':"@14064",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E0C,'size':4,'pad':0,'label':"lit_14614",'name':"@14614",'lib':0,'tu':141,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E10,'size':4,'pad':0,'label':"lit_14615",'name':"@14615",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E14,'size':4,'pad':0,'label':"lit_14616",'name':"@14616",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E18,'size':4,'pad':0,'label':"lit_14617",'name':"@14617",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E1C,'size':4,'pad':0,'label':"lit_14618",'name':"@14618",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E20,'size':4,'pad':0,'label':"lit_14619",'name':"@14619",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E24,'size':4,'pad':0,'label':"lit_14620",'name':"@14620",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E28,'size':4,'pad':0,'label':"lit_14621",'name':"@14621",'lib':0,'tu':141,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E2C,'size':4,'pad':0,'label':"lit_14622",'name':"@14622",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E30,'size':4,'pad':0,'label':"lit_14623",'name':"@14623",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E34,'size':4,'pad':0,'label':"lit_14624",'name':"@14624",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E38,'size':4,'pad':0,'label':"lit_14625",'name':"@14625",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E3C,'size':4,'pad':0,'label':"lit_14626",'name':"@14626",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E40,'size':4,'pad':0,'label':"lit_14627",'name':"@14627",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E44,'size':4,'pad':0,'label':"lit_14760",'name':"@14760",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E48,'size':4,'pad':0,'label':"lit_14781",'name':"@14781",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E4C,'size':4,'pad':0,'label':"lit_14782",'name':"@14782",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E50,'size':4,'pad':0,'label':"lit_14783",'name':"@14783",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E54,'size':4,'pad':0,'label':"lit_14784",'name':"@14784",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E58,'size':4,'pad':0,'label':"lit_14785",'name':"@14785",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E5C,'size':4,'pad':0,'label':"lit_14786",'name':"@14786",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E60,'size':4,'pad':0,'label':"lit_14787",'name':"@14787",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E64,'size':4,'pad':0,'label':"lit_14954",'name':"@14954",'lib':0,'tu':141,'section':8,'r':[47,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E68,'size':4,'pad':0,'label':"lit_14955",'name':"@14955",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E6C,'size':4,'pad':0,'label':"lit_15106",'name':"@15106",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E70,'size':4,'pad':0,'label':"lit_15188",'name':"@15188",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E74,'size':4,'pad':0,'label':"lit_15341",'name':"@15341",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E78,'size':4,'pad':0,'label':"lit_15460",'name':"@15460",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E7C,'size':4,'pad':0,'label':"lit_15808",'name':"@15808",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E80,'size':4,'pad':0,'label':"lit_16036",'name':"@16036",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E84,'size':4,'pad':0,'label':"lit_16037",'name':"@16037",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E88,'size':4,'pad':0,'label':"lit_16038",'name':"@16038",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E8C,'size':4,'pad':0,'label':"lit_16066",'name':"@16066",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E90,'size':4,'pad':0,'label':"lit_16067",'name':"@16067",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E94,'size':4,'pad':0,'label':"lit_16210",'name':"@16210",'lib':0,'tu':141,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E98,'size':4,'pad':0,'label':"lit_16566",'name':"@16566",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452E9C,'size':4,'pad':0,'label':"lit_16567",'name':"@16567",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EA0,'size':4,'pad':0,'label':"lit_16568",'name':"@16568",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EA4,'size':4,'pad':0,'label':"lit_16569",'name':"@16569",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EA8,'size':4,'pad':0,'label':"lit_16570",'name':"@16570",'lib':0,'tu':141,'section':8,'r':[20,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EAC,'size':4,'pad':0,'label':"lit_16641",'name':"@16641",'lib':0,'tu':141,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EB0,'size':4,'pad':0,'label':"lit_16790",'name':"@16790",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EB4,'size':4,'pad':0,'label':"lit_17382",'name':"@17382",'lib':0,'tu':141,'section':8,'r':[22,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EB8,'size':4,'pad':0,'label':"lit_17592",'name':"@17592",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EBC,'size':4,'pad':0,'label':"lit_17593",'name':"@17593",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EC0,'size':4,'pad':0,'label':"lit_18068",'name':"@18068",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EC4,'size':4,'pad':0,'label':"lit_18176",'name':"@18176",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EC8,'size':4,'pad':0,'label':"lit_18706",'name':"@18706",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452ECC,'size':4,'pad':0,'label':"lit_18830",'name':"@18830",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452ED0,'size':4,'pad':0,'label':"lit_18847",'name':"@18847",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452ED4,'size':4,'pad':0,'label':"lit_18929",'name':"@18929",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452ED8,'size':4,'pad':0,'label':"lit_18997",'name':"@18997",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EDC,'size':4,'pad':0,'label':"lit_19240",'name':"@19240",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EE0,'size':4,'pad':0,'label':"lit_19379",'name':"@19379",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EE4,'size':4,'pad':0,'label':"lit_19380",'name':"@19380",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EE8,'size':4,'pad':0,'label':"lit_19381",'name':"@19381",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EEC,'size':4,'pad':0,'label':"lit_19382",'name':"@19382",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EF0,'size':4,'pad':0,'label':"lit_19428",'name':"@19428",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EF4,'size':4,'pad':0,'label':"lit_19580",'name':"@19580",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EF8,'size':4,'pad':0,'label':"lit_20303",'name':"@20303",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452EFC,'size':4,'pad':0,'label':"lit_20400",'name':"@20400",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F00,'size':4,'pad':0,'label':"lit_20401",'name':"@20401",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F04,'size':4,'pad':0,'label':"lit_20402",'name':"@20402",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F08,'size':4,'pad':0,'label':"lit_20495",'name':"@20495",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F0C,'size':4,'pad':0,'label':"lit_20496",'name':"@20496",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F10,'size':4,'pad':0,'label':"lit_20790",'name':"@20790",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F14,'size':4,'pad':0,'label':"lit_20823",'name':"@20823",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F18,'size':4,'pad':0,'label':"lit_20824",'name':"@20824",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F1C,'size':4,'pad':0,'label':"lit_20991",'name':"@20991",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F20,'size':4,'pad':0,'label':"lit_20992",'name':"@20992",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F24,'size':4,'pad':0,'label':"lit_21021",'name':"@21021",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F28,'size':4,'pad':0,'label':"lit_21624",'name':"@21624",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F2C,'size':4,'pad':0,'label':"lit_21680",'name':"@21680",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F30,'size':4,'pad':0,'label':"lit_21736",'name':"@21736",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F34,'size':4,'pad':0,'label':"lit_22146",'name':"@22146",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452D00,'size':4,'pad':0,'label':"lit_6895",'name':"@6895",'lib':0,'tu':141,'section':8,'r':[47,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D04,'size':4,'pad':0,'label':"lit_6896",'name':"@6896",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D08,'size':4,'pad':0,'label':"lit_7174",'name':"@7174",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D0C,'size':4,'pad':0,'label':"lit_7305",'name':"@7305",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D10,'size':4,'pad':0,'label':"lit_7306",'name':"@7306",'lib':0,'tu':141,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D14,'size':4,'pad':0,'label':"lit_7307",'name':"@7307",'lib':0,'tu':141,'section':8,'r':[57,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D18,'size':4,'pad':0,'label':"lit_7308",'name':"@7308",'lib':0,'tu':141,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D1C,'size':4,'pad':0,'label':"lit_7448",'name':"@7448",'lib':0,'tu':141,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D20,'size':4,'pad':0,'label':"lit_7449",'name':"@7449",'lib':0,'tu':141,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D24,'size':4,'pad':0,'label':"lit_7450",'name':"@7450",'lib':0,'tu':141,'section':8,'r':[38,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D28,'size':4,'pad':0,'label':"lit_7451",'name':"@7451",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D2C,'size':4,'pad':0,'label':"lit_7624",'name':"@7624",'lib':0,'tu':141,'section':8,'r':[28,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D30,'size':4,'pad':0,'label':"lit_7625",'name':"@7625",'lib':0,'tu':141,'section':8,'r':[67,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D34,'size':4,'pad':0,'label':"lit_7710",'name':"@7710",'lib':0,'tu':141,'section':8,'r':[36,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D38,'size':4,'pad':0,'label':"lit_7807",'name':"@7807",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D3C,'size':4,'pad':0,'label':"lit_7808",'name':"@7808",'lib':0,'tu':141,'section':8,'r':[82,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D40,'size':4,'pad':0,'label':"lit_7945",'name':"@7945",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D44,'size':4,'pad':0,'label':"lit_7977",'name':"@7977",'lib':0,'tu':141,'section':8,'r':[27,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D48,'size':4,'pad':0,'label':"lit_8130",'name':"@8130",'lib':0,'tu':141,'section':8,'r':[21,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D4C,'size':4,'pad':0,'label':"lit_8131",'name':"@8131",'lib':0,'tu':141,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D50,'size':4,'pad':0,'label':"lit_8247",'name':"@8247",'lib':0,'tu':141,'section':8,'r':[39,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D54,'size':4,'pad':0,'label':"lit_8248",'name':"@8248",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D58,'size':4,'pad':0,'label':"lit_8249",'name':"@8249",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D5C,'size':4,'pad':0,'label':"lit_8322",'name':"@8322",'lib':0,'tu':141,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D60,'size':4,'pad':0,'label':"lit_8369",'name':"@8369",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D64,'size':4,'pad':0,'label':"lit_8370",'name':"@8370",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D68,'size':4,'pad':0,'label':"lit_8472",'name':"@8472",'lib':0,'tu':141,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D6C,'size':4,'pad':0,'label':"lit_8473",'name':"@8473",'lib':0,'tu':141,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D70,'size':4,'pad':0,'label':"lit_8501",'name':"@8501",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D74,'size':4,'pad':0,'label':"lit_8502",'name':"@8502",'lib':0,'tu':141,'section':8,'r':[21,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D78,'size':4,'pad':0,'label':"lit_8676",'name':"@8676",'lib':0,'tu':141,'section':8,'r':[31,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D7C,'size':4,'pad':0,'label':"lit_8779",'name':"@8779",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D80,'size':4,'pad':0,'label':"lit_8780",'name':"@8780",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D84,'size':4,'pad':0,'label':"lit_8781",'name':"@8781",'lib':0,'tu':141,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D88,'size':4,'pad':0,'label':"lit_8782",'name':"@8782",'lib':0,'tu':141,'section':8,'r':[29,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D8C,'size':4,'pad':0,'label':"lit_8783",'name':"@8783",'lib':0,'tu':141,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D90,'size':4,'pad':0,'label':"lit_8784",'name':"@8784",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D94,'size':4,'pad':0,'label':"lit_8785",'name':"@8785",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D98,'size':4,'pad':0,'label':"lit_8786",'name':"@8786",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452D9C,'size':4,'pad':0,'label':"lit_9053",'name':"@9053",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DA0,'size':4,'pad':0,'label':"lit_9054",'name':"@9054",'lib':0,'tu':141,'section':8,'r':[43,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DA4,'size':4,'pad':0,'label':"lit_9138",'name':"@9138",'lib':0,'tu':141,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DA8,'size':4,'pad':0,'label':"lit_9652",'name':"@9652",'lib':0,'tu':141,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DAC,'size':4,'pad':0,'label':"lit_9828",'name':"@9828",'lib':0,'tu':141,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DB0,'size':4,'pad':0,'label':"lit_10039",'name':"@10039",'lib':0,'tu':141,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DB4,'size':4,'pad':0,'label':"lit_10040",'name':"@10040",'lib':0,'tu':141,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DB8,'size':4,'pad':0,'label':"lit_10041",'name':"@10041",'lib':0,'tu':141,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DBC,'size':4,'pad':0,'label':"lit_10042",'name':"@10042",'lib':0,'tu':141,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DC0,'size':4,'pad':0,'label':"lit_10193",'name':"@10193",'lib':0,'tu':141,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DC4,'size':4,'pad':0,'label':"lit_10194",'name':"@10194",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DC8,'size':4,'pad':0,'label':"lit_10286",'name':"@10286",'lib':0,'tu':141,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DCC,'size':4,'pad':0,'label':"lit_10532",'name':"@10532",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DD0,'size':4,'pad':0,'label':"lit_11122",'name':"@11122",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DD4,'size':4,'pad':0,'label':"lit_11442",'name':"@11442",'lib':0,'tu':141,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DD8,'size':4,'pad':0,'label':"lit_11470",'name':"@11470",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DDC,'size':4,'pad':0,'label':"lit_11471",'name':"@11471",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DE0,'size':4,'pad':0,'label':"lit_11673",'name':"@11673",'lib':0,'tu':141,'section':8,'r':[17,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DE4,'size':4,'pad':0,'label':"lit_12328",'name':"@12328",'lib':0,'tu':141,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DE8,'size':4,'pad':0,'label':"lit_12475",'name':"@12475",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DEC,'size':4,'pad':0,'label':"lit_13119",'name':"@13119",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DF0,'size':4,'pad':0,'label':"lit_13382",'name':"@13382",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DF4,'size':4,'pad':0,'label':"lit_13699",'name':"@13699",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DF8,'size':4,'pad':0,'label':"lit_13700",'name':"@13700",'lib':0,'tu':141,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452DFC,'size':4,'pad':0,'label':"lit_13701",'name':"@13701",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E00,'size':4,'pad':0,'label':"lit_13702",'name':"@13702",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E04,'size':4,'pad':0,'label':"lit_13794",'name':"@13794",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E08,'size':4,'pad':0,'label':"lit_14064",'name':"@14064",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E0C,'size':4,'pad':0,'label':"lit_14614",'name':"@14614",'lib':0,'tu':141,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E10,'size':4,'pad':0,'label':"lit_14615",'name':"@14615",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E14,'size':4,'pad':0,'label':"lit_14616",'name':"@14616",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E18,'size':4,'pad':0,'label':"lit_14617",'name':"@14617",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E1C,'size':4,'pad':0,'label':"lit_14618",'name':"@14618",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E20,'size':4,'pad':0,'label':"lit_14619",'name':"@14619",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E24,'size':4,'pad':0,'label':"lit_14620",'name':"@14620",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E28,'size':4,'pad':0,'label':"lit_14621",'name':"@14621",'lib':0,'tu':141,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E2C,'size':4,'pad':0,'label':"lit_14622",'name':"@14622",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E30,'size':4,'pad':0,'label':"lit_14623",'name':"@14623",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E34,'size':4,'pad':0,'label':"lit_14624",'name':"@14624",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E38,'size':4,'pad':0,'label':"lit_14625",'name':"@14625",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E3C,'size':4,'pad':0,'label':"lit_14626",'name':"@14626",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E40,'size':4,'pad':0,'label':"lit_14627",'name':"@14627",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E44,'size':4,'pad':0,'label':"lit_14760",'name':"@14760",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E48,'size':4,'pad':0,'label':"lit_14781",'name':"@14781",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E4C,'size':4,'pad':0,'label':"lit_14782",'name':"@14782",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E50,'size':4,'pad':0,'label':"lit_14783",'name':"@14783",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E54,'size':4,'pad':0,'label':"lit_14784",'name':"@14784",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E58,'size':4,'pad':0,'label':"lit_14785",'name':"@14785",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E5C,'size':4,'pad':0,'label':"lit_14786",'name':"@14786",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E60,'size':4,'pad':0,'label':"lit_14787",'name':"@14787",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E64,'size':4,'pad':0,'label':"lit_14954",'name':"@14954",'lib':0,'tu':141,'section':8,'r':[47,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E68,'size':4,'pad':0,'label':"lit_14955",'name':"@14955",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E6C,'size':4,'pad':0,'label':"lit_15106",'name':"@15106",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E70,'size':4,'pad':0,'label':"lit_15188",'name':"@15188",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E74,'size':4,'pad':0,'label':"lit_15341",'name':"@15341",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E78,'size':4,'pad':0,'label':"lit_15460",'name':"@15460",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E7C,'size':4,'pad':0,'label':"lit_15808",'name':"@15808",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E80,'size':4,'pad':0,'label':"lit_16036",'name':"@16036",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E84,'size':4,'pad':0,'label':"lit_16037",'name':"@16037",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E88,'size':4,'pad':0,'label':"lit_16038",'name':"@16038",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E8C,'size':4,'pad':0,'label':"lit_16066",'name':"@16066",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E90,'size':4,'pad':0,'label':"lit_16067",'name':"@16067",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E94,'size':4,'pad':0,'label':"lit_16210",'name':"@16210",'lib':0,'tu':141,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E98,'size':4,'pad':0,'label':"lit_16566",'name':"@16566",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452E9C,'size':4,'pad':0,'label':"lit_16567",'name':"@16567",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EA0,'size':4,'pad':0,'label':"lit_16568",'name':"@16568",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EA4,'size':4,'pad':0,'label':"lit_16569",'name':"@16569",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EA8,'size':4,'pad':0,'label':"lit_16570",'name':"@16570",'lib':0,'tu':141,'section':8,'r':[20,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EAC,'size':4,'pad':0,'label':"lit_16641",'name':"@16641",'lib':0,'tu':141,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EB0,'size':4,'pad':0,'label':"lit_16790",'name':"@16790",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EB4,'size':4,'pad':0,'label':"lit_17382",'name':"@17382",'lib':0,'tu':141,'section':8,'r':[22,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EB8,'size':4,'pad':0,'label':"lit_17592",'name':"@17592",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EBC,'size':4,'pad':0,'label':"lit_17593",'name':"@17593",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EC0,'size':4,'pad':0,'label':"lit_18068",'name':"@18068",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EC4,'size':4,'pad':0,'label':"lit_18176",'name':"@18176",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EC8,'size':4,'pad':0,'label':"lit_18706",'name':"@18706",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452ECC,'size':4,'pad':0,'label':"lit_18830",'name':"@18830",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452ED0,'size':4,'pad':0,'label':"lit_18847",'name':"@18847",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452ED4,'size':4,'pad':0,'label':"lit_18929",'name':"@18929",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452ED8,'size':4,'pad':0,'label':"lit_18997",'name':"@18997",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EDC,'size':4,'pad':0,'label':"lit_19240",'name':"@19240",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EE0,'size':4,'pad':0,'label':"lit_19379",'name':"@19379",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EE4,'size':4,'pad':0,'label':"lit_19380",'name':"@19380",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EE8,'size':4,'pad':0,'label':"lit_19381",'name':"@19381",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EEC,'size':4,'pad':0,'label':"lit_19382",'name':"@19382",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EF0,'size':4,'pad':0,'label':"lit_19428",'name':"@19428",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EF4,'size':4,'pad':0,'label':"lit_19580",'name':"@19580",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EF8,'size':4,'pad':0,'label':"lit_20303",'name':"@20303",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452EFC,'size':4,'pad':0,'label':"lit_20400",'name':"@20400",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F00,'size':4,'pad':0,'label':"lit_20401",'name':"@20401",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F04,'size':4,'pad':0,'label':"lit_20402",'name':"@20402",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F08,'size':4,'pad':0,'label':"lit_20495",'name':"@20495",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F0C,'size':4,'pad':0,'label':"lit_20496",'name':"@20496",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F10,'size':4,'pad':0,'label':"lit_20790",'name':"@20790",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F14,'size':4,'pad':0,'label':"lit_20823",'name':"@20823",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F18,'size':4,'pad':0,'label':"lit_20824",'name':"@20824",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F1C,'size':4,'pad':0,'label':"lit_20991",'name':"@20991",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F20,'size':4,'pad':0,'label':"lit_20992",'name':"@20992",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F24,'size':4,'pad':0,'label':"lit_21021",'name':"@21021",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F28,'size':4,'pad':0,'label':"lit_21624",'name':"@21624",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F2C,'size':4,'pad':0,'label':"lit_21680",'name':"@21680",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F30,'size':4,'pad':0,'label':"lit_21736",'name':"@21736",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F34,'size':4,'pad':0,'label':"lit_22146",'name':"@22146",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452F38,'size':4,'pad':0,'label':"struct_80452F38",'name':None,'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Structure"}, - {'addr':0x80452F3C,'size':4,'pad':0,'label':"lit_22608",'name':"@22608",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F40,'size':4,'pad':0,'label':"lit_22609",'name':"@22609",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F44,'size':4,'pad':0,'label':"lit_23155",'name':"@23155",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F48,'size':4,'pad':0,'label':"lit_23416",'name':"@23416",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F4C,'size':4,'pad':0,'label':"lit_23542",'name':"@23542",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F50,'size':4,'pad':0,'label':"lit_23595",'name':"@23595",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F54,'size':4,'pad':0,'label':"lit_24322",'name':"@24322",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F58,'size':4,'pad':0,'label':"lit_24323",'name':"@24323",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F5C,'size':4,'pad':0,'label':"lit_24400",'name':"@24400",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F60,'size':4,'pad':0,'label':"lit_24401",'name':"@24401",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F64,'size':4,'pad':0,'label':"lit_24589",'name':"@24589",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F68,'size':4,'pad':0,'label':"lit_24590",'name':"@24590",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F6C,'size':4,'pad':0,'label':"lit_24591",'name':"@24591",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F70,'size':4,'pad':0,'label':"lit_24592",'name':"@24592",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F74,'size':4,'pad':0,'label':"lit_24593",'name':"@24593",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F78,'size':4,'pad':0,'label':"lit_24594",'name':"@24594",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F7C,'size':4,'pad':0,'label':"lit_24595",'name':"@24595",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F80,'size':4,'pad':0,'label':"lit_24600",'name':"@24600",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F84,'size':4,'pad':0,'label':"lit_24618",'name':"@24618",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F88,'size':4,'pad':0,'label':"lit_24680",'name':"@24680",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F8C,'size':4,'pad':0,'label':"lit_24852",'name':"@24852",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F90,'size':4,'pad':0,'label':"lit_25059",'name':"@25059",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F94,'size':4,'pad':0,'label':"lit_25113",'name':"@25113",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F98,'size':4,'pad':0,'label':"lit_25684",'name':"@25684",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452F9C,'size':4,'pad':0,'label':"lit_25873",'name':"@25873",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FA0,'size':4,'pad':0,'label':"lit_25874",'name':"@25874",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FA4,'size':4,'pad':0,'label':"lit_25916",'name':"@25916",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452F3C,'size':4,'pad':0,'label':"lit_22608",'name':"@22608",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F40,'size':4,'pad':0,'label':"lit_22609",'name':"@22609",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F44,'size':4,'pad':0,'label':"lit_23155",'name':"@23155",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F48,'size':4,'pad':0,'label':"lit_23416",'name':"@23416",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F4C,'size':4,'pad':0,'label':"lit_23542",'name':"@23542",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F50,'size':4,'pad':0,'label':"lit_23595",'name':"@23595",'lib':0,'tu':141,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F54,'size':4,'pad':0,'label':"lit_24322",'name':"@24322",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F58,'size':4,'pad':0,'label':"lit_24323",'name':"@24323",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F5C,'size':4,'pad':0,'label':"lit_24400",'name':"@24400",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F60,'size':4,'pad':0,'label':"lit_24401",'name':"@24401",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F64,'size':4,'pad':0,'label':"lit_24589",'name':"@24589",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F68,'size':4,'pad':0,'label':"lit_24590",'name':"@24590",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F6C,'size':4,'pad':0,'label':"lit_24591",'name':"@24591",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F70,'size':4,'pad':0,'label':"lit_24592",'name':"@24592",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F74,'size':4,'pad':0,'label':"lit_24593",'name':"@24593",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F78,'size':4,'pad':0,'label':"lit_24594",'name':"@24594",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F7C,'size':4,'pad':0,'label':"lit_24595",'name':"@24595",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F80,'size':4,'pad':0,'label':"lit_24600",'name':"@24600",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F84,'size':4,'pad':0,'label':"lit_24618",'name':"@24618",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F88,'size':4,'pad':0,'label':"lit_24680",'name':"@24680",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F8C,'size':4,'pad':0,'label':"lit_24852",'name':"@24852",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F90,'size':4,'pad':0,'label':"lit_25059",'name':"@25059",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F94,'size':4,'pad':0,'label':"lit_25113",'name':"@25113",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F98,'size':4,'pad':0,'label':"lit_25684",'name':"@25684",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452F9C,'size':4,'pad':0,'label':"lit_25873",'name':"@25873",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FA0,'size':4,'pad':0,'label':"lit_25874",'name':"@25874",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FA4,'size':4,'pad':0,'label':"lit_25916",'name':"@25916",'lib':0,'tu':141,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80452FA8,'size':8,'pad':0,'label':"offsetAngle",'name':"offsetAngle$25945",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80452FB0,'size':4,'pad':0,'label':"lit_26233",'name':"@26233",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FB4,'size':4,'pad':0,'label':"lit_26275",'name':"@26275",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FB8,'size':4,'pad':0,'label':"lit_26276",'name':"@26276",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FBC,'size':4,'pad':0,'label':"lit_26297",'name':"@26297",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FC0,'size':4,'pad':0,'label':"lit_26816",'name':"@26816",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FC4,'size':4,'pad':0,'label':"lit_26817",'name':"@26817",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FC8,'size':4,'pad':0,'label':"lit_26818",'name':"@26818",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FCC,'size':4,'pad':0,'label':"lit_26819",'name':"@26819",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FD0,'size':4,'pad':0,'label':"lit_27005",'name':"@27005",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FD4,'size':4,'pad':0,'label':"lit_27418",'name':"@27418",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FD8,'size':4,'pad':0,'label':"lit_27476",'name':"@27476",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FDC,'size':4,'pad':0,'label':"lit_27477",'name':"@27477",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FE0,'size':4,'pad':0,'label':"lit_28016",'name':"@28016",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FE4,'size':4,'pad':0,'label':"lit_28017",'name':"@28017",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FE8,'size':4,'pad':0,'label':"lit_28045",'name':"@28045",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FEC,'size':4,'pad':0,'label':"lit_28285",'name':"@28285",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FF0,'size':4,'pad':0,'label':"lit_28286",'name':"@28286",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FF4,'size':4,'pad':0,'label':"lit_28287",'name':"@28287",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FF8,'size':4,'pad':0,'label':"lit_28405",'name':"@28405",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80452FFC,'size':4,'pad':0,'label':"lit_30372",'name':"@30372",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453000,'size':4,'pad':0,'label':"lit_30895",'name':"@30895",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453004,'size':4,'pad':0,'label':"lit_31530",'name':"@31530",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453008,'size':8,'pad':0,'label':"lit_32072",'name':"@32072",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453010,'size':4,'pad':0,'label':"lit_32830",'name':"@32830",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453014,'size':4,'pad':0,'label':"lit_32831",'name':"@32831",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453018,'size':4,'pad':0,'label':"lit_32832",'name':"@32832",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045301C,'size':4,'pad':0,'label':"lit_32833",'name':"@32833",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80452FB0,'size':4,'pad':0,'label':"lit_26233",'name':"@26233",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FB4,'size':4,'pad':0,'label':"lit_26275",'name':"@26275",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FB8,'size':4,'pad':0,'label':"lit_26276",'name':"@26276",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FBC,'size':4,'pad':0,'label':"lit_26297",'name':"@26297",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FC0,'size':4,'pad':0,'label':"lit_26816",'name':"@26816",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FC4,'size':4,'pad':0,'label':"lit_26817",'name':"@26817",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FC8,'size':4,'pad':0,'label':"lit_26818",'name':"@26818",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FCC,'size':4,'pad':0,'label':"lit_26819",'name':"@26819",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FD0,'size':4,'pad':0,'label':"lit_27005",'name':"@27005",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FD4,'size':4,'pad':0,'label':"lit_27418",'name':"@27418",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FD8,'size':4,'pad':0,'label':"lit_27476",'name':"@27476",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FDC,'size':4,'pad':0,'label':"lit_27477",'name':"@27477",'lib':0,'tu':141,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FE0,'size':4,'pad':0,'label':"lit_28016",'name':"@28016",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FE4,'size':4,'pad':0,'label':"lit_28017",'name':"@28017",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FE8,'size':4,'pad':0,'label':"lit_28045",'name':"@28045",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FEC,'size':4,'pad':0,'label':"lit_28285",'name':"@28285",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FF0,'size':4,'pad':0,'label':"lit_28286",'name':"@28286",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FF4,'size':4,'pad':0,'label':"lit_28287",'name':"@28287",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FF8,'size':4,'pad':0,'label':"lit_28405",'name':"@28405",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80452FFC,'size':4,'pad':0,'label':"lit_30372",'name':"@30372",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453000,'size':4,'pad':0,'label':"lit_30895",'name':"@30895",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453004,'size':4,'pad':0,'label':"lit_31530",'name':"@31530",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453008,'size':8,'pad':0,'label':"lit_32072",'name':"@32072",'lib':0,'tu':141,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453010,'size':4,'pad':0,'label':"lit_32830",'name':"@32830",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453014,'size':4,'pad':0,'label':"lit_32831",'name':"@32831",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453018,'size':4,'pad':0,'label':"lit_32832",'name':"@32832",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045301C,'size':4,'pad':0,'label':"lit_32833",'name':"@32833",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453020,'size':4,'pad':0,'label':"grassWhistleIdx",'name':"grassWhistleIdx$33097",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453024,'size':4,'pad':0,'label':"lit_33587",'name':"@33587",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453028,'size':4,'pad':0,'label':"lit_34189",'name':"@34189",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045302C,'size':4,'pad':0,'label':"lit_34190",'name':"@34190",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453030,'size':4,'pad':0,'label':"lit_34772",'name':"@34772",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453034,'size':4,'pad':0,'label':"lit_34773",'name':"@34773",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453038,'size':4,'pad':0,'label':"lit_34774",'name':"@34774",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045303C,'size':4,'pad':0,'label':"lit_34775",'name':"@34775",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453040,'size':4,'pad':0,'label':"lit_34776",'name':"@34776",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453044,'size':4,'pad':0,'label':"lit_34777",'name':"@34777",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453048,'size':4,'pad':0,'label':"lit_34778",'name':"@34778",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045304C,'size':4,'pad':0,'label':"lit_34779",'name':"@34779",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453050,'size':4,'pad':0,'label':"lit_34957",'name':"@34957",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453054,'size':4,'pad':0,'label':"lit_35610",'name':"@35610",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453058,'size':4,'pad':0,'label':"lit_37152",'name':"@37152",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045305C,'size':4,'pad':0,'label':"lit_37322",'name':"@37322",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453060,'size':4,'pad':0,'label':"lit_37323",'name':"@37323",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453064,'size':4,'pad':0,'label':"lit_37527",'name':"@37527",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453068,'size':4,'pad':0,'label':"lit_37528",'name':"@37528",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045306C,'size':4,'pad':0,'label':"lit_37749",'name':"@37749",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453070,'size':4,'pad':0,'label':"lit_38059",'name':"@38059",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453074,'size':4,'pad':0,'label':"lit_38175",'name':"@38175",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453078,'size':4,'pad':0,'label':"lit_38176",'name':"@38176",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045307C,'size':4,'pad':0,'label':"lit_38177",'name':"@38177",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453080,'size':4,'pad':0,'label':"lit_38624",'name':"@38624",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453084,'size':4,'pad':0,'label':"lit_39330",'name':"@39330",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453088,'size':4,'pad':0,'label':"lit_40561",'name':"@40561",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045308C,'size':4,'pad':0,'label':"lit_40562",'name':"@40562",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453090,'size':4,'pad':0,'label':"lit_40716",'name':"@40716",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453024,'size':4,'pad':0,'label':"lit_33587",'name':"@33587",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453028,'size':4,'pad':0,'label':"lit_34189",'name':"@34189",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045302C,'size':4,'pad':0,'label':"lit_34190",'name':"@34190",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453030,'size':4,'pad':0,'label':"lit_34772",'name':"@34772",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453034,'size':4,'pad':0,'label':"lit_34773",'name':"@34773",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453038,'size':4,'pad':0,'label':"lit_34774",'name':"@34774",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045303C,'size':4,'pad':0,'label':"lit_34775",'name':"@34775",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453040,'size':4,'pad':0,'label':"lit_34776",'name':"@34776",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453044,'size':4,'pad':0,'label':"lit_34777",'name':"@34777",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453048,'size':4,'pad':0,'label':"lit_34778",'name':"@34778",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045304C,'size':4,'pad':0,'label':"lit_34779",'name':"@34779",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453050,'size':4,'pad':0,'label':"lit_34957",'name':"@34957",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453054,'size':4,'pad':0,'label':"lit_35610",'name':"@35610",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453058,'size':4,'pad':0,'label':"lit_37152",'name':"@37152",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045305C,'size':4,'pad':0,'label':"lit_37322",'name':"@37322",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453060,'size':4,'pad':0,'label':"lit_37323",'name':"@37323",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453064,'size':4,'pad':0,'label':"lit_37527",'name':"@37527",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453068,'size':4,'pad':0,'label':"lit_37528",'name':"@37528",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045306C,'size':4,'pad':0,'label':"lit_37749",'name':"@37749",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453070,'size':4,'pad':0,'label':"lit_38059",'name':"@38059",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453074,'size':4,'pad':0,'label':"lit_38175",'name':"@38175",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453078,'size':4,'pad':0,'label':"lit_38176",'name':"@38176",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045307C,'size':4,'pad':0,'label':"lit_38177",'name':"@38177",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453080,'size':4,'pad':0,'label':"lit_38624",'name':"@38624",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453084,'size':4,'pad':0,'label':"lit_39330",'name':"@39330",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453088,'size':4,'pad':0,'label':"lit_40561",'name':"@40561",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045308C,'size':4,'pad':0,'label':"lit_40562",'name':"@40562",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453090,'size':4,'pad':0,'label':"lit_40716",'name':"@40716",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453094,'size':6,'pad':2,'label':"effName_40765",'name':"effName$40765",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045309C,'size':6,'pad':2,'label':"effName0",'name':"effName0$40950",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804530A4,'size':6,'pad':2,'label':"effName1",'name':"effName1$40951",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804530AC,'size':4,'pad':0,'label':"effNameNormal",'name':"effNameNormal$41086",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804530B0,'size':8,'pad':0,'label':"effNameLight",'name':"effNameLight$41091",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804530B8,'size':4,'pad':0,'label':"effNameWater",'name':"effNameWater$41101",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804530BC,'size':4,'pad':0,'label':"lit_41180",'name':"@41180",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804530BC,'size':4,'pad':0,'label':"lit_41180",'name':"@41180",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804530C0,'size':8,'pad':0,'label':"jointID",'name':"jointID$41285",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804530C8,'size':8,'pad':0,'label':"effName_41286",'name':"effName$41286",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804530D0,'size':6,'pad':2,'label':"effName_41312",'name':"effName$41312",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -24268,291 +24268,291 @@ SYMBOLS = [ {'addr':0x804530F0,'size':4,'pad':0,'label':"normalNameID",'name':"normalNameID$41521",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804530F4,'size':4,'pad':0,'label':"ganonNameID",'name':"ganonNameID$41522",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804530F8,'size':8,'pad':0,'label':"effDataTable",'name':"effDataTable$41650",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453100,'size':4,'pad':0,'label':"lit_41718",'name':"@41718",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453100,'size':4,'pad':0,'label':"lit_41718",'name':"@41718",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453104,'size':8,'pad':0,'label':"cutSplashName",'name':"cutSplashName$41756",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045310C,'size':4,'pad':0,'label':"effName_42224",'name':"effName$42224",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453110,'size':4,'pad':0,'label':"effName_42309",'name':"effName$42309",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453114,'size':4,'pad':0,'label':"effName_42340",'name':"effName$42340",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453118,'size':4,'pad':0,'label':"lit_42493",'name':"@42493",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045311C,'size':4,'pad':0,'label':"lit_42622",'name':"@42622",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453120,'size':4,'pad':0,'label':"lit_42685",'name':"@42685",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453124,'size':4,'pad':0,'label':"lit_42686",'name':"@42686",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453128,'size':4,'pad':0,'label':"lit_42687",'name':"@42687",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045312C,'size':4,'pad':0,'label':"lit_42688",'name':"@42688",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453130,'size':4,'pad':0,'label':"lit_42933",'name':"@42933",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453134,'size':4,'pad':0,'label':"lit_42934",'name':"@42934",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453138,'size':4,'pad':0,'label':"lit_43529",'name':"@43529",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045313C,'size':4,'pad':0,'label':"lit_43530",'name':"@43530",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453140,'size':4,'pad':0,'label':"lit_43531",'name':"@43531",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453144,'size':4,'pad':0,'label':"lit_44003",'name':"@44003",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453148,'size':4,'pad':0,'label':"lit_44004",'name':"@44004",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453118,'size':4,'pad':0,'label':"lit_42493",'name':"@42493",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045311C,'size':4,'pad':0,'label':"lit_42622",'name':"@42622",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453120,'size':4,'pad':0,'label':"lit_42685",'name':"@42685",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453124,'size':4,'pad':0,'label':"lit_42686",'name':"@42686",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453128,'size':4,'pad':0,'label':"lit_42687",'name':"@42687",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045312C,'size':4,'pad':0,'label':"lit_42688",'name':"@42688",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453130,'size':4,'pad':0,'label':"lit_42933",'name':"@42933",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453134,'size':4,'pad':0,'label':"lit_42934",'name':"@42934",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453138,'size':4,'pad':0,'label':"lit_43529",'name':"@43529",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045313C,'size':4,'pad':0,'label':"lit_43530",'name':"@43530",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453140,'size':4,'pad':0,'label':"lit_43531",'name':"@43531",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453144,'size':4,'pad':0,'label':"lit_44003",'name':"@44003",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453148,'size':4,'pad':0,'label':"lit_44004",'name':"@44004",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045314C,'size':4,'pad':0,'label':"fFootJoint",'name':"fFootJoint$44785",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453150,'size':4,'pad':0,'label':"bFootJoint",'name':"bFootJoint$44786",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453154,'size':4,'pad':0,'label':"lit_45401",'name':"@45401",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453158,'size':4,'pad':0,'label':"lit_45501",'name':"@45501",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045315C,'size':4,'pad':0,'label':"lit_45756",'name':"@45756",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453160,'size':4,'pad':0,'label':"lit_46081",'name':"@46081",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453164,'size':4,'pad':0,'label':"lit_46462",'name':"@46462",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453168,'size':4,'pad':0,'label':"lit_47052",'name':"@47052",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045316C,'size':4,'pad':0,'label':"lit_47417",'name':"@47417",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453170,'size':4,'pad':0,'label':"lit_47597",'name':"@47597",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453174,'size':4,'pad':0,'label':"lit_47598",'name':"@47598",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453178,'size':4,'pad':0,'label':"lit_47725",'name':"@47725",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045317C,'size':4,'pad':0,'label':"lit_47726",'name':"@47726",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453180,'size':4,'pad':0,'label':"lit_48076",'name':"@48076",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453184,'size':4,'pad':0,'label':"lit_48077",'name':"@48077",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453188,'size':4,'pad':0,'label':"lit_48078",'name':"@48078",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045318C,'size':4,'pad':0,'label':"lit_48504",'name':"@48504",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453190,'size':4,'pad':0,'label':"lit_48505",'name':"@48505",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453194,'size':4,'pad':0,'label':"lit_48506",'name':"@48506",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453198,'size':4,'pad':0,'label':"lit_49124",'name':"@49124",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045319C,'size':4,'pad':0,'label':"lit_49395",'name':"@49395",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531A0,'size':4,'pad':0,'label':"lit_49396",'name':"@49396",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531A4,'size':4,'pad':0,'label':"lit_49938",'name':"@49938",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531A8,'size':4,'pad':0,'label':"lit_49992",'name':"@49992",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531AC,'size':4,'pad':0,'label':"lit_50951",'name':"@50951",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531B0,'size':4,'pad':0,'label':"lit_51575",'name':"@51575",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531B4,'size':4,'pad':0,'label':"lit_52234",'name':"@52234",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531B8,'size':4,'pad':0,'label':"lit_52470",'name':"@52470",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531BC,'size':4,'pad':0,'label':"lit_52534",'name':"@52534",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531C0,'size':4,'pad':0,'label':"lit_52535",'name':"@52535",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531C4,'size':4,'pad':0,'label':"lit_52536",'name':"@52536",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531C8,'size':4,'pad':0,'label':"lit_52882",'name':"@52882",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531CC,'size':4,'pad':0,'label':"lit_52883",'name':"@52883",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531D0,'size':4,'pad':0,'label':"lit_52884",'name':"@52884",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531D4,'size':4,'pad':0,'label':"lit_53012",'name':"@53012",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453154,'size':4,'pad':0,'label':"lit_45401",'name':"@45401",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453158,'size':4,'pad':0,'label':"lit_45501",'name':"@45501",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045315C,'size':4,'pad':0,'label':"lit_45756",'name':"@45756",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453160,'size':4,'pad':0,'label':"lit_46081",'name':"@46081",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453164,'size':4,'pad':0,'label':"lit_46462",'name':"@46462",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453168,'size':4,'pad':0,'label':"lit_47052",'name':"@47052",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045316C,'size':4,'pad':0,'label':"lit_47417",'name':"@47417",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453170,'size':4,'pad':0,'label':"lit_47597",'name':"@47597",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453174,'size':4,'pad':0,'label':"lit_47598",'name':"@47598",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453178,'size':4,'pad':0,'label':"lit_47725",'name':"@47725",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045317C,'size':4,'pad':0,'label':"lit_47726",'name':"@47726",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453180,'size':4,'pad':0,'label':"lit_48076",'name':"@48076",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453184,'size':4,'pad':0,'label':"lit_48077",'name':"@48077",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453188,'size':4,'pad':0,'label':"lit_48078",'name':"@48078",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045318C,'size':4,'pad':0,'label':"lit_48504",'name':"@48504",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453190,'size':4,'pad':0,'label':"lit_48505",'name':"@48505",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453194,'size':4,'pad':0,'label':"lit_48506",'name':"@48506",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453198,'size':4,'pad':0,'label':"lit_49124",'name':"@49124",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045319C,'size':4,'pad':0,'label':"lit_49395",'name':"@49395",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531A0,'size':4,'pad':0,'label':"lit_49396",'name':"@49396",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531A4,'size':4,'pad':0,'label':"lit_49938",'name':"@49938",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531A8,'size':4,'pad':0,'label':"lit_49992",'name':"@49992",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531AC,'size':4,'pad':0,'label':"lit_50951",'name':"@50951",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531B0,'size':4,'pad':0,'label':"lit_51575",'name':"@51575",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531B4,'size':4,'pad':0,'label':"lit_52234",'name':"@52234",'lib':0,'tu':141,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531B8,'size':4,'pad':0,'label':"lit_52470",'name':"@52470",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531BC,'size':4,'pad':0,'label':"lit_52534",'name':"@52534",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531C0,'size':4,'pad':0,'label':"lit_52535",'name':"@52535",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531C4,'size':4,'pad':0,'label':"lit_52536",'name':"@52536",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531C8,'size':4,'pad':0,'label':"lit_52882",'name':"@52882",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531CC,'size':4,'pad':0,'label':"lit_52883",'name':"@52883",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531D0,'size':4,'pad':0,'label':"lit_52884",'name':"@52884",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531D4,'size':4,'pad':0,'label':"lit_53012",'name':"@53012",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804531D8,'size':8,'pad':0,'label':"snowID",'name':"snowID$53110",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804531E0,'size':8,'pad':0,'label':"smokeID",'name':"smokeID$53111",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804531E8,'size':8,'pad':0,'label':"waterColor",'name':"waterColor$53845",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804531F0,'size':4,'pad':0,'label':"lit_55047",'name':"@55047",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531F4,'size':4,'pad':0,'label':"lit_55048",'name':"@55048",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531F8,'size':4,'pad':0,'label':"lit_55145",'name':"@55145",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804531FC,'size':4,'pad':0,'label':"lit_55146",'name':"@55146",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453200,'size':4,'pad':0,'label':"lit_55147",'name':"@55147",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453204,'size':4,'pad':0,'label':"lit_55148",'name':"@55148",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453208,'size':4,'pad':0,'label':"lit_55149",'name':"@55149",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045320C,'size':4,'pad':0,'label':"lit_55150",'name':"@55150",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453210,'size':4,'pad':0,'label':"lit_55151",'name':"@55151",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453214,'size':4,'pad':0,'label':"lit_55845",'name':"@55845",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453218,'size':4,'pad':0,'label':"lit_55846",'name':"@55846",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045321C,'size':4,'pad':0,'label':"lit_55847",'name':"@55847",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453220,'size':4,'pad':0,'label':"lit_55848",'name':"@55848",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453224,'size':4,'pad':0,'label':"lit_56018",'name':"@56018",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804531F0,'size':4,'pad':0,'label':"lit_55047",'name':"@55047",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531F4,'size':4,'pad':0,'label':"lit_55048",'name':"@55048",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531F8,'size':4,'pad':0,'label':"lit_55145",'name':"@55145",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804531FC,'size':4,'pad':0,'label':"lit_55146",'name':"@55146",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453200,'size':4,'pad':0,'label':"lit_55147",'name':"@55147",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453204,'size':4,'pad':0,'label':"lit_55148",'name':"@55148",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453208,'size':4,'pad':0,'label':"lit_55149",'name':"@55149",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045320C,'size':4,'pad':0,'label':"lit_55150",'name':"@55150",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453210,'size':4,'pad':0,'label':"lit_55151",'name':"@55151",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453214,'size':4,'pad':0,'label':"lit_55845",'name':"@55845",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453218,'size':4,'pad':0,'label':"lit_55846",'name':"@55846",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045321C,'size':4,'pad':0,'label':"lit_55847",'name':"@55847",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453220,'size':4,'pad':0,'label':"lit_55848",'name':"@55848",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453224,'size':4,'pad':0,'label':"lit_56018",'name':"@56018",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453228,'size':4,'pad':0,'label':"armJointTable",'name':"armJointTable$56027",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045322C,'size':4,'pad':0,'label':"footJointTable",'name':"footJointTable$56137",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453230,'size':4,'pad':0,'label':"lit_58630",'name':"@58630",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453234,'size':4,'pad':0,'label':"lit_58631",'name':"@58631",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453238,'size':4,'pad':0,'label':"lit_59593",'name':"@59593",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045323C,'size':4,'pad':0,'label':"lit_59594",'name':"@59594",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453240,'size':4,'pad':0,'label':"lit_59595",'name':"@59595",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453244,'size':4,'pad':0,'label':"lit_60413",'name':"@60413",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453248,'size':4,'pad':0,'label':"lit_61025",'name':"@61025",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045324C,'size':4,'pad':0,'label':"lit_61026",'name':"@61026",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453250,'size':4,'pad':0,'label':"lit_61027",'name':"@61027",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453254,'size':4,'pad':0,'label':"lit_61028",'name':"@61028",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453258,'size':4,'pad':0,'label':"lit_61029",'name':"@61029",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045325C,'size':4,'pad':0,'label':"lit_61030",'name':"@61030",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453260,'size':4,'pad':0,'label':"lit_61031",'name':"@61031",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453264,'size':4,'pad':0,'label':"lit_61032",'name':"@61032",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453268,'size':4,'pad':0,'label':"lit_61033",'name':"@61033",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045326C,'size':4,'pad':0,'label':"lit_61034",'name':"@61034",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453270,'size':4,'pad':0,'label':"lit_61141",'name':"@61141",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453274,'size':4,'pad':0,'label':"lit_61142",'name':"@61142",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453230,'size':4,'pad':0,'label':"lit_58630",'name':"@58630",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453234,'size':4,'pad':0,'label':"lit_58631",'name':"@58631",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453238,'size':4,'pad':0,'label':"lit_59593",'name':"@59593",'lib':0,'tu':141,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045323C,'size':4,'pad':0,'label':"lit_59594",'name':"@59594",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453240,'size':4,'pad':0,'label':"lit_59595",'name':"@59595",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453244,'size':4,'pad':0,'label':"lit_60413",'name':"@60413",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453248,'size':4,'pad':0,'label':"lit_61025",'name':"@61025",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045324C,'size':4,'pad':0,'label':"lit_61026",'name':"@61026",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453250,'size':4,'pad':0,'label':"lit_61027",'name':"@61027",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453254,'size':4,'pad':0,'label':"lit_61028",'name':"@61028",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453258,'size':4,'pad':0,'label':"lit_61029",'name':"@61029",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045325C,'size':4,'pad':0,'label':"lit_61030",'name':"@61030",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453260,'size':4,'pad':0,'label':"lit_61031",'name':"@61031",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453264,'size':4,'pad':0,'label':"lit_61032",'name':"@61032",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453268,'size':4,'pad':0,'label':"lit_61033",'name':"@61033",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045326C,'size':4,'pad':0,'label':"lit_61034",'name':"@61034",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453270,'size':4,'pad':0,'label':"lit_61141",'name':"@61141",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453274,'size':4,'pad':0,'label':"lit_61142",'name':"@61142",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453278,'size':8,'pad':0,'label':"kandelaarAnm",'name':"kandelaarAnm$62207",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453280,'size':4,'pad':0,'label':"lit_63332",'name':"@63332",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453284,'size':4,'pad':0,'label':"lit_63333",'name':"@63333",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453288,'size':4,'pad':0,'label':"lit_63334",'name':"@63334",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045328C,'size':4,'pad':0,'label':"lit_63482",'name':"@63482",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453290,'size':4,'pad':0,'label':"lit_64357",'name':"@64357",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453294,'size':4,'pad':0,'label':"lit_64592",'name':"@64592",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453298,'size':4,'pad':0,'label':"lit_64593",'name':"@64593",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045329C,'size':4,'pad':0,'label':"lit_64594",'name':"@64594",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532A0,'size':4,'pad':0,'label':"lit_64595",'name':"@64595",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532A4,'size':4,'pad':0,'label':"lit_64596",'name':"@64596",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532A8,'size':4,'pad':0,'label':"lit_64730",'name':"@64730",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532AC,'size':4,'pad':0,'label':"lit_64731",'name':"@64731",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453280,'size':4,'pad':0,'label':"lit_63332",'name':"@63332",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453284,'size':4,'pad':0,'label':"lit_63333",'name':"@63333",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453288,'size':4,'pad':0,'label':"lit_63334",'name':"@63334",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045328C,'size':4,'pad':0,'label':"lit_63482",'name':"@63482",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453290,'size':4,'pad':0,'label':"lit_64357",'name':"@64357",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453294,'size':4,'pad':0,'label':"lit_64592",'name':"@64592",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453298,'size':4,'pad':0,'label':"lit_64593",'name':"@64593",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045329C,'size':4,'pad':0,'label':"lit_64594",'name':"@64594",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532A0,'size':4,'pad':0,'label':"lit_64595",'name':"@64595",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532A4,'size':4,'pad':0,'label':"lit_64596",'name':"@64596",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532A8,'size':4,'pad':0,'label':"lit_64730",'name':"@64730",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532AC,'size':4,'pad':0,'label':"lit_64731",'name':"@64731",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804532B0,'size':4,'pad':0,'label':"itemTalkType",'name':"itemTalkType$67468",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804532B4,'size':4,'pad':0,'label':"lit_67554",'name':"@67554",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532B8,'size':4,'pad':0,'label':"lit_68266",'name':"@68266",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532BC,'size':4,'pad':0,'label':"lit_68956",'name':"@68956",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532C0,'size':4,'pad':0,'label':"lit_70084",'name':"@70084",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532C4,'size':4,'pad':0,'label':"lit_70267",'name':"@70267",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804532B4,'size':4,'pad':0,'label':"lit_67554",'name':"@67554",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532B8,'size':4,'pad':0,'label':"lit_68266",'name':"@68266",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532BC,'size':4,'pad':0,'label':"lit_68956",'name':"@68956",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532C0,'size':4,'pad':0,'label':"lit_70084",'name':"@70084",'lib':0,'tu':141,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532C4,'size':4,'pad':0,'label':"lit_70267",'name':"@70267",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804532C8,'size':4,'pad':0,'label':"lit_71910",'name':"@71910",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532CC,'size':4,'pad':0,'label':"lit_71997",'name':"@71997",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532D0,'size':4,'pad':0,'label':"lit_71998",'name':"@71998",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532D4,'size':4,'pad':0,'label':"lit_71999",'name':"@71999",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804532CC,'size':4,'pad':0,'label':"lit_71997",'name':"@71997",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532D0,'size':4,'pad':0,'label':"lit_71998",'name':"@71998",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532D4,'size':4,'pad':0,'label':"lit_71999",'name':"@71999",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804532D8,'size':4,'pad':0,'label':"lit_72043",'name':"@72043",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ReferenceArray"}, {'addr':0x804532DC,'size':4,'pad':0,'label':"data_804532DC",'name':None,'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ReferenceArray"}, - {'addr':0x804532E0,'size':4,'pad':0,'label':"lit_73057",'name':"@73057",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532E4,'size':4,'pad':0,'label':"lit_73781",'name':"@73781",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532E8,'size':4,'pad':0,'label':"lit_73790",'name':"@73790",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532EC,'size':4,'pad':0,'label':"lit_74138",'name':"@74138",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532F0,'size':4,'pad':0,'label':"lit_74385",'name':"@74385",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532F4,'size':4,'pad':0,'label':"lit_74386",'name':"@74386",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804532F8,'size':8,'pad':0,'label':"lit_74387",'name':"@74387",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453300,'size':8,'pad':0,'label':"lit_74388",'name':"@74388",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453308,'size':8,'pad':0,'label':"lit_74389",'name':"@74389",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453310,'size':8,'pad':0,'label':"lit_74390",'name':"@74390",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453318,'size':8,'pad':0,'label':"lit_74391",'name':"@74391",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453320,'size':8,'pad':0,'label':"lit_74392",'name':"@74392",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453328,'size':8,'pad':0,'label':"lit_74393",'name':"@74393",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453330,'size':4,'pad':0,'label':"lit_74394",'name':"@74394",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453334,'size':4,'pad':0,'label':"lit_74395",'name':"@74395",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453338,'size':4,'pad':0,'label':"lit_75939",'name':"@75939",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804532E0,'size':4,'pad':0,'label':"lit_73057",'name':"@73057",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532E4,'size':4,'pad':0,'label':"lit_73781",'name':"@73781",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532E8,'size':4,'pad':0,'label':"lit_73790",'name':"@73790",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532EC,'size':4,'pad':0,'label':"lit_74138",'name':"@74138",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532F0,'size':4,'pad':0,'label':"lit_74385",'name':"@74385",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532F4,'size':4,'pad':0,'label':"lit_74386",'name':"@74386",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804532F8,'size':8,'pad':0,'label':"lit_74387",'name':"@74387",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453300,'size':8,'pad':0,'label':"lit_74388",'name':"@74388",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453308,'size':8,'pad':0,'label':"lit_74389",'name':"@74389",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453310,'size':8,'pad':0,'label':"lit_74390",'name':"@74390",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453318,'size':8,'pad':0,'label':"lit_74391",'name':"@74391",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453320,'size':8,'pad':0,'label':"lit_74392",'name':"@74392",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453328,'size':8,'pad':0,'label':"lit_74393",'name':"@74393",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453330,'size':4,'pad':0,'label':"lit_74394",'name':"@74394",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453334,'size':4,'pad':0,'label':"lit_74395",'name':"@74395",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453338,'size':4,'pad':0,'label':"lit_75939",'name':"@75939",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045333C,'size':8,'pad':0,'label':"notColor0",'name':"notColor0$76211",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453344,'size':4,'pad':0,'label':"lit_77808",'name':"@77808",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453348,'size':4,'pad':0,'label':"lit_77809",'name':"@77809",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045334C,'size':4,'pad':0,'label':"lit_77810",'name':"@77810",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453350,'size':4,'pad':0,'label':"lit_77811",'name':"@77811",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453354,'size':4,'pad':0,'label':"lit_77812",'name':"@77812",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453358,'size':4,'pad':0,'label':"lit_77813",'name':"@77813",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045335C,'size':4,'pad':0,'label':"lit_77814",'name':"@77814",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453360,'size':4,'pad':0,'label':"lit_77815",'name':"@77815",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453364,'size':4,'pad':0,'label':"lit_77816",'name':"@77816",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453368,'size':4,'pad':0,'label':"lit_77817",'name':"@77817",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045336C,'size':4,'pad':0,'label':"lit_77818",'name':"@77818",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453370,'size':4,'pad':0,'label':"lit_77819",'name':"@77819",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453374,'size':4,'pad':0,'label':"lit_77820",'name':"@77820",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453378,'size':4,'pad':0,'label':"lit_77821",'name':"@77821",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045337C,'size':4,'pad':0,'label':"lit_77822",'name':"@77822",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453380,'size':4,'pad':0,'label':"lit_77823",'name':"@77823",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453384,'size':4,'pad':0,'label':"lit_77824",'name':"@77824",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453388,'size':4,'pad':0,'label':"lit_77825",'name':"@77825",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045338C,'size':4,'pad':0,'label':"lit_77826",'name':"@77826",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453390,'size':4,'pad':0,'label':"lit_77827",'name':"@77827",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453394,'size':4,'pad':0,'label':"lit_77828",'name':"@77828",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453398,'size':4,'pad':0,'label':"lit_77829",'name':"@77829",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045339C,'size':4,'pad':0,'label':"lit_77830",'name':"@77830",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453344,'size':4,'pad':0,'label':"lit_77808",'name':"@77808",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453348,'size':4,'pad':0,'label':"lit_77809",'name':"@77809",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045334C,'size':4,'pad':0,'label':"lit_77810",'name':"@77810",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453350,'size':4,'pad':0,'label':"lit_77811",'name':"@77811",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453354,'size':4,'pad':0,'label':"lit_77812",'name':"@77812",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453358,'size':4,'pad':0,'label':"lit_77813",'name':"@77813",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045335C,'size':4,'pad':0,'label':"lit_77814",'name':"@77814",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453360,'size':4,'pad':0,'label':"lit_77815",'name':"@77815",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453364,'size':4,'pad':0,'label':"lit_77816",'name':"@77816",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453368,'size':4,'pad':0,'label':"lit_77817",'name':"@77817",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045336C,'size':4,'pad':0,'label':"lit_77818",'name':"@77818",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453370,'size':4,'pad':0,'label':"lit_77819",'name':"@77819",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453374,'size':4,'pad':0,'label':"lit_77820",'name':"@77820",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453378,'size':4,'pad':0,'label':"lit_77821",'name':"@77821",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045337C,'size':4,'pad':0,'label':"lit_77822",'name':"@77822",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453380,'size':4,'pad':0,'label':"lit_77823",'name':"@77823",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453384,'size':4,'pad':0,'label':"lit_77824",'name':"@77824",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453388,'size':4,'pad':0,'label':"lit_77825",'name':"@77825",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045338C,'size':4,'pad':0,'label':"lit_77826",'name':"@77826",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453390,'size':4,'pad':0,'label':"lit_77827",'name':"@77827",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453394,'size':4,'pad':0,'label':"lit_77828",'name':"@77828",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453398,'size':4,'pad':0,'label':"lit_77829",'name':"@77829",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045339C,'size':4,'pad':0,'label':"lit_77830",'name':"@77830",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804533A0,'size':4,'pad':4,'label':"lit_77831",'name':"@77831",'lib':0,'tu':141,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804533A8,'size':4,'pad':0,'label':"lit_3881",'name':"@3881",'lib':0,'tu':142,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804533A8,'size':4,'pad':0,'label':"lit_3881",'name':"@3881",'lib':0,'tu':142,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804533AC,'size':4,'pad':0,'label':"lit_3952",'name':"@3952",'lib':0,'tu':142,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804533B0,'size':4,'pad':4,'label':"lit_3953",'name':"@3953",'lib':0,'tu':142,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804533B8,'size':8,'pad':0,'label':"lit_3955",'name':"@3955",'lib':0,'tu':142,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804533C0,'size':8,'pad':0,'label':"lit_4041",'name':"@4041",'lib':0,'tu':142,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804533B8,'size':8,'pad':0,'label':"lit_3955",'name':"@3955",'lib':0,'tu':142,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804533C0,'size':8,'pad':0,'label':"lit_4041",'name':"@4041",'lib':0,'tu':142,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804533C8,'size':4,'pad':0,'label':"lit_3762",'name':"@3762",'lib':0,'tu':143,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804533CC,'size':4,'pad':0,'label':"lit_3832",'name':"@3832",'lib':0,'tu':143,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804533CC,'size':4,'pad':0,'label':"lit_3832",'name':"@3832",'lib':0,'tu':143,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804533D0,'size':4,'pad':4,'label':"lit_3833",'name':"@3833",'lib':0,'tu':143,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804533D8,'size':4,'pad':0,'label':"lit_4116",'name':"@4116",'lib':0,'tu':144,'section':8,'r':[54,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804533DC,'size':4,'pad':0,'label':"lit_4140",'name':"@4140",'lib':0,'tu':144,'section':8,'r':[25,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804533E0,'size':8,'pad':0,'label':"lit_4142",'name':"@4142",'lib':0,'tu':144,'section':8,'r':[24,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804533E8,'size':4,'pad':0,'label':"lit_4148",'name':"@4148",'lib':0,'tu':144,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804533EC,'size':4,'pad':0,'label':"lit_4513",'name':"@4513",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804533F0,'size':4,'pad':0,'label':"lit_4672",'name':"@4672",'lib':0,'tu':144,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804533F4,'size':4,'pad':0,'label':"lit_4673",'name':"@4673",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804533DC,'size':4,'pad':0,'label':"lit_4140",'name':"@4140",'lib':0,'tu':144,'section':8,'r':[25,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804533E0,'size':8,'pad':0,'label':"lit_4142",'name':"@4142",'lib':0,'tu':144,'section':8,'r':[24,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804533E8,'size':4,'pad':0,'label':"lit_4148",'name':"@4148",'lib':0,'tu':144,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804533EC,'size':4,'pad':0,'label':"lit_4513",'name':"@4513",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804533F0,'size':4,'pad':0,'label':"lit_4672",'name':"@4672",'lib':0,'tu':144,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804533F4,'size':4,'pad':0,'label':"lit_4673",'name':"@4673",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804533F8,'size':4,'pad':4,'label':"lit_4674",'name':"@4674",'lib':0,'tu':144,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453400,'size':8,'pad':0,'label':"lit_4677",'name':"@4677",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453408,'size':8,'pad':0,'label':"lit_4723",'name':"@4723",'lib':0,'tu':144,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453410,'size':8,'pad':0,'label':"lit_4724",'name':"@4724",'lib':0,'tu':144,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453400,'size':8,'pad':0,'label':"lit_4677",'name':"@4677",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453408,'size':8,'pad':0,'label':"lit_4723",'name':"@4723",'lib':0,'tu':144,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453410,'size':8,'pad':0,'label':"lit_4724",'name':"@4724",'lib':0,'tu':144,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453418,'size':8,'pad':0,'label':"lit_4725",'name':"@4725",'lib':0,'tu':144,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453420,'size':4,'pad':0,'label':"lit_5239",'name':"@5239",'lib':0,'tu':144,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453424,'size':4,'pad':0,'label':"lit_5240",'name':"@5240",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453428,'size':4,'pad':0,'label':"lit_5241",'name':"@5241",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045342C,'size':4,'pad':0,'label':"lit_5410",'name':"@5410",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453430,'size':4,'pad':0,'label':"lit_5422",'name':"@5422",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453434,'size':4,'pad':0,'label':"lit_5423",'name':"@5423",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453438,'size':4,'pad':0,'label':"lit_5459",'name':"@5459",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045343C,'size':4,'pad':0,'label':"lit_5460",'name':"@5460",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453440,'size':4,'pad':0,'label':"lit_5667",'name':"@5667",'lib':0,'tu':144,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453444,'size':4,'pad':0,'label':"lit_5794",'name':"@5794",'lib':0,'tu':144,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453448,'size':4,'pad':0,'label':"lit_6667",'name':"@6667",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045344C,'size':4,'pad':0,'label':"lit_6775",'name':"@6775",'lib':0,'tu':144,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453450,'size':4,'pad':0,'label':"lit_6904",'name':"@6904",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453454,'size':4,'pad':0,'label':"lit_6905",'name':"@6905",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453458,'size':4,'pad':0,'label':"lit_6906",'name':"@6906",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045345C,'size':4,'pad':0,'label':"lit_6907",'name':"@6907",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453460,'size':4,'pad':0,'label':"lit_6908",'name':"@6908",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453464,'size':4,'pad':0,'label':"lit_6909",'name':"@6909",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453468,'size':4,'pad':0,'label':"lit_7089",'name':"@7089",'lib':0,'tu':144,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045346C,'size':4,'pad':0,'label':"lit_7090",'name':"@7090",'lib':0,'tu':144,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453470,'size':4,'pad':0,'label':"lit_7091",'name':"@7091",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453474,'size':4,'pad':0,'label':"lit_7222",'name':"@7222",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453478,'size':4,'pad':0,'label':"lit_7242",'name':"@7242",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045347C,'size':4,'pad':0,'label':"lit_7337",'name':"@7337",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453420,'size':4,'pad':0,'label':"lit_5239",'name':"@5239",'lib':0,'tu':144,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453424,'size':4,'pad':0,'label':"lit_5240",'name':"@5240",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453428,'size':4,'pad':0,'label':"lit_5241",'name':"@5241",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045342C,'size':4,'pad':0,'label':"lit_5410",'name':"@5410",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453430,'size':4,'pad':0,'label':"lit_5422",'name':"@5422",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453434,'size':4,'pad':0,'label':"lit_5423",'name':"@5423",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453438,'size':4,'pad':0,'label':"lit_5459",'name':"@5459",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045343C,'size':4,'pad':0,'label':"lit_5460",'name':"@5460",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453440,'size':4,'pad':0,'label':"lit_5667",'name':"@5667",'lib':0,'tu':144,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453444,'size':4,'pad':0,'label':"lit_5794",'name':"@5794",'lib':0,'tu':144,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453448,'size':4,'pad':0,'label':"lit_6667",'name':"@6667",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045344C,'size':4,'pad':0,'label':"lit_6775",'name':"@6775",'lib':0,'tu':144,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453450,'size':4,'pad':0,'label':"lit_6904",'name':"@6904",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453454,'size':4,'pad':0,'label':"lit_6905",'name':"@6905",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453458,'size':4,'pad':0,'label':"lit_6906",'name':"@6906",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045345C,'size':4,'pad':0,'label':"lit_6907",'name':"@6907",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453460,'size':4,'pad':0,'label':"lit_6908",'name':"@6908",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453464,'size':4,'pad':0,'label':"lit_6909",'name':"@6909",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453468,'size':4,'pad':0,'label':"lit_7089",'name':"@7089",'lib':0,'tu':144,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045346C,'size':4,'pad':0,'label':"lit_7090",'name':"@7090",'lib':0,'tu':144,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453470,'size':4,'pad':0,'label':"lit_7091",'name':"@7091",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453474,'size':4,'pad':0,'label':"lit_7222",'name':"@7222",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453478,'size':4,'pad':0,'label':"lit_7242",'name':"@7242",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045347C,'size':4,'pad':0,'label':"lit_7337",'name':"@7337",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453480,'size':4,'pad':0,'label':"id_7388",'name':"id$7388",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453484,'size':4,'pad':0,'label':"lit_7442",'name':"@7442",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453488,'size':4,'pad':0,'label':"lit_7550",'name':"@7550",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045348C,'size':4,'pad':0,'label':"lit_7551",'name':"@7551",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453490,'size':4,'pad':0,'label':"lit_8404",'name':"@8404",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453494,'size':4,'pad':0,'label':"lit_8405",'name':"@8405",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453498,'size':4,'pad':0,'label':"lit_9971",'name':"@9971",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045349C,'size':4,'pad':0,'label':"lit_10253",'name':"@10253",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804534A0,'size':4,'pad':0,'label':"lit_10745",'name':"@10745",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804534A4,'size':4,'pad':0,'label':"lit_11061",'name':"@11061",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804534A8,'size':4,'pad':0,'label':"lit_11062",'name':"@11062",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804534AC,'size':4,'pad':0,'label':"lit_11253",'name':"@11253",'lib':0,'tu':144,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804534B0,'size':4,'pad':0,'label':"lit_11605",'name':"@11605",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453484,'size':4,'pad':0,'label':"lit_7442",'name':"@7442",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453488,'size':4,'pad':0,'label':"lit_7550",'name':"@7550",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045348C,'size':4,'pad':0,'label':"lit_7551",'name':"@7551",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453490,'size':4,'pad':0,'label':"lit_8404",'name':"@8404",'lib':0,'tu':144,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453494,'size':4,'pad':0,'label':"lit_8405",'name':"@8405",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453498,'size':4,'pad':0,'label':"lit_9971",'name':"@9971",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045349C,'size':4,'pad':0,'label':"lit_10253",'name':"@10253",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534A0,'size':4,'pad':0,'label':"lit_10745",'name':"@10745",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534A4,'size':4,'pad':0,'label':"lit_11061",'name':"@11061",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534A8,'size':4,'pad':0,'label':"lit_11062",'name':"@11062",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534AC,'size':4,'pad':0,'label':"lit_11253",'name':"@11253",'lib':0,'tu':144,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534B0,'size':4,'pad':0,'label':"lit_11605",'name':"@11605",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804534B4,'size':4,'pad':0,'label':"id_11798",'name':"id$11798",'lib':0,'tu':144,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804534B8,'size':4,'pad':0,'label':"lit_4021",'name':"@4021",'lib':0,'tu':145,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804534B8,'size':4,'pad':0,'label':"lit_4021",'name':"@4021",'lib':0,'tu':145,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804534BC,'size':4,'pad':0,'label':"lit_4372",'name':"@4372",'lib':0,'tu':145,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804534C0,'size':4,'pad':4,'label':"lit_4373",'name':"@4373",'lib':0,'tu':145,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804534C8,'size':8,'pad':0,'label':"lit_4375",'name':"@4375",'lib':0,'tu':145,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804534D0,'size':4,'pad':0,'label':"lit_4582",'name':"@4582",'lib':0,'tu':145,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804534C8,'size':8,'pad':0,'label':"lit_4375",'name':"@4375",'lib':0,'tu':145,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534D0,'size':4,'pad':0,'label':"lit_4582",'name':"@4582",'lib':0,'tu':145,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804534D4,'size':4,'pad':0,'label':"id",'name':"id$4592",'lib':0,'tu':145,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804534D8,'size':4,'pad':0,'label':"lit_4656",'name':"@4656",'lib':0,'tu':145,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804534DC,'size':4,'pad':0,'label':"lit_4657",'name':"@4657",'lib':0,'tu':145,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804534E0,'size':4,'pad':0,'label':"lit_4050",'name':"@4050",'lib':0,'tu':146,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804534D8,'size':4,'pad':0,'label':"lit_4656",'name':"@4656",'lib':0,'tu':145,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534DC,'size':4,'pad':0,'label':"lit_4657",'name':"@4657",'lib':0,'tu':145,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534E0,'size':4,'pad':0,'label':"lit_4050",'name':"@4050",'lib':0,'tu':146,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804534E4,'size':4,'pad':0,'label':"lit_4585",'name':"@4585",'lib':0,'tu':146,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804534E8,'size':4,'pad':4,'label':"lit_4586",'name':"@4586",'lib':0,'tu':146,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804534F0,'size':8,'pad':0,'label':"lit_4588",'name':"@4588",'lib':0,'tu':146,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804534F8,'size':4,'pad':0,'label':"lit_4845",'name':"@4845",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804534F0,'size':8,'pad':0,'label':"lit_4588",'name':"@4588",'lib':0,'tu':146,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804534F8,'size':4,'pad':0,'label':"lit_4845",'name':"@4845",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804534FC,'size':4,'pad':0,'label':"id",'name':"id$4857",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453500,'size':4,'pad':0,'label':"lit_4921",'name':"@4921",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453504,'size':4,'pad':0,'label':"lit_4922",'name':"@4922",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453500,'size':4,'pad':0,'label':"lit_4921",'name':"@4921",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453504,'size':4,'pad':0,'label':"lit_4922",'name':"@4922",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453508,'size':4,'pad':4,'label':"lit_4970",'name':"@4970",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453510,'size':8,'pad':0,'label':"lit_4971",'name':"@4971",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453518,'size':8,'pad':0,'label':"lit_4972",'name':"@4972",'lib':0,'tu':146,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453510,'size':8,'pad':0,'label':"lit_4971",'name':"@4971",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453518,'size':8,'pad':0,'label':"lit_4972",'name':"@4972",'lib':0,'tu':146,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453520,'size':4,'pad':4,'label':"lit_5050",'name':"@5050",'lib':0,'tu':146,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453528,'size':8,'pad':0,'label':"lit_5051",'name':"@5051",'lib':0,'tu':146,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453530,'size':8,'pad':0,'label':"lit_5052",'name':"@5052",'lib':0,'tu':146,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453528,'size':8,'pad':0,'label':"lit_5051",'name':"@5051",'lib':0,'tu':146,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453530,'size':8,'pad':0,'label':"lit_5052",'name':"@5052",'lib':0,'tu':146,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453538,'size':8,'pad':0,'label':"lit_5053",'name':"@5053",'lib':0,'tu':146,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453540,'size':4,'pad':4,'label':"lit_5149",'name':"@5149",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453548,'size':8,'pad':0,'label':"lit_5359",'name':"@5359",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453550,'size':4,'pad':4,'label':"lit_3857",'name':"@3857",'lib':0,'tu':147,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453558,'size':8,'pad':0,'label':"lit_3858",'name':"@3858",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453560,'size':8,'pad':0,'label':"lit_3859",'name':"@3859",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453548,'size':8,'pad':0,'label':"lit_5359",'name':"@5359",'lib':0,'tu':146,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453550,'size':4,'pad':4,'label':"lit_3857",'name':"@3857",'lib':0,'tu':147,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453558,'size':8,'pad':0,'label':"lit_3858",'name':"@3858",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453560,'size':8,'pad':0,'label':"lit_3859",'name':"@3859",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453568,'size':8,'pad':0,'label':"lit_3860",'name':"@3860",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453570,'size':4,'pad':0,'label':"lit_3923",'name':"@3923",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453574,'size':4,'pad':0,'label':"lit_4067",'name':"@4067",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453578,'size':4,'pad':0,'label':"lit_4068",'name':"@4068",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045357C,'size':4,'pad':0,'label':"lit_4069",'name':"@4069",'lib':0,'tu':147,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453570,'size':4,'pad':0,'label':"lit_3923",'name':"@3923",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453574,'size':4,'pad':0,'label':"lit_4067",'name':"@4067",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453578,'size':4,'pad':0,'label':"lit_4068",'name':"@4068",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045357C,'size':4,'pad':0,'label':"lit_4069",'name':"@4069",'lib':0,'tu':147,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453580,'size':4,'pad':4,'label':"lit_4070",'name':"@4070",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453588,'size':8,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453590,'size':4,'pad':0,'label':"lit_4320",'name':"@4320",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453594,'size':4,'pad':0,'label':"lit_4321",'name':"@4321",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453598,'size':4,'pad':0,'label':"lit_4404",'name':"@4404",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045359C,'size':4,'pad':0,'label':"lit_4506",'name':"@4506",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535A0,'size':4,'pad':0,'label':"lit_4524",'name':"@4524",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535A4,'size':4,'pad':0,'label':"lit_4665",'name':"@4665",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453588,'size':8,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453590,'size':4,'pad':0,'label':"lit_4320",'name':"@4320",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453594,'size':4,'pad':0,'label':"lit_4321",'name':"@4321",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453598,'size':4,'pad':0,'label':"lit_4404",'name':"@4404",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045359C,'size':4,'pad':0,'label':"lit_4506",'name':"@4506",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535A0,'size':4,'pad':0,'label':"lit_4524",'name':"@4524",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535A4,'size':4,'pad':0,'label':"lit_4665",'name':"@4665",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804535A8,'size':4,'pad':4,'label':"lit_4666",'name':"@4666",'lib':0,'tu':147,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804535B0,'size':8,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804535B8,'size':4,'pad':0,'label':"lit_4781",'name':"@4781",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535BC,'size':4,'pad':0,'label':"lit_4923",'name':"@4923",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535C0,'size':4,'pad':0,'label':"lit_4979",'name':"@4979",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535C4,'size':4,'pad':0,'label':"lit_5050",'name':"@5050",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535C8,'size':4,'pad':0,'label':"lit_5051",'name':"@5051",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535CC,'size':4,'pad':0,'label':"lit_5110",'name':"@5110",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535D0,'size':4,'pad':0,'label':"lit_5230",'name':"@5230",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535D4,'size':4,'pad':0,'label':"lit_5231",'name':"@5231",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535D8,'size':4,'pad':0,'label':"lit_5232",'name':"@5232",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535DC,'size':4,'pad':0,'label':"lit_5233",'name':"@5233",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535E0,'size':4,'pad':0,'label':"lit_3871",'name':"@3871",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804535B0,'size':8,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535B8,'size':4,'pad':0,'label':"lit_4781",'name':"@4781",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535BC,'size':4,'pad':0,'label':"lit_4923",'name':"@4923",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535C0,'size':4,'pad':0,'label':"lit_4979",'name':"@4979",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535C4,'size':4,'pad':0,'label':"lit_5050",'name':"@5050",'lib':0,'tu':147,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535C8,'size':4,'pad':0,'label':"lit_5051",'name':"@5051",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535CC,'size':4,'pad':0,'label':"lit_5110",'name':"@5110",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535D0,'size':4,'pad':0,'label':"lit_5230",'name':"@5230",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535D4,'size':4,'pad':0,'label':"lit_5231",'name':"@5231",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535D8,'size':4,'pad':0,'label':"lit_5232",'name':"@5232",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535DC,'size':4,'pad':0,'label':"lit_5233",'name':"@5233",'lib':0,'tu':147,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535E0,'size':4,'pad':0,'label':"lit_3871",'name':"@3871",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804535E4,'size':4,'pad':0,'label':"lit_3872",'name':"@3872",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804535E8,'size':4,'pad':0,'label':"lit_3873",'name':"@3873",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535EC,'size':4,'pad':0,'label':"lit_3874",'name':"@3874",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535F0,'size':4,'pad':0,'label':"lit_3875",'name':"@3875",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804535F4,'size':4,'pad':0,'label':"lit_3876",'name':"@3876",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804535E8,'size':4,'pad':0,'label':"lit_3873",'name':"@3873",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535EC,'size':4,'pad':0,'label':"lit_3874",'name':"@3874",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535F0,'size':4,'pad':0,'label':"lit_3875",'name':"@3875",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804535F4,'size':4,'pad':0,'label':"lit_3876",'name':"@3876",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804535F8,'size':4,'pad':4,'label':"lit_3877",'name':"@3877",'lib':0,'tu':148,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453600,'size':4,'pad':4,'label':"lit_4215",'name':"@4215",'lib':0,'tu':150,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453608,'size':8,'pad':0,'label':"lit_4237",'name':"@4237",'lib':0,'tu':150,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453610,'size':4,'pad':0,'label':"lit_4247",'name':"@4247",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453614,'size':4,'pad':0,'label':"lit_4248",'name':"@4248",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453618,'size':4,'pad':0,'label':"lit_4249",'name':"@4249",'lib':0,'tu':150,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045361C,'size':4,'pad':0,'label':"lit_4250",'name':"@4250",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453620,'size':4,'pad':0,'label':"lit_4332",'name':"@4332",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453624,'size':4,'pad':0,'label':"lit_4333",'name':"@4333",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453600,'size':4,'pad':4,'label':"lit_4215",'name':"@4215",'lib':0,'tu':150,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453608,'size':8,'pad':0,'label':"lit_4237",'name':"@4237",'lib':0,'tu':150,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453610,'size':4,'pad':0,'label':"lit_4247",'name':"@4247",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453614,'size':4,'pad':0,'label':"lit_4248",'name':"@4248",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453618,'size':4,'pad':0,'label':"lit_4249",'name':"@4249",'lib':0,'tu':150,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045361C,'size':4,'pad':0,'label':"lit_4250",'name':"@4250",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453620,'size':4,'pad':0,'label':"lit_4332",'name':"@4332",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453624,'size':4,'pad':0,'label':"lit_4333",'name':"@4333",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453628,'size':4,'pad':4,'label':"lit_4334",'name':"@4334",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453630,'size':8,'pad':0,'label':"lit_4379",'name':"@4379",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453638,'size':8,'pad':0,'label':"lit_4380",'name':"@4380",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453630,'size':8,'pad':0,'label':"lit_4379",'name':"@4379",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453638,'size':8,'pad':0,'label':"lit_4380",'name':"@4380",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453640,'size':8,'pad':0,'label':"lit_4381",'name':"@4381",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453648,'size':8,'pad':0,'label':"sumouArcName",'name':"sumouArcName$4614",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453650,'size':5,'pad':3,'label':"ocArcName",'name':"ocArcName$4615",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -24562,583 +24562,583 @@ SYMBOLS = [ {'addr':0x80453670,'size':6,'pad':2,'label':"pigGanonArcName",'name':"pigGanonArcName$4621",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453678,'size':4,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x8045367C,'size':4,'pad':0,'label':"lit_4669",'name':"@4669",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453680,'size':4,'pad':0,'label':"lit_4699",'name':"@4699",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453684,'size':4,'pad':0,'label':"lit_4741",'name':"@4741",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453680,'size':4,'pad':0,'label':"lit_4699",'name':"@4699",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453684,'size':4,'pad':0,'label':"lit_4741",'name':"@4741",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453688,'size':4,'pad':4,'label':"lit_4742",'name':"@4742",'lib':0,'tu':150,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453690,'size':4,'pad':4,'label':"lit_4445",'name':"@4445",'lib':0,'tu':151,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453698,'size':8,'pad':0,'label':"lit_4448",'name':"@4448",'lib':0,'tu':151,'section':8,'r':[20,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453698,'size':8,'pad':0,'label':"lit_4448",'name':"@4448",'lib':0,'tu':151,'section':8,'r':[20,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804536A0,'size':4,'pad':0,'label':"lit_5656",'name':"@5656",'lib':0,'tu':151,'section':8,'r':[39,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804536A4,'size':4,'pad':0,'label':"lit_5657",'name':"@5657",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536A8,'size':4,'pad':0,'label':"lit_5658",'name':"@5658",'lib':0,'tu':151,'section':8,'r':[26,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536AC,'size':4,'pad':0,'label':"lit_5659",'name':"@5659",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536B0,'size':4,'pad':0,'label':"lit_5660",'name':"@5660",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536B4,'size':4,'pad':0,'label':"lit_5661",'name':"@5661",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536B8,'size':4,'pad':0,'label':"lit_5662",'name':"@5662",'lib':0,'tu':151,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536BC,'size':4,'pad':0,'label':"lit_5663",'name':"@5663",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804536A4,'size':4,'pad':0,'label':"lit_5657",'name':"@5657",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536A8,'size':4,'pad':0,'label':"lit_5658",'name':"@5658",'lib':0,'tu':151,'section':8,'r':[26,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536AC,'size':4,'pad':0,'label':"lit_5659",'name':"@5659",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536B0,'size':4,'pad':0,'label':"lit_5660",'name':"@5660",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536B4,'size':4,'pad':0,'label':"lit_5661",'name':"@5661",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536B8,'size':4,'pad':0,'label':"lit_5662",'name':"@5662",'lib':0,'tu':151,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536BC,'size':4,'pad':0,'label':"lit_5663",'name':"@5663",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804536C0,'size':4,'pad':4,'label':"lit_6093",'name':"@6093",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804536C8,'size':8,'pad':0,'label':"lit_6177",'name':"@6177",'lib':0,'tu':151,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804536D0,'size':8,'pad':0,'label':"lit_6178",'name':"@6178",'lib':0,'tu':151,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804536C8,'size':8,'pad':0,'label':"lit_6177",'name':"@6177",'lib':0,'tu':151,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536D0,'size':8,'pad':0,'label':"lit_6178",'name':"@6178",'lib':0,'tu':151,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804536D8,'size':8,'pad':0,'label':"lit_6179",'name':"@6179",'lib':0,'tu':151,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804536E0,'size':4,'pad':0,'label':"lit_6180",'name':"@6180",'lib':0,'tu':151,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536E4,'size':4,'pad':0,'label':"lit_6629",'name':"@6629",'lib':0,'tu':151,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536E8,'size':4,'pad':0,'label':"lit_6630",'name':"@6630",'lib':0,'tu':151,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536EC,'size':4,'pad':0,'label':"lit_6766",'name':"@6766",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536F0,'size':4,'pad':0,'label':"lit_7609",'name':"@7609",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536F4,'size':4,'pad':0,'label':"lit_8015",'name':"@8015",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536F8,'size':4,'pad':0,'label':"lit_8016",'name':"@8016",'lib':0,'tu':151,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804536FC,'size':4,'pad':0,'label':"lit_8017",'name':"@8017",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453700,'size':4,'pad':0,'label':"lit_8018",'name':"@8018",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453704,'size':4,'pad':0,'label':"lit_8019",'name':"@8019",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453708,'size':4,'pad':0,'label':"lit_8020",'name':"@8020",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045370C,'size':4,'pad':0,'label':"lit_8021",'name':"@8021",'lib':0,'tu':151,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453710,'size':4,'pad':0,'label':"lit_8022",'name':"@8022",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453714,'size':4,'pad':0,'label':"lit_8023",'name':"@8023",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453718,'size':4,'pad':0,'label':"lit_8127",'name':"@8127",'lib':0,'tu':151,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045371C,'size':4,'pad':0,'label':"lit_8163",'name':"@8163",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453720,'size':4,'pad':0,'label':"lit_8529",'name':"@8529",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453724,'size':4,'pad':0,'label':"lit_8530",'name':"@8530",'lib':0,'tu':151,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453728,'size':4,'pad':0,'label':"lit_9395",'name':"@9395",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045372C,'size':4,'pad':0,'label':"lit_9396",'name':"@9396",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453730,'size':4,'pad':0,'label':"lit_9397",'name':"@9397",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453734,'size':4,'pad':0,'label':"lit_9398",'name':"@9398",'lib':0,'tu':151,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453738,'size':4,'pad':0,'label':"lit_9399",'name':"@9399",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045373C,'size':4,'pad':0,'label':"lit_9400",'name':"@9400",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453740,'size':4,'pad':0,'label':"lit_9401",'name':"@9401",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453744,'size':4,'pad':0,'label':"lit_9402",'name':"@9402",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453748,'size':4,'pad':0,'label':"lit_9403",'name':"@9403",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045374C,'size':4,'pad':0,'label':"lit_9404",'name':"@9404",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453750,'size':4,'pad':0,'label':"lit_9405",'name':"@9405",'lib':0,'tu':151,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453754,'size':4,'pad':0,'label':"lit_9406",'name':"@9406",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453758,'size':4,'pad':0,'label':"lit_9407",'name':"@9407",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045375C,'size':4,'pad':0,'label':"lit_9408",'name':"@9408",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453760,'size':8,'pad':0,'label':"lit_9410",'name':"@9410",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453768,'size':4,'pad':0,'label':"lit_9788",'name':"@9788",'lib':0,'tu':151,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045376C,'size':4,'pad':0,'label':"lit_10550",'name':"@10550",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453770,'size':4,'pad':0,'label':"lit_10551",'name':"@10551",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453774,'size':4,'pad':0,'label':"lit_10552",'name':"@10552",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453778,'size':4,'pad':0,'label':"lit_10553",'name':"@10553",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045377C,'size':4,'pad':0,'label':"lit_10554",'name':"@10554",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453780,'size':4,'pad':0,'label':"lit_10555",'name':"@10555",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453784,'size':4,'pad':0,'label':"lit_10556",'name':"@10556",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453788,'size':4,'pad':0,'label':"lit_10557",'name':"@10557",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045378C,'size':4,'pad':0,'label':"lit_10558",'name':"@10558",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453790,'size':4,'pad':0,'label':"lit_10559",'name':"@10559",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453794,'size':4,'pad':0,'label':"lit_10560",'name':"@10560",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453798,'size':4,'pad':0,'label':"lit_10561",'name':"@10561",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045379C,'size':4,'pad':0,'label':"lit_10562",'name':"@10562",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537A0,'size':4,'pad':0,'label':"lit_10563",'name':"@10563",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537A4,'size':4,'pad':0,'label':"lit_10564",'name':"@10564",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537A8,'size':4,'pad':0,'label':"lit_10565",'name':"@10565",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537AC,'size':4,'pad':0,'label':"lit_10566",'name':"@10566",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537B0,'size':4,'pad':0,'label':"lit_10567",'name':"@10567",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537B4,'size':4,'pad':0,'label':"lit_10568",'name':"@10568",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537B8,'size':4,'pad':0,'label':"lit_10569",'name':"@10569",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537BC,'size':4,'pad':0,'label':"lit_10570",'name':"@10570",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537C0,'size':4,'pad':0,'label':"lit_10571",'name':"@10571",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537C4,'size':4,'pad':0,'label':"lit_10572",'name':"@10572",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537C8,'size':4,'pad':0,'label':"lit_10573",'name':"@10573",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537CC,'size':4,'pad':0,'label':"lit_10574",'name':"@10574",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537D0,'size':4,'pad':0,'label':"lit_10575",'name':"@10575",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537D4,'size':4,'pad':0,'label':"lit_10576",'name':"@10576",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537D8,'size':4,'pad':0,'label':"lit_10577",'name':"@10577",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537DC,'size':4,'pad':0,'label':"lit_10578",'name':"@10578",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537E0,'size':4,'pad':0,'label':"lit_10579",'name':"@10579",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537E4,'size':4,'pad':0,'label':"lit_10580",'name':"@10580",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537E8,'size':4,'pad':0,'label':"lit_10581",'name':"@10581",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537EC,'size':4,'pad':0,'label':"lit_10582",'name':"@10582",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537F0,'size':4,'pad':0,'label':"lit_11167",'name':"@11167",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537F4,'size':4,'pad':0,'label':"lit_11168",'name':"@11168",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537F8,'size':4,'pad':0,'label':"lit_11169",'name':"@11169",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804537FC,'size':4,'pad':0,'label':"lit_11170",'name':"@11170",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453800,'size':4,'pad':0,'label':"lit_11171",'name':"@11171",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453804,'size':4,'pad':0,'label':"lit_11172",'name':"@11172",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453808,'size':4,'pad':0,'label':"lit_11173",'name':"@11173",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045380C,'size':4,'pad':0,'label':"lit_11174",'name':"@11174",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453810,'size':4,'pad':0,'label':"lit_11175",'name':"@11175",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453814,'size':4,'pad':0,'label':"lit_12268",'name':"@12268",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453818,'size':4,'pad':0,'label':"lit_12269",'name':"@12269",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045381C,'size':4,'pad':0,'label':"lit_12270",'name':"@12270",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453820,'size':4,'pad':0,'label':"lit_12271",'name':"@12271",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453824,'size':4,'pad':0,'label':"lit_12272",'name':"@12272",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453828,'size':4,'pad':0,'label':"lit_12273",'name':"@12273",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045382C,'size':4,'pad':0,'label':"lit_12274",'name':"@12274",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453830,'size':4,'pad':0,'label':"lit_12275",'name':"@12275",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453834,'size':4,'pad':0,'label':"lit_12276",'name':"@12276",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453838,'size':4,'pad':0,'label':"lit_12277",'name':"@12277",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045383C,'size':4,'pad':0,'label':"lit_12278",'name':"@12278",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453840,'size':4,'pad':0,'label':"lit_12279",'name':"@12279",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453844,'size':4,'pad':0,'label':"lit_12280",'name':"@12280",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453848,'size':4,'pad':0,'label':"lit_12281",'name':"@12281",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045384C,'size':4,'pad':0,'label':"lit_12282",'name':"@12282",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453850,'size':4,'pad':0,'label':"lit_12283",'name':"@12283",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453854,'size':4,'pad':0,'label':"lit_12284",'name':"@12284",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453858,'size':4,'pad':0,'label':"lit_12285",'name':"@12285",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045385C,'size':4,'pad':0,'label':"lit_12286",'name':"@12286",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453860,'size':4,'pad':0,'label':"lit_12287",'name':"@12287",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453864,'size':4,'pad':0,'label':"lit_12288",'name':"@12288",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453868,'size':4,'pad':0,'label':"lit_12289",'name':"@12289",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045386C,'size':4,'pad':0,'label':"lit_12290",'name':"@12290",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453870,'size':4,'pad':0,'label':"lit_12291",'name':"@12291",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453874,'size':4,'pad':0,'label':"lit_12292",'name':"@12292",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453878,'size':4,'pad':0,'label':"lit_12293",'name':"@12293",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045387C,'size':4,'pad':0,'label':"lit_12294",'name':"@12294",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453880,'size':4,'pad':0,'label':"lit_12295",'name':"@12295",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453884,'size':4,'pad':0,'label':"lit_12296",'name':"@12296",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453888,'size':4,'pad':0,'label':"lit_12297",'name':"@12297",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045388C,'size':4,'pad':0,'label':"lit_12864",'name':"@12864",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453890,'size':4,'pad':0,'label':"lit_12865",'name':"@12865",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453894,'size':4,'pad':0,'label':"lit_12866",'name':"@12866",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453898,'size':4,'pad':0,'label':"lit_12867",'name':"@12867",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045389C,'size':4,'pad':0,'label':"lit_12868",'name':"@12868",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538A0,'size':4,'pad':0,'label':"lit_12869",'name':"@12869",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538A4,'size':4,'pad':0,'label':"lit_13132",'name':"@13132",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538A8,'size':4,'pad':0,'label':"lit_13314",'name':"@13314",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538AC,'size':4,'pad':0,'label':"lit_13673",'name':"@13673",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538B0,'size':4,'pad':0,'label':"lit_14059",'name':"@14059",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538B4,'size':4,'pad':0,'label':"lit_14060",'name':"@14060",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538B8,'size':4,'pad':0,'label':"lit_14061",'name':"@14061",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538BC,'size':4,'pad':0,'label':"lit_14062",'name':"@14062",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538C0,'size':4,'pad':0,'label':"lit_14063",'name':"@14063",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538C4,'size':4,'pad':0,'label':"lit_14064",'name':"@14064",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538C8,'size':4,'pad':0,'label':"lit_15474",'name':"@15474",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538CC,'size':4,'pad':0,'label':"lit_15475",'name':"@15475",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538D0,'size':4,'pad':0,'label':"lit_15476",'name':"@15476",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538D4,'size':4,'pad':0,'label':"lit_15477",'name':"@15477",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538D8,'size':4,'pad':0,'label':"lit_15478",'name':"@15478",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538DC,'size':4,'pad':0,'label':"lit_15479",'name':"@15479",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538E0,'size':4,'pad':0,'label':"lit_15480",'name':"@15480",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538E4,'size':4,'pad':0,'label':"lit_15481",'name':"@15481",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538E8,'size':4,'pad':0,'label':"lit_15482",'name':"@15482",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538EC,'size':4,'pad':0,'label':"lit_15483",'name':"@15483",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538F0,'size':4,'pad':0,'label':"lit_15484",'name':"@15484",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538F4,'size':4,'pad':0,'label':"lit_15485",'name':"@15485",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538F8,'size':4,'pad':0,'label':"lit_15486",'name':"@15486",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804538FC,'size':4,'pad':0,'label':"lit_15487",'name':"@15487",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453900,'size':4,'pad':0,'label':"lit_15772",'name':"@15772",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453904,'size':4,'pad':0,'label':"lit_15773",'name':"@15773",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453908,'size':4,'pad':0,'label':"lit_17253",'name':"@17253",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045390C,'size':4,'pad':0,'label':"lit_17254",'name':"@17254",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453910,'size':4,'pad':0,'label':"lit_17255",'name':"@17255",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804536E0,'size':4,'pad':0,'label':"lit_6180",'name':"@6180",'lib':0,'tu':151,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536E4,'size':4,'pad':0,'label':"lit_6629",'name':"@6629",'lib':0,'tu':151,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536E8,'size':4,'pad':0,'label':"lit_6630",'name':"@6630",'lib':0,'tu':151,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536EC,'size':4,'pad':0,'label':"lit_6766",'name':"@6766",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536F0,'size':4,'pad':0,'label':"lit_7609",'name':"@7609",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536F4,'size':4,'pad':0,'label':"lit_8015",'name':"@8015",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536F8,'size':4,'pad':0,'label':"lit_8016",'name':"@8016",'lib':0,'tu':151,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804536FC,'size':4,'pad':0,'label':"lit_8017",'name':"@8017",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453700,'size':4,'pad':0,'label':"lit_8018",'name':"@8018",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453704,'size':4,'pad':0,'label':"lit_8019",'name':"@8019",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453708,'size':4,'pad':0,'label':"lit_8020",'name':"@8020",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045370C,'size':4,'pad':0,'label':"lit_8021",'name':"@8021",'lib':0,'tu':151,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453710,'size':4,'pad':0,'label':"lit_8022",'name':"@8022",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453714,'size':4,'pad':0,'label':"lit_8023",'name':"@8023",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453718,'size':4,'pad':0,'label':"lit_8127",'name':"@8127",'lib':0,'tu':151,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045371C,'size':4,'pad':0,'label':"lit_8163",'name':"@8163",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453720,'size':4,'pad':0,'label':"lit_8529",'name':"@8529",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453724,'size':4,'pad':0,'label':"lit_8530",'name':"@8530",'lib':0,'tu':151,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453728,'size':4,'pad':0,'label':"lit_9395",'name':"@9395",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045372C,'size':4,'pad':0,'label':"lit_9396",'name':"@9396",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453730,'size':4,'pad':0,'label':"lit_9397",'name':"@9397",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453734,'size':4,'pad':0,'label':"lit_9398",'name':"@9398",'lib':0,'tu':151,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453738,'size':4,'pad':0,'label':"lit_9399",'name':"@9399",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045373C,'size':4,'pad':0,'label':"lit_9400",'name':"@9400",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453740,'size':4,'pad':0,'label':"lit_9401",'name':"@9401",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453744,'size':4,'pad':0,'label':"lit_9402",'name':"@9402",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453748,'size':4,'pad':0,'label':"lit_9403",'name':"@9403",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045374C,'size':4,'pad':0,'label':"lit_9404",'name':"@9404",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453750,'size':4,'pad':0,'label':"lit_9405",'name':"@9405",'lib':0,'tu':151,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453754,'size':4,'pad':0,'label':"lit_9406",'name':"@9406",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453758,'size':4,'pad':0,'label':"lit_9407",'name':"@9407",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045375C,'size':4,'pad':0,'label':"lit_9408",'name':"@9408",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453760,'size':8,'pad':0,'label':"lit_9410",'name':"@9410",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453768,'size':4,'pad':0,'label':"lit_9788",'name':"@9788",'lib':0,'tu':151,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045376C,'size':4,'pad':0,'label':"lit_10550",'name':"@10550",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453770,'size':4,'pad':0,'label':"lit_10551",'name':"@10551",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453774,'size':4,'pad':0,'label':"lit_10552",'name':"@10552",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453778,'size':4,'pad':0,'label':"lit_10553",'name':"@10553",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045377C,'size':4,'pad':0,'label':"lit_10554",'name':"@10554",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453780,'size':4,'pad':0,'label':"lit_10555",'name':"@10555",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453784,'size':4,'pad':0,'label':"lit_10556",'name':"@10556",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453788,'size':4,'pad':0,'label':"lit_10557",'name':"@10557",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045378C,'size':4,'pad':0,'label':"lit_10558",'name':"@10558",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453790,'size':4,'pad':0,'label':"lit_10559",'name':"@10559",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453794,'size':4,'pad':0,'label':"lit_10560",'name':"@10560",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453798,'size':4,'pad':0,'label':"lit_10561",'name':"@10561",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045379C,'size':4,'pad':0,'label':"lit_10562",'name':"@10562",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537A0,'size':4,'pad':0,'label':"lit_10563",'name':"@10563",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537A4,'size':4,'pad':0,'label':"lit_10564",'name':"@10564",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537A8,'size':4,'pad':0,'label':"lit_10565",'name':"@10565",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537AC,'size':4,'pad':0,'label':"lit_10566",'name':"@10566",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537B0,'size':4,'pad':0,'label':"lit_10567",'name':"@10567",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537B4,'size':4,'pad':0,'label':"lit_10568",'name':"@10568",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537B8,'size':4,'pad':0,'label':"lit_10569",'name':"@10569",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537BC,'size':4,'pad':0,'label':"lit_10570",'name':"@10570",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537C0,'size':4,'pad':0,'label':"lit_10571",'name':"@10571",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537C4,'size':4,'pad':0,'label':"lit_10572",'name':"@10572",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537C8,'size':4,'pad':0,'label':"lit_10573",'name':"@10573",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537CC,'size':4,'pad':0,'label':"lit_10574",'name':"@10574",'lib':0,'tu':151,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537D0,'size':4,'pad':0,'label':"lit_10575",'name':"@10575",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537D4,'size':4,'pad':0,'label':"lit_10576",'name':"@10576",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537D8,'size':4,'pad':0,'label':"lit_10577",'name':"@10577",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537DC,'size':4,'pad':0,'label':"lit_10578",'name':"@10578",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537E0,'size':4,'pad':0,'label':"lit_10579",'name':"@10579",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537E4,'size':4,'pad':0,'label':"lit_10580",'name':"@10580",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537E8,'size':4,'pad':0,'label':"lit_10581",'name':"@10581",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537EC,'size':4,'pad':0,'label':"lit_10582",'name':"@10582",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537F0,'size':4,'pad':0,'label':"lit_11167",'name':"@11167",'lib':0,'tu':151,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537F4,'size':4,'pad':0,'label':"lit_11168",'name':"@11168",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537F8,'size':4,'pad':0,'label':"lit_11169",'name':"@11169",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804537FC,'size':4,'pad':0,'label':"lit_11170",'name':"@11170",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453800,'size':4,'pad':0,'label':"lit_11171",'name':"@11171",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453804,'size':4,'pad':0,'label':"lit_11172",'name':"@11172",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453808,'size':4,'pad':0,'label':"lit_11173",'name':"@11173",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045380C,'size':4,'pad':0,'label':"lit_11174",'name':"@11174",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453810,'size':4,'pad':0,'label':"lit_11175",'name':"@11175",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453814,'size':4,'pad':0,'label':"lit_12268",'name':"@12268",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453818,'size':4,'pad':0,'label':"lit_12269",'name':"@12269",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045381C,'size':4,'pad':0,'label':"lit_12270",'name':"@12270",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453820,'size':4,'pad':0,'label':"lit_12271",'name':"@12271",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453824,'size':4,'pad':0,'label':"lit_12272",'name':"@12272",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453828,'size':4,'pad':0,'label':"lit_12273",'name':"@12273",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045382C,'size':4,'pad':0,'label':"lit_12274",'name':"@12274",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453830,'size':4,'pad':0,'label':"lit_12275",'name':"@12275",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453834,'size':4,'pad':0,'label':"lit_12276",'name':"@12276",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453838,'size':4,'pad':0,'label':"lit_12277",'name':"@12277",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045383C,'size':4,'pad':0,'label':"lit_12278",'name':"@12278",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453840,'size':4,'pad':0,'label':"lit_12279",'name':"@12279",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453844,'size':4,'pad':0,'label':"lit_12280",'name':"@12280",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453848,'size':4,'pad':0,'label':"lit_12281",'name':"@12281",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045384C,'size':4,'pad':0,'label':"lit_12282",'name':"@12282",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453850,'size':4,'pad':0,'label':"lit_12283",'name':"@12283",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453854,'size':4,'pad':0,'label':"lit_12284",'name':"@12284",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453858,'size':4,'pad':0,'label':"lit_12285",'name':"@12285",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045385C,'size':4,'pad':0,'label':"lit_12286",'name':"@12286",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453860,'size':4,'pad':0,'label':"lit_12287",'name':"@12287",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453864,'size':4,'pad':0,'label':"lit_12288",'name':"@12288",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453868,'size':4,'pad':0,'label':"lit_12289",'name':"@12289",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045386C,'size':4,'pad':0,'label':"lit_12290",'name':"@12290",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453870,'size':4,'pad':0,'label':"lit_12291",'name':"@12291",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453874,'size':4,'pad':0,'label':"lit_12292",'name':"@12292",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453878,'size':4,'pad':0,'label':"lit_12293",'name':"@12293",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045387C,'size':4,'pad':0,'label':"lit_12294",'name':"@12294",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453880,'size':4,'pad':0,'label':"lit_12295",'name':"@12295",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453884,'size':4,'pad':0,'label':"lit_12296",'name':"@12296",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453888,'size':4,'pad':0,'label':"lit_12297",'name':"@12297",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045388C,'size':4,'pad':0,'label':"lit_12864",'name':"@12864",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453890,'size':4,'pad':0,'label':"lit_12865",'name':"@12865",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453894,'size':4,'pad':0,'label':"lit_12866",'name':"@12866",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453898,'size':4,'pad':0,'label':"lit_12867",'name':"@12867",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045389C,'size':4,'pad':0,'label':"lit_12868",'name':"@12868",'lib':0,'tu':151,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538A0,'size':4,'pad':0,'label':"lit_12869",'name':"@12869",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538A4,'size':4,'pad':0,'label':"lit_13132",'name':"@13132",'lib':0,'tu':151,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538A8,'size':4,'pad':0,'label':"lit_13314",'name':"@13314",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538AC,'size':4,'pad':0,'label':"lit_13673",'name':"@13673",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538B0,'size':4,'pad':0,'label':"lit_14059",'name':"@14059",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538B4,'size':4,'pad':0,'label':"lit_14060",'name':"@14060",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538B8,'size':4,'pad':0,'label':"lit_14061",'name':"@14061",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538BC,'size':4,'pad':0,'label':"lit_14062",'name':"@14062",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538C0,'size':4,'pad':0,'label':"lit_14063",'name':"@14063",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538C4,'size':4,'pad':0,'label':"lit_14064",'name':"@14064",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538C8,'size':4,'pad':0,'label':"lit_15474",'name':"@15474",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538CC,'size':4,'pad':0,'label':"lit_15475",'name':"@15475",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538D0,'size':4,'pad':0,'label':"lit_15476",'name':"@15476",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538D4,'size':4,'pad':0,'label':"lit_15477",'name':"@15477",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538D8,'size':4,'pad':0,'label':"lit_15478",'name':"@15478",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538DC,'size':4,'pad':0,'label':"lit_15479",'name':"@15479",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538E0,'size':4,'pad':0,'label':"lit_15480",'name':"@15480",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538E4,'size':4,'pad':0,'label':"lit_15481",'name':"@15481",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538E8,'size':4,'pad':0,'label':"lit_15482",'name':"@15482",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538EC,'size':4,'pad':0,'label':"lit_15483",'name':"@15483",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538F0,'size':4,'pad':0,'label':"lit_15484",'name':"@15484",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538F4,'size':4,'pad':0,'label':"lit_15485",'name':"@15485",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538F8,'size':4,'pad':0,'label':"lit_15486",'name':"@15486",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804538FC,'size':4,'pad':0,'label':"lit_15487",'name':"@15487",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453900,'size':4,'pad':0,'label':"lit_15772",'name':"@15772",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453904,'size':4,'pad':0,'label':"lit_15773",'name':"@15773",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453908,'size':4,'pad':0,'label':"lit_17253",'name':"@17253",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045390C,'size':4,'pad':0,'label':"lit_17254",'name':"@17254",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453910,'size':4,'pad':0,'label':"lit_17255",'name':"@17255",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453914,'size':4,'pad':0,'label':"data_80453914",'name':"PatternLengthMax__Q29dCamera_c23@class$3669d_camera_cpp",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453918,'size':4,'pad':0,'label':"lit_17392",'name':"@17392",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045391C,'size':4,'pad':0,'label':"lit_17525",'name':"@17525",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453920,'size':4,'pad':0,'label':"lit_17948",'name':"@17948",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453924,'size':4,'pad':0,'label':"lit_17979",'name':"@17979",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453928,'size':4,'pad':0,'label':"lit_3812",'name':"@3812",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045392C,'size':4,'pad':0,'label':"lit_4165",'name':"@4165",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453918,'size':4,'pad':0,'label':"lit_17392",'name':"@17392",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045391C,'size':4,'pad':0,'label':"lit_17525",'name':"@17525",'lib':0,'tu':151,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453920,'size':4,'pad':0,'label':"lit_17948",'name':"@17948",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453924,'size':4,'pad':0,'label':"lit_17979",'name':"@17979",'lib':0,'tu':151,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453928,'size':4,'pad':0,'label':"lit_3812",'name':"@3812",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045392C,'size':4,'pad':0,'label':"lit_4165",'name':"@4165",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453930,'size':4,'pad':4,'label':"lit_4166",'name':"@4166",'lib':0,'tu':153,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453938,'size':8,'pad':0,'label':"lit_4342",'name':"@4342",'lib':0,'tu':153,'section':8,'r':[34,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453940,'size':4,'pad':0,'label':"lit_4611",'name':"@4611",'lib':0,'tu':153,'section':8,'r':[38,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453944,'size':4,'pad':0,'label':"lit_4612",'name':"@4612",'lib':0,'tu':153,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453938,'size':8,'pad':0,'label':"lit_4342",'name':"@4342",'lib':0,'tu':153,'section':8,'r':[34,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453940,'size':4,'pad':0,'label':"lit_4611",'name':"@4611",'lib':0,'tu':153,'section':8,'r':[38,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453944,'size':4,'pad':0,'label':"lit_4612",'name':"@4612",'lib':0,'tu':153,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453948,'size':4,'pad':0,'label':"lit_4778",'name':"@4778",'lib':0,'tu':153,'section':8,'r':[35,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045394C,'size':4,'pad':0,'label':"lit_5472",'name':"@5472",'lib':0,'tu':153,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045394C,'size':4,'pad':0,'label':"lit_5472",'name':"@5472",'lib':0,'tu':153,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453950,'size':4,'pad':4,'label':"lit_5473",'name':"@5473",'lib':0,'tu':153,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453958,'size':8,'pad':0,'label':"lit_5475",'name':"@5475",'lib':0,'tu':153,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453960,'size':4,'pad':0,'label':"lit_5614",'name':"@5614",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453964,'size':4,'pad':0,'label':"lit_5615",'name':"@5615",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453968,'size':4,'pad':0,'label':"lit_6069",'name':"@6069",'lib':0,'tu':153,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045396C,'size':4,'pad':0,'label':"lit_6070",'name':"@6070",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453970,'size':4,'pad':0,'label':"lit_6071",'name':"@6071",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453974,'size':4,'pad':0,'label':"lit_6867",'name':"@6867",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453978,'size':4,'pad':0,'label':"lit_6868",'name':"@6868",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045397C,'size':4,'pad':0,'label':"lit_6869",'name':"@6869",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453980,'size':4,'pad':0,'label':"lit_6870",'name':"@6870",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453984,'size':4,'pad':0,'label':"lit_6871",'name':"@6871",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453988,'size':4,'pad':0,'label':"lit_6872",'name':"@6872",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045398C,'size':4,'pad':0,'label':"lit_6873",'name':"@6873",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453990,'size':4,'pad':0,'label':"lit_6874",'name':"@6874",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453994,'size':4,'pad':0,'label':"lit_6875",'name':"@6875",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453998,'size':4,'pad':0,'label':"lit_6876",'name':"@6876",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045399C,'size':4,'pad':0,'label':"lit_6877",'name':"@6877",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539A0,'size':4,'pad':0,'label':"lit_6878",'name':"@6878",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539A4,'size':4,'pad':0,'label':"lit_6879",'name':"@6879",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539A8,'size':4,'pad':0,'label':"lit_6880",'name':"@6880",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539AC,'size':4,'pad':0,'label':"lit_7146",'name':"@7146",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539B0,'size':4,'pad':0,'label':"lit_7201",'name':"@7201",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539B4,'size':4,'pad':0,'label':"lit_8459",'name':"@8459",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539B8,'size':4,'pad':0,'label':"lit_8608",'name':"@8608",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539BC,'size':4,'pad':0,'label':"lit_8978",'name':"@8978",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453958,'size':8,'pad':0,'label':"lit_5475",'name':"@5475",'lib':0,'tu':153,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453960,'size':4,'pad':0,'label':"lit_5614",'name':"@5614",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453964,'size':4,'pad':0,'label':"lit_5615",'name':"@5615",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453968,'size':4,'pad':0,'label':"lit_6069",'name':"@6069",'lib':0,'tu':153,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045396C,'size':4,'pad':0,'label':"lit_6070",'name':"@6070",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453970,'size':4,'pad':0,'label':"lit_6071",'name':"@6071",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453974,'size':4,'pad':0,'label':"lit_6867",'name':"@6867",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453978,'size':4,'pad':0,'label':"lit_6868",'name':"@6868",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045397C,'size':4,'pad':0,'label':"lit_6869",'name':"@6869",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453980,'size':4,'pad':0,'label':"lit_6870",'name':"@6870",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453984,'size':4,'pad':0,'label':"lit_6871",'name':"@6871",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453988,'size':4,'pad':0,'label':"lit_6872",'name':"@6872",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045398C,'size':4,'pad':0,'label':"lit_6873",'name':"@6873",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453990,'size':4,'pad':0,'label':"lit_6874",'name':"@6874",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453994,'size':4,'pad':0,'label':"lit_6875",'name':"@6875",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453998,'size':4,'pad':0,'label':"lit_6876",'name':"@6876",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045399C,'size':4,'pad':0,'label':"lit_6877",'name':"@6877",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539A0,'size':4,'pad':0,'label':"lit_6878",'name':"@6878",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539A4,'size':4,'pad':0,'label':"lit_6879",'name':"@6879",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539A8,'size':4,'pad':0,'label':"lit_6880",'name':"@6880",'lib':0,'tu':153,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539AC,'size':4,'pad':0,'label':"lit_7146",'name':"@7146",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539B0,'size':4,'pad':0,'label':"lit_7201",'name':"@7201",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539B4,'size':4,'pad':0,'label':"lit_8459",'name':"@8459",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539B8,'size':4,'pad':0,'label':"lit_8608",'name':"@8608",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539BC,'size':4,'pad':0,'label':"lit_8978",'name':"@8978",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804539C0,'size':4,'pad':4,'label':"lit_8979",'name':"@8979",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804539C8,'size':8,'pad':0,'label':"lit_8980",'name':"@8980",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804539D0,'size':4,'pad':0,'label':"lit_8981",'name':"@8981",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539D4,'size':4,'pad':0,'label':"lit_8993",'name':"@8993",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804539C8,'size':8,'pad':0,'label':"lit_8980",'name':"@8980",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539D0,'size':4,'pad':0,'label':"lit_8981",'name':"@8981",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539D4,'size':4,'pad':0,'label':"lit_8993",'name':"@8993",'lib':0,'tu':153,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804539D8,'size':4,'pad':0,'label':"lit_3741",'name':"@3741",'lib':0,'tu':154,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804539DC,'size':4,'pad':0,'label':"lit_3769",'name':"@3769",'lib':0,'tu':154,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ReferenceArray"}, {'addr':0x804539E0,'size':4,'pad':0,'label':"data_804539E0",'name':None,'lib':0,'tu':154,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ReferenceArray"}, {'addr':0x804539E4,'size':4,'pad':0,'label':"lit_3770",'name':"@3770",'lib':0,'tu':154,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ReferenceArray"}, {'addr':0x804539E8,'size':4,'pad':0,'label':"data_804539E8",'name':None,'lib':0,'tu':154,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ReferenceArray"}, - {'addr':0x804539EC,'size':4,'pad':0,'label':"lit_3799",'name':"@3799",'lib':0,'tu':154,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804539F0,'size':8,'pad':0,'label':"lit_3868",'name':"@3868",'lib':0,'tu':154,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804539F8,'size':4,'pad':0,'label':"lit_4000",'name':"@4000",'lib':0,'tu':155,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804539EC,'size':4,'pad':0,'label':"lit_3799",'name':"@3799",'lib':0,'tu':154,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539F0,'size':8,'pad':0,'label':"lit_3868",'name':"@3868",'lib':0,'tu':154,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804539F8,'size':4,'pad':0,'label':"lit_4000",'name':"@4000",'lib':0,'tu':155,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804539FC,'size':4,'pad':0,'label':"lit_4001",'name':"@4001",'lib':0,'tu':155,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453A00,'size':4,'pad':0,'label':"lit_3792",'name':"@3792",'lib':0,'tu':156,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453A04,'size':4,'pad':0,'label':"lit_3821",'name':"@3821",'lib':0,'tu':156,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453A04,'size':4,'pad':0,'label':"lit_3821",'name':"@3821",'lib':0,'tu':156,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453A08,'size':4,'pad':4,'label':"lit_3822",'name':"@3822",'lib':0,'tu':156,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453A10,'size':4,'pad':0,'label':"lit_3756",'name':"@3756",'lib':0,'tu':157,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453A10,'size':4,'pad':0,'label':"lit_3756",'name':"@3756",'lib':0,'tu':157,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453A14,'size':4,'pad':0,'label':"lit_3757",'name':"@3757",'lib':0,'tu':157,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453A18,'size':8,'pad':0,'label':"lit_3759",'name':"@3759",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453A20,'size':4,'pad':0,'label':"lit_3879",'name':"@3879",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A24,'size':4,'pad':0,'label':"lit_3880",'name':"@3880",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A28,'size':4,'pad':0,'label':"lit_3881",'name':"@3881",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A2C,'size':4,'pad':0,'label':"lit_3882",'name':"@3882",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A30,'size':4,'pad':0,'label':"lit_3883",'name':"@3883",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A34,'size':4,'pad':0,'label':"lit_3902",'name':"@3902",'lib':0,'tu':157,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A38,'size':4,'pad':0,'label':"lit_3903",'name':"@3903",'lib':0,'tu':157,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A3C,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':0,'tu':157,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A40,'size':8,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':157,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453A48,'size':4,'pad':0,'label':"lit_3673",'name':"@3673",'lib':0,'tu':158,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A4C,'size':4,'pad':0,'label':"lit_3674",'name':"@3674",'lib':0,'tu':158,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453A18,'size':8,'pad':0,'label':"lit_3759",'name':"@3759",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A20,'size':4,'pad':0,'label':"lit_3879",'name':"@3879",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A24,'size':4,'pad':0,'label':"lit_3880",'name':"@3880",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A28,'size':4,'pad':0,'label':"lit_3881",'name':"@3881",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A2C,'size':4,'pad':0,'label':"lit_3882",'name':"@3882",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A30,'size':4,'pad':0,'label':"lit_3883",'name':"@3883",'lib':0,'tu':157,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A34,'size':4,'pad':0,'label':"lit_3902",'name':"@3902",'lib':0,'tu':157,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A38,'size':4,'pad':0,'label':"lit_3903",'name':"@3903",'lib':0,'tu':157,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A3C,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':0,'tu':157,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A40,'size':8,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':157,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A48,'size':4,'pad':0,'label':"lit_3673",'name':"@3673",'lib':0,'tu':158,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A4C,'size':4,'pad':0,'label':"lit_3674",'name':"@3674",'lib':0,'tu':158,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453A50,'size':4,'pad':0,'label':"lit_3808",'name':"@3808",'lib':0,'tu':158,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453A54,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':0,'tu':158,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A58,'size':8,'pad':0,'label':"lit_4064",'name':"@4064",'lib':0,'tu':158,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453A60,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':158,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A64,'size':4,'pad':0,'label':"lit_4157",'name':"@4157",'lib':0,'tu':158,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A68,'size':4,'pad':0,'label':"lit_4237",'name':"@4237",'lib':0,'tu':158,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A6C,'size':4,'pad':0,'label':"lit_4238",'name':"@4238",'lib':0,'tu':158,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A70,'size':4,'pad':4,'label':"lit_3740",'name':"@3740",'lib':0,'tu':159,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453A78,'size':8,'pad':0,'label':"lit_3773",'name':"@3773",'lib':0,'tu':159,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453A54,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':0,'tu':158,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A58,'size':8,'pad':0,'label':"lit_4064",'name':"@4064",'lib':0,'tu':158,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A60,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':158,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A64,'size':4,'pad':0,'label':"lit_4157",'name':"@4157",'lib':0,'tu':158,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A68,'size':4,'pad':0,'label':"lit_4237",'name':"@4237",'lib':0,'tu':158,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A6C,'size':4,'pad':0,'label':"lit_4238",'name':"@4238",'lib':0,'tu':158,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A70,'size':4,'pad':4,'label':"lit_3740",'name':"@3740",'lib':0,'tu':159,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A78,'size':8,'pad':0,'label':"lit_3773",'name':"@3773",'lib':0,'tu':159,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453A80,'size':4,'pad':4,'label':"lit_3814",'name':"@3814",'lib':0,'tu':159,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453A88,'size':4,'pad':0,'label':"lit_3796",'name':"@3796",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A8C,'size':4,'pad':0,'label':"lit_3797",'name':"@3797",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453A90,'size':4,'pad':0,'label':"lit_3798",'name':"@3798",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453A88,'size':4,'pad':0,'label':"lit_3796",'name':"@3796",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A8C,'size':4,'pad':0,'label':"lit_3797",'name':"@3797",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453A90,'size':4,'pad':0,'label':"lit_3798",'name':"@3798",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453A94,'size':4,'pad':0,'label':"lit_3916",'name':"@3916",'lib':0,'tu':160,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453A98,'size':8,'pad':0,'label':"lit_3917",'name':"@3917",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453AA0,'size':8,'pad':0,'label':"lit_3918",'name':"@3918",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453A98,'size':8,'pad':0,'label':"lit_3917",'name':"@3917",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AA0,'size':8,'pad':0,'label':"lit_3918",'name':"@3918",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453AA8,'size':8,'pad':0,'label':"lit_3919",'name':"@3919",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453AB0,'size':4,'pad':0,'label':"lit_3920",'name':"@3920",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AB4,'size':4,'pad':0,'label':"lit_3992",'name':"@3992",'lib':0,'tu':160,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AB8,'size':4,'pad':0,'label':"lit_4059",'name':"@4059",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453ABC,'size':4,'pad':0,'label':"lit_4060",'name':"@4060",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AC0,'size':4,'pad':0,'label':"lit_4061",'name':"@4061",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AC4,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AC8,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453ACC,'size':4,'pad':0,'label':"lit_4064",'name':"@4064",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AD0,'size':4,'pad':4,'label':"lit_3659",'name':"@3659",'lib':0,'tu':161,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453AD8,'size':8,'pad':0,'label':"lit_3838",'name':"@3838",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453AE0,'size':8,'pad':0,'label':"lit_3839",'name':"@3839",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453AB0,'size':4,'pad':0,'label':"lit_3920",'name':"@3920",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AB4,'size':4,'pad':0,'label':"lit_3992",'name':"@3992",'lib':0,'tu':160,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AB8,'size':4,'pad':0,'label':"lit_4059",'name':"@4059",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453ABC,'size':4,'pad':0,'label':"lit_4060",'name':"@4060",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AC0,'size':4,'pad':0,'label':"lit_4061",'name':"@4061",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AC4,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AC8,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453ACC,'size':4,'pad':0,'label':"lit_4064",'name':"@4064",'lib':0,'tu':160,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AD0,'size':4,'pad':4,'label':"lit_3659",'name':"@3659",'lib':0,'tu':161,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AD8,'size':8,'pad':0,'label':"lit_3838",'name':"@3838",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AE0,'size':8,'pad':0,'label':"lit_3839",'name':"@3839",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453AE8,'size':8,'pad':0,'label':"lit_3840",'name':"@3840",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453AF0,'size':4,'pad':0,'label':"lit_3841",'name':"@3841",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AF4,'size':4,'pad':0,'label':"lit_3842",'name':"@3842",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AF8,'size':4,'pad':0,'label':"lit_3843",'name':"@3843",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453AFC,'size':4,'pad':0,'label':"lit_3844",'name':"@3844",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B00,'size':4,'pad':0,'label':"lit_4097",'name':"@4097",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B04,'size':4,'pad':0,'label':"lit_4098",'name':"@4098",'lib':0,'tu':162,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B08,'size':4,'pad':0,'label':"lit_4099",'name':"@4099",'lib':0,'tu':162,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B0C,'size':4,'pad':0,'label':"lit_4100",'name':"@4100",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B10,'size':4,'pad':0,'label':"lit_4101",'name':"@4101",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B14,'size':4,'pad':0,'label':"lit_4493",'name':"@4493",'lib':0,'tu':162,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B18,'size':4,'pad':0,'label':"lit_4494",'name':"@4494",'lib':0,'tu':162,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B1C,'size':4,'pad':0,'label':"lit_4495",'name':"@4495",'lib':0,'tu':162,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B20,'size':4,'pad':0,'label':"lit_4496",'name':"@4496",'lib':0,'tu':162,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B24,'size':4,'pad':0,'label':"lit_5000",'name':"@5000",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B28,'size':4,'pad':0,'label':"lit_5001",'name':"@5001",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B2C,'size':4,'pad':0,'label':"lit_5002",'name':"@5002",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B30,'size':4,'pad':0,'label':"lit_5003",'name':"@5003",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B34,'size':4,'pad':0,'label':"lit_5004",'name':"@5004",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B38,'size':4,'pad':0,'label':"lit_5005",'name':"@5005",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B3C,'size':4,'pad':0,'label':"lit_5006",'name':"@5006",'lib':0,'tu':162,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B40,'size':4,'pad':0,'label':"lit_5007",'name':"@5007",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453AF0,'size':4,'pad':0,'label':"lit_3841",'name':"@3841",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AF4,'size':4,'pad':0,'label':"lit_3842",'name':"@3842",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AF8,'size':4,'pad':0,'label':"lit_3843",'name':"@3843",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453AFC,'size':4,'pad':0,'label':"lit_3844",'name':"@3844",'lib':0,'tu':161,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B00,'size':4,'pad':0,'label':"lit_4097",'name':"@4097",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B04,'size':4,'pad':0,'label':"lit_4098",'name':"@4098",'lib':0,'tu':162,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B08,'size':4,'pad':0,'label':"lit_4099",'name':"@4099",'lib':0,'tu':162,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B0C,'size':4,'pad':0,'label':"lit_4100",'name':"@4100",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B10,'size':4,'pad':0,'label':"lit_4101",'name':"@4101",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B14,'size':4,'pad':0,'label':"lit_4493",'name':"@4493",'lib':0,'tu':162,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B18,'size':4,'pad':0,'label':"lit_4494",'name':"@4494",'lib':0,'tu':162,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B1C,'size':4,'pad':0,'label':"lit_4495",'name':"@4495",'lib':0,'tu':162,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B20,'size':4,'pad':0,'label':"lit_4496",'name':"@4496",'lib':0,'tu':162,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B24,'size':4,'pad':0,'label':"lit_5000",'name':"@5000",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B28,'size':4,'pad':0,'label':"lit_5001",'name':"@5001",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B2C,'size':4,'pad':0,'label':"lit_5002",'name':"@5002",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B30,'size':4,'pad':0,'label':"lit_5003",'name':"@5003",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B34,'size':4,'pad':0,'label':"lit_5004",'name':"@5004",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B38,'size':4,'pad':0,'label':"lit_5005",'name':"@5005",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B3C,'size':4,'pad':0,'label':"lit_5006",'name':"@5006",'lib':0,'tu':162,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B40,'size':4,'pad':0,'label':"lit_5007",'name':"@5007",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453B44,'size':4,'pad':0,'label':"lit_5084",'name':"@5084",'lib':0,'tu':162,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80453B48,'size':4,'pad':4,'label':"lit_5296",'name':"@5296",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453B50,'size':8,'pad':0,'label':"lit_5298",'name':"@5298",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453B50,'size':8,'pad':0,'label':"lit_5298",'name':"@5298",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453B58,'size':6,'pad':2,'label':"item_no",'name':"item_no$5460",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453B60,'size':4,'pad':0,'label':"lit_5687",'name':"@5687",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B64,'size':4,'pad':0,'label':"lit_5688",'name':"@5688",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B68,'size':4,'pad':0,'label':"lit_5689",'name':"@5689",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B6C,'size':4,'pad':0,'label':"lit_5690",'name':"@5690",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B70,'size':4,'pad':0,'label':"lit_5691",'name':"@5691",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B74,'size':4,'pad':0,'label':"lit_5692",'name':"@5692",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B78,'size':4,'pad':0,'label':"lit_5693",'name':"@5693",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B7C,'size':4,'pad':0,'label':"lit_5694",'name':"@5694",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453B60,'size':4,'pad':0,'label':"lit_5687",'name':"@5687",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B64,'size':4,'pad':0,'label':"lit_5688",'name':"@5688",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B68,'size':4,'pad':0,'label':"lit_5689",'name':"@5689",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B6C,'size':4,'pad':0,'label':"lit_5690",'name':"@5690",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B70,'size':4,'pad':0,'label':"lit_5691",'name':"@5691",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B74,'size':4,'pad':0,'label':"lit_5692",'name':"@5692",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B78,'size':4,'pad':0,'label':"lit_5693",'name':"@5693",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B7C,'size':4,'pad':0,'label':"lit_5694",'name':"@5694",'lib':0,'tu':162,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453B80,'size':4,'pad':0,'label':"lit_3868",'name':"@3868",'lib':0,'tu':163,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453B84,'size':4,'pad':0,'label':"lit_3869",'name':"@3869",'lib':0,'tu':163,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B88,'size':4,'pad':0,'label':"lit_3870",'name':"@3870",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B8C,'size':4,'pad':0,'label':"lit_3878",'name':"@3878",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B90,'size':4,'pad':0,'label':"lit_3879",'name':"@3879",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B94,'size':4,'pad':0,'label':"lit_4069",'name':"@4069",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453B98,'size':8,'pad':0,'label':"lit_4071",'name':"@4071",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453BA0,'size':4,'pad':0,'label':"lit_4290",'name':"@4290",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BA4,'size':4,'pad':0,'label':"lit_4291",'name':"@4291",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BA8,'size':4,'pad':0,'label':"lit_4316",'name':"@4316",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BAC,'size':4,'pad':0,'label':"lit_4374",'name':"@4374",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BB0,'size':4,'pad':0,'label':"lit_4375",'name':"@4375",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BB4,'size':4,'pad':0,'label':"lit_4376",'name':"@4376",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453B84,'size':4,'pad':0,'label':"lit_3869",'name':"@3869",'lib':0,'tu':163,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B88,'size':4,'pad':0,'label':"lit_3870",'name':"@3870",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B8C,'size':4,'pad':0,'label':"lit_3878",'name':"@3878",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B90,'size':4,'pad':0,'label':"lit_3879",'name':"@3879",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B94,'size':4,'pad':0,'label':"lit_4069",'name':"@4069",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453B98,'size':8,'pad':0,'label':"lit_4071",'name':"@4071",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BA0,'size':4,'pad':0,'label':"lit_4290",'name':"@4290",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BA4,'size':4,'pad':0,'label':"lit_4291",'name':"@4291",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BA8,'size':4,'pad':0,'label':"lit_4316",'name':"@4316",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BAC,'size':4,'pad':0,'label':"lit_4374",'name':"@4374",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BB0,'size':4,'pad':0,'label':"lit_4375",'name':"@4375",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BB4,'size':4,'pad':0,'label':"lit_4376",'name':"@4376",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453BB8,'size':4,'pad':4,'label':"lit_4377",'name':"@4377",'lib':0,'tu':163,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453BC0,'size':4,'pad':0,'label':"lit_4345",'name':"@4345",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BC4,'size':4,'pad':0,'label':"lit_4346",'name':"@4346",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BC8,'size':4,'pad':0,'label':"lit_4347",'name':"@4347",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BCC,'size':4,'pad':0,'label':"lit_4348",'name':"@4348",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BD0,'size':4,'pad':0,'label':"lit_4349",'name':"@4349",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BD4,'size':4,'pad':0,'label':"lit_4350",'name':"@4350",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BD8,'size':4,'pad':0,'label':"lit_4351",'name':"@4351",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BDC,'size':4,'pad':0,'label':"lit_4352",'name':"@4352",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BE0,'size':4,'pad':0,'label':"lit_4353",'name':"@4353",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BE4,'size':4,'pad':0,'label':"lit_4354",'name':"@4354",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BE8,'size':4,'pad':0,'label':"lit_4355",'name':"@4355",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BEC,'size':4,'pad':0,'label':"lit_4356",'name':"@4356",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BF0,'size':4,'pad':0,'label':"lit_4357",'name':"@4357",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BF4,'size':4,'pad':0,'label':"lit_4358",'name':"@4358",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BF8,'size':4,'pad':0,'label':"lit_4359",'name':"@4359",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453BFC,'size':4,'pad':0,'label':"lit_4360",'name':"@4360",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C00,'size':4,'pad':0,'label':"lit_4361",'name':"@4361",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C04,'size':4,'pad':0,'label':"lit_4362",'name':"@4362",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C08,'size':4,'pad':0,'label':"lit_4363",'name':"@4363",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453BC0,'size':4,'pad':0,'label':"lit_4345",'name':"@4345",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BC4,'size':4,'pad':0,'label':"lit_4346",'name':"@4346",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BC8,'size':4,'pad':0,'label':"lit_4347",'name':"@4347",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BCC,'size':4,'pad':0,'label':"lit_4348",'name':"@4348",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BD0,'size':4,'pad':0,'label':"lit_4349",'name':"@4349",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BD4,'size':4,'pad':0,'label':"lit_4350",'name':"@4350",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BD8,'size':4,'pad':0,'label':"lit_4351",'name':"@4351",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BDC,'size':4,'pad':0,'label':"lit_4352",'name':"@4352",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BE0,'size':4,'pad':0,'label':"lit_4353",'name':"@4353",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BE4,'size':4,'pad':0,'label':"lit_4354",'name':"@4354",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BE8,'size':4,'pad':0,'label':"lit_4355",'name':"@4355",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BEC,'size':4,'pad':0,'label':"lit_4356",'name':"@4356",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BF0,'size':4,'pad':0,'label':"lit_4357",'name':"@4357",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BF4,'size':4,'pad':0,'label':"lit_4358",'name':"@4358",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BF8,'size':4,'pad':0,'label':"lit_4359",'name':"@4359",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453BFC,'size':4,'pad':0,'label':"lit_4360",'name':"@4360",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C00,'size':4,'pad':0,'label':"lit_4361",'name':"@4361",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C04,'size':4,'pad':0,'label':"lit_4362",'name':"@4362",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C08,'size':4,'pad':0,'label':"lit_4363",'name':"@4363",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453C0C,'size':4,'pad':0,'label':"lit_4409",'name':"@4409",'lib':0,'tu':164,'section':8,'r':[46,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453C10,'size':8,'pad':0,'label':"lit_4410",'name':"@4410",'lib':0,'tu':164,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453C18,'size':8,'pad':0,'label':"lit_4411",'name':"@4411",'lib':0,'tu':164,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453C10,'size':8,'pad':0,'label':"lit_4410",'name':"@4410",'lib':0,'tu':164,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C18,'size':8,'pad':0,'label':"lit_4411",'name':"@4411",'lib':0,'tu':164,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453C20,'size':8,'pad':0,'label':"lit_4412",'name':"@4412",'lib':0,'tu':164,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453C28,'size':4,'pad':0,'label':"lit_4441",'name':"@4441",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C2C,'size':4,'pad':0,'label':"lit_4442",'name':"@4442",'lib':0,'tu':164,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C30,'size':8,'pad':0,'label':"lit_4444",'name':"@4444",'lib':0,'tu':164,'section':8,'r':[25,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453C38,'size':4,'pad':0,'label':"lit_4477",'name':"@4477",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C3C,'size':4,'pad':0,'label':"lit_4502",'name':"@4502",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C40,'size':4,'pad':0,'label':"lit_4503",'name':"@4503",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C44,'size':4,'pad':0,'label':"lit_4504",'name':"@4504",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C48,'size':4,'pad':0,'label':"lit_4505",'name':"@4505",'lib':0,'tu':164,'section':8,'r':[36,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C4C,'size':4,'pad':0,'label':"lit_4506",'name':"@4506",'lib':0,'tu':164,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C50,'size':4,'pad':0,'label':"lit_4507",'name':"@4507",'lib':0,'tu':164,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C54,'size':4,'pad':0,'label':"lit_4508",'name':"@4508",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C58,'size':4,'pad':0,'label':"lit_4509",'name':"@4509",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C5C,'size':4,'pad':0,'label':"lit_4510",'name':"@4510",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C60,'size':4,'pad':0,'label':"lit_4529",'name':"@4529",'lib':0,'tu':164,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C64,'size':4,'pad':0,'label':"lit_4730",'name':"@4730",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C68,'size':4,'pad':0,'label':"lit_4731",'name':"@4731",'lib':0,'tu':164,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C6C,'size':4,'pad':0,'label':"lit_4732",'name':"@4732",'lib':0,'tu':164,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C70,'size':4,'pad':0,'label':"lit_4850",'name':"@4850",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C74,'size':4,'pad':0,'label':"lit_4851",'name':"@4851",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453C28,'size':4,'pad':0,'label':"lit_4441",'name':"@4441",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C2C,'size':4,'pad':0,'label':"lit_4442",'name':"@4442",'lib':0,'tu':164,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C30,'size':8,'pad':0,'label':"lit_4444",'name':"@4444",'lib':0,'tu':164,'section':8,'r':[25,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C38,'size':4,'pad':0,'label':"lit_4477",'name':"@4477",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C3C,'size':4,'pad':0,'label':"lit_4502",'name':"@4502",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C40,'size':4,'pad':0,'label':"lit_4503",'name':"@4503",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C44,'size':4,'pad':0,'label':"lit_4504",'name':"@4504",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C48,'size':4,'pad':0,'label':"lit_4505",'name':"@4505",'lib':0,'tu':164,'section':8,'r':[36,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C4C,'size':4,'pad':0,'label':"lit_4506",'name':"@4506",'lib':0,'tu':164,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C50,'size':4,'pad':0,'label':"lit_4507",'name':"@4507",'lib':0,'tu':164,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C54,'size':4,'pad':0,'label':"lit_4508",'name':"@4508",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C58,'size':4,'pad':0,'label':"lit_4509",'name':"@4509",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C5C,'size':4,'pad':0,'label':"lit_4510",'name':"@4510",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C60,'size':4,'pad':0,'label':"lit_4529",'name':"@4529",'lib':0,'tu':164,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C64,'size':4,'pad':0,'label':"lit_4730",'name':"@4730",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C68,'size':4,'pad':0,'label':"lit_4731",'name':"@4731",'lib':0,'tu':164,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C6C,'size':4,'pad':0,'label':"lit_4732",'name':"@4732",'lib':0,'tu':164,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C70,'size':4,'pad':0,'label':"lit_4850",'name':"@4850",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C74,'size':4,'pad':0,'label':"lit_4851",'name':"@4851",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453C78,'size':4,'pad':4,'label':"lit_4852",'name':"@4852",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453C80,'size':8,'pad':0,'label':"lit_4964",'name':"@4964",'lib':0,'tu':164,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453C88,'size':4,'pad':0,'label':"lit_5077",'name':"@5077",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C8C,'size':4,'pad':0,'label':"lit_5106",'name':"@5106",'lib':0,'tu':164,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C90,'size':4,'pad':0,'label':"lit_5191",'name':"@5191",'lib':0,'tu':164,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C94,'size':4,'pad':0,'label':"lit_5192",'name':"@5192",'lib':0,'tu':164,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C98,'size':4,'pad':0,'label':"lit_5193",'name':"@5193",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453C9C,'size':4,'pad':0,'label':"lit_5194",'name':"@5194",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CA0,'size':4,'pad':0,'label':"lit_5344",'name':"@5344",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CA4,'size':4,'pad':0,'label':"lit_5345",'name':"@5345",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CA8,'size':4,'pad':0,'label':"lit_5346",'name':"@5346",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CAC,'size':4,'pad':0,'label':"lit_5347",'name':"@5347",'lib':0,'tu':164,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CB0,'size':4,'pad':0,'label':"lit_5348",'name':"@5348",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CB4,'size':4,'pad':0,'label':"lit_5349",'name':"@5349",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CB8,'size':4,'pad':0,'label':"lit_5365",'name':"@5365",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CBC,'size':4,'pad':0,'label':"lit_5554",'name':"@5554",'lib':0,'tu':164,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CC0,'size':4,'pad':0,'label':"lit_5555",'name':"@5555",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CC4,'size':4,'pad':0,'label':"lit_5556",'name':"@5556",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CC8,'size':4,'pad':0,'label':"lit_5613",'name':"@5613",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CCC,'size':4,'pad':0,'label':"lit_5614",'name':"@5614",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CD0,'size':4,'pad':0,'label':"lit_5615",'name':"@5615",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CD4,'size':4,'pad':0,'label':"lit_5616",'name':"@5616",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CD8,'size':4,'pad':0,'label':"lit_5617",'name':"@5617",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CDC,'size':4,'pad':0,'label':"lit_5618",'name':"@5618",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CE0,'size':4,'pad':0,'label':"lit_5839",'name':"@5839",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CE4,'size':4,'pad':0,'label':"lit_5840",'name':"@5840",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CE8,'size':4,'pad':0,'label':"lit_6032",'name':"@6032",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CEC,'size':4,'pad':0,'label':"lit_6033",'name':"@6033",'lib':0,'tu':164,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CF0,'size':4,'pad':0,'label':"lit_6034",'name':"@6034",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CF4,'size':4,'pad':0,'label':"lit_6035",'name':"@6035",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CF8,'size':4,'pad':0,'label':"lit_6036",'name':"@6036",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453CFC,'size':4,'pad':0,'label':"lit_6037",'name':"@6037",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D00,'size':4,'pad':0,'label':"lit_6038",'name':"@6038",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D04,'size':4,'pad':0,'label':"lit_6039",'name':"@6039",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D08,'size':4,'pad':0,'label':"lit_6040",'name':"@6040",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D0C,'size':4,'pad':0,'label':"lit_6041",'name':"@6041",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D10,'size':4,'pad':0,'label':"lit_6042",'name':"@6042",'lib':0,'tu':164,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D14,'size':4,'pad':0,'label':"lit_6761",'name':"@6761",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D18,'size':4,'pad':0,'label':"lit_6762",'name':"@6762",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D1C,'size':4,'pad':0,'label':"lit_6763",'name':"@6763",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D20,'size':4,'pad':0,'label':"lit_6764",'name':"@6764",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D24,'size':4,'pad':0,'label':"lit_6765",'name':"@6765",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D28,'size':4,'pad':0,'label':"lit_6766",'name':"@6766",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D2C,'size':4,'pad':0,'label':"lit_6767",'name':"@6767",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D30,'size':4,'pad':0,'label':"lit_6768",'name':"@6768",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D34,'size':4,'pad':0,'label':"lit_6769",'name':"@6769",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D38,'size':4,'pad':0,'label':"lit_6770",'name':"@6770",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D3C,'size':4,'pad':0,'label':"lit_6771",'name':"@6771",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D40,'size':4,'pad':0,'label':"lit_6772",'name':"@6772",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D44,'size':4,'pad':0,'label':"lit_6773",'name':"@6773",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D48,'size':4,'pad':0,'label':"lit_6774",'name':"@6774",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D4C,'size':4,'pad':0,'label':"lit_7011",'name':"@7011",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D50,'size':4,'pad':0,'label':"lit_7012",'name':"@7012",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D54,'size':4,'pad':0,'label':"lit_7013",'name':"@7013",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D58,'size':4,'pad':0,'label':"lit_7014",'name':"@7014",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D5C,'size':4,'pad':0,'label':"lit_7015",'name':"@7015",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D60,'size':4,'pad':0,'label':"lit_7016",'name':"@7016",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D64,'size':4,'pad':0,'label':"lit_7017",'name':"@7017",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D68,'size':4,'pad':0,'label':"lit_7018",'name':"@7018",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D6C,'size':4,'pad':0,'label':"lit_7019",'name':"@7019",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D70,'size':4,'pad':0,'label':"lit_7020",'name':"@7020",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D74,'size':4,'pad':0,'label':"lit_7021",'name':"@7021",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D78,'size':4,'pad':0,'label':"lit_7022",'name':"@7022",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D7C,'size':4,'pad':0,'label':"lit_7023",'name':"@7023",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D80,'size':4,'pad':0,'label':"lit_7024",'name':"@7024",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D84,'size':4,'pad':0,'label':"lit_7025",'name':"@7025",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D88,'size':4,'pad':0,'label':"lit_7026",'name':"@7026",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D8C,'size':4,'pad':0,'label':"lit_7027",'name':"@7027",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D90,'size':4,'pad':0,'label':"lit_7186",'name':"@7186",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D94,'size':4,'pad':0,'label':"lit_7187",'name':"@7187",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D98,'size':4,'pad':0,'label':"lit_7365",'name':"@7365",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453D9C,'size':4,'pad':0,'label':"lit_7366",'name':"@7366",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DA0,'size':4,'pad':0,'label':"lit_7608",'name':"@7608",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DA4,'size':4,'pad':0,'label':"lit_7609",'name':"@7609",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DA8,'size':4,'pad':0,'label':"lit_8647",'name':"@8647",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DAC,'size':4,'pad':0,'label':"lit_8975",'name':"@8975",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DB0,'size':4,'pad':0,'label':"lit_9254",'name':"@9254",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DB4,'size':4,'pad':0,'label':"lit_9255",'name':"@9255",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DB8,'size':4,'pad':0,'label':"lit_9256",'name':"@9256",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DBC,'size':4,'pad':0,'label':"lit_9257",'name':"@9257",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DC0,'size':4,'pad':0,'label':"lit_9258",'name':"@9258",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DC4,'size':4,'pad':0,'label':"lit_9259",'name':"@9259",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DC8,'size':4,'pad':0,'label':"lit_9676",'name':"@9676",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DCC,'size':4,'pad':0,'label':"lit_9677",'name':"@9677",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DD0,'size':4,'pad':0,'label':"lit_9722",'name':"@9722",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DD4,'size':4,'pad':0,'label':"lit_9723",'name':"@9723",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DD8,'size':4,'pad':0,'label':"lit_9724",'name':"@9724",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DDC,'size':4,'pad':0,'label':"lit_9725",'name':"@9725",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DE0,'size':4,'pad':0,'label':"lit_9726",'name':"@9726",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DE4,'size':4,'pad':0,'label':"lit_9727",'name':"@9727",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DE8,'size':4,'pad':0,'label':"lit_9728",'name':"@9728",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DEC,'size':4,'pad':0,'label':"lit_9779",'name':"@9779",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DF0,'size':4,'pad':0,'label':"lit_9780",'name':"@9780",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DF4,'size':4,'pad':0,'label':"lit_9781",'name':"@9781",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DF8,'size':4,'pad':0,'label':"lit_10273",'name':"@10273",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453DFC,'size':4,'pad':0,'label':"lit_10274",'name':"@10274",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E00,'size':4,'pad':0,'label':"lit_10483",'name':"@10483",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E04,'size':4,'pad':0,'label':"lit_10484",'name':"@10484",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E08,'size':4,'pad':0,'label':"lit_10485",'name':"@10485",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E0C,'size':4,'pad':0,'label':"lit_10486",'name':"@10486",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E10,'size':4,'pad':0,'label':"lit_10916",'name':"@10916",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E14,'size':4,'pad':0,'label':"lit_10917",'name':"@10917",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E18,'size':4,'pad':0,'label':"lit_10918",'name':"@10918",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E1C,'size':4,'pad':0,'label':"lit_10919",'name':"@10919",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E20,'size':4,'pad':0,'label':"lit_10920",'name':"@10920",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E24,'size':4,'pad':0,'label':"lit_10921",'name':"@10921",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E28,'size':4,'pad':0,'label':"lit_10922",'name':"@10922",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E2C,'size':4,'pad':0,'label':"lit_10923",'name':"@10923",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E30,'size':4,'pad':0,'label':"lit_10924",'name':"@10924",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E34,'size':4,'pad':0,'label':"lit_10925",'name':"@10925",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E38,'size':4,'pad':0,'label':"lit_10926",'name':"@10926",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E3C,'size':4,'pad':0,'label':"lit_10927",'name':"@10927",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E40,'size':4,'pad':0,'label':"lit_10928",'name':"@10928",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E44,'size':4,'pad':0,'label':"lit_10929",'name':"@10929",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E48,'size':4,'pad':0,'label':"lit_10930",'name':"@10930",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E4C,'size':4,'pad':0,'label':"lit_10931",'name':"@10931",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453C80,'size':8,'pad':0,'label':"lit_4964",'name':"@4964",'lib':0,'tu':164,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C88,'size':4,'pad':0,'label':"lit_5077",'name':"@5077",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C8C,'size':4,'pad':0,'label':"lit_5106",'name':"@5106",'lib':0,'tu':164,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C90,'size':4,'pad':0,'label':"lit_5191",'name':"@5191",'lib':0,'tu':164,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C94,'size':4,'pad':0,'label':"lit_5192",'name':"@5192",'lib':0,'tu':164,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C98,'size':4,'pad':0,'label':"lit_5193",'name':"@5193",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453C9C,'size':4,'pad':0,'label':"lit_5194",'name':"@5194",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CA0,'size':4,'pad':0,'label':"lit_5344",'name':"@5344",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CA4,'size':4,'pad':0,'label':"lit_5345",'name':"@5345",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CA8,'size':4,'pad':0,'label':"lit_5346",'name':"@5346",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CAC,'size':4,'pad':0,'label':"lit_5347",'name':"@5347",'lib':0,'tu':164,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CB0,'size':4,'pad':0,'label':"lit_5348",'name':"@5348",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CB4,'size':4,'pad':0,'label':"lit_5349",'name':"@5349",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CB8,'size':4,'pad':0,'label':"lit_5365",'name':"@5365",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CBC,'size':4,'pad':0,'label':"lit_5554",'name':"@5554",'lib':0,'tu':164,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CC0,'size':4,'pad':0,'label':"lit_5555",'name':"@5555",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CC4,'size':4,'pad':0,'label':"lit_5556",'name':"@5556",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CC8,'size':4,'pad':0,'label':"lit_5613",'name':"@5613",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CCC,'size':4,'pad':0,'label':"lit_5614",'name':"@5614",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CD0,'size':4,'pad':0,'label':"lit_5615",'name':"@5615",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CD4,'size':4,'pad':0,'label':"lit_5616",'name':"@5616",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CD8,'size':4,'pad':0,'label':"lit_5617",'name':"@5617",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CDC,'size':4,'pad':0,'label':"lit_5618",'name':"@5618",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CE0,'size':4,'pad':0,'label':"lit_5839",'name':"@5839",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CE4,'size':4,'pad':0,'label':"lit_5840",'name':"@5840",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CE8,'size':4,'pad':0,'label':"lit_6032",'name':"@6032",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CEC,'size':4,'pad':0,'label':"lit_6033",'name':"@6033",'lib':0,'tu':164,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CF0,'size':4,'pad':0,'label':"lit_6034",'name':"@6034",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CF4,'size':4,'pad':0,'label':"lit_6035",'name':"@6035",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CF8,'size':4,'pad':0,'label':"lit_6036",'name':"@6036",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453CFC,'size':4,'pad':0,'label':"lit_6037",'name':"@6037",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D00,'size':4,'pad':0,'label':"lit_6038",'name':"@6038",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D04,'size':4,'pad':0,'label':"lit_6039",'name':"@6039",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D08,'size':4,'pad':0,'label':"lit_6040",'name':"@6040",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D0C,'size':4,'pad':0,'label':"lit_6041",'name':"@6041",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D10,'size':4,'pad':0,'label':"lit_6042",'name':"@6042",'lib':0,'tu':164,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D14,'size':4,'pad':0,'label':"lit_6761",'name':"@6761",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D18,'size':4,'pad':0,'label':"lit_6762",'name':"@6762",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D1C,'size':4,'pad':0,'label':"lit_6763",'name':"@6763",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D20,'size':4,'pad':0,'label':"lit_6764",'name':"@6764",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D24,'size':4,'pad':0,'label':"lit_6765",'name':"@6765",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D28,'size':4,'pad':0,'label':"lit_6766",'name':"@6766",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D2C,'size':4,'pad':0,'label':"lit_6767",'name':"@6767",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D30,'size':4,'pad':0,'label':"lit_6768",'name':"@6768",'lib':0,'tu':164,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D34,'size':4,'pad':0,'label':"lit_6769",'name':"@6769",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D38,'size':4,'pad':0,'label':"lit_6770",'name':"@6770",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D3C,'size':4,'pad':0,'label':"lit_6771",'name':"@6771",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D40,'size':4,'pad':0,'label':"lit_6772",'name':"@6772",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D44,'size':4,'pad':0,'label':"lit_6773",'name':"@6773",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D48,'size':4,'pad':0,'label':"lit_6774",'name':"@6774",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D4C,'size':4,'pad':0,'label':"lit_7011",'name':"@7011",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D50,'size':4,'pad':0,'label':"lit_7012",'name':"@7012",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D54,'size':4,'pad':0,'label':"lit_7013",'name':"@7013",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D58,'size':4,'pad':0,'label':"lit_7014",'name':"@7014",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D5C,'size':4,'pad':0,'label':"lit_7015",'name':"@7015",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D60,'size':4,'pad':0,'label':"lit_7016",'name':"@7016",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D64,'size':4,'pad':0,'label':"lit_7017",'name':"@7017",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D68,'size':4,'pad':0,'label':"lit_7018",'name':"@7018",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D6C,'size':4,'pad':0,'label':"lit_7019",'name':"@7019",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D70,'size':4,'pad':0,'label':"lit_7020",'name':"@7020",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D74,'size':4,'pad':0,'label':"lit_7021",'name':"@7021",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D78,'size':4,'pad':0,'label':"lit_7022",'name':"@7022",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D7C,'size':4,'pad':0,'label':"lit_7023",'name':"@7023",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D80,'size':4,'pad':0,'label':"lit_7024",'name':"@7024",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D84,'size':4,'pad':0,'label':"lit_7025",'name':"@7025",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D88,'size':4,'pad':0,'label':"lit_7026",'name':"@7026",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D8C,'size':4,'pad':0,'label':"lit_7027",'name':"@7027",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D90,'size':4,'pad':0,'label':"lit_7186",'name':"@7186",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D94,'size':4,'pad':0,'label':"lit_7187",'name':"@7187",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D98,'size':4,'pad':0,'label':"lit_7365",'name':"@7365",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453D9C,'size':4,'pad':0,'label':"lit_7366",'name':"@7366",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DA0,'size':4,'pad':0,'label':"lit_7608",'name':"@7608",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DA4,'size':4,'pad':0,'label':"lit_7609",'name':"@7609",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DA8,'size':4,'pad':0,'label':"lit_8647",'name':"@8647",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DAC,'size':4,'pad':0,'label':"lit_8975",'name':"@8975",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DB0,'size':4,'pad':0,'label':"lit_9254",'name':"@9254",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DB4,'size':4,'pad':0,'label':"lit_9255",'name':"@9255",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DB8,'size':4,'pad':0,'label':"lit_9256",'name':"@9256",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DBC,'size':4,'pad':0,'label':"lit_9257",'name':"@9257",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DC0,'size':4,'pad':0,'label':"lit_9258",'name':"@9258",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DC4,'size':4,'pad':0,'label':"lit_9259",'name':"@9259",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DC8,'size':4,'pad':0,'label':"lit_9676",'name':"@9676",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DCC,'size':4,'pad':0,'label':"lit_9677",'name':"@9677",'lib':0,'tu':164,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DD0,'size':4,'pad':0,'label':"lit_9722",'name':"@9722",'lib':0,'tu':164,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DD4,'size':4,'pad':0,'label':"lit_9723",'name':"@9723",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DD8,'size':4,'pad':0,'label':"lit_9724",'name':"@9724",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DDC,'size':4,'pad':0,'label':"lit_9725",'name':"@9725",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DE0,'size':4,'pad':0,'label':"lit_9726",'name':"@9726",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DE4,'size':4,'pad':0,'label':"lit_9727",'name':"@9727",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DE8,'size':4,'pad':0,'label':"lit_9728",'name':"@9728",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DEC,'size':4,'pad':0,'label':"lit_9779",'name':"@9779",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DF0,'size':4,'pad':0,'label':"lit_9780",'name':"@9780",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DF4,'size':4,'pad':0,'label':"lit_9781",'name':"@9781",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DF8,'size':4,'pad':0,'label':"lit_10273",'name':"@10273",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453DFC,'size':4,'pad':0,'label':"lit_10274",'name':"@10274",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E00,'size':4,'pad':0,'label':"lit_10483",'name':"@10483",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E04,'size':4,'pad':0,'label':"lit_10484",'name':"@10484",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E08,'size':4,'pad':0,'label':"lit_10485",'name':"@10485",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E0C,'size':4,'pad':0,'label':"lit_10486",'name':"@10486",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E10,'size':4,'pad':0,'label':"lit_10916",'name':"@10916",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E14,'size':4,'pad':0,'label':"lit_10917",'name':"@10917",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E18,'size':4,'pad':0,'label':"lit_10918",'name':"@10918",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E1C,'size':4,'pad':0,'label':"lit_10919",'name':"@10919",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E20,'size':4,'pad':0,'label':"lit_10920",'name':"@10920",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E24,'size':4,'pad':0,'label':"lit_10921",'name':"@10921",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E28,'size':4,'pad':0,'label':"lit_10922",'name':"@10922",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E2C,'size':4,'pad':0,'label':"lit_10923",'name':"@10923",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E30,'size':4,'pad':0,'label':"lit_10924",'name':"@10924",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E34,'size':4,'pad':0,'label':"lit_10925",'name':"@10925",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E38,'size':4,'pad':0,'label':"lit_10926",'name':"@10926",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E3C,'size':4,'pad':0,'label':"lit_10927",'name':"@10927",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E40,'size':4,'pad':0,'label':"lit_10928",'name':"@10928",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E44,'size':4,'pad':0,'label':"lit_10929",'name':"@10929",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E48,'size':4,'pad':0,'label':"lit_10930",'name':"@10930",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E4C,'size':4,'pad':0,'label':"lit_10931",'name':"@10931",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453E50,'size':4,'pad':4,'label':"lit_10932",'name':"@10932",'lib':0,'tu':164,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453E58,'size':4,'pad':0,'label':"lit_3804",'name':"@3804",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453E5C,'size':4,'pad':0,'label':"lit_3805",'name':"@3805",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E60,'size':8,'pad':0,'label':"lit_3812",'name':"@3812",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453E68,'size':4,'pad':0,'label':"lit_3843",'name':"@3843",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E6C,'size':4,'pad':0,'label':"lit_3844",'name':"@3844",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453E5C,'size':4,'pad':0,'label':"lit_3805",'name':"@3805",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E60,'size':8,'pad':0,'label':"lit_3812",'name':"@3812",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E68,'size':4,'pad':0,'label':"lit_3843",'name':"@3843",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E6C,'size':4,'pad':0,'label':"lit_3844",'name':"@3844",'lib':0,'tu':165,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453E70,'size':4,'pad':0,'label':"lit_3882",'name':"@3882",'lib':0,'tu':167,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453E74,'size':4,'pad':0,'label':"lit_3883",'name':"@3883",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E78,'size':4,'pad':0,'label':"lit_3884",'name':"@3884",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E7C,'size':4,'pad':0,'label':"lit_3885",'name':"@3885",'lib':0,'tu':167,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E80,'size':4,'pad':0,'label':"lit_3923",'name':"@3923",'lib':0,'tu':167,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E84,'size':4,'pad':0,'label':"lit_3924",'name':"@3924",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E88,'size':4,'pad':0,'label':"lit_3925",'name':"@3925",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E8C,'size':4,'pad':0,'label':"lit_3926",'name':"@3926",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E90,'size':4,'pad':0,'label':"lit_3927",'name':"@3927",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E94,'size':4,'pad':0,'label':"lit_3928",'name':"@3928",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E98,'size':4,'pad':0,'label':"lit_3929",'name':"@3929",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453E9C,'size':4,'pad':0,'label':"lit_4079",'name':"@4079",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EA0,'size':4,'pad':0,'label':"lit_4080",'name':"@4080",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EA4,'size':4,'pad':0,'label':"lit_4081",'name':"@4081",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EA8,'size':4,'pad':0,'label':"lit_4082",'name':"@4082",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EAC,'size':4,'pad':0,'label':"lit_4083",'name':"@4083",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EB0,'size':4,'pad':0,'label':"lit_4084",'name':"@4084",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EB4,'size':4,'pad':0,'label':"lit_4085",'name':"@4085",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EB8,'size':4,'pad':0,'label':"lit_4086",'name':"@4086",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EBC,'size':4,'pad':0,'label':"lit_4087",'name':"@4087",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EC0,'size':4,'pad':0,'label':"lit_4088",'name':"@4088",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EC4,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453E74,'size':4,'pad':0,'label':"lit_3883",'name':"@3883",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E78,'size':4,'pad':0,'label':"lit_3884",'name':"@3884",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E7C,'size':4,'pad':0,'label':"lit_3885",'name':"@3885",'lib':0,'tu':167,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E80,'size':4,'pad':0,'label':"lit_3923",'name':"@3923",'lib':0,'tu':167,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E84,'size':4,'pad':0,'label':"lit_3924",'name':"@3924",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E88,'size':4,'pad':0,'label':"lit_3925",'name':"@3925",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E8C,'size':4,'pad':0,'label':"lit_3926",'name':"@3926",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E90,'size':4,'pad':0,'label':"lit_3927",'name':"@3927",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E94,'size':4,'pad':0,'label':"lit_3928",'name':"@3928",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E98,'size':4,'pad':0,'label':"lit_3929",'name':"@3929",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453E9C,'size':4,'pad':0,'label':"lit_4079",'name':"@4079",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EA0,'size':4,'pad':0,'label':"lit_4080",'name':"@4080",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EA4,'size':4,'pad':0,'label':"lit_4081",'name':"@4081",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EA8,'size':4,'pad':0,'label':"lit_4082",'name':"@4082",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EAC,'size':4,'pad':0,'label':"lit_4083",'name':"@4083",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EB0,'size':4,'pad':0,'label':"lit_4084",'name':"@4084",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EB4,'size':4,'pad':0,'label':"lit_4085",'name':"@4085",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EB8,'size':4,'pad':0,'label':"lit_4086",'name':"@4086",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EBC,'size':4,'pad':0,'label':"lit_4087",'name':"@4087",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EC0,'size':4,'pad':0,'label':"lit_4088",'name':"@4088",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EC4,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453EC8,'size':4,'pad':4,'label':"lit_4090",'name':"@4090",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453ED0,'size':8,'pad':0,'label':"lit_4091",'name':"@4091",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453ED8,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EDC,'size':4,'pad':0,'label':"lit_4093",'name':"@4093",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EE0,'size':4,'pad':0,'label':"lit_4094",'name':"@4094",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EE4,'size':4,'pad':0,'label':"lit_4095",'name':"@4095",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EE8,'size':4,'pad':0,'label':"lit_4096",'name':"@4096",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EEC,'size':4,'pad':0,'label':"lit_4097",'name':"@4097",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EF0,'size':4,'pad':0,'label':"lit_4098",'name':"@4098",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453EF4,'size':4,'pad':0,'label':"lit_4099",'name':"@4099",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453ED0,'size':8,'pad':0,'label':"lit_4091",'name':"@4091",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453ED8,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EDC,'size':4,'pad':0,'label':"lit_4093",'name':"@4093",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EE0,'size':4,'pad':0,'label':"lit_4094",'name':"@4094",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EE4,'size':4,'pad':0,'label':"lit_4095",'name':"@4095",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EE8,'size':4,'pad':0,'label':"lit_4096",'name':"@4096",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EEC,'size':4,'pad':0,'label':"lit_4097",'name':"@4097",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EF0,'size':4,'pad':0,'label':"lit_4098",'name':"@4098",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453EF4,'size':4,'pad':0,'label':"lit_4099",'name':"@4099",'lib':0,'tu':167,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453EF8,'size':4,'pad':4,'label':"lit_3759",'name':"@3759",'lib':0,'tu':168,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453F00,'size':8,'pad':0,'label':"lit_3761",'name':"@3761",'lib':0,'tu':168,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453F08,'size':4,'pad':4,'label':"lit_3776",'name':"@3776",'lib':0,'tu':168,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453F00,'size':8,'pad':0,'label':"lit_3761",'name':"@3761",'lib':0,'tu':168,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F08,'size':4,'pad':4,'label':"lit_3776",'name':"@3776",'lib':0,'tu':168,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453F10,'size':4,'pad':0,'label':"lit_3847",'name':"@3847",'lib':0,'tu':169,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453F14,'size':4,'pad':0,'label':"lit_3885",'name':"@3885",'lib':0,'tu':169,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F18,'size':8,'pad':0,'label':"lit_3887",'name':"@3887",'lib':0,'tu':169,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453F14,'size':4,'pad':0,'label':"lit_3885",'name':"@3885",'lib':0,'tu':169,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F18,'size':8,'pad':0,'label':"lit_3887",'name':"@3887",'lib':0,'tu':169,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453F20,'size':4,'pad':4,'label':"lit_3911",'name':"@3911",'lib':0,'tu':169,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453F28,'size':4,'pad':0,'label':"lit_4481",'name':"@4481",'lib':0,'tu':170,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453F2C,'size':4,'pad':0,'label':"lit_4482",'name':"@4482",'lib':0,'tu':170,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F30,'size':4,'pad':0,'label':"lit_5173",'name':"@5173",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F34,'size':4,'pad':0,'label':"lit_5174",'name':"@5174",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F38,'size':8,'pad':0,'label':"lit_5199",'name':"@5199",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453F40,'size':4,'pad':0,'label':"lit_5268",'name':"@5268",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F44,'size':4,'pad':0,'label':"lit_5269",'name':"@5269",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F48,'size':8,'pad':0,'label':"lit_5271",'name':"@5271",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453F2C,'size':4,'pad':0,'label':"lit_4482",'name':"@4482",'lib':0,'tu':170,'section':8,'r':[15,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F30,'size':4,'pad':0,'label':"lit_5173",'name':"@5173",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F34,'size':4,'pad':0,'label':"lit_5174",'name':"@5174",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F38,'size':8,'pad':0,'label':"lit_5199",'name':"@5199",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F40,'size':4,'pad':0,'label':"lit_5268",'name':"@5268",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F44,'size':4,'pad':0,'label':"lit_5269",'name':"@5269",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F48,'size':8,'pad':0,'label':"lit_5271",'name':"@5271",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453F50,'size':4,'pad':0,'label':"lit_5402",'name':"@5402",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80453F54,'size':4,'pad':0,'label':"data_80453F54",'name':None,'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80453F58,'size':4,'pad':0,'label':"lit_5403",'name':"@5403",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80453F5C,'size':4,'pad':0,'label':"data_80453F5C",'name':None,'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F60,'size':4,'pad':0,'label':"lit_5531",'name':"@5531",'lib':0,'tu':170,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F64,'size':4,'pad':0,'label':"lit_5611",'name':"@5611",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F68,'size':4,'pad':0,'label':"lit_5612",'name':"@5612",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F6C,'size':4,'pad':0,'label':"lit_5613",'name':"@5613",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F70,'size':4,'pad':0,'label':"lit_5614",'name':"@5614",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F74,'size':4,'pad':0,'label':"lit_5615",'name':"@5615",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F78,'size':4,'pad':0,'label':"lit_5616",'name':"@5616",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F7C,'size':4,'pad':0,'label':"lit_5617",'name':"@5617",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F80,'size':4,'pad':0,'label':"lit_7324",'name':"@7324",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F84,'size':4,'pad':0,'label':"lit_7325",'name':"@7325",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F88,'size':4,'pad':0,'label':"lit_7326",'name':"@7326",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F8C,'size':4,'pad':0,'label':"lit_7327",'name':"@7327",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F90,'size':4,'pad':0,'label':"lit_7328",'name':"@7328",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F94,'size':4,'pad':0,'label':"lit_7329",'name':"@7329",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F98,'size':4,'pad':0,'label':"lit_7330",'name':"@7330",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453F9C,'size':4,'pad':0,'label':"lit_7331",'name':"@7331",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FA0,'size':4,'pad':0,'label':"lit_7332",'name':"@7332",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FA4,'size':4,'pad':0,'label':"lit_7333",'name':"@7333",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FA8,'size':4,'pad':0,'label':"lit_7334",'name':"@7334",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FAC,'size':4,'pad':0,'label':"lit_7335",'name':"@7335",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FB0,'size':4,'pad':0,'label':"lit_7336",'name':"@7336",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FB4,'size':4,'pad':0,'label':"lit_7505",'name':"@7505",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FB8,'size':4,'pad':0,'label':"lit_7506",'name':"@7506",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FBC,'size':4,'pad':0,'label':"lit_7507",'name':"@7507",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FC0,'size':4,'pad':0,'label':"lit_7508",'name':"@7508",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FC4,'size':4,'pad':0,'label':"lit_7944",'name':"@7944",'lib':0,'tu':170,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FC8,'size':4,'pad':0,'label':"lit_7945",'name':"@7945",'lib':0,'tu':170,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FCC,'size':4,'pad':0,'label':"lit_7946",'name':"@7946",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FD0,'size':4,'pad':0,'label':"lit_7947",'name':"@7947",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FD4,'size':4,'pad':0,'label':"lit_7948",'name':"@7948",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453F60,'size':4,'pad':0,'label':"lit_5531",'name':"@5531",'lib':0,'tu':170,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F64,'size':4,'pad':0,'label':"lit_5611",'name':"@5611",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F68,'size':4,'pad':0,'label':"lit_5612",'name':"@5612",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F6C,'size':4,'pad':0,'label':"lit_5613",'name':"@5613",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F70,'size':4,'pad':0,'label':"lit_5614",'name':"@5614",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F74,'size':4,'pad':0,'label':"lit_5615",'name':"@5615",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F78,'size':4,'pad':0,'label':"lit_5616",'name':"@5616",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F7C,'size':4,'pad':0,'label':"lit_5617",'name':"@5617",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F80,'size':4,'pad':0,'label':"lit_7324",'name':"@7324",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F84,'size':4,'pad':0,'label':"lit_7325",'name':"@7325",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F88,'size':4,'pad':0,'label':"lit_7326",'name':"@7326",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F8C,'size':4,'pad':0,'label':"lit_7327",'name':"@7327",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F90,'size':4,'pad':0,'label':"lit_7328",'name':"@7328",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F94,'size':4,'pad':0,'label':"lit_7329",'name':"@7329",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F98,'size':4,'pad':0,'label':"lit_7330",'name':"@7330",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453F9C,'size':4,'pad':0,'label':"lit_7331",'name':"@7331",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FA0,'size':4,'pad':0,'label':"lit_7332",'name':"@7332",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FA4,'size':4,'pad':0,'label':"lit_7333",'name':"@7333",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FA8,'size':4,'pad':0,'label':"lit_7334",'name':"@7334",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FAC,'size':4,'pad':0,'label':"lit_7335",'name':"@7335",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FB0,'size':4,'pad':0,'label':"lit_7336",'name':"@7336",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FB4,'size':4,'pad':0,'label':"lit_7505",'name':"@7505",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FB8,'size':4,'pad':0,'label':"lit_7506",'name':"@7506",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FBC,'size':4,'pad':0,'label':"lit_7507",'name':"@7507",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FC0,'size':4,'pad':0,'label':"lit_7508",'name':"@7508",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FC4,'size':4,'pad':0,'label':"lit_7944",'name':"@7944",'lib':0,'tu':170,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FC8,'size':4,'pad':0,'label':"lit_7945",'name':"@7945",'lib':0,'tu':170,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FCC,'size':4,'pad':0,'label':"lit_7946",'name':"@7946",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FD0,'size':4,'pad':0,'label':"lit_7947",'name':"@7947",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FD4,'size':4,'pad':0,'label':"lit_7948",'name':"@7948",'lib':0,'tu':170,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453FD8,'size':4,'pad':4,'label':"lit_7949",'name':"@7949",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80453FE0,'size':8,'pad':0,'label':"lit_7963",'name':"@7963",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80453FE0,'size':8,'pad':0,'label':"lit_7963",'name':"@7963",'lib':0,'tu':170,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80453FE8,'size':4,'pad':0,'label':"lit_3962",'name':"@3962",'lib':0,'tu':171,'section':8,'r':[20,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80453FEC,'size':4,'pad':0,'label':"lit_3963",'name':"@3963",'lib':0,'tu':171,'section':8,'r':[26,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FF0,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FF4,'size':4,'pad':0,'label':"lit_4106",'name':"@4106",'lib':0,'tu':171,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80453FF8,'size':8,'pad':0,'label':"lit_4108",'name':"@4108",'lib':0,'tu':171,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454000,'size':4,'pad':0,'label':"lit_4133",'name':"@4133",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454004,'size':4,'pad':0,'label':"lit_4191",'name':"@4191",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454008,'size':4,'pad':0,'label':"lit_4192",'name':"@4192",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045400C,'size':4,'pad':0,'label':"lit_4249",'name':"@4249",'lib':0,'tu':171,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454010,'size':4,'pad':0,'label':"lit_4312",'name':"@4312",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454014,'size':4,'pad':0,'label':"lit_4313",'name':"@4313",'lib':0,'tu':171,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454018,'size':4,'pad':0,'label':"lit_4314",'name':"@4314",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045401C,'size':4,'pad':0,'label':"lit_4315",'name':"@4315",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454020,'size':4,'pad':0,'label':"lit_4643",'name':"@4643",'lib':0,'tu':171,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454024,'size':4,'pad':0,'label':"lit_4784",'name':"@4784",'lib':0,'tu':171,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454028,'size':4,'pad':0,'label':"lit_4785",'name':"@4785",'lib':0,'tu':171,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045402C,'size':4,'pad':0,'label':"lit_4786",'name':"@4786",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454030,'size':4,'pad':0,'label':"lit_4787",'name':"@4787",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454034,'size':4,'pad':0,'label':"lit_4788",'name':"@4788",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454038,'size':8,'pad':0,'label':"lit_4790",'name':"@4790",'lib':0,'tu':171,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454040,'size':4,'pad':0,'label':"lit_4848",'name':"@4848",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454044,'size':4,'pad':0,'label':"lit_4926",'name':"@4926",'lib':0,'tu':171,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454048,'size':4,'pad':0,'label':"lit_4927",'name':"@4927",'lib':0,'tu':171,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045404C,'size':4,'pad':0,'label':"lit_5277",'name':"@5277",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454050,'size':4,'pad':0,'label':"lit_5288",'name':"@5288",'lib':0,'tu':171,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454054,'size':4,'pad':0,'label':"lit_6017",'name':"@6017",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454058,'size':4,'pad':0,'label':"lit_6180",'name':"@6180",'lib':0,'tu':171,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045405C,'size':4,'pad':0,'label':"lit_6181",'name':"@6181",'lib':0,'tu':171,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80453FEC,'size':4,'pad':0,'label':"lit_3963",'name':"@3963",'lib':0,'tu':171,'section':8,'r':[26,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FF0,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FF4,'size':4,'pad':0,'label':"lit_4106",'name':"@4106",'lib':0,'tu':171,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80453FF8,'size':8,'pad':0,'label':"lit_4108",'name':"@4108",'lib':0,'tu':171,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454000,'size':4,'pad':0,'label':"lit_4133",'name':"@4133",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454004,'size':4,'pad':0,'label':"lit_4191",'name':"@4191",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454008,'size':4,'pad':0,'label':"lit_4192",'name':"@4192",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045400C,'size':4,'pad':0,'label':"lit_4249",'name':"@4249",'lib':0,'tu':171,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454010,'size':4,'pad':0,'label':"lit_4312",'name':"@4312",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454014,'size':4,'pad':0,'label':"lit_4313",'name':"@4313",'lib':0,'tu':171,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454018,'size':4,'pad':0,'label':"lit_4314",'name':"@4314",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045401C,'size':4,'pad':0,'label':"lit_4315",'name':"@4315",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454020,'size':4,'pad':0,'label':"lit_4643",'name':"@4643",'lib':0,'tu':171,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454024,'size':4,'pad':0,'label':"lit_4784",'name':"@4784",'lib':0,'tu':171,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454028,'size':4,'pad':0,'label':"lit_4785",'name':"@4785",'lib':0,'tu':171,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045402C,'size':4,'pad':0,'label':"lit_4786",'name':"@4786",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454030,'size':4,'pad':0,'label':"lit_4787",'name':"@4787",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454034,'size':4,'pad':0,'label':"lit_4788",'name':"@4788",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454038,'size':8,'pad':0,'label':"lit_4790",'name':"@4790",'lib':0,'tu':171,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454040,'size':4,'pad':0,'label':"lit_4848",'name':"@4848",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454044,'size':4,'pad':0,'label':"lit_4926",'name':"@4926",'lib':0,'tu':171,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454048,'size':4,'pad':0,'label':"lit_4927",'name':"@4927",'lib':0,'tu':171,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045404C,'size':4,'pad':0,'label':"lit_5277",'name':"@5277",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454050,'size':4,'pad':0,'label':"lit_5288",'name':"@5288",'lib':0,'tu':171,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454054,'size':4,'pad':0,'label':"lit_6017",'name':"@6017",'lib':0,'tu':171,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454058,'size':4,'pad':0,'label':"lit_6180",'name':"@6180",'lib':0,'tu':171,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045405C,'size':4,'pad':0,'label':"lit_6181",'name':"@6181",'lib':0,'tu':171,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454060,'size':4,'pad':0,'label':"lit_3803",'name':"@3803",'lib':0,'tu':172,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80454064,'size':5,'pad':3,'label':"l_lineWidthPatOff_3807",'name':"l_lineWidthPatOff$3807",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045406C,'size':5,'pad':3,'label':"l_lineWidthPatOn_3808",'name':"l_lineWidthPatOn$3808",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -25146,914 +25146,914 @@ SYMBOLS = [ {'addr':0x8045407C,'size':5,'pad':3,'label':"l_lineWidthPatOff_3820",'name':"l_lineWidthPatOff$3820",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80454084,'size':5,'pad':3,'label':"l_lineWidthPatOn_3821",'name':"l_lineWidthPatOn$3821",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045408C,'size':5,'pad':3,'label':"l_lineWidthPatStay_3822",'name':"l_lineWidthPatStay$3822",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454094,'size':4,'pad':0,'label':"lit_3837",'name':"@3837",'lib':0,'tu':172,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454094,'size':4,'pad':0,'label':"lit_3837",'name':"@3837",'lib':0,'tu':172,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454098,'size':4,'pad':4,'label':"lit_3946",'name':"@3946",'lib':0,'tu':172,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804540A0,'size':8,'pad':0,'label':"lit_3947",'name':"@3947",'lib':0,'tu':172,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804540A8,'size':8,'pad':0,'label':"lit_4168",'name':"@4168",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804540B0,'size':8,'pad':0,'label':"lit_4170",'name':"@4170",'lib':0,'tu':172,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804540B8,'size':4,'pad':0,'label':"lit_4245",'name':"@4245",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540BC,'size':4,'pad':0,'label':"lit_4277",'name':"@4277",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540C0,'size':4,'pad':0,'label':"lit_4278",'name':"@4278",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540C4,'size':4,'pad':0,'label':"lit_4395",'name':"@4395",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540C8,'size':4,'pad':0,'label':"lit_4460",'name':"@4460",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540CC,'size':4,'pad':0,'label':"lit_4461",'name':"@4461",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804540A0,'size':8,'pad':0,'label':"lit_3947",'name':"@3947",'lib':0,'tu':172,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540A8,'size':8,'pad':0,'label':"lit_4168",'name':"@4168",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540B0,'size':8,'pad':0,'label':"lit_4170",'name':"@4170",'lib':0,'tu':172,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540B8,'size':4,'pad':0,'label':"lit_4245",'name':"@4245",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540BC,'size':4,'pad':0,'label':"lit_4277",'name':"@4277",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540C0,'size':4,'pad':0,'label':"lit_4278",'name':"@4278",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540C4,'size':4,'pad':0,'label':"lit_4395",'name':"@4395",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540C8,'size':4,'pad':0,'label':"lit_4460",'name':"@4460",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540CC,'size':4,'pad':0,'label':"lit_4461",'name':"@4461",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804540D0,'size':4,'pad':4,'label':"lit_4462",'name':"@4462",'lib':0,'tu':172,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804540D8,'size':4,'pad':0,'label':"lit_3703",'name':"@3703",'lib':0,'tu':173,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804540DC,'size':4,'pad':0,'label':"lit_3882",'name':"@3882",'lib':0,'tu':173,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540E0,'size':4,'pad':0,'label':"lit_4010",'name':"@4010",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540E4,'size':4,'pad':0,'label':"lit_4011",'name':"@4011",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540E8,'size':4,'pad':0,'label':"lit_4012",'name':"@4012",'lib':0,'tu':173,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540EC,'size':4,'pad':0,'label':"lit_4013",'name':"@4013",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540F0,'size':4,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540F4,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804540F8,'size':8,'pad':0,'label':"lit_4119",'name':"@4119",'lib':0,'tu':173,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454100,'size':8,'pad':0,'label':"lit_4140",'name':"@4140",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804540DC,'size':4,'pad':0,'label':"lit_3882",'name':"@3882",'lib':0,'tu':173,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540E0,'size':4,'pad':0,'label':"lit_4010",'name':"@4010",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540E4,'size':4,'pad':0,'label':"lit_4011",'name':"@4011",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540E8,'size':4,'pad':0,'label':"lit_4012",'name':"@4012",'lib':0,'tu':173,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540EC,'size':4,'pad':0,'label':"lit_4013",'name':"@4013",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540F0,'size':4,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540F4,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804540F8,'size':8,'pad':0,'label':"lit_4119",'name':"@4119",'lib':0,'tu':173,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454100,'size':8,'pad':0,'label':"lit_4140",'name':"@4140",'lib':0,'tu':173,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454108,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':0,'tu':174,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045410C,'size':4,'pad':0,'label':"lit_3905",'name':"@3905",'lib':0,'tu':174,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454110,'size':4,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':174,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454114,'size':4,'pad':0,'label':"lit_4010",'name':"@4010",'lib':0,'tu':174,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454118,'size':8,'pad':0,'label':"lit_4012",'name':"@4012",'lib':0,'tu':174,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454120,'size':4,'pad':0,'label':"lit_3994",'name':"@3994",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454124,'size':4,'pad':0,'label':"lit_3995",'name':"@3995",'lib':0,'tu':175,'section':8,'r':[26,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045410C,'size':4,'pad':0,'label':"lit_3905",'name':"@3905",'lib':0,'tu':174,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454110,'size':4,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':174,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454114,'size':4,'pad':0,'label':"lit_4010",'name':"@4010",'lib':0,'tu':174,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454118,'size':8,'pad':0,'label':"lit_4012",'name':"@4012",'lib':0,'tu':174,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454120,'size':4,'pad':0,'label':"lit_3994",'name':"@3994",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454124,'size':4,'pad':0,'label':"lit_3995",'name':"@3995",'lib':0,'tu':175,'section':8,'r':[26,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454128,'size':4,'pad':0,'label':"lit_4158",'name':"@4158",'lib':0,'tu':175,'section':8,'r':[31,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045412C,'size':4,'pad':0,'label':"lit_4159",'name':"@4159",'lib':0,'tu':175,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454130,'size':4,'pad':0,'label':"lit_4160",'name':"@4160",'lib':0,'tu':175,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454134,'size':4,'pad':0,'label':"lit_4161",'name':"@4161",'lib':0,'tu':175,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454138,'size':4,'pad':0,'label':"lit_4162",'name':"@4162",'lib':0,'tu':175,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045413C,'size':4,'pad':0,'label':"lit_4353",'name':"@4353",'lib':0,'tu':175,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454140,'size':8,'pad':0,'label':"lit_4358",'name':"@4358",'lib':0,'tu':175,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454148,'size':4,'pad':0,'label':"lit_4397",'name':"@4397",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045414C,'size':4,'pad':0,'label':"lit_4398",'name':"@4398",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454150,'size':4,'pad':0,'label':"lit_4399",'name':"@4399",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454154,'size':4,'pad':0,'label':"lit_4541",'name':"@4541",'lib':0,'tu':175,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454158,'size':4,'pad':0,'label':"lit_4939",'name':"@4939",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045415C,'size':4,'pad':0,'label':"lit_4940",'name':"@4940",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454160,'size':4,'pad':0,'label':"lit_6855",'name':"@6855",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454164,'size':4,'pad':0,'label':"lit_6987",'name':"@6987",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454168,'size':4,'pad':0,'label':"lit_7300",'name':"@7300",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045416C,'size':4,'pad':0,'label':"lit_7348",'name':"@7348",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454170,'size':4,'pad':0,'label':"lit_7356",'name':"@7356",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454174,'size':4,'pad':0,'label':"lit_7357",'name':"@7357",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454178,'size':8,'pad':0,'label':"lit_3689",'name':"@3689",'lib':0,'tu':176,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x8045412C,'size':4,'pad':0,'label':"lit_4159",'name':"@4159",'lib':0,'tu':175,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454130,'size':4,'pad':0,'label':"lit_4160",'name':"@4160",'lib':0,'tu':175,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454134,'size':4,'pad':0,'label':"lit_4161",'name':"@4161",'lib':0,'tu':175,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454138,'size':4,'pad':0,'label':"lit_4162",'name':"@4162",'lib':0,'tu':175,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045413C,'size':4,'pad':0,'label':"lit_4353",'name':"@4353",'lib':0,'tu':175,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454140,'size':8,'pad':0,'label':"lit_4358",'name':"@4358",'lib':0,'tu':175,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454148,'size':4,'pad':0,'label':"lit_4397",'name':"@4397",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045414C,'size':4,'pad':0,'label':"lit_4398",'name':"@4398",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454150,'size':4,'pad':0,'label':"lit_4399",'name':"@4399",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454154,'size':4,'pad':0,'label':"lit_4541",'name':"@4541",'lib':0,'tu':175,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454158,'size':4,'pad':0,'label':"lit_4939",'name':"@4939",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045415C,'size':4,'pad':0,'label':"lit_4940",'name':"@4940",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454160,'size':4,'pad':0,'label':"lit_6855",'name':"@6855",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454164,'size':4,'pad':0,'label':"lit_6987",'name':"@6987",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454168,'size':4,'pad':0,'label':"lit_7300",'name':"@7300",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045416C,'size':4,'pad':0,'label':"lit_7348",'name':"@7348",'lib':0,'tu':175,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454170,'size':4,'pad':0,'label':"lit_7356",'name':"@7356",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454174,'size':4,'pad':0,'label':"lit_7357",'name':"@7357",'lib':0,'tu':175,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454178,'size':8,'pad':0,'label':"lit_3689",'name':"@3689",'lib':0,'tu':176,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454180,'size':4,'pad':0,'label':"lit_3703",'name':"@3703",'lib':0,'tu':176,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454184,'size':4,'pad':0,'label':"lit_3711",'name':"@3711",'lib':0,'tu':176,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454188,'size':4,'pad':0,'label':"lit_3769",'name':"@3769",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045418C,'size':4,'pad':0,'label':"lit_3770",'name':"@3770",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454190,'size':4,'pad':0,'label':"lit_3771",'name':"@3771",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454184,'size':4,'pad':0,'label':"lit_3711",'name':"@3711",'lib':0,'tu':176,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454188,'size':4,'pad':0,'label':"lit_3769",'name':"@3769",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045418C,'size':4,'pad':0,'label':"lit_3770",'name':"@3770",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454190,'size':4,'pad':0,'label':"lit_3771",'name':"@3771",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454194,'size':1,'pad':3,'label':"m_other__22dMfm_HIO_prm_res_src_s",'name':"m_other__22dMfm_HIO_prm_res_src_s",'lib':0,'tu':176,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454198,'size':4,'pad':0,'label':"lit_4104",'name':"@4104",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045419C,'size':4,'pad':0,'label':"lit_4105",'name':"@4105",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454198,'size':4,'pad':0,'label':"lit_4104",'name':"@4104",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045419C,'size':4,'pad':0,'label':"lit_4105",'name':"@4105",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804541A0,'size':4,'pad':4,'label':"lit_4106",'name':"@4106",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804541A8,'size':8,'pad':0,'label':"lit_4108",'name':"@4108",'lib':0,'tu':176,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804541A8,'size':8,'pad':0,'label':"lit_4108",'name':"@4108",'lib':0,'tu':176,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804541B0,'size':5,'pad':3,'label':"l_lineWidthPatData",'name':"l_lineWidthPatData$4134",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804541B8,'size':5,'pad':3,'label':"l_lineWidthPatData2",'name':"l_lineWidthPatData2$4135",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804541C0,'size':4,'pad':0,'label':"lit_4152",'name':"@4152",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804541C0,'size':4,'pad':0,'label':"lit_4152",'name':"@4152",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804541C4,'size':4,'pad':0,'label':"borderColor0",'name':"borderColor0$4169",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804541C8,'size':4,'pad':0,'label':"borderColor1",'name':"borderColor1$4170",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804541CC,'size':4,'pad':0,'label':"l_mapBaseColor",'name':"l_mapBaseColor$4181",'lib':0,'tu':176,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804541D0,'size':4,'pad':0,'label':"lit_3970",'name':"@3970",'lib':0,'tu':177,'section':8,'r':[21,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804541D4,'size':4,'pad':0,'label':"lit_3971",'name':"@3971",'lib':0,'tu':177,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541D8,'size':4,'pad':0,'label':"lit_3972",'name':"@3972",'lib':0,'tu':177,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541DC,'size':4,'pad':0,'label':"lit_4199",'name':"@4199",'lib':0,'tu':177,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541E0,'size':4,'pad':0,'label':"lit_4200",'name':"@4200",'lib':0,'tu':177,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541E4,'size':4,'pad':0,'label':"lit_4201",'name':"@4201",'lib':0,'tu':177,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541E8,'size':4,'pad':0,'label':"lit_4202",'name':"@4202",'lib':0,'tu':177,'section':8,'r':[18,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541EC,'size':4,'pad':0,'label':"lit_4203",'name':"@4203",'lib':0,'tu':177,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541F0,'size':4,'pad':0,'label':"lit_4204",'name':"@4204",'lib':0,'tu':177,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541F4,'size':4,'pad':0,'label':"lit_4205",'name':"@4205",'lib':0,'tu':177,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804541F8,'size':8,'pad':0,'label':"lit_4207",'name':"@4207",'lib':0,'tu':177,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804541D4,'size':4,'pad':0,'label':"lit_3971",'name':"@3971",'lib':0,'tu':177,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541D8,'size':4,'pad':0,'label':"lit_3972",'name':"@3972",'lib':0,'tu':177,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541DC,'size':4,'pad':0,'label':"lit_4199",'name':"@4199",'lib':0,'tu':177,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541E0,'size':4,'pad':0,'label':"lit_4200",'name':"@4200",'lib':0,'tu':177,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541E4,'size':4,'pad':0,'label':"lit_4201",'name':"@4201",'lib':0,'tu':177,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541E8,'size':4,'pad':0,'label':"lit_4202",'name':"@4202",'lib':0,'tu':177,'section':8,'r':[18,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541EC,'size':4,'pad':0,'label':"lit_4203",'name':"@4203",'lib':0,'tu':177,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541F0,'size':4,'pad':0,'label':"lit_4204",'name':"@4204",'lib':0,'tu':177,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541F4,'size':4,'pad':0,'label':"lit_4205",'name':"@4205",'lib':0,'tu':177,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804541F8,'size':8,'pad':0,'label':"lit_4207",'name':"@4207",'lib':0,'tu':177,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454200,'size':4,'pad':4,'label':"lit_4260",'name':"@4260",'lib':0,'tu':177,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454208,'size':8,'pad':0,'label':"lit_4496",'name':"@4496",'lib':0,'tu':177,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454210,'size':4,'pad':0,'label':"lit_5133",'name':"@5133",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454214,'size':4,'pad':0,'label':"lit_5134",'name':"@5134",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454218,'size':4,'pad':0,'label':"lit_5433",'name':"@5433",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045421C,'size':4,'pad':0,'label':"lit_5434",'name':"@5434",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454220,'size':4,'pad':0,'label':"lit_5568",'name':"@5568",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454224,'size':4,'pad':0,'label':"lit_5632",'name':"@5632",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454228,'size':4,'pad':0,'label':"lit_5633",'name':"@5633",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045422C,'size':4,'pad':0,'label':"lit_6309",'name':"@6309",'lib':0,'tu':177,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454208,'size':8,'pad':0,'label':"lit_4496",'name':"@4496",'lib':0,'tu':177,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454210,'size':4,'pad':0,'label':"lit_5133",'name':"@5133",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454214,'size':4,'pad':0,'label':"lit_5134",'name':"@5134",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454218,'size':4,'pad':0,'label':"lit_5433",'name':"@5433",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045421C,'size':4,'pad':0,'label':"lit_5434",'name':"@5434",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454220,'size':4,'pad':0,'label':"lit_5568",'name':"@5568",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454224,'size':4,'pad':0,'label':"lit_5632",'name':"@5632",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454228,'size':4,'pad':0,'label':"lit_5633",'name':"@5633",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045422C,'size':4,'pad':0,'label':"lit_6309",'name':"@6309",'lib':0,'tu':177,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454230,'size':4,'pad':4,'label':"lit_6325",'name':"@6325",'lib':0,'tu':177,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454238,'size':4,'pad':0,'label':"lit_3834",'name':"@3834",'lib':0,'tu':178,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045423C,'size':4,'pad':0,'label':"lit_3835",'name':"@3835",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454240,'size':4,'pad':0,'label':"lit_3836",'name':"@3836",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454238,'size':4,'pad':0,'label':"lit_3834",'name':"@3834",'lib':0,'tu':178,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045423C,'size':4,'pad':0,'label':"lit_3835",'name':"@3835",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454240,'size':4,'pad':0,'label':"lit_3836",'name':"@3836",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454244,'size':4,'pad':0,'label':"lit_3837",'name':"@3837",'lib':0,'tu':178,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454248,'size':4,'pad':0,'label':"lit_3961",'name':"@3961",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045424C,'size':4,'pad':0,'label':"lit_3962",'name':"@3962",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454250,'size':4,'pad':0,'label':"lit_3963",'name':"@3963",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454254,'size':4,'pad':0,'label':"lit_3964",'name':"@3964",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454248,'size':4,'pad':0,'label':"lit_3961",'name':"@3961",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045424C,'size':4,'pad':0,'label':"lit_3962",'name':"@3962",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454250,'size':4,'pad':0,'label':"lit_3963",'name':"@3963",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454254,'size':4,'pad':0,'label':"lit_3964",'name':"@3964",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454258,'size':4,'pad':4,'label':"lit_3965",'name':"@3965",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454260,'size':8,'pad':0,'label':"lit_4020",'name':"@4020",'lib':0,'tu':178,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454268,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':178,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045426C,'size':4,'pad':0,'label':"lit_4135",'name':"@4135",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454260,'size':8,'pad':0,'label':"lit_4020",'name':"@4020",'lib':0,'tu':178,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454268,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':178,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045426C,'size':4,'pad':0,'label':"lit_4135",'name':"@4135",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454270,'size':4,'pad':4,'label':"lit_4136",'name':"@4136",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454278,'size':8,'pad':0,'label':"lit_4138",'name':"@4138",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454278,'size':8,'pad':0,'label':"lit_4138",'name':"@4138",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454280,'size':4,'pad':4,'label':"lit_4474",'name':"@4474",'lib':0,'tu':178,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454288,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':0,'tu':179,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045428C,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':0,'tu':179,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454290,'size':4,'pad':0,'label':"lit_4064",'name':"@4064",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454294,'size':4,'pad':0,'label':"lit_4065",'name':"@4065",'lib':0,'tu':179,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045428C,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':0,'tu':179,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454290,'size':4,'pad':0,'label':"lit_4064",'name':"@4064",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454294,'size':4,'pad':0,'label':"lit_4065",'name':"@4065",'lib':0,'tu':179,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454298,'size':4,'pad':4,'label':"lit_4066",'name':"@4066",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804542A0,'size':8,'pad':0,'label':"lit_4068",'name':"@4068",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804542A8,'size':4,'pad':0,'label':"lit_4302",'name':"@4302",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542AC,'size':4,'pad':0,'label':"lit_4303",'name':"@4303",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542B0,'size':4,'pad':0,'label':"lit_4304",'name':"@4304",'lib':0,'tu':179,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542B4,'size':4,'pad':0,'label':"lit_4305",'name':"@4305",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542B8,'size':4,'pad':0,'label':"lit_4306",'name':"@4306",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542BC,'size':4,'pad':0,'label':"lit_4346",'name':"@4346",'lib':0,'tu':179,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542C0,'size':4,'pad':0,'label':"lit_4347",'name':"@4347",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542C4,'size':4,'pad':0,'label':"lit_4348",'name':"@4348",'lib':0,'tu':179,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542C8,'size':4,'pad':0,'label':"lit_4452",'name':"@4452",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542CC,'size':4,'pad':0,'label':"lit_4453",'name':"@4453",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542D0,'size':4,'pad':0,'label':"lit_4820",'name':"@4820",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542D4,'size':4,'pad':0,'label':"lit_4948",'name':"@4948",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542D8,'size':8,'pad':0,'label':"lit_4950",'name':"@4950",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804542A0,'size':8,'pad':0,'label':"lit_4068",'name':"@4068",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542A8,'size':4,'pad':0,'label':"lit_4302",'name':"@4302",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542AC,'size':4,'pad':0,'label':"lit_4303",'name':"@4303",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542B0,'size':4,'pad':0,'label':"lit_4304",'name':"@4304",'lib':0,'tu':179,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542B4,'size':4,'pad':0,'label':"lit_4305",'name':"@4305",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542B8,'size':4,'pad':0,'label':"lit_4306",'name':"@4306",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542BC,'size':4,'pad':0,'label':"lit_4346",'name':"@4346",'lib':0,'tu':179,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542C0,'size':4,'pad':0,'label':"lit_4347",'name':"@4347",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542C4,'size':4,'pad':0,'label':"lit_4348",'name':"@4348",'lib':0,'tu':179,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542C8,'size':4,'pad':0,'label':"lit_4452",'name':"@4452",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542CC,'size':4,'pad':0,'label':"lit_4453",'name':"@4453",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542D0,'size':4,'pad':0,'label':"lit_4820",'name':"@4820",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542D4,'size':4,'pad':0,'label':"lit_4948",'name':"@4948",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542D8,'size':8,'pad':0,'label':"lit_4950",'name':"@4950",'lib':0,'tu':179,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804542E0,'size':4,'pad':0,'label':"lit_3827",'name':"@3827",'lib':0,'tu':180,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804542E4,'size':4,'pad':0,'label':"lit_3828",'name':"@3828",'lib':0,'tu':180,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542E8,'size':4,'pad':0,'label':"lit_3964",'name':"@3964",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542EC,'size':4,'pad':0,'label':"lit_3965",'name':"@3965",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542F0,'size':4,'pad':0,'label':"lit_3966",'name':"@3966",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542F4,'size':4,'pad':0,'label':"lit_3967",'name':"@3967",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542F8,'size':4,'pad':0,'label':"lit_4054",'name':"@4054",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804542FC,'size':4,'pad':0,'label':"lit_4055",'name':"@4055",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804542E4,'size':4,'pad':0,'label':"lit_3828",'name':"@3828",'lib':0,'tu':180,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542E8,'size':4,'pad':0,'label':"lit_3964",'name':"@3964",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542EC,'size':4,'pad':0,'label':"lit_3965",'name':"@3965",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542F0,'size':4,'pad':0,'label':"lit_3966",'name':"@3966",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542F4,'size':4,'pad':0,'label':"lit_3967",'name':"@3967",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542F8,'size':4,'pad':0,'label':"lit_4054",'name':"@4054",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804542FC,'size':4,'pad':0,'label':"lit_4055",'name':"@4055",'lib':0,'tu':180,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454300,'size':4,'pad':4,'label':"lit_4056",'name':"@4056",'lib':0,'tu':180,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454308,'size':8,'pad':0,'label':"lit_4058",'name':"@4058",'lib':0,'tu':180,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454310,'size':8,'pad':0,'label':"lit_4171",'name':"@4171",'lib':0,'tu':180,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454318,'size':4,'pad':0,'label':"lit_4308",'name':"@4308",'lib':0,'tu':180,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045431C,'size':4,'pad':0,'label':"lit_4309",'name':"@4309",'lib':0,'tu':180,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454308,'size':8,'pad':0,'label':"lit_4058",'name':"@4058",'lib':0,'tu':180,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454310,'size':8,'pad':0,'label':"lit_4171",'name':"@4171",'lib':0,'tu':180,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454318,'size':4,'pad':0,'label':"lit_4308",'name':"@4308",'lib':0,'tu':180,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045431C,'size':4,'pad':0,'label':"lit_4309",'name':"@4309",'lib':0,'tu':180,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454320,'size':4,'pad':4,'label':"lit_4310",'name':"@4310",'lib':0,'tu':180,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454328,'size':2,'pad':2,'label':"l_msgNum2",'name':"l_msgNum2$3920",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045432C,'size':4,'pad':0,'label':"lit_4068",'name':"@4068",'lib':0,'tu':181,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454330,'size':4,'pad':0,'label':"lit_4069",'name':"@4069",'lib':0,'tu':181,'section':8,'r':[18,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454334,'size':4,'pad':0,'label':"lit_4442",'name':"@4442",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454330,'size':4,'pad':0,'label':"lit_4069",'name':"@4069",'lib':0,'tu':181,'section':8,'r':[18,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454334,'size':4,'pad':0,'label':"lit_4442",'name':"@4442",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454338,'size':4,'pad':4,'label':"lit_4443",'name':"@4443",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454340,'size':8,'pad':0,'label':"lit_4445",'name':"@4445",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454348,'size':4,'pad':0,'label':"lit_4469",'name':"@4469",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045434C,'size':4,'pad':0,'label':"lit_4470",'name':"@4470",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454350,'size':4,'pad':0,'label':"lit_4471",'name':"@4471",'lib':0,'tu':181,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454354,'size':4,'pad':0,'label':"lit_4472",'name':"@4472",'lib':0,'tu':181,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454358,'size':8,'pad':0,'label':"lit_4520",'name':"@4520",'lib':0,'tu':181,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454360,'size':4,'pad':0,'label':"lit_4862",'name':"@4862",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454364,'size':4,'pad':0,'label':"lit_4893",'name':"@4893",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454368,'size':4,'pad':0,'label':"lit_4894",'name':"@4894",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045436C,'size':4,'pad':0,'label':"lit_5026",'name':"@5026",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454370,'size':4,'pad':0,'label':"lit_5027",'name':"@5027",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454374,'size':4,'pad':0,'label':"lit_5028",'name':"@5028",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454378,'size':4,'pad':0,'label':"lit_6256",'name':"@6256",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045437C,'size':4,'pad':0,'label':"lit_6507",'name':"@6507",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454380,'size':4,'pad':0,'label':"lit_6508",'name':"@6508",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454384,'size':4,'pad':0,'label':"lit_6509",'name':"@6509",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454340,'size':8,'pad':0,'label':"lit_4445",'name':"@4445",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454348,'size':4,'pad':0,'label':"lit_4469",'name':"@4469",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045434C,'size':4,'pad':0,'label':"lit_4470",'name':"@4470",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454350,'size':4,'pad':0,'label':"lit_4471",'name':"@4471",'lib':0,'tu':181,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454354,'size':4,'pad':0,'label':"lit_4472",'name':"@4472",'lib':0,'tu':181,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454358,'size':8,'pad':0,'label':"lit_4520",'name':"@4520",'lib':0,'tu':181,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454360,'size':4,'pad':0,'label':"lit_4862",'name':"@4862",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454364,'size':4,'pad':0,'label':"lit_4893",'name':"@4893",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454368,'size':4,'pad':0,'label':"lit_4894",'name':"@4894",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045436C,'size':4,'pad':0,'label':"lit_5026",'name':"@5026",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454370,'size':4,'pad':0,'label':"lit_5027",'name':"@5027",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454374,'size':4,'pad':0,'label':"lit_5028",'name':"@5028",'lib':0,'tu':181,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454378,'size':4,'pad':0,'label':"lit_6256",'name':"@6256",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045437C,'size':4,'pad':0,'label':"lit_6507",'name':"@6507",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454380,'size':4,'pad':0,'label':"lit_6508",'name':"@6508",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454384,'size':4,'pad':0,'label':"lit_6509",'name':"@6509",'lib':0,'tu':181,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454388,'size':4,'pad':0,'label':"lit_4300",'name':"@4300",'lib':0,'tu':182,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045438C,'size':4,'pad':0,'label':"lit_4301",'name':"@4301",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454390,'size':4,'pad':0,'label':"lit_4302",'name':"@4302",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454394,'size':4,'pad':0,'label':"lit_4303",'name':"@4303",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454398,'size':4,'pad':0,'label':"lit_4304",'name':"@4304",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045439C,'size':4,'pad':0,'label':"lit_4305",'name':"@4305",'lib':0,'tu':182,'section':8,'r':[18,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543A0,'size':4,'pad':0,'label':"lit_4306",'name':"@4306",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543A4,'size':4,'pad':0,'label':"lit_4307",'name':"@4307",'lib':0,'tu':182,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543A8,'size':4,'pad':0,'label':"lit_4308",'name':"@4308",'lib':0,'tu':182,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543AC,'size':4,'pad':0,'label':"lit_4309",'name':"@4309",'lib':0,'tu':182,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045438C,'size':4,'pad':0,'label':"lit_4301",'name':"@4301",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454390,'size':4,'pad':0,'label':"lit_4302",'name':"@4302",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454394,'size':4,'pad':0,'label':"lit_4303",'name':"@4303",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454398,'size':4,'pad':0,'label':"lit_4304",'name':"@4304",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045439C,'size':4,'pad':0,'label':"lit_4305",'name':"@4305",'lib':0,'tu':182,'section':8,'r':[18,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543A0,'size':4,'pad':0,'label':"lit_4306",'name':"@4306",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543A4,'size':4,'pad':0,'label':"lit_4307",'name':"@4307",'lib':0,'tu':182,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543A8,'size':4,'pad':0,'label':"lit_4308",'name':"@4308",'lib':0,'tu':182,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543AC,'size':4,'pad':0,'label':"lit_4309",'name':"@4309",'lib':0,'tu':182,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804543B0,'size':4,'pad':4,'label':"lit_4310",'name':"@4310",'lib':0,'tu':182,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804543B8,'size':8,'pad':0,'label':"lit_4312",'name':"@4312",'lib':0,'tu':182,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804543B8,'size':8,'pad':0,'label':"lit_4312",'name':"@4312",'lib':0,'tu':182,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804543C0,'size':4,'pad':4,'label':"lit_4465",'name':"@4465",'lib':0,'tu':182,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804543C8,'size':8,'pad':0,'label':"lit_4596",'name':"@4596",'lib':0,'tu':182,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804543D0,'size':4,'pad':0,'label':"lit_4739",'name':"@4739",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543D4,'size':4,'pad':0,'label':"lit_4810",'name':"@4810",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543D8,'size':4,'pad':0,'label':"lit_4811",'name':"@4811",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804543C8,'size':8,'pad':0,'label':"lit_4596",'name':"@4596",'lib':0,'tu':182,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543D0,'size':4,'pad':0,'label':"lit_4739",'name':"@4739",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543D4,'size':4,'pad':0,'label':"lit_4810",'name':"@4810",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543D8,'size':4,'pad':0,'label':"lit_4811",'name':"@4811",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804543DC,'size':4,'pad':0,'label':"lit_5171",'name':"@5171",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543E0,'size':4,'pad':0,'label':"lit_5366",'name':"@5366",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543E4,'size':4,'pad':0,'label':"lit_5367",'name':"@5367",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543E8,'size':4,'pad':0,'label':"lit_5368",'name':"@5368",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543EC,'size':4,'pad':0,'label':"lit_5369",'name':"@5369",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543F0,'size':4,'pad':0,'label':"lit_5370",'name':"@5370",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543F4,'size':4,'pad':0,'label':"lit_5648",'name':"@5648",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804543F8,'size':8,'pad':0,'label':"lit_5649",'name':"@5649",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454400,'size':8,'pad':0,'label':"lit_5650",'name':"@5650",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804543E0,'size':4,'pad':0,'label':"lit_5366",'name':"@5366",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543E4,'size':4,'pad':0,'label':"lit_5367",'name':"@5367",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543E8,'size':4,'pad':0,'label':"lit_5368",'name':"@5368",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543EC,'size':4,'pad':0,'label':"lit_5369",'name':"@5369",'lib':0,'tu':182,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543F0,'size':4,'pad':0,'label':"lit_5370",'name':"@5370",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543F4,'size':4,'pad':0,'label':"lit_5648",'name':"@5648",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804543F8,'size':8,'pad':0,'label':"lit_5649",'name':"@5649",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454400,'size':8,'pad':0,'label':"lit_5650",'name':"@5650",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454408,'size':8,'pad':0,'label':"lit_5651",'name':"@5651",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454410,'size':4,'pad':0,'label':"lit_5683",'name':"@5683",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454414,'size':4,'pad':0,'label':"lit_5811",'name':"@5811",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454418,'size':4,'pad':0,'label':"lit_6143",'name':"@6143",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045441C,'size':4,'pad':0,'label':"lit_6308",'name':"@6308",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454420,'size':4,'pad':0,'label':"lit_6454",'name':"@6454",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454410,'size':4,'pad':0,'label':"lit_5683",'name':"@5683",'lib':0,'tu':182,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454414,'size':4,'pad':0,'label':"lit_5811",'name':"@5811",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454418,'size':4,'pad':0,'label':"lit_6143",'name':"@6143",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045441C,'size':4,'pad':0,'label':"lit_6308",'name':"@6308",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454420,'size':4,'pad':0,'label':"lit_6454",'name':"@6454",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454424,'size':8,'pad':0,'label':"i_nameID",'name':"i_nameID$6472",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045442C,'size':8,'pad':0,'label':"i_expID",'name':"i_expID$6473",'lib':0,'tu':182,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80454434,'size':4,'pad':0,'label':"pad_80454434",'name':None,'lib':0,'tu':182,'section':8,'r':[0,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454438,'size':4,'pad':0,'label':"lit_3849",'name':"@3849",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045443C,'size':4,'pad':0,'label':"lit_3850",'name':"@3850",'lib':0,'tu':183,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454440,'size':4,'pad':0,'label':"lit_4173",'name':"@4173",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454444,'size':4,'pad':0,'label':"lit_4174",'name':"@4174",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454438,'size':4,'pad':0,'label':"lit_3849",'name':"@3849",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045443C,'size':4,'pad':0,'label':"lit_3850",'name':"@3850",'lib':0,'tu':183,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454440,'size':4,'pad':0,'label':"lit_4173",'name':"@4173",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454444,'size':4,'pad':0,'label':"lit_4174",'name':"@4174",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454448,'size':4,'pad':0,'label':"lit_4175",'name':"@4175",'lib':0,'tu':183,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045444C,'size':4,'pad':0,'label':"lit_4176",'name':"@4176",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454450,'size':4,'pad':0,'label':"lit_4177",'name':"@4177",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454454,'size':4,'pad':0,'label':"lit_4178",'name':"@4178",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454458,'size':4,'pad':0,'label':"lit_4179",'name':"@4179",'lib':0,'tu':183,'section':8,'r':[20,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045445C,'size':4,'pad':0,'label':"lit_4180",'name':"@4180",'lib':0,'tu':183,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454460,'size':4,'pad':0,'label':"lit_4181",'name':"@4181",'lib':0,'tu':183,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454464,'size':4,'pad':0,'label':"lit_4182",'name':"@4182",'lib':0,'tu':183,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045444C,'size':4,'pad':0,'label':"lit_4176",'name':"@4176",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454450,'size':4,'pad':0,'label':"lit_4177",'name':"@4177",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454454,'size':4,'pad':0,'label':"lit_4178",'name':"@4178",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454458,'size':4,'pad':0,'label':"lit_4179",'name':"@4179",'lib':0,'tu':183,'section':8,'r':[20,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045445C,'size':4,'pad':0,'label':"lit_4180",'name':"@4180",'lib':0,'tu':183,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454460,'size':4,'pad':0,'label':"lit_4181",'name':"@4181",'lib':0,'tu':183,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454464,'size':4,'pad':0,'label':"lit_4182",'name':"@4182",'lib':0,'tu':183,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454468,'size':4,'pad':4,'label':"lit_4183",'name':"@4183",'lib':0,'tu':183,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454470,'size':8,'pad':0,'label':"lit_4185",'name':"@4185",'lib':0,'tu':183,'section':8,'r':[17,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454478,'size':4,'pad':0,'label':"lit_4879",'name':"@4879",'lib':0,'tu':183,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045447C,'size':4,'pad':0,'label':"lit_6327",'name':"@6327",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454470,'size':8,'pad':0,'label':"lit_4185",'name':"@4185",'lib':0,'tu':183,'section':8,'r':[17,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454478,'size':4,'pad':0,'label':"lit_4879",'name':"@4879",'lib':0,'tu':183,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045447C,'size':4,'pad':0,'label':"lit_6327",'name':"@6327",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454480,'size':4,'pad':4,'label':"lit_6328",'name':"@6328",'lib':0,'tu':183,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454488,'size':4,'pad':0,'label':"lit_3808",'name':"@3808",'lib':0,'tu':184,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045448C,'size':4,'pad':0,'label':"lit_3809",'name':"@3809",'lib':0,'tu':184,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454490,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454494,'size':4,'pad':0,'label':"lit_3905",'name':"@3905",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454498,'size':4,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045449C,'size':4,'pad':0,'label':"lit_3907",'name':"@3907",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544A0,'size':4,'pad':0,'label':"lit_3944",'name':"@3944",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544A4,'size':4,'pad':0,'label':"lit_3945",'name':"@3945",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045448C,'size':4,'pad':0,'label':"lit_3809",'name':"@3809",'lib':0,'tu':184,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454490,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454494,'size':4,'pad':0,'label':"lit_3905",'name':"@3905",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454498,'size':4,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045449C,'size':4,'pad':0,'label':"lit_3907",'name':"@3907",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544A0,'size':4,'pad':0,'label':"lit_3944",'name':"@3944",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544A4,'size':4,'pad':0,'label':"lit_3945",'name':"@3945",'lib':0,'tu':184,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804544A8,'size':4,'pad':4,'label':"lit_3946",'name':"@3946",'lib':0,'tu':184,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804544B0,'size':8,'pad':0,'label':"lit_4016",'name':"@4016",'lib':0,'tu':184,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804544B8,'size':8,'pad':0,'label':"lit_4104",'name':"@4104",'lib':0,'tu':184,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804544B0,'size':8,'pad':0,'label':"lit_4016",'name':"@4016",'lib':0,'tu':184,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544B8,'size':8,'pad':0,'label':"lit_4104",'name':"@4104",'lib':0,'tu':184,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804544C0,'size':4,'pad':0,'label':"lit_4152",'name':"@4152",'lib':0,'tu':186,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804544C4,'size':4,'pad':0,'label':"lit_4386",'name':"@4386",'lib':0,'tu':186,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544C8,'size':4,'pad':0,'label':"lit_4387",'name':"@4387",'lib':0,'tu':186,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544CC,'size':4,'pad':0,'label':"lit_6000",'name':"@6000",'lib':0,'tu':186,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544D0,'size':4,'pad':0,'label':"lit_6001",'name':"@6001",'lib':0,'tu':186,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544D4,'size':4,'pad':0,'label':"lit_6086",'name':"@6086",'lib':0,'tu':186,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804544C4,'size':4,'pad':0,'label':"lit_4386",'name':"@4386",'lib':0,'tu':186,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544C8,'size':4,'pad':0,'label':"lit_4387",'name':"@4387",'lib':0,'tu':186,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544CC,'size':4,'pad':0,'label':"lit_6000",'name':"@6000",'lib':0,'tu':186,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544D0,'size':4,'pad':0,'label':"lit_6001",'name':"@6001",'lib':0,'tu':186,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544D4,'size':4,'pad':0,'label':"lit_6086",'name':"@6086",'lib':0,'tu':186,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804544D8,'size':4,'pad':4,'label':"lit_6087",'name':"@6087",'lib':0,'tu':186,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804544E0,'size':4,'pad':0,'label':"lit_3787",'name':"@3787",'lib':0,'tu':187,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544E4,'size':4,'pad':0,'label':"lit_3788",'name':"@3788",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544E8,'size':4,'pad':0,'label':"lit_3789",'name':"@3789",'lib':0,'tu':187,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544EC,'size':4,'pad':0,'label':"lit_3790",'name':"@3790",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544F0,'size':4,'pad':0,'label':"lit_3791",'name':"@3791",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804544F4,'size':4,'pad':0,'label':"lit_3792",'name':"@3792",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804544E0,'size':4,'pad':0,'label':"lit_3787",'name':"@3787",'lib':0,'tu':187,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544E4,'size':4,'pad':0,'label':"lit_3788",'name':"@3788",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544E8,'size':4,'pad':0,'label':"lit_3789",'name':"@3789",'lib':0,'tu':187,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544EC,'size':4,'pad':0,'label':"lit_3790",'name':"@3790",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544F0,'size':4,'pad':0,'label':"lit_3791",'name':"@3791",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804544F4,'size':4,'pad':0,'label':"lit_3792",'name':"@3792",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804544F8,'size':4,'pad':0,'label':"lit_3793",'name':"@3793",'lib':0,'tu':187,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804544FC,'size':4,'pad':0,'label':"lit_3794",'name':"@3794",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454500,'size':4,'pad':0,'label':"lit_3795",'name':"@3795",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454504,'size':4,'pad':0,'label':"lit_3796",'name':"@3796",'lib':0,'tu':187,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454508,'size':4,'pad':0,'label':"lit_3797",'name':"@3797",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045450C,'size':4,'pad':0,'label':"lit_3798",'name':"@3798",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454510,'size':4,'pad':0,'label':"lit_3799",'name':"@3799",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454514,'size':4,'pad':0,'label':"lit_3800",'name':"@3800",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454518,'size':4,'pad':0,'label':"lit_3801",'name':"@3801",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045451C,'size':4,'pad':0,'label':"lit_3802",'name':"@3802",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454520,'size':4,'pad':0,'label':"lit_3828",'name':"@3828",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454524,'size':4,'pad':0,'label':"lit_3829",'name':"@3829",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454528,'size':4,'pad':0,'label':"lit_3830",'name':"@3830",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045452C,'size':4,'pad':0,'label':"lit_3831",'name':"@3831",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454530,'size':4,'pad':0,'label':"lit_3832",'name':"@3832",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454534,'size':4,'pad':0,'label':"lit_3867",'name':"@3867",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454538,'size':4,'pad':0,'label':"lit_3902",'name':"@3902",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045453C,'size':4,'pad':0,'label':"lit_3903",'name':"@3903",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454540,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454544,'size':4,'pad':0,'label':"lit_3905",'name':"@3905",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454548,'size':4,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045454C,'size':4,'pad':0,'label':"lit_3907",'name':"@3907",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454550,'size':4,'pad':0,'label':"lit_3912",'name':"@3912",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454554,'size':4,'pad':0,'label':"lit_3913",'name':"@3913",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454558,'size':4,'pad':0,'label':"lit_3914",'name':"@3914",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045455C,'size':4,'pad':0,'label':"lit_3915",'name':"@3915",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454560,'size':4,'pad':0,'label':"lit_3916",'name':"@3916",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454564,'size':4,'pad':0,'label':"lit_3921",'name':"@3921",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454568,'size':4,'pad':0,'label':"lit_3956",'name':"@3956",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045456C,'size':4,'pad':0,'label':"lit_3957",'name':"@3957",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454570,'size':4,'pad':0,'label':"lit_4028",'name':"@4028",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454574,'size':4,'pad':0,'label':"lit_4029",'name':"@4029",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454578,'size':4,'pad':0,'label':"lit_4030",'name':"@4030",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045457C,'size':4,'pad':0,'label':"lit_4031",'name':"@4031",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454580,'size':4,'pad':0,'label':"lit_4032",'name':"@4032",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454584,'size':4,'pad':0,'label':"lit_4033",'name':"@4033",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454588,'size':4,'pad':0,'label':"lit_4034",'name':"@4034",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045458C,'size':4,'pad':0,'label':"lit_4035",'name':"@4035",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454590,'size':4,'pad':0,'label':"lit_4036",'name':"@4036",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454594,'size':4,'pad':0,'label':"lit_4037",'name':"@4037",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454598,'size':4,'pad':0,'label':"lit_4038",'name':"@4038",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045459C,'size':4,'pad':0,'label':"lit_4039",'name':"@4039",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545A0,'size':4,'pad':0,'label':"lit_4040",'name':"@4040",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545A4,'size':4,'pad':0,'label':"lit_4041",'name':"@4041",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545A8,'size':4,'pad':0,'label':"lit_4042",'name':"@4042",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545AC,'size':4,'pad':0,'label':"lit_4071",'name':"@4071",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545B0,'size':4,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545B4,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545B8,'size':4,'pad':0,'label':"lit_4074",'name':"@4074",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545BC,'size':4,'pad':0,'label':"lit_4075",'name':"@4075",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545C0,'size':4,'pad':0,'label':"lit_4076",'name':"@4076",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545C4,'size':4,'pad':0,'label':"lit_4077",'name':"@4077",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545C8,'size':4,'pad':0,'label':"lit_4078",'name':"@4078",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545CC,'size':4,'pad':0,'label':"lit_4079",'name':"@4079",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545D0,'size':4,'pad':0,'label':"lit_4080",'name':"@4080",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545D4,'size':4,'pad':0,'label':"lit_4081",'name':"@4081",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545D8,'size':4,'pad':0,'label':"lit_4082",'name':"@4082",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545DC,'size':4,'pad':0,'label':"lit_4083",'name':"@4083",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545E0,'size':4,'pad':0,'label':"lit_4084",'name':"@4084",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545E4,'size':4,'pad':0,'label':"lit_4085",'name':"@4085",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545E8,'size':4,'pad':0,'label':"lit_4086",'name':"@4086",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545EC,'size':4,'pad':0,'label':"lit_4087",'name':"@4087",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545F0,'size':4,'pad':0,'label':"lit_4088",'name':"@4088",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545F4,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545F8,'size':4,'pad':0,'label':"lit_4090",'name':"@4090",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804545FC,'size':4,'pad':0,'label':"lit_4091",'name':"@4091",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454600,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454604,'size':4,'pad':0,'label':"lit_4093",'name':"@4093",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454608,'size':4,'pad':0,'label':"lit_4126",'name':"@4126",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045460C,'size':4,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454610,'size':4,'pad':0,'label':"lit_4128",'name':"@4128",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454614,'size':4,'pad':0,'label':"lit_4129",'name':"@4129",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454618,'size':4,'pad':0,'label':"lit_4130",'name':"@4130",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045461C,'size':4,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454620,'size':4,'pad':0,'label':"lit_4132",'name':"@4132",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454624,'size':4,'pad':0,'label':"lit_4257",'name':"@4257",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454628,'size':4,'pad':0,'label':"lit_4258",'name':"@4258",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045462C,'size':4,'pad':0,'label':"lit_4259",'name':"@4259",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454630,'size':4,'pad':0,'label':"lit_4260",'name':"@4260",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454634,'size':4,'pad':0,'label':"lit_4261",'name':"@4261",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454638,'size':4,'pad':0,'label':"lit_4262",'name':"@4262",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045463C,'size':4,'pad':0,'label':"lit_4263",'name':"@4263",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454640,'size':4,'pad':0,'label':"lit_4264",'name':"@4264",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454644,'size':4,'pad':0,'label':"lit_4265",'name':"@4265",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454648,'size':4,'pad':0,'label':"lit_4266",'name':"@4266",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045464C,'size':4,'pad':0,'label':"lit_4267",'name':"@4267",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454650,'size':4,'pad':0,'label':"lit_4268",'name':"@4268",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454654,'size':4,'pad':0,'label':"lit_4269",'name':"@4269",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454658,'size':4,'pad':0,'label':"lit_4270",'name':"@4270",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045465C,'size':4,'pad':0,'label':"lit_4271",'name':"@4271",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454660,'size':4,'pad':0,'label':"lit_4272",'name':"@4272",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454664,'size':4,'pad':0,'label':"lit_4273",'name':"@4273",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454668,'size':4,'pad':0,'label':"lit_4274",'name':"@4274",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045466C,'size':4,'pad':0,'label':"lit_4275",'name':"@4275",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454670,'size':4,'pad':0,'label':"lit_4276",'name':"@4276",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454674,'size':4,'pad':0,'label':"lit_4277",'name':"@4277",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454678,'size':4,'pad':0,'label':"lit_4278",'name':"@4278",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045467C,'size':4,'pad':0,'label':"lit_4279",'name':"@4279",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454680,'size':4,'pad':0,'label':"lit_4280",'name':"@4280",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454684,'size':4,'pad':0,'label':"lit_4281",'name':"@4281",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454688,'size':4,'pad':0,'label':"lit_4282",'name':"@4282",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045468C,'size':4,'pad':0,'label':"lit_4283",'name':"@4283",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454690,'size':4,'pad':0,'label':"lit_4284",'name':"@4284",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454694,'size':4,'pad':0,'label':"lit_4285",'name':"@4285",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454698,'size':4,'pad':0,'label':"lit_4286",'name':"@4286",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045469C,'size':4,'pad':0,'label':"lit_4287",'name':"@4287",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546A0,'size':4,'pad':0,'label':"lit_4288",'name':"@4288",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546A4,'size':4,'pad':0,'label':"lit_4289",'name':"@4289",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546A8,'size':4,'pad':0,'label':"lit_4290",'name':"@4290",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546AC,'size':4,'pad':0,'label':"lit_4334",'name':"@4334",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546B0,'size':4,'pad':0,'label':"lit_4335",'name':"@4335",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546B4,'size':4,'pad':0,'label':"lit_4336",'name':"@4336",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546B8,'size':4,'pad':0,'label':"lit_4337",'name':"@4337",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546BC,'size':4,'pad':0,'label':"lit_4338",'name':"@4338",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546C0,'size':4,'pad':0,'label':"lit_4339",'name':"@4339",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546C4,'size':4,'pad':0,'label':"lit_4340",'name':"@4340",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546C8,'size':4,'pad':0,'label':"lit_4341",'name':"@4341",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546CC,'size':4,'pad':0,'label':"lit_4342",'name':"@4342",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546D0,'size':4,'pad':0,'label':"lit_4343",'name':"@4343",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546D4,'size':4,'pad':0,'label':"lit_4344",'name':"@4344",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546D8,'size':4,'pad':0,'label':"lit_4345",'name':"@4345",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546DC,'size':4,'pad':0,'label':"lit_4346",'name':"@4346",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546E0,'size':4,'pad':0,'label':"lit_4347",'name':"@4347",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546E4,'size':4,'pad':0,'label':"lit_4357",'name':"@4357",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546E8,'size':4,'pad':0,'label':"lit_4358",'name':"@4358",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546EC,'size':4,'pad':0,'label':"lit_4359",'name':"@4359",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546F0,'size':4,'pad':0,'label':"lit_4360",'name':"@4360",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546F4,'size':4,'pad':0,'label':"lit_4416",'name':"@4416",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546F8,'size':4,'pad':0,'label':"lit_4417",'name':"@4417",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804546FC,'size':4,'pad':0,'label':"lit_4418",'name':"@4418",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454700,'size':4,'pad':0,'label':"lit_4419",'name':"@4419",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454704,'size':4,'pad':0,'label':"lit_4420",'name':"@4420",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454708,'size':4,'pad':0,'label':"lit_4421",'name':"@4421",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045470C,'size':4,'pad':0,'label':"lit_4422",'name':"@4422",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454710,'size':4,'pad':0,'label':"lit_4423",'name':"@4423",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454714,'size':4,'pad':0,'label':"lit_4424",'name':"@4424",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454718,'size':4,'pad':0,'label':"lit_4425",'name':"@4425",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045471C,'size':4,'pad':0,'label':"lit_4426",'name':"@4426",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454720,'size':4,'pad':0,'label':"lit_4427",'name':"@4427",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454724,'size':4,'pad':0,'label':"lit_4428",'name':"@4428",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454728,'size':4,'pad':0,'label':"lit_4429",'name':"@4429",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045472C,'size':4,'pad':0,'label':"lit_4430",'name':"@4430",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454730,'size':4,'pad':0,'label':"lit_4485",'name':"@4485",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454734,'size':4,'pad':0,'label':"lit_4486",'name':"@4486",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454738,'size':4,'pad':0,'label':"lit_4487",'name':"@4487",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045473C,'size':4,'pad':0,'label':"lit_4488",'name':"@4488",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804544FC,'size':4,'pad':0,'label':"lit_3794",'name':"@3794",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454500,'size':4,'pad':0,'label':"lit_3795",'name':"@3795",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454504,'size':4,'pad':0,'label':"lit_3796",'name':"@3796",'lib':0,'tu':187,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454508,'size':4,'pad':0,'label':"lit_3797",'name':"@3797",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045450C,'size':4,'pad':0,'label':"lit_3798",'name':"@3798",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454510,'size':4,'pad':0,'label':"lit_3799",'name':"@3799",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454514,'size':4,'pad':0,'label':"lit_3800",'name':"@3800",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454518,'size':4,'pad':0,'label':"lit_3801",'name':"@3801",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045451C,'size':4,'pad':0,'label':"lit_3802",'name':"@3802",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454520,'size':4,'pad':0,'label':"lit_3828",'name':"@3828",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454524,'size':4,'pad':0,'label':"lit_3829",'name':"@3829",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454528,'size':4,'pad':0,'label':"lit_3830",'name':"@3830",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045452C,'size':4,'pad':0,'label':"lit_3831",'name':"@3831",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454530,'size':4,'pad':0,'label':"lit_3832",'name':"@3832",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454534,'size':4,'pad':0,'label':"lit_3867",'name':"@3867",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454538,'size':4,'pad':0,'label':"lit_3902",'name':"@3902",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045453C,'size':4,'pad':0,'label':"lit_3903",'name':"@3903",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454540,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454544,'size':4,'pad':0,'label':"lit_3905",'name':"@3905",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454548,'size':4,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045454C,'size':4,'pad':0,'label':"lit_3907",'name':"@3907",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454550,'size':4,'pad':0,'label':"lit_3912",'name':"@3912",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454554,'size':4,'pad':0,'label':"lit_3913",'name':"@3913",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454558,'size':4,'pad':0,'label':"lit_3914",'name':"@3914",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045455C,'size':4,'pad':0,'label':"lit_3915",'name':"@3915",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454560,'size':4,'pad':0,'label':"lit_3916",'name':"@3916",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454564,'size':4,'pad':0,'label':"lit_3921",'name':"@3921",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454568,'size':4,'pad':0,'label':"lit_3956",'name':"@3956",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045456C,'size':4,'pad':0,'label':"lit_3957",'name':"@3957",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454570,'size':4,'pad':0,'label':"lit_4028",'name':"@4028",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454574,'size':4,'pad':0,'label':"lit_4029",'name':"@4029",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454578,'size':4,'pad':0,'label':"lit_4030",'name':"@4030",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045457C,'size':4,'pad':0,'label':"lit_4031",'name':"@4031",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454580,'size':4,'pad':0,'label':"lit_4032",'name':"@4032",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454584,'size':4,'pad':0,'label':"lit_4033",'name':"@4033",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454588,'size':4,'pad':0,'label':"lit_4034",'name':"@4034",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045458C,'size':4,'pad':0,'label':"lit_4035",'name':"@4035",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454590,'size':4,'pad':0,'label':"lit_4036",'name':"@4036",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454594,'size':4,'pad':0,'label':"lit_4037",'name':"@4037",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454598,'size':4,'pad':0,'label':"lit_4038",'name':"@4038",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045459C,'size':4,'pad':0,'label':"lit_4039",'name':"@4039",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545A0,'size':4,'pad':0,'label':"lit_4040",'name':"@4040",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545A4,'size':4,'pad':0,'label':"lit_4041",'name':"@4041",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545A8,'size':4,'pad':0,'label':"lit_4042",'name':"@4042",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545AC,'size':4,'pad':0,'label':"lit_4071",'name':"@4071",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545B0,'size':4,'pad':0,'label':"lit_4072",'name':"@4072",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545B4,'size':4,'pad':0,'label':"lit_4073",'name':"@4073",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545B8,'size':4,'pad':0,'label':"lit_4074",'name':"@4074",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545BC,'size':4,'pad':0,'label':"lit_4075",'name':"@4075",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545C0,'size':4,'pad':0,'label':"lit_4076",'name':"@4076",'lib':0,'tu':187,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545C4,'size':4,'pad':0,'label':"lit_4077",'name':"@4077",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545C8,'size':4,'pad':0,'label':"lit_4078",'name':"@4078",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545CC,'size':4,'pad':0,'label':"lit_4079",'name':"@4079",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545D0,'size':4,'pad':0,'label':"lit_4080",'name':"@4080",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545D4,'size':4,'pad':0,'label':"lit_4081",'name':"@4081",'lib':0,'tu':187,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545D8,'size':4,'pad':0,'label':"lit_4082",'name':"@4082",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545DC,'size':4,'pad':0,'label':"lit_4083",'name':"@4083",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545E0,'size':4,'pad':0,'label':"lit_4084",'name':"@4084",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545E4,'size':4,'pad':0,'label':"lit_4085",'name':"@4085",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545E8,'size':4,'pad':0,'label':"lit_4086",'name':"@4086",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545EC,'size':4,'pad':0,'label':"lit_4087",'name':"@4087",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545F0,'size':4,'pad':0,'label':"lit_4088",'name':"@4088",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545F4,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545F8,'size':4,'pad':0,'label':"lit_4090",'name':"@4090",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804545FC,'size':4,'pad':0,'label':"lit_4091",'name':"@4091",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454600,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454604,'size':4,'pad':0,'label':"lit_4093",'name':"@4093",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454608,'size':4,'pad':0,'label':"lit_4126",'name':"@4126",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045460C,'size':4,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454610,'size':4,'pad':0,'label':"lit_4128",'name':"@4128",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454614,'size':4,'pad':0,'label':"lit_4129",'name':"@4129",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454618,'size':4,'pad':0,'label':"lit_4130",'name':"@4130",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045461C,'size':4,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454620,'size':4,'pad':0,'label':"lit_4132",'name':"@4132",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454624,'size':4,'pad':0,'label':"lit_4257",'name':"@4257",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454628,'size':4,'pad':0,'label':"lit_4258",'name':"@4258",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045462C,'size':4,'pad':0,'label':"lit_4259",'name':"@4259",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454630,'size':4,'pad':0,'label':"lit_4260",'name':"@4260",'lib':0,'tu':187,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454634,'size':4,'pad':0,'label':"lit_4261",'name':"@4261",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454638,'size':4,'pad':0,'label':"lit_4262",'name':"@4262",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045463C,'size':4,'pad':0,'label':"lit_4263",'name':"@4263",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454640,'size':4,'pad':0,'label':"lit_4264",'name':"@4264",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454644,'size':4,'pad':0,'label':"lit_4265",'name':"@4265",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454648,'size':4,'pad':0,'label':"lit_4266",'name':"@4266",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045464C,'size':4,'pad':0,'label':"lit_4267",'name':"@4267",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454650,'size':4,'pad':0,'label':"lit_4268",'name':"@4268",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454654,'size':4,'pad':0,'label':"lit_4269",'name':"@4269",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454658,'size':4,'pad':0,'label':"lit_4270",'name':"@4270",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045465C,'size':4,'pad':0,'label':"lit_4271",'name':"@4271",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454660,'size':4,'pad':0,'label':"lit_4272",'name':"@4272",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454664,'size':4,'pad':0,'label':"lit_4273",'name':"@4273",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454668,'size':4,'pad':0,'label':"lit_4274",'name':"@4274",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045466C,'size':4,'pad':0,'label':"lit_4275",'name':"@4275",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454670,'size':4,'pad':0,'label':"lit_4276",'name':"@4276",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454674,'size':4,'pad':0,'label':"lit_4277",'name':"@4277",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454678,'size':4,'pad':0,'label':"lit_4278",'name':"@4278",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045467C,'size':4,'pad':0,'label':"lit_4279",'name':"@4279",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454680,'size':4,'pad':0,'label':"lit_4280",'name':"@4280",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454684,'size':4,'pad':0,'label':"lit_4281",'name':"@4281",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454688,'size':4,'pad':0,'label':"lit_4282",'name':"@4282",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045468C,'size':4,'pad':0,'label':"lit_4283",'name':"@4283",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454690,'size':4,'pad':0,'label':"lit_4284",'name':"@4284",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454694,'size':4,'pad':0,'label':"lit_4285",'name':"@4285",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454698,'size':4,'pad':0,'label':"lit_4286",'name':"@4286",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045469C,'size':4,'pad':0,'label':"lit_4287",'name':"@4287",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546A0,'size':4,'pad':0,'label':"lit_4288",'name':"@4288",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546A4,'size':4,'pad':0,'label':"lit_4289",'name':"@4289",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546A8,'size':4,'pad':0,'label':"lit_4290",'name':"@4290",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546AC,'size':4,'pad':0,'label':"lit_4334",'name':"@4334",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546B0,'size':4,'pad':0,'label':"lit_4335",'name':"@4335",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546B4,'size':4,'pad':0,'label':"lit_4336",'name':"@4336",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546B8,'size':4,'pad':0,'label':"lit_4337",'name':"@4337",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546BC,'size':4,'pad':0,'label':"lit_4338",'name':"@4338",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546C0,'size':4,'pad':0,'label':"lit_4339",'name':"@4339",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546C4,'size':4,'pad':0,'label':"lit_4340",'name':"@4340",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546C8,'size':4,'pad':0,'label':"lit_4341",'name':"@4341",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546CC,'size':4,'pad':0,'label':"lit_4342",'name':"@4342",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546D0,'size':4,'pad':0,'label':"lit_4343",'name':"@4343",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546D4,'size':4,'pad':0,'label':"lit_4344",'name':"@4344",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546D8,'size':4,'pad':0,'label':"lit_4345",'name':"@4345",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546DC,'size':4,'pad':0,'label':"lit_4346",'name':"@4346",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546E0,'size':4,'pad':0,'label':"lit_4347",'name':"@4347",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546E4,'size':4,'pad':0,'label':"lit_4357",'name':"@4357",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546E8,'size':4,'pad':0,'label':"lit_4358",'name':"@4358",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546EC,'size':4,'pad':0,'label':"lit_4359",'name':"@4359",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546F0,'size':4,'pad':0,'label':"lit_4360",'name':"@4360",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546F4,'size':4,'pad':0,'label':"lit_4416",'name':"@4416",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546F8,'size':4,'pad':0,'label':"lit_4417",'name':"@4417",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804546FC,'size':4,'pad':0,'label':"lit_4418",'name':"@4418",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454700,'size':4,'pad':0,'label':"lit_4419",'name':"@4419",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454704,'size':4,'pad':0,'label':"lit_4420",'name':"@4420",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454708,'size':4,'pad':0,'label':"lit_4421",'name':"@4421",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045470C,'size':4,'pad':0,'label':"lit_4422",'name':"@4422",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454710,'size':4,'pad':0,'label':"lit_4423",'name':"@4423",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454714,'size':4,'pad':0,'label':"lit_4424",'name':"@4424",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454718,'size':4,'pad':0,'label':"lit_4425",'name':"@4425",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045471C,'size':4,'pad':0,'label':"lit_4426",'name':"@4426",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454720,'size':4,'pad':0,'label':"lit_4427",'name':"@4427",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454724,'size':4,'pad':0,'label':"lit_4428",'name':"@4428",'lib':0,'tu':187,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454728,'size':4,'pad':0,'label':"lit_4429",'name':"@4429",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045472C,'size':4,'pad':0,'label':"lit_4430",'name':"@4430",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454730,'size':4,'pad':0,'label':"lit_4485",'name':"@4485",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454734,'size':4,'pad':0,'label':"lit_4486",'name':"@4486",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454738,'size':4,'pad':0,'label':"lit_4487",'name':"@4487",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045473C,'size':4,'pad':0,'label':"lit_4488",'name':"@4488",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454740,'size':4,'pad':4,'label':"lit_4489",'name':"@4489",'lib':0,'tu':187,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454748,'size':4,'pad':0,'label':"lit_4146",'name':"@4146",'lib':0,'tu':188,'section':8,'r':[36,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045474C,'size':4,'pad':0,'label':"lit_4147",'name':"@4147",'lib':0,'tu':188,'section':8,'r':[30,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454750,'size':4,'pad':0,'label':"lit_4148",'name':"@4148",'lib':0,'tu':188,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454754,'size':4,'pad':0,'label':"lit_4149",'name':"@4149",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454758,'size':4,'pad':0,'label':"lit_4513",'name':"@4513",'lib':0,'tu':188,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045475C,'size':4,'pad':0,'label':"lit_4514",'name':"@4514",'lib':0,'tu':188,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045474C,'size':4,'pad':0,'label':"lit_4147",'name':"@4147",'lib':0,'tu':188,'section':8,'r':[30,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454750,'size':4,'pad':0,'label':"lit_4148",'name':"@4148",'lib':0,'tu':188,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454754,'size':4,'pad':0,'label':"lit_4149",'name':"@4149",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454758,'size':4,'pad':0,'label':"lit_4513",'name':"@4513",'lib':0,'tu':188,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045475C,'size':4,'pad':0,'label':"lit_4514",'name':"@4514",'lib':0,'tu':188,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454760,'size':4,'pad':4,'label':"lit_4515",'name':"@4515",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454768,'size':8,'pad':0,'label':"lit_4517",'name':"@4517",'lib':0,'tu':188,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454770,'size':4,'pad':0,'label':"lit_5628",'name':"@5628",'lib':0,'tu':188,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454774,'size':4,'pad':0,'label':"lit_5629",'name':"@5629",'lib':0,'tu':188,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454778,'size':4,'pad':0,'label':"lit_5630",'name':"@5630",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045477C,'size':4,'pad':0,'label':"lit_5631",'name':"@5631",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454780,'size':4,'pad':0,'label':"lit_5632",'name':"@5632",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454784,'size':4,'pad':0,'label':"lit_5633",'name':"@5633",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454788,'size':4,'pad':0,'label':"lit_5634",'name':"@5634",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045478C,'size':4,'pad':0,'label':"lit_5635",'name':"@5635",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454790,'size':4,'pad':0,'label':"lit_5636",'name':"@5636",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454794,'size':4,'pad':0,'label':"lit_6012",'name':"@6012",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454798,'size':4,'pad':0,'label':"lit_6013",'name':"@6013",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045479C,'size':4,'pad':0,'label':"lit_6014",'name':"@6014",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547A0,'size':4,'pad':0,'label':"lit_6015",'name':"@6015",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547A4,'size':4,'pad':0,'label':"lit_6016",'name':"@6016",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547A8,'size':4,'pad':0,'label':"lit_6017",'name':"@6017",'lib':0,'tu':188,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547AC,'size':4,'pad':0,'label':"lit_7857",'name':"@7857",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454768,'size':8,'pad':0,'label':"lit_4517",'name':"@4517",'lib':0,'tu':188,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454770,'size':4,'pad':0,'label':"lit_5628",'name':"@5628",'lib':0,'tu':188,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454774,'size':4,'pad':0,'label':"lit_5629",'name':"@5629",'lib':0,'tu':188,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454778,'size':4,'pad':0,'label':"lit_5630",'name':"@5630",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045477C,'size':4,'pad':0,'label':"lit_5631",'name':"@5631",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454780,'size':4,'pad':0,'label':"lit_5632",'name':"@5632",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454784,'size':4,'pad':0,'label':"lit_5633",'name':"@5633",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454788,'size':4,'pad':0,'label':"lit_5634",'name':"@5634",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045478C,'size':4,'pad':0,'label':"lit_5635",'name':"@5635",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454790,'size':4,'pad':0,'label':"lit_5636",'name':"@5636",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454794,'size':4,'pad':0,'label':"lit_6012",'name':"@6012",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454798,'size':4,'pad':0,'label':"lit_6013",'name':"@6013",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045479C,'size':4,'pad':0,'label':"lit_6014",'name':"@6014",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547A0,'size':4,'pad':0,'label':"lit_6015",'name':"@6015",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547A4,'size':4,'pad':0,'label':"lit_6016",'name':"@6016",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547A8,'size':4,'pad':0,'label':"lit_6017",'name':"@6017",'lib':0,'tu':188,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547AC,'size':4,'pad':0,'label':"lit_7857",'name':"@7857",'lib':0,'tu':188,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804547B0,'size':4,'pad':0,'label':"lit_3742",'name':"@3742",'lib':0,'tu':189,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804547B4,'size':4,'pad':0,'label':"lit_3890",'name':"@3890",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547B8,'size':4,'pad':0,'label':"lit_3891",'name':"@3891",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547BC,'size':4,'pad':0,'label':"lit_3892",'name':"@3892",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547C0,'size':4,'pad':0,'label':"lit_3893",'name':"@3893",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547C4,'size':4,'pad':0,'label':"lit_3894",'name':"@3894",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547C8,'size':4,'pad':0,'label':"lit_3895",'name':"@3895",'lib':0,'tu':189,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547CC,'size':4,'pad':0,'label':"lit_3896",'name':"@3896",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547D0,'size':4,'pad':0,'label':"lit_3897",'name':"@3897",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547D4,'size':4,'pad':0,'label':"lit_3898",'name':"@3898",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547D8,'size':4,'pad':0,'label':"lit_3940",'name':"@3940",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547DC,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547E0,'size':4,'pad':0,'label':"lit_3942",'name':"@3942",'lib':0,'tu':189,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547E4,'size':4,'pad':0,'label':"lit_3943",'name':"@3943",'lib':0,'tu':189,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547E8,'size':4,'pad':0,'label':"lit_4116",'name':"@4116",'lib':0,'tu':189,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804547EC,'size':4,'pad':0,'label':"lit_4117",'name':"@4117",'lib':0,'tu':189,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804547B4,'size':4,'pad':0,'label':"lit_3890",'name':"@3890",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547B8,'size':4,'pad':0,'label':"lit_3891",'name':"@3891",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547BC,'size':4,'pad':0,'label':"lit_3892",'name':"@3892",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547C0,'size':4,'pad':0,'label':"lit_3893",'name':"@3893",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547C4,'size':4,'pad':0,'label':"lit_3894",'name':"@3894",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547C8,'size':4,'pad':0,'label':"lit_3895",'name':"@3895",'lib':0,'tu':189,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547CC,'size':4,'pad':0,'label':"lit_3896",'name':"@3896",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547D0,'size':4,'pad':0,'label':"lit_3897",'name':"@3897",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547D4,'size':4,'pad':0,'label':"lit_3898",'name':"@3898",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547D8,'size':4,'pad':0,'label':"lit_3940",'name':"@3940",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547DC,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':0,'tu':189,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547E0,'size':4,'pad':0,'label':"lit_3942",'name':"@3942",'lib':0,'tu':189,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547E4,'size':4,'pad':0,'label':"lit_3943",'name':"@3943",'lib':0,'tu':189,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547E8,'size':4,'pad':0,'label':"lit_4116",'name':"@4116",'lib':0,'tu':189,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804547EC,'size':4,'pad':0,'label':"lit_4117",'name':"@4117",'lib':0,'tu':189,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804547F0,'size':4,'pad':4,'label':"lit_4165",'name':"@4165",'lib':0,'tu':189,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804547F8,'size':8,'pad':0,'label':"lit_4189",'name':"@4189",'lib':0,'tu':189,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804547F8,'size':8,'pad':0,'label':"lit_4189",'name':"@4189",'lib':0,'tu':189,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454800,'size':4,'pad':0,'label':"lit_3793",'name':"@3793",'lib':0,'tu':190,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454804,'size':4,'pad':0,'label':"lit_3794",'name':"@3794",'lib':0,'tu':190,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454808,'size':4,'pad':0,'label':"lit_3936",'name':"@3936",'lib':0,'tu':190,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045480C,'size':4,'pad':0,'label':"lit_4094",'name':"@4094",'lib':0,'tu':190,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454810,'size':4,'pad':0,'label':"lit_4095",'name':"@4095",'lib':0,'tu':190,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454814,'size':4,'pad':0,'label':"lit_4096",'name':"@4096",'lib':0,'tu':190,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454818,'size':8,'pad':0,'label':"lit_4098",'name':"@4098",'lib':0,'tu':190,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454804,'size':4,'pad':0,'label':"lit_3794",'name':"@3794",'lib':0,'tu':190,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454808,'size':4,'pad':0,'label':"lit_3936",'name':"@3936",'lib':0,'tu':190,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045480C,'size':4,'pad':0,'label':"lit_4094",'name':"@4094",'lib':0,'tu':190,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454810,'size':4,'pad':0,'label':"lit_4095",'name':"@4095",'lib':0,'tu':190,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454814,'size':4,'pad':0,'label':"lit_4096",'name':"@4096",'lib':0,'tu':190,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454818,'size':8,'pad':0,'label':"lit_4098",'name':"@4098",'lib':0,'tu':190,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454820,'size':4,'pad':4,'label':"lit_4076",'name':"@4076",'lib':0,'tu':191,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454828,'size':8,'pad':0,'label':"lit_4100",'name':"@4100",'lib':0,'tu':191,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454828,'size':8,'pad':0,'label':"lit_4100",'name':"@4100",'lib':0,'tu':191,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454830,'size':4,'pad':0,'label':"lit_4128",'name':"@4128",'lib':0,'tu':191,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454834,'size':4,'pad':0,'label':"lit_4129",'name':"@4129",'lib':0,'tu':191,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454838,'size':8,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':191,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454840,'size':4,'pad':0,'label':"lit_4159",'name':"@4159",'lib':0,'tu':191,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454844,'size':4,'pad':0,'label':"lit_4515",'name':"@4515",'lib':0,'tu':191,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454848,'size':4,'pad':0,'label':"lit_3758",'name':"@3758",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045484C,'size':4,'pad':0,'label':"lit_3759",'name':"@3759",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454850,'size':4,'pad':0,'label':"lit_3760",'name':"@3760",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454854,'size':4,'pad':0,'label':"lit_3761",'name':"@3761",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454834,'size':4,'pad':0,'label':"lit_4129",'name':"@4129",'lib':0,'tu':191,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454838,'size':8,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':191,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454840,'size':4,'pad':0,'label':"lit_4159",'name':"@4159",'lib':0,'tu':191,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454844,'size':4,'pad':0,'label':"lit_4515",'name':"@4515",'lib':0,'tu':191,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454848,'size':4,'pad':0,'label':"lit_3758",'name':"@3758",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045484C,'size':4,'pad':0,'label':"lit_3759",'name':"@3759",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454850,'size':4,'pad':0,'label':"lit_3760",'name':"@3760",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454854,'size':4,'pad':0,'label':"lit_3761",'name':"@3761",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454858,'size':4,'pad':0,'label':"lit_3762",'name':"@3762",'lib':0,'tu':192,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045485C,'size':4,'pad':0,'label':"lit_3819",'name':"@3819",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454860,'size':4,'pad':0,'label':"lit_3820",'name':"@3820",'lib':0,'tu':192,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454864,'size':4,'pad':0,'label':"lit_3821",'name':"@3821",'lib':0,'tu':192,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045485C,'size':4,'pad':0,'label':"lit_3819",'name':"@3819",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454860,'size':4,'pad':0,'label':"lit_3820",'name':"@3820",'lib':0,'tu':192,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454864,'size':4,'pad':0,'label':"lit_3821",'name':"@3821",'lib':0,'tu':192,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454868,'size':4,'pad':4,'label':"lit_3822",'name':"@3822",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454870,'size':8,'pad':0,'label':"lit_3824",'name':"@3824",'lib':0,'tu':192,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454878,'size':4,'pad':0,'label':"lit_3866",'name':"@3866",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045487C,'size':4,'pad':0,'label':"lit_3979",'name':"@3979",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454870,'size':8,'pad':0,'label':"lit_3824",'name':"@3824",'lib':0,'tu':192,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454878,'size':4,'pad':0,'label':"lit_3866",'name':"@3866",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045487C,'size':4,'pad':0,'label':"lit_3979",'name':"@3979",'lib':0,'tu':192,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454880,'size':4,'pad':0,'label':"lit_4182",'name':"@4182",'lib':0,'tu':193,'section':8,'r':[38,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454884,'size':4,'pad':0,'label':"lit_4183",'name':"@4183",'lib':0,'tu':193,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454888,'size':4,'pad':0,'label':"lit_4184",'name':"@4184",'lib':0,'tu':193,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045488C,'size':4,'pad':0,'label':"lit_4185",'name':"@4185",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454890,'size':4,'pad':0,'label':"lit_4921",'name':"@4921",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454894,'size':4,'pad':0,'label':"lit_4922",'name':"@4922",'lib':0,'tu':193,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454884,'size':4,'pad':0,'label':"lit_4183",'name':"@4183",'lib':0,'tu':193,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454888,'size':4,'pad':0,'label':"lit_4184",'name':"@4184",'lib':0,'tu':193,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045488C,'size':4,'pad':0,'label':"lit_4185",'name':"@4185",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454890,'size':4,'pad':0,'label':"lit_4921",'name':"@4921",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454894,'size':4,'pad':0,'label':"lit_4922",'name':"@4922",'lib':0,'tu':193,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454898,'size':4,'pad':4,'label':"lit_4923",'name':"@4923",'lib':0,'tu':193,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804548A0,'size':8,'pad':0,'label':"lit_4925",'name':"@4925",'lib':0,'tu':193,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804548A8,'size':4,'pad':0,'label':"lit_5784",'name':"@5784",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548AC,'size':4,'pad':0,'label':"lit_5785",'name':"@5785",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548B0,'size':4,'pad':0,'label':"lit_5786",'name':"@5786",'lib':0,'tu':193,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548B4,'size':4,'pad':0,'label':"lit_6143",'name':"@6143",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548B8,'size':4,'pad':0,'label':"lit_6175",'name':"@6175",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548BC,'size':4,'pad':0,'label':"lit_6210",'name':"@6210",'lib':0,'tu':193,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548C0,'size':8,'pad':0,'label':"lit_6293",'name':"@6293",'lib':0,'tu':193,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804548C8,'size':4,'pad':0,'label':"lit_6524",'name':"@6524",'lib':0,'tu':193,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548CC,'size':4,'pad':0,'label':"lit_8207",'name':"@8207",'lib':0,'tu':193,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548D0,'size':4,'pad':0,'label':"lit_8359",'name':"@8359",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548D4,'size':4,'pad':0,'label':"lit_8360",'name':"@8360",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548D8,'size':4,'pad':0,'label':"lit_8548",'name':"@8548",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548DC,'size':4,'pad':0,'label':"lit_8549",'name':"@8549",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548E0,'size':4,'pad':0,'label':"lit_8774",'name':"@8774",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548E4,'size':4,'pad':0,'label':"lit_8775",'name':"@8775",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548E8,'size':4,'pad':0,'label':"lit_8992",'name':"@8992",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548EC,'size':4,'pad':0,'label':"lit_8993",'name':"@8993",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548F0,'size':4,'pad':0,'label':"lit_8994",'name':"@8994",'lib':0,'tu':193,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548F4,'size':4,'pad':0,'label':"lit_8995",'name':"@8995",'lib':0,'tu':193,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548F8,'size':4,'pad':0,'label':"lit_8996",'name':"@8996",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804548FC,'size':4,'pad':0,'label':"lit_8997",'name':"@8997",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454900,'size':4,'pad':0,'label':"lit_8998",'name':"@8998",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454904,'size':4,'pad':0,'label':"lit_8999",'name':"@8999",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454908,'size':4,'pad':0,'label':"lit_9000",'name':"@9000",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045490C,'size':4,'pad':0,'label':"lit_9001",'name':"@9001",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454910,'size':4,'pad':0,'label':"lit_9002",'name':"@9002",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454914,'size':4,'pad':0,'label':"lit_9003",'name':"@9003",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454918,'size':4,'pad':0,'label':"lit_9004",'name':"@9004",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045491C,'size':4,'pad':0,'label':"lit_9005",'name':"@9005",'lib':0,'tu':193,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454920,'size':4,'pad':0,'label':"lit_9006",'name':"@9006",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454924,'size':4,'pad':0,'label':"lit_9007",'name':"@9007",'lib':0,'tu':193,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454928,'size':4,'pad':0,'label':"lit_9025",'name':"@9025",'lib':0,'tu':193,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045492C,'size':4,'pad':0,'label':"lit_9026",'name':"@9026",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454930,'size':4,'pad':0,'label':"lit_9027",'name':"@9027",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454934,'size':4,'pad':0,'label':"lit_9028",'name':"@9028",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454938,'size':4,'pad':0,'label':"lit_9029",'name':"@9029",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045493C,'size':4,'pad':0,'label':"lit_9047",'name':"@9047",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454940,'size':4,'pad':0,'label':"lit_9048",'name':"@9048",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454944,'size':4,'pad':0,'label':"lit_9049",'name':"@9049",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454948,'size':4,'pad':0,'label':"lit_9050",'name':"@9050",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045494C,'size':4,'pad':0,'label':"lit_9051",'name':"@9051",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454950,'size':4,'pad':0,'label':"lit_9052",'name':"@9052",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454954,'size':4,'pad':0,'label':"lit_9089",'name':"@9089",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454958,'size':4,'pad':0,'label':"lit_9090",'name':"@9090",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045495C,'size':4,'pad':0,'label':"lit_9091",'name':"@9091",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454960,'size':4,'pad':0,'label':"lit_9092",'name':"@9092",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454964,'size':4,'pad':0,'label':"lit_9093",'name':"@9093",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454968,'size':4,'pad':0,'label':"lit_9094",'name':"@9094",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045496C,'size':4,'pad':0,'label':"lit_9095",'name':"@9095",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454970,'size':4,'pad':0,'label':"lit_9096",'name':"@9096",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454974,'size':4,'pad':0,'label':"lit_9097",'name':"@9097",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454978,'size':4,'pad':0,'label':"lit_9098",'name':"@9098",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045497C,'size':4,'pad':0,'label':"lit_9099",'name':"@9099",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454980,'size':4,'pad':0,'label':"lit_9100",'name':"@9100",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454984,'size':4,'pad':0,'label':"lit_9101",'name':"@9101",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454988,'size':4,'pad':0,'label':"lit_9102",'name':"@9102",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045498C,'size':4,'pad':0,'label':"lit_9103",'name':"@9103",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454990,'size':4,'pad':0,'label':"lit_9104",'name':"@9104",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454994,'size':4,'pad':0,'label':"lit_9105",'name':"@9105",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804548A0,'size':8,'pad':0,'label':"lit_4925",'name':"@4925",'lib':0,'tu':193,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548A8,'size':4,'pad':0,'label':"lit_5784",'name':"@5784",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548AC,'size':4,'pad':0,'label':"lit_5785",'name':"@5785",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548B0,'size':4,'pad':0,'label':"lit_5786",'name':"@5786",'lib':0,'tu':193,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548B4,'size':4,'pad':0,'label':"lit_6143",'name':"@6143",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548B8,'size':4,'pad':0,'label':"lit_6175",'name':"@6175",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548BC,'size':4,'pad':0,'label':"lit_6210",'name':"@6210",'lib':0,'tu':193,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548C0,'size':8,'pad':0,'label':"lit_6293",'name':"@6293",'lib':0,'tu':193,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548C8,'size':4,'pad':0,'label':"lit_6524",'name':"@6524",'lib':0,'tu':193,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548CC,'size':4,'pad':0,'label':"lit_8207",'name':"@8207",'lib':0,'tu':193,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548D0,'size':4,'pad':0,'label':"lit_8359",'name':"@8359",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548D4,'size':4,'pad':0,'label':"lit_8360",'name':"@8360",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548D8,'size':4,'pad':0,'label':"lit_8548",'name':"@8548",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548DC,'size':4,'pad':0,'label':"lit_8549",'name':"@8549",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548E0,'size':4,'pad':0,'label':"lit_8774",'name':"@8774",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548E4,'size':4,'pad':0,'label':"lit_8775",'name':"@8775",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548E8,'size':4,'pad':0,'label':"lit_8992",'name':"@8992",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548EC,'size':4,'pad':0,'label':"lit_8993",'name':"@8993",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548F0,'size':4,'pad':0,'label':"lit_8994",'name':"@8994",'lib':0,'tu':193,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548F4,'size':4,'pad':0,'label':"lit_8995",'name':"@8995",'lib':0,'tu':193,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548F8,'size':4,'pad':0,'label':"lit_8996",'name':"@8996",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804548FC,'size':4,'pad':0,'label':"lit_8997",'name':"@8997",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454900,'size':4,'pad':0,'label':"lit_8998",'name':"@8998",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454904,'size':4,'pad':0,'label':"lit_8999",'name':"@8999",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454908,'size':4,'pad':0,'label':"lit_9000",'name':"@9000",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045490C,'size':4,'pad':0,'label':"lit_9001",'name':"@9001",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454910,'size':4,'pad':0,'label':"lit_9002",'name':"@9002",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454914,'size':4,'pad':0,'label':"lit_9003",'name':"@9003",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454918,'size':4,'pad':0,'label':"lit_9004",'name':"@9004",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045491C,'size':4,'pad':0,'label':"lit_9005",'name':"@9005",'lib':0,'tu':193,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454920,'size':4,'pad':0,'label':"lit_9006",'name':"@9006",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454924,'size':4,'pad':0,'label':"lit_9007",'name':"@9007",'lib':0,'tu':193,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454928,'size':4,'pad':0,'label':"lit_9025",'name':"@9025",'lib':0,'tu':193,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045492C,'size':4,'pad':0,'label':"lit_9026",'name':"@9026",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454930,'size':4,'pad':0,'label':"lit_9027",'name':"@9027",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454934,'size':4,'pad':0,'label':"lit_9028",'name':"@9028",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454938,'size':4,'pad':0,'label':"lit_9029",'name':"@9029",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045493C,'size':4,'pad':0,'label':"lit_9047",'name':"@9047",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454940,'size':4,'pad':0,'label':"lit_9048",'name':"@9048",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454944,'size':4,'pad':0,'label':"lit_9049",'name':"@9049",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454948,'size':4,'pad':0,'label':"lit_9050",'name':"@9050",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045494C,'size':4,'pad':0,'label':"lit_9051",'name':"@9051",'lib':0,'tu':193,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454950,'size':4,'pad':0,'label':"lit_9052",'name':"@9052",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454954,'size':4,'pad':0,'label':"lit_9089",'name':"@9089",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454958,'size':4,'pad':0,'label':"lit_9090",'name':"@9090",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045495C,'size':4,'pad':0,'label':"lit_9091",'name':"@9091",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454960,'size':4,'pad':0,'label':"lit_9092",'name':"@9092",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454964,'size':4,'pad':0,'label':"lit_9093",'name':"@9093",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454968,'size':4,'pad':0,'label':"lit_9094",'name':"@9094",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045496C,'size':4,'pad':0,'label':"lit_9095",'name':"@9095",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454970,'size':4,'pad':0,'label':"lit_9096",'name':"@9096",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454974,'size':4,'pad':0,'label':"lit_9097",'name':"@9097",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454978,'size':4,'pad':0,'label':"lit_9098",'name':"@9098",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045497C,'size':4,'pad':0,'label':"lit_9099",'name':"@9099",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454980,'size':4,'pad':0,'label':"lit_9100",'name':"@9100",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454984,'size':4,'pad':0,'label':"lit_9101",'name':"@9101",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454988,'size':4,'pad':0,'label':"lit_9102",'name':"@9102",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045498C,'size':4,'pad':0,'label':"lit_9103",'name':"@9103",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454990,'size':4,'pad':0,'label':"lit_9104",'name':"@9104",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454994,'size':4,'pad':0,'label':"lit_9105",'name':"@9105",'lib':0,'tu':193,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454998,'size':4,'pad':0,'label':"lit_3916",'name':"@3916",'lib':0,'tu':194,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045499C,'size':4,'pad':0,'label':"lit_3917",'name':"@3917",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549A0,'size':4,'pad':0,'label':"lit_3918",'name':"@3918",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549A4,'size':4,'pad':0,'label':"lit_3919",'name':"@3919",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549A8,'size':4,'pad':0,'label':"lit_3920",'name':"@3920",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549AC,'size':4,'pad':0,'label':"lit_3921",'name':"@3921",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045499C,'size':4,'pad':0,'label':"lit_3917",'name':"@3917",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549A0,'size':4,'pad':0,'label':"lit_3918",'name':"@3918",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549A4,'size':4,'pad':0,'label':"lit_3919",'name':"@3919",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549A8,'size':4,'pad':0,'label':"lit_3920",'name':"@3920",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549AC,'size':4,'pad':0,'label':"lit_3921",'name':"@3921",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804549B0,'size':4,'pad':4,'label':"lit_3922",'name':"@3922",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804549B8,'size':8,'pad':0,'label':"lit_4108",'name':"@4108",'lib':0,'tu':194,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804549C0,'size':8,'pad':0,'label':"lit_5206",'name':"@5206",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804549B8,'size':8,'pad':0,'label':"lit_4108",'name':"@4108",'lib':0,'tu':194,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549C0,'size':8,'pad':0,'label':"lit_5206",'name':"@5206",'lib':0,'tu':194,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804549C8,'size':4,'pad':0,'label':"lit_4662",'name':"@4662",'lib':0,'tu':195,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804549CC,'size':4,'pad':0,'label':"lit_4663",'name':"@4663",'lib':0,'tu':195,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804549CC,'size':4,'pad':0,'label':"lit_4663",'name':"@4663",'lib':0,'tu':195,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804549D0,'size':4,'pad':4,'label':"lit_4837",'name':"@4837",'lib':0,'tu':195,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804549D8,'size':8,'pad':0,'label':"lit_5267",'name':"@5267",'lib':0,'tu':195,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804549E0,'size':8,'pad':0,'label':"lit_5268",'name':"@5268",'lib':0,'tu':195,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804549E8,'size':4,'pad':0,'label':"lit_5791",'name':"@5791",'lib':0,'tu':195,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549EC,'size':4,'pad':0,'label':"lit_5933",'name':"@5933",'lib':0,'tu':195,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549F0,'size':4,'pad':0,'label':"lit_6051",'name':"@6051",'lib':0,'tu':195,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549F4,'size':4,'pad':0,'label':"lit_6052",'name':"@6052",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549F8,'size':4,'pad':0,'label':"lit_6564",'name':"@6564",'lib':0,'tu':195,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804549FC,'size':4,'pad':0,'label':"lit_7509",'name':"@7509",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A00,'size':4,'pad':0,'label':"lit_7510",'name':"@7510",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A04,'size':4,'pad':0,'label':"lit_9090",'name':"@9090",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804549D8,'size':8,'pad':0,'label':"lit_5267",'name':"@5267",'lib':0,'tu':195,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549E0,'size':8,'pad':0,'label':"lit_5268",'name':"@5268",'lib':0,'tu':195,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549E8,'size':4,'pad':0,'label':"lit_5791",'name':"@5791",'lib':0,'tu':195,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549EC,'size':4,'pad':0,'label':"lit_5933",'name':"@5933",'lib':0,'tu':195,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549F0,'size':4,'pad':0,'label':"lit_6051",'name':"@6051",'lib':0,'tu':195,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549F4,'size':4,'pad':0,'label':"lit_6052",'name':"@6052",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549F8,'size':4,'pad':0,'label':"lit_6564",'name':"@6564",'lib':0,'tu':195,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804549FC,'size':4,'pad':0,'label':"lit_7509",'name':"@7509",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A00,'size':4,'pad':0,'label':"lit_7510",'name':"@7510",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A04,'size':4,'pad':0,'label':"lit_9090",'name':"@9090",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454A08,'size':4,'pad':4,'label':"lit_9091",'name':"@9091",'lib':0,'tu':195,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454A10,'size':4,'pad':0,'label':"lit_3748",'name':"@3748",'lib':0,'tu':196,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454A14,'size':4,'pad':0,'label':"lit_3749",'name':"@3749",'lib':0,'tu':196,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A18,'size':8,'pad':0,'label':"lit_4397",'name':"@4397",'lib':0,'tu':196,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454A20,'size':4,'pad':0,'label':"lit_4986",'name':"@4986",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A24,'size':4,'pad':0,'label':"lit_4987",'name':"@4987",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A28,'size':4,'pad':0,'label':"lit_4988",'name':"@4988",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A2C,'size':4,'pad':0,'label':"lit_4989",'name':"@4989",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A30,'size':4,'pad':0,'label':"lit_4990",'name':"@4990",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A34,'size':4,'pad':0,'label':"lit_4991",'name':"@4991",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A38,'size':4,'pad':0,'label':"lit_4992",'name':"@4992",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A3C,'size':4,'pad':0,'label':"lit_4993",'name':"@4993",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A40,'size':4,'pad':0,'label':"lit_4994",'name':"@4994",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A44,'size':4,'pad':0,'label':"lit_4995",'name':"@4995",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A48,'size':4,'pad':0,'label':"lit_4996",'name':"@4996",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A4C,'size':4,'pad':0,'label':"lit_4997",'name':"@4997",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A50,'size':8,'pad':0,'label':"lit_5001",'name':"@5001",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454A58,'size':4,'pad':0,'label':"lit_4025",'name':"@4025",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A5C,'size':4,'pad':0,'label':"lit_4026",'name':"@4026",'lib':0,'tu':197,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454A14,'size':4,'pad':0,'label':"lit_3749",'name':"@3749",'lib':0,'tu':196,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A18,'size':8,'pad':0,'label':"lit_4397",'name':"@4397",'lib':0,'tu':196,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A20,'size':4,'pad':0,'label':"lit_4986",'name':"@4986",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A24,'size':4,'pad':0,'label':"lit_4987",'name':"@4987",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A28,'size':4,'pad':0,'label':"lit_4988",'name':"@4988",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A2C,'size':4,'pad':0,'label':"lit_4989",'name':"@4989",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A30,'size':4,'pad':0,'label':"lit_4990",'name':"@4990",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A34,'size':4,'pad':0,'label':"lit_4991",'name':"@4991",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A38,'size':4,'pad':0,'label':"lit_4992",'name':"@4992",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A3C,'size':4,'pad':0,'label':"lit_4993",'name':"@4993",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A40,'size':4,'pad':0,'label':"lit_4994",'name':"@4994",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A44,'size':4,'pad':0,'label':"lit_4995",'name':"@4995",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A48,'size':4,'pad':0,'label':"lit_4996",'name':"@4996",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A4C,'size':4,'pad':0,'label':"lit_4997",'name':"@4997",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A50,'size':8,'pad':0,'label':"lit_5001",'name':"@5001",'lib':0,'tu':196,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A58,'size':4,'pad':0,'label':"lit_4025",'name':"@4025",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A5C,'size':4,'pad':0,'label':"lit_4026",'name':"@4026",'lib':0,'tu':197,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454A60,'size':4,'pad':0,'label':"lit_4027",'name':"@4027",'lib':0,'tu':197,'section':8,'r':[25,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454A64,'size':4,'pad':0,'label':"lit_4028",'name':"@4028",'lib':0,'tu':197,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454A64,'size':4,'pad':0,'label':"lit_4028",'name':"@4028",'lib':0,'tu':197,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454A68,'size':8,'pad':0,'label':"lit_4078",'name':"@4078",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454A70,'size':8,'pad':0,'label':"lit_4198",'name':"@4198",'lib':0,'tu':197,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454A78,'size':4,'pad':0,'label':"lit_4291",'name':"@4291",'lib':0,'tu':197,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A7C,'size':4,'pad':0,'label':"lit_5151",'name':"@5151",'lib':0,'tu':197,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A80,'size':8,'pad':0,'label':"lit_5154",'name':"@5154",'lib':0,'tu':197,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454A88,'size':4,'pad':0,'label':"lit_5490",'name':"@5490",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A8C,'size':4,'pad':0,'label':"lit_5491",'name':"@5491",'lib':0,'tu':197,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A90,'size':4,'pad':0,'label':"lit_6374",'name':"@6374",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454A94,'size':4,'pad':0,'label':"lit_6781",'name':"@6781",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454A70,'size':8,'pad':0,'label':"lit_4198",'name':"@4198",'lib':0,'tu':197,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A78,'size':4,'pad':0,'label':"lit_4291",'name':"@4291",'lib':0,'tu':197,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A7C,'size':4,'pad':0,'label':"lit_5151",'name':"@5151",'lib':0,'tu':197,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A80,'size':8,'pad':0,'label':"lit_5154",'name':"@5154",'lib':0,'tu':197,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A88,'size':4,'pad':0,'label':"lit_5490",'name':"@5490",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A8C,'size':4,'pad':0,'label':"lit_5491",'name':"@5491",'lib':0,'tu':197,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A90,'size':4,'pad':0,'label':"lit_6374",'name':"@6374",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454A94,'size':4,'pad':0,'label':"lit_6781",'name':"@6781",'lib':0,'tu':197,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454A98,'size':4,'pad':4,'label':"lit_7190",'name':"@7190",'lib':0,'tu':197,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454AA0,'size':4,'pad':0,'label':"lit_4076",'name':"@4076",'lib':0,'tu':198,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AA4,'size':4,'pad':0,'label':"lit_4077",'name':"@4077",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AA8,'size':4,'pad':0,'label':"lit_4078",'name':"@4078",'lib':0,'tu':198,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AAC,'size':4,'pad':0,'label':"lit_4079",'name':"@4079",'lib':0,'tu':198,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AB0,'size':4,'pad':0,'label':"lit_4080",'name':"@4080",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AB4,'size':4,'pad':0,'label':"lit_4081",'name':"@4081",'lib':0,'tu':198,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AB8,'size':4,'pad':0,'label':"lit_4082",'name':"@4082",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454AA0,'size':4,'pad':0,'label':"lit_4076",'name':"@4076",'lib':0,'tu':198,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AA4,'size':4,'pad':0,'label':"lit_4077",'name':"@4077",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AA8,'size':4,'pad':0,'label':"lit_4078",'name':"@4078",'lib':0,'tu':198,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AAC,'size':4,'pad':0,'label':"lit_4079",'name':"@4079",'lib':0,'tu':198,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AB0,'size':4,'pad':0,'label':"lit_4080",'name':"@4080",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AB4,'size':4,'pad':0,'label':"lit_4081",'name':"@4081",'lib':0,'tu':198,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AB8,'size':4,'pad':0,'label':"lit_4082",'name':"@4082",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454ABC,'size':4,'pad':0,'label':"lit_4083",'name':"@4083",'lib':0,'tu':198,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454AC0,'size':4,'pad':0,'label':"lit_4084",'name':"@4084",'lib':0,'tu':198,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AC4,'size':4,'pad':0,'label':"lit_4085",'name':"@4085",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AC8,'size':4,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454ACC,'size':4,'pad':0,'label':"lit_4128",'name':"@4128",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AD0,'size':4,'pad':0,'label':"lit_4129",'name':"@4129",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AD4,'size':4,'pad':0,'label':"lit_4130",'name':"@4130",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AD8,'size':4,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454ADC,'size':4,'pad':0,'label':"lit_4132",'name':"@4132",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AE0,'size':4,'pad':0,'label':"lit_4133",'name':"@4133",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AE4,'size':4,'pad':0,'label':"lit_4134",'name':"@4134",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AE8,'size':4,'pad':0,'label':"lit_4135",'name':"@4135",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AEC,'size':4,'pad':0,'label':"lit_4136",'name':"@4136",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AF0,'size':4,'pad':0,'label':"lit_4137",'name':"@4137",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AF4,'size':4,'pad':0,'label':"lit_4138",'name':"@4138",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AF8,'size':4,'pad':0,'label':"lit_4139",'name':"@4139",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454AFC,'size':4,'pad':0,'label':"lit_4140",'name':"@4140",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B00,'size':4,'pad':0,'label':"lit_4141",'name':"@4141",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B04,'size':4,'pad':0,'label':"lit_4142",'name':"@4142",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B08,'size':4,'pad':0,'label':"lit_4143",'name':"@4143",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B0C,'size':4,'pad':0,'label':"lit_4144",'name':"@4144",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B10,'size':4,'pad':0,'label':"lit_4145",'name':"@4145",'lib':0,'tu':198,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B14,'size':4,'pad':0,'label':"lit_4146",'name':"@4146",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454AC0,'size':4,'pad':0,'label':"lit_4084",'name':"@4084",'lib':0,'tu':198,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AC4,'size':4,'pad':0,'label':"lit_4085",'name':"@4085",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AC8,'size':4,'pad':0,'label':"lit_4127",'name':"@4127",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454ACC,'size':4,'pad':0,'label':"lit_4128",'name':"@4128",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AD0,'size':4,'pad':0,'label':"lit_4129",'name':"@4129",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AD4,'size':4,'pad':0,'label':"lit_4130",'name':"@4130",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AD8,'size':4,'pad':0,'label':"lit_4131",'name':"@4131",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454ADC,'size':4,'pad':0,'label':"lit_4132",'name':"@4132",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AE0,'size':4,'pad':0,'label':"lit_4133",'name':"@4133",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AE4,'size':4,'pad':0,'label':"lit_4134",'name':"@4134",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AE8,'size':4,'pad':0,'label':"lit_4135",'name':"@4135",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AEC,'size':4,'pad':0,'label':"lit_4136",'name':"@4136",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AF0,'size':4,'pad':0,'label':"lit_4137",'name':"@4137",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AF4,'size':4,'pad':0,'label':"lit_4138",'name':"@4138",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AF8,'size':4,'pad':0,'label':"lit_4139",'name':"@4139",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454AFC,'size':4,'pad':0,'label':"lit_4140",'name':"@4140",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B00,'size':4,'pad':0,'label':"lit_4141",'name':"@4141",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B04,'size':4,'pad':0,'label':"lit_4142",'name':"@4142",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B08,'size':4,'pad':0,'label':"lit_4143",'name':"@4143",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B0C,'size':4,'pad':0,'label':"lit_4144",'name':"@4144",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B10,'size':4,'pad':0,'label':"lit_4145",'name':"@4145",'lib':0,'tu':198,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B14,'size':4,'pad':0,'label':"lit_4146",'name':"@4146",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454B18,'size':4,'pad':4,'label':"lit_4147",'name':"@4147",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454B20,'size':8,'pad':0,'label':"lit_4965",'name':"@4965",'lib':0,'tu':198,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454B28,'size':4,'pad':0,'label':"lit_5044",'name':"@5044",'lib':0,'tu':198,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B2C,'size':4,'pad':0,'label':"lit_5947",'name':"@5947",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B30,'size':4,'pad':0,'label':"lit_5948",'name':"@5948",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B34,'size':4,'pad':0,'label':"lit_5949",'name':"@5949",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454B20,'size':8,'pad':0,'label':"lit_4965",'name':"@4965",'lib':0,'tu':198,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B28,'size':4,'pad':0,'label':"lit_5044",'name':"@5044",'lib':0,'tu':198,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B2C,'size':4,'pad':0,'label':"lit_5947",'name':"@5947",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B30,'size':4,'pad':0,'label':"lit_5948",'name':"@5948",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B34,'size':4,'pad':0,'label':"lit_5949",'name':"@5949",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454B38,'size':4,'pad':4,'label':"lit_5950",'name':"@5950",'lib':0,'tu':198,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454B40,'size':4,'pad':0,'label':"lit_3702",'name':"@3702",'lib':0,'tu':199,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B44,'size':4,'pad':0,'label':"lit_3703",'name':"@3703",'lib':0,'tu':199,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454B40,'size':4,'pad':0,'label':"lit_3702",'name':"@3702",'lib':0,'tu':199,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B44,'size':4,'pad':0,'label':"lit_3703",'name':"@3703",'lib':0,'tu':199,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454B48,'size':4,'pad':4,'label':"lit_3704",'name':"@3704",'lib':0,'tu':199,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454B50,'size':8,'pad':0,'label':"lit_3707",'name':"@3707",'lib':0,'tu':199,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454B50,'size':8,'pad':0,'label':"lit_3707",'name':"@3707",'lib':0,'tu':199,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454B58,'size':4,'pad':0,'label':"lit_3909",'name':"@3909",'lib':0,'tu':200,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454B5C,'size':4,'pad':0,'label':"lit_3910",'name':"@3910",'lib':0,'tu':200,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B60,'size':4,'pad':0,'label':"lit_3911",'name':"@3911",'lib':0,'tu':200,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B64,'size':4,'pad':0,'label':"lit_4154",'name':"@4154",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B68,'size':4,'pad':0,'label':"lit_4155",'name':"@4155",'lib':0,'tu':200,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B6C,'size':4,'pad':0,'label':"lit_4156",'name':"@4156",'lib':0,'tu':200,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B70,'size':4,'pad':0,'label':"lit_4157",'name':"@4157",'lib':0,'tu':200,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B74,'size':4,'pad':0,'label':"lit_4158",'name':"@4158",'lib':0,'tu':200,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B78,'size':8,'pad':0,'label':"lit_4345",'name':"@4345",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454B80,'size':4,'pad':0,'label':"lit_4434",'name':"@4434",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B84,'size':4,'pad':0,'label':"lit_4604",'name':"@4604",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B88,'size':4,'pad':0,'label':"lit_4605",'name':"@4605",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454B8C,'size':4,'pad':0,'label':"lit_4606",'name':"@4606",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454B5C,'size':4,'pad':0,'label':"lit_3910",'name':"@3910",'lib':0,'tu':200,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B60,'size':4,'pad':0,'label':"lit_3911",'name':"@3911",'lib':0,'tu':200,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B64,'size':4,'pad':0,'label':"lit_4154",'name':"@4154",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B68,'size':4,'pad':0,'label':"lit_4155",'name':"@4155",'lib':0,'tu':200,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B6C,'size':4,'pad':0,'label':"lit_4156",'name':"@4156",'lib':0,'tu':200,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B70,'size':4,'pad':0,'label':"lit_4157",'name':"@4157",'lib':0,'tu':200,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B74,'size':4,'pad':0,'label':"lit_4158",'name':"@4158",'lib':0,'tu':200,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B78,'size':8,'pad':0,'label':"lit_4345",'name':"@4345",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B80,'size':4,'pad':0,'label':"lit_4434",'name':"@4434",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B84,'size':4,'pad':0,'label':"lit_4604",'name':"@4604",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B88,'size':4,'pad':0,'label':"lit_4605",'name':"@4605",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454B8C,'size':4,'pad':0,'label':"lit_4606",'name':"@4606",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454B90,'size':4,'pad':4,'label':"lit_4607",'name':"@4607",'lib':0,'tu':200,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454B98,'size':4,'pad':0,'label':"lit_3662",'name':"@3662",'lib':0,'tu':201,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454B9C,'size':4,'pad':0,'label':"lit_3761",'name':"@3761",'lib':0,'tu':201,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BA0,'size':8,'pad':0,'label':"lit_3763",'name':"@3763",'lib':0,'tu':201,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454B9C,'size':4,'pad':0,'label':"lit_3761",'name':"@3761",'lib':0,'tu':201,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BA0,'size':8,'pad':0,'label':"lit_3763",'name':"@3763",'lib':0,'tu':201,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454BA8,'size':4,'pad':0,'label':"lit_3820",'name':"@3820",'lib':0,'tu':202,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454BAC,'size':4,'pad':0,'label':"lit_3821",'name':"@3821",'lib':0,'tu':202,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BB0,'size':4,'pad':0,'label':"lit_3854",'name':"@3854",'lib':0,'tu':203,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454BAC,'size':4,'pad':0,'label':"lit_3821",'name':"@3821",'lib':0,'tu':202,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BB0,'size':4,'pad':0,'label':"lit_3854",'name':"@3854",'lib':0,'tu':203,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454BB4,'size':4,'pad':0,'label':"lit_3916",'name':"@3916",'lib':0,'tu':203,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454BB8,'size':4,'pad':0,'label':"lit_3978",'name':"@3978",'lib':0,'tu':204,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BBC,'size':4,'pad':0,'label':"lit_3979",'name':"@3979",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454BB8,'size':4,'pad':0,'label':"lit_3978",'name':"@3978",'lib':0,'tu':204,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BBC,'size':4,'pad':0,'label':"lit_3979",'name':"@3979",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454BC0,'size':4,'pad':0,'label':"lit_3980",'name':"@3980",'lib':0,'tu':204,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454BC4,'size':4,'pad':0,'label':"lit_3981",'name':"@3981",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BC8,'size':4,'pad':0,'label':"lit_4078",'name':"@4078",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BCC,'size':4,'pad':0,'label':"lit_4120",'name':"@4120",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BD0,'size':4,'pad':0,'label':"lit_4121",'name':"@4121",'lib':0,'tu':204,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BD4,'size':4,'pad':0,'label':"lit_4122",'name':"@4122",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BD8,'size':4,'pad':0,'label':"lit_4123",'name':"@4123",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BDC,'size':4,'pad':0,'label':"lit_4124",'name':"@4124",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BE0,'size':4,'pad':0,'label':"lit_4211",'name':"@4211",'lib':0,'tu':204,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BE4,'size':4,'pad':0,'label':"lit_4230",'name':"@4230",'lib':0,'tu':204,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BE8,'size':4,'pad':0,'label':"lit_4294",'name':"@4294",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BEC,'size':4,'pad':0,'label':"lit_4414",'name':"@4414",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BF0,'size':8,'pad':0,'label':"lit_4416",'name':"@4416",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454BF8,'size':4,'pad':0,'label':"lit_4192",'name':"@4192",'lib':0,'tu':205,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454BFC,'size':4,'pad':0,'label':"lit_4193",'name':"@4193",'lib':0,'tu':205,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C00,'size':4,'pad':0,'label':"lit_4194",'name':"@4194",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454BC4,'size':4,'pad':0,'label':"lit_3981",'name':"@3981",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BC8,'size':4,'pad':0,'label':"lit_4078",'name':"@4078",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BCC,'size':4,'pad':0,'label':"lit_4120",'name':"@4120",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BD0,'size':4,'pad':0,'label':"lit_4121",'name':"@4121",'lib':0,'tu':204,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BD4,'size':4,'pad':0,'label':"lit_4122",'name':"@4122",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BD8,'size':4,'pad':0,'label':"lit_4123",'name':"@4123",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BDC,'size':4,'pad':0,'label':"lit_4124",'name':"@4124",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BE0,'size':4,'pad':0,'label':"lit_4211",'name':"@4211",'lib':0,'tu':204,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BE4,'size':4,'pad':0,'label':"lit_4230",'name':"@4230",'lib':0,'tu':204,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BE8,'size':4,'pad':0,'label':"lit_4294",'name':"@4294",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BEC,'size':4,'pad':0,'label':"lit_4414",'name':"@4414",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BF0,'size':8,'pad':0,'label':"lit_4416",'name':"@4416",'lib':0,'tu':204,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BF8,'size':4,'pad':0,'label':"lit_4192",'name':"@4192",'lib':0,'tu':205,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454BFC,'size':4,'pad':0,'label':"lit_4193",'name':"@4193",'lib':0,'tu':205,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C00,'size':4,'pad':0,'label':"lit_4194",'name':"@4194",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454C04,'size':4,'pad':0,'label':"lit_4195",'name':"@4195",'lib':0,'tu':205,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454C08,'size':4,'pad':0,'label':"lit_4196",'name':"@4196",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C0C,'size':4,'pad':0,'label':"lit_4197",'name':"@4197",'lib':0,'tu':205,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C10,'size':8,'pad':0,'label':"lit_4199",'name':"@4199",'lib':0,'tu':205,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454C18,'size':8,'pad':0,'label':"lit_4388",'name':"@4388",'lib':0,'tu':205,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454C20,'size':4,'pad':0,'label':"lit_4476",'name':"@4476",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C24,'size':4,'pad':0,'label':"lit_4477",'name':"@4477",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C28,'size':4,'pad':0,'label':"lit_4478",'name':"@4478",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C2C,'size':4,'pad':0,'label':"lit_4663",'name':"@4663",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C30,'size':4,'pad':0,'label':"lit_4664",'name':"@4664",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C34,'size':4,'pad':0,'label':"lit_4665",'name':"@4665",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C38,'size':4,'pad':0,'label':"lit_4666",'name':"@4666",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C3C,'size':4,'pad':0,'label':"lit_4667",'name':"@4667",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C40,'size':4,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C44,'size':4,'pad':0,'label':"lit_4669",'name':"@4669",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C48,'size':4,'pad':0,'label':"lit_4670",'name':"@4670",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C4C,'size':4,'pad':0,'label':"lit_4671",'name':"@4671",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454C08,'size':4,'pad':0,'label':"lit_4196",'name':"@4196",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C0C,'size':4,'pad':0,'label':"lit_4197",'name':"@4197",'lib':0,'tu':205,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C10,'size':8,'pad':0,'label':"lit_4199",'name':"@4199",'lib':0,'tu':205,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C18,'size':8,'pad':0,'label':"lit_4388",'name':"@4388",'lib':0,'tu':205,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C20,'size':4,'pad':0,'label':"lit_4476",'name':"@4476",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C24,'size':4,'pad':0,'label':"lit_4477",'name':"@4477",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C28,'size':4,'pad':0,'label':"lit_4478",'name':"@4478",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C2C,'size':4,'pad':0,'label':"lit_4663",'name':"@4663",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C30,'size':4,'pad':0,'label':"lit_4664",'name':"@4664",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C34,'size':4,'pad':0,'label':"lit_4665",'name':"@4665",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C38,'size':4,'pad':0,'label':"lit_4666",'name':"@4666",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C3C,'size':4,'pad':0,'label':"lit_4667",'name':"@4667",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C40,'size':4,'pad':0,'label':"lit_4668",'name':"@4668",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C44,'size':4,'pad':0,'label':"lit_4669",'name':"@4669",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C48,'size':4,'pad':0,'label':"lit_4670",'name':"@4670",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C4C,'size':4,'pad':0,'label':"lit_4671",'name':"@4671",'lib':0,'tu':205,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454C50,'size':4,'pad':0,'label':"lit_4427",'name':"@4427",'lib':0,'tu':206,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454C54,'size':4,'pad':0,'label':"lit_4428",'name':"@4428",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C58,'size':4,'pad':0,'label':"lit_4429",'name':"@4429",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C5C,'size':4,'pad':0,'label':"lit_4430",'name':"@4430",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454C54,'size':4,'pad':0,'label':"lit_4428",'name':"@4428",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C58,'size':4,'pad':0,'label':"lit_4429",'name':"@4429",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C5C,'size':4,'pad':0,'label':"lit_4430",'name':"@4430",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454C60,'size':4,'pad':4,'label':"lit_4431",'name':"@4431",'lib':0,'tu':206,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454C68,'size':8,'pad':0,'label':"lit_4434",'name':"@4434",'lib':0,'tu':206,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454C70,'size':4,'pad':0,'label':"lit_4561",'name':"@4561",'lib':0,'tu':206,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C74,'size':4,'pad':0,'label':"lit_4562",'name':"@4562",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454C68,'size':8,'pad':0,'label':"lit_4434",'name':"@4434",'lib':0,'tu':206,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C70,'size':4,'pad':0,'label':"lit_4561",'name':"@4561",'lib':0,'tu':206,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C74,'size':4,'pad':0,'label':"lit_4562",'name':"@4562",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454C78,'size':4,'pad':4,'label':"lit_4563",'name':"@4563",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454C80,'size':8,'pad':0,'label':"lit_4587",'name':"@4587",'lib':0,'tu':206,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454C88,'size':4,'pad':0,'label':"lit_4824",'name':"@4824",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C8C,'size':4,'pad':0,'label':"lit_4825",'name':"@4825",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C90,'size':4,'pad':0,'label':"lit_4826",'name':"@4826",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C94,'size':4,'pad':0,'label':"lit_4827",'name':"@4827",'lib':0,'tu':206,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C98,'size':4,'pad':0,'label':"lit_4828",'name':"@4828",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454C9C,'size':4,'pad':0,'label':"lit_4829",'name':"@4829",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454CA0,'size':4,'pad':0,'label':"lit_5203",'name':"@5203",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454CA4,'size':4,'pad':0,'label':"lit_5233",'name':"@5233",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454CA8,'size':4,'pad':0,'label':"lit_5234",'name':"@5234",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454CAC,'size':4,'pad':0,'label':"lit_5508",'name':"@5508",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454C80,'size':8,'pad':0,'label':"lit_4587",'name':"@4587",'lib':0,'tu':206,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C88,'size':4,'pad':0,'label':"lit_4824",'name':"@4824",'lib':0,'tu':206,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C8C,'size':4,'pad':0,'label':"lit_4825",'name':"@4825",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C90,'size':4,'pad':0,'label':"lit_4826",'name':"@4826",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C94,'size':4,'pad':0,'label':"lit_4827",'name':"@4827",'lib':0,'tu':206,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C98,'size':4,'pad':0,'label':"lit_4828",'name':"@4828",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454C9C,'size':4,'pad':0,'label':"lit_4829",'name':"@4829",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454CA0,'size':4,'pad':0,'label':"lit_5203",'name':"@5203",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454CA4,'size':4,'pad':0,'label':"lit_5233",'name':"@5233",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454CA8,'size':4,'pad':0,'label':"lit_5234",'name':"@5234",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454CAC,'size':4,'pad':0,'label':"lit_5508",'name':"@5508",'lib':0,'tu':206,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454CB0,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':0,'tu':207,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454CB4,'size':4,'pad':0,'label':"lit_3942",'name':"@3942",'lib':0,'tu':207,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454CB4,'size':4,'pad':0,'label':"lit_3942",'name':"@3942",'lib':0,'tu':207,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454CB8,'size':4,'pad':4,'label':"lit_4021",'name':"@4021",'lib':0,'tu':207,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454CC0,'size':4,'pad':0,'label':"lit_3944",'name':"@3944",'lib':0,'tu':208,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454CC4,'size':4,'pad':0,'label':"lit_3945",'name':"@3945",'lib':0,'tu':208,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454CC4,'size':4,'pad':0,'label':"lit_3945",'name':"@3945",'lib':0,'tu':208,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454CC8,'size':4,'pad':4,'label':"lit_3946",'name':"@3946",'lib':0,'tu':208,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454CD0,'size':8,'pad':0,'label':"lit_4033",'name':"@4033",'lib':0,'tu':208,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454CD0,'size':8,'pad':0,'label':"lit_4033",'name':"@4033",'lib':0,'tu':208,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454CD8,'size':4,'pad':0,'label':"lit_3808",'name':"@3808",'lib':0,'tu':209,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454CDC,'size':4,'pad':0,'label':"lit_3869",'name':"@3869",'lib':0,'tu':209,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454CE0,'size':8,'pad':0,'label':"lit_3871",'name':"@3871",'lib':0,'tu':209,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454CDC,'size':4,'pad':0,'label':"lit_3869",'name':"@3869",'lib':0,'tu':209,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454CE0,'size':8,'pad':0,'label':"lit_3871",'name':"@3871",'lib':0,'tu':209,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454CE8,'size':4,'pad':0,'label':"lit_3998",'name':"@3998",'lib':0,'tu':210,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454CEC,'size':4,'pad':0,'label':"lit_3999",'name':"@3999",'lib':0,'tu':210,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454CEC,'size':4,'pad':0,'label':"lit_3999",'name':"@3999",'lib':0,'tu':210,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454CF0,'size':4,'pad':4,'label':"lit_4000",'name':"@4000",'lib':0,'tu':210,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454CF8,'size':4,'pad':0,'label':"lit_3842",'name':"@3842",'lib':0,'tu':211,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454CFC,'size':4,'pad':0,'label':"lit_3877",'name':"@3877",'lib':0,'tu':211,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D00,'size':4,'pad':0,'label':"lit_4086",'name':"@4086",'lib':0,'tu':212,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454CFC,'size':4,'pad':0,'label':"lit_3877",'name':"@3877",'lib':0,'tu':211,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D00,'size':4,'pad':0,'label':"lit_4086",'name':"@4086",'lib':0,'tu':212,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454D04,'size':4,'pad':0,'label':"lit_4087",'name':"@4087",'lib':0,'tu':212,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454D08,'size':4,'pad':0,'label':"lit_4088",'name':"@4088",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D0C,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D10,'size':4,'pad':0,'label':"lit_4197",'name':"@4197",'lib':0,'tu':212,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D14,'size':4,'pad':0,'label':"lit_4278",'name':"@4278",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D18,'size':4,'pad':0,'label':"lit_4279",'name':"@4279",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D1C,'size':4,'pad':0,'label':"lit_4489",'name':"@4489",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D20,'size':4,'pad':0,'label':"lit_4490",'name':"@4490",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D24,'size':4,'pad':0,'label':"lit_4491",'name':"@4491",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D28,'size':4,'pad':0,'label':"lit_4492",'name':"@4492",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D2C,'size':4,'pad':0,'label':"lit_4493",'name':"@4493",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D30,'size':4,'pad':0,'label':"lit_4494",'name':"@4494",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D34,'size':4,'pad':0,'label':"lit_4495",'name':"@4495",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D38,'size':4,'pad':0,'label':"lit_4496",'name':"@4496",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D3C,'size':4,'pad':0,'label':"lit_4497",'name':"@4497",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D40,'size':4,'pad':0,'label':"lit_4498",'name':"@4498",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D44,'size':4,'pad':0,'label':"lit_4499",'name':"@4499",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454D08,'size':4,'pad':0,'label':"lit_4088",'name':"@4088",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D0C,'size':4,'pad':0,'label':"lit_4089",'name':"@4089",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D10,'size':4,'pad':0,'label':"lit_4197",'name':"@4197",'lib':0,'tu':212,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D14,'size':4,'pad':0,'label':"lit_4278",'name':"@4278",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D18,'size':4,'pad':0,'label':"lit_4279",'name':"@4279",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D1C,'size':4,'pad':0,'label':"lit_4489",'name':"@4489",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D20,'size':4,'pad':0,'label':"lit_4490",'name':"@4490",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D24,'size':4,'pad':0,'label':"lit_4491",'name':"@4491",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D28,'size':4,'pad':0,'label':"lit_4492",'name':"@4492",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D2C,'size':4,'pad':0,'label':"lit_4493",'name':"@4493",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D30,'size':4,'pad':0,'label':"lit_4494",'name':"@4494",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D34,'size':4,'pad':0,'label':"lit_4495",'name':"@4495",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D38,'size':4,'pad':0,'label':"lit_4496",'name':"@4496",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D3C,'size':4,'pad':0,'label':"lit_4497",'name':"@4497",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D40,'size':4,'pad':0,'label':"lit_4498",'name':"@4498",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D44,'size':4,'pad':0,'label':"lit_4499",'name':"@4499",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454D48,'size':4,'pad':4,'label':"lit_4500",'name':"@4500",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454D50,'size':8,'pad':0,'label':"lit_4502",'name':"@4502",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454D50,'size':8,'pad':0,'label':"lit_4502",'name':"@4502",'lib':0,'tu':212,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454D58,'size':4,'pad':0,'label':"lit_3949",'name':"@3949",'lib':0,'tu':213,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454D5C,'size':4,'pad':0,'label':"lit_3950",'name':"@3950",'lib':0,'tu':213,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454D5C,'size':4,'pad':0,'label':"lit_3950",'name':"@3950",'lib':0,'tu':213,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454D60,'size':4,'pad':4,'label':"lit_3951",'name':"@3951",'lib':0,'tu':213,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454D68,'size':8,'pad':0,'label':"lit_4053",'name':"@4053",'lib':0,'tu':213,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454D70,'size':4,'pad':4,'label':"lit_4046",'name':"@4046",'lib':0,'tu':214,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454D78,'size':4,'pad':0,'label':"lit_3777",'name':"@3777",'lib':0,'tu':215,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454D7C,'size':4,'pad':0,'label':"lit_3778",'name':"@3778",'lib':0,'tu':215,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454D68,'size':8,'pad':0,'label':"lit_4053",'name':"@4053",'lib':0,'tu':213,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D70,'size':4,'pad':4,'label':"lit_4046",'name':"@4046",'lib':0,'tu':214,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D78,'size':4,'pad':0,'label':"lit_3777",'name':"@3777",'lib':0,'tu':215,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D7C,'size':4,'pad':0,'label':"lit_3778",'name':"@3778",'lib':0,'tu':215,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454D80,'size':4,'pad':4,'label':"lit_3779",'name':"@3779",'lib':0,'tu':215,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454D88,'size':8,'pad':0,'label':"lit_3781",'name':"@3781",'lib':0,'tu':215,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454D90,'size':8,'pad':0,'label':"lit_5116",'name':"@5116",'lib':0,'tu':216,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454D88,'size':8,'pad':0,'label':"lit_3781",'name':"@3781",'lib':0,'tu':215,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454D90,'size':8,'pad':0,'label':"lit_5116",'name':"@5116",'lib':0,'tu':216,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454D98,'size':4,'pad':4,'label':"lit_5608",'name':"@5608",'lib':0,'tu':216,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454DA0,'size':8,'pad':0,'label':"lit_6040",'name':"@6040",'lib':0,'tu':216,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454DA8,'size':4,'pad':0,'label':"lit_6273",'name':"@6273",'lib':0,'tu':216,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DAC,'size':4,'pad':0,'label':"lit_6613",'name':"@6613",'lib':0,'tu':216,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DB0,'size':4,'pad':0,'label':"lit_3665",'name':"@3665",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DB4,'size':4,'pad':0,'label':"lit_3666",'name':"@3666",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DB8,'size':4,'pad':0,'label':"lit_3755",'name':"@3755",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DBC,'size':4,'pad':0,'label':"lit_3756",'name':"@3756",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DC0,'size':4,'pad':0,'label':"lit_3820",'name':"@3820",'lib':0,'tu':217,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DC4,'size':4,'pad':0,'label':"lit_3886",'name':"@3886",'lib':0,'tu':217,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DC8,'size':8,'pad':0,'label':"lit_3936",'name':"@3936",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454DA0,'size':8,'pad':0,'label':"lit_6040",'name':"@6040",'lib':0,'tu':216,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DA8,'size':4,'pad':0,'label':"lit_6273",'name':"@6273",'lib':0,'tu':216,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DAC,'size':4,'pad':0,'label':"lit_6613",'name':"@6613",'lib':0,'tu':216,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DB0,'size':4,'pad':0,'label':"lit_3665",'name':"@3665",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DB4,'size':4,'pad':0,'label':"lit_3666",'name':"@3666",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DB8,'size':4,'pad':0,'label':"lit_3755",'name':"@3755",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DBC,'size':4,'pad':0,'label':"lit_3756",'name':"@3756",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DC0,'size':4,'pad':0,'label':"lit_3820",'name':"@3820",'lib':0,'tu':217,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DC4,'size':4,'pad':0,'label':"lit_3886",'name':"@3886",'lib':0,'tu':217,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DC8,'size':8,'pad':0,'label':"lit_3936",'name':"@3936",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454DD0,'size':4,'pad':0,'label':"lit_4009",'name':"@4009",'lib':0,'tu':217,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454DD4,'size':4,'pad':0,'label':"lit_4722",'name':"@4722",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DD8,'size':4,'pad':0,'label':"lit_4723",'name':"@4723",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DDC,'size':4,'pad':0,'label':"lit_4724",'name':"@4724",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454DD4,'size':4,'pad':0,'label':"lit_4722",'name':"@4722",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DD8,'size':4,'pad':0,'label':"lit_4723",'name':"@4723",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DDC,'size':4,'pad':0,'label':"lit_4724",'name':"@4724",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454DE0,'size':4,'pad':4,'label':"lit_4725",'name':"@4725",'lib':0,'tu':217,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454DE8,'size':4,'pad':0,'label':"lit_3864",'name':"@3864",'lib':0,'tu':218,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454DEC,'size':4,'pad':0,'label':"lit_3865",'name':"@3865",'lib':0,'tu':218,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454DF0,'size':8,'pad':0,'label':"lit_3866",'name':"@3866",'lib':0,'tu':218,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454DF8,'size':8,'pad':0,'label':"lit_3867",'name':"@3867",'lib':0,'tu':218,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454DEC,'size':4,'pad':0,'label':"lit_3865",'name':"@3865",'lib':0,'tu':218,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DF0,'size':8,'pad':0,'label':"lit_3866",'name':"@3866",'lib':0,'tu':218,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454DF8,'size':8,'pad':0,'label':"lit_3867",'name':"@3867",'lib':0,'tu':218,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454E00,'size':8,'pad':0,'label':"lit_3868",'name':"@3868",'lib':0,'tu':218,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80454E08,'size':4,'pad':4,'label':"lit_3869",'name':"@3869",'lib':0,'tu':218,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454E10,'size':8,'pad':0,'label':"lit_3873",'name':"@3873",'lib':0,'tu':218,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454E10,'size':8,'pad':0,'label':"lit_3873",'name':"@3873",'lib':0,'tu':218,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454E18,'size':4,'pad':4,'label':"lit_3970",'name':"@3970",'lib':0,'tu':218,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454E20,'size':4,'pad':0,'label':"lit_3631",'name':"@3631",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80454E24,'size':4,'pad':0,'label':"lit_3683",'name':"@3683",'lib':0,'tu':220,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454E28,'size':4,'pad':0,'label':"lit_3684",'name':"@3684",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E2C,'size':4,'pad':0,'label':"lit_3685",'name':"@3685",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E30,'size':4,'pad':0,'label':"lit_3686",'name':"@3686",'lib':0,'tu':220,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E34,'size':4,'pad':0,'label':"lit_3687",'name':"@3687",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E38,'size':4,'pad':0,'label':"lit_3688",'name':"@3688",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E3C,'size':4,'pad':0,'label':"lit_3689",'name':"@3689",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E40,'size':4,'pad':0,'label':"lit_3690",'name':"@3690",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E44,'size':4,'pad':0,'label':"lit_3691",'name':"@3691",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E48,'size':4,'pad':0,'label':"lit_3757",'name':"@3757",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E4C,'size':4,'pad':0,'label':"lit_3794",'name':"@3794",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E50,'size':4,'pad':0,'label':"lit_3795",'name':"@3795",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E54,'size':4,'pad':0,'label':"lit_3822",'name':"@3822",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454E28,'size':4,'pad':0,'label':"lit_3684",'name':"@3684",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E2C,'size':4,'pad':0,'label':"lit_3685",'name':"@3685",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E30,'size':4,'pad':0,'label':"lit_3686",'name':"@3686",'lib':0,'tu':220,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E34,'size':4,'pad':0,'label':"lit_3687",'name':"@3687",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E38,'size':4,'pad':0,'label':"lit_3688",'name':"@3688",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E3C,'size':4,'pad':0,'label':"lit_3689",'name':"@3689",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E40,'size':4,'pad':0,'label':"lit_3690",'name':"@3690",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E44,'size':4,'pad':0,'label':"lit_3691",'name':"@3691",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E48,'size':4,'pad':0,'label':"lit_3757",'name':"@3757",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E4C,'size':4,'pad':0,'label':"lit_3794",'name':"@3794",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E50,'size':4,'pad':0,'label':"lit_3795",'name':"@3795",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E54,'size':4,'pad':0,'label':"lit_3822",'name':"@3822",'lib':0,'tu':220,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454E58,'size':4,'pad':0,'label':"lit_3748",'name':"@3748",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80454E5C,'size':4,'pad':0,'label':"lit_3800",'name':"@3800",'lib':0,'tu':221,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454E60,'size':4,'pad':0,'label':"lit_3801",'name':"@3801",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E64,'size':4,'pad':0,'label':"lit_3802",'name':"@3802",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E68,'size':4,'pad':0,'label':"lit_3803",'name':"@3803",'lib':0,'tu':221,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E6C,'size':4,'pad':0,'label':"lit_3804",'name':"@3804",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E70,'size':4,'pad':0,'label':"lit_3805",'name':"@3805",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E74,'size':4,'pad':0,'label':"lit_3806",'name':"@3806",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E78,'size':4,'pad':0,'label':"lit_3807",'name':"@3807",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E7C,'size':4,'pad':0,'label':"lit_3808",'name':"@3808",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E80,'size':4,'pad':0,'label':"lit_3923",'name':"@3923",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E84,'size':4,'pad':0,'label':"lit_3947",'name':"@3947",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454E88,'size':4,'pad':4,'label':"lit_3858",'name':"@3858",'lib':0,'tu':222,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454E90,'size':8,'pad':0,'label':"lit_3860",'name':"@3860",'lib':0,'tu':222,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454E60,'size':4,'pad':0,'label':"lit_3801",'name':"@3801",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E64,'size':4,'pad':0,'label':"lit_3802",'name':"@3802",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E68,'size':4,'pad':0,'label':"lit_3803",'name':"@3803",'lib':0,'tu':221,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E6C,'size':4,'pad':0,'label':"lit_3804",'name':"@3804",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E70,'size':4,'pad':0,'label':"lit_3805",'name':"@3805",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E74,'size':4,'pad':0,'label':"lit_3806",'name':"@3806",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E78,'size':4,'pad':0,'label':"lit_3807",'name':"@3807",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E7C,'size':4,'pad':0,'label':"lit_3808",'name':"@3808",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E80,'size':4,'pad':0,'label':"lit_3923",'name':"@3923",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E84,'size':4,'pad':0,'label':"lit_3947",'name':"@3947",'lib':0,'tu':221,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E88,'size':4,'pad':4,'label':"lit_3858",'name':"@3858",'lib':0,'tu':222,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454E90,'size':8,'pad':0,'label':"lit_3860",'name':"@3860",'lib':0,'tu':222,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454E98,'size':4,'pad':4,'label':"lit_4046",'name':"@4046",'lib':0,'tu':222,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454EA0,'size':8,'pad':0,'label':"lit_4349",'name':"@4349",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454EA8,'size':4,'pad':0,'label':"lit_4473",'name':"@4473",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EAC,'size':4,'pad':0,'label':"lit_4474",'name':"@4474",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EB0,'size':4,'pad':0,'label':"lit_4475",'name':"@4475",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EB4,'size':4,'pad':0,'label':"lit_4476",'name':"@4476",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454EA0,'size':8,'pad':0,'label':"lit_4349",'name':"@4349",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EA8,'size':4,'pad':0,'label':"lit_4473",'name':"@4473",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EAC,'size':4,'pad':0,'label':"lit_4474",'name':"@4474",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EB0,'size':4,'pad':0,'label':"lit_4475",'name':"@4475",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EB4,'size':4,'pad':0,'label':"lit_4476",'name':"@4476",'lib':0,'tu':222,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454EB8,'size':4,'pad':4,'label':"lit_3692",'name':"@3692",'lib':0,'tu':223,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454EC0,'size':8,'pad':0,'label':"lit_3694",'name':"@3694",'lib':0,'tu':223,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454EC8,'size':8,'pad':0,'label':"lit_3708",'name':"@3708",'lib':0,'tu':223,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454ED0,'size':4,'pad':4,'label':"lit_3721",'name':"@3721",'lib':0,'tu':223,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454ED8,'size':4,'pad':0,'label':"lit_3933",'name':"@3933",'lib':0,'tu':225,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EDC,'size':4,'pad':0,'label':"lit_3934",'name':"@3934",'lib':0,'tu':225,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EE0,'size':4,'pad':0,'label':"lit_3935",'name':"@3935",'lib':0,'tu':225,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EE4,'size':4,'pad':0,'label':"lit_3936",'name':"@3936",'lib':0,'tu':225,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EE8,'size':4,'pad':0,'label':"lit_3937",'name':"@3937",'lib':0,'tu':225,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EEC,'size':4,'pad':0,'label':"lit_3938",'name':"@3938",'lib':0,'tu':225,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454EF0,'size':8,'pad':0,'label':"lit_3940",'name':"@3940",'lib':0,'tu':225,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454EC0,'size':8,'pad':0,'label':"lit_3694",'name':"@3694",'lib':0,'tu':223,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EC8,'size':8,'pad':0,'label':"lit_3708",'name':"@3708",'lib':0,'tu':223,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454ED0,'size':4,'pad':4,'label':"lit_3721",'name':"@3721",'lib':0,'tu':223,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454ED8,'size':4,'pad':0,'label':"lit_3933",'name':"@3933",'lib':0,'tu':225,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EDC,'size':4,'pad':0,'label':"lit_3934",'name':"@3934",'lib':0,'tu':225,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EE0,'size':4,'pad':0,'label':"lit_3935",'name':"@3935",'lib':0,'tu':225,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EE4,'size':4,'pad':0,'label':"lit_3936",'name':"@3936",'lib':0,'tu':225,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EE8,'size':4,'pad':0,'label':"lit_3937",'name':"@3937",'lib':0,'tu':225,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EEC,'size':4,'pad':0,'label':"lit_3938",'name':"@3938",'lib':0,'tu':225,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454EF0,'size':8,'pad':0,'label':"lit_3940",'name':"@3940",'lib':0,'tu':225,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454EF8,'size':4,'pad':0,'label':"lit_3923",'name':"@3923",'lib':0,'tu':227,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454EFC,'size':4,'pad':0,'label':"lit_3924",'name':"@3924",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F00,'size':4,'pad':0,'label':"lit_3925",'name':"@3925",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F04,'size':4,'pad':0,'label':"lit_3926",'name':"@3926",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F08,'size':4,'pad':0,'label':"lit_3927",'name':"@3927",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F0C,'size':4,'pad':0,'label':"lit_3928",'name':"@3928",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F10,'size':8,'pad':0,'label':"lit_3930",'name':"@3930",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454EFC,'size':4,'pad':0,'label':"lit_3924",'name':"@3924",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F00,'size':4,'pad':0,'label':"lit_3925",'name':"@3925",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F04,'size':4,'pad':0,'label':"lit_3926",'name':"@3926",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F08,'size':4,'pad':0,'label':"lit_3927",'name':"@3927",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F0C,'size':4,'pad':0,'label':"lit_3928",'name':"@3928",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F10,'size':8,'pad':0,'label':"lit_3930",'name':"@3930",'lib':0,'tu':227,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454F18,'size':2,'pad':2,'label':"T_JOINT_dylKeyTbl",'name':"T_JOINT_dylKeyTbl",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F1C,'size':4,'pad':0,'label':"lit_4055",'name':"@4055",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F20,'size':4,'pad':0,'label':"lit_4066",'name':"@4066",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F24,'size':4,'pad':0,'label':"lit_4067",'name':"@4067",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454F1C,'size':4,'pad':0,'label':"lit_4055",'name':"@4055",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F20,'size':4,'pad':0,'label':"lit_4066",'name':"@4066",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F24,'size':4,'pad':0,'label':"lit_4067",'name':"@4067",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454F28,'size':4,'pad':0,'label':"lit_4068",'name':"@4068",'lib':0,'tu':228,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80454F2C,'size':4,'pad':0,'label':"lit_4100",'name':"@4100",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F30,'size':4,'pad':0,'label':"lit_4804",'name':"@4804",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F34,'size':4,'pad':0,'label':"lit_4805",'name':"@4805",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454F30,'size':4,'pad':0,'label':"lit_4804",'name':"@4804",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F34,'size':4,'pad':0,'label':"lit_4805",'name':"@4805",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454F38,'size':4,'pad':4,'label':"lit_4806",'name':"@4806",'lib':0,'tu':228,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454F40,'size':4,'pad':0,'label':"lit_3919",'name':"@3919",'lib':0,'tu':232,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454F44,'size':4,'pad':0,'label':"lit_3920",'name':"@3920",'lib':0,'tu':232,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F48,'size':4,'pad':0,'label':"lit_4050",'name':"@4050",'lib':0,'tu':232,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F4C,'size':4,'pad':0,'label':"lit_4124",'name':"@4124",'lib':0,'tu':232,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454F44,'size':4,'pad':0,'label':"lit_3920",'name':"@3920",'lib':0,'tu':232,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F48,'size':4,'pad':0,'label':"lit_4050",'name':"@4050",'lib':0,'tu':232,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F4C,'size':4,'pad':0,'label':"lit_4124",'name':"@4124",'lib':0,'tu':232,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454F50,'size':4,'pad':4,'label':"lit_4125",'name':"@4125",'lib':0,'tu':232,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80454F58,'size':8,'pad':0,'label':"lit_4627",'name':"@4627",'lib':0,'tu':232,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454F58,'size':8,'pad':0,'label':"lit_4627",'name':"@4627",'lib':0,'tu':232,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454F60,'size':6,'pad':2,'label':"animeFrame",'name':"animeFrame$5017",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454F68,'size':4,'pad':0,'label':"lit_5094",'name':"@5094",'lib':0,'tu':232,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F6C,'size':4,'pad':0,'label':"lit_5143",'name':"@5143",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F70,'size':4,'pad':0,'label':"lit_5227",'name':"@5227",'lib':0,'tu':232,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F74,'size':4,'pad':0,'label':"lit_5228",'name':"@5228",'lib':0,'tu':232,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F78,'size':4,'pad':0,'label':"lit_5229",'name':"@5229",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F7C,'size':4,'pad':0,'label':"lit_5230",'name':"@5230",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F80,'size':4,'pad':0,'label':"lit_5231",'name':"@5231",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F84,'size':4,'pad':0,'label':"lit_5232",'name':"@5232",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F88,'size':4,'pad':0,'label':"lit_5233",'name':"@5233",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F8C,'size':4,'pad':0,'label':"lit_5234",'name':"@5234",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F90,'size':4,'pad':0,'label':"lit_5235",'name':"@5235",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F94,'size':4,'pad':0,'label':"lit_5325",'name':"@5325",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F98,'size':4,'pad':0,'label':"lit_5326",'name':"@5326",'lib':0,'tu':232,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454F9C,'size':4,'pad':0,'label':"lit_5327",'name':"@5327",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FA0,'size':4,'pad':0,'label':"lit_5544",'name':"@5544",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FA4,'size':4,'pad':0,'label':"lit_5545",'name':"@5545",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FA8,'size':4,'pad':0,'label':"lit_5546",'name':"@5546",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FAC,'size':4,'pad':0,'label':"lit_5547",'name':"@5547",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FB0,'size':4,'pad':0,'label':"lit_3718",'name':"@3718",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FB4,'size':4,'pad':0,'label':"lit_3719",'name':"@3719",'lib':0,'tu':233,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FB8,'size':4,'pad':0,'label':"lit_3720",'name':"@3720",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FBC,'size':4,'pad':0,'label':"lit_3844",'name':"@3844",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FC0,'size':4,'pad':4,'label':"lit_3845",'name':"@3845",'lib':0,'tu':233,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454FC8,'size':8,'pad':0,'label':"lit_3846",'name':"@3846",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454FD0,'size':8,'pad':0,'label':"lit_3847",'name':"@3847",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454F68,'size':4,'pad':0,'label':"lit_5094",'name':"@5094",'lib':0,'tu':232,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F6C,'size':4,'pad':0,'label':"lit_5143",'name':"@5143",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F70,'size':4,'pad':0,'label':"lit_5227",'name':"@5227",'lib':0,'tu':232,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F74,'size':4,'pad':0,'label':"lit_5228",'name':"@5228",'lib':0,'tu':232,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F78,'size':4,'pad':0,'label':"lit_5229",'name':"@5229",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F7C,'size':4,'pad':0,'label':"lit_5230",'name':"@5230",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F80,'size':4,'pad':0,'label':"lit_5231",'name':"@5231",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F84,'size':4,'pad':0,'label':"lit_5232",'name':"@5232",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F88,'size':4,'pad':0,'label':"lit_5233",'name':"@5233",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F8C,'size':4,'pad':0,'label':"lit_5234",'name':"@5234",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F90,'size':4,'pad':0,'label':"lit_5235",'name':"@5235",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F94,'size':4,'pad':0,'label':"lit_5325",'name':"@5325",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F98,'size':4,'pad':0,'label':"lit_5326",'name':"@5326",'lib':0,'tu':232,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454F9C,'size':4,'pad':0,'label':"lit_5327",'name':"@5327",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FA0,'size':4,'pad':0,'label':"lit_5544",'name':"@5544",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FA4,'size':4,'pad':0,'label':"lit_5545",'name':"@5545",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FA8,'size':4,'pad':0,'label':"lit_5546",'name':"@5546",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FAC,'size':4,'pad':0,'label':"lit_5547",'name':"@5547",'lib':0,'tu':232,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FB0,'size':4,'pad':0,'label':"lit_3718",'name':"@3718",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FB4,'size':4,'pad':0,'label':"lit_3719",'name':"@3719",'lib':0,'tu':233,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FB8,'size':4,'pad':0,'label':"lit_3720",'name':"@3720",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FBC,'size':4,'pad':0,'label':"lit_3844",'name':"@3844",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FC0,'size':4,'pad':4,'label':"lit_3845",'name':"@3845",'lib':0,'tu':233,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FC8,'size':8,'pad':0,'label':"lit_3846",'name':"@3846",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FD0,'size':8,'pad':0,'label':"lit_3847",'name':"@3847",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454FD8,'size':8,'pad':0,'label':"lit_3848",'name':"@3848",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454FE0,'size':4,'pad':0,'label':"lit_3873",'name':"@3873",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FE4,'size':4,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FE8,'size':8,'pad':0,'label':"lit_3908",'name':"@3908",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80454FE0,'size':4,'pad':0,'label':"lit_3873",'name':"@3873",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FE4,'size':4,'pad':0,'label':"lit_3906",'name':"@3906",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FE8,'size':8,'pad':0,'label':"lit_3908",'name':"@3908",'lib':0,'tu':233,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80454FF0,'size':7,'pad':1,'label':"l_arcName",'name':"l_arcName",'lib':0,'tu':234,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80454FF8,'size':4,'pad':0,'label':"lit_3838",'name':"@3838",'lib':0,'tu':234,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80454FFC,'size':4,'pad':0,'label':"lit_3839",'name':"@3839",'lib':0,'tu':234,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455000,'size':4,'pad':0,'label':"lit_3840",'name':"@3840",'lib':0,'tu':234,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80454FF8,'size':4,'pad':0,'label':"lit_3838",'name':"@3838",'lib':0,'tu':234,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80454FFC,'size':4,'pad':0,'label':"lit_3839",'name':"@3839",'lib':0,'tu':234,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455000,'size':4,'pad':0,'label':"lit_3840",'name':"@3840",'lib':0,'tu':234,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455004,'size':4,'pad':0,'label':"lit_3946",'name':"@3946",'lib':0,'tu':234,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455008,'size':4,'pad':4,'label':"lit_3772",'name':"@3772",'lib':0,'tu':235,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455010,'size':8,'pad':0,'label':"lit_3774",'name':"@3774",'lib':0,'tu':235,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455018,'size':4,'pad':0,'label':"lit_2305",'name':"@2305",'lib':2,'tu':249,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045501C,'size':4,'pad':0,'label':"lit_2306",'name':"@2306",'lib':2,'tu':249,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455020,'size':4,'pad':4,'label':"lit_2431",'name':"@2431",'lib':2,'tu':249,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455028,'size':8,'pad':0,'label':"lit_2472",'name':"@2472",'lib':2,'tu':249,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455010,'size':8,'pad':0,'label':"lit_3774",'name':"@3774",'lib':0,'tu':235,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455018,'size':4,'pad':0,'label':"lit_2305",'name':"@2305",'lib':2,'tu':249,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045501C,'size':4,'pad':0,'label':"lit_2306",'name':"@2306",'lib':2,'tu':249,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455020,'size':4,'pad':4,'label':"lit_2431",'name':"@2431",'lib':2,'tu':249,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455028,'size':8,'pad':0,'label':"lit_2472",'name':"@2472",'lib':2,'tu':249,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455030,'size':4,'pad':4,'label':"lit_2632",'name':"@2632",'lib':2,'tu':249,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455038,'size':4,'pad':0,'label':"lit_2532",'name':"@2532",'lib':2,'tu':250,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045503C,'size':4,'pad':0,'label':"lit_2759",'name':"@2759",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455040,'size':4,'pad':0,'label':"lit_2760",'name':"@2760",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455044,'size':4,'pad':0,'label':"lit_2761",'name':"@2761",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045503C,'size':4,'pad':0,'label':"lit_2759",'name':"@2759",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455040,'size':4,'pad':0,'label':"lit_2760",'name':"@2760",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455044,'size':4,'pad':0,'label':"lit_2761",'name':"@2761",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455048,'size':4,'pad':4,'label':"lit_2762",'name':"@2762",'lib':2,'tu':250,'section':8,'r':[1,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455050,'size':8,'pad':0,'label':"lit_2763",'name':"@2763",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455058,'size':8,'pad':0,'label':"lit_2764",'name':"@2764",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455050,'size':8,'pad':0,'label':"lit_2763",'name':"@2763",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455058,'size':8,'pad':0,'label':"lit_2764",'name':"@2764",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455060,'size':8,'pad':0,'label':"lit_2765",'name':"@2765",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455068,'size':4,'pad':4,'label':"lit_2766",'name':"@2766",'lib':2,'tu':250,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455070,'size':4,'pad':0,'label':"lit_2201",'name':"@2201",'lib':2,'tu':262,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455074,'size':4,'pad':0,'label':"lit_2288",'name':"@2288",'lib':2,'tu':262,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455078,'size':4,'pad':0,'label':"lit_2325",'name':"@2325",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045507C,'size':4,'pad':0,'label':"lit_2326",'name':"@2326",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455070,'size':4,'pad':0,'label':"lit_2201",'name':"@2201",'lib':2,'tu':262,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455074,'size':4,'pad':0,'label':"lit_2288",'name':"@2288",'lib':2,'tu':262,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455078,'size':4,'pad':0,'label':"lit_2325",'name':"@2325",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045507C,'size':4,'pad':0,'label':"lit_2326",'name':"@2326",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455080,'size':4,'pad':0,'label':"lit_2327",'name':"@2327",'lib':2,'tu':262,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455084,'size':4,'pad':0,'label':"lit_2405",'name':"@2405",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455088,'size':8,'pad':0,'label':"lit_2446",'name':"@2446",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455090,'size':8,'pad':0,'label':"lit_2447",'name':"@2447",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455084,'size':4,'pad':0,'label':"lit_2405",'name':"@2405",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455088,'size':8,'pad':0,'label':"lit_2446",'name':"@2446",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455090,'size':8,'pad':0,'label':"lit_2447",'name':"@2447",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455098,'size':8,'pad':0,'label':"lit_2448",'name':"@2448",'lib':2,'tu':262,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804550A0,'size':8,'pad':0,'label':"lit_151",'name':"@151",'lib':2,'tu':263,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804550A8,'size':8,'pad':0,'label':"lit_2201",'name':"@2201",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804550B0,'size':4,'pad':0,'label':"lit_2215",'name':"@2215",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804550B4,'size':4,'pad':0,'label':"lit_2232",'name':"@2232",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804550A0,'size':8,'pad':0,'label':"lit_151",'name':"@151",'lib':2,'tu':263,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550A8,'size':8,'pad':0,'label':"lit_2201",'name':"@2201",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550B0,'size':4,'pad':0,'label':"lit_2215",'name':"@2215",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550B4,'size':4,'pad':0,'label':"lit_2232",'name':"@2232",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804550B8,'size':4,'pad':0,'label':"lit_2277",'name':"@2277",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804550BC,'size':4,'pad':0,'label':"lit_2282",'name':"@2282",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804550C0,'size':8,'pad':0,'label':"lit_2284",'name':"@2284",'lib':2,'tu':264,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804550C8,'size':4,'pad':0,'label':"lit_2296",'name':"@2296",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804550CC,'size':4,'pad':0,'label':"lit_2297",'name':"@2297",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804550BC,'size':4,'pad':0,'label':"lit_2282",'name':"@2282",'lib':2,'tu':264,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550C0,'size':8,'pad':0,'label':"lit_2284",'name':"@2284",'lib':2,'tu':264,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550C8,'size':4,'pad':0,'label':"lit_2296",'name':"@2296",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550CC,'size':4,'pad':0,'label':"lit_2297",'name':"@2297",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804550D0,'size':4,'pad':4,'label':"lit_2298",'name':"@2298",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804550D8,'size':8,'pad':0,'label':"lit_2299",'name':"@2299",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804550E0,'size':4,'pad':0,'label':"lit_2311",'name':"@2311",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804550E4,'size':4,'pad':0,'label':"lit_2312",'name':"@2312",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804550E8,'size':4,'pad':0,'label':"lit_2242",'name':"@2242",'lib':2,'tu':270,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804550EC,'size':4,'pad':0,'label':"lit_2249",'name':"@2249",'lib':2,'tu':270,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804550F0,'size':4,'pad':0,'label':"lit_2266",'name':"@2266",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804550F4,'size':4,'pad':0,'label':"lit_2267",'name':"@2267",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804550D8,'size':8,'pad':0,'label':"lit_2299",'name':"@2299",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550E0,'size':4,'pad':0,'label':"lit_2311",'name':"@2311",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550E4,'size':4,'pad':0,'label':"lit_2312",'name':"@2312",'lib':2,'tu':264,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550E8,'size':4,'pad':0,'label':"lit_2242",'name':"@2242",'lib':2,'tu':270,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550EC,'size':4,'pad':0,'label':"lit_2249",'name':"@2249",'lib':2,'tu':270,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550F0,'size':4,'pad':0,'label':"lit_2266",'name':"@2266",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804550F4,'size':4,'pad':0,'label':"lit_2267",'name':"@2267",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804550F8,'size':4,'pad':0,'label':"lit_2268",'name':"@2268",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804550FC,'size':4,'pad':0,'label':"lit_2269",'name':"@2269",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455100,'size':8,'pad':0,'label':"lit_2270",'name':"@2270",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455108,'size':8,'pad':0,'label':"lit_2271",'name':"@2271",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804550FC,'size':4,'pad':0,'label':"lit_2269",'name':"@2269",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455100,'size':8,'pad':0,'label':"lit_2270",'name':"@2270",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455108,'size':8,'pad':0,'label':"lit_2271",'name':"@2271",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455110,'size':8,'pad':0,'label':"lit_2272",'name':"@2272",'lib':2,'tu':271,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455118,'size':4,'pad':4,'label':"lit_2256",'name':"@2256",'lib':2,'tu':272,'section':8,'r':[28,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455120,'size':8,'pad':0,'label':"lit_2257",'name':"@2257",'lib':2,'tu':272,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455128,'size':8,'pad':0,'label':"lit_2258",'name':"@2258",'lib':2,'tu':272,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455118,'size':4,'pad':4,'label':"lit_2256",'name':"@2256",'lib':2,'tu':272,'section':8,'r':[28,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455120,'size':8,'pad':0,'label':"lit_2257",'name':"@2257",'lib':2,'tu':272,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455128,'size':8,'pad':0,'label':"lit_2258",'name':"@2258",'lib':2,'tu':272,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455130,'size':8,'pad':0,'label':"lit_2259",'name':"@2259",'lib':2,'tu':272,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455138,'size':4,'pad':0,'label':"lit_2273",'name':"@2273",'lib':2,'tu':272,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045513C,'size':4,'pad':0,'label':"lit_2346",'name':"@2346",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455138,'size':4,'pad':0,'label':"lit_2273",'name':"@2273",'lib':2,'tu':272,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045513C,'size':4,'pad':0,'label':"lit_2346",'name':"@2346",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455140,'size':4,'pad':0,'label':"BPCP_OUTCODE0",'name':"BPCP_OUTCODE0",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455144,'size':4,'pad':0,'label':"BPCP_OUTCODE1",'name':"BPCP_OUTCODE1",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455148,'size':4,'pad':0,'label':"BPCP_OUTCODE4",'name':"BPCP_OUTCODE4",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, @@ -26080,478 +26080,478 @@ SYMBOLS = [ {'addr':0x8045519C,'size':4,'pad':0,'label':"BEVEL3D_OUTCODE5",'name':"BEVEL3D_OUTCODE5",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804551A0,'size':4,'pad':0,'label':"BEVEL3D_OUTCODE6",'name':"BEVEL3D_OUTCODE6",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804551A4,'size':4,'pad':0,'label':"BEVEL3D_OUTCODE7",'name':"BEVEL3D_OUTCODE7",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551A8,'size':4,'pad':0,'label':"lit_3082",'name':"@3082",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551AC,'size':4,'pad':0,'label':"lit_3205",'name':"@3205",'lib':2,'tu':272,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551B0,'size':4,'pad':0,'label':"lit_3229",'name':"@3229",'lib':2,'tu':272,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551B4,'size':4,'pad':0,'label':"lit_3230",'name':"@3230",'lib':2,'tu':272,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551B8,'size':4,'pad':0,'label':"lit_3497",'name':"@3497",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551BC,'size':4,'pad':0,'label':"lit_3739",'name':"@3739",'lib':2,'tu':272,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551C0,'size':4,'pad':0,'label':"lit_3740",'name':"@3740",'lib':2,'tu':272,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551C4,'size':4,'pad':0,'label':"lit_3892",'name':"@3892",'lib':2,'tu':272,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551C8,'size':4,'pad':0,'label':"lit_4255",'name':"@4255",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551CC,'size':4,'pad':0,'label':"lit_5508",'name':"@5508",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551D0,'size':4,'pad':0,'label':"lit_416",'name':"@416",'lib':2,'tu':273,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804551D4,'size':4,'pad':0,'label':"lit_417",'name':"@417",'lib':2,'tu':273,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804551A8,'size':4,'pad':0,'label':"lit_3082",'name':"@3082",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551AC,'size':4,'pad':0,'label':"lit_3205",'name':"@3205",'lib':2,'tu':272,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551B0,'size':4,'pad':0,'label':"lit_3229",'name':"@3229",'lib':2,'tu':272,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551B4,'size':4,'pad':0,'label':"lit_3230",'name':"@3230",'lib':2,'tu':272,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551B8,'size':4,'pad':0,'label':"lit_3497",'name':"@3497",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551BC,'size':4,'pad':0,'label':"lit_3739",'name':"@3739",'lib':2,'tu':272,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551C0,'size':4,'pad':0,'label':"lit_3740",'name':"@3740",'lib':2,'tu':272,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551C4,'size':4,'pad':0,'label':"lit_3892",'name':"@3892",'lib':2,'tu':272,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551C8,'size':4,'pad':0,'label':"lit_4255",'name':"@4255",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551CC,'size':4,'pad':0,'label':"lit_5508",'name':"@5508",'lib':2,'tu':272,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551D0,'size':4,'pad':0,'label':"lit_416",'name':"@416",'lib':2,'tu':273,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551D4,'size':4,'pad':0,'label':"lit_417",'name':"@417",'lib':2,'tu':273,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804551D8,'size':4,'pad':4,'label':"lit_493",'name':"@493",'lib':2,'tu':273,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804551E0,'size':4,'pad':4,'label':"lit_2262",'name':"@2262",'lib':2,'tu':281,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804551E8,'size':8,'pad':0,'label':"lit_2379",'name':"@2379",'lib':2,'tu':281,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804551F0,'size':8,'pad':0,'label':"lit_2380",'name':"@2380",'lib':2,'tu':281,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804551E0,'size':4,'pad':4,'label':"lit_2262",'name':"@2262",'lib':2,'tu':281,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551E8,'size':8,'pad':0,'label':"lit_2379",'name':"@2379",'lib':2,'tu':281,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804551F0,'size':8,'pad':0,'label':"lit_2380",'name':"@2380",'lib':2,'tu':281,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804551F8,'size':8,'pad':0,'label':"lit_2381",'name':"@2381",'lib':2,'tu':281,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455200,'size':4,'pad':4,'label':"lit_2382",'name':"@2382",'lib':2,'tu':281,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455208,'size':4,'pad':0,'label':"lit_2248",'name':"@2248",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045520C,'size':4,'pad':0,'label':"lit_2260",'name':"@2260",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455210,'size':8,'pad':0,'label':"lit_2263",'name':"@2263",'lib':2,'tu':282,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455218,'size':4,'pad':0,'label':"lit_2269",'name':"@2269",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045521C,'size':4,'pad':0,'label':"lit_2277",'name':"@2277",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455220,'size':4,'pad':0,'label':"lit_2440",'name':"@2440",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455224,'size':4,'pad':0,'label':"lit_2441",'name':"@2441",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455228,'size':4,'pad':0,'label':"lit_2474",'name':"@2474",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455208,'size':4,'pad':0,'label':"lit_2248",'name':"@2248",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045520C,'size':4,'pad':0,'label':"lit_2260",'name':"@2260",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455210,'size':8,'pad':0,'label':"lit_2263",'name':"@2263",'lib':2,'tu':282,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455218,'size':4,'pad':0,'label':"lit_2269",'name':"@2269",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045521C,'size':4,'pad':0,'label':"lit_2277",'name':"@2277",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455220,'size':4,'pad':0,'label':"lit_2440",'name':"@2440",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455224,'size':4,'pad':0,'label':"lit_2441",'name':"@2441",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455228,'size':4,'pad':0,'label':"lit_2474",'name':"@2474",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045522C,'size':4,'pad':0,'label':"lit_2491",'name':"@2491",'lib':2,'tu':282,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455230,'size':8,'pad':0,'label':"lit_2671",'name':"@2671",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455238,'size':4,'pad':0,'label':"lit_2672",'name':"@2672",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045523C,'size':4,'pad':0,'label':"lit_2744",'name':"@2744",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455240,'size':4,'pad':0,'label':"lit_2242",'name':"@2242",'lib':4,'tu':284,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455244,'size':4,'pad':0,'label':"lit_2243",'name':"@2243",'lib':4,'tu':284,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455248,'size':8,'pad':0,'label':"lit_2245",'name':"@2245",'lib':4,'tu':284,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455238,'size':4,'pad':0,'label':"lit_2672",'name':"@2672",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045523C,'size':4,'pad':0,'label':"lit_2744",'name':"@2744",'lib':2,'tu':282,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455240,'size':4,'pad':0,'label':"lit_2242",'name':"@2242",'lib':4,'tu':284,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455244,'size':4,'pad':0,'label':"lit_2243",'name':"@2243",'lib':4,'tu':284,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455248,'size':8,'pad':0,'label':"lit_2245",'name':"@2245",'lib':4,'tu':284,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455250,'size':4,'pad':0,'label':"lit_2198",'name':"@2198",'lib':4,'tu':285,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455254,'size':4,'pad':0,'label':"lit_2497",'name':"@2497",'lib':4,'tu':285,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455254,'size':4,'pad':0,'label':"lit_2497",'name':"@2497",'lib':4,'tu':285,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455258,'size':4,'pad':4,'label':"lit_2498",'name':"@2498",'lib':4,'tu':285,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455260,'size':8,'pad':0,'label':"lit_2500",'name':"@2500",'lib':4,'tu':285,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455268,'size':8,'pad':0,'label':"lit_2933",'name':"@2933",'lib':4,'tu':285,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455270,'size':8,'pad':0,'label':"lit_2964",'name':"@2964",'lib':4,'tu':285,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455278,'size':4,'pad':0,'label':"lit_893",'name':"@893",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045527C,'size':4,'pad':0,'label':"lit_894",'name':"@894",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455280,'size':4,'pad':0,'label':"lit_913",'name':"@913",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455284,'size':4,'pad':0,'label':"lit_914",'name':"@914",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455288,'size':4,'pad':4,'label':"lit_991",'name':"@991",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455290,'size':4,'pad':0,'label':"lit_3189",'name':"@3189",'lib':6,'tu':289,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455294,'size':4,'pad':0,'label':"lit_3190",'name':"@3190",'lib':6,'tu':289,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455298,'size':4,'pad':0,'label':"lit_3191",'name':"@3191",'lib':6,'tu':289,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455260,'size':8,'pad':0,'label':"lit_2500",'name':"@2500",'lib':4,'tu':285,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455268,'size':8,'pad':0,'label':"lit_2933",'name':"@2933",'lib':4,'tu':285,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455270,'size':8,'pad':0,'label':"lit_2964",'name':"@2964",'lib':4,'tu':285,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455278,'size':4,'pad':0,'label':"lit_893",'name':"@893",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045527C,'size':4,'pad':0,'label':"lit_894",'name':"@894",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455280,'size':4,'pad':0,'label':"lit_913",'name':"@913",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455284,'size':4,'pad':0,'label':"lit_914",'name':"@914",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455288,'size':4,'pad':4,'label':"lit_991",'name':"@991",'lib':5,'tu':286,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455290,'size':4,'pad':0,'label':"lit_3189",'name':"@3189",'lib':6,'tu':289,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455294,'size':4,'pad':0,'label':"lit_3190",'name':"@3190",'lib':6,'tu':289,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455298,'size':4,'pad':0,'label':"lit_3191",'name':"@3191",'lib':6,'tu':289,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045529C,'size':4,'pad':0,'label':"lit_3192",'name':"@3192",'lib':6,'tu':289,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804552A0,'size':8,'pad':0,'label':"lit_3194",'name':"@3194",'lib':6,'tu':289,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804552A0,'size':8,'pad':0,'label':"lit_3194",'name':"@3194",'lib':6,'tu':289,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804552A8,'size':4,'pad':4,'label':"lit_2262",'name':"@2262",'lib':6,'tu':290,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804552B0,'size':8,'pad':0,'label':"lit_2623",'name':"@2623",'lib':6,'tu':290,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804552B8,'size':4,'pad':0,'label':"lit_2740",'name':"@2740",'lib':6,'tu':290,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804552BC,'size':4,'pad':0,'label':"lit_2741",'name':"@2741",'lib':6,'tu':290,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804552C0,'size':4,'pad':4,'label':"lit_2742",'name':"@2742",'lib':6,'tu':290,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804552C8,'size':8,'pad':0,'label':"lit_2744",'name':"@2744",'lib':6,'tu':290,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804552D0,'size':4,'pad':0,'label':"lit_3145",'name':"@3145",'lib':6,'tu':290,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804552D4,'size':4,'pad':0,'label':"lit_3146",'name':"@3146",'lib':6,'tu':290,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804552D8,'size':4,'pad':0,'label':"lit_3281",'name':"@3281",'lib':6,'tu':290,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804552DC,'size':4,'pad':0,'label':"lit_3282",'name':"@3282",'lib':6,'tu':290,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804552B0,'size':8,'pad':0,'label':"lit_2623",'name':"@2623",'lib':6,'tu':290,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552B8,'size':4,'pad':0,'label':"lit_2740",'name':"@2740",'lib':6,'tu':290,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552BC,'size':4,'pad':0,'label':"lit_2741",'name':"@2741",'lib':6,'tu':290,'section':8,'r':[14,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552C0,'size':4,'pad':4,'label':"lit_2742",'name':"@2742",'lib':6,'tu':290,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552C8,'size':8,'pad':0,'label':"lit_2744",'name':"@2744",'lib':6,'tu':290,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552D0,'size':4,'pad':0,'label':"lit_3145",'name':"@3145",'lib':6,'tu':290,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552D4,'size':4,'pad':0,'label':"lit_3146",'name':"@3146",'lib':6,'tu':290,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552D8,'size':4,'pad':0,'label':"lit_3281",'name':"@3281",'lib':6,'tu':290,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552DC,'size':4,'pad':0,'label':"lit_3282",'name':"@3282",'lib':6,'tu':290,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804552E0,'size':4,'pad':4,'label':"lit_2270",'name':"@2270",'lib':6,'tu':291,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804552E8,'size':8,'pad':0,'label':"lit_2312",'name':"@2312",'lib':6,'tu':291,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804552F0,'size':4,'pad':0,'label':"lit_2339",'name':"@2339",'lib':6,'tu':291,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804552F4,'size':4,'pad':0,'label':"lit_2390",'name':"@2390",'lib':6,'tu':291,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804552F8,'size':4,'pad':0,'label':"lit_2433",'name':"@2433",'lib':6,'tu':291,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804552FC,'size':4,'pad':0,'label':"lit_2434",'name':"@2434",'lib':6,'tu':291,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455300,'size':4,'pad':4,'label':"lit_2503",'name':"@2503",'lib':6,'tu':291,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455308,'size':4,'pad':0,'label':"lit_2318",'name':"@2318",'lib':6,'tu':292,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045530C,'size':4,'pad':0,'label':"lit_2319",'name':"@2319",'lib':6,'tu':292,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804552E8,'size':8,'pad':0,'label':"lit_2312",'name':"@2312",'lib':6,'tu':291,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552F0,'size':4,'pad':0,'label':"lit_2339",'name':"@2339",'lib':6,'tu':291,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552F4,'size':4,'pad':0,'label':"lit_2390",'name':"@2390",'lib':6,'tu':291,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552F8,'size':4,'pad':0,'label':"lit_2433",'name':"@2433",'lib':6,'tu':291,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804552FC,'size':4,'pad':0,'label':"lit_2434",'name':"@2434",'lib':6,'tu':291,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455300,'size':4,'pad':4,'label':"lit_2503",'name':"@2503",'lib':6,'tu':291,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455308,'size':4,'pad':0,'label':"lit_2318",'name':"@2318",'lib':6,'tu':292,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045530C,'size':4,'pad':0,'label':"lit_2319",'name':"@2319",'lib':6,'tu':292,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455310,'size':4,'pad':0,'label':"lit_2287",'name':"@2287",'lib':6,'tu':294,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455314,'size':4,'pad':0,'label':"lit_2288",'name':"@2288",'lib':6,'tu':294,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455314,'size':4,'pad':0,'label':"lit_2288",'name':"@2288",'lib':6,'tu':294,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455318,'size':4,'pad':4,'label':"lit_2289",'name':"@2289",'lib':6,'tu':294,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455320,'size':8,'pad':0,'label':"lit_2321",'name':"@2321",'lib':6,'tu':294,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455320,'size':8,'pad':0,'label':"lit_2321",'name':"@2321",'lib':6,'tu':294,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455328,'size':4,'pad':4,'label':"lit_2501",'name':"@2501",'lib':6,'tu':294,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455330,'size':8,'pad':0,'label':"lit_2503",'name':"@2503",'lib':6,'tu':294,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455338,'size':4,'pad':0,'label':"lit_2353",'name':"@2353",'lib':6,'tu':295,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455330,'size':8,'pad':0,'label':"lit_2503",'name':"@2503",'lib':6,'tu':294,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455338,'size':4,'pad':0,'label':"lit_2353",'name':"@2353",'lib':6,'tu':295,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045533C,'size':4,'pad':0,'label':"lit_2354",'name':"@2354",'lib':6,'tu':295,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455340,'size':4,'pad':0,'label':"lit_2459",'name':"@2459",'lib':6,'tu':295,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455344,'size':4,'pad':0,'label':"lit_2460",'name':"@2460",'lib':6,'tu':295,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455348,'size':4,'pad':0,'label':"lit_2461",'name':"@2461",'lib':6,'tu':295,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045534C,'size':4,'pad':0,'label':"lit_2656",'name':"@2656",'lib':6,'tu':295,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455350,'size':8,'pad':0,'label':"lit_2215",'name':"@2215",'lib':6,'tu':296,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455340,'size':4,'pad':0,'label':"lit_2459",'name':"@2459",'lib':6,'tu':295,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455344,'size':4,'pad':0,'label':"lit_2460",'name':"@2460",'lib':6,'tu':295,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455348,'size':4,'pad':0,'label':"lit_2461",'name':"@2461",'lib':6,'tu':295,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045534C,'size':4,'pad':0,'label':"lit_2656",'name':"@2656",'lib':6,'tu':295,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455350,'size':8,'pad':0,'label':"lit_2215",'name':"@2215",'lib':6,'tu':296,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455358,'size':4,'pad':0,'label':"lit_2632",'name':"@2632",'lib':6,'tu':299,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045535C,'size':4,'pad':0,'label':"lit_2633",'name':"@2633",'lib':6,'tu':299,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455360,'size':4,'pad':0,'label':"lit_2634",'name':"@2634",'lib':6,'tu':299,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455364,'size':4,'pad':0,'label':"lit_2635",'name':"@2635",'lib':6,'tu':299,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045535C,'size':4,'pad':0,'label':"lit_2633",'name':"@2633",'lib':6,'tu':299,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455360,'size':4,'pad':0,'label':"lit_2634",'name':"@2634",'lib':6,'tu':299,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455364,'size':4,'pad':0,'label':"lit_2635",'name':"@2635",'lib':6,'tu':299,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455368,'size':4,'pad':4,'label':"lit_2636",'name':"@2636",'lib':6,'tu':299,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455370,'size':4,'pad':0,'label':"lit_2440",'name':"@2440",'lib':6,'tu':300,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455370,'size':4,'pad':0,'label':"lit_2440",'name':"@2440",'lib':6,'tu':300,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455374,'size':4,'pad':0,'label':"lit_2441",'name':"@2441",'lib':6,'tu':300,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455378,'size':4,'pad':0,'label':"lit_2442",'name':"@2442",'lib':6,'tu':300,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045537C,'size':4,'pad':0,'label':"lit_2443",'name':"@2443",'lib':6,'tu':300,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455378,'size':4,'pad':0,'label':"lit_2442",'name':"@2442",'lib':6,'tu':300,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045537C,'size':4,'pad':0,'label':"lit_2443",'name':"@2443",'lib':6,'tu':300,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455380,'size':4,'pad':4,'label':"lit_2444",'name':"@2444",'lib':6,'tu':300,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455388,'size':4,'pad':0,'label':"lit_2565",'name':"@2565",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455388,'size':4,'pad':0,'label':"lit_2565",'name':"@2565",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045538C,'size':4,'pad':0,'label':"lit_2566",'name':"@2566",'lib':6,'tu':301,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455390,'size':4,'pad':0,'label':"lit_2567",'name':"@2567",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455394,'size':4,'pad':0,'label':"lit_2568",'name':"@2568",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455398,'size':4,'pad':0,'label':"lit_2569",'name':"@2569",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045539C,'size':4,'pad':0,'label':"lit_2570",'name':"@2570",'lib':6,'tu':301,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804553A0,'size':8,'pad':0,'label':"lit_2572",'name':"@2572",'lib':6,'tu':301,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804553A8,'size':8,'pad':0,'label':"lit_2574",'name':"@2574",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455390,'size':4,'pad':0,'label':"lit_2567",'name':"@2567",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455394,'size':4,'pad':0,'label':"lit_2568",'name':"@2568",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455398,'size':4,'pad':0,'label':"lit_2569",'name':"@2569",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045539C,'size':4,'pad':0,'label':"lit_2570",'name':"@2570",'lib':6,'tu':301,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804553A0,'size':8,'pad':0,'label':"lit_2572",'name':"@2572",'lib':6,'tu':301,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804553A8,'size':8,'pad':0,'label':"lit_2574",'name':"@2574",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804553B0,'size':4,'pad':4,'label':"lit_3010",'name':"@3010",'lib':6,'tu':301,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804553B8,'size':4,'pad':0,'label':"lit_2193",'name':"@2193",'lib':6,'tu':302,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804553B8,'size':4,'pad':0,'label':"lit_2193",'name':"@2193",'lib':6,'tu':302,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804553BC,'size':4,'pad':0,'label':"lit_2238",'name':"@2238",'lib':6,'tu':302,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804553C0,'size':4,'pad':4,'label':"lit_2239",'name':"@2239",'lib':6,'tu':302,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804553C8,'size':4,'pad':4,'label':"lit_343",'name':"@343",'lib':7,'tu':303,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804553C8,'size':4,'pad':4,'label':"lit_343",'name':"@343",'lib':7,'tu':303,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804553D0,'size':4,'pad':4,'label':"lit_302",'name':"@302",'lib':7,'tu':304,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804553D8,'size':4,'pad':4,'label':"lit_319",'name':"@319",'lib':7,'tu':305,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804553D8,'size':4,'pad':4,'label':"lit_319",'name':"@319",'lib':7,'tu':305,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804553E0,'size':4,'pad':0,'label':"lit_319",'name':"@319",'lib':7,'tu':306,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804553E4,'size':4,'pad':0,'label':"lit_336",'name':"@336",'lib':7,'tu':306,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804553E8,'size':4,'pad':4,'label':"lit_311",'name':"@311",'lib':7,'tu':307,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804553F0,'size':4,'pad':4,'label':"lit_338",'name':"@338",'lib':7,'tu':308,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804553F0,'size':4,'pad':4,'label':"lit_338",'name':"@338",'lib':7,'tu':308,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804553F8,'size':4,'pad':4,'label':"ga4cSignature__Q37JStudio3ctb4data",'name':"ga4cSignature__Q37JStudio3ctb4data",'lib':8,'tu':311,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455400,'size':8,'pad':0,'label':"lit_652",'name':"@652",'lib':8,'tu':312,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455408,'size':8,'pad':0,'label':"lit_792",'name':"@792",'lib':8,'tu':312,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455410,'size':8,'pad':0,'label':"lit_793",'name':"@793",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455418,'size':8,'pad':0,'label':"lit_794",'name':"@794",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455420,'size':8,'pad':0,'label':"lit_799",'name':"@799",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455428,'size':8,'pad':0,'label':"lit_800",'name':"@800",'lib':8,'tu':312,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455430,'size':8,'pad':0,'label':"lit_801",'name':"@801",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455438,'size':8,'pad':0,'label':"lit_842",'name':"@842",'lib':8,'tu':312,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455440,'size':8,'pad':0,'label':"lit_867",'name':"@867",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455448,'size':8,'pad':0,'label':"lit_1517",'name':"@1517",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455408,'size':8,'pad':0,'label':"lit_792",'name':"@792",'lib':8,'tu':312,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455410,'size':8,'pad':0,'label':"lit_793",'name':"@793",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455418,'size':8,'pad':0,'label':"lit_794",'name':"@794",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455420,'size':8,'pad':0,'label':"lit_799",'name':"@799",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455428,'size':8,'pad':0,'label':"lit_800",'name':"@800",'lib':8,'tu':312,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455430,'size':8,'pad':0,'label':"lit_801",'name':"@801",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455438,'size':8,'pad':0,'label':"lit_842",'name':"@842",'lib':8,'tu':312,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455440,'size':8,'pad':0,'label':"lit_867",'name':"@867",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455448,'size':8,'pad':0,'label':"lit_1517",'name':"@1517",'lib':8,'tu':312,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455450,'size':4,'pad':4,'label':"ga4cSignature__Q37JStudio3fvb4data",'name':"ga4cSignature__Q37JStudio3fvb4data",'lib':8,'tu':314,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455458,'size':4,'pad':0,'label':"lit_748",'name':"@748",'lib':8,'tu':316,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045545C,'size':4,'pad':0,'label':"lit_772",'name':"@772",'lib':8,'tu':316,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045545C,'size':4,'pad':0,'label':"lit_772",'name':"@772",'lib':8,'tu':316,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455460,'size':8,'pad':0,'label':"ga8cSignature__Q27JStudio4data",'name':"ga8cSignature__Q27JStudio4data",'lib':8,'tu':317,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455468,'size':4,'pad':0,'label':"lit_488",'name':"@488",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455468,'size':4,'pad':0,'label':"lit_488",'name':"@488",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045546C,'size':4,'pad':0,'label':"lit_489",'name':"@489",'lib':8,'tu':318,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455470,'size':8,'pad':0,'label':"lit_623",'name':"@623",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455478,'size':8,'pad':0,'label':"lit_624",'name':"@624",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455478,'size':8,'pad':0,'label':"lit_624",'name':"@624",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455480,'size':4,'pad':4,'label':"lit_625",'name':"@625",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455488,'size':8,'pad':0,'label':"lit_626",'name':"@626",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455490,'size':8,'pad':0,'label':"lit_627",'name':"@627",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455498,'size':8,'pad':0,'label':"lit_628",'name':"@628",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804554A0,'size':8,'pad':0,'label':"lit_803",'name':"@803",'lib':8,'tu':319,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455488,'size':8,'pad':0,'label':"lit_626",'name':"@626",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455490,'size':8,'pad':0,'label':"lit_627",'name':"@627",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455498,'size':8,'pad':0,'label':"lit_628",'name':"@628",'lib':8,'tu':318,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804554A0,'size':8,'pad':0,'label':"lit_803",'name':"@803",'lib':8,'tu':319,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804554A8,'size':4,'pad':0,'label':"lit_1094",'name':"@1094",'lib':8,'tu':319,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804554AC,'size':4,'pad':0,'label':"lit_1095",'name':"@1095",'lib':8,'tu':319,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804554AC,'size':4,'pad':0,'label':"lit_1095",'name':"@1095",'lib':8,'tu':319,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804554B0,'size':8,'pad':0,'label':"sauVariableValue_2_DISTANCE_NEAR_FAR__Q27JStudio15TAdaptor_camera",'name':"sauVariableValue_2_DISTANCE_NEAR_FAR__Q27JStudio15TAdaptor_camera",'lib':8,'tu':319,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804554B8,'size':8,'pad':0,'label':"sauVariableValue_2_RANGE_BEGIN_END__Q27JStudio12TAdaptor_fog",'name':"sauVariableValue_2_RANGE_BEGIN_END__Q27JStudio12TAdaptor_fog",'lib':8,'tu':319,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804554C0,'size':8,'pad':0,'label':"sauVariableValue_2_DIRECTION_THETA_PHI__Q27JStudio14TAdaptor_light",'name':"sauVariableValue_2_DIRECTION_THETA_PHI__Q27JStudio14TAdaptor_light",'lib':8,'tu':319,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804554C8,'size':4,'pad':4,'label':"lit_1967",'name':"@1967",'lib':8,'tu':319,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804554D0,'size':4,'pad':4,'label':"gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data",'name':"gu32Mask_TSequence_value_signExpansion__Q37JStudio3stb4data",'lib':8,'tu':321,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804554D8,'size':4,'pad':4,'label':"ga4cSignature__Q37JStudio3stb4data",'name':"ga4cSignature__Q37JStudio3stb4data",'lib':8,'tu':323,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804554E0,'size':4,'pad':4,'label':"lit_1081",'name':"@1081",'lib':9,'tu':326,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804554E8,'size':4,'pad':4,'label':"lit_846",'name':"@846",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804554F0,'size':8,'pad':0,'label':"lit_847",'name':"@847",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804554F8,'size':8,'pad':0,'label':"lit_848",'name':"@848",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804554E0,'size':4,'pad':4,'label':"lit_1081",'name':"@1081",'lib':9,'tu':326,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804554E8,'size':4,'pad':4,'label':"lit_846",'name':"@846",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804554F0,'size':8,'pad':0,'label':"lit_847",'name':"@847",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804554F8,'size':8,'pad':0,'label':"lit_848",'name':"@848",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455500,'size':8,'pad':0,'label':"lit_849",'name':"@849",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455508,'size':4,'pad':0,'label':"lit_850",'name':"@850",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045550C,'size':4,'pad':0,'label':"lit_898",'name':"@898",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455508,'size':4,'pad':0,'label':"lit_850",'name':"@850",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045550C,'size':4,'pad':0,'label':"lit_898",'name':"@898",'lib':9,'tu':330,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455510,'size':4,'pad':0,'label':"lit_1470",'name':"@1470",'lib':10,'tu':331,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455514,'size':4,'pad':0,'label':"lit_1805",'name':"@1805",'lib':10,'tu':331,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455518,'size':8,'pad':0,'label':"lit_1807",'name':"@1807",'lib':10,'tu':331,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455514,'size':4,'pad':0,'label':"lit_1805",'name':"@1805",'lib':10,'tu':331,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455518,'size':8,'pad':0,'label':"lit_1807",'name':"@1807",'lib':10,'tu':331,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455520,'size':4,'pad':0,'label':"lit_1361",'name':"@1361",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455524,'size':4,'pad':0,'label':"lit_1362",'name':"@1362",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455524,'size':4,'pad':0,'label':"lit_1362",'name':"@1362",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455528,'size':4,'pad':4,'label':"lit_1363",'name':"@1363",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455530,'size':8,'pad':0,'label':"lit_1622",'name':"@1622",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455538,'size':8,'pad':0,'label':"lit_1623",'name':"@1623",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455540,'size':8,'pad':0,'label':"lit_1624",'name':"@1624",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455548,'size':8,'pad':0,'label':"lit_1625",'name':"@1625",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455550,'size':8,'pad':0,'label':"lit_1629",'name':"@1629",'lib':11,'tu':332,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455530,'size':8,'pad':0,'label':"lit_1622",'name':"@1622",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455538,'size':8,'pad':0,'label':"lit_1623",'name':"@1623",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455540,'size':8,'pad':0,'label':"lit_1624",'name':"@1624",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455548,'size':8,'pad':0,'label':"lit_1625",'name':"@1625",'lib':11,'tu':332,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455550,'size':8,'pad':0,'label':"lit_1629",'name':"@1629",'lib':11,'tu':332,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455558,'size':4,'pad':4,'label':"lit_847",'name':"@847",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455560,'size':8,'pad':0,'label':"lit_850",'name':"@850",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455560,'size':8,'pad':0,'label':"lit_850",'name':"@850",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455568,'size':4,'pad':0,'label':"lit_969",'name':"@969",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045556C,'size':8,'pad':0,'label':"scale_frac",'name':"scale_frac$980",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455574,'size':8,'pad':0,'label':"two_to_frac",'name':"two_to_frac$981",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045557C,'size':4,'pad':0,'label':"lit_994",'name':"@994",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045557C,'size':4,'pad':0,'label':"lit_994",'name':"@994",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455580,'size':4,'pad':4,'label':"lit_995",'name':"@995",'lib':12,'tu':333,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455588,'size':4,'pad':0,'label':"lit_125",'name':"@125",'lib':12,'tu':339,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045558C,'size':4,'pad':0,'label':"lit_126",'name':"@126",'lib':12,'tu':339,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455588,'size':4,'pad':0,'label':"lit_125",'name':"@125",'lib':12,'tu':339,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045558C,'size':4,'pad':0,'label':"lit_126",'name':"@126",'lib':12,'tu':339,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455590,'size':4,'pad':4,'label':"lit_127",'name':"@127",'lib':12,'tu':339,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455598,'size':8,'pad':0,'label':"lit_129",'name':"@129",'lib':12,'tu':339,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455598,'size':8,'pad':0,'label':"lit_129",'name':"@129",'lib':12,'tu':339,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804555A0,'size':4,'pad':0,'label':"lit_457",'name':"@457",'lib':12,'tu':342,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804555A4,'size':4,'pad':0,'label':"lit_679",'name':"@679",'lib':12,'tu':342,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555A8,'size':4,'pad':0,'label':"lit_690",'name':"@690",'lib':12,'tu':342,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555AC,'size':4,'pad':0,'label':"lit_952",'name':"@952",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555B0,'size':8,'pad':0,'label':"lit_954",'name':"@954",'lib':12,'tu':342,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804555B8,'size':4,'pad':0,'label':"lit_1032",'name':"@1032",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555BC,'size':4,'pad':0,'label':"lit_1042",'name':"@1042",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555C0,'size':8,'pad':0,'label':"lit_1044",'name':"@1044",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804555C8,'size':4,'pad':0,'label':"lit_1069",'name':"@1069",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555CC,'size':4,'pad':0,'label':"lit_1070",'name':"@1070",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804555A4,'size':4,'pad':0,'label':"lit_679",'name':"@679",'lib':12,'tu':342,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555A8,'size':4,'pad':0,'label':"lit_690",'name':"@690",'lib':12,'tu':342,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555AC,'size':4,'pad':0,'label':"lit_952",'name':"@952",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555B0,'size':8,'pad':0,'label':"lit_954",'name':"@954",'lib':12,'tu':342,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555B8,'size':4,'pad':0,'label':"lit_1032",'name':"@1032",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555BC,'size':4,'pad':0,'label':"lit_1042",'name':"@1042",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555C0,'size':8,'pad':0,'label':"lit_1044",'name':"@1044",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555C8,'size':4,'pad':0,'label':"lit_1069",'name':"@1069",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555CC,'size':4,'pad':0,'label':"lit_1070",'name':"@1070",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804555D0,'size':4,'pad':0,'label':"FILTER_MODE_IIR__6JASDsp",'name':"FILTER_MODE_IIR__6JASDsp",'lib':12,'tu':342,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555D4,'size':4,'pad':0,'label':"lit_1246",'name':"@1246",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555D8,'size':4,'pad':0,'label':"lit_627",'name':"@627",'lib':12,'tu':346,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555DC,'size':4,'pad':0,'label':"lit_628",'name':"@628",'lib':12,'tu':346,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555E0,'size':4,'pad':0,'label':"lit_629",'name':"@629",'lib':12,'tu':346,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555E4,'size':4,'pad':0,'label':"lit_630",'name':"@630",'lib':12,'tu':346,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804555D4,'size':4,'pad':0,'label':"lit_1246",'name':"@1246",'lib':12,'tu':342,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555D8,'size':4,'pad':0,'label':"lit_627",'name':"@627",'lib':12,'tu':346,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555DC,'size':4,'pad':0,'label':"lit_628",'name':"@628",'lib':12,'tu':346,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555E0,'size':4,'pad':0,'label':"lit_629",'name':"@629",'lib':12,'tu':346,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555E4,'size':4,'pad':0,'label':"lit_630",'name':"@630",'lib':12,'tu':346,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804555E8,'size':4,'pad':4,'label':"lit_631",'name':"@631",'lib':12,'tu':346,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804555F0,'size':8,'pad':0,'label':"lit_634",'name':"@634",'lib':12,'tu':346,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804555F8,'size':4,'pad':0,'label':"lit_718",'name':"@718",'lib':12,'tu':346,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804555FC,'size':4,'pad':0,'label':"lit_719",'name':"@719",'lib':12,'tu':346,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804555F0,'size':8,'pad':0,'label':"lit_634",'name':"@634",'lib':12,'tu':346,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555F8,'size':4,'pad':0,'label':"lit_718",'name':"@718",'lib':12,'tu':346,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804555FC,'size':4,'pad':0,'label':"lit_719",'name':"@719",'lib':12,'tu':346,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455600,'size':4,'pad':4,'label':"lit_931",'name':"@931",'lib':12,'tu':346,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455608,'size':8,'pad':0,'label':"lit_1064",'name':"@1064",'lib':12,'tu':346,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455608,'size':8,'pad':0,'label':"lit_1064",'name':"@1064",'lib':12,'tu':346,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455610,'size':4,'pad':0,'label':"lit_390",'name':"@390",'lib':12,'tu':348,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455614,'size':4,'pad':0,'label':"lit_391",'name':"@391",'lib':12,'tu':348,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455618,'size':4,'pad':0,'label':"lit_392",'name':"@392",'lib':12,'tu':348,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045561C,'size':4,'pad':0,'label':"lit_531",'name':"@531",'lib':12,'tu':348,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455620,'size':8,'pad':0,'label':"lit_533",'name':"@533",'lib':12,'tu':348,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455614,'size':4,'pad':0,'label':"lit_391",'name':"@391",'lib':12,'tu':348,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455618,'size':4,'pad':0,'label':"lit_392",'name':"@392",'lib':12,'tu':348,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045561C,'size':4,'pad':0,'label':"lit_531",'name':"@531",'lib':12,'tu':348,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455620,'size':8,'pad':0,'label':"lit_533",'name':"@533",'lib':12,'tu':348,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455628,'size':4,'pad':4,'label':"one",'name':"one$776",'lib':12,'tu':348,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455630,'size':4,'pad':0,'label':"lit_248",'name':"@248",'lib':12,'tu':349,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455630,'size':4,'pad':0,'label':"lit_248",'name':"@248",'lib':12,'tu':349,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455634,'size':4,'pad':0,'label':"lit_249",'name':"@249",'lib':12,'tu':349,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455638,'size':4,'pad':0,'label':"lit_250",'name':"@250",'lib':12,'tu':349,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045563C,'size':4,'pad':0,'label':"lit_290",'name':"@290",'lib':12,'tu':349,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455638,'size':4,'pad':0,'label':"lit_250",'name':"@250",'lib':12,'tu':349,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045563C,'size':4,'pad':0,'label':"lit_290",'name':"@290",'lib':12,'tu':349,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455640,'size':4,'pad':4,'label':"lit_187",'name':"@187",'lib':12,'tu':352,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455648,'size':4,'pad':0,'label':"lit_219",'name':"@219",'lib':12,'tu':353,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455648,'size':4,'pad':0,'label':"lit_219",'name':"@219",'lib':12,'tu':353,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045564C,'size':4,'pad':0,'label':"lit_220",'name':"@220",'lib':12,'tu':353,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455650,'size':4,'pad':4,'label':"lit_253",'name':"@253",'lib':12,'tu':353,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455658,'size':4,'pad':4,'label':"lit_835",'name':"@835",'lib':12,'tu':357,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455660,'size':8,'pad':0,'label':"lit_838",'name':"@838",'lib':12,'tu':357,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455668,'size':8,'pad':0,'label':"lit_990",'name':"@990",'lib':12,'tu':357,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455670,'size':4,'pad':0,'label':"lit_1045",'name':"@1045",'lib':12,'tu':357,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455660,'size':8,'pad':0,'label':"lit_838",'name':"@838",'lib':12,'tu':357,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455668,'size':8,'pad':0,'label':"lit_990",'name':"@990",'lib':12,'tu':357,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455670,'size':4,'pad':0,'label':"lit_1045",'name':"@1045",'lib':12,'tu':357,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455674,'size':4,'pad':0,'label':"lit_1046",'name':"@1046",'lib':12,'tu':357,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455678,'size':4,'pad':4,'label':"lit_1047",'name':"@1047",'lib':12,'tu':357,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455680,'size':4,'pad':0,'label':"lit_544",'name':"@544",'lib':12,'tu':359,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455680,'size':4,'pad':0,'label':"lit_544",'name':"@544",'lib':12,'tu':359,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455684,'size':4,'pad':0,'label':"lit_545",'name':"@545",'lib':12,'tu':359,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455688,'size':4,'pad':4,'label':"lit_546",'name':"@546",'lib':12,'tu':359,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455690,'size':8,'pad':0,'label':"lit_661",'name':"@661",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455698,'size':8,'pad':0,'label':"lit_685",'name':"@685",'lib':12,'tu':359,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455690,'size':8,'pad':0,'label':"lit_661",'name':"@661",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455698,'size':8,'pad':0,'label':"lit_685",'name':"@685",'lib':12,'tu':359,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804556A0,'size':4,'pad':4,'label':"lit_711",'name':"@711",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804556A8,'size':8,'pad':0,'label':"lit_714",'name':"@714",'lib':12,'tu':359,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804556B0,'size':4,'pad':0,'label':"lit_775",'name':"@775",'lib':12,'tu':359,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556B4,'size':4,'pad':0,'label':"lit_776",'name':"@776",'lib':12,'tu':359,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556B8,'size':4,'pad':0,'label':"lit_832",'name':"@832",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556BC,'size':4,'pad':0,'label':"lit_833",'name':"@833",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556C0,'size':4,'pad':0,'label':"lit_846",'name':"@846",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556C4,'size':4,'pad':0,'label':"lit_847",'name':"@847",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556C8,'size':4,'pad':0,'label':"lit_969",'name':"@969",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556CC,'size':4,'pad':0,'label':"lit_970",'name':"@970",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556D0,'size':4,'pad':0,'label':"lit_971",'name':"@971",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556D4,'size':4,'pad':0,'label':"lit_972",'name':"@972",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804556A8,'size':8,'pad':0,'label':"lit_714",'name':"@714",'lib':12,'tu':359,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556B0,'size':4,'pad':0,'label':"lit_775",'name':"@775",'lib':12,'tu':359,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556B4,'size':4,'pad':0,'label':"lit_776",'name':"@776",'lib':12,'tu':359,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556B8,'size':4,'pad':0,'label':"lit_832",'name':"@832",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556BC,'size':4,'pad':0,'label':"lit_833",'name':"@833",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556C0,'size':4,'pad':0,'label':"lit_846",'name':"@846",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556C4,'size':4,'pad':0,'label':"lit_847",'name':"@847",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556C8,'size':4,'pad':0,'label':"lit_969",'name':"@969",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556CC,'size':4,'pad':0,'label':"lit_970",'name':"@970",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556D0,'size':4,'pad':0,'label':"lit_971",'name':"@971",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556D4,'size':4,'pad':0,'label':"lit_972",'name':"@972",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804556D8,'size':4,'pad':4,'label':"lit_973",'name':"@973",'lib':12,'tu':359,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804556E0,'size':4,'pad':0,'label':"lit_341",'name':"@341",'lib':12,'tu':360,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804556E4,'size':4,'pad':0,'label':"lit_342",'name':"@342",'lib':12,'tu':360,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556E8,'size':4,'pad':0,'label':"lit_363",'name':"@363",'lib':12,'tu':360,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804556EC,'size':4,'pad':0,'label':"lit_364",'name':"@364",'lib':12,'tu':360,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804556E4,'size':4,'pad':0,'label':"lit_342",'name':"@342",'lib':12,'tu':360,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556E8,'size':4,'pad':0,'label':"lit_363",'name':"@363",'lib':12,'tu':360,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804556EC,'size':4,'pad':0,'label':"lit_364",'name':"@364",'lib':12,'tu':360,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804556F0,'size':4,'pad':4,'label':"lit_376",'name':"@376",'lib':12,'tu':360,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804556F8,'size':4,'pad':0,'label':"lit_77",'name':"@77",'lib':12,'tu':361,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804556FC,'size':4,'pad':0,'label':"lit_87",'name':"@87",'lib':12,'tu':361,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804556FC,'size':4,'pad':0,'label':"lit_87",'name':"@87",'lib':12,'tu':361,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455700,'size':4,'pad':4,'label':"lit_88",'name':"@88",'lib':12,'tu':361,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455708,'size':8,'pad':0,'label':"lit_91",'name':"@91",'lib':12,'tu':361,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455708,'size':8,'pad':0,'label':"lit_91",'name':"@91",'lib':12,'tu':361,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455710,'size':4,'pad':4,'label':"lit_154",'name':"@154",'lib':12,'tu':361,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455718,'size':8,'pad':0,'label':"lit_156",'name':"@156",'lib':12,'tu':361,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455720,'size':4,'pad':0,'label':"lit_233",'name':"@233",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455724,'size':4,'pad':0,'label':"lit_234",'name':"@234",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455728,'size':4,'pad':0,'label':"lit_235",'name':"@235",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045572C,'size':4,'pad':0,'label':"lit_275",'name':"@275",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455718,'size':8,'pad':0,'label':"lit_156",'name':"@156",'lib':12,'tu':361,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455720,'size':4,'pad':0,'label':"lit_233",'name':"@233",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455724,'size':4,'pad':0,'label':"lit_234",'name':"@234",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455728,'size':4,'pad':0,'label':"lit_235",'name':"@235",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045572C,'size':4,'pad':0,'label':"lit_275",'name':"@275",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455730,'size':4,'pad':4,'label':"lit_276",'name':"@276",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455738,'size':8,'pad':0,'label':"lit_278",'name':"@278",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455740,'size':8,'pad':0,'label':"lit_156",'name':"@156",'lib':12,'tu':364,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455748,'size':4,'pad':0,'label':"lit_176",'name':"@176",'lib':12,'tu':366,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455738,'size':8,'pad':0,'label':"lit_278",'name':"@278",'lib':12,'tu':362,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455740,'size':8,'pad':0,'label':"lit_156",'name':"@156",'lib':12,'tu':364,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455748,'size':4,'pad':0,'label':"lit_176",'name':"@176",'lib':12,'tu':366,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045574C,'size':8,'pad':0,'label':"COMP_BLOCKSAMPLES",'name':"COMP_BLOCKSAMPLES$331",'lib':12,'tu':366,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455754,'size':8,'pad':0,'label':"COMP_BLOCKBYTES",'name':"COMP_BLOCKBYTES$332",'lib':12,'tu':366,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045575C,'size':4,'pad':0,'label':"pad_8045575C",'name':None,'lib':12,'tu':366,'section':8,'r':[0,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455760,'size':4,'pad':0,'label':"lit_299",'name':"@299",'lib':12,'tu':368,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455764,'size':4,'pad':0,'label':"lit_300",'name':"@300",'lib':12,'tu':368,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455768,'size':4,'pad':0,'label':"lit_301",'name':"@301",'lib':12,'tu':368,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045576C,'size':4,'pad':0,'label':"lit_311",'name':"@311",'lib':12,'tu':368,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455764,'size':4,'pad':0,'label':"lit_300",'name':"@300",'lib':12,'tu':368,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455768,'size':4,'pad':0,'label':"lit_301",'name':"@301",'lib':12,'tu':368,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045576C,'size':4,'pad':0,'label':"lit_311",'name':"@311",'lib':12,'tu':368,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455770,'size':4,'pad':4,'label':"lit_333",'name':"@333",'lib':12,'tu':369,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455778,'size':4,'pad':0,'label':"lit_626",'name':"@626",'lib':12,'tu':375,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455778,'size':4,'pad':0,'label':"lit_626",'name':"@626",'lib':12,'tu':375,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045577C,'size':4,'pad':0,'label':"lit_627",'name':"@627",'lib':12,'tu':375,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455780,'size':4,'pad':0,'label':"lit_628",'name':"@628",'lib':12,'tu':375,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455784,'size':4,'pad':0,'label':"lit_736",'name':"@736",'lib':12,'tu':375,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455788,'size':4,'pad':0,'label':"lit_822",'name':"@822",'lib':12,'tu':376,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045578C,'size':4,'pad':0,'label':"lit_1040",'name':"@1040",'lib':12,'tu':376,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455780,'size':4,'pad':0,'label':"lit_628",'name':"@628",'lib':12,'tu':375,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455784,'size':4,'pad':0,'label':"lit_736",'name':"@736",'lib':12,'tu':375,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455788,'size':4,'pad':0,'label':"lit_822",'name':"@822",'lib':12,'tu':376,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045578C,'size':4,'pad':0,'label':"lit_1040",'name':"@1040",'lib':12,'tu':376,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455790,'size':4,'pad':0,'label':"lit_1041",'name':"@1041",'lib':12,'tu':376,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455794,'size':4,'pad':0,'label':"lit_1042",'name':"@1042",'lib':12,'tu':376,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455798,'size':4,'pad':0,'label':"lit_642",'name':"@642",'lib':12,'tu':377,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455794,'size':4,'pad':0,'label':"lit_1042",'name':"@1042",'lib':12,'tu':376,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455798,'size':4,'pad':0,'label':"lit_642",'name':"@642",'lib':12,'tu':377,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045579C,'size':4,'pad':0,'label':"lit_643",'name':"@643",'lib':12,'tu':377,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804557A0,'size':4,'pad':4,'label':"lit_644",'name':"@644",'lib':12,'tu':377,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804557A8,'size':4,'pad':0,'label':"lit_691",'name':"@691",'lib':12,'tu':379,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804557A8,'size':4,'pad':0,'label':"lit_691",'name':"@691",'lib':12,'tu':379,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804557AC,'size':4,'pad':0,'label':"lit_692",'name':"@692",'lib':12,'tu':379,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804557B0,'size':4,'pad':4,'label':"lit_693",'name':"@693",'lib':12,'tu':379,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804557B8,'size':4,'pad':0,'label':"lit_659",'name':"@659",'lib':12,'tu':380,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804557BC,'size':4,'pad':0,'label':"lit_697",'name':"@697",'lib':12,'tu':380,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804557C0,'size':4,'pad':4,'label':"lit_698",'name':"@698",'lib':12,'tu':380,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804557C8,'size':8,'pad':0,'label':"lit_766",'name':"@766",'lib':12,'tu':380,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804557B8,'size':4,'pad':0,'label':"lit_659",'name':"@659",'lib':12,'tu':380,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804557BC,'size':4,'pad':0,'label':"lit_697",'name':"@697",'lib':12,'tu':380,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804557C0,'size':4,'pad':4,'label':"lit_698",'name':"@698",'lib':12,'tu':380,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804557C8,'size':8,'pad':0,'label':"lit_766",'name':"@766",'lib':12,'tu':380,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804557D0,'size':4,'pad':4,'label':"lit_887",'name':"@887",'lib':12,'tu':380,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804557D8,'size':4,'pad':0,'label':"lit_689",'name':"@689",'lib':12,'tu':381,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804557D8,'size':4,'pad':0,'label':"lit_689",'name':"@689",'lib':12,'tu':381,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804557DC,'size':4,'pad':0,'label':"lit_690",'name':"@690",'lib':12,'tu':381,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804557E0,'size':4,'pad':4,'label':"lit_691",'name':"@691",'lib':12,'tu':381,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804557E8,'size':8,'pad':0,'label':"lit_292",'name':"@292",'lib':12,'tu':384,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804557F0,'size':4,'pad':0,'label':"lit_864",'name':"@864",'lib':12,'tu':386,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804557E8,'size':8,'pad':0,'label':"lit_292",'name':"@292",'lib':12,'tu':384,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804557F0,'size':4,'pad':0,'label':"lit_864",'name':"@864",'lib':12,'tu':386,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804557F4,'size':4,'pad':0,'label':"lit_865",'name':"@865",'lib':12,'tu':386,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804557F8,'size':4,'pad':4,'label':"lit_866",'name':"@866",'lib':12,'tu':386,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455800,'size':4,'pad':0,'label':"lit_653",'name':"@653",'lib':12,'tu':388,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455800,'size':4,'pad':0,'label':"lit_653",'name':"@653",'lib':12,'tu':388,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455804,'size':4,'pad':0,'label':"lit_654",'name':"@654",'lib':12,'tu':388,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455808,'size':4,'pad':4,'label':"lit_655",'name':"@655",'lib':12,'tu':388,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455810,'size':4,'pad':4,'label':"lit_730",'name':"@730",'lib':12,'tu':394,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455818,'size':4,'pad':4,'label':"ga4cSignature__Q28JMessage4data",'name':"ga4cSignature__Q28JMessage4data",'lib':13,'tu':401,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455820,'size':4,'pad':0,'label':"cEqualCSlope__6Z2Calc",'name':"cEqualCSlope__6Z2Calc",'lib':14,'tu':405,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455824,'size':4,'pad':0,'label':"cEqualPSlope__6Z2Calc",'name':"cEqualPSlope__6Z2Calc",'lib':14,'tu':405,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455820,'size':4,'pad':0,'label':"cEqualCSlope__6Z2Calc",'name':"cEqualCSlope__6Z2Calc",'lib':14,'tu':405,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455824,'size':4,'pad':0,'label':"cEqualPSlope__6Z2Calc",'name':"cEqualPSlope__6Z2Calc",'lib':14,'tu':405,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455828,'size':4,'pad':0,'label':"lit_380",'name':"@380",'lib':14,'tu':405,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045582C,'size':4,'pad':0,'label':"lit_381",'name':"@381",'lib':14,'tu':405,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455830,'size':4,'pad':0,'label':"lit_396",'name':"@396",'lib':14,'tu':405,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455834,'size':4,'pad':0,'label':"lit_397",'name':"@397",'lib':14,'tu':405,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455838,'size':4,'pad':0,'label':"lit_3688",'name':"@3688",'lib':14,'tu':408,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045583C,'size':4,'pad':0,'label':"lit_3689",'name':"@3689",'lib':14,'tu':408,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455840,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':14,'tu':408,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045582C,'size':4,'pad':0,'label':"lit_381",'name':"@381",'lib':14,'tu':405,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455830,'size':4,'pad':0,'label':"lit_396",'name':"@396",'lib':14,'tu':405,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455834,'size':4,'pad':0,'label':"lit_397",'name':"@397",'lib':14,'tu':405,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455838,'size':4,'pad':0,'label':"lit_3688",'name':"@3688",'lib':14,'tu':408,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045583C,'size':4,'pad':0,'label':"lit_3689",'name':"@3689",'lib':14,'tu':408,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455840,'size':4,'pad':0,'label':"lit_3904",'name':"@3904",'lib':14,'tu':408,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455844,'size':4,'pad':0,'label':"lit_3905",'name':"@3905",'lib':14,'tu':408,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455848,'size':8,'pad':0,'label':"lit_3909",'name':"@3909",'lib':14,'tu':408,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455848,'size':8,'pad':0,'label':"lit_3909",'name':"@3909",'lib':14,'tu':408,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455850,'size':4,'pad':4,'label':"lit_4313",'name':"@4313",'lib':14,'tu':408,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455858,'size':4,'pad':0,'label':"lit_3597",'name':"@3597",'lib':14,'tu':409,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045585C,'size':4,'pad':0,'label':"lit_3598",'name':"@3598",'lib':14,'tu':409,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455860,'size':4,'pad':0,'label':"lit_3599",'name':"@3599",'lib':14,'tu':409,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455864,'size':4,'pad':0,'label':"lit_3713",'name':"@3713",'lib':14,'tu':409,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455868,'size':8,'pad':0,'label':"lit_3717",'name':"@3717",'lib':14,'tu':409,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455870,'size':4,'pad':0,'label':"lit_4038",'name':"@4038",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455874,'size':4,'pad':0,'label':"lit_4039",'name':"@4039",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045585C,'size':4,'pad':0,'label':"lit_3598",'name':"@3598",'lib':14,'tu':409,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455860,'size':4,'pad':0,'label':"lit_3599",'name':"@3599",'lib':14,'tu':409,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455864,'size':4,'pad':0,'label':"lit_3713",'name':"@3713",'lib':14,'tu':409,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455868,'size':8,'pad':0,'label':"lit_3717",'name':"@3717",'lib':14,'tu':409,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455870,'size':4,'pad':0,'label':"lit_4038",'name':"@4038",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455874,'size':4,'pad':0,'label':"lit_4039",'name':"@4039",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455878,'size':4,'pad':0,'label':"lit_4040",'name':"@4040",'lib':14,'tu':411,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045587C,'size':4,'pad':0,'label':"lit_4041",'name':"@4041",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455880,'size':4,'pad':0,'label':"lit_4042",'name':"@4042",'lib':14,'tu':411,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455884,'size':4,'pad':0,'label':"lit_4043",'name':"@4043",'lib':14,'tu':411,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455888,'size':4,'pad':0,'label':"lit_4044",'name':"@4044",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045588C,'size':4,'pad':0,'label':"lit_4045",'name':"@4045",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455890,'size':4,'pad':0,'label':"lit_4046",'name':"@4046",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455894,'size':4,'pad':0,'label':"lit_4047",'name':"@4047",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455898,'size':4,'pad':0,'label':"lit_4048",'name':"@4048",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045589C,'size':4,'pad':0,'label':"lit_4049",'name':"@4049",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558A0,'size':4,'pad':0,'label':"lit_4050",'name':"@4050",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558A4,'size':4,'pad':0,'label':"lit_4051",'name':"@4051",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558A8,'size':4,'pad':0,'label':"lit_4052",'name':"@4052",'lib':14,'tu':411,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558AC,'size':4,'pad':0,'label':"lit_4053",'name':"@4053",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558B0,'size':4,'pad':0,'label':"lit_4054",'name':"@4054",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558B4,'size':4,'pad':0,'label':"lit_4055",'name':"@4055",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558B8,'size':4,'pad':0,'label':"lit_4056",'name':"@4056",'lib':14,'tu':411,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558BC,'size':4,'pad':0,'label':"lit_4057",'name':"@4057",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558C0,'size':4,'pad':0,'label':"lit_4058",'name':"@4058",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558C4,'size':4,'pad':0,'label':"lit_4059",'name':"@4059",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558C8,'size':4,'pad':0,'label':"lit_4060",'name':"@4060",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558CC,'size':4,'pad':0,'label':"lit_4061",'name':"@4061",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558D0,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558D4,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558D8,'size':8,'pad':0,'label':"lit_4067",'name':"@4067",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804558E0,'size':8,'pad':0,'label':"lit_4070",'name':"@4070",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804558E8,'size':4,'pad':0,'label':"lit_4586",'name':"@4586",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558EC,'size':4,'pad':0,'label':"lit_4587",'name':"@4587",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558F0,'size':4,'pad':0,'label':"lit_4588",'name':"@4588",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804558F4,'size':4,'pad':0,'label':"lit_4589",'name':"@4589",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045587C,'size':4,'pad':0,'label':"lit_4041",'name':"@4041",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455880,'size':4,'pad':0,'label':"lit_4042",'name':"@4042",'lib':14,'tu':411,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455884,'size':4,'pad':0,'label':"lit_4043",'name':"@4043",'lib':14,'tu':411,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455888,'size':4,'pad':0,'label':"lit_4044",'name':"@4044",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045588C,'size':4,'pad':0,'label':"lit_4045",'name':"@4045",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455890,'size':4,'pad':0,'label':"lit_4046",'name':"@4046",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455894,'size':4,'pad':0,'label':"lit_4047",'name':"@4047",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455898,'size':4,'pad':0,'label':"lit_4048",'name':"@4048",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045589C,'size':4,'pad':0,'label':"lit_4049",'name':"@4049",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558A0,'size':4,'pad':0,'label':"lit_4050",'name':"@4050",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558A4,'size':4,'pad':0,'label':"lit_4051",'name':"@4051",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558A8,'size':4,'pad':0,'label':"lit_4052",'name':"@4052",'lib':14,'tu':411,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558AC,'size':4,'pad':0,'label':"lit_4053",'name':"@4053",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558B0,'size':4,'pad':0,'label':"lit_4054",'name':"@4054",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558B4,'size':4,'pad':0,'label':"lit_4055",'name':"@4055",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558B8,'size':4,'pad':0,'label':"lit_4056",'name':"@4056",'lib':14,'tu':411,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558BC,'size':4,'pad':0,'label':"lit_4057",'name':"@4057",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558C0,'size':4,'pad':0,'label':"lit_4058",'name':"@4058",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558C4,'size':4,'pad':0,'label':"lit_4059",'name':"@4059",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558C8,'size':4,'pad':0,'label':"lit_4060",'name':"@4060",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558CC,'size':4,'pad':0,'label':"lit_4061",'name':"@4061",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558D0,'size':4,'pad':0,'label':"lit_4062",'name':"@4062",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558D4,'size':4,'pad':0,'label':"lit_4063",'name':"@4063",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558D8,'size':8,'pad':0,'label':"lit_4067",'name':"@4067",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558E0,'size':8,'pad':0,'label':"lit_4070",'name':"@4070",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558E8,'size':4,'pad':0,'label':"lit_4586",'name':"@4586",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558EC,'size':4,'pad':0,'label':"lit_4587",'name':"@4587",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558F0,'size':4,'pad':0,'label':"lit_4588",'name':"@4588",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804558F4,'size':4,'pad':0,'label':"lit_4589",'name':"@4589",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804558F8,'size':4,'pad':4,'label':"lit_4590",'name':"@4590",'lib':14,'tu':411,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455900,'size':8,'pad':0,'label':"lit_4591",'name':"@4591",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455908,'size':8,'pad':0,'label':"lit_4592",'name':"@4592",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455910,'size':8,'pad':0,'label':"lit_4593",'name':"@4593",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455918,'size':8,'pad':0,'label':"lit_4594",'name':"@4594",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455920,'size':8,'pad':0,'label':"lit_4595",'name':"@4595",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455928,'size':8,'pad':0,'label':"lit_4596",'name':"@4596",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455930,'size':8,'pad':0,'label':"lit_4597",'name':"@4597",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455938,'size':4,'pad':0,'label':"lit_4598",'name':"@4598",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045593C,'size':4,'pad':0,'label':"lit_4599",'name':"@4599",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455940,'size':4,'pad':0,'label':"lit_4600",'name':"@4600",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455944,'size':4,'pad':0,'label':"lit_4601",'name':"@4601",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455948,'size':4,'pad':0,'label':"lit_4602",'name':"@4602",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045594C,'size':4,'pad':0,'label':"lit_4603",'name':"@4603",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455950,'size':4,'pad':0,'label':"lit_4604",'name':"@4604",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455954,'size':4,'pad':0,'label':"lit_4605",'name':"@4605",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455900,'size':8,'pad':0,'label':"lit_4591",'name':"@4591",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455908,'size':8,'pad':0,'label':"lit_4592",'name':"@4592",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455910,'size':8,'pad':0,'label':"lit_4593",'name':"@4593",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455918,'size':8,'pad':0,'label':"lit_4594",'name':"@4594",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455920,'size':8,'pad':0,'label':"lit_4595",'name':"@4595",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455928,'size':8,'pad':0,'label':"lit_4596",'name':"@4596",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455930,'size':8,'pad':0,'label':"lit_4597",'name':"@4597",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455938,'size':4,'pad':0,'label':"lit_4598",'name':"@4598",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045593C,'size':4,'pad':0,'label':"lit_4599",'name':"@4599",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455940,'size':4,'pad':0,'label':"lit_4600",'name':"@4600",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455944,'size':4,'pad':0,'label':"lit_4601",'name':"@4601",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455948,'size':4,'pad':0,'label':"lit_4602",'name':"@4602",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045594C,'size':4,'pad':0,'label':"lit_4603",'name':"@4603",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455950,'size':4,'pad':0,'label':"lit_4604",'name':"@4604",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455954,'size':4,'pad':0,'label':"lit_4605",'name':"@4605",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455958,'size':4,'pad':4,'label':"lit_4606",'name':"@4606",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455960,'size':8,'pad':0,'label':"lit_4607",'name':"@4607",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455968,'size':8,'pad':0,'label':"lit_4608",'name':"@4608",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455960,'size':8,'pad':0,'label':"lit_4607",'name':"@4607",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455968,'size':8,'pad':0,'label':"lit_4608",'name':"@4608",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455970,'size':8,'pad':0,'label':"lit_4609",'name':"@4609",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455978,'size':4,'pad':0,'label':"lit_4610",'name':"@4610",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045597C,'size':4,'pad':0,'label':"lit_4611",'name':"@4611",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455980,'size':4,'pad':0,'label':"lit_4612",'name':"@4612",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455984,'size':4,'pad':0,'label':"lit_4613",'name':"@4613",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455988,'size':4,'pad':0,'label':"lit_4614",'name':"@4614",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045598C,'size':4,'pad':0,'label':"lit_4615",'name':"@4615",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455990,'size':4,'pad':0,'label':"lit_5085",'name':"@5085",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455994,'size':4,'pad':0,'label':"lit_5134",'name':"@5134",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455998,'size':4,'pad':0,'label':"lit_3372",'name':"@3372",'lib':14,'tu':412,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455978,'size':4,'pad':0,'label':"lit_4610",'name':"@4610",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045597C,'size':4,'pad':0,'label':"lit_4611",'name':"@4611",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455980,'size':4,'pad':0,'label':"lit_4612",'name':"@4612",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455984,'size':4,'pad':0,'label':"lit_4613",'name':"@4613",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455988,'size':4,'pad':0,'label':"lit_4614",'name':"@4614",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045598C,'size':4,'pad':0,'label':"lit_4615",'name':"@4615",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455990,'size':4,'pad':0,'label':"lit_5085",'name':"@5085",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455994,'size':4,'pad':0,'label':"lit_5134",'name':"@5134",'lib':14,'tu':411,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455998,'size':4,'pad':0,'label':"lit_3372",'name':"@3372",'lib':14,'tu':412,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045599C,'size':4,'pad':0,'label':"lit_3373",'name':"@3373",'lib':14,'tu':412,'section':8,'r':[23,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804559A0,'size':4,'pad':4,'label':"lit_3559",'name':"@3559",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804559A8,'size':8,'pad':0,'label':"lit_3561",'name':"@3561",'lib':14,'tu':412,'section':8,'r':[22,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804559B0,'size':4,'pad':0,'label':"lit_4726",'name':"@4726",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559B4,'size':4,'pad':0,'label':"lit_4727",'name':"@4727",'lib':14,'tu':412,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559B8,'size':4,'pad':0,'label':"lit_4728",'name':"@4728",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559BC,'size':4,'pad':0,'label':"lit_4729",'name':"@4729",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559C0,'size':4,'pad':0,'label':"lit_4730",'name':"@4730",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559C4,'size':4,'pad':0,'label':"lit_4731",'name':"@4731",'lib':14,'tu':412,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559C8,'size':4,'pad':0,'label':"lit_4732",'name':"@4732",'lib':14,'tu':412,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559CC,'size':4,'pad':0,'label':"lit_4733",'name':"@4733",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559D0,'size':4,'pad':0,'label':"lit_4734",'name':"@4734",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559D4,'size':4,'pad':0,'label':"lit_4735",'name':"@4735",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559D8,'size':4,'pad':0,'label':"lit_4736",'name':"@4736",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559DC,'size':4,'pad':0,'label':"lit_4737",'name':"@4737",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804559A8,'size':8,'pad':0,'label':"lit_3561",'name':"@3561",'lib':14,'tu':412,'section':8,'r':[22,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559B0,'size':4,'pad':0,'label':"lit_4726",'name':"@4726",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559B4,'size':4,'pad':0,'label':"lit_4727",'name':"@4727",'lib':14,'tu':412,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559B8,'size':4,'pad':0,'label':"lit_4728",'name':"@4728",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559BC,'size':4,'pad':0,'label':"lit_4729",'name':"@4729",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559C0,'size':4,'pad':0,'label':"lit_4730",'name':"@4730",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559C4,'size':4,'pad':0,'label':"lit_4731",'name':"@4731",'lib':14,'tu':412,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559C8,'size':4,'pad':0,'label':"lit_4732",'name':"@4732",'lib':14,'tu':412,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559CC,'size':4,'pad':0,'label':"lit_4733",'name':"@4733",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559D0,'size':4,'pad':0,'label':"lit_4734",'name':"@4734",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559D4,'size':4,'pad':0,'label':"lit_4735",'name':"@4735",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559D8,'size':4,'pad':0,'label':"lit_4736",'name':"@4736",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559DC,'size':4,'pad':0,'label':"lit_4737",'name':"@4737",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804559E0,'size':4,'pad':4,'label':"lit_4738",'name':"@4738",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804559E8,'size':8,'pad':0,'label':"lit_4741",'name':"@4741",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804559F0,'size':4,'pad':0,'label':"lit_5673",'name':"@5673",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559F4,'size':4,'pad':0,'label':"lit_5674",'name':"@5674",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559F8,'size':4,'pad':0,'label':"lit_5675",'name':"@5675",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804559FC,'size':4,'pad':0,'label':"lit_5676",'name':"@5676",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A00,'size':4,'pad':0,'label':"lit_5677",'name':"@5677",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A04,'size':4,'pad':0,'label':"lit_5678",'name':"@5678",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A08,'size':4,'pad':0,'label':"lit_5679",'name':"@5679",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A0C,'size':4,'pad':0,'label':"lit_5680",'name':"@5680",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A10,'size':4,'pad':0,'label':"lit_5681",'name':"@5681",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A14,'size':4,'pad':0,'label':"lit_5913",'name':"@5913",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A18,'size':4,'pad':0,'label':"lit_3395",'name':"@3395",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804559E8,'size':8,'pad':0,'label':"lit_4741",'name':"@4741",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559F0,'size':4,'pad':0,'label':"lit_5673",'name':"@5673",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559F4,'size':4,'pad':0,'label':"lit_5674",'name':"@5674",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559F8,'size':4,'pad':0,'label':"lit_5675",'name':"@5675",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804559FC,'size':4,'pad':0,'label':"lit_5676",'name':"@5676",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A00,'size':4,'pad':0,'label':"lit_5677",'name':"@5677",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A04,'size':4,'pad':0,'label':"lit_5678",'name':"@5678",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A08,'size':4,'pad':0,'label':"lit_5679",'name':"@5679",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A0C,'size':4,'pad':0,'label':"lit_5680",'name':"@5680",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A10,'size':4,'pad':0,'label':"lit_5681",'name':"@5681",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A14,'size':4,'pad':0,'label':"lit_5913",'name':"@5913",'lib':14,'tu':412,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A18,'size':4,'pad':0,'label':"lit_3395",'name':"@3395",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455A1C,'size':4,'pad':0,'label':"lit_3396",'name':"@3396",'lib':14,'tu':413,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455A20,'size':4,'pad':0,'label':"lit_3467",'name':"@3467",'lib':14,'tu':413,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A24,'size':4,'pad':0,'label':"lit_3468",'name':"@3468",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A28,'size':8,'pad':0,'label':"lit_3731",'name':"@3731",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455A30,'size':4,'pad':0,'label':"lit_3798",'name':"@3798",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A34,'size':4,'pad':0,'label':"lit_3799",'name':"@3799",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455A20,'size':4,'pad':0,'label':"lit_3467",'name':"@3467",'lib':14,'tu':413,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A24,'size':4,'pad':0,'label':"lit_3468",'name':"@3468",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A28,'size':8,'pad':0,'label':"lit_3731",'name':"@3731",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A30,'size':4,'pad':0,'label':"lit_3798",'name':"@3798",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A34,'size':4,'pad':0,'label':"lit_3799",'name':"@3799",'lib':14,'tu':413,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455A38,'size':4,'pad':0,'label':"lit_3511",'name':"@3511",'lib':14,'tu':414,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455A3C,'size':4,'pad':0,'label':"lit_3512",'name':"@3512",'lib':14,'tu':414,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455A3C,'size':4,'pad':0,'label':"lit_3512",'name':"@3512",'lib':14,'tu':414,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455A40,'size':4,'pad':4,'label':"lit_3529",'name':"@3529",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455A48,'size':8,'pad':0,'label':"lit_3531",'name':"@3531",'lib':14,'tu':414,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455A50,'size':4,'pad':0,'label':"lit_5341",'name':"@5341",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A54,'size':4,'pad':0,'label':"lit_5342",'name':"@5342",'lib':14,'tu':414,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A58,'size':4,'pad':0,'label':"lit_5343",'name':"@5343",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A5C,'size':4,'pad':0,'label':"lit_5344",'name':"@5344",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A60,'size':4,'pad':0,'label':"lit_5345",'name':"@5345",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A64,'size':4,'pad':0,'label':"lit_5346",'name':"@5346",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A68,'size':4,'pad':0,'label':"lit_963",'name':"@963",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A6C,'size':4,'pad':0,'label':"lit_964",'name':"@964",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A70,'size':4,'pad':0,'label':"lit_965",'name':"@965",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A74,'size':4,'pad':0,'label':"lit_966",'name':"@966",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A78,'size':4,'pad':0,'label':"lit_967",'name':"@967",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455A48,'size':8,'pad':0,'label':"lit_3531",'name':"@3531",'lib':14,'tu':414,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A50,'size':4,'pad':0,'label':"lit_5341",'name':"@5341",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A54,'size':4,'pad':0,'label':"lit_5342",'name':"@5342",'lib':14,'tu':414,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A58,'size':4,'pad':0,'label':"lit_5343",'name':"@5343",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A5C,'size':4,'pad':0,'label':"lit_5344",'name':"@5344",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A60,'size':4,'pad':0,'label':"lit_5345",'name':"@5345",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A64,'size':4,'pad':0,'label':"lit_5346",'name':"@5346",'lib':14,'tu':414,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A68,'size':4,'pad':0,'label':"lit_963",'name':"@963",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A6C,'size':4,'pad':0,'label':"lit_964",'name':"@964",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A70,'size':4,'pad':0,'label':"lit_965",'name':"@965",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A74,'size':4,'pad':0,'label':"lit_966",'name':"@966",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455A78,'size':4,'pad':0,'label':"lit_967",'name':"@967",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455A7C,'size':4,'pad':0,'label':"lit_968",'name':"@968",'lib':14,'tu':416,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455A80,'size':4,'pad':4,'label':"lit_969",'name':"@969",'lib':14,'tu':416,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455A88,'size':8,'pad':0,'label':"lit_973",'name':"@973",'lib':14,'tu':416,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455A88,'size':8,'pad':0,'label':"lit_973",'name':"@973",'lib':14,'tu':416,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455A90,'size':4,'pad':0,'label':"STRM_CH_SHIFT__20JAUStdSoundTableType",'name':"STRM_CH_SHIFT__20JAUStdSoundTableType",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455A94,'size':4,'pad':0,'label':"lit_1010",'name':"@1010",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455A94,'size':4,'pad':0,'label':"lit_1010",'name':"@1010",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455A98,'size':4,'pad':4,'label':"lit_1070",'name':"@1070",'lib':14,'tu':416,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455AA0,'size':4,'pad':0,'label':"lit_848",'name':"@848",'lib':14,'tu':417,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455AA4,'size':4,'pad':0,'label':"lit_894",'name':"@894",'lib':14,'tu':417,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AA8,'size':4,'pad':0,'label':"lit_895",'name':"@895",'lib':14,'tu':417,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AAC,'size':4,'pad':0,'label':"lit_896",'name':"@896",'lib':14,'tu':417,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AB0,'size':4,'pad':0,'label':"lit_998",'name':"@998",'lib':14,'tu':417,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AB4,'size':4,'pad':0,'label':"lit_999",'name':"@999",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AB8,'size':4,'pad':0,'label':"lit_1000",'name':"@1000",'lib':14,'tu':417,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455ABC,'size':4,'pad':0,'label':"lit_1001",'name':"@1001",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AC0,'size':4,'pad':0,'label':"lit_1002",'name':"@1002",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AC4,'size':4,'pad':0,'label':"lit_1003",'name':"@1003",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455AA4,'size':4,'pad':0,'label':"lit_894",'name':"@894",'lib':14,'tu':417,'section':8,'r':[16,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AA8,'size':4,'pad':0,'label':"lit_895",'name':"@895",'lib':14,'tu':417,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AAC,'size':4,'pad':0,'label':"lit_896",'name':"@896",'lib':14,'tu':417,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AB0,'size':4,'pad':0,'label':"lit_998",'name':"@998",'lib':14,'tu':417,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AB4,'size':4,'pad':0,'label':"lit_999",'name':"@999",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AB8,'size':4,'pad':0,'label':"lit_1000",'name':"@1000",'lib':14,'tu':417,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455ABC,'size':4,'pad':0,'label':"lit_1001",'name':"@1001",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AC0,'size':4,'pad':0,'label':"lit_1002",'name':"@1002",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AC4,'size':4,'pad':0,'label':"lit_1003",'name':"@1003",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455AC8,'size':4,'pad':4,'label':"lit_1004",'name':"@1004",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455AD0,'size':8,'pad':0,'label':"lit_1008",'name':"@1008",'lib':14,'tu':417,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455AD8,'size':4,'pad':0,'label':"lit_1036",'name':"@1036",'lib':14,'tu':417,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455ADC,'size':4,'pad':0,'label':"lit_1058",'name':"@1058",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AE0,'size':4,'pad':0,'label':"lit_1059",'name':"@1059",'lib':14,'tu':417,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AE4,'size':4,'pad':0,'label':"lit_1060",'name':"@1060",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AE8,'size':4,'pad':0,'label':"lit_1061",'name':"@1061",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AEC,'size':4,'pad':0,'label':"lit_1062",'name':"@1062",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AF0,'size':4,'pad':0,'label':"lit_1063",'name':"@1063",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AF4,'size':4,'pad':0,'label':"lit_1064",'name':"@1064",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AF8,'size':4,'pad':0,'label':"lit_1065",'name':"@1065",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455AFC,'size':4,'pad':0,'label':"lit_1066",'name':"@1066",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B00,'size':4,'pad':0,'label':"lit_1067",'name':"@1067",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B04,'size':4,'pad':0,'label':"lit_1135",'name':"@1135",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B08,'size':4,'pad':0,'label':"lit_1267",'name':"@1267",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B0C,'size':4,'pad':0,'label':"lit_1268",'name':"@1268",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B10,'size':4,'pad':0,'label':"lit_1269",'name':"@1269",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B14,'size':4,'pad':0,'label':"lit_1270",'name':"@1270",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B18,'size':4,'pad':0,'label':"lit_1271",'name':"@1271",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B1C,'size':4,'pad':0,'label':"lit_1272",'name':"@1272",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B20,'size':4,'pad':0,'label':"lit_1273",'name':"@1273",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B24,'size':4,'pad':0,'label':"lit_1334",'name':"@1334",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B28,'size':4,'pad':0,'label':"lit_1335",'name':"@1335",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B2C,'size':4,'pad':0,'label':"lit_1336",'name':"@1336",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B30,'size':4,'pad':0,'label':"lit_1337",'name':"@1337",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B34,'size':4,'pad':0,'label':"lit_1988",'name':"@1988",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B38,'size':4,'pad':0,'label':"lit_3559",'name':"@3559",'lib':14,'tu':418,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B3C,'size':4,'pad':0,'label':"lit_3560",'name':"@3560",'lib':14,'tu':418,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455AD0,'size':8,'pad':0,'label':"lit_1008",'name':"@1008",'lib':14,'tu':417,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AD8,'size':4,'pad':0,'label':"lit_1036",'name':"@1036",'lib':14,'tu':417,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455ADC,'size':4,'pad':0,'label':"lit_1058",'name':"@1058",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AE0,'size':4,'pad':0,'label':"lit_1059",'name':"@1059",'lib':14,'tu':417,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AE4,'size':4,'pad':0,'label':"lit_1060",'name':"@1060",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AE8,'size':4,'pad':0,'label':"lit_1061",'name':"@1061",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AEC,'size':4,'pad':0,'label':"lit_1062",'name':"@1062",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AF0,'size':4,'pad':0,'label':"lit_1063",'name':"@1063",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AF4,'size':4,'pad':0,'label':"lit_1064",'name':"@1064",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AF8,'size':4,'pad':0,'label':"lit_1065",'name':"@1065",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455AFC,'size':4,'pad':0,'label':"lit_1066",'name':"@1066",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B00,'size':4,'pad':0,'label':"lit_1067",'name':"@1067",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B04,'size':4,'pad':0,'label':"lit_1135",'name':"@1135",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B08,'size':4,'pad':0,'label':"lit_1267",'name':"@1267",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B0C,'size':4,'pad':0,'label':"lit_1268",'name':"@1268",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B10,'size':4,'pad':0,'label':"lit_1269",'name':"@1269",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B14,'size':4,'pad':0,'label':"lit_1270",'name':"@1270",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B18,'size':4,'pad':0,'label':"lit_1271",'name':"@1271",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B1C,'size':4,'pad':0,'label':"lit_1272",'name':"@1272",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B20,'size':4,'pad':0,'label':"lit_1273",'name':"@1273",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B24,'size':4,'pad':0,'label':"lit_1334",'name':"@1334",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B28,'size':4,'pad':0,'label':"lit_1335",'name':"@1335",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B2C,'size':4,'pad':0,'label':"lit_1336",'name':"@1336",'lib':14,'tu':417,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B30,'size':4,'pad':0,'label':"lit_1337",'name':"@1337",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B34,'size':4,'pad':0,'label':"lit_1988",'name':"@1988",'lib':14,'tu':417,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B38,'size':4,'pad':0,'label':"lit_3559",'name':"@3559",'lib':14,'tu':418,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B3C,'size':4,'pad':0,'label':"lit_3560",'name':"@3560",'lib':14,'tu':418,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455B40,'size':4,'pad':4,'label':"lit_3561",'name':"@3561",'lib':14,'tu':418,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455B48,'size':8,'pad':0,'label':"lit_3564",'name':"@3564",'lib':14,'tu':418,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455B48,'size':8,'pad':0,'label':"lit_3564",'name':"@3564",'lib':14,'tu':418,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455B50,'size':4,'pad':0,'label':"lit_3821",'name':"@3821",'lib':14,'tu':418,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455B54,'size':4,'pad':0,'label':"lit_3822",'name':"@3822",'lib':14,'tu':418,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B58,'size':4,'pad':0,'label':"lit_3823",'name':"@3823",'lib':14,'tu':418,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B5C,'size':4,'pad':0,'label':"lit_3824",'name':"@3824",'lib':14,'tu':418,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455B54,'size':4,'pad':0,'label':"lit_3822",'name':"@3822",'lib':14,'tu':418,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B58,'size':4,'pad':0,'label':"lit_3823",'name':"@3823",'lib':14,'tu':418,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B5C,'size':4,'pad':0,'label':"lit_3824",'name':"@3824",'lib':14,'tu':418,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455B60,'size':4,'pad':4,'label':"lit_3825",'name':"@3825",'lib':14,'tu':418,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455B68,'size':8,'pad':0,'label':"lit_3828",'name':"@3828",'lib':14,'tu':418,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455B70,'size':4,'pad':0,'label':"lit_3859",'name':"@3859",'lib':14,'tu':418,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B74,'size':4,'pad':0,'label':"lit_3860",'name':"@3860",'lib':14,'tu':418,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B78,'size':4,'pad':0,'label':"lit_3861",'name':"@3861",'lib':14,'tu':418,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455B7C,'size':4,'pad':0,'label':"lit_3862",'name':"@3862",'lib':14,'tu':418,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455B68,'size':8,'pad':0,'label':"lit_3828",'name':"@3828",'lib':14,'tu':418,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B70,'size':4,'pad':0,'label':"lit_3859",'name':"@3859",'lib':14,'tu':418,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B74,'size':4,'pad':0,'label':"lit_3860",'name':"@3860",'lib':14,'tu':418,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B78,'size':4,'pad':0,'label':"lit_3861",'name':"@3861",'lib':14,'tu':418,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455B7C,'size':4,'pad':0,'label':"lit_3862",'name':"@3862",'lib':14,'tu':418,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455B80,'size':4,'pad':0,'label':"sAreaDefault",'name':"sAreaDefault",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455B84,'size':4,'pad':0,'label':"data_80455B84",'name':None,'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455B88,'size':4,'pad':0,'label':"sAreaFloating",'name':"sAreaFloating",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, @@ -26565,14 +26565,14 @@ SYMBOLS = [ {'addr':0x80455BA8,'size':4,'pad':0,'label':"sAreaSmallFloating",'name':"sAreaSmallFloating",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455BAC,'size':4,'pad':0,'label':"data_80455BAC",'name':None,'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455BB0,'size':4,'pad':0,'label':"lit_3694",'name':"@3694",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455BB4,'size':4,'pad':0,'label':"lit_3695",'name':"@3695",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455BB8,'size':4,'pad':0,'label':"lit_3696",'name':"@3696",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455BBC,'size':4,'pad':0,'label':"lit_3697",'name':"@3697",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455BC0,'size':4,'pad':0,'label':"lit_3698",'name':"@3698",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455BC4,'size':4,'pad':0,'label':"lit_3699",'name':"@3699",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455BC8,'size':4,'pad':0,'label':"lit_3700",'name':"@3700",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455BCC,'size':4,'pad':0,'label':"lit_3701",'name':"@3701",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455BD0,'size':8,'pad':0,'label':"lit_3703",'name':"@3703",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455BB4,'size':4,'pad':0,'label':"lit_3695",'name':"@3695",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455BB8,'size':4,'pad':0,'label':"lit_3696",'name':"@3696",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455BBC,'size':4,'pad':0,'label':"lit_3697",'name':"@3697",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455BC0,'size':4,'pad':0,'label':"lit_3698",'name':"@3698",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455BC4,'size':4,'pad':0,'label':"lit_3699",'name':"@3699",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455BC8,'size':4,'pad':0,'label':"lit_3700",'name':"@3700",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455BCC,'size':4,'pad':0,'label':"lit_3701",'name':"@3701",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455BD0,'size':8,'pad':0,'label':"lit_3703",'name':"@3703",'lib':14,'tu':419,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455BD8,'size':4,'pad':0,'label':"sAreaDefault",'name':"sAreaDefault",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455BDC,'size':4,'pad':0,'label':"data_80455BDC",'name':None,'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455BE0,'size':4,'pad':0,'label':"sAreaFloating",'name':"sAreaFloating",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, @@ -26585,169 +26585,169 @@ SYMBOLS = [ {'addr':0x80455BFC,'size':4,'pad':0,'label':"data_80455BFC",'name':None,'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455C00,'size':4,'pad':0,'label':"sAreaSmallFloating",'name':"sAreaSmallFloating",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80455C04,'size':4,'pad':0,'label':"data_80455C04",'name':None,'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C08,'size':4,'pad':0,'label':"lit_3663",'name':"@3663",'lib':14,'tu':420,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C0C,'size':4,'pad':0,'label':"lit_3664",'name':"@3664",'lib':14,'tu':420,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C10,'size':4,'pad':0,'label':"lit_3665",'name':"@3665",'lib':14,'tu':420,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C14,'size':4,'pad':0,'label':"lit_3666",'name':"@3666",'lib':14,'tu':420,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C18,'size':4,'pad':0,'label':"lit_3667",'name':"@3667",'lib':14,'tu':420,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C1C,'size':4,'pad':0,'label':"lit_3668",'name':"@3668",'lib':14,'tu':420,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455C08,'size':4,'pad':0,'label':"lit_3663",'name':"@3663",'lib':14,'tu':420,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C0C,'size':4,'pad':0,'label':"lit_3664",'name':"@3664",'lib':14,'tu':420,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C10,'size':4,'pad':0,'label':"lit_3665",'name':"@3665",'lib':14,'tu':420,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C14,'size':4,'pad':0,'label':"lit_3666",'name':"@3666",'lib':14,'tu':420,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C18,'size':4,'pad':0,'label':"lit_3667",'name':"@3667",'lib':14,'tu':420,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C1C,'size':4,'pad':0,'label':"lit_3668",'name':"@3668",'lib':14,'tu':420,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455C20,'size':4,'pad':4,'label':"lit_3669",'name':"@3669",'lib':14,'tu':420,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455C28,'size':8,'pad':0,'label':"lit_3672",'name':"@3672",'lib':14,'tu':420,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455C30,'size':4,'pad':0,'label':"lit_3716",'name':"@3716",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455C28,'size':8,'pad':0,'label':"lit_3672",'name':"@3672",'lib':14,'tu':420,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C30,'size':4,'pad':0,'label':"lit_3716",'name':"@3716",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455C34,'size':4,'pad':0,'label':"lit_3717",'name':"@3717",'lib':14,'tu':420,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455C38,'size':4,'pad':0,'label':"lit_3718",'name':"@3718",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C3C,'size':4,'pad':0,'label':"lit_3719",'name':"@3719",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C40,'size':4,'pad':0,'label':"lit_3720",'name':"@3720",'lib':14,'tu':420,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C44,'size':4,'pad':0,'label':"lit_4090",'name':"@4090",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C48,'size':4,'pad':0,'label':"lit_4091",'name':"@4091",'lib':14,'tu':420,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C4C,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':14,'tu':420,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C50,'size':4,'pad':0,'label':"lit_4187",'name':"@4187",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C54,'size':4,'pad':0,'label':"lit_4188",'name':"@4188",'lib':14,'tu':420,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C58,'size':4,'pad':0,'label':"lit_4189",'name':"@4189",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C5C,'size':4,'pad':0,'label':"lit_4190",'name':"@4190",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C60,'size':4,'pad':0,'label':"lit_4191",'name':"@4191",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C64,'size':4,'pad':0,'label':"lit_4192",'name':"@4192",'lib':14,'tu':420,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C68,'size':4,'pad':0,'label':"lit_4193",'name':"@4193",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C6C,'size':4,'pad':0,'label':"lit_4194",'name':"@4194",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C70,'size':4,'pad':0,'label':"lit_4561",'name':"@4561",'lib':14,'tu':420,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C74,'size':4,'pad':0,'label':"lit_4562",'name':"@4562",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C78,'size':4,'pad':0,'label':"lit_4681",'name':"@4681",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C7C,'size':4,'pad':0,'label':"lit_4682",'name':"@4682",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C80,'size':4,'pad':0,'label':"lit_4837",'name':"@4837",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C84,'size':4,'pad':0,'label':"lit_4838",'name':"@4838",'lib':14,'tu':420,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C88,'size':4,'pad':0,'label':"lit_4875",'name':"@4875",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C8C,'size':4,'pad':0,'label':"lit_4906",'name':"@4906",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C90,'size':4,'pad':0,'label':"lit_4944",'name':"@4944",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C94,'size':4,'pad':0,'label':"lit_4945",'name':"@4945",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C98,'size':4,'pad':0,'label':"lit_3721",'name':"@3721",'lib':14,'tu':421,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455C9C,'size':4,'pad':0,'label':"lit_3722",'name':"@3722",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CA0,'size':4,'pad':4,'label':"lit_3723",'name':"@3723",'lib':14,'tu':421,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455CA8,'size':8,'pad':0,'label':"lit_3724",'name':"@3724",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455CB0,'size':8,'pad':0,'label':"lit_3725",'name':"@3725",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455C38,'size':4,'pad':0,'label':"lit_3718",'name':"@3718",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C3C,'size':4,'pad':0,'label':"lit_3719",'name':"@3719",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C40,'size':4,'pad':0,'label':"lit_3720",'name':"@3720",'lib':14,'tu':420,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C44,'size':4,'pad':0,'label':"lit_4090",'name':"@4090",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C48,'size':4,'pad':0,'label':"lit_4091",'name':"@4091",'lib':14,'tu':420,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C4C,'size':4,'pad':0,'label':"lit_4092",'name':"@4092",'lib':14,'tu':420,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C50,'size':4,'pad':0,'label':"lit_4187",'name':"@4187",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C54,'size':4,'pad':0,'label':"lit_4188",'name':"@4188",'lib':14,'tu':420,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C58,'size':4,'pad':0,'label':"lit_4189",'name':"@4189",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C5C,'size':4,'pad':0,'label':"lit_4190",'name':"@4190",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C60,'size':4,'pad':0,'label':"lit_4191",'name':"@4191",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C64,'size':4,'pad':0,'label':"lit_4192",'name':"@4192",'lib':14,'tu':420,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C68,'size':4,'pad':0,'label':"lit_4193",'name':"@4193",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C6C,'size':4,'pad':0,'label':"lit_4194",'name':"@4194",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C70,'size':4,'pad':0,'label':"lit_4561",'name':"@4561",'lib':14,'tu':420,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C74,'size':4,'pad':0,'label':"lit_4562",'name':"@4562",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C78,'size':4,'pad':0,'label':"lit_4681",'name':"@4681",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C7C,'size':4,'pad':0,'label':"lit_4682",'name':"@4682",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C80,'size':4,'pad':0,'label':"lit_4837",'name':"@4837",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C84,'size':4,'pad':0,'label':"lit_4838",'name':"@4838",'lib':14,'tu':420,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C88,'size':4,'pad':0,'label':"lit_4875",'name':"@4875",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C8C,'size':4,'pad':0,'label':"lit_4906",'name':"@4906",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C90,'size':4,'pad':0,'label':"lit_4944",'name':"@4944",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C94,'size':4,'pad':0,'label':"lit_4945",'name':"@4945",'lib':14,'tu':420,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C98,'size':4,'pad':0,'label':"lit_3721",'name':"@3721",'lib':14,'tu':421,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455C9C,'size':4,'pad':0,'label':"lit_3722",'name':"@3722",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CA0,'size':4,'pad':4,'label':"lit_3723",'name':"@3723",'lib':14,'tu':421,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CA8,'size':8,'pad':0,'label':"lit_3724",'name':"@3724",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CB0,'size':8,'pad':0,'label':"lit_3725",'name':"@3725",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455CB8,'size':8,'pad':0,'label':"lit_3726",'name':"@3726",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455CC0,'size':4,'pad':0,'label':"lit_3743",'name':"@3743",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CC4,'size':4,'pad':0,'label':"lit_3834",'name':"@3834",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CC8,'size':4,'pad':0,'label':"lit_3835",'name':"@3835",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CCC,'size':4,'pad':0,'label':"lit_3836",'name':"@3836",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CD0,'size':4,'pad':0,'label':"lit_3837",'name':"@3837",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CD4,'size':4,'pad':0,'label':"lit_3838",'name':"@3838",'lib':14,'tu':421,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455CC0,'size':4,'pad':0,'label':"lit_3743",'name':"@3743",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CC4,'size':4,'pad':0,'label':"lit_3834",'name':"@3834",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CC8,'size':4,'pad':0,'label':"lit_3835",'name':"@3835",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CCC,'size':4,'pad':0,'label':"lit_3836",'name':"@3836",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CD0,'size':4,'pad':0,'label':"lit_3837",'name':"@3837",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CD4,'size':4,'pad':0,'label':"lit_3838",'name':"@3838",'lib':14,'tu':421,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455CD8,'size':4,'pad':4,'label':"lit_3839",'name':"@3839",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455CE0,'size':8,'pad':0,'label':"lit_3842",'name':"@3842",'lib':14,'tu':421,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455CE8,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CEC,'size':4,'pad':0,'label':"lit_3942",'name':"@3942",'lib':14,'tu':421,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CF0,'size':4,'pad':0,'label':"lit_3943",'name':"@3943",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CF4,'size':4,'pad':0,'label':"lit_3944",'name':"@3944",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CF8,'size':4,'pad':0,'label':"lit_3945",'name':"@3945",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455CFC,'size':4,'pad':0,'label':"lit_3946",'name':"@3946",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D00,'size':4,'pad':0,'label':"lit_3947",'name':"@3947",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D04,'size':4,'pad':0,'label':"lit_3948",'name':"@3948",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D08,'size':4,'pad':0,'label':"lit_3949",'name':"@3949",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D0C,'size':4,'pad':0,'label':"lit_3950",'name':"@3950",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D10,'size':8,'pad':0,'label':"lit_3954",'name':"@3954",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455D18,'size':4,'pad':0,'label':"lit_4178",'name':"@4178",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D1C,'size':4,'pad':0,'label':"lit_4399",'name':"@4399",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D20,'size':4,'pad':0,'label':"lit_4621",'name':"@4621",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D24,'size':4,'pad':0,'label':"lit_4622",'name':"@4622",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D28,'size':4,'pad':0,'label':"lit_4623",'name':"@4623",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D2C,'size':4,'pad':0,'label':"lit_4624",'name':"@4624",'lib':14,'tu':421,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D30,'size':4,'pad':0,'label':"lit_4625",'name':"@4625",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D34,'size':4,'pad':0,'label':"lit_4645",'name':"@4645",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D38,'size':4,'pad':0,'label':"lit_4646",'name':"@4646",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D3C,'size':4,'pad':0,'label':"lit_4647",'name':"@4647",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D40,'size':4,'pad':0,'label':"lit_3501",'name':"@3501",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D44,'size':4,'pad':0,'label':"lit_3502",'name':"@3502",'lib':14,'tu':422,'section':8,'r':[24,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455CE0,'size':8,'pad':0,'label':"lit_3842",'name':"@3842",'lib':14,'tu':421,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CE8,'size':4,'pad':0,'label':"lit_3941",'name':"@3941",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CEC,'size':4,'pad':0,'label':"lit_3942",'name':"@3942",'lib':14,'tu':421,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CF0,'size':4,'pad':0,'label':"lit_3943",'name':"@3943",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CF4,'size':4,'pad':0,'label':"lit_3944",'name':"@3944",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CF8,'size':4,'pad':0,'label':"lit_3945",'name':"@3945",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455CFC,'size':4,'pad':0,'label':"lit_3946",'name':"@3946",'lib':14,'tu':421,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D00,'size':4,'pad':0,'label':"lit_3947",'name':"@3947",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D04,'size':4,'pad':0,'label':"lit_3948",'name':"@3948",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D08,'size':4,'pad':0,'label':"lit_3949",'name':"@3949",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D0C,'size':4,'pad':0,'label':"lit_3950",'name':"@3950",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D10,'size':8,'pad':0,'label':"lit_3954",'name':"@3954",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D18,'size':4,'pad':0,'label':"lit_4178",'name':"@4178",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D1C,'size':4,'pad':0,'label':"lit_4399",'name':"@4399",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D20,'size':4,'pad':0,'label':"lit_4621",'name':"@4621",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D24,'size':4,'pad':0,'label':"lit_4622",'name':"@4622",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D28,'size':4,'pad':0,'label':"lit_4623",'name':"@4623",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D2C,'size':4,'pad':0,'label':"lit_4624",'name':"@4624",'lib':14,'tu':421,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D30,'size':4,'pad':0,'label':"lit_4625",'name':"@4625",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D34,'size':4,'pad':0,'label':"lit_4645",'name':"@4645",'lib':14,'tu':421,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D38,'size':4,'pad':0,'label':"lit_4646",'name':"@4646",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D3C,'size':4,'pad':0,'label':"lit_4647",'name':"@4647",'lib':14,'tu':421,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D40,'size':4,'pad':0,'label':"lit_3501",'name':"@3501",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D44,'size':4,'pad':0,'label':"lit_3502",'name':"@3502",'lib':14,'tu':422,'section':8,'r':[24,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455D48,'size':4,'pad':0,'label':"lit_3503",'name':"@3503",'lib':14,'tu':422,'section':8,'r':[19,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455D4C,'size':4,'pad':0,'label':"lit_3504",'name':"@3504",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455D4C,'size':4,'pad':0,'label':"lit_3504",'name':"@3504",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455D50,'size':4,'pad':4,'label':"lit_3505",'name':"@3505",'lib':14,'tu':422,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455D58,'size':8,'pad':0,'label':"lit_3508",'name':"@3508",'lib':14,'tu':422,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455D60,'size':4,'pad':0,'label':"lit_3574",'name':"@3574",'lib':14,'tu':422,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D64,'size':4,'pad':0,'label':"lit_3585",'name':"@3585",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D68,'size':4,'pad':0,'label':"lit_3654",'name':"@3654",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D6C,'size':4,'pad':0,'label':"lit_3655",'name':"@3655",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D70,'size':4,'pad':0,'label':"lit_3704",'name':"@3704",'lib':14,'tu':422,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D74,'size':4,'pad':0,'label':"lit_3705",'name':"@3705",'lib':14,'tu':422,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D78,'size':4,'pad':0,'label':"lit_3749",'name':"@3749",'lib':14,'tu':422,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D7C,'size':4,'pad':0,'label':"lit_3750",'name':"@3750",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D80,'size':4,'pad':0,'label':"lit_3751",'name':"@3751",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D84,'size':4,'pad':0,'label':"lit_3752",'name':"@3752",'lib':14,'tu':422,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D88,'size':4,'pad':0,'label':"lit_3753",'name':"@3753",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D8C,'size':4,'pad':0,'label':"lit_3754",'name':"@3754",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D90,'size':4,'pad':0,'label':"lit_3755",'name':"@3755",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D94,'size':4,'pad':0,'label':"lit_3756",'name':"@3756",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D98,'size':4,'pad':0,'label':"lit_3757",'name':"@3757",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455D9C,'size':4,'pad':0,'label':"lit_3758",'name':"@3758",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DA0,'size':4,'pad':0,'label':"lit_3759",'name':"@3759",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DA4,'size':4,'pad':0,'label':"lit_3760",'name':"@3760",'lib':14,'tu':422,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DA8,'size':4,'pad':0,'label':"lit_3761",'name':"@3761",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DAC,'size':4,'pad':0,'label':"lit_3762",'name':"@3762",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DB0,'size':4,'pad':0,'label':"lit_3763",'name':"@3763",'lib':14,'tu':422,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DB4,'size':4,'pad':0,'label':"lit_3764",'name':"@3764",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DB8,'size':4,'pad':0,'label':"lit_3765",'name':"@3765",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DBC,'size':4,'pad':0,'label':"lit_3766",'name':"@3766",'lib':14,'tu':422,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DC0,'size':4,'pad':0,'label':"lit_3767",'name':"@3767",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DC4,'size':4,'pad':0,'label':"lit_3768",'name':"@3768",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DC8,'size':4,'pad':0,'label':"lit_3769",'name':"@3769",'lib':14,'tu':422,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DCC,'size':4,'pad':0,'label':"lit_3770",'name':"@3770",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DD0,'size':4,'pad':0,'label':"lit_3771",'name':"@3771",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DD4,'size':4,'pad':0,'label':"lit_3772",'name':"@3772",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DD8,'size':4,'pad':0,'label':"lit_3773",'name':"@3773",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DDC,'size':4,'pad':0,'label':"lit_3774",'name':"@3774",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DE0,'size':4,'pad':0,'label':"lit_3775",'name':"@3775",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DE4,'size':4,'pad':0,'label':"lit_3776",'name':"@3776",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DE8,'size':4,'pad':0,'label':"lit_3777",'name':"@3777",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DEC,'size':4,'pad':0,'label':"lit_3928",'name':"@3928",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DF0,'size':4,'pad':0,'label':"lit_3963",'name':"@3963",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DF4,'size':4,'pad':0,'label':"lit_4260",'name':"@4260",'lib':14,'tu':422,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DF8,'size':4,'pad':0,'label':"lit_4261",'name':"@4261",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455DFC,'size':4,'pad':0,'label':"lit_4262",'name':"@4262",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E00,'size':4,'pad':0,'label':"lit_4263",'name':"@4263",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E04,'size':4,'pad':0,'label':"lit_4264",'name':"@4264",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E08,'size':4,'pad':0,'label':"lit_4265",'name':"@4265",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E0C,'size':4,'pad':0,'label':"lit_4266",'name':"@4266",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E10,'size':4,'pad':0,'label':"lit_4267",'name':"@4267",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E14,'size':4,'pad':0,'label':"lit_4268",'name':"@4268",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455D58,'size':8,'pad':0,'label':"lit_3508",'name':"@3508",'lib':14,'tu':422,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D60,'size':4,'pad':0,'label':"lit_3574",'name':"@3574",'lib':14,'tu':422,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D64,'size':4,'pad':0,'label':"lit_3585",'name':"@3585",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D68,'size':4,'pad':0,'label':"lit_3654",'name':"@3654",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D6C,'size':4,'pad':0,'label':"lit_3655",'name':"@3655",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D70,'size':4,'pad':0,'label':"lit_3704",'name':"@3704",'lib':14,'tu':422,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D74,'size':4,'pad':0,'label':"lit_3705",'name':"@3705",'lib':14,'tu':422,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D78,'size':4,'pad':0,'label':"lit_3749",'name':"@3749",'lib':14,'tu':422,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D7C,'size':4,'pad':0,'label':"lit_3750",'name':"@3750",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D80,'size':4,'pad':0,'label':"lit_3751",'name':"@3751",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D84,'size':4,'pad':0,'label':"lit_3752",'name':"@3752",'lib':14,'tu':422,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D88,'size':4,'pad':0,'label':"lit_3753",'name':"@3753",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D8C,'size':4,'pad':0,'label':"lit_3754",'name':"@3754",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D90,'size':4,'pad':0,'label':"lit_3755",'name':"@3755",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D94,'size':4,'pad':0,'label':"lit_3756",'name':"@3756",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D98,'size':4,'pad':0,'label':"lit_3757",'name':"@3757",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455D9C,'size':4,'pad':0,'label':"lit_3758",'name':"@3758",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DA0,'size':4,'pad':0,'label':"lit_3759",'name':"@3759",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DA4,'size':4,'pad':0,'label':"lit_3760",'name':"@3760",'lib':14,'tu':422,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DA8,'size':4,'pad':0,'label':"lit_3761",'name':"@3761",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DAC,'size':4,'pad':0,'label':"lit_3762",'name':"@3762",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DB0,'size':4,'pad':0,'label':"lit_3763",'name':"@3763",'lib':14,'tu':422,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DB4,'size':4,'pad':0,'label':"lit_3764",'name':"@3764",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DB8,'size':4,'pad':0,'label':"lit_3765",'name':"@3765",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DBC,'size':4,'pad':0,'label':"lit_3766",'name':"@3766",'lib':14,'tu':422,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DC0,'size':4,'pad':0,'label':"lit_3767",'name':"@3767",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DC4,'size':4,'pad':0,'label':"lit_3768",'name':"@3768",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DC8,'size':4,'pad':0,'label':"lit_3769",'name':"@3769",'lib':14,'tu':422,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DCC,'size':4,'pad':0,'label':"lit_3770",'name':"@3770",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DD0,'size':4,'pad':0,'label':"lit_3771",'name':"@3771",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DD4,'size':4,'pad':0,'label':"lit_3772",'name':"@3772",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DD8,'size':4,'pad':0,'label':"lit_3773",'name':"@3773",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DDC,'size':4,'pad':0,'label':"lit_3774",'name':"@3774",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DE0,'size':4,'pad':0,'label':"lit_3775",'name':"@3775",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DE4,'size':4,'pad':0,'label':"lit_3776",'name':"@3776",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DE8,'size':4,'pad':0,'label':"lit_3777",'name':"@3777",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DEC,'size':4,'pad':0,'label':"lit_3928",'name':"@3928",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DF0,'size':4,'pad':0,'label':"lit_3963",'name':"@3963",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DF4,'size':4,'pad':0,'label':"lit_4260",'name':"@4260",'lib':14,'tu':422,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DF8,'size':4,'pad':0,'label':"lit_4261",'name':"@4261",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455DFC,'size':4,'pad':0,'label':"lit_4262",'name':"@4262",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E00,'size':4,'pad':0,'label':"lit_4263",'name':"@4263",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E04,'size':4,'pad':0,'label':"lit_4264",'name':"@4264",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E08,'size':4,'pad':0,'label':"lit_4265",'name':"@4265",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E0C,'size':4,'pad':0,'label':"lit_4266",'name':"@4266",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E10,'size':4,'pad':0,'label':"lit_4267",'name':"@4267",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E14,'size':4,'pad':0,'label':"lit_4268",'name':"@4268",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455E18,'size':4,'pad':4,'label':"lit_4269",'name':"@4269",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455E20,'size':8,'pad':0,'label':"lit_4271",'name':"@4271",'lib':14,'tu':422,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455E28,'size':4,'pad':0,'label':"lit_4400",'name':"@4400",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E2C,'size':4,'pad':0,'label':"lit_4422",'name':"@4422",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E30,'size':4,'pad':0,'label':"lit_4510",'name':"@4510",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E34,'size':4,'pad':0,'label':"lit_4511",'name':"@4511",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E38,'size':4,'pad':0,'label':"lit_4619",'name':"@4619",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E3C,'size':4,'pad':0,'label':"lit_4621",'name':"@4621",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E40,'size':4,'pad':0,'label':"lit_4732",'name':"@4732",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E44,'size':4,'pad':0,'label':"lit_4833",'name':"@4833",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E48,'size':4,'pad':0,'label':"lit_4834",'name':"@4834",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E4C,'size':4,'pad':0,'label':"lit_4835",'name':"@4835",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E50,'size':4,'pad':0,'label':"lit_4836",'name':"@4836",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E54,'size':4,'pad':0,'label':"lit_4837",'name':"@4837",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E58,'size':4,'pad':0,'label':"lit_4856",'name':"@4856",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E5C,'size':4,'pad':0,'label':"lit_4879",'name':"@4879",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455E20,'size':8,'pad':0,'label':"lit_4271",'name':"@4271",'lib':14,'tu':422,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E28,'size':4,'pad':0,'label':"lit_4400",'name':"@4400",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E2C,'size':4,'pad':0,'label':"lit_4422",'name':"@4422",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E30,'size':4,'pad':0,'label':"lit_4510",'name':"@4510",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E34,'size':4,'pad':0,'label':"lit_4511",'name':"@4511",'lib':14,'tu':422,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E38,'size':4,'pad':0,'label':"lit_4619",'name':"@4619",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E3C,'size':4,'pad':0,'label':"lit_4621",'name':"@4621",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E40,'size':4,'pad':0,'label':"lit_4732",'name':"@4732",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E44,'size':4,'pad':0,'label':"lit_4833",'name':"@4833",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E48,'size':4,'pad':0,'label':"lit_4834",'name':"@4834",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E4C,'size':4,'pad':0,'label':"lit_4835",'name':"@4835",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E50,'size':4,'pad':0,'label':"lit_4836",'name':"@4836",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E54,'size':4,'pad':0,'label':"lit_4837",'name':"@4837",'lib':14,'tu':422,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E58,'size':4,'pad':0,'label':"lit_4856",'name':"@4856",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E5C,'size':4,'pad':0,'label':"lit_4879",'name':"@4879",'lib':14,'tu':422,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455E60,'size':4,'pad':0,'label':"lit_3485",'name':"@3485",'lib':14,'tu':423,'section':8,'r':[8,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455E64,'size':4,'pad':0,'label':"lit_3486",'name':"@3486",'lib':14,'tu':423,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E68,'size':4,'pad':0,'label':"lit_3527",'name':"@3527",'lib':14,'tu':423,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E6C,'size':4,'pad':0,'label':"lit_3528",'name':"@3528",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E70,'size':8,'pad':0,'label':"lit_3530",'name':"@3530",'lib':14,'tu':423,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455E78,'size':4,'pad':0,'label':"lit_3589",'name':"@3589",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E7C,'size':4,'pad':0,'label':"lit_3590",'name':"@3590",'lib':14,'tu':423,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E80,'size':4,'pad':0,'label':"lit_3711",'name':"@3711",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E84,'size':4,'pad':0,'label':"lit_3712",'name':"@3712",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E88,'size':4,'pad':0,'label':"lit_3713",'name':"@3713",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E8C,'size':4,'pad':0,'label':"lit_3714",'name':"@3714",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E90,'size':4,'pad':0,'label':"lit_3715",'name':"@3715",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E94,'size':4,'pad':0,'label':"lit_3716",'name':"@3716",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E98,'size':4,'pad':0,'label':"lit_3717",'name':"@3717",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455E9C,'size':4,'pad':0,'label':"lit_3718",'name':"@3718",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455EA0,'size':4,'pad':0,'label':"lit_3719",'name':"@3719",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455EA4,'size':4,'pad':0,'label':"lit_3720",'name':"@3720",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455EA8,'size':8,'pad':0,'label':"lit_4032",'name':"@4032",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455EB0,'size':8,'pad':0,'label':"lit_4033",'name':"@4033",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455E64,'size':4,'pad':0,'label':"lit_3486",'name':"@3486",'lib':14,'tu':423,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E68,'size':4,'pad':0,'label':"lit_3527",'name':"@3527",'lib':14,'tu':423,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E6C,'size':4,'pad':0,'label':"lit_3528",'name':"@3528",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E70,'size':8,'pad':0,'label':"lit_3530",'name':"@3530",'lib':14,'tu':423,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E78,'size':4,'pad':0,'label':"lit_3589",'name':"@3589",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E7C,'size':4,'pad':0,'label':"lit_3590",'name':"@3590",'lib':14,'tu':423,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E80,'size':4,'pad':0,'label':"lit_3711",'name':"@3711",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E84,'size':4,'pad':0,'label':"lit_3712",'name':"@3712",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E88,'size':4,'pad':0,'label':"lit_3713",'name':"@3713",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E8C,'size':4,'pad':0,'label':"lit_3714",'name':"@3714",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E90,'size':4,'pad':0,'label':"lit_3715",'name':"@3715",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E94,'size':4,'pad':0,'label':"lit_3716",'name':"@3716",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E98,'size':4,'pad':0,'label':"lit_3717",'name':"@3717",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455E9C,'size':4,'pad':0,'label':"lit_3718",'name':"@3718",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455EA0,'size':4,'pad':0,'label':"lit_3719",'name':"@3719",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455EA4,'size':4,'pad':0,'label':"lit_3720",'name':"@3720",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455EA8,'size':8,'pad':0,'label':"lit_4032",'name':"@4032",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455EB0,'size':8,'pad':0,'label':"lit_4033",'name':"@4033",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455EB8,'size':8,'pad':0,'label':"lit_4034",'name':"@4034",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455EC0,'size':4,'pad':0,'label':"lit_4035",'name':"@4035",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455EC4,'size':4,'pad':0,'label':"lit_4036",'name':"@4036",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455EC8,'size':4,'pad':0,'label':"lit_4037",'name':"@4037",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455ECC,'size':4,'pad':0,'label':"lit_4038",'name':"@4038",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455ED0,'size':4,'pad':0,'label':"lit_4039",'name':"@4039",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455ED4,'size':4,'pad':0,'label':"lit_4040",'name':"@4040",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80455EC0,'size':4,'pad':0,'label':"lit_4035",'name':"@4035",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455EC4,'size':4,'pad':0,'label':"lit_4036",'name':"@4036",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455EC8,'size':4,'pad':0,'label':"lit_4037",'name':"@4037",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455ECC,'size':4,'pad':0,'label':"lit_4038",'name':"@4038",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455ED0,'size':4,'pad':0,'label':"lit_4039",'name':"@4039",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455ED4,'size':4,'pad':0,'label':"lit_4040",'name':"@4040",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455ED8,'size':4,'pad':4,'label':"lit_4041",'name':"@4041",'lib':14,'tu':423,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455EE0,'size':6,'pad':2,'label':"sBoringTail__8Z2MdnPrm",'name':"sBoringTail__8Z2MdnPrm",'lib':14,'tu':424,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455EE8,'size':6,'pad':2,'label':"sOrderTail__8Z2MdnPrm",'name':"sOrderTail__8Z2MdnPrm",'lib':14,'tu':424,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, @@ -26760,101 +26760,101 @@ SYMBOLS = [ {'addr':0x80455F20,'size':7,'pad':1,'label':"sReplybTail__8Z2MdnPrm",'name':"sReplybTail__8Z2MdnPrm",'lib':14,'tu':424,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455F28,'size':8,'pad':0,'label':"sDesideTail__8Z2MdnPrm",'name':"sDesideTail__8Z2MdnPrm",'lib':14,'tu':424,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80455F30,'size':4,'pad':0,'label':"lit_3836",'name':"@3836",'lib':14,'tu':424,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455F34,'size':4,'pad':0,'label':"lit_3837",'name':"@3837",'lib':14,'tu':424,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455F38,'size':4,'pad':0,'label':"lit_3838",'name':"@3838",'lib':14,'tu':424,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455F3C,'size':4,'pad':0,'label':"lit_3885",'name':"@3885",'lib':14,'tu':424,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455F40,'size':8,'pad':0,'label':"lit_3887",'name':"@3887",'lib':14,'tu':424,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455F48,'size':8,'pad':0,'label':"lit_4083",'name':"@4083",'lib':14,'tu':424,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455F50,'size':4,'pad':0,'label':"lit_4571",'name':"@4571",'lib':14,'tu':424,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455F54,'size':4,'pad':0,'label':"lit_4572",'name':"@4572",'lib':14,'tu':424,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455F58,'size':4,'pad':0,'label':"lit_3931",'name':"@3931",'lib':14,'tu':425,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455F5C,'size':4,'pad':0,'label':"lit_3932",'name':"@3932",'lib':14,'tu':425,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455F60,'size':4,'pad':4,'label':"lit_4035",'name':"@4035",'lib':14,'tu':425,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455F34,'size':4,'pad':0,'label':"lit_3837",'name':"@3837",'lib':14,'tu':424,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F38,'size':4,'pad':0,'label':"lit_3838",'name':"@3838",'lib':14,'tu':424,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F3C,'size':4,'pad':0,'label':"lit_3885",'name':"@3885",'lib':14,'tu':424,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F40,'size':8,'pad':0,'label':"lit_3887",'name':"@3887",'lib':14,'tu':424,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F48,'size':8,'pad':0,'label':"lit_4083",'name':"@4083",'lib':14,'tu':424,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F50,'size':4,'pad':0,'label':"lit_4571",'name':"@4571",'lib':14,'tu':424,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F54,'size':4,'pad':0,'label':"lit_4572",'name':"@4572",'lib':14,'tu':424,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F58,'size':4,'pad':0,'label':"lit_3931",'name':"@3931",'lib':14,'tu':425,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F5C,'size':4,'pad':0,'label':"lit_3932",'name':"@3932",'lib':14,'tu':425,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F60,'size':4,'pad':4,'label':"lit_4035",'name':"@4035",'lib':14,'tu':425,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455F68,'size':4,'pad':0,'label':"lit_293",'name':"@293",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455F6C,'size':4,'pad':0,'label':"lit_294",'name':"@294",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455F70,'size':8,'pad':0,'label':"lit_295",'name':"@295",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455F6C,'size':4,'pad':0,'label':"lit_294",'name':"@294",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455F70,'size':8,'pad':0,'label':"lit_295",'name':"@295",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455F78,'size':4,'pad':4,'label':"lit_296",'name':"@296",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455F80,'size':8,'pad':0,'label':"lit_297",'name':"@297",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455F80,'size':8,'pad':0,'label':"lit_297",'name':"@297",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455F88,'size':4,'pad':4,'label':"lit_298",'name':"@298",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455F90,'size':8,'pad':0,'label':"lit_301",'name':"@301",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455F90,'size':8,'pad':0,'label':"lit_301",'name':"@301",'lib':15,'tu':428,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455F98,'size':4,'pad':4,'label':"lit_1121",'name':"@1121",'lib':16,'tu':431,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455FA0,'size':8,'pad':0,'label':"lit_1123",'name':"@1123",'lib':16,'tu':431,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455FA0,'size':8,'pad':0,'label':"lit_1123",'name':"@1123",'lib':16,'tu':431,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80455FA8,'size':4,'pad':4,'label':"lit_693",'name':"@693",'lib':16,'tu':432,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80455FB0,'size':8,'pad':0,'label':"lit_695",'name':"@695",'lib':16,'tu':432,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455FB8,'size':8,'pad':0,'label':"lit_697",'name':"@697",'lib':16,'tu':432,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455FC0,'size':4,'pad':0,'label':"lit_934",'name':"@934",'lib':16,'tu':435,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455FC4,'size':4,'pad':0,'label':"lit_935",'name':"@935",'lib':16,'tu':435,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455FC8,'size':8,'pad':0,'label':"lit_937",'name':"@937",'lib':16,'tu':435,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455FD0,'size':4,'pad':4,'label':"lit_721",'name':"@721",'lib':19,'tu':462,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455FD8,'size':4,'pad':0,'label':"lit_453",'name':"@453",'lib':19,'tu':464,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455FDC,'size':4,'pad':0,'label':"lit_454",'name':"@454",'lib':19,'tu':464,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80455FE0,'size':8,'pad':0,'label':"lit_456",'name':"@456",'lib':19,'tu':464,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455FE8,'size':8,'pad':0,'label':"lit_459",'name':"@459",'lib':19,'tu':464,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455FF0,'size':4,'pad':4,'label':"lit_647",'name':"@647",'lib':19,'tu':469,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80455FF8,'size':8,'pad':0,'label':"lit_649",'name':"@649",'lib':19,'tu':469,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456000,'size':8,'pad':0,'label':"lit_651",'name':"@651",'lib':19,'tu':469,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456008,'size':4,'pad':0,'label':"lit_835",'name':"@835",'lib':19,'tu':470,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045600C,'size':4,'pad':0,'label':"lit_836",'name':"@836",'lib':19,'tu':470,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456010,'size':8,'pad':0,'label':"lit_838",'name':"@838",'lib':19,'tu':470,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80455FB0,'size':8,'pad':0,'label':"lit_695",'name':"@695",'lib':16,'tu':432,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FB8,'size':8,'pad':0,'label':"lit_697",'name':"@697",'lib':16,'tu':432,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FC0,'size':4,'pad':0,'label':"lit_934",'name':"@934",'lib':16,'tu':435,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FC4,'size':4,'pad':0,'label':"lit_935",'name':"@935",'lib':16,'tu':435,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FC8,'size':8,'pad':0,'label':"lit_937",'name':"@937",'lib':16,'tu':435,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FD0,'size':4,'pad':4,'label':"lit_721",'name':"@721",'lib':19,'tu':462,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FD8,'size':4,'pad':0,'label':"lit_453",'name':"@453",'lib':19,'tu':464,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FDC,'size':4,'pad':0,'label':"lit_454",'name':"@454",'lib':19,'tu':464,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FE0,'size':8,'pad':0,'label':"lit_456",'name':"@456",'lib':19,'tu':464,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FE8,'size':8,'pad':0,'label':"lit_459",'name':"@459",'lib':19,'tu':464,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FF0,'size':4,'pad':4,'label':"lit_647",'name':"@647",'lib':19,'tu':469,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80455FF8,'size':8,'pad':0,'label':"lit_649",'name':"@649",'lib':19,'tu':469,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456000,'size':8,'pad':0,'label':"lit_651",'name':"@651",'lib':19,'tu':469,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456008,'size':4,'pad':0,'label':"lit_835",'name':"@835",'lib':19,'tu':470,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045600C,'size':4,'pad':0,'label':"lit_836",'name':"@836",'lib':19,'tu':470,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456010,'size':8,'pad':0,'label':"lit_838",'name':"@838",'lib':19,'tu':470,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456018,'size':4,'pad':4,'label':"lit_1047",'name':"@1047",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456020,'size':8,'pad':0,'label':"lit_1050",'name':"@1050",'lib':19,'tu':471,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456028,'size':4,'pad':4,'label':"lit_1056",'name':"@1056",'lib':19,'tu':471,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456030,'size':8,'pad':0,'label':"lit_1117",'name':"@1117",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456038,'size':8,'pad':0,'label':"lit_1118",'name':"@1118",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456020,'size':8,'pad':0,'label':"lit_1050",'name':"@1050",'lib':19,'tu':471,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456028,'size':4,'pad':4,'label':"lit_1056",'name':"@1056",'lib':19,'tu':471,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456030,'size':8,'pad':0,'label':"lit_1117",'name':"@1117",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456038,'size':8,'pad':0,'label':"lit_1118",'name':"@1118",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456040,'size':8,'pad':0,'label':"lit_1119",'name':"@1119",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456048,'size':4,'pad':0,'label':"lit_1120",'name':"@1120",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045604C,'size':4,'pad':0,'label':"lit_1121",'name':"@1121",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456048,'size':4,'pad':0,'label':"lit_1120",'name':"@1120",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045604C,'size':4,'pad':0,'label':"lit_1121",'name':"@1121",'lib':19,'tu':471,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456050,'size':4,'pad':0,'label':"lit_2293",'name':"@2293",'lib':19,'tu':472,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456054,'size':4,'pad':0,'label':"lit_3034",'name':"@3034",'lib':19,'tu':472,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456054,'size':4,'pad':0,'label':"lit_3034",'name':"@3034",'lib':19,'tu':472,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456058,'size':4,'pad':4,'label':"lit_3035",'name':"@3035",'lib':19,'tu':472,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456060,'size':8,'pad':0,'label':"lit_503",'name':"@503",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456068,'size':8,'pad':0,'label':"lit_504",'name':"@504",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456070,'size':8,'pad':0,'label':"lit_505",'name':"@505",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456078,'size':8,'pad':0,'label':"lit_506",'name':"@506",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456080,'size':8,'pad':0,'label':"lit_507",'name':"@507",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456088,'size':8,'pad':0,'label':"lit_508",'name':"@508",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456090,'size':8,'pad':0,'label':"lit_509",'name':"@509",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456098,'size':8,'pad':0,'label':"lit_510",'name':"@510",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804560A0,'size':8,'pad':0,'label':"lit_511",'name':"@511",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804560A8,'size':8,'pad':0,'label':"lit_512",'name':"@512",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804560B0,'size':8,'pad':0,'label':"lit_514",'name':"@514",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804560B8,'size':4,'pad':0,'label':"lit_724",'name':"@724",'lib':19,'tu':474,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804560BC,'size':4,'pad':0,'label':"lit_725",'name':"@725",'lib':19,'tu':474,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456060,'size':8,'pad':0,'label':"lit_503",'name':"@503",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456068,'size':8,'pad':0,'label':"lit_504",'name':"@504",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456070,'size':8,'pad':0,'label':"lit_505",'name':"@505",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456078,'size':8,'pad':0,'label':"lit_506",'name':"@506",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456080,'size':8,'pad':0,'label':"lit_507",'name':"@507",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456088,'size':8,'pad':0,'label':"lit_508",'name':"@508",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456090,'size':8,'pad':0,'label':"lit_509",'name':"@509",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456098,'size':8,'pad':0,'label':"lit_510",'name':"@510",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560A0,'size':8,'pad':0,'label':"lit_511",'name':"@511",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560A8,'size':8,'pad':0,'label':"lit_512",'name':"@512",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560B0,'size':8,'pad':0,'label':"lit_514",'name':"@514",'lib':19,'tu':473,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560B8,'size':4,'pad':0,'label':"lit_724",'name':"@724",'lib':19,'tu':474,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560BC,'size':4,'pad':0,'label':"lit_725",'name':"@725",'lib':19,'tu':474,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804560C0,'size':4,'pad':4,'label':"lit_726",'name':"@726",'lib':19,'tu':474,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804560C8,'size':8,'pad':0,'label':"lit_728",'name':"@728",'lib':19,'tu':474,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804560D0,'size':8,'pad':0,'label':"lit_2196",'name':"@2196",'lib':19,'tu':477,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804560D8,'size':4,'pad':0,'label':"lit_2258",'name':"@2258",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804560DC,'size':4,'pad':0,'label':"lit_2259",'name':"@2259",'lib':19,'tu':478,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804560C8,'size':8,'pad':0,'label':"lit_728",'name':"@728",'lib':19,'tu':474,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560D0,'size':8,'pad':0,'label':"lit_2196",'name':"@2196",'lib':19,'tu':477,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560D8,'size':4,'pad':0,'label':"lit_2258",'name':"@2258",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560DC,'size':4,'pad':0,'label':"lit_2259",'name':"@2259",'lib':19,'tu':478,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804560E0,'size':4,'pad':4,'label':"lit_2279",'name':"@2279",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804560E8,'size':8,'pad':0,'label':"lit_2281",'name':"@2281",'lib':19,'tu':478,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804560F0,'size':4,'pad':0,'label':"lit_2308",'name':"@2308",'lib':19,'tu':478,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804560F4,'size':4,'pad':0,'label':"lit_2309",'name':"@2309",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804560F8,'size':4,'pad':0,'label':"lit_2310",'name':"@2310",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804560FC,'size':4,'pad':0,'label':"lit_2311",'name':"@2311",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456100,'size':4,'pad':0,'label':"lit_2312",'name':"@2312",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456104,'size':4,'pad':0,'label':"lit_2313",'name':"@2313",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456108,'size':8,'pad':0,'label':"lit_2315",'name':"@2315",'lib':19,'tu':478,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456110,'size':4,'pad':0,'label':"lit_2580",'name':"@2580",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456114,'size':4,'pad':0,'label':"lit_2581",'name':"@2581",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456118,'size':4,'pad':0,'label':"lit_2460",'name':"@2460",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804560E8,'size':8,'pad':0,'label':"lit_2281",'name':"@2281",'lib':19,'tu':478,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560F0,'size':4,'pad':0,'label':"lit_2308",'name':"@2308",'lib':19,'tu':478,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560F4,'size':4,'pad':0,'label':"lit_2309",'name':"@2309",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560F8,'size':4,'pad':0,'label':"lit_2310",'name':"@2310",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804560FC,'size':4,'pad':0,'label':"lit_2311",'name':"@2311",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456100,'size':4,'pad':0,'label':"lit_2312",'name':"@2312",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456104,'size':4,'pad':0,'label':"lit_2313",'name':"@2313",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456108,'size':8,'pad':0,'label':"lit_2315",'name':"@2315",'lib':19,'tu':478,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456110,'size':4,'pad':0,'label':"lit_2580",'name':"@2580",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456114,'size':4,'pad':0,'label':"lit_2581",'name':"@2581",'lib':19,'tu':478,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456118,'size':4,'pad':0,'label':"lit_2460",'name':"@2460",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045611C,'size':4,'pad':0,'label':"lit_2461",'name':"@2461",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456120,'size':4,'pad':0,'label':"lit_2462",'name':"@2462",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456124,'size':4,'pad':0,'label':"lit_2463",'name':"@2463",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456128,'size':4,'pad':0,'label':"lit_2464",'name':"@2464",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045612C,'size':4,'pad':0,'label':"lit_2465",'name':"@2465",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456120,'size':4,'pad':0,'label':"lit_2462",'name':"@2462",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456124,'size':4,'pad':0,'label':"lit_2463",'name':"@2463",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456128,'size':4,'pad':0,'label':"lit_2464",'name':"@2464",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045612C,'size':4,'pad':0,'label':"lit_2465",'name':"@2465",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456130,'size':4,'pad':4,'label':"lit_2466",'name':"@2466",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456138,'size':8,'pad':0,'label':"lit_2469",'name':"@2469",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456140,'size':8,'pad':0,'label':"lit_2471",'name':"@2471",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456138,'size':8,'pad':0,'label':"lit_2469",'name':"@2469",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456140,'size':8,'pad':0,'label':"lit_2471",'name':"@2471",'lib':19,'tu':479,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456148,'size':4,'pad':0,'label':"lit_627",'name':"@627",'lib':20,'tu':482,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045614C,'size':4,'pad':0,'label':"lit_628",'name':"@628",'lib':20,'tu':482,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045614C,'size':4,'pad':0,'label':"lit_628",'name':"@628",'lib':20,'tu':482,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456150,'size':4,'pad':4,'label':"lit_730",'name':"@730",'lib':20,'tu':482,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456158,'size':8,'pad':0,'label':"lit_732",'name':"@732",'lib':20,'tu':482,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456160,'size':4,'pad':4,'label':"lit_522",'name':"@522",'lib':20,'tu':483,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456168,'size':4,'pad':0,'label':"lit_1488",'name':"@1488",'lib':20,'tu':484,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045616C,'size':4,'pad':0,'label':"lit_1489",'name':"@1489",'lib':20,'tu':484,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456158,'size':8,'pad':0,'label':"lit_732",'name':"@732",'lib':20,'tu':482,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456160,'size':4,'pad':4,'label':"lit_522",'name':"@522",'lib':20,'tu':483,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456168,'size':4,'pad':0,'label':"lit_1488",'name':"@1488",'lib':20,'tu':484,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045616C,'size':4,'pad':0,'label':"lit_1489",'name':"@1489",'lib':20,'tu':484,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456170,'size':4,'pad':0,'label':"lit_1490",'name':"@1490",'lib':20,'tu':484,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456174,'size':4,'pad':0,'label':"lit_1491",'name':"@1491",'lib':20,'tu':484,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456178,'size':4,'pad':0,'label':"lit_1507",'name':"@1507",'lib':20,'tu':484,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456174,'size':4,'pad':0,'label':"lit_1491",'name':"@1491",'lib':20,'tu':484,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456178,'size':4,'pad':0,'label':"lit_1507",'name':"@1507",'lib':20,'tu':484,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045617C,'size':4,'pad':0,'label':"j2dDefaultColInfo",'name':"j2dDefaultColInfo",'lib':20,'tu':484,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80456180,'size':4,'pad':0,'label':"j2dDefaultTevOrderInfoNull",'name':"j2dDefaultTevOrderInfoNull",'lib':20,'tu':484,'section':8,'r':[0,7,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80456184,'size':2,'pad':2,'label':"j2dDefaultIndTexOrderNull",'name':"j2dDefaultIndTexOrderNull",'lib':20,'tu':484,'section':8,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, @@ -26867,96 +26867,96 @@ SYMBOLS = [ {'addr':0x804561A4,'size':4,'pad':0,'label':"data_804561A4",'name':None,'lib':20,'tu':484,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804561A8,'size':4,'pad':0,'label':"j2dDefaultColorChanInfo",'name':"j2dDefaultColorChanInfo",'lib':20,'tu':484,'section':8,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804561AC,'size':4,'pad':0,'label':"struct_804561AC",'name':None,'lib':20,'tu':484,'section':8,'r':[0,4,0],'sh':[0,0,0],'type':"Structure"}, - {'addr':0x804561B0,'size':4,'pad':0,'label':"lit_1943",'name':"@1943",'lib':20,'tu':485,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804561B4,'size':4,'pad':0,'label':"lit_1944",'name':"@1944",'lib':20,'tu':485,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804561B8,'size':8,'pad':0,'label':"lit_1946",'name':"@1946",'lib':20,'tu':485,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804561B0,'size':4,'pad':0,'label':"lit_1943",'name':"@1943",'lib':20,'tu':485,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804561B4,'size':4,'pad':0,'label':"lit_1944",'name':"@1944",'lib':20,'tu':485,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804561B8,'size':8,'pad':0,'label':"lit_1946",'name':"@1946",'lib':20,'tu':485,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804561C0,'size':4,'pad':0,'label':"lit_1887",'name':"@1887",'lib':20,'tu':487,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804561C4,'size':4,'pad':0,'label':"lit_2039",'name':"@2039",'lib':20,'tu':487,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804561C8,'size':4,'pad':0,'label':"lit_418",'name':"@418",'lib':20,'tu':488,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804561CC,'size':4,'pad':0,'label':"lit_644",'name':"@644",'lib':20,'tu':488,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804561D0,'size':8,'pad':0,'label':"lit_650",'name':"@650",'lib':20,'tu':488,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804561CC,'size':4,'pad':0,'label':"lit_644",'name':"@644",'lib':20,'tu':488,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804561D0,'size':8,'pad':0,'label':"lit_650",'name':"@650",'lib':20,'tu':488,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804561D8,'size':4,'pad':4,'label':"lit_786",'name':"@786",'lib':20,'tu':488,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804561E0,'size':8,'pad':0,'label':"lit_791",'name':"@791",'lib':20,'tu':488,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804561E8,'size':4,'pad':0,'label':"lit_913",'name':"@913",'lib':20,'tu':488,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804561EC,'size':4,'pad':0,'label':"lit_937",'name':"@937",'lib':20,'tu':488,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804561E0,'size':8,'pad':0,'label':"lit_791",'name':"@791",'lib':20,'tu':488,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804561E8,'size':4,'pad':0,'label':"lit_913",'name':"@913",'lib':20,'tu':488,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804561EC,'size':4,'pad':0,'label':"lit_937",'name':"@937",'lib':20,'tu':488,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804561F0,'size':4,'pad':0,'label':"lit_1469",'name':"@1469",'lib':20,'tu':489,'section':8,'r':[12,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804561F4,'size':4,'pad':0,'label':"lit_1489",'name':"@1489",'lib':20,'tu':489,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804561F8,'size':8,'pad':0,'label':"lit_1651",'name':"@1651",'lib':20,'tu':489,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456200,'size':8,'pad':0,'label':"lit_1655",'name':"@1655",'lib':20,'tu':489,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456208,'size':4,'pad':0,'label':"lit_1725",'name':"@1725",'lib':20,'tu':489,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045620C,'size':4,'pad':0,'label':"lit_2466",'name':"@2466",'lib':20,'tu':489,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456210,'size':4,'pad':0,'label':"lit_2547",'name':"@2547",'lib':20,'tu':489,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456214,'size':4,'pad':0,'label':"lit_2890",'name':"@2890",'lib':20,'tu':489,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804561F4,'size':4,'pad':0,'label':"lit_1489",'name':"@1489",'lib':20,'tu':489,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804561F8,'size':8,'pad':0,'label':"lit_1651",'name':"@1651",'lib':20,'tu':489,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456200,'size':8,'pad':0,'label':"lit_1655",'name':"@1655",'lib':20,'tu':489,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456208,'size':4,'pad':0,'label':"lit_1725",'name':"@1725",'lib':20,'tu':489,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045620C,'size':4,'pad':0,'label':"lit_2466",'name':"@2466",'lib':20,'tu':489,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456210,'size':4,'pad':0,'label':"lit_2547",'name':"@2547",'lib':20,'tu':489,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456214,'size':4,'pad':0,'label':"lit_2890",'name':"@2890",'lib':20,'tu':489,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456218,'size':4,'pad':4,'label':"lit_2891",'name':"@2891",'lib':20,'tu':489,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456220,'size':4,'pad':0,'label':"lit_1561",'name':"@1561",'lib':20,'tu':490,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456224,'size':4,'pad':0,'label':"lit_1562",'name':"@1562",'lib':20,'tu':490,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456224,'size':4,'pad':0,'label':"lit_1562",'name':"@1562",'lib':20,'tu':490,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456228,'size':4,'pad':4,'label':"lit_1563",'name':"@1563",'lib':20,'tu':490,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456230,'size':8,'pad':0,'label':"lit_1705",'name':"@1705",'lib':20,'tu':490,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456238,'size':4,'pad':0,'label':"lit_1829",'name':"@1829",'lib':20,'tu':490,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045623C,'size':4,'pad':0,'label':"lit_1830",'name':"@1830",'lib':20,'tu':490,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456240,'size':8,'pad':0,'label':"lit_1971",'name':"@1971",'lib':20,'tu':491,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456248,'size':8,'pad':0,'label':"lit_1974",'name':"@1974",'lib':20,'tu':491,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456230,'size':8,'pad':0,'label':"lit_1705",'name':"@1705",'lib':20,'tu':490,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456238,'size':4,'pad':0,'label':"lit_1829",'name':"@1829",'lib':20,'tu':490,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045623C,'size':4,'pad':0,'label':"lit_1830",'name':"@1830",'lib':20,'tu':490,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456240,'size':8,'pad':0,'label':"lit_1971",'name':"@1971",'lib':20,'tu':491,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456248,'size':8,'pad':0,'label':"lit_1974",'name':"@1974",'lib':20,'tu':491,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456250,'size':4,'pad':0,'label':"lit_2156",'name':"@2156",'lib':20,'tu':491,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456254,'size':4,'pad':0,'label':"lit_2984",'name':"@2984",'lib':20,'tu':491,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456254,'size':4,'pad':0,'label':"lit_2984",'name':"@2984",'lib':20,'tu':491,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456258,'size':4,'pad':4,'label':"lit_2985",'name':"@2985",'lib':20,'tu':491,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456260,'size':8,'pad':0,'label':"lit_1739",'name':"@1739",'lib':20,'tu':492,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456268,'size':4,'pad':0,'label':"lit_1767",'name':"@1767",'lib':20,'tu':492,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456260,'size':8,'pad':0,'label':"lit_1739",'name':"@1739",'lib':20,'tu':492,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456268,'size':4,'pad':0,'label':"lit_1767",'name':"@1767",'lib':20,'tu':492,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045626C,'size':4,'pad':0,'label':"lit_2017",'name':"@2017",'lib':20,'tu':492,'section':8,'r':[9,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456270,'size':8,'pad':0,'label':"lit_2021",'name':"@2021",'lib':20,'tu':492,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456278,'size':4,'pad':0,'label':"lit_2758",'name':"@2758",'lib':20,'tu':492,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045627C,'size':4,'pad':0,'label':"lit_2933",'name':"@2933",'lib':20,'tu':492,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456280,'size':4,'pad':4,'label':"lit_1660",'name':"@1660",'lib':20,'tu':493,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456288,'size':8,'pad':0,'label':"lit_1662",'name':"@1662",'lib':20,'tu':493,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456290,'size':8,'pad':0,'label':"lit_1665",'name':"@1665",'lib':20,'tu':493,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456270,'size':8,'pad':0,'label':"lit_2021",'name':"@2021",'lib':20,'tu':492,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456278,'size':4,'pad':0,'label':"lit_2758",'name':"@2758",'lib':20,'tu':492,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045627C,'size':4,'pad':0,'label':"lit_2933",'name':"@2933",'lib':20,'tu':492,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456280,'size':4,'pad':4,'label':"lit_1660",'name':"@1660",'lib':20,'tu':493,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456288,'size':8,'pad':0,'label':"lit_1662",'name':"@1662",'lib':20,'tu':493,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456290,'size':8,'pad':0,'label':"lit_1665",'name':"@1665",'lib':20,'tu':493,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456298,'size':4,'pad':4,'label':"lit_2049",'name':"@2049",'lib':20,'tu':493,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804562A0,'size':8,'pad':0,'label':"lit_1549",'name':"@1549",'lib':20,'tu':494,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804562A8,'size':8,'pad':0,'label':"lit_1552",'name':"@1552",'lib':20,'tu':494,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804562A0,'size':8,'pad':0,'label':"lit_1549",'name':"@1549",'lib':20,'tu':494,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804562A8,'size':8,'pad':0,'label':"lit_1552",'name':"@1552",'lib':20,'tu':494,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804562B0,'size':4,'pad':0,'label':"lit_1827",'name':"@1827",'lib':20,'tu':494,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804562B4,'size':4,'pad':0,'label':"lit_2256",'name':"@2256",'lib':20,'tu':494,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804562B4,'size':4,'pad':0,'label':"lit_2256",'name':"@2256",'lib':20,'tu':494,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804562B8,'size':4,'pad':4,'label':"lit_2257",'name':"@2257",'lib':20,'tu':494,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804562C0,'size':4,'pad':0,'label':"lit_1517",'name':"@1517",'lib':20,'tu':495,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804562C0,'size':4,'pad':0,'label':"lit_1517",'name':"@1517",'lib':20,'tu':495,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804562C4,'size':4,'pad':0,'label':"lit_1784",'name':"@1784",'lib':20,'tu':495,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804562C8,'size':8,'pad':0,'label':"lit_2130",'name':"@2130",'lib':20,'tu':495,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804562C8,'size':8,'pad':0,'label':"lit_2130",'name':"@2130",'lib':20,'tu':495,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804562D0,'size':4,'pad':4,'label':"lit_2690",'name':"@2690",'lib':20,'tu':495,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804562D8,'size':4,'pad':4,'label':"lit_1534",'name':"@1534",'lib':20,'tu':496,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804562E0,'size':8,'pad':0,'label':"lit_1536",'name':"@1536",'lib':20,'tu':496,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804562E8,'size':8,'pad':0,'label':"lit_1539",'name':"@1539",'lib':20,'tu':496,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804562D8,'size':4,'pad':4,'label':"lit_1534",'name':"@1534",'lib':20,'tu':496,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804562E0,'size':8,'pad':0,'label':"lit_1536",'name':"@1536",'lib':20,'tu':496,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804562E8,'size':8,'pad':0,'label':"lit_1539",'name':"@1539",'lib':20,'tu':496,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804562F0,'size':4,'pad':4,'label':"lit_1731",'name':"@1731",'lib':20,'tu':496,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804562F8,'size':4,'pad':4,'label':"lit_1581",'name':"@1581",'lib':20,'tu':497,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456300,'size':4,'pad':4,'label':"lit_1573",'name':"@1573",'lib':20,'tu':498,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456308,'size':8,'pad':0,'label':"lit_1576",'name':"@1576",'lib':20,'tu':498,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456310,'size':4,'pad':0,'label':"lit_1619",'name':"@1619",'lib':20,'tu':498,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456314,'size':4,'pad':0,'label':"lit_1748",'name':"@1748",'lib':20,'tu':498,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456318,'size':4,'pad':0,'label':"lit_2110",'name':"@2110",'lib':20,'tu':498,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045631C,'size':4,'pad':0,'label':"lit_2111",'name':"@2111",'lib':20,'tu':498,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456320,'size':8,'pad':0,'label':"lit_2379",'name':"@2379",'lib':20,'tu':498,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456328,'size':4,'pad':0,'label':"lit_1050",'name':"@1050",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045632C,'size':4,'pad':0,'label':"lit_1051",'name':"@1051",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456330,'size':4,'pad':0,'label':"lit_1233",'name':"@1233",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804562F8,'size':4,'pad':4,'label':"lit_1581",'name':"@1581",'lib':20,'tu':497,'section':8,'r':[11,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456300,'size':4,'pad':4,'label':"lit_1573",'name':"@1573",'lib':20,'tu':498,'section':8,'r':[10,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456308,'size':8,'pad':0,'label':"lit_1576",'name':"@1576",'lib':20,'tu':498,'section':8,'r':[5,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456310,'size':4,'pad':0,'label':"lit_1619",'name':"@1619",'lib':20,'tu':498,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456314,'size':4,'pad':0,'label':"lit_1748",'name':"@1748",'lib':20,'tu':498,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456318,'size':4,'pad':0,'label':"lit_2110",'name':"@2110",'lib':20,'tu':498,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045631C,'size':4,'pad':0,'label':"lit_2111",'name':"@2111",'lib':20,'tu':498,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456320,'size':8,'pad':0,'label':"lit_2379",'name':"@2379",'lib':20,'tu':498,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456328,'size':4,'pad':0,'label':"lit_1050",'name':"@1050",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045632C,'size':4,'pad':0,'label':"lit_1051",'name':"@1051",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456330,'size':4,'pad':0,'label':"lit_1233",'name':"@1233",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456334,'size':4,'pad':0,'label':"lit_1460",'name':"@1460",'lib':21,'tu':500,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456338,'size':4,'pad':4,'label':"lit_1461",'name':"@1461",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456340,'size':8,'pad':0,'label':"lit_1462",'name':"@1462",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456340,'size':8,'pad':0,'label':"lit_1462",'name':"@1462",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456348,'size':4,'pad':4,'label':"lit_1463",'name':"@1463",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456350,'size':8,'pad':0,'label':"lit_1464",'name':"@1464",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456350,'size':8,'pad':0,'label':"lit_1464",'name':"@1464",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456358,'size':4,'pad':4,'label':"lit_1465",'name':"@1465",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456360,'size':8,'pad':0,'label':"lit_1468",'name':"@1468",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456360,'size':8,'pad':0,'label':"lit_1468",'name':"@1468",'lib':21,'tu':500,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456368,'size':4,'pad':0,'label':"lit_892",'name':"@892",'lib':21,'tu':501,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045636C,'size':4,'pad':0,'label':"lit_893",'name':"@893",'lib':21,'tu':501,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045636C,'size':4,'pad':0,'label':"lit_893",'name':"@893",'lib':21,'tu':501,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456370,'size':4,'pad':4,'label':"lit_894",'name':"@894",'lib':21,'tu':501,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456378,'size':4,'pad':0,'label':"lit_435",'name':"@435",'lib':21,'tu':503,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045637C,'size':4,'pad':0,'label':"lit_526",'name':"@526",'lib':21,'tu':503,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045637C,'size':4,'pad':0,'label':"lit_526",'name':"@526",'lib':21,'tu':503,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456380,'size':4,'pad':4,'label':"lit_557",'name':"@557",'lib':21,'tu':503,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456388,'size':4,'pad':0,'label':"lit_284",'name':"@284",'lib':21,'tu':504,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045638C,'size':4,'pad':0,'label':"lit_285",'name':"@285",'lib':21,'tu':504,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456390,'size':8,'pad':0,'label':"lit_288",'name':"@288",'lib':21,'tu':504,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456388,'size':4,'pad':0,'label':"lit_284",'name':"@284",'lib':21,'tu':504,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045638C,'size':4,'pad':0,'label':"lit_285",'name':"@285",'lib':21,'tu':504,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456390,'size':8,'pad':0,'label':"lit_288",'name':"@288",'lib':21,'tu':504,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456398,'size':4,'pad':0,'label':"lit_1032",'name':"@1032",'lib':21,'tu':506,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045639C,'size':4,'pad':0,'label':"lit_1423",'name':"@1423",'lib':21,'tu':506,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804563A0,'size':4,'pad':4,'label':"lit_687",'name':"@687",'lib':21,'tu':508,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x8045639C,'size':4,'pad':0,'label':"lit_1423",'name':"@1423",'lib':21,'tu':506,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804563A0,'size':4,'pad':4,'label':"lit_687",'name':"@687",'lib':21,'tu':508,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804563A8,'size':4,'pad':0,'label':"lit_585",'name':"@585",'lib':21,'tu':510,'section':8,'r':[7,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804563AC,'size':4,'pad':0,'label':"lit_5060",'name':"@5060",'lib':21,'tu':510,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804563B0,'size':4,'pad':0,'label':"lit_1167",'name':"@1167",'lib':21,'tu':511,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804563B4,'size':4,'pad':0,'label':"lit_1168",'name':"@1168",'lib':21,'tu':511,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804563B8,'size':8,'pad':0,'label':"lit_1171",'name':"@1171",'lib':21,'tu':511,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804563B0,'size':4,'pad':0,'label':"lit_1167",'name':"@1167",'lib':21,'tu':511,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804563B4,'size':4,'pad':0,'label':"lit_1168",'name':"@1168",'lib':21,'tu':511,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804563B8,'size':8,'pad':0,'label':"lit_1171",'name':"@1171",'lib':21,'tu':511,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804563C0,'size':4,'pad':0,'label':"j3dDefaultColInfo",'name':"j3dDefaultColInfo",'lib':21,'tu':511,'section':8,'r':[0,4,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804563C4,'size':4,'pad':0,'label':"j3dDefaultAmbInfo",'name':"j3dDefaultAmbInfo",'lib':21,'tu':511,'section':8,'r':[0,2,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804563C8,'size':4,'pad':0,'label':"data_804563C8",'name':None,'lib':21,'tu':511,'section':8,'r':[0,1,0],'sh':[0,0,0],'type':"Integer"}, @@ -26972,280 +26972,280 @@ SYMBOLS = [ {'addr':0x804563F0,'size':8,'pad':0,'label':"j3dDefaultColorChanInfo",'name':"j3dDefaultColorChanInfo",'lib':21,'tu':511,'section':8,'r':[0,3,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804563F8,'size':4,'pad':0,'label':"struct_804563F8",'name':None,'lib':21,'tu':511,'section':8,'r':[0,2,0],'sh':[0,0,0],'type':"Structure"}, {'addr':0x804563FC,'size':2,'pad':2,'label':"j3dDefaultZModeID",'name':"j3dDefaultZModeID",'lib':21,'tu':511,'section':8,'r':[0,3,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456400,'size':4,'pad':0,'label':"lit_781",'name':"@781",'lib':21,'tu':512,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456404,'size':4,'pad':0,'label':"lit_782",'name':"@782",'lib':21,'tu':512,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456408,'size':8,'pad':0,'label':"lit_784",'name':"@784",'lib':21,'tu':512,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456410,'size':4,'pad':0,'label':"lit_409",'name':"@409",'lib':21,'tu':513,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456400,'size':4,'pad':0,'label':"lit_781",'name':"@781",'lib':21,'tu':512,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456404,'size':4,'pad':0,'label':"lit_782",'name':"@782",'lib':21,'tu':512,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456408,'size':8,'pad':0,'label':"lit_784",'name':"@784",'lib':21,'tu':512,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456410,'size':4,'pad':0,'label':"lit_409",'name':"@409",'lib':21,'tu':513,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456414,'size':4,'pad':0,'label':"lit_410",'name':"@410",'lib':21,'tu':513,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456418,'size':4,'pad':4,'label':"lit_903",'name':"@903",'lib':22,'tu':515,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456420,'size':4,'pad':0,'label':"lit_1320",'name':"@1320",'lib':22,'tu':517,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456420,'size':4,'pad':0,'label':"lit_1320",'name':"@1320",'lib':22,'tu':517,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456424,'size':4,'pad':0,'label':"lit_1321",'name':"@1321",'lib':22,'tu':517,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456428,'size':4,'pad':4,'label':"lit_896",'name':"@896",'lib':22,'tu':518,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456430,'size':4,'pad':0,'label':"lit_852",'name':"@852",'lib':22,'tu':519,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456430,'size':4,'pad':0,'label':"lit_852",'name':"@852",'lib':22,'tu':519,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456434,'size':4,'pad':0,'label':"lit_853",'name':"@853",'lib':22,'tu':519,'section':8,'r':[20,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456438,'size':4,'pad':4,'label':"lit_973",'name':"@973",'lib':22,'tu':519,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456440,'size':8,'pad':0,'label':"lit_975",'name':"@975",'lib':22,'tu':519,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456440,'size':8,'pad':0,'label':"lit_975",'name':"@975",'lib':22,'tu':519,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456448,'size':4,'pad':4,'label':"lit_1092",'name':"@1092",'lib':22,'tu':519,'section':8,'r':[4,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456450,'size':8,'pad':0,'label':"lit_1223",'name':"@1223",'lib':22,'tu':519,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456458,'size':4,'pad':0,'label':"lit_1499",'name':"@1499",'lib':22,'tu':519,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045645C,'size':4,'pad':0,'label':"lit_1817",'name':"@1817",'lib':22,'tu':519,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456450,'size':8,'pad':0,'label':"lit_1223",'name':"@1223",'lib':22,'tu':519,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456458,'size':4,'pad':0,'label':"lit_1499",'name':"@1499",'lib':22,'tu':519,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045645C,'size':4,'pad':0,'label':"lit_1817",'name':"@1817",'lib':22,'tu':519,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456460,'size':4,'pad':4,'label':"lit_1818",'name':"@1818",'lib':22,'tu':519,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456468,'size':4,'pad':0,'label':"lit_1110",'name':"@1110",'lib':22,'tu':521,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456468,'size':4,'pad':0,'label':"lit_1110",'name':"@1110",'lib':22,'tu':521,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045646C,'size':4,'pad':0,'label':"lit_1578",'name':"@1578",'lib':22,'tu':521,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456470,'size':4,'pad':0,'label':"lit_830",'name':"@830",'lib':22,'tu':522,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456470,'size':4,'pad':0,'label':"lit_830",'name':"@830",'lib':22,'tu':522,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456474,'size':4,'pad':0,'label':"lit_840",'name':"@840",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80456478,'size':4,'pad':0,'label':"data_80456478",'name':None,'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x8045647C,'size':4,'pad':0,'label':"lit_866",'name':"@866",'lib':22,'tu':522,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456480,'size':4,'pad':0,'label':"lit_1020",'name':"@1020",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456484,'size':4,'pad':0,'label':"lit_1021",'name':"@1021",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456488,'size':4,'pad':0,'label':"lit_1022",'name':"@1022",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045648C,'size':4,'pad':0,'label':"lit_1023",'name':"@1023",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456490,'size':4,'pad':0,'label':"lit_1024",'name':"@1024",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456494,'size':4,'pad':0,'label':"lit_1025",'name':"@1025",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456498,'size':8,'pad':0,'label':"lit_1027",'name':"@1027",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804564A0,'size':4,'pad':0,'label':"lit_922",'name':"@922",'lib':22,'tu':523,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456480,'size':4,'pad':0,'label':"lit_1020",'name':"@1020",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456484,'size':4,'pad':0,'label':"lit_1021",'name':"@1021",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456488,'size':4,'pad':0,'label':"lit_1022",'name':"@1022",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045648C,'size':4,'pad':0,'label':"lit_1023",'name':"@1023",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456490,'size':4,'pad':0,'label':"lit_1024",'name':"@1024",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456494,'size':4,'pad':0,'label':"lit_1025",'name':"@1025",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456498,'size':8,'pad':0,'label':"lit_1027",'name':"@1027",'lib':22,'tu':522,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804564A0,'size':4,'pad':0,'label':"lit_922",'name':"@922",'lib':22,'tu':523,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804564A4,'size':4,'pad':0,'label':"lit_1220",'name':"@1220",'lib':22,'tu':523,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804564A8,'size':4,'pad':0,'label':"lit_1691",'name':"@1691",'lib':23,'tu':525,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804564AC,'size':4,'pad':0,'label':"lit_1798",'name':"@1798",'lib':23,'tu':525,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804564B0,'size':4,'pad':4,'label':"lit_1915",'name':"@1915",'lib':23,'tu':525,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804564B8,'size':4,'pad':0,'label':"lit_1130",'name':"@1130",'lib':23,'tu':526,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x804564BC,'size':4,'pad':0,'label':"lit_1317",'name':"@1317",'lib':23,'tu':526,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804564C0,'size':4,'pad':4,'label':"lit_889",'name':"@889",'lib':23,'tu':532,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804564C0,'size':4,'pad':4,'label':"lit_889",'name':"@889",'lib':23,'tu':532,'section':8,'r':[13,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804564C8,'size':8,'pad':0,'label':"lit_376",'name':"@376",'lib':24,'tu':533,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x804564D0,'size':4,'pad':4,'label':"lit_411",'name':"@411",'lib':24,'tu':533,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804564D8,'size':4,'pad':4,'label':"lit_326",'name':"@326",'lib':24,'tu':535,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804564E0,'size':8,'pad':0,'label':"lit_436",'name':"@436",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804564E8,'size':8,'pad':0,'label':"lit_437",'name':"@437",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804564F0,'size':8,'pad':0,'label':"lit_438",'name':"@438",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804564D8,'size':4,'pad':4,'label':"lit_326",'name':"@326",'lib':24,'tu':535,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804564E0,'size':8,'pad':0,'label':"lit_436",'name':"@436",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804564E8,'size':8,'pad':0,'label':"lit_437",'name':"@437",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804564F0,'size':8,'pad':0,'label':"lit_438",'name':"@438",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804564F8,'size':4,'pad':4,'label':"lit_439",'name':"@439",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456500,'size':8,'pad':0,'label':"lit_441",'name':"@441",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456508,'size':4,'pad':0,'label':"lit_96",'name':"@96",'lib':30,'tu':565,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456500,'size':8,'pad':0,'label':"lit_441",'name':"@441",'lib':24,'tu':535,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456508,'size':4,'pad':0,'label':"lit_96",'name':"@96",'lib':30,'tu':565,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x8045650C,'size':4,'pad':0,'label':"lit_97",'name':"@97",'lib':30,'tu':565,'section':8,'r':[6,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456510,'size':4,'pad':0,'label':"lit_190",'name':"@190",'lib':30,'tu':565,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456514,'size':4,'pad':0,'label':"lit_191",'name':"@191",'lib':30,'tu':565,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456518,'size':4,'pad':0,'label':"lit_206",'name':"@206",'lib':30,'tu':565,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045651C,'size':4,'pad':0,'label':"lit_227",'name':"@227",'lib':30,'tu':565,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456510,'size':4,'pad':0,'label':"lit_190",'name':"@190",'lib':30,'tu':565,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456514,'size':4,'pad':0,'label':"lit_191",'name':"@191",'lib':30,'tu':565,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456518,'size':4,'pad':0,'label':"lit_206",'name':"@206",'lib':30,'tu':565,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045651C,'size':4,'pad':0,'label':"lit_227",'name':"@227",'lib':30,'tu':565,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456520,'size':4,'pad':4,'label':"lit_230",'name':"@230",'lib':30,'tu':565,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456528,'size':4,'pad':0,'label':"lit_99",'name':"@99",'lib':30,'tu':567,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045652C,'size':4,'pad':0,'label':"lit_100",'name':"@100",'lib':30,'tu':567,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456528,'size':4,'pad':0,'label':"lit_99",'name':"@99",'lib':30,'tu':567,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045652C,'size':4,'pad':0,'label':"lit_100",'name':"@100",'lib':30,'tu':567,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456530,'size':4,'pad':0,'label':"lit_101",'name':"@101",'lib':30,'tu':567,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456534,'size':4,'pad':0,'label':"lit_102",'name':"@102",'lib':30,'tu':567,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456538,'size':4,'pad':0,'label':"lit_105",'name':"@105",'lib':30,'tu':567,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045653C,'size':4,'pad':0,'label':"lit_106",'name':"@106",'lib':30,'tu':567,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456534,'size':4,'pad':0,'label':"lit_102",'name':"@102",'lib':30,'tu':567,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456538,'size':4,'pad':0,'label':"lit_105",'name':"@105",'lib':30,'tu':567,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045653C,'size':4,'pad':0,'label':"lit_106",'name':"@106",'lib':30,'tu':567,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456540,'size':4,'pad':0,'label':"lit_113",'name':"@113",'lib':30,'tu':568,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456544,'size':4,'pad':0,'label':"lit_118",'name':"@118",'lib':30,'tu':568,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456548,'size':4,'pad':0,'label':"lit_119",'name':"@119",'lib':30,'tu':568,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045654C,'size':4,'pad':0,'label':"lit_161",'name':"@161",'lib':30,'tu':568,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456544,'size':4,'pad':0,'label':"lit_118",'name':"@118",'lib':30,'tu':568,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456548,'size':4,'pad':0,'label':"lit_119",'name':"@119",'lib':30,'tu':568,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045654C,'size':4,'pad':0,'label':"lit_161",'name':"@161",'lib':30,'tu':568,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456550,'size':4,'pad':0,'label':"lit_130",'name':"@130",'lib':30,'tu':569,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456554,'size':4,'pad':0,'label':"lit_133",'name':"@133",'lib':30,'tu':569,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456558,'size':4,'pad':0,'label':"lit_135",'name':"@135",'lib':30,'tu':569,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045655C,'size':4,'pad':0,'label':"lit_261",'name':"@261",'lib':30,'tu':569,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456560,'size':4,'pad':4,'label':"lit_160",'name':"@160",'lib':33,'tu':579,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456568,'size':8,'pad':0,'label':"lit_161",'name':"@161",'lib':33,'tu':579,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456570,'size':8,'pad':0,'label':"lit_162",'name':"@162",'lib':33,'tu':579,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456578,'size':8,'pad':0,'label':"lit_164",'name':"@164",'lib':33,'tu':579,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456554,'size':4,'pad':0,'label':"lit_133",'name':"@133",'lib':30,'tu':569,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456558,'size':4,'pad':0,'label':"lit_135",'name':"@135",'lib':30,'tu':569,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045655C,'size':4,'pad':0,'label':"lit_261",'name':"@261",'lib':30,'tu':569,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456560,'size':4,'pad':4,'label':"lit_160",'name':"@160",'lib':33,'tu':579,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456568,'size':8,'pad':0,'label':"lit_161",'name':"@161",'lib':33,'tu':579,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456570,'size':8,'pad':0,'label':"lit_162",'name':"@162",'lib':33,'tu':579,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456578,'size':8,'pad':0,'label':"lit_164",'name':"@164",'lib':33,'tu':579,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456580,'size':4,'pad':0,'label':"__GXData",'name':"__GXData",'lib':38,'tu':601,'section':8,'r':[6,108,0],'sh':[0,0,0],'type':"ReferenceArray"}, - {'addr':0x80456584,'size':4,'pad':0,'label':"lit_267",'name':"@267",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456584,'size':4,'pad':0,'label':"lit_267",'name':"@267",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456588,'size':4,'pad':0,'label':"lit_268",'name':"@268",'lib':38,'tu':601,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x8045658C,'size':4,'pad':0,'label':"lit_269",'name':"@269",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80456590,'size':4,'pad':0,'label':"lit_270",'name':"@270",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456594,'size':4,'pad':0,'label':"lit_271",'name':"@271",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456598,'size':4,'pad':0,'label':"lit_331",'name':"@331",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045659C,'size':4,'pad':0,'label':"lit_332",'name':"@332",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565A0,'size':8,'pad':0,'label':"lit_334",'name':"@334",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456598,'size':4,'pad':0,'label':"lit_331",'name':"@331",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045659C,'size':4,'pad':0,'label':"lit_332",'name':"@332",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565A0,'size':8,'pad':0,'label':"lit_334",'name':"@334",'lib':38,'tu':601,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804565A8,'size':4,'pad':4,'label':"lit_179",'name':"@179",'lib':38,'tu':606,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804565B0,'size':8,'pad':0,'label':"lit_234",'name':"@234",'lib':38,'tu':606,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804565B0,'size':8,'pad':0,'label':"lit_234",'name':"@234",'lib':38,'tu':606,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804565B8,'size':4,'pad':0,'label':"lit_134",'name':"@134",'lib':38,'tu':607,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804565BC,'size':4,'pad':0,'label':"lit_135",'name':"@135",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565C0,'size':4,'pad':0,'label':"lit_136",'name':"@136",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565C4,'size':4,'pad':0,'label':"lit_137",'name':"@137",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565C8,'size':4,'pad':0,'label':"lit_138",'name':"@138",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565CC,'size':4,'pad':0,'label':"lit_139",'name':"@139",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565D0,'size':4,'pad':0,'label':"lit_140",'name':"@140",'lib':38,'tu':607,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565D4,'size':4,'pad':0,'label':"lit_141",'name':"@141",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565D8,'size':4,'pad':0,'label':"lit_142",'name':"@142",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565DC,'size':4,'pad':0,'label':"lit_143",'name':"@143",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565E0,'size':4,'pad':0,'label':"lit_144",'name':"@144",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565E4,'size':4,'pad':0,'label':"lit_160",'name':"@160",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804565BC,'size':4,'pad':0,'label':"lit_135",'name':"@135",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565C0,'size':4,'pad':0,'label':"lit_136",'name':"@136",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565C4,'size':4,'pad':0,'label':"lit_137",'name':"@137",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565C8,'size':4,'pad':0,'label':"lit_138",'name':"@138",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565CC,'size':4,'pad':0,'label':"lit_139",'name':"@139",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565D0,'size':4,'pad':0,'label':"lit_140",'name':"@140",'lib':38,'tu':607,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565D4,'size':4,'pad':0,'label':"lit_141",'name':"@141",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565D8,'size':4,'pad':0,'label':"lit_142",'name':"@142",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565DC,'size':4,'pad':0,'label':"lit_143",'name':"@143",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565E0,'size':4,'pad':0,'label':"lit_144",'name':"@144",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565E4,'size':4,'pad':0,'label':"lit_160",'name':"@160",'lib':38,'tu':607,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804565E8,'size':4,'pad':4,'label':"lit_220",'name':"@220",'lib':38,'tu':608,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x804565F0,'size':8,'pad':0,'label':"lit_222",'name':"@222",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804565F8,'size':4,'pad':0,'label':"lit_288",'name':"@288",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x804565FC,'size':4,'pad':0,'label':"lit_289",'name':"@289",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456600,'size':4,'pad':0,'label':"lit_290",'name':"@290",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456604,'size':4,'pad':0,'label':"lit_291",'name':"@291",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x804565F0,'size':8,'pad':0,'label':"lit_222",'name':"@222",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565F8,'size':4,'pad':0,'label':"lit_288",'name':"@288",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804565FC,'size':4,'pad':0,'label':"lit_289",'name':"@289",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456600,'size':4,'pad':0,'label':"lit_290",'name':"@290",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456604,'size':4,'pad':0,'label':"lit_291",'name':"@291",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456608,'size':4,'pad':0,'label':"lit_292",'name':"@292",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045660C,'size':4,'pad':0,'label':"lit_293",'name':"@293",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045660C,'size':4,'pad':0,'label':"lit_293",'name':"@293",'lib':38,'tu':608,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456610,'size':4,'pad':4,'label':"lit_149",'name':"@149",'lib':38,'tu':609,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456618,'size':4,'pad':0,'label':"lit_211",'name':"@211",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x8045661C,'size':4,'pad':0,'label':"lit_212",'name':"@212",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x8045661C,'size':4,'pad':0,'label':"lit_212",'name':"@212",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456620,'size':4,'pad':4,'label':"lit_213",'name':"@213",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456628,'size':8,'pad':0,'label':"lit_214",'name':"@214",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456628,'size':8,'pad':0,'label':"lit_214",'name':"@214",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456630,'size':4,'pad':4,'label':"lit_215",'name':"@215",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456638,'size':8,'pad':0,'label':"lit_216",'name':"@216",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456638,'size':8,'pad':0,'label':"lit_216",'name':"@216",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456640,'size':4,'pad':4,'label':"lit_217",'name':"@217",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, - {'addr':0x80456648,'size':8,'pad':0,'label':"lit_219",'name':"@219",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456648,'size':8,'pad':0,'label':"lit_219",'name':"@219",'lib':38,'tu':611,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456650,'size':4,'pad':0,'label':"lit_26",'name':"@26",'lib':38,'tu':613,'section':8,'r':[3,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456654,'size':4,'pad':0,'label':"lit_27",'name':"@27",'lib':38,'tu':613,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x80456658,'size':4,'pad':0,'label':"lit_28",'name':"@28",'lib':38,'tu':613,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"Integer"}, - {'addr':0x8045665C,'size':4,'pad':0,'label':"lit_201",'name':"@201",'lib':38,'tu':613,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, + {'addr':0x80456654,'size':4,'pad':0,'label':"lit_27",'name':"@27",'lib':38,'tu':613,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456658,'size':4,'pad':0,'label':"lit_28",'name':"@28",'lib':38,'tu':613,'section':8,'r':[2,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x8045665C,'size':4,'pad':0,'label':"lit_201",'name':"@201",'lib':38,'tu':613,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456660,'size':8,'pad':0,'label':"lit_824",'name':"@824",'lib':40,'tu':621,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456668,'size':4,'pad':4,'label':"lit_74",'name':"@74",'lib':40,'tu':630,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"Integer"}, {'addr':0x80456670,'size':8,'pad':0,'label':"lit_1089",'name':"@1089",'lib':40,'tu':634,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456678,'size':8,'pad':0,'label':"lit_83",'name':"@83",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456680,'size':8,'pad':0,'label':"lit_84",'name':"@84",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456688,'size':8,'pad':0,'label':"lit_85",'name':"@85",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456690,'size':8,'pad':0,'label':"lit_86",'name':"@86",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456698,'size':8,'pad':0,'label':"lit_87",'name':"@87",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566A0,'size':8,'pad':0,'label':"lit_88",'name':"@88",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566A8,'size':8,'pad':0,'label':"lit_89",'name':"@89",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566B0,'size':8,'pad':0,'label':"lit_90",'name':"@90",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566B8,'size':8,'pad':0,'label':"lit_91",'name':"@91",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566C0,'size':8,'pad':0,'label':"lit_92",'name':"@92",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566C8,'size':8,'pad':0,'label':"lit_93",'name':"@93",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566D0,'size':8,'pad':0,'label':"lit_94",'name':"@94",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566D8,'size':8,'pad':0,'label':"lit_95",'name':"@95",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566E0,'size':8,'pad':0,'label':"lit_96",'name':"@96",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566E8,'size':8,'pad':0,'label':"lit_97",'name':"@97",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566F0,'size':8,'pad':0,'label':"lit_98",'name':"@98",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804566F8,'size':8,'pad':0,'label':"lit_99",'name':"@99",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456700,'size':8,'pad':0,'label':"lit_94",'name':"@94",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456708,'size':8,'pad':0,'label':"lit_95",'name':"@95",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456710,'size':8,'pad':0,'label':"lit_96",'name':"@96",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456718,'size':8,'pad':0,'label':"lit_97",'name':"@97",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456720,'size':8,'pad':0,'label':"lit_98",'name':"@98",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456728,'size':8,'pad':0,'label':"lit_99",'name':"@99",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456730,'size':8,'pad':0,'label':"lit_100",'name':"@100",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456738,'size':8,'pad':0,'label':"lit_101",'name':"@101",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456740,'size':8,'pad':0,'label':"lit_102",'name':"@102",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456748,'size':8,'pad':0,'label':"lit_103",'name':"@103",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456750,'size':8,'pad':0,'label':"lit_104",'name':"@104",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456758,'size':8,'pad':0,'label':"lit_105",'name':"@105",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456760,'size':8,'pad':0,'label':"lit_106",'name':"@106",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456768,'size':8,'pad':0,'label':"lit_107",'name':"@107",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456770,'size':8,'pad':0,'label':"lit_108",'name':"@108",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456778,'size':8,'pad':0,'label':"lit_109",'name':"@109",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456780,'size':8,'pad':0,'label':"lit_110",'name':"@110",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456788,'size':8,'pad':0,'label':"lit_145",'name':"@145",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456790,'size':8,'pad':0,'label':"lit_146",'name':"@146",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456798,'size':8,'pad':0,'label':"lit_147",'name':"@147",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567A0,'size':8,'pad':0,'label':"lit_148",'name':"@148",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567A8,'size':8,'pad':0,'label':"lit_149",'name':"@149",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567B0,'size':8,'pad':0,'label':"lit_150",'name':"@150",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567B8,'size':8,'pad':0,'label':"lit_151",'name':"@151",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567C0,'size':8,'pad':0,'label':"lit_152",'name':"@152",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456680,'size':8,'pad':0,'label':"lit_84",'name':"@84",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456688,'size':8,'pad':0,'label':"lit_85",'name':"@85",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456690,'size':8,'pad':0,'label':"lit_86",'name':"@86",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456698,'size':8,'pad':0,'label':"lit_87",'name':"@87",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566A0,'size':8,'pad':0,'label':"lit_88",'name':"@88",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566A8,'size':8,'pad':0,'label':"lit_89",'name':"@89",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566B0,'size':8,'pad':0,'label':"lit_90",'name':"@90",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566B8,'size':8,'pad':0,'label':"lit_91",'name':"@91",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566C0,'size':8,'pad':0,'label':"lit_92",'name':"@92",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566C8,'size':8,'pad':0,'label':"lit_93",'name':"@93",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566D0,'size':8,'pad':0,'label':"lit_94",'name':"@94",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566D8,'size':8,'pad':0,'label':"lit_95",'name':"@95",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566E0,'size':8,'pad':0,'label':"lit_96",'name':"@96",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566E8,'size':8,'pad':0,'label':"lit_97",'name':"@97",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566F0,'size':8,'pad':0,'label':"lit_98",'name':"@98",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804566F8,'size':8,'pad':0,'label':"lit_99",'name':"@99",'lib':40,'tu':642,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456700,'size':8,'pad':0,'label':"lit_94",'name':"@94",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456708,'size':8,'pad':0,'label':"lit_95",'name':"@95",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456710,'size':8,'pad':0,'label':"lit_96",'name':"@96",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456718,'size':8,'pad':0,'label':"lit_97",'name':"@97",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456720,'size':8,'pad':0,'label':"lit_98",'name':"@98",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456728,'size':8,'pad':0,'label':"lit_99",'name':"@99",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456730,'size':8,'pad':0,'label':"lit_100",'name':"@100",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456738,'size':8,'pad':0,'label':"lit_101",'name':"@101",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456740,'size':8,'pad':0,'label':"lit_102",'name':"@102",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456748,'size':8,'pad':0,'label':"lit_103",'name':"@103",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456750,'size':8,'pad':0,'label':"lit_104",'name':"@104",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456758,'size':8,'pad':0,'label':"lit_105",'name':"@105",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456760,'size':8,'pad':0,'label':"lit_106",'name':"@106",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456768,'size':8,'pad':0,'label':"lit_107",'name':"@107",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456770,'size':8,'pad':0,'label':"lit_108",'name':"@108",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456778,'size':8,'pad':0,'label':"lit_109",'name':"@109",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456780,'size':8,'pad':0,'label':"lit_110",'name':"@110",'lib':40,'tu':643,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456788,'size':8,'pad':0,'label':"lit_145",'name':"@145",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456790,'size':8,'pad':0,'label':"lit_146",'name':"@146",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456798,'size':8,'pad':0,'label':"lit_147",'name':"@147",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804567A0,'size':8,'pad':0,'label':"lit_148",'name':"@148",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804567A8,'size':8,'pad':0,'label':"lit_149",'name':"@149",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804567B0,'size':8,'pad':0,'label':"lit_150",'name':"@150",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804567B8,'size':8,'pad':0,'label':"lit_151",'name':"@151",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804567C0,'size':8,'pad':0,'label':"lit_152",'name':"@152",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804567C8,'size':8,'pad':0,'label':"lit_153",'name':"@153",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567D0,'size':8,'pad':0,'label':"lit_154",'name':"@154",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567D8,'size':8,'pad':0,'label':"lit_155",'name':"@155",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804567D0,'size':8,'pad':0,'label':"lit_154",'name':"@154",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804567D8,'size':8,'pad':0,'label':"lit_155",'name':"@155",'lib':40,'tu':644,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x804567E0,'size':8,'pad':0,'label':"lit_115",'name':"@115",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567E8,'size':8,'pad':0,'label':"lit_116",'name':"@116",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567F0,'size':8,'pad':0,'label':"lit_117",'name':"@117",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804567F8,'size':8,'pad':0,'label':"lit_118",'name':"@118",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456800,'size':8,'pad':0,'label':"lit_119",'name':"@119",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456808,'size':8,'pad':0,'label':"lit_120",'name':"@120",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456810,'size':8,'pad':0,'label':"lit_121",'name':"@121",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456818,'size':8,'pad':0,'label':"lit_122",'name':"@122",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456820,'size':8,'pad':0,'label':"lit_123",'name':"@123",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456828,'size':8,'pad':0,'label':"lit_124",'name':"@124",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456830,'size':8,'pad':0,'label':"lit_125",'name':"@125",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456838,'size':8,'pad':0,'label':"lit_126",'name':"@126",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456840,'size':8,'pad':0,'label':"lit_127",'name':"@127",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456848,'size':8,'pad':0,'label':"lit_128",'name':"@128",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456850,'size':8,'pad':0,'label':"lit_131",'name':"@131",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456858,'size':8,'pad':0,'label':"lit_336",'name':"@336",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x804567E8,'size':8,'pad':0,'label':"lit_116",'name':"@116",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804567F0,'size':8,'pad':0,'label':"lit_117",'name':"@117",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804567F8,'size':8,'pad':0,'label':"lit_118",'name':"@118",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456800,'size':8,'pad':0,'label':"lit_119",'name':"@119",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456808,'size':8,'pad':0,'label':"lit_120",'name':"@120",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456810,'size':8,'pad':0,'label':"lit_121",'name':"@121",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456818,'size':8,'pad':0,'label':"lit_122",'name':"@122",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456820,'size':8,'pad':0,'label':"lit_123",'name':"@123",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456828,'size':8,'pad':0,'label':"lit_124",'name':"@124",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456830,'size':8,'pad':0,'label':"lit_125",'name':"@125",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456838,'size':8,'pad':0,'label':"lit_126",'name':"@126",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456840,'size':8,'pad':0,'label':"lit_127",'name':"@127",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456848,'size':8,'pad':0,'label':"lit_128",'name':"@128",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456850,'size':8,'pad':0,'label':"lit_131",'name':"@131",'lib':40,'tu':645,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456858,'size':8,'pad':0,'label':"lit_336",'name':"@336",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456860,'size':8,'pad':0,'label':"lit_337",'name':"@337",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456868,'size':8,'pad':0,'label':"lit_338",'name':"@338",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456870,'size':8,'pad':0,'label':"lit_339",'name':"@339",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456878,'size':8,'pad':0,'label':"lit_340",'name':"@340",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456880,'size':8,'pad':0,'label':"lit_341",'name':"@341",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456888,'size':8,'pad':0,'label':"lit_342",'name':"@342",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456890,'size':8,'pad':0,'label':"lit_343",'name':"@343",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456898,'size':8,'pad':0,'label':"lit_344",'name':"@344",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568A0,'size':8,'pad':0,'label':"lit_345",'name':"@345",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568A8,'size':8,'pad':0,'label':"lit_346",'name':"@346",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568B0,'size':8,'pad':0,'label':"lit_347",'name':"@347",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568B8,'size':8,'pad':0,'label':"lit_348",'name':"@348",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568C0,'size':8,'pad':0,'label':"lit_349",'name':"@349",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568C8,'size':8,'pad':0,'label':"lit_350",'name':"@350",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568D0,'size':8,'pad':0,'label':"lit_351",'name':"@351",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568D8,'size':8,'pad':0,'label':"lit_352",'name':"@352",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568E0,'size':8,'pad':0,'label':"lit_353",'name':"@353",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568E8,'size':8,'pad':0,'label':"lit_354",'name':"@354",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568F0,'size':8,'pad':0,'label':"lit_355",'name':"@355",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804568F8,'size':8,'pad':0,'label':"lit_356",'name':"@356",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456900,'size':8,'pad':0,'label':"lit_357",'name':"@357",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456908,'size':8,'pad':0,'label':"lit_358",'name':"@358",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456910,'size':8,'pad':0,'label':"lit_359",'name':"@359",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456918,'size':8,'pad':0,'label':"lit_360",'name':"@360",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456920,'size':8,'pad':0,'label':"lit_361",'name':"@361",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456928,'size':8,'pad':0,'label':"lit_362",'name':"@362",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456930,'size':8,'pad':0,'label':"lit_363",'name':"@363",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456938,'size':8,'pad':0,'label':"lit_364",'name':"@364",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456940,'size':8,'pad':0,'label':"lit_365",'name':"@365",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456948,'size':8,'pad':0,'label':"lit_366",'name':"@366",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456950,'size':8,'pad':0,'label':"lit_367",'name':"@367",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456958,'size':8,'pad':0,'label':"lit_368",'name':"@368",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456960,'size':8,'pad':0,'label':"lit_370",'name':"@370",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456868,'size':8,'pad':0,'label':"lit_338",'name':"@338",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456870,'size':8,'pad':0,'label':"lit_339",'name':"@339",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456878,'size':8,'pad':0,'label':"lit_340",'name':"@340",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456880,'size':8,'pad':0,'label':"lit_341",'name':"@341",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456888,'size':8,'pad':0,'label':"lit_342",'name':"@342",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456890,'size':8,'pad':0,'label':"lit_343",'name':"@343",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456898,'size':8,'pad':0,'label':"lit_344",'name':"@344",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568A0,'size':8,'pad':0,'label':"lit_345",'name':"@345",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568A8,'size':8,'pad':0,'label':"lit_346",'name':"@346",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568B0,'size':8,'pad':0,'label':"lit_347",'name':"@347",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568B8,'size':8,'pad':0,'label':"lit_348",'name':"@348",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568C0,'size':8,'pad':0,'label':"lit_349",'name':"@349",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568C8,'size':8,'pad':0,'label':"lit_350",'name':"@350",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568D0,'size':8,'pad':0,'label':"lit_351",'name':"@351",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568D8,'size':8,'pad':0,'label':"lit_352",'name':"@352",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568E0,'size':8,'pad':0,'label':"lit_353",'name':"@353",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568E8,'size':8,'pad':0,'label':"lit_354",'name':"@354",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568F0,'size':8,'pad':0,'label':"lit_355",'name':"@355",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804568F8,'size':8,'pad':0,'label':"lit_356",'name':"@356",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456900,'size':8,'pad':0,'label':"lit_357",'name':"@357",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456908,'size':8,'pad':0,'label':"lit_358",'name':"@358",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456910,'size':8,'pad':0,'label':"lit_359",'name':"@359",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456918,'size':8,'pad':0,'label':"lit_360",'name':"@360",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456920,'size':8,'pad':0,'label':"lit_361",'name':"@361",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456928,'size':8,'pad':0,'label':"lit_362",'name':"@362",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456930,'size':8,'pad':0,'label':"lit_363",'name':"@363",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456938,'size':8,'pad':0,'label':"lit_364",'name':"@364",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456940,'size':8,'pad':0,'label':"lit_365",'name':"@365",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456948,'size':8,'pad':0,'label':"lit_366",'name':"@366",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456950,'size':8,'pad':0,'label':"lit_367",'name':"@367",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456958,'size':8,'pad':0,'label':"lit_368",'name':"@368",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456960,'size':8,'pad':0,'label':"lit_370",'name':"@370",'lib':40,'tu':647,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456968,'size':8,'pad':0,'label':"lit_145",'name':"@145",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456970,'size':8,'pad':0,'label':"lit_146",'name':"@146",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456978,'size':8,'pad':0,'label':"lit_147",'name':"@147",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456980,'size':8,'pad':0,'label':"lit_148",'name':"@148",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456988,'size':8,'pad':0,'label':"lit_149",'name':"@149",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456990,'size':8,'pad':0,'label':"lit_150",'name':"@150",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456998,'size':8,'pad':0,'label':"lit_151",'name':"@151",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569A0,'size':8,'pad':0,'label':"lit_152",'name':"@152",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569A8,'size':8,'pad':0,'label':"lit_153",'name':"@153",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569B0,'size':8,'pad':0,'label':"lit_154",'name':"@154",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569B8,'size':8,'pad':0,'label':"lit_157",'name':"@157",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569C0,'size':8,'pad':0,'label':"lit_65",'name':"@65",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569C8,'size':8,'pad':0,'label':"lit_66",'name':"@66",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569D0,'size':8,'pad':0,'label':"lit_67",'name':"@67",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569D8,'size':8,'pad':0,'label':"lit_68",'name':"@68",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569E0,'size':8,'pad':0,'label':"lit_69",'name':"@69",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569E8,'size':8,'pad':0,'label':"lit_70",'name':"@70",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569F0,'size':8,'pad':0,'label':"lit_71",'name':"@71",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x804569F8,'size':8,'pad':0,'label':"lit_72",'name':"@72",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A00,'size':8,'pad':0,'label':"lit_73",'name':"@73",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456970,'size':8,'pad':0,'label':"lit_146",'name':"@146",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456978,'size':8,'pad':0,'label':"lit_147",'name':"@147",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456980,'size':8,'pad':0,'label':"lit_148",'name':"@148",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456988,'size':8,'pad':0,'label':"lit_149",'name':"@149",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456990,'size':8,'pad':0,'label':"lit_150",'name':"@150",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456998,'size':8,'pad':0,'label':"lit_151",'name':"@151",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569A0,'size':8,'pad':0,'label':"lit_152",'name':"@152",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569A8,'size':8,'pad':0,'label':"lit_153",'name':"@153",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569B0,'size':8,'pad':0,'label':"lit_154",'name':"@154",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569B8,'size':8,'pad':0,'label':"lit_157",'name':"@157",'lib':40,'tu':648,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569C0,'size':8,'pad':0,'label':"lit_65",'name':"@65",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569C8,'size':8,'pad':0,'label':"lit_66",'name':"@66",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569D0,'size':8,'pad':0,'label':"lit_67",'name':"@67",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569D8,'size':8,'pad':0,'label':"lit_68",'name':"@68",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569E0,'size':8,'pad':0,'label':"lit_69",'name':"@69",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569E8,'size':8,'pad':0,'label':"lit_70",'name':"@70",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569F0,'size':8,'pad':0,'label':"lit_71",'name':"@71",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x804569F8,'size':8,'pad':0,'label':"lit_72",'name':"@72",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A00,'size':8,'pad':0,'label':"lit_73",'name':"@73",'lib':40,'tu':649,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456A08,'size':8,'pad':0,'label':"lit_436",'name':"@436",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A10,'size':8,'pad':0,'label':"lit_437",'name':"@437",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A18,'size':8,'pad':0,'label':"lit_438",'name':"@438",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A20,'size':8,'pad':0,'label':"lit_439",'name':"@439",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A28,'size':8,'pad':0,'label':"lit_440",'name':"@440",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A30,'size':8,'pad':0,'label':"lit_441",'name':"@441",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A38,'size':8,'pad':0,'label':"lit_442",'name':"@442",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A40,'size':8,'pad':0,'label':"lit_445",'name':"@445",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A48,'size':8,'pad':0,'label':"lit_60",'name':"@60",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A50,'size':8,'pad':0,'label':"lit_61",'name':"@61",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A58,'size':8,'pad':0,'label':"lit_62",'name':"@62",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A60,'size':8,'pad':0,'label':"lit_63",'name':"@63",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A68,'size':8,'pad':0,'label':"lit_64",'name':"@64",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A70,'size':8,'pad':0,'label':"lit_65",'name':"@65",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A78,'size':8,'pad':0,'label':"lit_66",'name':"@66",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A80,'size':8,'pad':0,'label':"lit_94",'name':"@94",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A88,'size':8,'pad':0,'label':"lit_95",'name':"@95",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A90,'size':8,'pad':0,'label':"lit_96",'name':"@96",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456A98,'size':8,'pad':0,'label':"lit_97",'name':"@97",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456A10,'size':8,'pad':0,'label':"lit_437",'name':"@437",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A18,'size':8,'pad':0,'label':"lit_438",'name':"@438",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A20,'size':8,'pad':0,'label':"lit_439",'name':"@439",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A28,'size':8,'pad':0,'label':"lit_440",'name':"@440",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A30,'size':8,'pad':0,'label':"lit_441",'name':"@441",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A38,'size':8,'pad':0,'label':"lit_442",'name':"@442",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A40,'size':8,'pad':0,'label':"lit_445",'name':"@445",'lib':40,'tu':650,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A48,'size':8,'pad':0,'label':"lit_60",'name':"@60",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A50,'size':8,'pad':0,'label':"lit_61",'name':"@61",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A58,'size':8,'pad':0,'label':"lit_62",'name':"@62",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A60,'size':8,'pad':0,'label':"lit_63",'name':"@63",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A68,'size':8,'pad':0,'label':"lit_64",'name':"@64",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A70,'size':8,'pad':0,'label':"lit_65",'name':"@65",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A78,'size':8,'pad':0,'label':"lit_66",'name':"@66",'lib':40,'tu':651,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A80,'size':8,'pad':0,'label':"lit_94",'name':"@94",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A88,'size':8,'pad':0,'label':"lit_95",'name':"@95",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A90,'size':8,'pad':0,'label':"lit_96",'name':"@96",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456A98,'size':8,'pad':0,'label':"lit_97",'name':"@97",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456AA0,'size':8,'pad':0,'label':"lit_98",'name':"@98",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AA8,'size':8,'pad':0,'label':"lit_99",'name':"@99",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AB0,'size':8,'pad':0,'label':"lit_101",'name':"@101",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AB8,'size':8,'pad':0,'label':"lit_115",'name':"@115",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AC0,'size':8,'pad':0,'label':"lit_116",'name':"@116",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AC8,'size':8,'pad':0,'label':"lit_117",'name':"@117",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AD0,'size':8,'pad':0,'label':"lit_118",'name':"@118",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AD8,'size':8,'pad':0,'label':"lit_119",'name':"@119",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AE0,'size':8,'pad':0,'label':"lit_124",'name':"@124",'lib':40,'tu':654,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456AA8,'size':8,'pad':0,'label':"lit_99",'name':"@99",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456AB0,'size':8,'pad':0,'label':"lit_101",'name':"@101",'lib':40,'tu':652,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456AB8,'size':8,'pad':0,'label':"lit_115",'name':"@115",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456AC0,'size':8,'pad':0,'label':"lit_116",'name':"@116",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456AC8,'size':8,'pad':0,'label':"lit_117",'name':"@117",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456AD0,'size':8,'pad':0,'label':"lit_118",'name':"@118",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456AD8,'size':8,'pad':0,'label':"lit_119",'name':"@119",'lib':40,'tu':653,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456AE0,'size':8,'pad':0,'label':"lit_124",'name':"@124",'lib':40,'tu':654,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456AE8,'size':8,'pad':0,'label':"lit_125",'name':"@125",'lib':40,'tu':654,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456AF0,'size':8,'pad':0,'label':"lit_67",'name':"@67",'lib':40,'tu':656,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456AF8,'size':8,'pad':0,'label':"lit_124",'name':"@124",'lib':40,'tu':657,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456AF8,'size':8,'pad':0,'label':"lit_124",'name':"@124",'lib':40,'tu':657,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456B00,'size':8,'pad':0,'label':"lit_125",'name':"@125",'lib':40,'tu':657,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456B08,'size':8,'pad':0,'label':"lit_57",'name':"@57",'lib':40,'tu':658,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456B08,'size':8,'pad':0,'label':"lit_57",'name':"@57",'lib':40,'tu':658,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456B10,'size':8,'pad':0,'label':"lit_91",'name':"@91",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456B18,'size':8,'pad':0,'label':"lit_92",'name':"@92",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456B20,'size':8,'pad':0,'label':"lit_93",'name':"@93",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456B28,'size':8,'pad':0,'label':"lit_94",'name':"@94",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456B30,'size':8,'pad':0,'label':"lit_95",'name':"@95",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456B18,'size':8,'pad':0,'label':"lit_92",'name':"@92",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456B20,'size':8,'pad':0,'label':"lit_93",'name':"@93",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456B28,'size':8,'pad':0,'label':"lit_94",'name':"@94",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, + {'addr':0x80456B30,'size':8,'pad':0,'label':"lit_95",'name':"@95",'lib':40,'tu':659,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456B38,'size':8,'pad':0,'label':"lit_67",'name':"@67",'lib':40,'tu':661,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456B40,'size':8,'pad':0,'label':"lit_58",'name':"@58",'lib':40,'tu':662,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, - {'addr':0x80456B48,'size':8,'pad':0,'label':"lit_164",'name':"@164",'lib':40,'tu':669,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, + {'addr':0x80456B48,'size':8,'pad':0,'label':"lit_164",'name':"@164",'lib':40,'tu':669,'section':8,'r':[1,0,0],'sh':[0,0,0],'type':"FloatingPoint"}, {'addr':0x80456B60,'size':4,'pad':4,'label':"lit_4530",'name':"@4530",'lib':0,'tu':6,'section':9,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456B68,'size':4,'pad':4,'label':"lit_4275",'name':"@4275",'lib':0,'tu':102,'section':9,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, {'addr':0x80456B70,'size':4,'pad':4,'label':"lit_3621",'name':"@3621",'lib':0,'tu':138,'section':9,'r':[1,0,0],'sh':[0,0,0],'type':"ArbitraryData"}, diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp index 4bba5d8550c..5f111101ad0 100644 --- a/libs/JSystem/J2DGraph/J2DAnimation.cpp +++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp @@ -130,16 +130,6 @@ struct J2DAnmBase { static void J2DGetKeyFrameInterpolation__template0(f32, J3DAnmKeyTableBase*, s16*); static void J2DGetKeyFrameInterpolation__template1(f32, J3DAnmKeyTableBase*, f32*); -extern "C" extern void* __vt__15J2DAnmTevRegKey[4]; -extern "C" extern void* __vt__16J2DAnmTexPattern[4]; -extern "C" extern void* __vt__19J2DAnmTextureSRTKey[4]; -extern "C" extern void* __vt__17J2DAnmVtxColorKey[5]; -extern "C" extern void* __vt__18J2DAnmVtxColorFull[5]; -extern "C" extern void* __vt__14J2DAnmColorKey[5]; -extern "C" extern void* __vt__15J2DAnmColorFull[5]; -extern "C" extern void* __vt__11J2DAnmColor[5]; -extern "C" extern void* __vt__18J2DAnmTransformKey[6]; -extern "C" extern void* __vt__19J2DAnmTransformFull[5]; extern "C" void getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo(); extern "C" void calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo(); @@ -186,11 +176,6 @@ extern "C" extern void* __vt__19J2DAnmTransformFull[5]; void* operator new(u32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* __vt__10J2DAnmBase[4]; -extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */]; -extern "C" extern void* __vt__10JUTNameTab[3]; -extern "C" extern void* __vt__14J2DAnmVtxColor[5]; -extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */]; extern "C" void searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen(); extern "C" void __dt__15J2DAnmTevRegKeyFv(); @@ -229,22 +214,14 @@ extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80456300-80456308 0004+04 s=10 e=0 z=0 None .sdata2 @1573 */ -SECTION_SDATA2 static u8 lit_1573[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_1573[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80456308-80456310 0008+00 s=5 e=0 z=0 None .sdata2 @1576 */ -SECTION_SDATA2 static u8 lit_1576[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1576 = 4503599627370496.0 /* cast u32 to float */; /* 8030A590-8030AAFC 056C+00 s=1 e=0 z=0 None .text * getTransform__19J2DAnmTransformFullCFUsP16J3DTransformInfo */ @@ -259,7 +236,7 @@ asm void J2DAnmTransformFull::getTransform(u16 param_0, J3DTransformInfo* param_ /* ############################################################################################## */ /* 80456310-80456314 0004+00 s=2 e=0 z=0 None .sdata2 @1619 */ -SECTION_SDATA2 static u32 lit_1619 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1619 = 1.0f; /* 8030AAFC-8030AF24 0428+00 s=1 e=0 z=0 None .text * calcTransform__18J2DAnmTransformKeyCFfUsP16J3DTransformInfo */ @@ -297,7 +274,7 @@ asm void J2DAnmColorFull::getColor(u16 param_0, _GXColor* param_1) const { /* ############################################################################################## */ /* 80456314-80456318 0004+00 s=3 e=0 z=0 None .sdata2 @1748 */ -SECTION_SDATA2 static u32 lit_1748 = 0x437F0000; +SECTION_SDATA2 static f32 lit_1748 = 255.0f; /* 8030B200-8030B4C4 02C4+00 s=1 e=0 z=0 None .text getColor__14J2DAnmColorKeyCFUsP8_GXColor */ @@ -409,10 +386,10 @@ asm void J2DAnmVisibilityFull::getVisibility(u16 param_0, u8* param_1) const { /* ############################################################################################## */ /* 80456318-8045631C 0004+00 s=1 e=0 z=0 None .sdata2 @2110 */ -SECTION_SDATA2 static u32 lit_2110 = 0xC4800000; +SECTION_SDATA2 static f32 lit_2110 = -1024.0f; /* 8045631C-80456320 0004+00 s=1 e=0 z=0 None .sdata2 @2111 */ -SECTION_SDATA2 static u32 lit_2111 = 0x447FC000; +SECTION_SDATA2 static f32 lit_2111 = 1023.0f; /* 8030C0F0-8030C3B4 02C4+00 s=0 e=1 z=0 None .text * getTevColorReg__15J2DAnmTevRegKeyCFUsP11_GXColorS10 */ @@ -449,9 +426,7 @@ asm void J2DAnmTevRegKey::searchUpdateMaterialID(J2DScreen* param_0) { /* ############################################################################################## */ /* 80456320-80456328 0008+00 s=1 e=0 z=0 None .sdata2 @2379 */ -SECTION_SDATA2 static u8 lit_2379[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2379 = 4503601774854144.0 /* cast s32 to float */; /* 8030C77C-8030C9B0 0234+00 s=6 e=0 z=0 None .text * J2DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs */ diff --git a/libs/JSystem/J2DGraph/J2DAnmLoader.cpp b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp index 5fc079bec76..e0443d89bba 100644 --- a/libs/JSystem/J2DGraph/J2DAnmLoader.cpp +++ b/libs/JSystem/J2DGraph/J2DAnmLoader.cpp @@ -73,12 +73,12 @@ struct J2DAnmLoader { /* 8030A410 */ ~J2DAnmLoader(); }; +struct J2DAnmColorKey {}; + struct J2DAnmBase { /* 800569B0 */ void searchUpdateMaterialID(J2DScreen*); }; -struct J2DAnmColorKey {}; - struct J2DAnmKeyLoader_v15 { /* 80309290 */ J2DAnmKeyLoader_v15(); /* 803092AC */ ~J2DAnmKeyLoader_v15(); @@ -132,7 +132,6 @@ void JSUConvertOffsetToPtr__template39(void const*, void const*); void JSUConvertOffsetToPtr__template40(void const*, void const*); void JSUConvertOffsetToPtr__template41(void const*, void const*); void JSUConvertOffsetToPtr__template42(void const*, void const*); -extern "C" extern void* __vt__14J2DAnmVtxColor[5]; extern "C" void load__20J2DAnmLoaderDataBaseFPCv(); extern "C" void __ct__19J2DAnmKeyLoader_v15Fv(); @@ -196,18 +195,6 @@ void* operator new(u32); void operator delete(void*); void JSUConvertOffsetToPtr__template24(void const*, void const*); void JSUConvertOffsetToPtr__template28(void const*, void const*); -extern "C" extern void* __vt__10J2DAnmBase[4]; -extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */]; -extern "C" extern void* __vt__15J2DAnmTevRegKey[4]; -extern "C" extern void* __vt__16J2DAnmTexPattern[4]; -extern "C" extern void* __vt__19J2DAnmTextureSRTKey[4]; -extern "C" extern void* __vt__17J2DAnmVtxColorKey[5]; -extern "C" extern void* __vt__18J2DAnmVtxColorFull[5]; -extern "C" extern void* __vt__14J2DAnmColorKey[5]; -extern "C" extern void* __vt__15J2DAnmColorFull[5]; -extern "C" extern void* __vt__11J2DAnmColor[5]; -extern "C" extern void* __vt__18J2DAnmTransformKey[6]; -extern "C" extern void* __vt__19J2DAnmTransformFull[5]; extern "C" void searchUpdateMaterialID__10J2DAnmBaseFP9J2DScreen(); extern "C" void* __nw__FUl(); @@ -280,16 +267,10 @@ SECTION_DATA void* __vt__14J2DAnmVtxColor[5] = { }; /* 804562F8-80456300 0004+04 s=11 e=0 z=0 None .sdata2 @1581 */ -SECTION_SDATA2 static u8 lit_1581[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_1581[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80308A6C-80309290 0824+00 s=0 e=26 z=2 None .text load__20J2DAnmLoaderDataBaseFPCv */ diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp index b4c7d4b8036..1a9429dcbc7 100644 --- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp +++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp @@ -51,8 +51,6 @@ struct J2DGrafContext { // Forward References: // -extern "C" extern void* __vt__14J2DGrafContext[10]; - extern "C" void __ct__14J2DGrafContextFffff(); extern "C" void setPort__14J2DGrafContextFv(); extern "C" void setup2D__14J2DGrafContextFv(); @@ -148,7 +146,7 @@ SECTION_SDATA2 static u8 lit_627[4] = { }; /* 8045614C-80456150 0004+00 s=1 e=0 z=0 None .sdata2 @628 */ -SECTION_SDATA2 static u32 lit_628 = 0x3F800000; +SECTION_SDATA2 static f32 lit_628 = 1.0f; /* 802E8BB4-802E8C44 0090+00 s=1 e=1 z=0 None .text setPort__14J2DGrafContextFv */ #pragma push @@ -179,9 +177,7 @@ SECTION_SDATA2 static f32 lit_730[1 + 1 /* padding */] = { }; /* 80456158-80456160 0008+00 s=1 e=0 z=0 None .sdata2 @732 */ -SECTION_SDATA2 static u8 lit_732[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_732 = 4503599627370496.0 /* cast u32 to float */; /* 802E8E20-802E90C0 02A0+00 s=1 e=2 z=0 None .text setScissor__14J2DGrafContextFv */ #pragma push diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp index 5647ce91d0f..7abbd74c1af 100644 --- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp @@ -77,15 +77,15 @@ struct J2DTevOrder { /* 802F1B70 */ J2DTevOrder(); }; +struct J2DGXColorS10 { + /* 802F1B90 */ J2DGXColorS10(); +}; + struct J2DIndTevStage { /* 802EA044 */ void load(u8); /* 802F18A0 */ J2DIndTevStage(); }; -struct J2DGXColorS10 { - /* 802F1B90 */ J2DGXColorS10(); -}; - struct J2DTevBlock8 { /* 802EED64 */ J2DTevBlock8(); /* 802EEE8C */ ~J2DTevBlock8(); @@ -420,10 +420,6 @@ struct J2DColorBlock { // Forward References: // -extern "C" extern void* __vt__15J2DIndBlockFull[14]; -extern "C" extern void* __vt__11J2DTevBlock[47]; -extern "C" extern void* __vt__14J2DTexGenBlock[3 + 1 /* padding */]; - extern "C" void initialize__13J2DColorBlockFv(); extern "C" void setGX__13J2DColorBlockFv(); extern "C" void initialize__14J2DTexGenBlockFv(); @@ -718,23 +714,6 @@ extern "C" extern void* __vt__14J2DTexGenBlock[3 + 1 /* padding */]; void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j2dDefaultTexCoordInfo[32]; -extern "C" extern u8 const j2dDefaultIndTexMtxInfo[28]; -extern "C" extern u8 const j2dDefaultTevStageInfo[20]; -extern "C" extern u8 const j2dDefaultIndTevStageInfo[12]; -extern "C" extern void* __vt__11J2DIndBlock[14]; -extern "C" extern u32 j2dDefaultColInfo; -extern "C" extern u32 j2dDefaultTevOrderInfoNull; -extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */]; -extern "C" extern u8 j2dDefaultTevColor[8]; -extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */]; -extern "C" extern u32 j2dDefaultTevKColor; -extern "C" extern u8 j2dDefaultTevSwapMode[4]; -extern "C" extern u32 j2dDefaultTevSwapModeTable; -extern "C" extern u32 j2dDefaultBlendInfo; -extern "C" extern u8 data_804561A4[4]; -extern "C" extern u32 j2dDefaultColorChanInfo; -extern "C" extern u8 struct_804561AC[4]; extern "C" void __ct__Q28JUtility6TColorFv(); extern "C" void* __nw__FUl(); diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp index 8bb572caf64..839fca1a931 100644 --- a/libs/JSystem/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp @@ -82,6 +82,10 @@ struct J2DPEBlock { /* 802F1840 */ void setGX(); }; +struct J2DAnmColor { + /* 802EB390 */ void getColor(u16, _GXColor*) const; +}; + struct J2DAnmTexPattern { /* 8030BEE8 */ void getTexNo(u16, u16*) const; /* 8030BF9C */ void getResTIMG(u16) const; @@ -97,10 +101,6 @@ struct J2DAnmTevRegKey { /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const; }; -struct J2DAnmColor { - /* 802EB390 */ void getColor(u16, _GXColor*) const; -}; - struct J2DMaterial { struct J2DMaterialAnmPointer { /* 802EA79C */ J2DMaterialAnmPointer(); @@ -167,8 +167,6 @@ struct J2DColorBlock { // Forward References: // -extern "C" extern void* __vt__11J2DIndBlock[14]; - extern "C" void __ct__11J2DMaterialFv(); extern "C" void __dt__11J2DMaterialFv(); extern "C" void setGX__11J2DMaterialFv(); @@ -214,17 +212,6 @@ extern "C" extern void* __vt__11J2DIndBlock[14]; void* operator new(u32); void* operator new(u32, int); void operator delete(void*); -extern "C" extern u8 const j2dDefaultTexCoordInfo[32]; -extern "C" extern u8 const j2dDefaultTexMtxInfo[36]; -extern "C" extern u8 const j2dDefaultIndTexMtxInfo[28]; -extern "C" extern void* __vt__15J2DIndBlockFull[14]; -extern "C" extern void* __vt__11J2DTevBlock[47]; -extern "C" extern void* __vt__14J2DTexGenBlock[3 + 1 /* padding */]; -extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */]; -extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */]; -extern "C" extern u32 j2dDefaultBlendInfo; -extern "C" extern u32 j2dDefaultColorChanInfo; -extern "C" extern u8 struct_804561AC[4]; extern "C" void __ct__Q28JUtility6TColorFv(); extern "C" void* __nw__FUl(); @@ -442,15 +429,13 @@ asm void J2DMaterial::setAnimation(J2DAnmTevRegKey* param_0) { /* ############################################################################################## */ /* 804561B0-804561B4 0004+00 s=1 e=0 z=0 None .sdata2 @1943 */ -SECTION_SDATA2 static u32 lit_1943 = 0x43B40000; +SECTION_SDATA2 static f32 lit_1943 = 360.0f; /* 804561B4-804561B8 0004+00 s=1 e=0 z=0 None .sdata2 @1944 */ -SECTION_SDATA2 static u32 lit_1944 = 0x477FFF00; +SECTION_SDATA2 static f32 lit_1944 = 65535.0f; /* 804561B8-804561C0 0008+00 s=1 e=0 z=0 None .sdata2 @1946 */ -SECTION_SDATA2 static u8 lit_1946[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1946 = 4503599627370496.0 /* cast u32 to float */; /* 802EAC78-802EB0F4 047C+00 s=0 e=1 z=0 None .text animation__11J2DMaterialFv */ #pragma push diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp index 4e17afb1014..102a95b99dc 100644 --- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -34,13 +34,13 @@ struct J2DResReference { /* 8030CF44 */ void getName(u16) const; }; -struct J2DMaterialBlock {}; - struct J2DMaterial { /* 802EA410 */ void createTevBlock(int, bool); /* 802EA5C4 */ void createIndBlock(int, bool); }; +struct J2DMaterialBlock {}; + struct J2DMaterialFactory { /* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&); /* 802F2C94 */ void countStages(int) const; @@ -146,18 +146,6 @@ extern "C" static void func_802F42D8(); // void* operator new(u32); -extern "C" extern u8 const j2dDefaultTexCoordInfo[32]; -extern "C" extern u8 const j2dDefaultIndTexMtxInfo[28]; -extern "C" extern u8 const j2dDefaultIndTevStageInfo[12]; -extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */]; -extern "C" extern u32 j2dDefaultTevOrderInfoNull; -extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */]; -extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */]; -extern "C" extern u8 j2dDefaultTevSwapMode[4]; -extern "C" extern u32 j2dDefaultTevSwapModeTable; -extern "C" extern u32 j2dDefaultBlendInfo; -extern "C" extern u32 j2dDefaultColorChanInfo; -extern "C" extern u8 struct_804561AC[4]; extern "C" void* __nw__FUl(); extern "C" void getResource__15JUTResReferenceFPCvUlP10JKRArchive(); diff --git a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp index eb7c6dd6662..c562d140cb2 100644 --- a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp +++ b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp @@ -62,7 +62,6 @@ void J2DFillBox(f32, f32, f32, f32, JUtility::TColor); static void J2DFillBox(JGeometry::TBox2__template0 const&, JUtility::TColor); void J2DDrawFrame(f32, f32, f32, f32, JUtility::TColor, u8); static void J2DDrawFrame(JGeometry::TBox2__template0 const&, JUtility::TColor, u8); -extern "C" extern void* __vt__13J2DOrthoGraph[10]; extern "C" void __ct__13J2DOrthoGraphFv(); extern "C" void __ct__13J2DOrthoGraphFffffff(); @@ -82,8 +81,6 @@ extern "C" extern void* __vt__13J2DOrthoGraph[10]; // External References: // -extern "C" extern void* __vt__14J2DGrafContext[10]; - extern "C" void __dt__13J2DOrthoGraphFv(); extern "C" void __ct__14J2DGrafContextFffff(); extern "C" void setPort__14J2DGrafContextFv(); @@ -125,16 +122,10 @@ SECTION_DATA void* __vt__13J2DOrthoGraph[10] = { }; /* 80456160-80456168 0004+04 s=3 e=0 z=0 None .sdata2 @522 */ -SECTION_SDATA2 static u8 lit_522[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_522[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 802E9670-802E96D0 0060+00 s=3 e=1 z=0 None .text __ct__13J2DOrthoGraphFv */ diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index fba44941e1a..f80d495c329 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -17,12 +17,12 @@ struct ResTIMG {}; struct ResFONT {}; +struct JKRArchive {}; + struct JSUInputStream { /* 802DC298 */ void read(void*, s32); }; -struct JKRArchive {}; - struct JUTResReference { /* 802DE078 */ void getResource(JSUInputStream*, u32, JKRArchive*); }; @@ -56,20 +56,9 @@ struct JGeometry { struct J2DRotateAxis {}; -struct J2DAnmTextureSRTKey {}; - -struct J2DGrafContext { - /* 802E8E20 */ void setScissor(); - /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); -}; - -struct J2DAnmTexPattern {}; - -struct J2DAnmTevRegKey {}; - struct J2DAnmColor {}; -struct J2DAnmTransform {}; +struct J2DBasePosition {}; struct J2DAnmVtxColor {}; @@ -77,7 +66,18 @@ struct J2DAnmVisibilityFull {}; struct J2DAnmBase {}; -struct J2DBasePosition {}; +struct J2DAnmTransform {}; + +struct J2DGrafContext { + /* 802E8E20 */ void setScissor(); + /* 802E90C0 */ void scissor(JGeometry::TBox2 const&); +}; + +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmTexPattern {}; + +struct J2DAnmTevRegKey {}; struct J2DPane { /* 80020158 */ void setAlpha(u8); @@ -217,8 +217,6 @@ extern "C" void __sinit_J2DPane_cpp(); // void operator delete(void*); -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */]; extern "C" void setAlpha__7J2DPaneFUc(); extern "C" void calcMtx__7J2DPaneFv(); @@ -344,7 +342,7 @@ asm J2DPane::J2DPane() { /* ############################################################################################## */ /* 804561F4-804561F8 0004+00 s=3 e=0 z=0 None .sdata2 @1489 */ -SECTION_SDATA2 static u32 lit_1489 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1489 = 1.0f; /* 802F5CB8-802F5D40 0088+00 s=3 e=0 z=0 None .text initiate__7J2DPaneFv */ #pragma push @@ -415,14 +413,10 @@ asm J2DPane::J2DPane(J2DPane* param_0, JSURandomInputStream* param_1, u8 param_2 /* ############################################################################################## */ /* 804561F8-80456200 0008+00 s=3 e=0 z=0 None .sdata2 @1651 */ -SECTION_SDATA2 static u8 lit_1651[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1651 = 4503601774854144.0 /* cast s32 to float */; /* 80456200-80456208 0008+00 s=3 e=0 z=0 None .sdata2 @1655 */ -SECTION_SDATA2 static u8 lit_1655[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1655 = 4503599627370496.0 /* cast u32 to float */; /* 802F60C4-802F63F8 0334+00 s=1 e=3 z=0 None .text * makePaneStream__7J2DPaneFP7J2DPaneP20JSURandomInputStream */ @@ -437,7 +431,7 @@ asm void J2DPane::makePaneStream(J2DPane* param_0, JSURandomInputStream* param_1 /* ############################################################################################## */ /* 80456208-8045620C 0004+00 s=4 e=0 z=0 None .sdata2 @1725 */ -SECTION_SDATA2 static u32 lit_1725 = 0x3F000000; +SECTION_SDATA2 static f32 lit_1725 = 0.5f; /* 802F63F8-802F658C 0194+00 s=4 e=0 z=0 None .text changeUseTrans__7J2DPaneFP7J2DPane */ #pragma push @@ -617,7 +611,7 @@ asm void J2DPane::isUsed(ResFONT const* param_0) { /* ############################################################################################## */ /* 8045620C-80456210 0004+00 s=1 e=0 z=0 None .sdata2 @2466 */ -SECTION_SDATA2 static u32 lit_2466 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_2466 = 0.01745329238474369f; /* 802F7540-802F7680 0140+00 s=1 e=7 z=0 None .text makeMatrix__7J2DPaneFffff */ #pragma push @@ -652,7 +646,7 @@ asm void J2DPane::setBasePosition(J2DBasePosition param_0) { /* ############################################################################################## */ /* 80456210-80456214 0004+00 s=1 e=0 z=0 None .sdata2 @2547 */ -SECTION_SDATA2 static u32 lit_2547 = 0x437F0000; +SECTION_SDATA2 static f32 lit_2547 = 255.0f; /* 802F77D0-802F79A8 01D8+00 s=0 e=1 z=0 None .text setInfluencedAlpha__7J2DPaneFbb */ #pragma push @@ -823,7 +817,7 @@ asm void J2DPane::animationPane(J2DAnmTransform const* param_0) { /* ############################################################################################## */ /* 80456214-80456218 0004+00 s=1 e=0 z=0 None .sdata2 @2890 */ -SECTION_SDATA2 static u32 lit_2890 = 0x43B40000; +SECTION_SDATA2 static f32 lit_2890 = 360.0f; /* 80456218-80456220 0004+04 s=1 e=0 z=0 None .sdata2 @2891 */ SECTION_SDATA2 static f32 lit_2891[1 + 1 /* padding */] = { diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp index ae5afc52b0b..c751d16f2f2 100644 --- a/libs/JSystem/J2DGraph/J2DPicture.cpp +++ b/libs/JSystem/J2DGraph/J2DPicture.cpp @@ -73,27 +73,21 @@ struct J2DScreen { /* 802F9640 */ void getNameResource(char const*); }; -struct J2DBinding {}; - -struct J2DMirror {}; - -struct J2DMaterial {}; - -struct J2DAnmBase {}; - struct J2DAnmTextureSRTKey {}; +struct J2DAnmColor {}; + +struct J2DAnmVtxColor {}; + +struct J2DAnmVisibilityFull {}; + struct J2DAnmTexPattern {}; struct J2DAnmTevRegKey {}; -struct J2DAnmColor {}; - struct J2DAnmTransform {}; -struct J2DAnmVisibilityFull {}; - -struct J2DAnmVtxColor {}; +struct J2DAnmBase {}; struct J2DPane { /* 80020158 */ void setAlpha(u8); @@ -136,6 +130,12 @@ struct J2DPane { /* 802F8474 */ void update(); }; +struct J2DMirror {}; + +struct J2DBinding {}; + +struct J2DMaterial {}; + struct J2DPicture { /* 800202CC */ void setBlendRatio(f32, f32); /* 802FF208 */ void append(JUTTexture*, f32); @@ -503,9 +503,7 @@ asm J2DPicture::J2DPicture(J2DPane* param_0, JSURandomInputStream* param_1, JKRA /* ############################################################################################## */ /* 80456260-80456268 0008+00 s=1 e=0 z=0 None .sdata2 @1739 */ -SECTION_SDATA2 static u8 lit_1739[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1739 = 4503599627370496.0 /* cast u32 to float */; /* 802FC1D4-802FC708 0534+00 s=0 e=1 z=0 None .text * __ct__10J2DPictureFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial */ @@ -520,7 +518,7 @@ asm J2DPicture::J2DPicture(J2DPane* param_0, JSURandomInputStream* param_1, J2DM /* ############################################################################################## */ /* 80456268-8045626C 0004+00 s=9 e=0 z=0 None .sdata2 @1767 */ -SECTION_SDATA2 static u32 lit_1767 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1767 = 1.0f; /* 802FC708-802FC800 00F8+00 s=0 e=20 z=1 None .text __ct__10J2DPictureFPC7ResTIMG */ #pragma push @@ -566,9 +564,7 @@ SECTION_SDATA2 static u8 lit_2017[4] = { }; /* 80456270-80456278 0008+00 s=7 e=0 z=0 None .sdata2 @2021 */ -SECTION_SDATA2 static u8 lit_2021[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2021 = 4503601774854144.0 /* cast s32 to float */; /* 802FCCDC-802FCD70 0094+00 s=1 e=0 z=0 None .text initiate__10J2DPictureFPC7ResTIMGPC7ResTLUT */ @@ -826,7 +822,7 @@ asm void J2DPicture::setBlendAlphaRatio(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 80456278-8045627C 0004+00 s=2 e=0 z=0 None .sdata2 @2758 */ -SECTION_SDATA2 static u32 lit_2758 = 0x437F0000; +SECTION_SDATA2 static f32 lit_2758 = 255.0f; /* 802FEAC4-802FEB94 00D0+00 s=4 e=0 z=0 None .text setBlendKonstColor__10J2DPictureFv */ #pragma push @@ -873,7 +869,7 @@ asm void J2DPicture::setTexCoord(JUTTexture const* param_0, J2DBinding param_1, /* ############################################################################################## */ /* 8045627C-80456280 0004+00 s=1 e=0 z=0 None .sdata2 @2933 */ -SECTION_SDATA2 static u32 lit_2933 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2933 = 0.5f; /* 802FED84-802FF09C 0318+00 s=2 e=0 z=0 None .text * setTexCoord__10J2DPictureFPQ29JGeometry8TVec2PC10JUTTexture10J2DBinding9J2DMirrorb */ diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp index 8c68aff55aa..85b5a91d52b 100644 --- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp @@ -71,16 +71,8 @@ struct J2DScreen { /* 802F9640 */ void getNameResource(char const*); }; -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTexPattern {}; - -struct J2DAnmTevRegKey {}; - struct J2DAnmColor {}; -struct J2DAnmTransform {}; - struct J2DAnmVtxColor {}; struct J2DAnmVisibilityFull { @@ -89,13 +81,7 @@ struct J2DAnmVisibilityFull { struct J2DAnmBase {}; -struct J2DMaterial { - /* 802EA38C */ void setGX(); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); -}; +struct J2DAnmTransform {}; struct J2DPane { /* 80053BC0 */ void calcMtx(); @@ -122,6 +108,20 @@ struct J2DPane { /* 802F8474 */ void update(); }; +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmTexPattern {}; + +struct J2DAnmTevRegKey {}; + +struct J2DMaterial { + /* 802EA38C */ void setGX(); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); +}; + struct J2DPictureEx { struct stage_enum {}; @@ -216,9 +216,6 @@ struct J2DPicture { // Forward References: // -extern "C" extern u8 const lit_2556[32]; -extern "C" extern u8 const lit_2557[40]; - extern "C" void initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT(); extern "C" void __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial(); extern "C" void __dt__12J2DPictureExFv(); @@ -300,7 +297,6 @@ extern "C" extern u8 const lit_2557[40]; // void operator delete(void*); -extern "C" extern u8 const j2dDefaultTexMtxInfo[36]; extern "C" void setBlendRatio__10J2DPictureFff(); extern "C" void calcMtx__7J2DPaneFv(); @@ -385,7 +381,7 @@ extern "C" extern u8 const j2dDefaultTexMtxInfo[36]; /* ############################################################################################## */ /* 804562C0-804562C4 0004+00 s=7 e=0 z=0 None .sdata2 @1517 */ -SECTION_SDATA2 static u32 lit_1517 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1517 = 1.0f; /* 80303640-803036EC 00AC+00 s=1 e=0 z=0 None .text initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT */ @@ -691,9 +687,7 @@ asm void J2DPictureEx::isRemove(u8 param_0) const { /* ############################################################################################## */ /* 804562C8-804562D0 0008+00 s=2 e=0 z=0 None .sdata2 @2130 */ -SECTION_SDATA2 static u8 lit_2130[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2130 = 4503601774854144.0 /* cast s32 to float */; /* 8030477C-80304890 0114+00 s=1 e=0 z=0 None .text draw__12J2DPictureExFffUcbbb */ #pragma push diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp index 2bb359e63f6..46c61800796 100644 --- a/libs/JSystem/J2DGraph/J2DPrint.cpp +++ b/libs/JSystem/J2DGraph/J2DPrint.cpp @@ -75,7 +75,6 @@ extern "C" void getNumberF32__8J2DPrintFPPCUcffi(); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; extern "C" void* __nwa__FUlP7JKRHeapi(); extern "C" void __dl__FPv(); @@ -195,12 +194,10 @@ asm J2DPrint::~J2DPrint() { /* ############################################################################################## */ /* 804561CC-804561D0 0004+00 s=1 e=0 z=0 None .sdata2 @644 */ -SECTION_SDATA2 static u32 lit_644 = 0x42000000; +SECTION_SDATA2 static f32 lit_644 = 32.0f; /* 804561D0-804561D8 0008+00 s=6 e=0 z=0 None .sdata2 @650 */ -SECTION_SDATA2 static u8 lit_650[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_650 = 4503601774854144.0 /* cast s32 to float */; /* 802F4468-802F4658 01F0+00 s=1 e=0 z=0 None .text * private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb @@ -266,9 +263,7 @@ SECTION_SDATA2 static f32 lit_786[1 + 1 /* padding */] = { }; /* 804561E0-804561E8 0008+00 s=2 e=0 z=0 None .sdata2 @791 */ -SECTION_SDATA2 static u8 lit_791[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_791 = 4503599627370496.0 /* cast u32 to float */; /* 802F4828-802F4B4C 0324+00 s=0 e=4 z=0 None .text * printReturn__8J2DPrintFPCcff18J2DTextBoxHBinding18J2DTextBoxVBindingffUc */ @@ -285,7 +280,7 @@ asm void J2DPrint::printReturn(char const* param_0, f32 param_1, f32 param_2, /* ############################################################################################## */ /* 804561E8-804561EC 0004+00 s=1 e=0 z=0 None .sdata2 @913 */ -SECTION_SDATA2 static u32 lit_913 = 0x461C4000; +SECTION_SDATA2 static f32 lit_913 = 10000.0f; /* 802F4B4C-802F52E8 079C+00 s=2 e=0 z=0 None .text * parse__8J2DPrintFPCUciiPUsRQ28J2DPrint5TSizeUcb */ @@ -301,7 +296,7 @@ asm void J2DPrint::parse(u8 const* param_0, int param_1, int param_2, u16* param /* ############################################################################################## */ /* 804561EC-804561F0 0004+00 s=2 e=0 z=0 None .sdata2 @937 */ -SECTION_SDATA2 static u32 lit_937 = 0x3F800000; +SECTION_SDATA2 static f32 lit_937 = 1.0f; /* 802F52E8-802F5410 0128+00 s=2 e=0 z=0 None .text doCtrlCode__8J2DPrintFi */ #pragma push diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp index e16205d3d04..ee5576b267b 100644 --- a/libs/JSystem/J2DGraph/J2DScreen.cpp +++ b/libs/JSystem/J2DGraph/J2DScreen.cpp @@ -52,16 +52,34 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct J2DAnmBase {}; +struct J2DAnmColor {}; + +struct J2DAnmTexPattern {}; + +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmTevRegKey {}; + +struct J2DMaterial { + /* 802EA1AC */ J2DMaterial(); + /* 802EA2CC */ ~J2DMaterial(); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); + /* 802EAC78 */ void animation(); +}; struct J2DGrafContext {}; -struct J2DAnmTransform {}; - struct J2DAnmVtxColor {}; struct J2DAnmVisibilityFull {}; +struct J2DAnmBase {}; + +struct J2DAnmTransform {}; + struct J2DPane { /* 80020158 */ void setAlpha(u8); /* 80053C00 */ void makeMatrix(f32, f32); @@ -91,24 +109,6 @@ struct J2DPane { /* 802F8478 */ void drawSelf(f32, f32); }; -struct J2DAnmTexPattern {}; - -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTevRegKey {}; - -struct J2DAnmColor {}; - -struct J2DMaterial { - /* 802EA1AC */ J2DMaterial(); - /* 802EA2CC */ ~J2DMaterial(); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); - /* 802EAC78 */ void animation(); -}; - struct J2DWindowEx { /* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*); }; @@ -199,8 +199,6 @@ struct J2DDataManage { // Forward References: // -extern "C" extern u8 mDataManage__9J2DScreen[4 + 4 /* padding */]; - extern "C" void __ct__9J2DScreenFv(); extern "C" void __dt__9J2DScreenFv(); extern "C" void clean__9J2DScreenFv(); @@ -245,12 +243,6 @@ void* operator new[](u32); void* operator new[](u32, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern void* __vt__10JSUIosBase[3]; -extern "C" extern void* __vt__20JSURandomInputStream[9]; -extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */]; -extern "C" extern void* __vt__20JSUMemoryInputStream[9 + 1 /* padding */]; -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; extern "C" void setAlpha__7J2DPaneFUc(); extern "C" void clearAnmTransform__9J2DScreenFv(); @@ -406,7 +398,7 @@ SECTION_SDATA2 static u8 lit_1561[4] = { }; /* 80456224-80456228 0004+00 s=2 e=0 z=0 None .sdata2 @1562 */ -SECTION_SDATA2 static u32 lit_1562 = 0x44200000; +SECTION_SDATA2 static f32 lit_1562 = 640.0f; /* 80456228-80456230 0004+04 s=2 e=0 z=0 None .sdata2 @1563 */ SECTION_SDATA2 static f32 lit_1563[1 + 1 /* padding */] = { @@ -491,9 +483,7 @@ asm void J2DScreen::checkSignature(JSURandomInputStream* param_0) { /* ############################################################################################## */ /* 80456230-80456238 0008+00 s=1 e=0 z=0 None .sdata2 @1705 */ -SECTION_SDATA2 static u8 lit_1705[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1705 = 4503599627370496.0 /* cast u32 to float */; /* 802F8894-802F8990 00FC+00 s=1 e=0 z=0 None .text * getScreenInformation__9J2DScreenFP20JSURandomInputStream */ @@ -532,10 +522,10 @@ asm void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInput /* ############################################################################################## */ /* 80456238-8045623C 0004+00 s=1 e=0 z=0 None .sdata2 @1829 */ -SECTION_SDATA2 static u32 lit_1829 = 0xBF800000; +SECTION_SDATA2 static f32 lit_1829 = -1.0f; /* 8045623C-80456240 0004+00 s=1 e=0 z=0 None .sdata2 @1830 */ -SECTION_SDATA2 static u32 lit_1830 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1830 = 1.0f; /* 802F8ED4-802F90A0 01CC+00 s=0 e=51 z=4 None .text draw__9J2DScreenFffPC14J2DGrafContext */ #pragma push diff --git a/libs/JSystem/J2DGraph/J2DTevs.cpp b/libs/JSystem/J2DGraph/J2DTevs.cpp index cc8972d4add..1061ed6cfb9 100644 --- a/libs/JSystem/J2DGraph/J2DTevs.cpp +++ b/libs/JSystem/J2DGraph/J2DTevs.cpp @@ -63,24 +63,6 @@ struct J2DIndBlock { // Forward References: // -extern "C" extern u8 const j2dDefaultTexCoordInfo[32]; -extern "C" extern u8 const j2dDefaultTexMtxInfo[36]; -extern "C" extern u8 const j2dDefaultIndTexMtxInfo[28]; -extern "C" extern u8 const j2dDefaultTevStageInfo[20]; -extern "C" extern u8 const j2dDefaultIndTevStageInfo[12]; -extern "C" extern u32 j2dDefaultColInfo; -extern "C" extern u32 j2dDefaultTevOrderInfoNull; -extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */]; -extern "C" extern u8 j2dDefaultTevColor[8]; -extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */]; -extern "C" extern u32 j2dDefaultTevKColor; -extern "C" extern u8 j2dDefaultTevSwapMode[4]; -extern "C" extern u32 j2dDefaultTevSwapModeTable; -extern "C" extern u32 j2dDefaultBlendInfo; -extern "C" extern u8 data_804561A4[4]; -extern "C" extern u32 j2dDefaultColorChanInfo; -extern "C" extern u8 struct_804561AC[4]; - extern "C" void load__9J2DTexMtxFUl(); extern "C" void calc__9J2DTexMtxFv(); extern "C" void getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f(); @@ -162,10 +144,10 @@ asm void J2DTexMtx::calc() { /* ############################################################################################## */ /* 80456168-8045616C 0004+00 s=2 e=0 z=0 None .sdata2 @1488 */ -SECTION_SDATA2 static u32 lit_1488 = 0x40490FDB; +SECTION_SDATA2 static f32 lit_1488 = 3.1415927410125732f; /* 8045616C-80456170 0004+00 s=2 e=0 z=0 None .sdata2 @1489 */ -SECTION_SDATA2 static u32 lit_1489 = 0x43340000; +SECTION_SDATA2 static f32 lit_1489 = 180.0f; /* 80456170-80456174 0004+00 s=2 e=0 z=0 None .sdata2 @1490 */ SECTION_SDATA2 static u8 lit_1490[4] = { @@ -176,7 +158,7 @@ SECTION_SDATA2 static u8 lit_1490[4] = { }; /* 80456174-80456178 0004+00 s=2 e=0 z=0 None .sdata2 @1491 */ -SECTION_SDATA2 static u32 lit_1491 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1491 = 1.0f; /* 802E9D2C-802E9EBC 0190+00 s=1 e=0 z=0 None .text * getTextureMtx__9J2DTexMtxFRC17J2DTextureSRTInfo3VecPA4_f */ @@ -192,7 +174,7 @@ asm void J2DTexMtx::getTextureMtx(J2DTextureSRTInfo const& param_0, Vec param_1, /* ############################################################################################## */ /* 80456178-8045617C 0004+00 s=1 e=0 z=0 None .sdata2 @1507 */ -SECTION_SDATA2 static u32 lit_1507 = 0x3F000000; +SECTION_SDATA2 static f32 lit_1507 = 0.5f; /* 802E9EBC-802EA044 0188+00 s=1 e=0 z=0 None .text * getTextureMtxMaya__9J2DTexMtxFRC17J2DTextureSRTInfoPA4_f */ diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index c0180639c1f..2d8cf284f1c 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -53,23 +53,21 @@ struct J2DTextBoxVBinding {}; struct J2DTextBoxHBinding {}; -struct J2DMaterial {}; - -struct J2DAnmBase {}; - struct J2DAnmTextureSRTKey {}; +struct J2DAnmColor {}; + +struct J2DAnmVtxColor {}; + +struct J2DAnmVisibilityFull {}; + struct J2DAnmTexPattern {}; struct J2DAnmTevRegKey {}; -struct J2DAnmColor {}; - struct J2DAnmTransform {}; -struct J2DAnmVisibilityFull {}; - -struct J2DAnmVtxColor {}; +struct J2DAnmBase {}; struct J2DPane { /* 80020158 */ void setAlpha(u8); @@ -109,6 +107,8 @@ struct J2DPane { /* 802F8474 */ void update(); }; +struct J2DMaterial {}; + struct J2DTextBox { /* 80186C84 */ void setWhite(JUtility::TColor); /* 8019230C */ void setBlackWhite(JUtility::TColor, JUtility::TColor); @@ -156,8 +156,6 @@ struct J2DPrint { // Forward References: // -extern "C" extern char const* const J2DTextBox__stringBase0; - extern "C" void __ct__10J2DTextBoxFv(); extern "C" void __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamP10JKRArchive(); extern "C" void __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial(); @@ -349,27 +347,17 @@ asm J2DTextBox::J2DTextBox(J2DPane* param_0, JSURandomInputStream* param_1, JKRA /* ############################################################################################## */ /* 80456280-80456288 0004+04 s=6 e=0 z=0 None .sdata2 @1660 */ -SECTION_SDATA2 static u8 lit_1660[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_1660[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80456288-80456290 0008+00 s=3 e=0 z=0 None .sdata2 @1662 */ -SECTION_SDATA2 static u8 lit_1662[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1662 = 4503601774854144.0 /* cast s32 to float */; /* 80456290-80456298 0008+00 s=2 e=0 z=0 None .sdata2 @1665 */ -SECTION_SDATA2 static u8 lit_1665[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1665 = 4503599627370496.0 /* cast u32 to float */; /* 802FF75C-802FFBC4 0468+00 s=0 e=1 z=0 None .text * __ct__10J2DTextBoxFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */ diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp index c3930a9543e..3a3d1e96395 100644 --- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp @@ -38,15 +38,9 @@ struct J2DTextBoxVBinding {}; struct J2DTextBoxHBinding {}; -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTexPattern {}; - -struct J2DAnmTevRegKey {}; - struct J2DAnmColor {}; -struct J2DAnmTransform {}; +struct J2DTevStage {}; struct J2DAnmVtxColor {}; @@ -56,15 +50,7 @@ struct J2DAnmVisibilityFull { struct J2DAnmBase {}; -struct J2DTevStage {}; - -struct J2DMaterial { - /* 802EA38C */ void setGX(); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); -}; +struct J2DAnmTransform {}; struct J2DPane { /* 80053BC0 */ void calcMtx(); @@ -89,6 +75,20 @@ struct J2DPane { /* 802F8474 */ void update(); }; +struct J2DAnmTextureSRTKey {}; + +struct J2DAnmTexPattern {}; + +struct J2DAnmTevRegKey {}; + +struct J2DMaterial { + /* 802EA38C */ void setGX(); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); +}; + struct J2DTextBoxEx { struct stage_enum {}; @@ -150,8 +150,6 @@ struct J2DPrint { // Forward References: // -extern "C" extern char const* const J2DTextBoxEx__stringBase0; - extern "C" void __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial(); extern "C" void __dt__12J2DTextBoxExFv(); extern "C" void drawSelf__12J2DTextBoxExFffPA3_A4_f(); @@ -311,27 +309,17 @@ SECTION_DATA static void* __vt__12J2DTextBoxEx[47 + 1 /* padding */] = { }; /* 804562D8-804562E0 0004+04 s=4 e=0 z=0 None .sdata2 @1534 */ -SECTION_SDATA2 static u8 lit_1534[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_1534[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 804562E0-804562E8 0008+00 s=2 e=0 z=0 None .sdata2 @1536 */ -SECTION_SDATA2 static u8 lit_1536[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1536 = 4503601774854144.0 /* cast s32 to float */; /* 804562E8-804562F0 0008+00 s=1 e=0 z=0 None .sdata2 @1539 */ -SECTION_SDATA2 static u8 lit_1539[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1539 = 4503599627370496.0 /* cast u32 to float */; /* 803071E4-8030751C 0338+00 s=0 e=1 z=0 None .text * __ct__12J2DTextBoxExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */ diff --git a/libs/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/J2DGraph/J2DWindow.cpp index d5c9e7ef1e3..20f8b63cf2c 100644 --- a/libs/JSystem/J2DGraph/J2DWindow.cpp +++ b/libs/JSystem/J2DGraph/J2DWindow.cpp @@ -57,23 +57,21 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct J2DMaterial {}; - -struct J2DAnmBase {}; - struct J2DAnmTextureSRTKey {}; +struct J2DAnmColor {}; + +struct J2DAnmVtxColor {}; + +struct J2DAnmVisibilityFull {}; + struct J2DAnmTexPattern {}; struct J2DAnmTevRegKey {}; -struct J2DAnmColor {}; - struct J2DAnmTransform {}; -struct J2DAnmVisibilityFull {}; - -struct J2DAnmVtxColor {}; +struct J2DAnmBase {}; struct J2DPane { /* 80020158 */ void setAlpha(u8); @@ -114,6 +112,8 @@ struct J2DPane { /* 802F8474 */ void update(); }; +struct J2DMaterial {}; + struct J2DWindow { struct TMaterial {}; @@ -371,14 +371,10 @@ SECTION_RODATA static u8 const lit_1849[16] = { }; /* 80456240-80456248 0008+00 s=7 e=0 z=0 None .sdata2 @1971 */ -SECTION_SDATA2 static u8 lit_1971[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1971 = 4503601774854144.0 /* cast s32 to float */; /* 80456248-80456250 0008+00 s=2 e=0 z=0 None .sdata2 @1974 */ -SECTION_SDATA2 static u8 lit_1974[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1974 = 4503599627370496.0 /* cast u32 to float */; /* 802F9C10-802FA118 0508+00 s=0 e=1 z=0 None .text * __ct__9J2DWindowFP7J2DPaneP20JSURandomInputStreamP11J2DMaterial */ @@ -548,7 +544,7 @@ asm void J2DWindow::drawFrameTexture(JUTTexture* param_0, f32 param_1, f32 param /* ############################################################################################## */ /* 80456254-80456258 0004+00 s=1 e=0 z=0 None .sdata2 @2984 */ -SECTION_SDATA2 static u32 lit_2984 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2984 = 1.0f; /* 80456258-80456260 0004+04 s=1 e=0 z=0 None .sdata2 @2985 */ SECTION_SDATA2 static f32 lit_2985[1 + 1 /* padding */] = { diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp index c5eec4461be..7aed29617d5 100644 --- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp +++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp @@ -41,15 +41,9 @@ struct JGeometry { struct TBox2__template0 {}; }; -struct J2DAnmTextureSRTKey {}; - -struct J2DAnmTexPattern {}; - -struct J2DAnmTevRegKey {}; - struct J2DAnmColor {}; -struct J2DAnmTransform {}; +struct J2DTevStage {}; struct J2DAnmVtxColor { /* 8030363C */ void getColor(u8, u16, _GXColor*) const; @@ -59,27 +53,9 @@ struct J2DAnmVisibilityFull { /* 8030C048 */ void getVisibility(u16, u8*) const; }; -struct J2DWindow { - struct TMaterial {}; - - /* 802F9A7C */ J2DWindow(); - /* 802FA880 */ ~J2DWindow(); - /* 802FB000 */ void resize(f32, f32); - /* 802FB1D8 */ void drawSelf(f32, f32); - /* 802FBF98 */ s32 getTypeID() const; -}; - struct J2DAnmBase {}; -struct J2DTevStage {}; - -struct J2DMaterial { - /* 802EA38C */ void setGX(); - /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); - /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); - /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); - /* 802EA89C */ void setAnimation(J2DAnmColor*); -}; +struct J2DAnmTransform {}; struct J2DPane { /* 80053BC0 */ void calcMtx(); @@ -107,6 +83,30 @@ struct J2DPane { /* 802F8474 */ void update(); }; +struct J2DAnmTextureSRTKey {}; + +struct J2DWindow { + struct TMaterial {}; + + /* 802F9A7C */ J2DWindow(); + /* 802FA880 */ ~J2DWindow(); + /* 802FB000 */ void resize(f32, f32); + /* 802FB1D8 */ void drawSelf(f32, f32); + /* 802FBF98 */ s32 getTypeID() const; +}; + +struct J2DAnmTexPattern {}; + +struct J2DAnmTevRegKey {}; + +struct J2DMaterial { + /* 802EA38C */ void setGX(); + /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*); + /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*); + /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*); + /* 802EA89C */ void setAnimation(J2DAnmColor*); +}; + struct J2DWindowEx { struct stage_enum {}; @@ -158,18 +158,6 @@ struct J2DWindowEx { // Forward References: // -extern "C" extern u8 const lit_1557[16]; -extern "C" extern u8 const lit_1566[16]; -extern "C" extern u8 const lit_1575[16]; -extern "C" extern u8 const lit_1581[16]; -extern "C" extern u8 const lit_1587[16]; -extern "C" extern u8 const lit_1596[16]; -extern "C" extern u8 const lit_1605[16]; -extern "C" extern u8 const lit_1612[16]; -extern "C" extern u8 const lit_2530[24]; -extern "C" extern u8 const lit_2531[24]; -extern "C" extern u8 const lit_2532[30 + 2 /* padding */]; - extern "C" void __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial(); extern "C" void setMinSize__11J2DWindowExFv(); extern "C" void __dt__11J2DWindowExFv(); @@ -364,14 +352,10 @@ SECTION_DATA static void* __vt__11J2DWindowEx[51 + 1 /* padding */] = { }; /* 804562A0-804562A8 0008+00 s=4 e=0 z=0 None .sdata2 @1549 */ -SECTION_SDATA2 static u8 lit_1549[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1549 = 4503601774854144.0 /* cast s32 to float */; /* 804562A8-804562B0 0008+00 s=1 e=0 z=0 None .sdata2 @1552 */ -SECTION_SDATA2 static u8 lit_1552[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1552 = 4503599627370496.0 /* cast u32 to float */; /* 80300C94-80300F80 02EC+00 s=0 e=1 z=0 None .text * __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */ @@ -437,7 +421,7 @@ SECTION_SDATA2 static u8 lit_1827[4] = { }; /* 804562B4-804562B8 0004+00 s=1 e=0 z=0 None .sdata2 @2256 */ -SECTION_SDATA2 static u32 lit_2256 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2256 = 1.0f; /* 804562B8-804562C0 0004+04 s=1 e=0 z=0 None .sdata2 @2257 */ SECTION_SDATA2 static f32 lit_2257[1 + 1 /* padding */] = { diff --git a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp index b434dd8f0bc..49d78f967b9 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -152,11 +152,6 @@ struct J3DAnmCluster { static void J3DGetKeyFrameInterpolation__template0(f32, J3DAnmKeyTableBase*, s16*); static void J3DGetKeyFrameInterpolation__template1(f32, J3DAnmKeyTableBase*, f32*); -extern "C" extern void* __vt__16J3DAnmClusterKey[5]; -extern "C" extern void* __vt__13J3DAnmCluster[5]; -extern "C" extern void* __vt__17J3DAnmClusterFull[5]; -extern "C" extern void* __vt__27J3DAnmTransformFullWithLerp[5]; -extern "C" extern void* __vt__19J3DAnmTransformFull[5 + 1 /* padding */]; extern "C" void init__12J3DFrameCtrlFs(); extern "C" void checkPass__12J3DFrameCtrlFf(); @@ -235,9 +230,6 @@ extern "C" extern void* __vt__19J3DAnmTransformFull[5 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern void* __vt__10J3DAnmBase[4]; -extern "C" extern void* __vt__15J3DAnmTransform[5]; -extern "C" extern void* __vt__10JUTNameTab[3]; extern "C" void __dl__FPv(); extern "C" void __ct__10JUTNameTabFv(); @@ -262,7 +254,7 @@ extern "C" extern void* __vt__10JUTNameTab[3]; /* ############################################################################################## */ /* 80456430-80456434 0004+00 s=6 e=0 z=0 None .sdata2 @852 */ -SECTION_SDATA2 static u32 lit_852 = 0x3F800000; +SECTION_SDATA2 static f32 lit_852 = 1.0f; /* 80456434-80456438 0004+00 s=20 e=0 z=0 None .sdata2 @853 */ SECTION_SDATA2 static u8 lit_853[4] = { @@ -291,9 +283,7 @@ SECTION_SDATA2 static f32 lit_973[1 + 1 /* padding */] = { }; /* 80456440-80456448 0008+00 s=4 e=0 z=0 None .sdata2 @975 */ -SECTION_SDATA2 static u8 lit_975[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_975 = 4503601774854144.0 /* cast s32 to float */; /* 8032842C-803289CC 05A0+00 s=0 e=92 z=382 None .text checkPass__12J3DFrameCtrlFf */ #pragma push @@ -346,9 +336,7 @@ asm void J3DAnmTransformFull::getTransform(u16 param_0, J3DTransformInfo* param_ /* ############################################################################################## */ /* 80456450-80456458 0008+00 s=2 e=0 z=0 None .sdata2 @1223 */ -SECTION_SDATA2 static u8 lit_1223[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1223 = 4503599627370496.0 /* cast u32 to float */; /* 803291F0-80329A34 0844+00 s=1 e=0 z=0 None .text * getTransform__27J3DAnmTransformFullWithLerpCFUsP16J3DTransformInfo */ @@ -564,7 +552,7 @@ asm J3DAnmVtxColorKey::J3DAnmVtxColorKey() { /* ############################################################################################## */ /* 80456458-8045645C 0004+00 s=3 e=0 z=0 None .sdata2 @1499 */ -SECTION_SDATA2 static u32 lit_1499 = 0x437F0000; +SECTION_SDATA2 static f32 lit_1499 = 255.0f; /* 8032A53C-8032A828 02EC+00 s=1 e=0 z=0 None .text getColor__17J3DAnmVtxColorKeyCFUcUsP8_GXColor */ @@ -716,7 +704,7 @@ asm void J3DAnmTextureSRTKey::searchUpdateMaterialID(J3DModelData* param_0) { /* ############################################################################################## */ /* 8045645C-80456460 0004+00 s=1 e=0 z=0 None .sdata2 @1817 */ -SECTION_SDATA2 static u32 lit_1817 = 0xC4800000; +SECTION_SDATA2 static f32 lit_1817 = -1024.0f; /* 80456460-80456468 0004+04 s=1 e=0 z=0 None .sdata2 @1818 */ SECTION_SDATA2 static f32 lit_1818[1 + 1 /* padding */] = { diff --git a/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp b/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp index 071c01ef82d..31e0b80e635 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DCluster.cpp @@ -15,6 +15,10 @@ struct J3DVertexBuffer {}; struct J3DModel {}; +struct J3DCluster {}; + +struct J3DClusterKey {}; + struct J3DAnmCluster {}; struct J3DDeformData { @@ -25,10 +29,6 @@ struct J3DDeformData { /* 8032E364 */ void setAnm(J3DAnmCluster*); }; -struct J3DClusterKey {}; - -struct J3DCluster {}; - struct J3DDeformer { /* 8032E39C */ J3DDeformer(J3DDeformData*); /* 8032EAB4 */ void deform(J3DVertexBuffer*, u16, f32*); @@ -58,8 +58,6 @@ extern "C" void normalizeWeight__11J3DDeformerFiPf(); // External References: // -extern "C" extern u8 asinAcosTable___5JMath[4128]; - extern "C" void PPCSync(); extern "C" void DCStoreRangeNoSync(); extern "C" void PSVECNormalize(); @@ -153,7 +151,7 @@ asm void J3DDeformer::deform(J3DVertexBuffer* param_0, u16 param_1) { /* ############################################################################################## */ /* 80456470-80456474 0004+00 s=2 e=0 z=0 None .sdata2 @830 */ -SECTION_SDATA2 static u32 lit_830 = 0x3F800000; +SECTION_SDATA2 static f32 lit_830 = 1.0f; /* 80456474-80456478 0004+00 s=1 e=0 z=0 None .sdata2 @840 */ SECTION_SDATA2 static u32 lit_840 = 0x3F800000; @@ -183,27 +181,25 @@ asm void J3DDeformer::deform_VtxPosF32(J3DVertexBuffer* param_0, J3DCluster* par /* ############################################################################################## */ /* 80456480-80456484 0004+00 s=1 e=0 z=0 None .sdata2 @1020 */ -SECTION_SDATA2 static u32 lit_1020 = 0xBF800000; +SECTION_SDATA2 static f32 lit_1020 = -1.0f; /* 80456484-80456488 0004+00 s=1 e=0 z=0 None .sdata2 @1021 */ -SECTION_SDATA2 static u32 lit_1021 = 0x40490FDB; +SECTION_SDATA2 static f32 lit_1021 = 3.1415927410125732f; /* 80456488-8045648C 0004+00 s=1 e=0 z=0 None .sdata2 @1022 */ -SECTION_SDATA2 static u32 lit_1022 = 0x447FE000; +SECTION_SDATA2 static f32 lit_1022 = 1023.5f; /* 8045648C-80456490 0004+00 s=1 e=0 z=0 None .sdata2 @1023 */ -SECTION_SDATA2 static u32 lit_1023 = 0x3FC90FDB; +SECTION_SDATA2 static f32 lit_1023 = 1.5707963705062866f; /* 80456490-80456494 0004+00 s=1 e=0 z=0 None .sdata2 @1024 */ -SECTION_SDATA2 static u32 lit_1024 = 0x42652EE0; +SECTION_SDATA2 static f32 lit_1024 = 57.2957763671875f; /* 80456494-80456498 0004+00 s=1 e=0 z=0 None .sdata2 @1025 */ -SECTION_SDATA2 static u32 lit_1025 = 0x43340000; +SECTION_SDATA2 static f32 lit_1025 = 180.0f; /* 80456498-804564A0 0008+00 s=1 e=0 z=0 None .sdata2 @1027 */ -SECTION_SDATA2 static u8 lit_1027[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1027 = 4503599627370496.0 /* cast u32 to float */; /* 8032E60C-8032EAB4 04A8+00 s=1 e=0 z=0 None .text * deform_VtxNrmF32__11J3DDeformerFP15J3DVertexBufferP10J3DClusterP13J3DClusterKeyPf */ diff --git a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp index 02bc790e545..4ce31f3444b 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp @@ -50,10 +50,6 @@ struct J3DJoint { // Forward References: // -extern "C" extern u8 mMtxBuffer__10J3DMtxCalc[4]; -extern "C" extern u8 mJoint__10J3DMtxCalc[4]; -extern "C" extern u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */]; - extern "C" void init__25J3DMtxCalcJ3DSysInitBasicFRC3VecRA3_A4_Cf(); extern "C" void init__24J3DMtxCalcJ3DSysInitMayaFRC3VecRA3_A4_Cf(); extern "C" void calcTransform__28J3DMtxCalcCalcTransformBasicFRC16J3DTransformInfo(); @@ -74,12 +70,6 @@ extern "C" extern u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */]; void J3DGetTranslateRotateMtx(J3DTransformInfo const&, f32 (*)[4]); void J3DGetTranslateRotateMtx(s16, s16, s16, f32, f32, f32, f32 (*)[4]); void JMAMTXApplyScale(f32 const (*)[4], f32 (*)[4], f32, f32, f32); -extern "C" extern u8 const j3dDefaultTransformInfo[32]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 mCurrentS__6J3DSys[12]; -extern "C" extern u8 mParentS__6J3DSys[12]; -extern "C" extern u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */]; extern "C" void J3DGetTranslateRotateMtx__FRC16J3DTransformInfoPA4_f(); extern "C" void J3DGetTranslateRotateMtx__FsssfffPA4_f(); @@ -142,7 +132,7 @@ u8 mMtxBuffer__10J3DMtxCalc[4]; u8 mJoint__10J3DMtxCalc[4]; /* 804564A0-804564A4 0004+00 s=3 e=0 z=0 None .sdata2 @922 */ -SECTION_SDATA2 static u32 lit_922 = 0x3F800000; +SECTION_SDATA2 static f32 lit_922 = 1.0f; /* 8032ED30-8032EE50 0120+00 s=0 e=1 z=0 None .text * calcTransform__28J3DMtxCalcCalcTransformBasicFRC16J3DTransformInfo */ diff --git a/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp index 767887be826..3cd219ba0dc 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp @@ -48,8 +48,6 @@ struct J3DDrawMtxData { // Forward References: // -extern "C" extern void* __vt__12J3DJointTree[4 + 1 /* padding */]; - extern "C" void __ct__12J3DJointTreeFv(); extern "C" void makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable(); @@ -64,8 +62,6 @@ extern "C" extern void* __vt__12J3DJointTree[4 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern u8 mMtxBuffer__10J3DMtxCalc[4]; -extern "C" extern u8 mCurrentMtxCalc__8J3DJoint[4 + 4 /* padding */]; extern "C" void __dl__FPv(); extern "C" void __ct__14J3DDrawMtxDataFv(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp index 246b2ee26bd..09bb8a4ad5c 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp @@ -25,10 +25,10 @@ struct J3DTevKColorAnm {}; struct J3DTevColorAnm {}; -struct J3DMaterial {}; - struct J3DMatColorAnm {}; +struct J3DMaterial {}; + struct J3DMaterialAnm { /* 800A4820 */ ~J3DMaterialAnm(); /* 8032C320 */ void initialize(); @@ -53,8 +53,6 @@ struct J3DAnmTevRegKey { // Forward References: // -extern "C" extern void* __vt__14J3DMaterialAnm[4]; - extern "C" void initialize__14J3DMaterialAnmFv(); extern "C" void calc__14J3DMaterialAnmCFP11J3DMaterial(); extern "C" void setMatColorAnm__14J3DMaterialAnmFiP14J3DMatColorAnm(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp index 1c3026da483..8ba10b12832 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp @@ -25,11 +25,11 @@ struct J3DTevColorAnm {}; struct J3DAnmTextureSRTKey {}; -struct J3DAnmTexPattern {}; +struct J3DAnmColor {}; struct J3DAnmTevRegKey {}; -struct J3DAnmColor {}; +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F5A8 */ void clear(); @@ -79,8 +79,6 @@ extern "C" void entryTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultTexMtxInfo[100]; -extern "C" extern void* __vt__11J3DTexNoAnm[3]; extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp index 62d09dee20e..54b218a32f4 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp @@ -120,8 +120,6 @@ struct J3DDisplayListObj { // Forward References: // -extern "C" extern void* __vt__8J3DModel[9]; - extern "C" void initialize__8J3DModelFv(); extern "C" void entryModelData__8J3DModelFP12J3DModelDataUlUl(); extern "C" void createShapePacket__8J3DModelFP12J3DModelData(); @@ -156,9 +154,6 @@ void* operator new(u32); void* operator new[](u32); void operator delete(void*); void J3DCalcViewBaseMtx(f32 (*)[4], Vec const&, f32 const (&)[3][4], f32 (*)[4]); -extern "C" extern u8 const j3dDefaultScale[12]; -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern u8 j3dSys[284]; extern "C" void* __nw__FUl(); extern "C" void* __nwa__FUl(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp b/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp index fa9ab31f86b..8ba57b51190 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp @@ -70,9 +70,6 @@ extern "C" void __dt__12J3DModelDataFv(); // void operator delete(void*); -extern "C" extern void* __vt__12J3DJointTree[4 + 1 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 __GDCurrentDL[4]; extern "C" void __dl__FPv(); extern "C" void __ct__13J3DVertexDataFv(); diff --git a/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp index 8a4a9c19b68..77a09daa5d8 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp @@ -62,7 +62,6 @@ void J3DCalcBBoardMtx(f32 (*)[4]); void J3DCalcYBBoardMtx(f32 (*)[4]); void J3DPSCalcInverseTranspose(f32 (*)[4], f32 (*)[3]); void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], u32); -extern "C" extern u8 j3dSys[284]; extern "C" void* __nwa__FUl(); extern "C" void* __nwa__FUli(); @@ -216,7 +215,7 @@ asm void J3DMtxBuffer::calcNrmMtx() { /* ############################################################################################## */ /* 80456420-80456424 0004+00 s=1 e=0 z=0 None .sdata2 @1320 */ -SECTION_SDATA2 static u32 lit_1320 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1320 = 1.0f; /* 80456424-80456428 0004+00 s=1 e=0 z=0 None .sdata2 @1321 */ SECTION_SDATA2 static u8 lit_1321[4] = { diff --git a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index 7845e16c98e..b1c452cf0a1 100644 --- a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -60,7 +60,6 @@ struct J3DShape { static void J3DPSWeightMTXMultVec(f32 (*)[4], f32, Vec*, Vec*); static void J3DPSWeightMTXMultVecSR(f32 (*)[4], f32, Vec*, Vec*); -extern "C" extern char const* const J3DSkinDeform__stringBase0; extern "C" void __ct__12J3DSkinNListFv(); extern "C" static void J3DPSWeightMTXMultVec__FPA4_ffP3VecP3Vec(); @@ -95,7 +94,6 @@ void* operator new[](u32, int); void operator delete(void*); void J3DGQRSetup7(u32, u32, u32, u32); void J3DPSCalcInverseTranspose(f32 (*)[4], f32 (*)[3]); -extern "C" extern u8 PSMulUnit01[8]; SECTION_INIT void memcpy(); extern "C" void OSReport(); @@ -216,7 +214,7 @@ static u8 sWorkArea_WEvlpMixMtx__13J3DSkinDeform[4096]; static u8 sWorkArea_WEvlpMixWeight__13J3DSkinDeform[4096]; /* 80456468-8045646C 0004+00 s=1 e=0 z=0 None .sdata2 @1110 */ -SECTION_SDATA2 static u32 lit_1110 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1110 = 1.0f; /* 8032C9B0-8032CF44 0594+00 s=0 e=1 z=0 None .text initSkinInfo__13J3DSkinDeformFP12J3DModelData */ diff --git a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp index 13db0780390..08831dfc6cb 100644 --- a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp +++ b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp @@ -43,9 +43,6 @@ struct J3DDrawBuffer { // Forward References: // -extern "C" extern u8 sortFuncTable__13J3DDrawBuffer[72]; -extern "C" extern u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */]; - extern "C" void initialize__13J3DDrawBufferFv(); extern "C" void allocBuffer__13J3DDrawBufferFUl(); extern "C" void __dt__13J3DDrawBufferFv(); @@ -71,7 +68,6 @@ extern "C" extern u8 entryNum__13J3DDrawBuffer[4 + 4 /* padding */]; void* operator new[](u32, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern u8 j3dSys[284]; extern "C" void* __nwa__FUli(); extern "C" void __dl__FPv(); @@ -93,15 +89,13 @@ extern "C" extern u8 j3dSys[284]; /* ############################################################################################## */ /* 80456400-80456404 0004+00 s=2 e=0 z=0 None .sdata2 @781 */ -SECTION_SDATA2 static u32 lit_781 = 0x3F800000; +SECTION_SDATA2 static f32 lit_781 = 1.0f; /* 80456404-80456408 0004+00 s=1 e=0 z=0 None .sdata2 @782 */ -SECTION_SDATA2 static u32 lit_782 = 0x461C4000; +SECTION_SDATA2 static f32 lit_782 = 10000.0f; /* 80456408-80456410 0008+00 s=2 e=0 z=0 None .sdata2 @784 */ -SECTION_SDATA2 static u8 lit_784[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_784 = 4503599627370496.0 /* cast u32 to float */; /* 80324F08-80324F70 0068+00 s=0 e=1 z=0 None .text initialize__13J3DDrawBufferFv */ #pragma push diff --git a/libs/JSystem/J3DGraphBase/J3DGD.cpp b/libs/JSystem/J3DGraphBase/J3DGD.cpp index e95907059b5..ef8a09f53d6 100644 --- a/libs/JSystem/J3DGraphBase/J3DGD.cpp +++ b/libs/JSystem/J3DGraphBase/J3DGD.cpp @@ -100,7 +100,6 @@ void J3DFifoLoadNrmMtxImm3x3(f32 (*)[3], u32); void J3DFifoLoadNrmMtxToTexMtx(f32 (*)[4], u32); void J3DFifoLoadNrmMtxToTexMtx3x3(f32 (*)[3], u32); void J3DFifoLoadTexCached(_GXTexMapID, u32, _GXTexCacheSize, u32, _GXTexCacheSize); -extern "C" extern u8 pad_8045094C[4]; extern "C" void J3DGDSetGenMode__FUcUcUcUc11_GXCullMode(); extern "C" void J3DGDSetGenMode_3Param__FUcUcUc(); @@ -141,8 +140,6 @@ extern "C" extern u8 pad_8045094C[4]; // External References: // -extern "C" extern u8 __GDCurrentDL[4]; - extern "C" void GDOverflowed(); extern "C" void __cvt_fp2unsigned(); extern "C" void __save_gpr(); @@ -356,10 +353,10 @@ SECTION_SDATA static u8 GX2HWFiltConv[6 + 2 /* padding */] = { }; /* 80456328-8045632C 0004+00 s=1 e=0 z=0 None .sdata2 @1050 */ -SECTION_SDATA2 static u32 lit_1050 = 0x42000000; +SECTION_SDATA2 static f32 lit_1050 = 32.0f; /* 8045632C-80456330 0004+00 s=1 e=0 z=0 None .sdata2 @1051 */ -SECTION_SDATA2 static u32 lit_1051 = 0x41800000; +SECTION_SDATA2 static f32 lit_1051 = 16.0f; /* 8030E438-8030E5D4 019C+00 s=0 e=1 z=0 None .text * J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy @@ -429,7 +426,7 @@ asm void J3DGDLoadTlut(void* param_0, u32 param_1, _GXTlutSize param_2) { /* ############################################################################################## */ /* 80456330-80456334 0004+00 s=1 e=0 z=0 None .sdata2 @1233 */ -SECTION_SDATA2 static u32 lit_1233 = 0x44800000; +SECTION_SDATA2 static f32 lit_1233 = 1024.0f; /* 8030EB30-8030EE10 02E0+00 s=0 e=2 z=0 None .text J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc */ @@ -561,9 +558,7 @@ SECTION_SDATA2 static f32 lit_1461[1 + 1 /* padding */] = { }; /* 80456340-80456348 0008+00 s=1 e=0 z=0 None .sdata2 @1462 */ -SECTION_SDATA2 static u8 lit_1462[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1462 = 1.0; /* 80456348-80456350 0004+04 s=1 e=0 z=0 None .sdata2 @1463 */ SECTION_SDATA2 static f32 lit_1463[1 + 1 /* padding */] = { @@ -573,9 +568,7 @@ SECTION_SDATA2 static f32 lit_1463[1 + 1 /* padding */] = { }; /* 80456350-80456358 0008+00 s=1 e=0 z=0 None .sdata2 @1464 */ -SECTION_SDATA2 static u8 lit_1464[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1464 = 0.5; /* 80456358-80456360 0004+04 s=1 e=0 z=0 None .sdata2 @1465 */ SECTION_SDATA2 static f32 lit_1465[1 + 1 /* padding */] = { @@ -585,9 +578,7 @@ SECTION_SDATA2 static f32 lit_1465[1 + 1 /* padding */] = { }; /* 80456360-80456368 0008+00 s=1 e=0 z=0 None .sdata2 @1468 */ -SECTION_SDATA2 static u8 lit_1468[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1468 = 4503601774854144.0 /* cast s32 to float */; /* 8030F630-8030F994 0364+00 s=0 e=3 z=0 None .text J3DGDSetFog__F10_GXFogTypeffff8_GXColor */ #pragma push diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp index 96698166f49..dbb6ba6de91 100644 --- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -115,10 +115,10 @@ struct J3DTevStage {}; struct J3DTevOrder {}; -struct J3DIndTevStage {}; - struct J3DGXColorS10 {}; +struct J3DIndTevStage {}; + struct J3DGXColor {}; struct J3DTevBlock { @@ -448,10 +448,10 @@ struct J3DPEBlockOpa { /* 80323334 */ ~J3DPEBlockOpa(); }; -struct J3DBlend {}; - struct J3DAlphaComp {}; +struct J3DBlend {}; + struct J3DFog {}; struct J3DPEBlock { @@ -687,26 +687,6 @@ struct J3DColorBlockAmbientOn { // Forward References: // -extern "C" extern char const* const J3DMatBlock__stringBase0; -extern "C" extern void* __vt__14J3DPEBlockFull[31]; -extern "C" extern void* __vt__16J3DPEBlockFogOff[31]; -extern "C" extern void* __vt__13J3DTevBlock16[55]; -extern "C" extern void* __vt__12J3DTevBlock4[55]; -extern "C" extern void* __vt__12J3DTevBlock2[55]; -extern "C" extern void* __vt__12J3DTevBlock1[55]; -extern "C" extern void* __vt__18J3DTevBlockPatched[55]; -extern "C" extern void* __vt__19J3DTexGenBlockBasic[27]; -extern "C" extern void* __vt__15J3DTexGenBlock4[27]; -extern "C" extern void* __vt__21J3DTexGenBlockPatched[27]; -extern "C" extern void* __vt__20J3DColorBlockLightOn[36]; -extern "C" extern void* __vt__22J3DColorBlockAmbientOn[36]; -extern "C" extern void* __vt__13J3DPEBlockXlu[31]; -extern "C" extern void* __vt__17J3DPEBlockTexEdge[31]; -extern "C" extern void* __vt__13J3DPEBlockOpa[31]; -extern "C" extern void* __vt__15J3DIndBlockFull[19]; -extern "C" extern void* __vt__11J3DTevBlock[55]; -extern "C" extern void* __vt__21J3DColorBlockLightOff[36 + 1 /* padding */]; - extern "C" void initialize__21J3DColorBlockLightOffFv(); extern "C" void initialize__22J3DColorBlockAmbientOnFv(); extern "C" void initialize__20J3DColorBlockLightOnFv(); @@ -1203,22 +1183,6 @@ void isTexNoReg(void*); void getTexNoReg(void*); void loadTexNo(u32, u16 const&); void patchTexNo_PtrToIdx(u32, u16 const&); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* __vt__10J3DPEBlock[31]; -extern "C" extern void* __vt__11J3DIndBlock[19]; -extern "C" extern void* __vt__14J3DTexGenBlock[27]; -extern "C" extern void* __vt__13J3DColorBlock[36]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */]; -extern "C" extern u8 j3dTevSwapTableTable[1024]; -extern "C" extern u8 j3dAlphaCmpTable[768]; -extern "C" extern u8 j3dZModeTable[96]; -extern "C" extern u8 __GDCurrentDL[4]; -extern "C" extern u32 j3dDefaultColInfo; -extern "C" extern u32 j3dDefaultAmbInfo; -extern "C" extern u32 j3dDefaultTevColor; -extern "C" extern u32 data_804563D8; -extern "C" extern u32 j3dDefaultTevKColor; SECTION_INIT void memcpy(); extern "C" void OSReport(); diff --git a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp index d10557849ef..f4551911e8e 100644 --- a/libs/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/libs/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -107,11 +107,11 @@ struct J3DPEBlockFogOff { /* 80317B34 */ void initialize(); }; -struct J3DBlend {}; +struct J3DFog {}; struct J3DAlphaComp {}; -struct J3DFog {}; +struct J3DBlend {}; struct J3DPEBlock { /* 8000DBCC */ void patch(); @@ -320,15 +320,6 @@ struct J3DColorBlock { // Forward References: // -extern "C" extern void* __vt__17J3DLockedMaterial[12]; -extern "C" extern void* __vt__18J3DPatchedMaterial[12]; -extern "C" extern void* __vt__11J3DMaterial[12]; -extern "C" extern void* __vt__10J3DPEBlock[31]; -extern "C" extern void* __vt__15J3DIndBlockNull[19]; -extern "C" extern void* __vt__11J3DIndBlock[19]; -extern "C" extern void* __vt__14J3DTexGenBlock[27]; -extern "C" extern void* __vt__13J3DColorBlock[36]; - extern "C" void createColorBlock__11J3DMaterialFUl(); extern "C" void createTexGenBlock__11J3DMaterialFUl(); extern "C" void createTevBlock__11J3DMaterialFi(); @@ -458,30 +449,6 @@ void operator delete(void*); void J3DGDSetGenMode(u8, u8, u8, u8, _GXCullMode); void J3DGDSetGenMode_3Param(u8, u8, u8); void loadNBTScale(J3DNBTScale&); -extern "C" extern u8 const j3dDefaultFogInfo[44]; -extern "C" extern u8 const j3dDefaultNBTScaleInfo[16]; -extern "C" extern void* __vt__14J3DPEBlockFull[31]; -extern "C" extern void* __vt__16J3DPEBlockFogOff[31]; -extern "C" extern void* __vt__13J3DTevBlock16[55]; -extern "C" extern void* __vt__12J3DTevBlock4[55]; -extern "C" extern void* __vt__12J3DTevBlock2[55]; -extern "C" extern void* __vt__12J3DTevBlock1[55]; -extern "C" extern void* __vt__19J3DTexGenBlockBasic[27]; -extern "C" extern void* __vt__15J3DTexGenBlock4[27]; -extern "C" extern void* __vt__21J3DTexGenBlockPatched[27]; -extern "C" extern void* __vt__20J3DColorBlockLightOn[36]; -extern "C" extern void* __vt__22J3DColorBlockAmbientOn[36]; -extern "C" extern void* __vt__13J3DPEBlockXlu[31]; -extern "C" extern void* __vt__17J3DPEBlockTexEdge[31]; -extern "C" extern void* __vt__13J3DPEBlockOpa[31]; -extern "C" extern void* __vt__15J3DIndBlockFull[19]; -extern "C" extern void* __vt__11J3DTevBlock[55]; -extern "C" extern void* __vt__21J3DColorBlockLightOff[36 + 1 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 __GDCurrentDL[4]; -extern "C" extern u32 j3dDefaultBlendInfo; -extern "C" extern u8 struct_804563F8[4]; -extern "C" extern u16 j3dDefaultZModeID[1 + 1 /* padding */]; extern "C" void patch__10J3DPEBlockFv(); extern "C" void patchLight__13J3DColorBlockFv(); diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index 6620f7106e6..1b0058ff859 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -78,9 +78,6 @@ struct J3DDisplayListObj { // Forward References: // -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 sGDLObj__17J3DDisplayListObj[16]; - extern "C" void newDisplayList__17J3DDisplayListObjFUl(); extern "C" void newSingleDisplayList__17J3DDisplayListObjFUl(); extern "C" void single_To_Double__17J3DDisplayListObjFv(); @@ -124,13 +121,6 @@ extern "C" extern u8 sGDLObj__17J3DDisplayListObj[16]; void* operator new(u32); void* operator new[](u32, int); void operator delete(void*); -extern "C" extern u8 sortFuncTable__13J3DDrawBuffer[72]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_804515B0[4]; -extern "C" extern u8 sTexGenBlock__17J3DDifferedTexMtx[4]; -extern "C" extern u8 sTexMtxObj__17J3DDifferedTexMtx[4]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; -extern "C" extern u8 __GDCurrentDL[4]; SECTION_INIT void memcpy(); extern "C" void __dt__9J3DPacketFv(); diff --git a/libs/JSystem/J3DGraphBase/J3DShape.cpp b/libs/JSystem/J3DGraphBase/J3DShape.cpp index 6160eee5a2c..f8c26fddf16 100644 --- a/libs/JSystem/J3DGraphBase/J3DShape.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShape.cpp @@ -52,8 +52,6 @@ struct J3DShape { static void J3DLoadCPCmd(u8, u32); static void J3DLoadArrayBasePtr(_GXAttr, void*); -extern "C" extern void* __vt__8J3DShape[6]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void initialize__8J3DShapeFv(); extern "C" void addTexMtxIndexInDL__8J3DShapeF7_GXAttrUl(); @@ -83,13 +81,6 @@ void* operator new[](u32); void J3DGDSetVtxAttrFmtv(_GXVtxFmt, _GXVtxAttrFmtList const*, bool); void J3DFifoLoadPosMtxImm(f32 (*)[4], u32); void J3DFifoLoadNrmMtxImm(f32 (*)[4], u32); -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 j3dDefaultViewNo[4 + 4 /* padding */]; -extern "C" extern u8 sCurrentPipeline__11J3DShapeMtx[4]; -extern "C" extern u8 sCurrentScaleFlag__11J3DShapeMtx[4]; -extern "C" extern u8 struct_804515B0[4]; -extern "C" extern u8 sTexMtxLoadType__11J3DShapeMtx[4]; -extern "C" extern u8 __GDCurrentDL[4]; extern "C" void* __nwa__FUl(); extern "C" void J3DGDSetVtxAttrFmtv__F9_GXVtxFmtPC17_GXVtxAttrFmtListb(); @@ -130,16 +121,10 @@ extern "C" extern u8 __GDCurrentDL[4]; /* ############################################################################################## */ /* 804563A0-804563A8 0004+04 s=1 e=0 z=0 None .sdata2 @687 */ -SECTION_SDATA2 static u8 lit_687[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_687[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80314B48-80314BB8 0070+00 s=0 e=1 z=0 None .text initialize__8J3DShapeFv */ diff --git a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp index f572ce659f8..58ef074a2fb 100644 --- a/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp +++ b/libs/JSystem/J3DGraphBase/J3DShapeMtx.cpp @@ -86,20 +86,6 @@ struct J3DDifferedTexMtx { // Forward References: // -extern "C" extern u8 data_803CDB70[20]; -extern "C" extern void* __vt__28J3DShapeMtxYBBoardConcatView[10]; -extern "C" extern void* __vt__27J3DShapeMtxBBoardConcatView[10]; -extern "C" extern void* __vt__26J3DShapeMtxMultiConcatView[10]; -extern "C" extern void* __vt__16J3DShapeMtxMulti[8]; -extern "C" extern void* __vt__21J3DShapeMtxConcatView[10]; -extern "C" extern void* __vt__11J3DShapeMtx[8 + 1 /* padding */]; -extern "C" extern u8 sCurrentPipeline__11J3DShapeMtx[4]; -extern "C" extern u8 sCurrentScaleFlag__11J3DShapeMtx[4]; -extern "C" extern u8 struct_804515B0[4]; -extern "C" extern u8 sTexMtxLoadType__11J3DShapeMtx[4]; -extern "C" extern u8 sTexGenBlock__17J3DDifferedTexMtx[4]; -extern "C" extern u8 sTexMtxObj__17J3DDifferedTexMtx[4]; - extern "C" void resetMtxLoadCache__11J3DShapeMtxFv(); extern "C" void loadMtxIndx_PNGP__11J3DShapeMtxCFiUs(); extern "C" void loadMtxIndx_PCPU__11J3DShapeMtxCFiUs(); @@ -175,7 +161,6 @@ void J3DGetTextureMtxMayaOld(J3DTextureSRTInfo const&, f32 (*)[4]); void J3DScaleNrmMtx(f32 (*)[4], Vec const&); void J3DScaleNrmMtx33(f32 (*)[3], Vec const&); void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]); -extern "C" extern u8 j3dSys[284]; extern "C" bool getUseMtxNum__11J3DShapeMtxCFv(); extern "C" void __dl__FPv(); @@ -607,7 +592,7 @@ asm void J3DShapeMtxMultiConcatView::loadNrmMtx(int param_0, u16 param_1, f32 (* /* ############################################################################################## */ /* 8045639C-804563A0 0004+00 s=1 e=0 z=0 None .sdata2 @1423 */ -SECTION_SDATA2 static u32 lit_1423 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1423 = 1.0f; /* 803142D4-803143E4 0110+00 s=1 e=0 z=0 None .text load__27J3DShapeMtxBBoardConcatViewCFv */ #pragma push diff --git a/libs/JSystem/J3DGraphBase/J3DStruct.cpp b/libs/JSystem/J3DGraphBase/J3DStruct.cpp index cfeb18f3ae3..12d6763ebb6 100644 --- a/libs/JSystem/J3DGraphBase/J3DStruct.cpp +++ b/libs/JSystem/J3DGraphBase/J3DStruct.cpp @@ -73,7 +73,7 @@ asm void J3DTexMtxInfo::operator=(J3DTexMtxInfo const& param_0) { /* ############################################################################################## */ /* 80456410-80456414 0004+00 s=1 e=0 z=0 None .sdata2 @409 */ -SECTION_SDATA2 static u32 lit_409 = 0x3F800000; +SECTION_SDATA2 static f32 lit_409 = 1.0f; /* 80456414-80456418 0004+00 s=1 e=0 z=0 None .sdata2 @410 */ SECTION_SDATA2 static u8 lit_410[4] = { diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp index 5fe64b13227..4e09e43efbc 100644 --- a/libs/JSystem/J3DGraphBase/J3DSys.cpp +++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp @@ -35,13 +35,6 @@ struct J3DSys { // Forward References: // -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 mCurrentS__6J3DSys[12]; -extern "C" extern u8 mParentS__6J3DSys[12]; -extern "C" extern u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */]; -extern "C" extern u8 j3dDefaultViewNo[4 + 4 /* padding */]; - extern "C" void __ct__6J3DSysFv(); extern "C" void loadPosMtxIndx__6J3DSysCFiUs(); extern "C" void loadNrmMtxIndx__6J3DSysCFiUs(); @@ -72,12 +65,6 @@ void makeTexCoordTable(); void makeAlphaCmpTable(); void makeZModeTable(); void makeTevSwapTable(); -extern "C" extern u8 const j3dDefaultTexCoordInfo[32]; -extern "C" extern u32 j3dDefaultColInfo; -extern "C" extern u32 data_804563C8; -extern "C" extern u32 j3dDefaultTevColor; -extern "C" extern u32 data_804563D8; -extern "C" extern u32 j3dDefaultTevKColor; extern "C" void J3DFifoLoadTexCached__F11_GXTexMapIDUl15_GXTexCacheSizeUl15_GXTexCacheSize(); extern "C" void makeTexCoordTable__Fv(); @@ -341,7 +328,7 @@ SECTION_SDATA2 static u8 lit_892[4] = { }; /* 8045636C-80456370 0004+00 s=1 e=0 z=0 None .sdata2 @893 */ -SECTION_SDATA2 static u32 lit_893 = 0x3F800000; +SECTION_SDATA2 static f32 lit_893 = 1.0f; /* 80456370-80456378 0004+04 s=1 e=0 z=0 None .sdata2 @894 */ SECTION_SDATA2 static f32 lit_894[1 + 1 /* padding */] = { diff --git a/libs/JSystem/J3DGraphBase/J3DTevs.cpp b/libs/JSystem/J3DGraphBase/J3DTevs.cpp index b2f21cc9007..982e007cb35 100644 --- a/libs/JSystem/J3DGraphBase/J3DTevs.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTevs.cpp @@ -72,32 +72,6 @@ void makeZModeTable(); void makeTevSwapTable(); static void J3DGDLoadTexMtxImm(f32 (*)[4], u32, _GXTexMtxType); static void J3DGDLoadPostTexMtxImm(f32 (*)[4], u32); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern u8 const j3dDefaultTexCoordInfo[32]; -extern "C" extern u8 const j3dDefaultTexMtxInfo[100]; -extern "C" extern u8 const j3dDefaultIndTexMtxInfo[28]; -extern "C" extern u8 const j3dDefaultTevStageInfo[20]; -extern "C" extern u8 const j3dDefaultIndTevStageInfo[12]; -extern "C" extern u8 const j3dDefaultFogInfo[44]; -extern "C" extern u8 const j3dDefaultNBTScaleInfo[16]; -extern "C" extern u8 j3dTevSwapTableTable[1024]; -extern "C" extern u8 j3dAlphaCmpTable[768]; -extern "C" extern u8 j3dZModeTable[96]; -extern "C" extern u32 j3dDefaultColInfo; -extern "C" extern u32 j3dDefaultAmbInfo; -extern "C" extern u32 data_804563C8; -extern "C" extern u32 j3dDefaultTevOrderInfoNull; -extern "C" extern u32 j3dDefaultIndTexOrderNull; -extern "C" extern u32 j3dDefaultTevColor; -extern "C" extern u32 data_804563D8; -extern "C" extern u8 j3dDefaultIndTexCoordScaleInfo[4]; -extern "C" extern u32 j3dDefaultTevKColor; -extern "C" extern u8 j3dDefaultTevSwapMode[4]; -extern "C" extern u32 j3dDefaultTevSwapModeTable; -extern "C" extern u32 j3dDefaultBlendInfo; -extern "C" extern u8 j3dDefaultColorChanInfo[8]; -extern "C" extern u8 struct_804563F8[4]; -extern "C" extern u16 j3dDefaultZModeID[1 + 1 /* padding */]; extern "C" void load__11J3DLightObjCFUl(); extern "C" void loadTexCoordGens__FUlP11J3DTexCoord(); @@ -166,9 +140,6 @@ void J3DGetTextureMtxOld(J3DTextureSRTInfo const&, Vec const&, f32 (*)[4]); void J3DGetTextureMtxMaya(J3DTextureSRTInfo const&, f32 (*)[4]); void J3DGetTextureMtxMayaOld(J3DTextureSRTInfo const&, f32 (*)[4]); void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]); -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */]; -extern "C" extern u8 __GDCurrentDL[4]; extern "C" void J3DGDSetLightAttn__F10_GXLightIDffffff(); extern "C" void J3DGDSetLightColor__F10_GXLightID8_GXColor(); @@ -345,15 +316,13 @@ asm void getTexNoReg(void* param_0) { /* ############################################################################################## */ /* 804563B0-804563B4 0004+00 s=1 e=0 z=0 None .sdata2 @1167 */ -SECTION_SDATA2 static u32 lit_1167 = 0x3E000000; +SECTION_SDATA2 static f32 lit_1167 = 0.125f; /* 804563B4-804563B8 0004+00 s=1 e=0 z=0 None .sdata2 @1168 */ -SECTION_SDATA2 static u32 lit_1168 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_1168 = 1.0f / 100.0f; /* 804563B8-804563C0 0008+00 s=1 e=0 z=0 None .sdata2 @1171 */ -SECTION_SDATA2 static u8 lit_1171[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1171 = 4503601774854144.0 /* cast s32 to float */; /* 80323F94-8032413C 01A8+00 s=0 e=20 z=0 None .text loadTexNo__FUlRCUs */ #pragma push diff --git a/libs/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/J3DGraphBase/J3DTexture.cpp index a6bedf0e71c..b9ca61ceeec 100644 --- a/libs/JSystem/J3DGraphBase/J3DTexture.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTexture.cpp @@ -51,15 +51,13 @@ extern "C" void _restgpr_28(); /* ############################################################################################## */ /* 80456388-8045638C 0004+00 s=1 e=0 z=0 None .sdata2 @284 */ -SECTION_SDATA2 static u32 lit_284 = 0x3E000000; +SECTION_SDATA2 static f32 lit_284 = 0.125f; /* 8045638C-80456390 0004+00 s=1 e=0 z=0 None .sdata2 @285 */ -SECTION_SDATA2 static u32 lit_285 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_285 = 1.0f / 100.0f; /* 80456390-80456398 0008+00 s=1 e=0 z=0 None .sdata2 @288 */ -SECTION_SDATA2 static u8 lit_288[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_288 = 4503601774854144.0 /* cast s32 to float */; /* 8031204C-803121A4 0158+00 s=0 e=1 z=0 None .text loadGX__10J3DTextureCFUs11_GXTexMapID */ #pragma push diff --git a/libs/JSystem/J3DGraphBase/J3DTransform.cpp b/libs/JSystem/J3DGraphBase/J3DTransform.cpp index 37ebaf7e5a2..4e4e233015c 100644 --- a/libs/JSystem/J3DGraphBase/J3DTransform.cpp +++ b/libs/JSystem/J3DGraphBase/J3DTransform.cpp @@ -36,10 +36,6 @@ void J3DScaleNrmMtx(f32 (*)[4], Vec const&); void J3DScaleNrmMtx33(f32 (*)[3], Vec const&); void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]); void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], u32); -extern "C" extern u8 const j3dDefaultTransformInfo[32]; -extern "C" extern u8 const j3dDefaultScale[12]; -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern u8 PSMulUnit01[8]; extern "C" static void __MTGQR7__FUl(); extern "C" void J3DGQRSetup7__FUlUlUlUl(); @@ -65,8 +61,6 @@ extern "C" extern u8 PSMulUnit01[8]; // External References: // -extern "C" extern u8 sincosTable___5JMath[65536]; - extern "C" void PSVECNormalize(); extern "C" extern u8 sincosTable___5JMath[65536]; @@ -181,7 +175,7 @@ asm void J3DGetTranslateRotateMtx(s16 param_0, s16 param_1, s16 param_2, f32 par /* ############################################################################################## */ /* 8045637C-80456380 0004+00 s=4 e=0 z=0 None .sdata2 @526 */ -SECTION_SDATA2 static u32 lit_526 = 0x3F800000; +SECTION_SDATA2 static f32 lit_526 = 1.0f; /* 80311ACC-80311B80 00B4+00 s=0 e=3 z=0 None .text * J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f */ diff --git a/libs/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/J3DGraphBase/J3DVertex.cpp index 94cdfacee98..816e738804a 100644 --- a/libs/JSystem/J3DGraphBase/J3DVertex.cpp +++ b/libs/JSystem/J3DGraphBase/J3DVertex.cpp @@ -55,7 +55,6 @@ extern "C" void __dt__14J3DDrawMtxDataFv(); void* operator new[](u32, int); void operator delete(void*); -extern "C" extern u8 j3dSys[284]; SECTION_INIT void memcpy(); extern "C" void* __nwa__FUli(); diff --git a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp index b08c0204bb3..3fc2d8ed4cb 100644 --- a/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DAnmLoader.cpp @@ -79,16 +79,16 @@ struct J3DAnmLoader { /* 80339800 */ ~J3DAnmLoader(); }; -struct J3DAnmClusterKey {}; - -struct J3DAnmClusterKeyData {}; - struct J3DAnmColorKeyData {}; +struct J3DAnmClusterKey {}; + struct J3DAnmColorKey { /* 8032AB00 */ J3DAnmColorKey(); }; +struct J3DAnmClusterKeyData {}; + struct J3DAnmKeyLoader_v15 { /* 803384E0 */ J3DAnmKeyLoader_v15(); /* 803384FC */ ~J3DAnmKeyLoader_v15(); @@ -108,16 +108,16 @@ struct J3DAnmKeyLoader_v15 { /* 80339634 */ void setAnmVtxColor(J3DAnmVtxColorKey*, J3DAnmVtxColorKeyData const*); }; -struct J3DAnmColorFull { - /* 8032A93C */ J3DAnmColorFull(); -}; +struct J3DAnmClusterFullData {}; struct J3DAnmColorFullData {}; -struct J3DAnmClusterFullData {}; - struct J3DAnmClusterFull {}; +struct J3DAnmColorFull { + /* 8032A93C */ J3DAnmColorFull(); +}; + struct J3DAnmFullLoader_v15 { /* 80338468 */ J3DAnmFullLoader_v15(); /* 80338484 */ ~J3DAnmFullLoader_v15(); @@ -143,7 +143,6 @@ struct J3DAnmFullLoader_v15 { static void JSUConvertOffsetToPtr__template78(void const*, void const*); static void JSUConvertOffsetToPtr__template79(void const*, void const*); -extern "C" extern char const* const J3DAnmLoader__stringBase0; extern "C" void load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag(); extern "C" void setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv(); @@ -215,13 +214,6 @@ void JSUConvertOffsetToPtr__template39(void const*, void const*); void JSUConvertOffsetToPtr__template40(void const*, void const*); void JSUConvertOffsetToPtr__template41(void const*, void const*); void JSUConvertOffsetToPtr__template42(void const*, void const*); -extern "C" extern void* __vt__10J3DAnmBase[4]; -extern "C" extern void* __vt__18J3DAnmTransformKey[5]; -extern "C" extern void* __vt__16J3DAnmClusterKey[5]; -extern "C" extern void* __vt__13J3DAnmCluster[5]; -extern "C" extern void* __vt__17J3DAnmClusterFull[5]; -extern "C" extern void* __vt__27J3DAnmTransformFullWithLerp[5]; -extern "C" extern void* __vt__19J3DAnmTransformFull[5 + 1 /* padding */]; extern "C" void OSReport(); extern "C" void* __nw__FUl(); @@ -313,16 +305,10 @@ SECTION_DATA static void* __vt__20J3DAnmVisibilityFull[4 + 1 /* padding */] = { }; /* 804564C0-804564C8 0004+04 s=13 e=0 z=0 None .sdata2 @889 */ -SECTION_SDATA2 static u8 lit_889[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_889[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80337B40-80338134 05F4+00 s=0 e=7 z=1 None .text diff --git a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index a66fdbe040b..55948d7922c 100644 --- a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -49,7 +49,6 @@ struct J3DClusterLoader { static void JSUConvertOffsetToPtr__template63(void const*, void const*); static void JSUConvertOffsetToPtr__template64(void const*, void const*); static void JSUConvertOffsetToPtr__template65(void const*, void const*); -extern "C" extern char const* const J3DClusterLoader__stringBase0; extern "C" void load__24J3DClusterLoaderDataBaseFPCv(); extern "C" void __ct__20J3DClusterLoader_v15Fv(); diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index 99742b577a5..09d1500993c 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -79,10 +79,6 @@ struct J3DTevBlockPatched { /* 803176E0 */ void initialize(); }; -struct J3DIndTevStage { - /* 8000E14C */ J3DIndTevStage(); -}; - struct J3DGXColorS10 { /* 8000E460 */ J3DGXColorS10(); }; @@ -91,6 +87,10 @@ struct J3DGXColor { /* 8000E538 */ J3DGXColor(); }; +struct J3DIndTevStage { + /* 8000E14C */ J3DIndTevStage(); +}; + struct J3DTevBlock { /* 8000DBC8 */ void patchTexNoAndTexCoordScale(); /* 8000DBD4 */ void patch(); @@ -162,11 +162,11 @@ struct J3DPEBlockNull { /* 803329B0 */ ~J3DPEBlockNull(); }; -struct J3DBlend {}; +struct J3DFog {}; struct J3DAlphaComp {}; -struct J3DFog {}; +struct J3DBlend {}; struct J3DPEBlock { /* 8000DBCC */ void patch(); @@ -197,8 +197,6 @@ struct J3DPEBlock { /* 80317394 */ void setFogOffset(u32); }; -struct J3DMaterialDLBlock {}; - struct J3DMaterial { /* 803157A0 */ void createColorBlock(u32); /* 803159A0 */ void createTexGenBlock(u32); @@ -216,6 +214,8 @@ struct J3DMaterial { struct J3DMaterialBlock {}; +struct J3DMaterialDLBlock {}; + struct J3DMaterialFactory { struct MaterialType {}; @@ -442,29 +442,6 @@ void JSUConvertOffsetToPtr__template24(void const*, void const*); void JSUConvertOffsetToPtr__template25(void const*, void const*); void JSUConvertOffsetToPtr__template26(void const*, void const*); void JSUConvertOffsetToPtr__template28(void const*, void const*); -extern "C" extern u8 const j3dDefaultTexCoordInfo[32]; -extern "C" extern u8 const j3dDefaultIndTexMtxInfo[28]; -extern "C" extern u8 const j3dDefaultIndTevStageInfo[12]; -extern "C" extern u8 const j3dDefaultFogInfo[44]; -extern "C" extern u8 const j3dDefaultNBTScaleInfo[16]; -extern "C" extern void* __vt__17J3DLockedMaterial[12]; -extern "C" extern void* __vt__18J3DPatchedMaterial[12]; -extern "C" extern void* __vt__11J3DMaterial[12]; -extern "C" extern void* __vt__10J3DPEBlock[31]; -extern "C" extern void* __vt__15J3DIndBlockNull[19]; -extern "C" extern void* __vt__11J3DIndBlock[19]; -extern "C" extern void* __vt__14J3DTexGenBlock[27]; -extern "C" extern void* __vt__13J3DColorBlock[36]; -extern "C" extern void* __vt__18J3DTevBlockPatched[55]; -extern "C" extern void* __vt__21J3DTexGenBlockPatched[27]; -extern "C" extern void* __vt__11J3DTevBlock[55]; -extern "C" extern u32 j3dDefaultTevOrderInfoNull; -extern "C" extern u32 j3dDefaultIndTexOrderNull; -extern "C" extern u8 j3dDefaultIndTexCoordScaleInfo[4]; -extern "C" extern u32 j3dDefaultTevSwapModeTable; -extern "C" extern u32 j3dDefaultBlendInfo; -extern "C" extern u8 j3dDefaultColorChanInfo[8]; -extern "C" extern u16 j3dDefaultZModeID[1 + 1 /* padding */]; extern "C" void patchTexNoAndTexCoordScale__11J3DTevBlockFv(); extern "C" void patch__10J3DPEBlockFv(); diff --git a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp index 648c530ef81..09113de6ba6 100644 --- a/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp @@ -22,8 +22,6 @@ struct J3DTevStage { /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&); }; -struct J3DMaterialBlock_v21 {}; - struct J3DMaterial { /* 803157A0 */ void createColorBlock(u32); /* 803159A0 */ void createTexGenBlock(u32); @@ -33,6 +31,8 @@ struct J3DMaterial { /* 80316240 */ void initialize(); }; +struct J3DMaterialBlock_v21 {}; + struct J3DMaterialFactory_v21 { /* 80332DA4 */ J3DMaterialFactory_v21(J3DMaterialBlock_v21 const&); /* 80332F84 */ void countUniqueMaterials(); @@ -123,15 +123,6 @@ void JSUConvertOffsetToPtr__template55(void const*, void const*); void JSUConvertOffsetToPtr__template56(void const*, void const*); void JSUConvertOffsetToPtr__template57(void const*, void const*); void JSUConvertOffsetToPtr__template59(void const*, void const*); -extern "C" extern u8 const j3dDefaultTexCoordInfo[32]; -extern "C" extern u8 const j3dDefaultFogInfo[44]; -extern "C" extern u8 const j3dDefaultNBTScaleInfo[16]; -extern "C" extern void* __vt__11J3DMaterial[12]; -extern "C" extern u32 j3dDefaultTevOrderInfoNull; -extern "C" extern u32 j3dDefaultTevSwapModeTable; -extern "C" extern u32 j3dDefaultBlendInfo; -extern "C" extern u8 j3dDefaultColorChanInfo[8]; -extern "C" extern u16 j3dDefaultZModeID[1 + 1 /* padding */]; extern "C" void __ct__11J3DTevStageFv(); extern "C" void __ct__11J3DTevStageFRC15J3DTevStageInfo(); diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp index c8f21e4b6dc..8daa854681e 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -119,14 +119,14 @@ struct J3DModelLoaderDataBase { struct J3DDrawBlock {}; +struct J3DJointBlock {}; + struct J3DModelInfoBlock {}; struct J3DMaterialDLBlock {}; struct J3DEnvelopeBlock {}; -struct J3DJointBlock {}; - struct J3DModelLoader { /* 8033468C */ J3DModelLoader(); /* 803347E0 */ void load(void const*, u32); @@ -217,7 +217,6 @@ static void JSUConvertOffsetToPtr__template69(void const*, void const*); void JSUConvertOffsetToPtr__template70(void const*, void const*); void JSUConvertOffsetToPtr__template71(void const*, u32); void JSUConvertOffsetToPtr__template72(void const*, u32); -extern "C" extern char const* const J3DModelLoader__stringBase0; extern "C" void __ct__14J3DModelLoaderFv(); extern "C" void load__22J3DModelLoaderDataBaseFPCvUl(); @@ -279,14 +278,6 @@ void JSUConvertOffsetToPtr__template24(void const*, void const*); void JSUConvertOffsetToPtr__template28(void const*, void const*); void JSUConvertOffsetToPtr__template39(void const*, void const*); void JSUConvertOffsetToPtr__template41(void const*, void const*); -extern "C" extern void* data_803A3360[11]; -extern "C" extern void* __vt__19J3DMtxCalcNoAnmBase[11]; -extern "C" extern void* __vt__10J3DMtxCalc[11 + 1 /* padding */]; -extern "C" extern void* __vt__11J3DMaterial[12]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 mCurrentS__6J3DSys[12]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 mJoint__10J3DMtxCalc[4]; extern "C" void OSReport(); extern "C" void setAnmTransform__10J3DMtxCalcFUcP15J3DAnmTransform(); diff --git a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index 2117d9b089f..2b827b3df98 100644 --- a/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -30,14 +30,14 @@ struct J3DModelLoader_v26 { struct J3DDrawBlock {}; +struct J3DJointBlock {}; + struct J3DModelInfoBlock {}; struct J3DMaterialDLBlock {}; struct J3DEnvelopeBlock {}; -struct J3DJointBlock {}; - struct J3DModelLoader { /* 80336794 */ void countMaterialNum(void const*); /* 803367D4 */ void calcLoadSize(void const*, u32); @@ -69,8 +69,6 @@ struct J3DMaterialFactory { // Forward References: // -extern "C" extern char const* const J3DModelLoaderCalcSize__stringBase0; - extern "C" void countMaterialNum__14J3DModelLoaderFPCv(); extern "C" void calcLoadSize__14J3DModelLoaderFPCvUl(); extern "C" void calcLoadMaterialTableSize__14J3DModelLoaderFPCv(); diff --git a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index e1f439e8743..9331d4e08f6 100644 --- a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -42,7 +42,6 @@ static void JSUConvertOffsetToPtr__template74(void const*, u32); static void JSUConvertOffsetToPtr__template75(void const*, u32); static void JSUConvertOffsetToPtr__template76(void const*, u32); static void JSUConvertOffsetToPtr__template77(void const*, u32); -extern "C" extern char const* const J3DShapeFactory__stringBase0; extern "C" void __ct__15J3DShapeFactoryFRC13J3DShapeBlock(); extern "C" void create__15J3DShapeFactoryFiUlP14_GXVtxDescList(); @@ -67,13 +66,6 @@ void* operator new[](u32); void* operator new[](u32, int); void JSUConvertOffsetToPtr__template71(void const*, u32); void JSUConvertOffsetToPtr__template72(void const*, u32); -extern "C" extern void* __vt__28J3DShapeMtxYBBoardConcatView[10]; -extern "C" extern void* __vt__27J3DShapeMtxBBoardConcatView[10]; -extern "C" extern void* __vt__26J3DShapeMtxMultiConcatView[10]; -extern "C" extern void* __vt__16J3DShapeMtxMulti[8]; -extern "C" extern void* __vt__21J3DShapeMtxConcatView[10]; -extern "C" extern void* __vt__11J3DShapeMtx[8 + 1 /* padding */]; -extern "C" extern void* __vt__8J3DShape[6]; extern "C" void OSReport(); extern "C" void* __nw__FUl(); diff --git a/libs/JSystem/J3DU/J3DUClipper.cpp b/libs/JSystem/J3DU/J3DUClipper.cpp index 74cca366490..7e19fc77b1b 100644 --- a/libs/JSystem/J3DU/J3DUClipper.cpp +++ b/libs/JSystem/J3DU/J3DUClipper.cpp @@ -24,8 +24,6 @@ struct J3DUClipper { // Forward References: // -extern "C" extern char const* const J3DUClipper__stringBase0; - extern "C" void init__11J3DUClipperFv(); extern "C" void calcViewFrustum__11J3DUClipperFv(); extern "C" void clip__11J3DUClipperCFPA4_Cf3Vecf(); @@ -49,10 +47,10 @@ extern "C" void tan(); /* ############################################################################################## */ /* 80455278-8045527C 0004+00 s=1 e=0 z=0 None .sdata2 @893 */ -SECTION_SDATA2 static u32 lit_893 = 0x3F800000; +SECTION_SDATA2 static f32 lit_893 = 1.0f; /* 8045527C-80455280 0004+00 s=1 e=0 z=0 None .sdata2 @894 */ -SECTION_SDATA2 static u32 lit_894 = 0x47C35000; +SECTION_SDATA2 static f32 lit_894 = 100000.0f; /* 80273778-8027378C 0014+00 s=0 e=1 z=0 None .text init__11J3DUClipperFv */ #pragma push @@ -91,10 +89,10 @@ SECTION_RODATA static u8 const lit_902[12] = { }; /* 80455280-80455284 0004+00 s=1 e=0 z=0 None .sdata2 @913 */ -SECTION_SDATA2 static u32 lit_913 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_913 = 0.01745329238474369f; /* 80455284-80455288 0004+00 s=1 e=0 z=0 None .sdata2 @914 */ -SECTION_SDATA2 static u32 lit_914 = 0x3F000000; +SECTION_SDATA2 static f32 lit_914 = 0.5f; /* 8027378C-802738FC 0170+00 s=0 e=3 z=4 None .text calcViewFrustum__11J3DUClipperFv */ #pragma push @@ -118,16 +116,10 @@ asm void J3DUClipper::clip(f32 const (*param_0)[4], Vec param_1, f32 param_2) co /* ############################################################################################## */ /* 80455288-80455290 0004+04 s=1 e=0 z=0 None .sdata2 @991 */ -SECTION_SDATA2 static u8 lit_991[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_991[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80273A44-80273E08 03C4+00 s=0 e=3 z=2 None .text clip__11J3DUClipperCFPA4_CfP3VecP3Vec */ diff --git a/libs/JSystem/JAudio2/JAIAudible.cpp b/libs/JSystem/JAudio2/JAIAudible.cpp index fc20b3cdd0b..e882582d3a6 100644 --- a/libs/JSystem/JAudio2/JAIAudible.cpp +++ b/libs/JSystem/JAudio2/JAIAudible.cpp @@ -19,8 +19,6 @@ struct JAIAudible { // Forward References: // -extern "C" extern void* __vt__10JAIAudible[5 + 1 /* padding */]; - extern "C" void __dt__10JAIAudibleFv(); extern "C" extern void* __vt__10JAIAudible[5 + 1 /* padding */]; diff --git a/libs/JSystem/JAudio2/JAIAudience.cpp b/libs/JSystem/JAudio2/JAIAudience.cpp index 539957243b9..893f3b7d64e 100644 --- a/libs/JSystem/JAudio2/JAIAudience.cpp +++ b/libs/JSystem/JAudio2/JAIAudience.cpp @@ -19,8 +19,6 @@ struct JAIAudience { // Forward References: // -extern "C" extern void* __vt__11JAIAudience[8]; - extern "C" void __dt__11JAIAudienceFv(); extern "C" extern void* __vt__11JAIAudience[8]; diff --git a/libs/JSystem/JAudio2/JAISe.cpp b/libs/JSystem/JAudio2/JAISe.cpp index 83368ad8ce6..d7f66379172 100644 --- a/libs/JSystem/JAudio2/JAISe.cpp +++ b/libs/JSystem/JAudio2/JAISe.cpp @@ -89,8 +89,6 @@ struct JAISe { // Forward References: // -extern "C" extern void* __vt__5JAISe[22]; - extern "C" void func_8029F03C(); extern "C" void mixOut___5JAISeFRC14JASSoundParams(); extern "C" void stopTrack___5JAISeFv(); @@ -179,7 +177,7 @@ SECTION_DATA void* __vt__5JAISe[22] = { }; /* 80455778-8045577C 0004+00 s=2 e=0 z=0 None .sdata2 @626 */ -SECTION_SDATA2 static u32 lit_626 = 0x3F800000; +SECTION_SDATA2 static f32 lit_626 = 1.0f; /* 8045577C-80455780 0004+00 s=2 e=0 z=0 None .sdata2 @627 */ SECTION_SDATA2 static u8 lit_627[4] = { @@ -190,7 +188,7 @@ SECTION_SDATA2 static u8 lit_627[4] = { }; /* 80455780-80455784 0004+00 s=2 e=0 z=0 None .sdata2 @628 */ -SECTION_SDATA2 static u32 lit_628 = 0x3F000000; +SECTION_SDATA2 static f32 lit_628 = 0.5f; /* 8029F03C-8029F0F8 00BC+00 s=0 e=1 z=0 None .text * __ct__5JAISeFP8JAISeMgrP27JAISoundStrategyMgr<5JAISe>Ul */ @@ -235,7 +233,7 @@ asm void JAISe::startTrack_(JASSoundParams const& param_0) { /* ############################################################################################## */ /* 80455784-80455788 0004+00 s=2 e=0 z=0 None .sdata2 @736 */ -SECTION_SDATA2 static u32 lit_736 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_736 = 1.0f / 100.0f; /* 8029F304-8029F4CC 01C8+00 s=0 e=1 z=0 None .text * JAISeCategoryMgr_mixOut___5JAISeFbRC14JASSoundParams16JAISoundActivity */ diff --git a/libs/JSystem/JAudio2/JAISeMgr.cpp b/libs/JSystem/JAudio2/JAISeMgr.cpp index b91e2f76d58..d84f30817f7 100644 --- a/libs/JSystem/JAudio2/JAISeMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeMgr.cpp @@ -127,11 +127,6 @@ struct JAISe { // Forward References: // -extern "C" extern char const* const JAISeMgr__stringBase0; -extern "C" extern void* __vt__8JAISeMgr[5]; -extern "C" extern void* __vt__16JAISeCategoryMgr[5]; -extern "C" extern u8 data_80434084[16 + 4 /* padding */]; - extern "C" void isUsingSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion(); extern "C" void releaseSeqData__16JAISeCategoryMgrFRC16JAISeqDataRegion(); extern "C" void JAISeMgr_calc___16JAISeCategoryMgrFv(); @@ -172,11 +167,6 @@ extern "C" extern u8 data_80434084[16 + 4 /* padding */]; void JASReport(char const*, ...); void operator delete(void*); -extern "C" extern void* __vt__5JAISe[22]; -extern "C" extern void* __vt__14JAISeqDataUser[5 + 1 /* padding */]; -extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80450B6C[4]; -extern "C" extern u8 data_80451310[8]; extern "C" void __dt__16JAISeCategoryMgrFv(); extern "C" void __ct__17JASGenericMemPoolFv(); @@ -283,7 +273,7 @@ asm JASMemPool__template0::~JASMemPool__template0() { /* ############################################################################################## */ /* 80455788-8045578C 0004+00 s=1 e=0 z=0 None .sdata2 @822 */ -SECTION_SDATA2 static u32 lit_822 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_822 = 1.0f / 100.0f; /* 8029FC88-8029FD40 00B8+00 s=1 e=0 z=0 None .text * JAISeMgr_acceptsNewSe___16JAISeCategoryMgrCFUl */ @@ -349,7 +339,7 @@ asm void JAISeCategoryMgr::pause(bool param_0) { /* ############################################################################################## */ /* 8045578C-80455790 0004+00 s=4 e=0 z=0 None .sdata2 @1040 */ -SECTION_SDATA2 static u32 lit_1040 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1040 = 1.0f; /* 80455790-80455794 0004+00 s=4 e=0 z=0 None .sdata2 @1041 */ SECTION_SDATA2 static u8 lit_1041[4] = { @@ -360,7 +350,7 @@ SECTION_SDATA2 static u8 lit_1041[4] = { }; /* 80455794-80455798 0004+00 s=4 e=0 z=0 None .sdata2 @1042 */ -SECTION_SDATA2 static u32 lit_1042 = 0x3F000000; +SECTION_SDATA2 static f32 lit_1042 = 0.5f; /* 8029FF18-802A0074 015C+00 s=1 e=0 z=0 None .text * JAISeMgr_mixOut___16JAISeCategoryMgrFRC18JAISoundParamsMove16JAISoundActivity */ diff --git a/libs/JSystem/JAudio2/JAISeq.cpp b/libs/JSystem/JAudio2/JAISeq.cpp index 88b023a0944..47563cbac16 100644 --- a/libs/JSystem/JAudio2/JAISeq.cpp +++ b/libs/JSystem/JAudio2/JAISeq.cpp @@ -120,9 +120,6 @@ struct JAISeq { // Forward References: // -extern "C" extern void* __vt__6JAISeq[12 + 1 /* padding */]; -extern "C" extern u8 data_804340B0[16]; - extern "C" static void func_802A0A6C(); extern "C" void func_802A0A8C(); extern "C" void func_802A0B64(); @@ -152,9 +149,6 @@ extern "C" extern u8 data_804340B0[16]; // void operator delete(void*); -extern "C" extern u8 data_80431B04[16 + 4 /* padding */]; -extern "C" extern u8 struct_80451230[8]; -extern "C" extern u8 data_80451318[8]; extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void __dt__17JASGenericMemPoolFv(); @@ -249,7 +243,7 @@ SECTION_DATA void* __vt__6JAISeq[12 + 1 /* padding */] = { }; /* 80455798-8045579C 0004+00 s=3 e=0 z=0 None .sdata2 @642 */ -SECTION_SDATA2 static u32 lit_642 = 0x3F800000; +SECTION_SDATA2 static f32 lit_642 = 1.0f; /* 8045579C-804557A0 0004+00 s=4 e=0 z=0 None .sdata2 @643 */ SECTION_SDATA2 static u8 lit_643[4] = { diff --git a/libs/JSystem/JAudio2/JAISeqDataMgr.cpp b/libs/JSystem/JAudio2/JAISeqDataMgr.cpp index 62f3fe064a1..fb0821a5e3d 100644 --- a/libs/JSystem/JAudio2/JAISeqDataMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeqDataMgr.cpp @@ -23,9 +23,6 @@ struct JAISeqDataMgr { // Forward References: // -extern "C" extern void* __vt__13JAISeqDataMgr[6]; -extern "C" extern void* __vt__14JAISeqDataUser[5 + 1 /* padding */]; - extern "C" void __dt__14JAISeqDataUserFv(); extern "C" void __dt__13JAISeqDataMgrFv(); extern "C" extern void* __vt__13JAISeqDataMgr[6]; diff --git a/libs/JSystem/JAudio2/JAISeqMgr.cpp b/libs/JSystem/JAudio2/JAISeqMgr.cpp index 959ddb87124..fcd67f85e42 100644 --- a/libs/JSystem/JAudio2/JAISeqMgr.cpp +++ b/libs/JSystem/JAudio2/JAISeqMgr.cpp @@ -66,8 +66,6 @@ struct JAISound { /* 802A24DC */ void stop(u32); }; -struct JAISeqDataRegion {}; - struct JAISeqMgr; struct JAIAudience {}; @@ -79,6 +77,8 @@ struct JAISeq { /* 802A14FC */ void JAISeqMgr_mixOut_(JASSoundParams const&, JAISoundActivity); }; +struct JAISeqDataRegion {}; + struct JAISeqMgr { /* 802A1804 */ void isUsingSeqData(JAISeqDataRegion const&); /* 802A1870 */ void releaseSeqData(JAISeqDataRegion const&); @@ -103,9 +103,6 @@ struct JAISeqDataUser { // Forward References: // -extern "C" extern void* __vt__9JAISeqMgr[5 + 1 /* padding */]; -extern "C" extern u8 data_804340CC[16 + 4 /* padding */]; - extern "C" void isUsingSeqData__9JAISeqMgrFRC16JAISeqDataRegion(); extern "C" void releaseSeqData__9JAISeqMgrFRC16JAISeqDataRegion(); extern "C" void __ct__9JAISeqMgrFb(); @@ -128,11 +125,6 @@ extern "C" extern u8 data_804340CC[16 + 4 /* padding */]; // void operator delete(void*); -extern "C" extern void* __vt__6JAISeq[12 + 1 /* padding */]; -extern "C" extern void* __vt__14JAISeqDataUser[5 + 1 /* padding */]; -extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80450B68[4]; -extern "C" extern u8 data_80451320[8]; extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void __dt__17JASGenericMemPoolFv(); @@ -203,7 +195,7 @@ SECTION_DATA void* __vt__9JAISeqMgr[5 + 1 /* padding */] = { }; /* 804557A8-804557AC 0004+00 s=1 e=0 z=0 None .sdata2 @691 */ -SECTION_SDATA2 static u32 lit_691 = 0x3F800000; +SECTION_SDATA2 static f32 lit_691 = 1.0f; /* 804557AC-804557B0 0004+00 s=1 e=0 z=0 None .sdata2 @692 */ SECTION_SDATA2 static u8 lit_692[4] = { diff --git a/libs/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/JAudio2/JAISound.cpp index a8d163d1e88..7a4025bfefc 100644 --- a/libs/JSystem/JAudio2/JAISound.cpp +++ b/libs/JSystem/JAudio2/JAISound.cpp @@ -65,8 +65,6 @@ struct JAISound { // Forward References: // -extern "C" extern char const* const JAISound__stringBase0; - extern "C" void releaseSound__14JAISoundHandleFv(); extern "C" void releaseHandle__8JAISoundFv(); extern "C" void attachHandle__8JAISoundFP14JAISoundHandle(); @@ -157,7 +155,7 @@ asm void JAISoundStatus_::unlockIfLocked() { /* ############################################################################################## */ /* 804557B8-804557BC 0004+00 s=3 e=0 z=0 None .sdata2 @659 */ -SECTION_SDATA2 static u32 lit_659 = 0x3F000000; +SECTION_SDATA2 static f32 lit_659 = 0.5f; /* 802A2280-802A22F8 0078+00 s=0 e=4 z=0 None .text * mixOutAll__14JAISoundParamsFRC14JASSoundParamsP14JASSoundParamsf */ @@ -189,19 +187,13 @@ SECTION_DATA static void* __vt__8JAISound[12] = { }; /* 804557BC-804557C0 0004+00 s=2 e=0 z=0 None .sdata2 @697 */ -SECTION_SDATA2 static u32 lit_697 = 0x3F800000; +SECTION_SDATA2 static f32 lit_697 = 1.0f; /* 804557C0-804557C8 0004+04 s=4 e=0 z=0 None .sdata2 @698 */ -SECTION_SDATA2 static u8 lit_698[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_698[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 802A22F8-802A2328 0030+00 s=0 e=3 z=0 None .text __ct__8JAISoundFv */ @@ -251,9 +243,7 @@ asm void JAISound::newAudible(JGeometry::TVec3 const& param_0, /* ############################################################################################## */ /* 804557C8-804557D0 0008+00 s=1 e=0 z=0 None .sdata2 @766 */ -SECTION_SDATA2 static u8 lit_766[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_766 = 4503599627370496.0 /* cast u32 to float */; /* 802A24DC-802A2598 00BC+00 s=0 e=24 z=0 None .text stop__8JAISoundFUl */ #pragma push diff --git a/libs/JSystem/JAudio2/JAISoundChild.cpp b/libs/JSystem/JAudio2/JAISoundChild.cpp index e98794dfd1f..a9218e45a49 100644 --- a/libs/JSystem/JAudio2/JAISoundChild.cpp +++ b/libs/JSystem/JAudio2/JAISoundChild.cpp @@ -43,7 +43,7 @@ extern "C" void assignExtBuffer__8JASTrackFUlP14JASSoundParams(); /* ############################################################################################## */ /* 804557D8-804557DC 0004+00 s=1 e=0 z=0 None .sdata2 @689 */ -SECTION_SDATA2 static u32 lit_689 = 0x3F800000; +SECTION_SDATA2 static f32 lit_689 = 1.0f; /* 804557DC-804557E0 0004+00 s=1 e=0 z=0 None .sdata2 @690 */ SECTION_SDATA2 static u8 lit_690[4] = { diff --git a/libs/JSystem/JAudio2/JAISoundInfo.cpp b/libs/JSystem/JAudio2/JAISoundInfo.cpp index ac1d032cf6a..96a6f615a4e 100644 --- a/libs/JSystem/JAudio2/JAISoundInfo.cpp +++ b/libs/JSystem/JAudio2/JAISoundInfo.cpp @@ -28,7 +28,6 @@ extern "C" void __dt__12JAISoundInfoFv(); // void operator delete(void*); -extern "C" extern u8 data_80450B5C[4]; extern "C" void __dl__FPv(); extern "C" extern u8 data_80450B5C[4]; diff --git a/libs/JSystem/JAudio2/JAISoundParams.cpp b/libs/JSystem/JAudio2/JAISoundParams.cpp index ea83690cdb2..5be7825c2d3 100644 --- a/libs/JSystem/JAudio2/JAISoundParams.cpp +++ b/libs/JSystem/JAudio2/JAISoundParams.cpp @@ -39,9 +39,7 @@ extern "C" void moveDolby__18JAISoundParamsMoveFfUl(); /* ############################################################################################## */ /* 804557E8-804557F0 0008+00 s=5 e=0 z=0 None .sdata2 @292 */ -SECTION_SDATA2 static u8 lit_292[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_292 = 4503599627370496.0 /* cast u32 to float */; /* 802A2DB4-802A2E0C 0058+00 s=0 e=40 z=0 None .text moveVolume__18JAISoundParamsMoveFfUl */ #pragma push diff --git a/libs/JSystem/JAudio2/JAISoundStarter.cpp b/libs/JSystem/JAudio2/JAISoundStarter.cpp index 9c6351bc7b5..11af7c38f3d 100644 --- a/libs/JSystem/JAudio2/JAISoundStarter.cpp +++ b/libs/JSystem/JAudio2/JAISoundStarter.cpp @@ -41,7 +41,6 @@ extern "C" void func_802A2FEC(); // void operator delete(void*); -extern "C" extern u8 data_80450B78[4]; extern "C" void __dl__FPv(); extern "C" extern u8 data_80450B78[4]; diff --git a/libs/JSystem/JAudio2/JAIStream.cpp b/libs/JSystem/JAudio2/JAIStream.cpp index 78dd4321708..1b71ad6e201 100644 --- a/libs/JSystem/JAudio2/JAIStream.cpp +++ b/libs/JSystem/JAudio2/JAIStream.cpp @@ -49,17 +49,17 @@ struct JASAramStream { struct JAIStreamMgr {}; -struct JAISoundID {}; - struct JAISoundActivity {}; -struct JAIAudience {}; +struct JAISoundID {}; template struct JAISoundStrategyMgr {}; /* JAISoundStrategyMgr */ struct JAISoundStrategyMgr__template2 {}; +struct JAIAudience {}; + struct JAIStream { /* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr*); /* 802A319C */ void JAIStreamMgr_startID_(JAISoundID, s32, JGeometry::TVec3 const*, @@ -104,7 +104,6 @@ struct JAISound { // static void JAIStream_JASAramStreamCallback_(u32, JASAramStream*, void*); -extern "C" extern void* __vt__9JAIStream[12]; extern "C" static void JAIStream_JASAramStreamCallback___FUlP13JASAramStreamPv(); extern "C" void func_802A3104(); @@ -129,9 +128,6 @@ extern "C" extern void* __vt__9JAIStream[12]; // External References: // -extern "C" extern u8 data_804340B0[16]; -extern "C" extern u8 data_80451318[8]; - extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void alloc__17JASGenericMemPoolFUl(); extern "C" void free__17JASGenericMemPoolFPvUl(); @@ -251,7 +247,7 @@ asm void JAIStream::prepare_startStream_() { /* ############################################################################################## */ /* 804557F0-804557F4 0004+00 s=2 e=0 z=0 None .sdata2 @864 */ -SECTION_SDATA2 static u32 lit_864 = 0x3F800000; +SECTION_SDATA2 static f32 lit_864 = 1.0f; /* 804557F4-804557F8 0004+00 s=2 e=0 z=0 None .sdata2 @865 */ SECTION_SDATA2 static u8 lit_865[4] = { diff --git a/libs/JSystem/JAudio2/JAIStreamDataMgr.cpp b/libs/JSystem/JAudio2/JAIStreamDataMgr.cpp index 7546544e08d..59603e73117 100644 --- a/libs/JSystem/JAudio2/JAIStreamDataMgr.cpp +++ b/libs/JSystem/JAudio2/JAIStreamDataMgr.cpp @@ -23,9 +23,6 @@ struct JAIStreamAramMgr { // Forward References: // -extern "C" extern void* __vt__16JAIStreamAramMgr[5]; -extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */]; - extern "C" void __dt__16JAIStreamDataMgrFv(); extern "C" void __dt__16JAIStreamAramMgrFv(); extern "C" extern void* __vt__16JAIStreamAramMgr[5]; diff --git a/libs/JSystem/JAudio2/JAIStreamMgr.cpp b/libs/JSystem/JAudio2/JAIStreamMgr.cpp index cdacbd7f957..0fca9a8bed9 100644 --- a/libs/JSystem/JAudio2/JAIStreamMgr.cpp +++ b/libs/JSystem/JAudio2/JAIStreamMgr.cpp @@ -62,13 +62,13 @@ struct JAIStreamMgr { struct JAISoundActivity {}; -struct JAIAudience {}; - template struct JAISoundStrategyMgr {}; /* JAISoundStrategyMgr */ struct JAISoundStrategyMgr__template2 {}; +struct JAIAudience {}; + struct JAIStream { /* 802A3104 */ JAIStream(JAIStreamMgr*, JAISoundStrategyMgr*); /* 802A319C */ void JAIStreamMgr_startID_(JAISoundID, s32, JGeometry::TVec3 const*, @@ -87,8 +87,6 @@ struct JAISound { // Forward References: // -extern "C" extern u8 data_804340FC[16 + 4 /* padding */]; - extern "C" void __ct__12JAIStreamMgrFb(); extern "C" void func_802A3C3C(); extern "C" void freeDeadStream___12JAIStreamMgrFv(); @@ -106,10 +104,6 @@ extern "C" extern u8 data_804340FC[16 + 4 /* padding */]; // void operator delete(void*); -extern "C" extern void* __vt__9JAIStream[12]; -extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80450B64[4]; -extern "C" extern u8 data_80451328[8]; extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void __dt__17JASGenericMemPoolFv(); @@ -143,7 +137,7 @@ extern "C" extern u8 data_80451328[8]; /* ############################################################################################## */ /* 80455800-80455804 0004+00 s=1 e=0 z=0 None .sdata2 @653 */ -SECTION_SDATA2 static u32 lit_653 = 0x3F800000; +SECTION_SDATA2 static f32 lit_653 = 1.0f; /* 80455804-80455808 0004+00 s=1 e=0 z=0 None .sdata2 @654 */ SECTION_SDATA2 static u8 lit_654[4] = { diff --git a/libs/JSystem/JAudio2/JASAiCtrl.cpp b/libs/JSystem/JAudio2/JASAiCtrl.cpp index 39f84f8e149..2c171aa5115 100644 --- a/libs/JSystem/JAudio2/JASAiCtrl.cpp +++ b/libs/JSystem/JAudio2/JASAiCtrl.cpp @@ -81,8 +81,6 @@ struct JASCalc { // Forward References: // -extern "C" extern char const* const JASAiCtrl__stringBase0; - extern "C" void initAI__9JASDriverFPFv_v(); extern "C" void startDMA__9JASDriverFv(); extern "C" void stopDMA__9JASDriverFv(); @@ -109,9 +107,6 @@ extern "C" extern char const* const JASAiCtrl__stringBase0; void JASReport(char const*, ...); void* operator new[](u32, JKRHeap*, int); -extern "C" extern u8 sFreeRunLfo__6JASLfo[24]; -extern "C" extern u8 JASDram[4]; -extern "C" extern u8 snIntCount__14JASAudioThread[4 + 4 /* padding */]; extern "C" void imixcopy__7JASCalcFPCsPCsPsUl(); extern "C" void bzero__7JASCalcFPvUl(); @@ -226,19 +221,19 @@ asm void JASDriver::stopDMA() { SECTION_SDATA static u32 sMixMode__9JASDriver = 0x00000002; /* 804507B0-804507B4 0004+00 s=2 e=0 z=0 None .sdata sDacRate__9JASDriver */ -SECTION_SDATA static u32 sDacRate__9JASDriver = 0x46FA3900; +SECTION_SDATA static f32 sDacRate__9JASDriver = 32028.5f; /* 804507B4-804507B8 0004+00 s=4 e=0 z=0 None .sdata sSubFrames__9JASDriver */ SECTION_SDATA static u32 sSubFrames__9JASDriver = 0x00000007; /* 80455720-80455724 0004+00 s=1 e=0 z=0 None .sdata2 @233 */ -SECTION_SDATA2 static u32 lit_233 = 0x46FA0000; +SECTION_SDATA2 static f32 lit_233 = 32000.0f; /* 80455724-80455728 0004+00 s=1 e=0 z=0 None .sdata2 @234 */ -SECTION_SDATA2 static u32 lit_234 = 0x473B8000; +SECTION_SDATA2 static f32 lit_234 = 48000.0f; /* 80455728-8045572C 0004+00 s=1 e=0 z=0 None .sdata2 @235 */ -SECTION_SDATA2 static u32 lit_235 = 0x3F801D27; +SECTION_SDATA2 static f32 lit_235 = 1.0008896589279175f; /* 8029C524-8029C568 0044+00 s=1 e=0 z=0 None .text setOutputRate__9JASDriverF13JASOutputRate */ @@ -307,7 +302,7 @@ static u8 old_time[4]; static u8 data_804512D4[4]; /* 8045572C-80455730 0004+00 s=1 e=0 z=0 None .sdata2 @275 */ -SECTION_SDATA2 static u32 lit_275 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_275 = 11.0f / 10.0f; /* 80455730-80455738 0004+04 s=1 e=0 z=0 None .sdata2 @276 */ SECTION_SDATA2 static f32 lit_276[1 + 1 /* padding */] = { @@ -317,9 +312,7 @@ SECTION_SDATA2 static f32 lit_276[1 + 1 /* padding */] = { }; /* 80455738-80455740 0008+00 s=1 e=0 z=0 None .sdata2 @278 */ -SECTION_SDATA2 static u8 lit_278[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_278 = 4503599627370496.0 /* cast u32 to float */; /* 8029C6C4-8029C7E0 011C+00 s=1 e=1 z=0 None .text updateDSP__9JASDriverFv */ #pragma push diff --git a/libs/JSystem/JAudio2/JASAramStream.cpp b/libs/JSystem/JAudio2/JASAramStream.cpp index 61ee7908e34..0cc8d01623a 100644 --- a/libs/JSystem/JAudio2/JASAramStream.cpp +++ b/libs/JSystem/JAudio2/JASAramStream.cpp @@ -93,10 +93,6 @@ struct JASAramStream { // Forward References: // -extern "C" extern u8 data_80431B34[16 + 4 /* padding */]; -extern "C" extern u8 sBlockSize__13JASAramStream[4]; -extern "C" extern u8 struct_80451260[8]; - extern "C" void initSystem__13JASAramStreamFUlUl(); extern "C" void __ct__13JASAramStreamFv(); extern "C" void init__13JASAramStreamFUlUlPFUlP13JASAramStreamPv_vPv(); @@ -131,9 +127,6 @@ extern "C" extern u8 struct_80451260[8]; void* operator new[](u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sBankDisposeList__10JASChannel[64]; -extern "C" extern u8 lit_556[12 + 4 /* padding */]; -extern "C" extern u8 JASDram[4]; extern "C" void sendCmdMsg__13JASTaskThreadFPFPv_vPCvUl(); extern "C" void sendCmdMsg__13JASTaskThreadFPFPv_vPv(); @@ -215,10 +208,10 @@ SECTION_SDATA2 static u8 lit_390[4] = { }; /* 80455614-80455618 0004+00 s=2 e=0 z=0 None .sdata2 @391 */ -SECTION_SDATA2 static u32 lit_391 = 0x3F800000; +SECTION_SDATA2 static f32 lit_391 = 1.0f; /* 80455618-8045561C 0004+00 s=2 e=0 z=0 None .sdata2 @392 */ -SECTION_SDATA2 static u32 lit_392 = 0x3F000000; +SECTION_SDATA2 static f32 lit_392 = 0.5f; /* 802963A8-8029649C 00F4+00 s=0 e=1 z=0 None .text __ct__13JASAramStreamFv */ #pragma push @@ -354,12 +347,10 @@ asm void JASAramStream::prepareFinishTask(void* param_0) { /* ############################################################################################## */ /* 8045561C-80455620 0004+00 s=1 e=0 z=0 None .sdata2 @531 */ -SECTION_SDATA2 static u32 lit_531 = 0x42FE0000; +SECTION_SDATA2 static f32 lit_531 = 127.0f; /* 80455620-80455628 0008+00 s=3 e=0 z=0 None .sdata2 @533 */ -SECTION_SDATA2 static u8 lit_533[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_533 = 4503599627370496.0 /* cast u32 to float */; /* 80296920-80296AE8 01C8+00 s=1 e=0 z=0 None .text headerLoad__13JASAramStreamFUli */ #pragma push diff --git a/libs/JSystem/JAudio2/JASAudioReseter.cpp b/libs/JSystem/JAudio2/JASAudioReseter.cpp index ca601681cbc..8cc92ba5e4e 100644 --- a/libs/JSystem/JAudio2/JASAudioReseter.cpp +++ b/libs/JSystem/JAudio2/JASAudioReseter.cpp @@ -53,7 +53,6 @@ extern "C" void callback__15JASAudioReseterFPv(); // void operator delete(void*); -extern "C" extern u8 data_80450B8C[4]; extern "C" void stop__14JASAudioThreadFv(); extern "C" void drop__13JASDSPChannelFv(); @@ -122,9 +121,7 @@ asm void JASAudioReseter::checkDone() const { /* ############################################################################################## */ /* 80455740-80455748 0008+00 s=1 e=0 z=0 None .sdata2 @156 */ -SECTION_SDATA2 static u8 lit_156[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_156 = 4503599627370496.0 /* cast u32 to float */; /* 8029D200-8029D2D4 00D4+00 s=1 e=0 z=0 None .text calc__15JASAudioReseterFv */ #pragma push diff --git a/libs/JSystem/JAudio2/JASAudioThread.cpp b/libs/JSystem/JAudio2/JASAudioThread.cpp index 615d70756ed..b552468269c 100644 --- a/libs/JSystem/JAudio2/JASAudioThread.cpp +++ b/libs/JSystem/JAudio2/JASAudioThread.cpp @@ -69,9 +69,6 @@ struct JASAudioThread { // Forward References: // -extern "C" extern char const* const JASAudioThread__stringBase0; -extern "C" extern u8 snIntCount__14JASAudioThread[4 + 4 /* padding */]; - extern "C" void __ct__14JASAudioThreadFiiUl(); extern "C" void create__14JASAudioThreadFl(); extern "C" void stop__14JASAudioThreadFv(); @@ -88,12 +85,6 @@ extern "C" extern u8 snIntCount__14JASAudioThread[4 + 4 /* padding */]; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 data_80431B34[16 + 4 /* padding */]; -extern "C" extern u8 data_80450B8C[4]; -extern "C" extern u8 JASDram[4]; -extern "C" extern u8 struct_80451260[8]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void newMemPool__17JASGenericMemPoolFUli(); diff --git a/libs/JSystem/JAudio2/JASBNKParser.cpp b/libs/JSystem/JAudio2/JASBNKParser.cpp index 017bebd4fb6..7fc2bc4a1f2 100644 --- a/libs/JSystem/JAudio2/JASBNKParser.cpp +++ b/libs/JSystem/JAudio2/JASBNKParser.cpp @@ -119,7 +119,6 @@ extern "C" void __sinit_JASBNKParser_cpp(); void* operator new(u32, JKRHeap*, int); void* operator new[](u32, JKRHeap*, int); -extern "C" extern u8 JASDram[4]; extern "C" void bcopy__7JASCalcFPCvPvUl(); extern "C" void __ct__17JASGenericMemPoolFv(); @@ -199,9 +198,7 @@ SECTION_SDATA2 static f32 lit_835[1 + 1 /* padding */] = { }; /* 80455660-80455668 0008+00 s=1 e=0 z=0 None .sdata2 @838 */ -SECTION_SDATA2 static u8 lit_838[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_838 = 4503599627370496.0 /* cast u32 to float */; /* 8029963C-80299A3C 0400+00 s=1 e=0 z=0 None .text * createBasicBank__Q212JASBNKParser4Ver1FPCvP7JKRHeap */ @@ -216,9 +213,7 @@ asm void JASBNKParser::Ver1::createBasicBank(void const* param_0, JKRHeap* param /* ############################################################################################## */ /* 80455668-80455670 0008+00 s=1 e=0 z=0 None .sdata2 @990 */ -SECTION_SDATA2 static u8 lit_990[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_990 = 4503601774854144.0 /* cast s32 to float */; /* 80299A3C-80299E68 042C+00 s=1 e=0 z=0 None .text * createBasicBank__Q212JASBNKParser4Ver0FPCvP7JKRHeap */ @@ -233,7 +228,7 @@ asm void JASBNKParser::Ver0::createBasicBank(void const* param_0, JKRHeap* param /* ############################################################################################## */ /* 80455670-80455674 0004+00 s=1 e=0 z=0 None .sdata2 @1045 */ -SECTION_SDATA2 static u32 lit_1045 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1045 = 1.0f; /* 80455674-80455678 0004+00 s=1 e=0 z=0 None .sdata2 @1046 */ SECTION_SDATA2 static u8 lit_1046[4] = { diff --git a/libs/JSystem/JAudio2/JASBank.cpp b/libs/JSystem/JAudio2/JASBank.cpp index 6f9598e1a93..e8aa8be4816 100644 --- a/libs/JSystem/JAudio2/JASBank.cpp +++ b/libs/JSystem/JAudio2/JASBank.cpp @@ -59,11 +59,6 @@ extern "C" void noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelP // External References: // -extern "C" extern u8 data_80431B34[16 + 4 /* padding */]; -extern "C" extern u8 sBankDisposeList__10JASChannel[64]; -extern "C" extern u8 lit_556[12 + 4 /* padding */]; -extern "C" extern u8 struct_80451260[8]; - extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void alloc__17JASGenericMemPoolFUl(); extern "C" void func_802978DC(); @@ -92,7 +87,7 @@ extern "C" extern u8 struct_80451260[8]; static u8 lit_156[12 + 4 /* padding */]; /* 80455630-80455634 0004+00 s=1 e=0 z=0 None .sdata2 @248 */ -SECTION_SDATA2 static u32 lit_248 = 0x3F800000; +SECTION_SDATA2 static f32 lit_248 = 1.0f; /* 80455634-80455638 0004+00 s=1 e=0 z=0 None .sdata2 @249 */ SECTION_SDATA2 static u8 lit_249[4] = { @@ -103,7 +98,7 @@ SECTION_SDATA2 static u8 lit_249[4] = { }; /* 80455638-8045563C 0004+00 s=1 e=0 z=0 None .sdata2 @250 */ -SECTION_SDATA2 static u32 lit_250 = 0x3F000000; +SECTION_SDATA2 static f32 lit_250 = 0.5f; /* 80297930-80297C40 0310+00 s=0 e=1 z=0 None .text * noteOn__7JASBankFPC7JASBankiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv */ @@ -136,7 +131,7 @@ SECTION_RODATA static void* const OSC_ENV[6 + 1 /* padding */] = { }; /* 8045563C-80455640 0004+00 s=1 e=0 z=0 None .sdata2 @290 */ -SECTION_SDATA2 static u32 lit_290 = 0x4682C008; +SECTION_SDATA2 static f32 lit_290 = 16736.015625f; /* 80297C40-80297D78 0138+00 s=1 e=0 z=0 None .text * noteOnOsc__7JASBankFiUcUcUsPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv */ diff --git a/libs/JSystem/JAudio2/JASBasicBank.cpp b/libs/JSystem/JAudio2/JASBasicBank.cpp index 68eafb4b663..30098237747 100644 --- a/libs/JSystem/JAudio2/JASBasicBank.cpp +++ b/libs/JSystem/JAudio2/JASBasicBank.cpp @@ -39,8 +39,6 @@ struct JASBank { // Forward References: // -extern "C" extern void* __vt__7JASBank[5]; - extern "C" void __ct__12JASBasicBankFv(); extern "C" void newInstTable__12JASBasicBankFUcP7JKRHeap(); extern "C" void getInstParam__12JASBasicBankCFiiiP12JASInstParam(); diff --git a/libs/JSystem/JAudio2/JASBasicInst.cpp b/libs/JSystem/JAudio2/JASBasicInst.cpp index 1bab912a0ea..95e4461053e 100644 --- a/libs/JSystem/JAudio2/JASBasicInst.cpp +++ b/libs/JSystem/JAudio2/JASBasicInst.cpp @@ -46,8 +46,6 @@ struct JASBasicInst { // Forward References: // -extern "C" extern void* __vt__7JASInst[5]; - extern "C" void __ct__12JASBasicInstFv(); extern "C" void __dt__12JASBasicInstFv(); extern "C" void getParam__12JASBasicInstCFiiP12JASInstParam(); diff --git a/libs/JSystem/JAudio2/JASBasicWaveBank.cpp b/libs/JSystem/JAudio2/JASBasicWaveBank.cpp index 5b8c4b9ec09..6227fe0be59 100644 --- a/libs/JSystem/JAudio2/JASBasicWaveBank.cpp +++ b/libs/JSystem/JAudio2/JASBasicWaveBank.cpp @@ -67,9 +67,6 @@ struct JASBasicWaveBank { // Forward References: // -extern "C" extern void* __vt__13JASWaveHandle[5]; -extern "C" extern void* __vt__11JASWaveBank[6]; - extern "C" void __ct__16JASBasicWaveBankFv(); extern "C" void __dt__16JASBasicWaveBankFv(); extern "C" void __dt__Q216JASBasicWaveBank11TWaveHandleFv(); @@ -105,7 +102,6 @@ extern "C" extern void* __vt__11JASWaveBank[6]; void* operator new[](u32, JKRHeap*, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */]; extern "C" void __ct__10JASWaveArcFv(); extern "C" void __dt__10JASWaveArcFv(); diff --git a/libs/JSystem/JAudio2/JASCalc.cpp b/libs/JSystem/JAudio2/JASCalc.cpp index d80d9b60bef..82b4554b67c 100644 --- a/libs/JSystem/JAudio2/JASCalc.cpp +++ b/libs/JSystem/JAudio2/JASCalc.cpp @@ -28,8 +28,6 @@ struct JASCalc { // Forward References: // -extern "C" extern u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024]; - extern "C" void imixcopy__7JASCalcFPCsPCsPsUl(); extern "C" void bcopyfast__7JASCalcFPCvPvUl(); extern "C" void bcopy__7JASCalcFPCvPvUl(); @@ -43,8 +41,6 @@ extern "C" extern u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024]; // External References: // -extern "C" extern u32 __float_huge; - extern "C" void DCZeroRange(); extern "C" extern u32 __float_huge; @@ -172,9 +168,9 @@ SECTION_RODATA u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024] = { }; /* 8039AFB8-8039AFD0 0018+00 s=1 e=0 z=0 None .rodata __two_to_x$982 */ -SECTION_RODATA static u8 const __two_to_x[24] = { - 0x3F, 0x31, 0x72, 0x18, 0x3E, 0x75, 0xFD, 0xF7, 0x3D, 0x63, 0x57, 0x06, - 0x3C, 0x1D, 0xB2, 0x45, 0x3A, 0xAC, 0x1C, 0x81, 0x39, 0x3F, 0xE5, 0xDA, +SECTION_RODATA static f32 const __two_to_x[6] = { + 0.6931471824645996f, 0.240226611495018f, 0.055502913892269135f, + 0.009625022299587727f, 0.0013131053419783711f, 0.0001830080582294613f, }; /* 80455558-80455560 0004+04 s=1 e=0 z=0 None .sdata2 @847 */ @@ -185,9 +181,7 @@ SECTION_SDATA2 static f32 lit_847[1 + 1 /* padding */] = { }; /* 80455560-80455568 0008+00 s=1 e=0 z=0 None .sdata2 @850 */ -SECTION_SDATA2 static u8 lit_850[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_850 = 4503601774854144.0 /* cast s32 to float */; /* 80455568-8045556C 0004+00 s=1 e=0 z=0 None .sdata2 @969 */ SECTION_SDATA2 static u8 lit_969[4] = { @@ -208,7 +202,7 @@ SECTION_SDATA2 static u8 two_to_frac[8] = { }; /* 8045557C-80455580 0004+00 s=1 e=0 z=0 None .sdata2 @994 */ -SECTION_SDATA2 static u32 lit_994 = 0x3F400000; +SECTION_SDATA2 static f32 lit_994 = 0.75f; /* 80455580-80455588 0004+04 s=1 e=0 z=0 None .sdata2 @995 */ SECTION_SDATA2 static f32 lit_995[1 + 1 /* padding */] = { diff --git a/libs/JSystem/JAudio2/JASChannel.cpp b/libs/JSystem/JAudio2/JASChannel.cpp index c6fc748d919..76bb6020ccd 100644 --- a/libs/JSystem/JAudio2/JASChannel.cpp +++ b/libs/JSystem/JAudio2/JASChannel.cpp @@ -109,9 +109,6 @@ struct JASCalc { // Forward References: // -extern "C" extern u8 sBankDisposeList__10JASChannel[64]; -extern "C" extern u8 lit_556[12 + 4 /* padding */]; - extern "C" void __ct__10JASChannelFPFUlP10JASChannelPQ26JASDsp8TChannelPv_vPv(); extern "C" void __dt__10JASChannelFv(); extern "C" void play__10JASChannelFv(); @@ -141,11 +138,6 @@ extern "C" extern u8 lit_556[12 + 4 /* padding */]; // External References: // -extern "C" extern u8 data_80431B34[16 + 4 /* padding */]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */]; -extern "C" extern u8 struct_80451260[8]; - extern "C" void pow2__7JASCalcFf(); extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void free__17JASGenericMemPoolFPvUl(); @@ -201,7 +193,7 @@ extern "C" extern u8 struct_80451260[8]; /* ############################################################################################## */ /* 80455680-80455684 0004+00 s=6 e=0 z=0 None .sdata2 @544 */ -SECTION_SDATA2 static u32 lit_544 = 0x3F800000; +SECTION_SDATA2 static f32 lit_544 = 1.0f; /* 80455684-80455688 0004+00 s=7 e=0 z=0 None .sdata2 @545 */ SECTION_SDATA2 static u8 lit_545[4] = { @@ -338,9 +330,7 @@ SECTION_DATA static void* lit_662[7] = { }; /* 80455690-80455698 0008+00 s=1 e=0 z=0 None .sdata2 @661 */ -SECTION_SDATA2 static u8 lit_661[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_661 = 0.5; /* 8029ABEC-8029ACD4 00E8+00 s=3 e=0 z=0 None .text * effectOsc__10JASChannelFUlPQ213JASOscillator12EffectParams */ @@ -355,9 +345,7 @@ asm void JASChannel::effectOsc(u32 param_0, JASOscillator::EffectParams* param_1 /* ############################################################################################## */ /* 80455698-804556A0 0008+00 s=3 e=0 z=0 None .sdata2 @685 */ -SECTION_SDATA2 static u8 lit_685[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_685 = 4503601774854144.0 /* cast s32 to float */; /* 8029ACD4-8029AD38 0064+00 s=0 e=1 z=0 None .text setKeySweepTarget__10JASChannelFlUl */ #pragma push @@ -378,9 +366,7 @@ SECTION_SDATA2 static f32 lit_711[1 + 1 /* padding */] = { }; /* 804556A8-804556B0 0008+00 s=4 e=0 z=0 None .sdata2 @714 */ -SECTION_SDATA2 static u8 lit_714[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_714 = 4503599627370496.0 /* cast u32 to float */; /* 8029AD38-8029AF78 0240+00 s=2 e=0 z=0 None .text * updateEffectorParam__10JASChannelFPQ26JASDsp8TChannelPUsRCQ213JASOscillator12EffectParams */ @@ -407,10 +393,10 @@ asm void JASChannel::dspUpdateCallback(u32 param_0, JASDsp::TChannel* param_1, v /* ############################################################################################## */ /* 804556B0-804556B4 0004+00 s=2 e=0 z=0 None .sdata2 @775 */ -SECTION_SDATA2 static u32 lit_775 = 0x41400000; +SECTION_SDATA2 static f32 lit_775 = 12.0f; /* 804556B4-804556B8 0004+00 s=2 e=0 z=0 None .sdata2 @776 */ -SECTION_SDATA2 static u32 lit_776 = 0x45800000; +SECTION_SDATA2 static f32 lit_776 = 4096.0f; /* 8029B004-8029B324 0320+00 s=1 e=0 z=0 None .text * initialUpdateDSPChannel__10JASChannelFPQ26JASDsp8TChannel */ @@ -425,10 +411,10 @@ asm void JASChannel::initialUpdateDSPChannel(JASDsp::TChannel* param_0) { /* ############################################################################################## */ /* 804556B8-804556BC 0004+00 s=1 e=0 z=0 None .sdata2 @832 */ -SECTION_SDATA2 static u32 lit_832 = 0x46FA3900; +SECTION_SDATA2 static f32 lit_832 = 32028.5f; /* 804556BC-804556C0 0004+00 s=1 e=0 z=0 None .sdata2 @833 */ -SECTION_SDATA2 static u32 lit_833 = 0x473B8000; +SECTION_SDATA2 static f32 lit_833 = 48000.0f; /* 8029B324-8029B6A0 037C+00 s=1 e=0 z=0 None .text * updateDSPChannel__10JASChannelFPQ26JASDsp8TChannel */ @@ -443,10 +429,10 @@ asm void JASChannel::updateDSPChannel(JASDsp::TChannel* param_0) { /* ############################################################################################## */ /* 804556C0-804556C4 0004+00 s=1 e=0 z=0 None .sdata2 @846 */ -SECTION_SDATA2 static u32 lit_846 = 0x3F34FDF4; +SECTION_SDATA2 static f32 lit_846 = 0.7070000171661377f; /* 804556C4-804556C8 0004+00 s=1 e=0 z=0 None .sdata2 @847 */ -SECTION_SDATA2 static u32 lit_847 = 0x42FF0000; +SECTION_SDATA2 static f32 lit_847 = 127.5f; /* 8029B6A0-8029B7D8 0138+00 s=1 e=0 z=0 None .text * updateAutoMixer__10JASChannelFPQ26JASDsp8TChannelffff */ @@ -488,16 +474,16 @@ SECTION_DATA static void* lit_974[8 + 1 /* padding */] = { }; /* 804556C8-804556CC 0004+00 s=1 e=0 z=0 None .sdata2 @969 */ -SECTION_SDATA2 static u32 lit_969 = 0xC4A2F983; +SECTION_SDATA2 static f32 lit_969 = -1303.7972412109375f; /* 804556CC-804556D0 0004+00 s=1 e=0 z=0 None .sdata2 @970 */ -SECTION_SDATA2 static u32 lit_970 = 0x44A2F983; +SECTION_SDATA2 static f32 lit_970 = 1303.7972412109375f; /* 804556D0-804556D4 0004+00 s=1 e=0 z=0 None .sdata2 @971 */ -SECTION_SDATA2 static u32 lit_971 = 0x40490FDB; +SECTION_SDATA2 static f32 lit_971 = 3.1415927410125732f; /* 804556D4-804556D8 0004+00 s=1 e=0 z=0 None .sdata2 @972 */ -SECTION_SDATA2 static u32 lit_972 = 0x3EA6F933; +SECTION_SDATA2 static f32 lit_972 = 0.326119989156723f; /* 804556D8-804556E0 0004+04 s=1 e=0 z=0 None .sdata2 @973 */ SECTION_SDATA2 static f32 lit_973[1 + 1 /* padding */] = { diff --git a/libs/JSystem/JAudio2/JASDSPChannel.cpp b/libs/JSystem/JAudio2/JASDSPChannel.cpp index 898260815ed..6701468ed43 100644 --- a/libs/JSystem/JAudio2/JASDSPChannel.cpp +++ b/libs/JSystem/JAudio2/JASDSPChannel.cpp @@ -69,7 +69,6 @@ extern "C" void getHandle__13JASDSPChannelFUl(); // void* operator new[](u32, JKRHeap*, int); -extern "C" extern u8 JASDram[4]; extern "C" void releaseHalt__6JASDspFUl(); extern "C" void getDSPHandle__6JASDspFi(); diff --git a/libs/JSystem/JAudio2/JASDSPInterface.cpp b/libs/JSystem/JAudio2/JASDSPInterface.cpp index e4b5d091192..fbf4e623f31 100644 --- a/libs/JSystem/JAudio2/JASDSPInterface.cpp +++ b/libs/JSystem/JAudio2/JASDSPInterface.cpp @@ -66,8 +66,6 @@ struct JASCalc { // void DSP_CreateMap2(u32); -extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */]; -extern "C" extern u8 pad_8045575C[4]; extern "C" void boot__6JASDspFPFPv_v(); extern "C" void releaseHalt__6JASDspFUl(); @@ -119,7 +117,6 @@ void DspBoot(void (*)(void*)); void DspFinishWork(u16); void DsyncFrame2(u32, u32, u32); void* operator new[](u32, JKRHeap*, int); -extern "C" extern u8 JASDram[4]; extern "C" void cDyl_InitAsyncIsDone__Fv(); extern "C" void bzero__7JASCalcFPvUl(); @@ -199,7 +196,7 @@ asm void JASDsp::syncFrame(u32 param_0, u32 param_1, u32 param_2) { /* ############################################################################################## */ /* 80455748-8045574C 0004+00 s=1 e=0 z=0 None .sdata2 @176 */ -SECTION_SDATA2 static u32 lit_176 = 0x40800000; +SECTION_SDATA2 static f32 lit_176 = 4.0f; /* 8029DA04-8029DA30 002C+00 s=0 e=1 z=0 None .text setDSPMixerLevel__6JASDspFf */ #pragma push diff --git a/libs/JSystem/JAudio2/JASDrumSet.cpp b/libs/JSystem/JAudio2/JASDrumSet.cpp index 6ef1ae84ec4..14a070816f6 100644 --- a/libs/JSystem/JAudio2/JASDrumSet.cpp +++ b/libs/JSystem/JAudio2/JASDrumSet.cpp @@ -52,7 +52,6 @@ extern "C" void getType__10JASDrumSetCFv(); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern void* __vt__7JASInst[5]; extern "C" void bzero__7JASCalcFPvUl(); extern "C" void* __nwa__FUlP7JKRHeapi(); @@ -116,7 +115,7 @@ static u8 oscp[4]; static u8 data_80451274[4]; /* 80455648-8045564C 0004+00 s=2 e=0 z=0 None .sdata2 @219 */ -SECTION_SDATA2 static u32 lit_219 = 0x3F800000; +SECTION_SDATA2 static f32 lit_219 = 1.0f; /* 8045564C-80455650 0004+00 s=1 e=0 z=0 None .sdata2 @220 */ SECTION_SDATA2 static u8 lit_220[4] = { diff --git a/libs/JSystem/JAudio2/JASDvdThread.cpp b/libs/JSystem/JAudio2/JASDvdThread.cpp index f57608105b1..7bede8bfcbb 100644 --- a/libs/JSystem/JAudio2/JASDvdThread.cpp +++ b/libs/JSystem/JAudio2/JASDvdThread.cpp @@ -34,9 +34,6 @@ extern "C" void createThread__6JASDvdFliUl(); // void* operator new(u32, JKRHeap*, int); -extern "C" extern u8 JASDram[4]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; extern "C" void __ct__13JASTaskThreadFiiUl(); extern "C" void* __nw__FUlP7JKRHeapi(); diff --git a/libs/JSystem/JAudio2/JASHeapCtrl.cpp b/libs/JSystem/JAudio2/JASHeapCtrl.cpp index 34914ab16c2..e27a87acaba 100644 --- a/libs/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/libs/JSystem/JAudio2/JASHeapCtrl.cpp @@ -68,8 +68,6 @@ struct JASGenericMemPool { // Forward References: // -extern "C" extern u8 JASDram[4]; - extern "C" void __ct__7JASHeapFP11JASDisposer(); extern "C" void initRootHeap__7JASHeapFPvUl(); extern "C" void alloc__7JASHeapFP7JASHeapUl(); @@ -102,7 +100,6 @@ void* operator new(u32, JKRHeap*, int); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; extern "C" void* __nw__FUlP7JKRHeapi(); extern "C" void* __nwa__FUlP7JKRHeapi(); diff --git a/libs/JSystem/JAudio2/JASLfo.cpp b/libs/JSystem/JAudio2/JASLfo.cpp index 9efec4c6e5d..b52b9b5d3a7 100644 --- a/libs/JSystem/JAudio2/JASLfo.cpp +++ b/libs/JSystem/JAudio2/JASLfo.cpp @@ -22,8 +22,6 @@ struct JASLfo { // Forward References: // -extern "C" extern u8 sFreeRunLfo__6JASLfo[24]; - extern "C" void __ct__6JASLfoFv(); extern "C" void getValue__6JASLfoCFv(); extern "C" void incCounter__6JASLfoFf(); @@ -37,8 +35,6 @@ extern "C" extern u8 sFreeRunLfo__6JASLfo[24]; extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 sincosTable___5JMath[65536]; - // // Declarations: // @@ -53,7 +49,7 @@ SECTION_SDATA2 static u8 lit_341[4] = { }; /* 804556E4-804556E8 0004+00 s=2 e=0 z=0 None .sdata2 @342 */ -SECTION_SDATA2 static u32 lit_342 = 0x3F800000; +SECTION_SDATA2 static f32 lit_342 = 1.0f; /* 8029BD14-8029BD44 0030+00 s=1 e=1 z=0 None .text __ct__6JASLfoFv */ #pragma push @@ -67,10 +63,10 @@ asm JASLfo::JASLfo() { /* ############################################################################################## */ /* 804556E8-804556EC 0004+00 s=1 e=0 z=0 None .sdata2 @363 */ -SECTION_SDATA2 static u32 lit_363 = 0xC6000000; +SECTION_SDATA2 static f32 lit_363 = -8192.0f; /* 804556EC-804556F0 0004+00 s=1 e=0 z=0 None .sdata2 @364 */ -SECTION_SDATA2 static u32 lit_364 = 0x46000000; +SECTION_SDATA2 static f32 lit_364 = 8192.0f; /* 8029BD44-8029BDD8 0094+00 s=0 e=3 z=0 None .text getValue__6JASLfoCFv */ #pragma push diff --git a/libs/JSystem/JAudio2/JASOscillator.cpp b/libs/JSystem/JAudio2/JASOscillator.cpp index 4be8b40b933..61d349f1b38 100644 --- a/libs/JSystem/JAudio2/JASOscillator.cpp +++ b/libs/JSystem/JAudio2/JASOscillator.cpp @@ -66,7 +66,7 @@ asm JASOscillator::JASOscillator() { /* ############################################################################################## */ /* 804556FC-80455700 0004+00 s=2 e=0 z=0 None .sdata2 @87 */ -SECTION_SDATA2 static u32 lit_87 = 0x3F800000; +SECTION_SDATA2 static f32 lit_87 = 1.0f; /* 80455700-80455708 0004+04 s=3 e=0 z=0 None .sdata2 @88 */ SECTION_SDATA2 static f32 lit_88[1 + 1 /* padding */] = { @@ -76,9 +76,7 @@ SECTION_SDATA2 static f32 lit_88[1 + 1 /* padding */] = { }; /* 80455708-80455710 0008+00 s=3 e=0 z=0 None .sdata2 @91 */ -SECTION_SDATA2 static u8 lit_91[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_91 = 4503601774854144.0 /* cast s32 to float */; /* 8029BEC4-8029BF68 00A4+00 s=0 e=1 z=0 None .text * initStart__13JASOscillatorFPCQ213JASOscillator4Data */ @@ -184,9 +182,7 @@ SECTION_SDATA2 static f32 lit_154[1 + 1 /* padding */] = { }; /* 80455718-80455720 0008+00 s=1 e=0 z=0 None .sdata2 @156 */ -SECTION_SDATA2 static u8 lit_156[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_156 = 4503599627370496.0 /* cast u32 to float */; /* 8029C2C0-8029C388 00C8+00 s=1 e=0 z=0 None .text updateCurrentValue__13JASOscillatorFf */ #pragma push diff --git a/libs/JSystem/JAudio2/JASProbe.cpp b/libs/JSystem/JAudio2/JASProbe.cpp index a3112923bdd..ce10790e513 100644 --- a/libs/JSystem/JAudio2/JASProbe.cpp +++ b/libs/JSystem/JAudio2/JASProbe.cpp @@ -51,10 +51,10 @@ asm void JASProbe::start(char const* param_0) { /* ############################################################################################## */ /* 80455588-8045558C 0004+00 s=1 e=0 z=0 None .sdata2 @125 */ -SECTION_SDATA2 static u32 lit_125 = 0x426FC28F; +SECTION_SDATA2 static f32 lit_125 = 59.939998626708984f; /* 8045558C-80455590 0004+00 s=1 e=0 z=0 None .sdata2 @126 */ -SECTION_SDATA2 static u32 lit_126 = 0x3F75C28F; +SECTION_SDATA2 static f32 lit_126 = 24.0f / 25.0f; /* 80455590-80455598 0004+04 s=1 e=0 z=0 None .sdata2 @127 */ SECTION_SDATA2 static f32 lit_127[1 + 1 /* padding */] = { @@ -64,9 +64,7 @@ SECTION_SDATA2 static f32 lit_127[1 + 1 /* padding */] = { }; /* 80455598-804555A0 0008+00 s=1 e=0 z=0 None .sdata2 @129 */ -SECTION_SDATA2 static u8 lit_129[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_129 = 4503599627370496.0 /* cast u32 to float */; /* 80290DC4-80290EE4 0120+00 s=1 e=0 z=0 None .text stop__8JASProbeFv */ #pragma push diff --git a/libs/JSystem/JAudio2/JASReport.cpp b/libs/JSystem/JAudio2/JASReport.cpp index d16deb6e8db..87fd64860e9 100644 --- a/libs/JSystem/JAudio2/JASReport.cpp +++ b/libs/JSystem/JAudio2/JASReport.cpp @@ -12,7 +12,6 @@ // void JASReport(char const*, ...); -extern "C" extern u8 struct_80451230[8]; extern "C" void JASReport__FPCce(); extern "C" extern u8 struct_80451230[8]; diff --git a/libs/JSystem/JAudio2/JASSeqCtrl.cpp b/libs/JSystem/JAudio2/JASSeqCtrl.cpp index 174950a2672..d9d8728ee7e 100644 --- a/libs/JSystem/JAudio2/JASSeqCtrl.cpp +++ b/libs/JSystem/JAudio2/JASSeqCtrl.cpp @@ -63,7 +63,6 @@ extern "C" void __dt__12JASSeqParserFv(); // void operator delete(void*); -extern "C" extern void* __vt__12JASSeqParser[8]; extern "C" void checkNoteStop__8JASTrackCFUl(); extern "C" void init__12JASSeqReaderFv(); diff --git a/libs/JSystem/JAudio2/JASSeqParser.cpp b/libs/JSystem/JAudio2/JASSeqParser.cpp index c0ac49eac35..59f365b8d69 100644 --- a/libs/JSystem/JAudio2/JASSeqParser.cpp +++ b/libs/JSystem/JAudio2/JASSeqParser.cpp @@ -150,10 +150,6 @@ struct JASRegisterParam { // Forward References: // -extern "C" extern char const* const JASSeqParser__stringBase0; -extern "C" extern void* __vt__12JASSeqParser[8]; -extern "C" extern u8 sCallBackFunc__12JASSeqParser[4]; - extern "C" void conditionCheck__12JASSeqParserFP8JASTrackQ212JASSeqParser15BranchCondition(); extern "C" void writeReg__12JASSeqParserFP8JASTrackUlUl(); extern "C" void readReg__12JASSeqParserCFP8JASTrackUl(); @@ -232,8 +228,6 @@ extern "C" extern u8 sCallBackFunc__12JASSeqParser[4]; // void JASReport(char const*, ...); -extern "C" extern u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; extern "C" void JASReport__FPCce(); extern "C" void setSeqData__8JASTrackFPvUl(); @@ -1118,16 +1112,16 @@ SECTION_DATA static void* lit_632[53] = { }; /* 804555D8-804555DC 0004+00 s=6 e=0 z=0 None .sdata2 @627 */ -SECTION_SDATA2 static u32 lit_627 = 0x46FFFE00; +SECTION_SDATA2 static f32 lit_627 = 32767.0f; /* 804555DC-804555E0 0004+00 s=2 e=0 z=0 None .sdata2 @628 */ -SECTION_SDATA2 static u32 lit_628 = 0x44BE8000; +SECTION_SDATA2 static f32 lit_628 = 1524.0f; /* 804555E0-804555E4 0004+00 s=2 e=0 z=0 None .sdata2 @629 */ -SECTION_SDATA2 static u32 lit_629 = 0x463E8000; +SECTION_SDATA2 static f32 lit_629 = 12192.0f; /* 804555E4-804555E8 0004+00 s=1 e=0 z=0 None .sdata2 @630 */ -SECTION_SDATA2 static u32 lit_630 = 0x3B800000; +SECTION_SDATA2 static f32 lit_630 = 0.00390625f; /* 804555E8-804555F0 0004+04 s=1 e=0 z=0 None .sdata2 @631 */ SECTION_SDATA2 static f32 lit_631[1 + 1 /* padding */] = { @@ -1137,9 +1131,7 @@ SECTION_SDATA2 static f32 lit_631[1 + 1 /* padding */] = { }; /* 804555F0-804555F8 0008+00 s=3 e=0 z=0 None .sdata2 @634 */ -SECTION_SDATA2 static u8 lit_634[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_634 = 4503599627370496.0 /* cast u32 to float */; /* 80293DC4-80293FC8 0204+00 s=8 e=0 z=0 None .text writeReg__12JASSeqParserFP8JASTrackUlUl */ #pragma push @@ -1210,10 +1202,10 @@ SECTION_DATA static void* lit_720[53] = { }; /* 804555F8-804555FC 0004+00 s=1 e=0 z=0 None .sdata2 @718 */ -SECTION_SDATA2 static u32 lit_718 = 0x43800000; +SECTION_SDATA2 static f32 lit_718 = 256.0f; /* 804555FC-80455600 0004+00 s=1 e=0 z=0 None .sdata2 @719 */ -SECTION_SDATA2 static u32 lit_719 = 0x42800000; +SECTION_SDATA2 static f32 lit_719 = 64.0f; /* 80293FC8-80294188 01C0+00 s=7 e=0 z=0 None .text readReg__12JASSeqParserCFP8JASTrackUl */ #pragma push @@ -1714,9 +1706,7 @@ asm void JASSeqParser::cmdPrg(JASTrack* param_0, u32* param_1) { /* ############################################################################################## */ /* 80455608-80455610 0008+00 s=4 e=0 z=0 None .sdata2 @1064 */ -SECTION_SDATA2 static u8 lit_1064[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1064 = 4503601774854144.0 /* cast s32 to float */; /* 80294BF8-80294C54 005C+00 s=1 e=0 z=0 None .text cmdParamI__12JASSeqParserFP8JASTrackPUl */ #pragma push diff --git a/libs/JSystem/JAudio2/JASSimpleWaveBank.cpp b/libs/JSystem/JAudio2/JASSimpleWaveBank.cpp index 8d064654e6e..aeea8e8e9e0 100644 --- a/libs/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/libs/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -65,9 +65,6 @@ extern "C" static void func_80298FA8(); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern void* __vt__13JASWaveHandle[5]; -extern "C" extern void* __vt__11JASWaveBank[6]; -extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */]; extern "C" void __ct__10JASWaveArcFv(); extern "C" void __dt__10JASWaveArcFv(); diff --git a/libs/JSystem/JAudio2/JASSoundParams.cpp b/libs/JSystem/JAudio2/JASSoundParams.cpp index b65486c8268..9bbf4708bfc 100644 --- a/libs/JSystem/JAudio2/JASSoundParams.cpp +++ b/libs/JSystem/JAudio2/JASSoundParams.cpp @@ -41,10 +41,10 @@ SECTION_SDATA2 static u8 lit_299[4] = { }; /* 80455764-80455768 0004+00 s=1 e=0 z=0 None .sdata2 @300 */ -SECTION_SDATA2 static u32 lit_300 = 0x3F800000; +SECTION_SDATA2 static f32 lit_300 = 1.0f; /* 80455768-8045576C 0004+00 s=1 e=0 z=0 None .sdata2 @301 */ -SECTION_SDATA2 static u32 lit_301 = 0x41000000; +SECTION_SDATA2 static f32 lit_301 = 8.0f; /* 8029E3B0-8029E47C 00CC+00 s=0 e=2 z=0 None .text clamp__14JASSoundParamsFv */ #pragma push @@ -58,7 +58,7 @@ asm void JASSoundParams::clamp() { /* ############################################################################################## */ /* 8045576C-80455770 0004+00 s=1 e=0 z=0 None .sdata2 @311 */ -SECTION_SDATA2 static u32 lit_311 = 0x3F000000; +SECTION_SDATA2 static f32 lit_311 = 0.5f; /* 8029E47C-8029E4D8 005C+00 s=0 e=2 z=0 None .text * combine__14JASSoundParamsFRC14JASSoundParamsRC14JASSoundParams */ diff --git a/libs/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/JAudio2/JASTaskThread.cpp index 3bd5a555277..04c7b171aed 100644 --- a/libs/JSystem/JAudio2/JASTaskThread.cpp +++ b/libs/JSystem/JAudio2/JASTaskThread.cpp @@ -57,8 +57,6 @@ extern "C" void pause__13JASTaskThreadFb(); void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 JASDram[4]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; extern "C" void bcopy__7JASCalcFPCvPvUl(); extern "C" void getSystemHeap__9JASKernelFv(); diff --git a/libs/JSystem/JAudio2/JASTrack.cpp b/libs/JSystem/JAudio2/JASTrack.cpp index f7338b483ae..ee8952b84c7 100644 --- a/libs/JSystem/JAudio2/JASTrack.cpp +++ b/libs/JSystem/JAudio2/JASTrack.cpp @@ -32,22 +32,14 @@ struct JASTrackPort { /* 802935E8 */ void writeExport(u32, u16); }; +struct JASSoundParams {}; + struct JASOscillator { struct Point {}; struct Data {}; }; -struct JASChannel { - /* 8029AAD0 */ void release(u16); - /* 8029AB64 */ void setOscInit(u32, JASOscillator::Data const*); - /* 8029AB98 */ void setMixConfig(u32, u16); - /* 8029ACD4 */ void setKeySweepTarget(s32, u32); - /* 8029BBFC */ void free(); -}; - -struct JASSoundParams {}; - struct JASDsp { struct TChannel { /* 8029E00C */ void setFilterMode(u16); @@ -57,6 +49,14 @@ struct JASDsp { }; }; +struct JASChannel { + /* 8029AAD0 */ void release(u16); + /* 8029AB64 */ void setOscInit(u32, JASOscillator::Data const*); + /* 8029AB98 */ void setMixConfig(u32, u16); + /* 8029ACD4 */ void setKeySweepTarget(s32, u32); + /* 8029BBFC */ void free(); +}; + struct JASTrack { struct TChannelMgr { /* 802930DC */ TChannelMgr(JASTrack*); @@ -191,10 +191,6 @@ struct JASBank { // Forward References: // -extern "C" extern void* __vt__11JASBankList[3 + 1 /* padding */]; -extern "C" extern u8 data_80431AF4[16]; -extern "C" extern u8 data_80431B04[16 + 4 /* padding */]; - extern "C" void __ct__8JASTrackFv(); extern "C" void __dt__8JASTrackFv(); extern "C" void setChannelMgrCount__8JASTrackFUl(); @@ -271,8 +267,6 @@ extern "C" extern u8 data_80431B04[16 + 4 /* padding */]; // void operator delete(void*); -extern "C" extern u8 data_80450B90[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451230[8]; SECTION_INIT void memset(); extern "C" void __ct__17JASGenericMemPoolFv(); @@ -420,7 +414,7 @@ SECTION_RODATA static u8 const sPitchEnvOsc__8JASTrack[24] = { }; /* 804555A4-804555A8 0004+00 s=9 e=0 z=0 None .sdata2 @679 */ -SECTION_SDATA2 static u32 lit_679 = 0x3F800000; +SECTION_SDATA2 static f32 lit_679 = 1.0f; /* 802915D4-802918FC 0328+00 s=2 e=1 z=0 None .text init__8JASTrackFv */ #pragma push @@ -434,7 +428,7 @@ asm void JASTrack::init() { /* ############################################################################################## */ /* 804555A8-804555AC 0004+00 s=4 e=0 z=0 None .sdata2 @690 */ -SECTION_SDATA2 static u32 lit_690 = 0x3F000000; +SECTION_SDATA2 static f32 lit_690 = 0.5f; /* 802918FC-8029194C 0050+00 s=1 e=0 z=0 None .text initTimed__8JASTrackFv */ #pragma push @@ -591,12 +585,10 @@ asm void JASTrack::noteOn(u32 param_0, u32 param_1, u32 param_2) { /* ############################################################################################## */ /* 804555AC-804555B0 0004+00 s=1 e=0 z=0 None .sdata2 @952 */ -SECTION_SDATA2 static u32 lit_952 = 0x42C80000; +SECTION_SDATA2 static f32 lit_952 = 100.0f; /* 804555B0-804555B8 0008+00 s=4 e=0 z=0 None .sdata2 @954 */ -SECTION_SDATA2 static u8 lit_954[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_954 = 4503599627370496.0 /* cast u32 to float */; /* 80292008-80292198 0190+00 s=0 e=1 z=0 None .text gateOn__8JASTrackFUlUlfUl */ #pragma push @@ -650,7 +642,7 @@ asm void JASTrack::updateTimedParam() { /* ############################################################################################## */ /* 804555B8-804555BC 0004+00 s=1 e=0 z=0 None .sdata2 @1032 */ -SECTION_SDATA2 static u32 lit_1032 = 0x3EAAAAAB; +SECTION_SDATA2 static f32 lit_1032 = 1.0f / 3.0f; /* 80292348-802924E4 019C+00 s=1 e=0 z=0 None .text updateTrack__8JASTrackFf */ #pragma push @@ -664,12 +656,10 @@ asm void JASTrack::updateTrack(f32 param_0) { /* ############################################################################################## */ /* 804555BC-804555C0 0004+00 s=1 e=0 z=0 None .sdata2 @1042 */ -SECTION_SDATA2 static u32 lit_1042 = 0x3FAAAAAB; +SECTION_SDATA2 static f32 lit_1042 = 4.0f / 3.0f; /* 804555C0-804555C8 0008+00 s=1 e=0 z=0 None .sdata2 @1044 */ -SECTION_SDATA2 static u8 lit_1044[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1044 = 4503601774854144.0 /* cast s32 to float */; /* 802924E4-80292580 009C+00 s=5 e=0 z=0 None .text updateTempo__8JASTrackFv */ #pragma push @@ -693,10 +683,10 @@ asm void JASTrack::updateSeq(bool param_0, f32 param_1) { /* ############################################################################################## */ /* 804555C8-804555CC 0004+00 s=1 e=0 z=0 None .sdata2 @1069 */ -SECTION_SDATA2 static u32 lit_1069 = 0x42F00000; +SECTION_SDATA2 static f32 lit_1069 = 120.0f; /* 804555CC-804555D0 0004+00 s=1 e=0 z=0 None .sdata2 @1070 */ -SECTION_SDATA2 static u32 lit_1070 = 0x41200000; +SECTION_SDATA2 static f32 lit_1070 = 10.0f; /* 80292644-802926E0 009C+00 s=1 e=0 z=0 None .text seqTimeToDspTime__8JASTrackFf */ #pragma push @@ -905,7 +895,7 @@ asm void JASTrack::setTimebase(u16 param_0) { /* ############################################################################################## */ /* 804555D4-804555D8 0004+00 s=1 e=0 z=0 None .sdata2 @1246 */ -SECTION_SDATA2 static u32 lit_1246 = 0x46FFFE00; +SECTION_SDATA2 static f32 lit_1246 = 32767.0f; /* 80292BF4-80292CA4 00B0+00 s=1 e=0 z=0 None .text * updateChannel__8JASTrackFP10JASChannelPQ26JASDsp8TChannel */ diff --git a/libs/JSystem/JAudio2/JASVoiceBank.cpp b/libs/JSystem/JAudio2/JASVoiceBank.cpp index 107616ec206..cdd3c47d3bc 100644 --- a/libs/JSystem/JAudio2/JASVoiceBank.cpp +++ b/libs/JSystem/JAudio2/JASVoiceBank.cpp @@ -23,8 +23,6 @@ struct JASVoiceBank { // Forward References: // -extern "C" extern void* __vt__12JASVoiceBank[5 + 1 /* padding */]; - extern "C" void getInstParam__12JASVoiceBankCFiiiP12JASInstParam(); extern "C" void __dt__12JASVoiceBankFv(); extern "C" void getType__12JASVoiceBankCFv(); @@ -35,7 +33,6 @@ extern "C" extern void* __vt__12JASVoiceBank[5 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern void* __vt__7JASBank[5]; extern "C" void __dl__FPv(); extern "C" extern void* __vt__7JASBank[5]; diff --git a/libs/JSystem/JAudio2/JASWSParser.cpp b/libs/JSystem/JAudio2/JASWSParser.cpp index c444df3ace6..6c02b5f5a0a 100644 --- a/libs/JSystem/JAudio2/JASWSParser.cpp +++ b/libs/JSystem/JAudio2/JASWSParser.cpp @@ -75,8 +75,6 @@ extern "C" static void func_80299520(); // void* operator new(u32, JKRHeap*, int); -extern "C" extern u32 one__11JASWaveInfo[1 + 1 /* padding */]; -extern "C" extern u8 JASDram[4]; extern "C" void __ct__16JASBasicWaveBankFv(); extern "C" void getWaveGroup__16JASBasicWaveBankFUl(); diff --git a/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp b/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp index 7d79382334d..e968e77c26e 100644 --- a/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp +++ b/libs/JSystem/JAudio2/JAUAudioArcLoader.cpp @@ -62,8 +62,6 @@ struct JAUAudioArcInterpreter { // Forward References: // -extern "C" extern void* __vt__17JAUAudioArcLoader[17 + 1 /* padding */]; - extern "C" void __ct__17JAUAudioArcLoaderFP10JAUSection(); extern "C" void load__17JAUAudioArcLoaderFPCv(); extern "C" void readWS__17JAUAudioArcLoaderFUlPCvUl(); @@ -87,7 +85,6 @@ extern "C" extern void* __vt__17JAUAudioArcLoader[17 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern u8 data_80450B6C[4]; extern "C" void __ct__22JAUAudioArcInterpreterFv(); extern "C" void __dt__22JAUAudioArcInterpreterFv(); diff --git a/libs/JSystem/JAudio2/JAUInitializer.cpp b/libs/JSystem/JAudio2/JAUInitializer.cpp index 55a598921ca..60cae3b3fd0 100644 --- a/libs/JSystem/JAudio2/JAUInitializer.cpp +++ b/libs/JSystem/JAudio2/JAUInitializer.cpp @@ -112,22 +112,6 @@ extern "C" void initJAInterface__18JAU_JAIInitializerFv(); // External References: // -extern "C" extern u8 data_80431AF4[16]; -extern "C" extern u8 data_80431B04[16 + 4 /* padding */]; -extern "C" extern u8 data_80434084[16 + 4 /* padding */]; -extern "C" extern u8 data_804340B0[16]; -extern "C" extern u8 data_804340CC[16 + 4 /* padding */]; -extern "C" extern u8 data_804340FC[16 + 4 /* padding */]; -extern "C" extern u8 data_80450B8C[4]; -extern "C" extern u8 JASDram[4]; -extern "C" extern u8 struct_80451230[8]; -extern "C" extern u8 data_80451310[8]; -extern "C" extern u8 data_80451318[8]; -extern "C" extern u8 data_80451320[8]; -extern "C" extern u8 data_80451328[8]; -extern "C" extern u8 sManager__15JKRThreadSwitch[4]; -extern "C" extern u8 sAramObject__7JKRAram[4]; - extern "C" void getThreadPointer__6JASDvdFv(); extern "C" void createThread__6JASDvdFliUl(); extern "C" void __ct__17JASGenericMemPoolFv(); diff --git a/libs/JSystem/JAudio2/JAUSectionHeap.cpp b/libs/JSystem/JAudio2/JAUSectionHeap.cpp index 66746384900..843b835b85c 100644 --- a/libs/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/libs/JSystem/JAudio2/JAUSectionHeap.cpp @@ -84,11 +84,11 @@ struct JAUSeqCollection { /* 802A66AC */ void init(void const*); }; -struct JAISoundID {}; +struct JAISeqData {}; struct JAISeqDataUser {}; -struct JAISeqData {}; +struct JAISoundID {}; struct JAUSectionHeap { struct TSectionHeapData { @@ -183,7 +183,6 @@ struct JAISeqDataMgr { static void JAUNewSectionHeap(JKRSolidHeap*, bool); void JAUNewSectionHeap(bool); -extern "C" extern char const* const JAUSectionHeap__stringBase0; extern "C" void __ct__Q210JAUSection12TSectionDataFv(); extern "C" void resetRegisteredBankTables__Q210JAUSection12TSectionDataFv(); @@ -240,19 +239,6 @@ void* operator new[](u32); void* operator new[](u32, int); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern void* __vt__11JASBankList[3 + 1 /* padding */]; -extern "C" extern void* __vt__7JASBank[5]; -extern "C" extern void* __vt__12JASVoiceBank[5 + 1 /* padding */]; -extern "C" extern void* __vt__13JAISeqDataMgr[6]; -extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */]; -extern "C" extern void* __vt__32JAUStreamDataMgr_StreamFileTable[4]; -extern "C" extern void* __files[80]; -extern "C" extern u8 data_80450B50[4]; -extern "C" extern u8 data_80450B54[4]; -extern "C" extern u8 data_80450B58[4]; -extern "C" extern u8 data_80450B90[4 + 4 /* padding */]; -extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; -extern "C" extern u8 JASDram[4]; SECTION_INIT void memset(); SECTION_INIT void memcpy(); diff --git a/libs/JSystem/JAudio2/JAUSeqCollection.cpp b/libs/JSystem/JAudio2/JAUSeqCollection.cpp index 09b529b0d0f..ed46160997e 100644 --- a/libs/JSystem/JAudio2/JAUSeqCollection.cpp +++ b/libs/JSystem/JAudio2/JAUSeqCollection.cpp @@ -11,11 +11,11 @@ // Types: // -struct JAISeqDataUser {}; +struct JAISeqData {}; struct JAISoundID {}; -struct JAISeqData {}; +struct JAISeqDataUser {}; struct JAUSeqDataMgr_SeqCollection { /* 802A677C */ JAUSeqDataMgr_SeqCollection(); @@ -57,7 +57,6 @@ extern "C" void __dt__27JAUSeqDataMgr_SeqCollectionFv(); // void operator delete(void*); -extern "C" extern void* __vt__13JAISeqDataMgr[6]; extern "C" void __dt__13JAISeqDataMgrFv(); extern "C" void __dl__FPv(); diff --git a/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp index 2f800fff9e8..a9b9f435ec5 100644 --- a/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp +++ b/libs/JSystem/JAudio2/JAUSeqDataBlockMgr.cpp @@ -42,10 +42,10 @@ struct JAUSeqDataBlocks { /* 802A6A18 */ void hasFailedBlock(JAISoundID); }; -struct JAISeqDataUser {}; - struct JAISeqData {}; +struct JAISeqDataUser {}; + struct JAUDynamicSeqDataBlocks { /* 802A6A58 */ JAUDynamicSeqDataBlocks(); /* 802A6AA0 */ void setSeqDataArchive(JKRArchive*); @@ -88,8 +88,6 @@ extern "C" void rearrangeLoadingSeqs___23JAUDynamicSeqDataBlocksFv(); // External References: // -extern "C" extern u8 data_80450B50[4]; - extern "C" void getResSize__15JASResArcLoaderFPC10JKRArchiveUs(); extern "C" void loadResourceAsync__15JASResArcLoaderFP10JKRArchiveUsPUcUlPFUlUl_vUl(); extern "C" void __ct__10JSUPtrLinkFPv(); diff --git a/libs/JSystem/JAudio2/JAUStreamFileTable.cpp b/libs/JSystem/JAudio2/JAUStreamFileTable.cpp index 584543e7beb..e234ddc90e9 100644 --- a/libs/JSystem/JAudio2/JAUStreamFileTable.cpp +++ b/libs/JSystem/JAudio2/JAUStreamFileTable.cpp @@ -33,8 +33,6 @@ struct JAIStreamDataMgr { // Forward References: // -extern "C" extern void* __vt__32JAUStreamDataMgr_StreamFileTable[4]; - extern "C" void __ct__18JAUStreamFileTableFv(); extern "C" void init__18JAUStreamFileTableFPCv(); extern "C" void getNumFiles__18JAUStreamFileTableCFv(); diff --git a/libs/JSystem/JAudio2/osdsp.cpp b/libs/JSystem/JAudio2/osdsp.cpp index caf541075f3..f0873ef780e 100644 --- a/libs/JSystem/JAudio2/osdsp.cpp +++ b/libs/JSystem/JAudio2/osdsp.cpp @@ -26,8 +26,6 @@ extern "C" void DSPAddPriorTask__FP15STRUCT_DSP_TASK(); // External References: // -extern "C" extern u8 DSP_prior_task[4]; - extern "C" void OSReport(); extern "C" void OSDisableInterrupts(); extern "C" void OSRestoreInterrupts(); diff --git a/libs/JSystem/JAudio2/osdsp_task.cpp b/libs/JSystem/JAudio2/osdsp_task.cpp index fb5f353df74..661da0b0fa9 100644 --- a/libs/JSystem/JAudio2/osdsp_task.cpp +++ b/libs/JSystem/JAudio2/osdsp_task.cpp @@ -16,11 +16,6 @@ static void DsyncFrame3(u32, u32, u32, u32, u32); static void Dsp_Update_Request(); void Dsp_Running_Check(); void Dsp_Running_Start(); -extern "C" extern u8 DSP_prior_task[4]; -extern "C" extern u8 data_80451310[8]; -extern "C" extern u8 data_80451318[8]; -extern "C" extern u8 data_80451320[8]; -extern "C" extern u8 data_80451328[8]; extern "C" void __DSPHandler(); extern "C" void DsyncFrame2__FUlUlUl(); @@ -40,8 +35,6 @@ extern "C" extern u8 data_80451328[8]; void DsyncFrame2ch(u32, u32, u32); void DsyncFrame4ch(u32, u32, u32, u32, u32); -extern "C" extern u8 __DSP_first_task[4]; -extern "C" extern u8 __DSP_curr_task[4]; extern "C" void DsyncFrame2ch__FUlUlUl(); extern "C" void DsyncFrame4ch__FUlUlUlUlUl(); diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index e17c5240b0e..1d207c69a40 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -121,8 +121,6 @@ static void JFWThreadAlarmHandler(OSAlarm*, OSContext*); static void JFWDrawDoneAlarm(); static void JFWGXAbortAlarmHandler(OSAlarm*, OSContext*); static void diagnoseGpHang(); -extern "C" extern char const* const JFWDisplay__stringBase0; -extern "C" extern u8 sManager__10JFWDisplay[4]; extern "C" void ctor_subroutine__10JFWDisplayFb(); extern "C" void __ct__10JFWDisplayFP7JKRHeapQ26JUTXfb10EXfbNumberb(); @@ -162,16 +160,6 @@ extern "C" extern u8 sManager__10JFWDisplay[4]; void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; -extern "C" extern u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */]; -extern "C" extern u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */]; -extern "C" extern u8 sManager__8JUTVideo[4]; -extern "C" extern u8 sVideoLastTick__8JUTVideo[4]; -extern "C" extern u8 sVideoInterval__8JUTVideo[4]; -extern "C" extern u8 sManager__6JUTXfb[4 + 4 /* padding */]; -extern "C" extern u8 sManager__10JUTProcBar[4]; -extern "C" extern u8 sManager__17JUTConsoleManager[4]; extern "C" void OSReport(); extern "C" void* __nw__FUl(); @@ -512,7 +500,7 @@ asm void JFWDisplay::preGX() { /* ############################################################################################## */ /* 80455254-80455258 0004+00 s=1 e=0 z=0 None .sdata2 @2497 */ -SECTION_SDATA2 static u32 lit_2497 = 0xBF800000; +SECTION_SDATA2 static f32 lit_2497 = -1.0f; /* 80455258-80455260 0004+04 s=3 e=0 z=0 None .sdata2 @2498 */ SECTION_SDATA2 static f32 lit_2498[1 + 1 /* padding */] = { @@ -522,9 +510,7 @@ SECTION_SDATA2 static f32 lit_2498[1 + 1 /* padding */] = { }; /* 80455260-80455268 0008+00 s=4 e=0 z=0 None .sdata2 @2500 */ -SECTION_SDATA2 static u8 lit_2500[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2500 = 4503599627370496.0 /* cast u32 to float */; /* 8027268C-80272798 010C+00 s=1 e=0 z=0 None .text endGX__10JFWDisplayFv */ #pragma push @@ -684,9 +670,7 @@ asm void JFWDisplay::clearEfb(int param_0, int param_1, int param_2, int param_3 /* ############################################################################################## */ /* 80455268-80455270 0008+00 s=1 e=0 z=0 None .sdata2 @2933 */ -SECTION_SDATA2 static u8 lit_2933[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2933 = 4503601774854144.0 /* cast s32 to float */; /* 8027331C-802733A8 008C+00 s=1 e=0 z=0 None .text calcCombinationRatio__10JFWDisplayFv */ #pragma push @@ -700,9 +684,7 @@ asm void JFWDisplay::calcCombinationRatio() { /* ############################################################################################## */ /* 80455270-80455278 0008+00 s=1 e=0 z=0 None .sdata2 @2964 */ -SECTION_SDATA2 static u8 lit_2964[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2964 = 0.5; /* 802733A8-80273484 00DC+00 s=2 e=0 z=0 None .text JFWDrawDoneAlarm__Fv */ #pragma push diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp index f7f48b0557e..f2052f65944 100644 --- a/libs/JSystem/JFramework/JFWSystem.cpp +++ b/libs/JSystem/JFramework/JFWSystem.cpp @@ -87,15 +87,6 @@ struct JFWSystem { // Forward References: // -extern "C" extern u32 maxStdHeaps__Q29JFWSystem11CSetUpParam; -extern "C" extern u32 sysHeapSize__Q29JFWSystem11CSetUpParam; -extern "C" extern u32 fifoBufSize__Q29JFWSystem11CSetUpParam; -extern "C" extern u32 aramAudioBufSize__Q29JFWSystem11CSetUpParam; -extern "C" extern u32 aramGraphBufSize__Q29JFWSystem11CSetUpParam; -extern "C" extern void* renderMode__Q29JFWSystem11CSetUpParam; -extern "C" extern u8 systemHeap__9JFWSystem[4]; -extern "C" extern u8 systemConsole__9JFWSystem[4]; - extern "C" void firstInit__9JFWSystemFv(); extern "C" void init__9JFWSystemFv(); extern "C" extern u32 maxStdHeaps__Q29JFWSystem11CSetUpParam; @@ -112,8 +103,6 @@ extern "C" extern u8 systemConsole__9JFWSystem[4]; // void* operator new(u32); -extern "C" extern u8 const JUTResFONT_Ascfont_fix12[16736]; -extern "C" extern u8 GXNtsc480IntDf[60]; extern "C" void alloc__7JKRHeapFUli(); extern "C" void* __nw__FUl(); @@ -227,15 +216,13 @@ u8 systemConsole__9JFWSystem[4]; static u8 data_804511BC[4]; /* 80455240-80455244 0004+00 s=1 e=0 z=0 None .sdata2 @2242 */ -SECTION_SDATA2 static u32 lit_2242 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2242 = 0.5f; /* 80455244-80455248 0004+00 s=1 e=0 z=0 None .sdata2 @2243 */ -SECTION_SDATA2 static u32 lit_2243 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_2243 = 17.0f / 20.0f; /* 80455248-80455250 0008+00 s=1 e=0 z=0 None .sdata2 @2245 */ -SECTION_SDATA2 static u8 lit_2245[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2245 = 4503601774854144.0 /* cast s32 to float */; /* 80271D18-80272040 0328+00 s=0 e=1 z=0 None .text init__9JFWSystemFv */ #pragma push diff --git a/libs/JSystem/JGadget/binary.cpp b/libs/JSystem/JGadget/binary.cpp index 9d2ed133598..483c3695ace 100644 --- a/libs/JSystem/JGadget/binary.cpp +++ b/libs/JSystem/JGadget/binary.cpp @@ -40,7 +40,6 @@ extern "C" void parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl(); // void operator delete(void*); -extern "C" extern void* __vt__Q37JGadget6binary19TParse_header_block[5]; extern "C" void __dl__FPv(); extern "C" void _savegpr_26(); diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index 1f6a8ec3ab9..296eab4b2db 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -50,10 +50,10 @@ struct JKRAramStream { /* 802D3B48 */ void create(s32); }; -struct JKRAramBlock {}; - struct JKRAMCommand {}; +struct JKRAramBlock {}; + struct JKRAramPiece { /* 802D3838 */ void orderSync(int, u32, u32, u32, JKRAramBlock*); /* 802D38CC */ void startDMA(JKRAMCommand*); @@ -85,10 +85,6 @@ static void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*); static void decompSZS_subroutine(u8*, u8*); static void firstSrcData(); static void nextSrcData(u8*); -extern "C" extern char const* const JKRAram__stringBase0; -extern "C" extern u8 sMessageQueue__7JKRAram[32]; -extern "C" extern u32 sSZSBufferSize__7JKRAram[1 + 1 /* padding */]; -extern "C" extern u8 sAramObject__7JKRAram[4]; extern "C" void create__7JKRAramFUlUllll(); extern "C" void __ct__7JKRAramFUlUll(); @@ -115,8 +111,6 @@ extern "C" extern u8 sAramObject__7JKRAram[4]; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; SECTION_INIT void memcpy(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp index 092df765633..b61d4afc15a 100644 --- a/libs/JSystem/JKernel/JKRAramArchive.cpp +++ b/libs/JSystem/JKernel/JKRAramArchive.cpp @@ -112,9 +112,6 @@ struct JKRAram { // Forward References: // -extern "C" extern char const* const JKRAramArchive__stringBase0; -extern "C" extern void* __vt__7JKRFile[8]; - extern "C" void __ct__14JKRAramArchiveFlQ210JKRArchive15EMountDirection(); extern "C" void __dt__14JKRAramArchiveFv(); extern "C" void open__14JKRAramArchiveFl(); @@ -135,9 +132,6 @@ extern "C" extern void* __vt__7JKRFile[8]; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sVolumeList__13JKRFileLoader[12]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sAramObject__7JKRAram[4]; SECTION_INIT void memset(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp index a94c9218cf9..af3e3ce32f1 100644 --- a/libs/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/JKernel/JKRAramPiece.cpp @@ -43,13 +43,13 @@ struct JKRDecomp { /* 802DB8D0 */ void sendCommand(JKRDecompCommand*); }; -struct JKRAramBlock {}; - struct JKRAMCommand { /* 802D39EC */ JKRAMCommand(); /* 802D3A5C */ ~JKRAMCommand(); }; +struct JKRAramBlock {}; + struct JKRAramPiece { /* 802D3574 */ void prepareCommand(int, u32, u32, u32, JKRAramBlock*, void (*)(u32)); /* 802D35F4 */ void sendCommand(JKRAMCommand*); @@ -64,8 +64,6 @@ struct JKRAramPiece { // Forward References: // -extern "C" extern char const* const JKRAramPiece__stringBase0; - extern "C" void prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v(); extern "C" void sendCommand__12JKRAramPieceFP12JKRAMCommand(); extern "C" void orderAsync__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v(); @@ -84,8 +82,6 @@ extern "C" extern char const* const JKRAramPiece__stringBase0; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sMessageQueue__7JKRAram[32]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; extern "C" void OSReport(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index 3239292abd3..59cae2b1857 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -65,8 +65,6 @@ struct JKRAramPiece { // Forward References: // -extern "C" extern char const* const JKRAramStream__stringBase0; - extern "C" void create__13JKRAramStreamFl(); extern "C" void __ct__13JKRAramStreamFl(); extern "C" void __dt__13JKRAramStreamFv(); @@ -86,8 +84,6 @@ extern "C" extern char const* const JKRAramStream__stringBase0; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); extern "C" void alloc__7JKRHeapFUli(); diff --git a/libs/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp index fccea79abab..33dff00d3c0 100644 --- a/libs/JSystem/JKernel/JKRArchivePri.cpp +++ b/libs/JSystem/JKernel/JKRArchivePri.cpp @@ -49,8 +49,6 @@ struct JKRArchive { // Forward References: // -extern "C" extern u8 sCurrentDirID__10JKRArchive[4 + 4 /* padding */]; - extern "C" void __ct__10JKRArchiveFlQ210JKRArchive10EMountMode(); extern "C" void __dt__10JKRArchiveFv(); extern "C" void isSameName__10JKRArchiveCFRQ210JKRArchive8CArcNameUlUs(); @@ -73,9 +71,6 @@ extern "C" extern u8 sCurrentDirID__10JKRArchive[4 + 4 /* padding */]; // void operator delete(void*); -extern "C" extern void* __vt__10JKRArchive[20]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */]; extern "C" void findFromRoot__7JKRHeapFPv(); extern "C" void __dl__FPv(); diff --git a/libs/JSystem/JKernel/JKRArchivePub.cpp b/libs/JSystem/JKernel/JKRArchivePub.cpp index 8d8877007db..28c82842fa7 100644 --- a/libs/JSystem/JKernel/JKRArchivePub.cpp +++ b/libs/JSystem/JKernel/JKRArchivePub.cpp @@ -92,8 +92,6 @@ struct JKRAramArchive { // Forward References: // -extern "C" extern void* __vt__10JKRArchive[20]; - extern "C" void check_mount_already__10JKRArchiveFlP7JKRHeap(); extern "C" void mount__10JKRArchiveFPCcQ210JKRArchive10EMountModeP7JKRHeapQ210JKRArchive15EMountDirection(); @@ -126,11 +124,6 @@ extern "C" extern void* __vt__10JKRArchive[20]; // void* operator new(u32, JKRHeap*, int); -extern "C" extern u8 sVolumeList__13JKRFileLoader[12]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */]; -extern "C" extern u8 sCurrentDirID__10JKRArchive[4 + 4 /* padding */]; extern "C" void getExpandedResSize__10JKRArchiveCFPCv(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRAssertHeap.cpp b/libs/JSystem/JKernel/JKRAssertHeap.cpp index eb48fd9051c..8755d6eea14 100644 --- a/libs/JSystem/JKernel/JKRAssertHeap.cpp +++ b/libs/JSystem/JKernel/JKRAssertHeap.cpp @@ -77,7 +77,6 @@ extern "C" bool do_getTotalFreeSize__13JKRAssertHeapFv(); // void operator delete(void*); -extern "C" extern u8 sRootHeap__7JKRHeap[4]; extern "C" void __ct__7JKRHeapFPvUlP7JKRHeapb(); extern "C" void __dt__7JKRHeapFv(); diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp index 50093bab058..baa04f5ee22 100644 --- a/libs/JSystem/JKernel/JKRCompArchive.cpp +++ b/libs/JSystem/JKernel/JKRCompArchive.cpp @@ -118,8 +118,6 @@ struct JKRAram { // Forward References: // -extern "C" extern char const* const JKRCompArchive__stringBase0; - extern "C" void __ct__14JKRCompArchiveFlQ210JKRArchive15EMountDirection(); extern "C" void __dt__14JKRCompArchiveFv(); extern "C" void open__14JKRCompArchiveFl(); @@ -136,9 +134,6 @@ extern "C" extern char const* const JKRCompArchive__stringBase0; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sVolumeList__13JKRFileLoader[12]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sAramObject__7JKRAram[4]; SECTION_INIT void memset(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRDecomp.cpp b/libs/JSystem/JKernel/JKRDecomp.cpp index 96394523d29..23f436a132b 100644 --- a/libs/JSystem/JKernel/JKRDecomp.cpp +++ b/libs/JSystem/JKernel/JKRDecomp.cpp @@ -71,7 +71,6 @@ extern "C" void __dt__16JKRDecompCommandFv(); void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; extern "C" void* __nw__FUlP7JKRHeapi(); extern "C" void __dl__FPv(); diff --git a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp index c949861f5f3..8527aeda35b 100644 --- a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -100,7 +100,6 @@ static void decompSZS_subroutine(u8*, u32); static void firstSrcData(); static void nextSrcData(u8*); static void dmaBufferFlush(u32); -extern "C" extern u32 sSZSBufferSize__16JKRDvdAramRipper; extern "C" void loadToAram__16JKRDvdAramRipperFlUl15JKRExpandSwitchUlUlPUl(); extern "C" void loadToAram__16JKRDvdAramRipperFP10JKRDvdFileUl15JKRExpandSwitchUlUlPUl(); @@ -126,10 +125,6 @@ extern "C" extern u32 sSZSBufferSize__16JKRDvdAramRipper; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern void* __vt__20JSURandomInputStream[9]; -extern "C" extern void* __vt__18JSUFileInputStream[9 + 1 /* padding */]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sAramObject__7JKRAram[4]; SECTION_INIT void memcpy(); extern "C" void alloc__7JKRHeapFUli(); diff --git a/libs/JSystem/JKernel/JKRDvdArchive.cpp b/libs/JSystem/JKernel/JKRDvdArchive.cpp index 2fd047572b2..453e124bc20 100644 --- a/libs/JSystem/JKernel/JKRDvdArchive.cpp +++ b/libs/JSystem/JKernel/JKRDvdArchive.cpp @@ -87,8 +87,6 @@ struct JKRDvdArchive { // Forward References: // -extern "C" extern char const* const JKRDvdArchive__stringBase0; - extern "C" void __ct__13JKRDvdArchiveFlQ210JKRArchive15EMountDirection(); extern "C" void __dt__13JKRDvdArchiveFv(); extern "C" void open__13JKRDvdArchiveFl(); @@ -105,8 +103,6 @@ extern "C" extern char const* const JKRDvdArchive__stringBase0; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sVolumeList__13JKRFileLoader[12]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; SECTION_INIT void memset(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp index aa330dd525c..f8254ddbfc6 100644 --- a/libs/JSystem/JKernel/JKRDvdFile.cpp +++ b/libs/JSystem/JKernel/JKRDvdFile.cpp @@ -61,8 +61,6 @@ struct JKRDisposer { // Forward References: // -extern "C" extern char const* const JKRDvdFile__stringBase0; - extern "C" void __ct__10JKRDvdFileFv(); extern "C" void __ct__10JKRDvdFileFPCc(); extern "C" void __ct__10JKRDvdFileFl(); @@ -85,7 +83,6 @@ extern "C" extern char const* const JKRDvdFile__stringBase0; // void operator delete(void*); -extern "C" extern void* __vt__7JKRFile[8]; extern "C" void __dl__FPv(); extern "C" void __ct__11JKRDisposerFv(); diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp index 0cc681ff96c..1127ed6ec54 100644 --- a/libs/JSystem/JKernel/JKRDvdRipper.cpp +++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp @@ -67,8 +67,6 @@ static void JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*); static void decompSZS_subroutine(u8*, u8*); static void firstSrcData(); static void nextSrcData(u8*); -extern "C" extern char const* const JKRDvdRipper__stringBase0; -extern "C" extern u32 sSZSBufferSize__12JKRDvdRipper; extern "C" void loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl(); @@ -91,7 +89,6 @@ extern "C" extern u32 sSZSBufferSize__12JKRDvdRipper; // void operator delete(void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; SECTION_INIT void memcpy(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRExpHeap.cpp b/libs/JSystem/JKernel/JKRExpHeap.cpp index d3331d3be19..fc2e0feec45 100644 --- a/libs/JSystem/JKernel/JKRExpHeap.cpp +++ b/libs/JSystem/JKernel/JKRExpHeap.cpp @@ -84,8 +84,6 @@ struct JKRExpHeap { // Forward References: // -extern "C" extern char const* const JKRExpHeap__stringBase0; - extern "C" void createRoot__10JKRExpHeapFib(); extern "C" void create__10JKRExpHeapFUlP7JKRHeapb(); extern "C" void create__10JKRExpHeapFPvUlP7JKRHeapb(); @@ -136,9 +134,6 @@ extern "C" extern char const* const JKRExpHeap__stringBase0; // void operator delete(void*); -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sRootHeap__7JKRHeap[4]; -extern "C" extern u8 mErrorHandler__7JKRHeap[4]; extern "C" void __ct__7JKRHeapFPvUlP7JKRHeapb(); extern "C" void __dt__7JKRHeapFv(); @@ -579,9 +574,7 @@ SECTION_SDATA2 static f32 lit_1121[1 + 1 /* padding */] = { }; /* 80455FA0-80455FA8 0008+00 s=2 e=0 z=0 None .sdata2 @1123 */ -SECTION_SDATA2 static u8 lit_1123[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1123 = 4503599627370496.0 /* cast u32 to float */; /* 802D03B8-802D05CC 0214+00 s=1 e=0 z=0 None .text dump__10JKRExpHeapFv */ #pragma push diff --git a/libs/JSystem/JKernel/JKRFileCache.cpp b/libs/JSystem/JKernel/JKRFileCache.cpp index a6d95dca346..a4196625d0d 100644 --- a/libs/JSystem/JKernel/JKRFileCache.cpp +++ b/libs/JSystem/JKernel/JKRFileCache.cpp @@ -85,8 +85,6 @@ struct JKRDvdFile { // Forward References: // -extern "C" extern char const* const JKRFileCache__stringBase0; - extern "C" void mount__12JKRFileCacheFPCcP7JKRHeapPCc(); extern "C" void __ct__12JKRFileCacheFPCcPCc(); extern "C" void __dt__12JKRFileCacheFv(); @@ -119,9 +117,6 @@ extern "C" extern char const* const JKRFileCache__stringBase0; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sVolumeList__13JKRFileLoader[12]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */]; SECTION_INIT void memcpy(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRFileLoader.cpp b/libs/JSystem/JKernel/JKRFileLoader.cpp index 4dce96e3b94..0005f51f338 100644 --- a/libs/JSystem/JKernel/JKRFileLoader.cpp +++ b/libs/JSystem/JKernel/JKRFileLoader.cpp @@ -49,10 +49,6 @@ struct JKRDisposer { // Forward References: // -extern "C" extern char const* const JKRFileLoader__stringBase0; -extern "C" extern u8 sVolumeList__13JKRFileLoader[12]; -extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */]; - extern "C" void __ct__13JKRFileLoaderFv(); extern "C" void __dt__13JKRFileLoaderFv(); extern "C" void unmount__13JKRFileLoaderFv(); @@ -73,7 +69,6 @@ extern "C" extern u8 sCurrentVolume__13JKRFileLoader[4 + 4 /* padding */]; // void operator delete(void*); -extern "C" extern u8 __lower_map[256]; extern "C" void __dl__FPv(); extern "C" void __ct__11JKRDisposerFv(); diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index 37fd7d0a3ae..986eb792d0c 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -89,16 +89,6 @@ void* operator new[](u32, int); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern char const* const JKRHeap__stringBase0; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sRootHeap__7JKRHeap[4]; -extern "C" extern u8 mErrorHandler__7JKRHeap[4]; -extern "C" extern u8 mCodeStart__7JKRHeap[4]; -extern "C" extern u8 mCodeEnd__7JKRHeap[4]; -extern "C" extern u8 mUserRamStart__7JKRHeap[4]; -extern "C" extern u8 mUserRamEnd__7JKRHeap[4]; -extern "C" extern u8 mMemorySize__7JKRHeap[4]; extern "C" void __ct__7JKRHeapFPvUlP7JKRHeapb(); extern "C" void __dt__7JKRHeapFv(); @@ -162,8 +152,6 @@ extern "C" extern u8 mMemorySize__7JKRHeap[4]; // External References: // -extern "C" extern u8 data_804508B0[8]; - extern "C" bool dump_sort__7JKRHeapFv(); extern "C" void __ct__11JKRDisposerFv(); extern "C" void __dt__11JKRDisposerFv(); diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp index b062293f313..1e7641735d1 100644 --- a/libs/JSystem/JKernel/JKRMemArchive.cpp +++ b/libs/JSystem/JKernel/JKRMemArchive.cpp @@ -87,8 +87,6 @@ struct JKRDecomp { // Forward References: // -extern "C" extern char const* const JKRMemArchive__stringBase0; - extern "C" void __ct__13JKRMemArchiveFlQ210JKRArchive15EMountDirection(); extern "C" void __ct__13JKRMemArchiveFPvUl15JKRMemBreakFlag(); extern "C" void __dt__13JKRMemArchiveFv(); @@ -107,7 +105,6 @@ extern "C" extern char const* const JKRMemArchive__stringBase0; // void operator delete(void*); -extern "C" extern u8 sVolumeList__13JKRFileLoader[12]; SECTION_INIT void memcpy(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); diff --git a/libs/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp index 89d81fd0253..b91696d3f5a 100644 --- a/libs/JSystem/JKernel/JKRSolidHeap.cpp +++ b/libs/JSystem/JKernel/JKRSolidHeap.cpp @@ -60,8 +60,6 @@ struct JKRSolidHeap { // Forward References: // -extern "C" extern char const* const JKRSolidHeap__stringBase0; - extern "C" void create__12JKRSolidHeapFUlP7JKRHeapb(); extern "C" void do_destroy__12JKRSolidHeapFv(); extern "C" void __ct__12JKRSolidHeapFPvUlP7JKRHeapb(); @@ -91,8 +89,6 @@ extern "C" extern char const* const JKRSolidHeap__stringBase0; // void operator delete(void*); -extern "C" extern u8 sRootHeap__7JKRHeap[4]; -extern "C" extern u8 mErrorHandler__7JKRHeap[4]; extern "C" bool dump_sort__7JKRHeapFv(); extern "C" void __ct__7JKRHeapFPvUlP7JKRHeapb(); @@ -331,14 +327,10 @@ SECTION_SDATA2 static f32 lit_693[1 + 1 /* padding */] = { }; /* 80455FB0-80455FB8 0008+00 s=1 e=0 z=0 None .sdata2 @695 */ -SECTION_SDATA2 static u8 lit_695[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_695 = 4503601774854144.0 /* cast s32 to float */; /* 80455FB8-80455FC0 0008+00 s=1 e=0 z=0 None .sdata2 @697 */ -SECTION_SDATA2 static u8 lit_697[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_697 = 4503599627370496.0 /* cast u32 to float */; /* 802D10FC-802D11FC 0100+00 s=1 e=0 z=0 None .text dump__12JKRSolidHeapFv */ #pragma push diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index 98d27f92c1f..361f51b4b8b 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -44,8 +44,6 @@ struct JSUList__template4 { /* 802D1F50 */ ~JSUList__template4(); }; -struct JKRThreadName_ {}; - struct JKRHeap { /* 802CE438 */ void becomeCurrentHeap(); /* 802CE474 */ void alloc(u32, int, JKRHeap*); @@ -66,6 +64,8 @@ struct JKRThread { /* 802D1E14 */ bool run(); }; +struct JKRThreadName_ {}; + struct JKRThreadSwitch { /* 802D199C */ JKRThreadSwitch(JKRHeap*); /* 802D1A14 */ void createManager(JKRHeap*); @@ -85,10 +85,6 @@ struct JKRDisposer { // Forward References: // -extern "C" extern char const* const JKRThread__stringBase0; -extern "C" extern u8 sEndMesgQueue__7JKRTask[32]; -extern "C" extern u8 sManager__15JKRThreadSwitch[4]; - extern "C" void __ct__9JKRThreadFUlii(); extern "C" void __ct__9JKRThreadFP7JKRHeapUlii(); extern "C" void __ct__9JKRThreadFP8OSThreadi(); @@ -118,9 +114,6 @@ extern "C" extern u8 sManager__15JKRThreadSwitch[4]; void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sRootHeap__7JKRHeap[4]; extern "C" void becomeCurrentHeap__7JKRHeapFv(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); @@ -359,15 +352,13 @@ asm void JKRThreadSwitch::callback(OSThread* param_0, OSThread* param_1) { /* ############################################################################################## */ /* 80455FC0-80455FC4 0004+00 s=1 e=0 z=0 None .sdata2 @934 */ -SECTION_SDATA2 static u32 lit_934 = 0x42C80000; +SECTION_SDATA2 static f32 lit_934 = 100.0f; /* 80455FC4-80455FC8 0004+00 s=1 e=0 z=0 None .sdata2 @935 */ -SECTION_SDATA2 static u32 lit_935 = 0x447A0000; +SECTION_SDATA2 static f32 lit_935 = 1000.0f; /* 80455FC8-80455FD0 0008+00 s=1 e=0 z=0 None .sdata2 @937 */ -SECTION_SDATA2 static u8 lit_937[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_937 = 4503599627370496.0 /* cast u32 to float */; /* 802D1C74-802D1E14 01A0+00 s=1 e=0 z=0 None .text * draw__15JKRThreadSwitchFP14JKRThreadName_P10JUTConsole */ diff --git a/libs/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/JMath/JMATrigonometric.cpp index f9d8d29ffd7..925a093e7ba 100644 --- a/libs/JSystem/JMath/JMATrigonometric.cpp +++ b/libs/JSystem/JMath/JMATrigonometric.cpp @@ -25,9 +25,6 @@ struct pair__template0 { // Forward References: // -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 asinAcosTable___5JMath[4128]; - extern "C" void __sinit_JMATrigonometric_cpp(); extern "C" void func_80339CB0(); extern "C" extern u8 sincosTable___5JMath[65536]; @@ -60,32 +57,20 @@ static u8 atanTable___5JMath[4128]; u8 asinAcosTable___5JMath[4128]; /* 804564D8-804564E0 0004+04 s=2 e=0 z=0 None .sdata2 @326 */ -SECTION_SDATA2 static u8 lit_326[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_326[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 804564E0-804564E8 0008+00 s=1 e=0 z=0 None .sdata2 @436 */ -SECTION_SDATA2 static u8 lit_436[8] = { - 0x40, 0x19, 0x21, 0xFB, 0x60, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_436 = 6.2831854820251465; /* 804564E8-804564F0 0008+00 s=1 e=0 z=0 None .sdata2 @437 */ -SECTION_SDATA2 static u8 lit_437[8] = { - 0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_437 = 8192.0; /* 804564F0-804564F8 0008+00 s=1 e=0 z=0 None .sdata2 @438 */ -SECTION_SDATA2 static u8 lit_438[8] = { - 0x3F, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_438 = 0.0009765625; /* 804564F8-80456500 0004+04 s=1 e=0 z=0 None .sdata2 @439 */ SECTION_SDATA2 static f32 lit_439[1 + 1 /* padding */] = { @@ -95,9 +80,7 @@ SECTION_SDATA2 static f32 lit_439[1 + 1 /* padding */] = { }; /* 80456500-80456508 0008+00 s=1 e=0 z=0 None .sdata2 @441 */ -SECTION_SDATA2 static u8 lit_441[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_441 = 4503601774854144.0 /* cast s32 to float */; /* 80339AEC-80339CB0 01C4+00 s=0 e=1 z=0 None .text __sinit_JMATrigonometric_cpp */ #pragma push diff --git a/libs/JSystem/JMath/JMath.cpp b/libs/JSystem/JMath/JMath.cpp index 0b5847cf096..ee0886727c3 100644 --- a/libs/JSystem/JMath/JMath.cpp +++ b/libs/JSystem/JMath/JMath.cpp @@ -37,8 +37,6 @@ extern "C" void JMAMTXApplyScale__FPA4_CfPA4_ffff(); extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 sincosTable___5JMath[65536]; - // // Declarations: // diff --git a/libs/JSystem/JMessage/data.cpp b/libs/JSystem/JMessage/data.cpp index 198abbe322d..5af388444c6 100644 --- a/libs/JSystem/JMessage/data.cpp +++ b/libs/JSystem/JMessage/data.cpp @@ -13,8 +13,6 @@ extern "C" extern u32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */]; -extern "C" extern u32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */]; - // // External References: // diff --git a/libs/JSystem/JMessage/processor.cpp b/libs/JSystem/JMessage/processor.cpp index 09b4b9baf4d..c7c11c66733 100644 --- a/libs/JSystem/JMessage/processor.cpp +++ b/libs/JSystem/JMessage/processor.cpp @@ -111,8 +111,6 @@ struct JMessage { // Forward References: // -extern "C" extern void* __vt__Q28JMessage10TReference[4 + 1 /* padding */]; - extern "C" void __dt__Q28JMessage10TReferenceFv(); extern "C" bool do_word__Q28JMessage10TReferenceCFUl(); extern "C" void __dt__Q28JMessage10TProcessorFv(); diff --git a/libs/JSystem/JMessage/resource.cpp b/libs/JSystem/JMessage/resource.cpp index 9a64414e1e2..f064b5adf56 100644 --- a/libs/JSystem/JMessage/resource.cpp +++ b/libs/JSystem/JMessage/resource.cpp @@ -99,8 +99,6 @@ extern "C" void func_802A94D4(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__Q37JGadget6binary19TParse_header_block[5]; -extern "C" extern u32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */]; extern "C" void parseCharacter_ShiftJIS__Q28JMessage6localeFPPCc(); extern "C" void parseCharacter_UTF8__Q28JMessage6localeFPPCc(); diff --git a/libs/JSystem/JParticle/JPABaseShape.cpp b/libs/JSystem/JParticle/JPABaseShape.cpp index 1d5a299252b..32cddf8f4d6 100644 --- a/libs/JSystem/JParticle/JPABaseShape.cpp +++ b/libs/JSystem/JParticle/JPABaseShape.cpp @@ -223,9 +223,6 @@ extern "C" void setGX__12JPABaseShapeCFP18JPAEmitterWorkData(); // External References: // -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_epsilon; - extern "C" void func_8027EEB0(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); extern "C" void load__10JUTTextureF11_GXTexMapID(); @@ -479,9 +476,7 @@ asm void JPACalcClrIdxMerge(JPAEmitterWorkData* param_0) { /* ############################################################################################## */ /* 804552B0-804552B8 0008+00 s=4 e=0 z=0 None .sdata2 @2623 */ -SECTION_SDATA2 static u8 lit_2623[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2623 = 4503601774854144.0 /* cast s32 to float */; /* 80277314-80277384 0070+00 s=0 e=1 z=0 None .text * JPACalcClrIdxMerge__FP18JPAEmitterWorkDataP15JPABaseParticle */ @@ -604,28 +599,20 @@ asm void JPAGenTexCrdMtxPrj(JPAEmitterWorkData* param_0) { /* ############################################################################################## */ /* 804552B8-804552BC 0004+00 s=9 e=0 z=0 None .sdata2 @2740 */ -SECTION_SDATA2 static u32 lit_2740 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2740 = 0.5f; /* 804552BC-804552C0 0004+00 s=14 e=0 z=0 None .sdata2 @2741 */ -SECTION_SDATA2 static u32 lit_2741 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2741 = 1.0f; /* 804552C0-804552C8 0004+04 s=19 e=0 z=0 None .sdata2 @2742 */ -SECTION_SDATA2 static u8 lit_2742[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_2742[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 804552C8-804552D0 0008+00 s=6 e=0 z=0 None .sdata2 @2744 */ -SECTION_SDATA2 static u8 lit_2744[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2744 = 4503599627370496.0 /* cast u32 to float */; /* 802775AC-80277758 01AC+00 s=0 e=1 z=0 None .text * JPAGenCalcTexCrdMtxAnm__FP18JPAEmitterWorkData */ @@ -984,10 +971,10 @@ asm static void rotTypeZ(f32 param_0, f32 param_1, f32 (¶m_2)[3][4]) { /* ############################################################################################## */ /* 804552D0-804552D4 0004+00 s=1 e=0 z=0 None .sdata2 @3145 */ -SECTION_SDATA2 static u32 lit_3145 = 0x3EAAAA9F; +SECTION_SDATA2 static f32 lit_3145 = 0.33333298563957214f; /* 804552D4-804552D8 0004+00 s=1 e=0 z=0 None .sdata2 @3146 */ -SECTION_SDATA2 static u32 lit_3146 = 0x3F13CD36; +SECTION_SDATA2 static f32 lit_3146 = 0.5773500204086304f; /* 80278494-802784F0 005C+00 s=1 e=0 z=0 None .text rotTypeXYZ__FffRA3_A4_f */ #pragma push @@ -1056,10 +1043,10 @@ SECTION_SDATA static void* p_dl[2] = { }; /* 804552D8-804552DC 0004+00 s=6 e=0 z=0 None .sdata2 @3281 */ -SECTION_SDATA2 static u32 lit_3281 = 0x42000000; +SECTION_SDATA2 static f32 lit_3281 = 32.0f; /* 804552DC-804552E0 0004+00 s=6 e=0 z=0 None .sdata2 @3282 */ -SECTION_SDATA2 static u32 lit_3282 = 0x40400000; +SECTION_SDATA2 static f32 lit_3282 = 3.0f; /* 802785F8-80278994 039C+00 s=0 e=1 z=0 None .text * JPADrawDirection__FP18JPAEmitterWorkDataP15JPABaseParticle */ diff --git a/libs/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/JParticle/JPAChildShape.cpp index 385888ff405..dc472f81126 100644 --- a/libs/JSystem/JParticle/JPAChildShape.cpp +++ b/libs/JSystem/JParticle/JPAChildShape.cpp @@ -55,10 +55,10 @@ asm void JPARegistChildPrmEnv(JPAEmitterWorkData* param_0) { /* ############################################################################################## */ /* 80455308-8045530C 0004+00 s=1 e=0 z=0 None .sdata2 @2318 */ -SECTION_SDATA2 static u32 lit_2318 = 0x437F0000; +SECTION_SDATA2 static f32 lit_2318 = 255.0f; /* 8045530C-80455310 0004+00 s=2 e=0 z=0 None .sdata2 @2319 */ -SECTION_SDATA2 static u32 lit_2319 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2319 = 1.0f; /* 8027AFDC-8027B008 002C+00 s=0 e=1 z=0 None .text * JPACalcChildAlphaOut__FP18JPAEmitterWorkDataP15JPABaseParticle */ diff --git a/libs/JSystem/JParticle/JPADynamicsBlock.cpp b/libs/JSystem/JParticle/JPADynamicsBlock.cpp index 6d06aa35882..f6795cc62c9 100644 --- a/libs/JSystem/JParticle/JPADynamicsBlock.cpp +++ b/libs/JSystem/JParticle/JPADynamicsBlock.cpp @@ -50,8 +50,6 @@ extern "C" void create__16JPADynamicsBlockFP18JPAEmitterWorkData(); // External References: // -extern "C" extern u8 sincosTable___5JMath[65536]; - extern "C" void createParticle__14JPABaseEmitterFv(); extern "C" extern u8 sincosTable___5JMath[65536]; @@ -69,7 +67,7 @@ SECTION_SDATA2 static u8 lit_2287[4] = { }; /* 80455314-80455318 0004+00 s=7 e=0 z=0 None .sdata2 @2288 */ -SECTION_SDATA2 static u32 lit_2288 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2288 = 1.0f; /* 80455318-80455320 0004+04 s=3 e=0 z=0 None .sdata2 @2289 */ SECTION_SDATA2 static f32 lit_2289[1 + 1 /* padding */] = { @@ -90,9 +88,7 @@ asm static void JPAVolumePoint(JPAEmitterWorkData* param_0) { /* ############################################################################################## */ /* 80455320-80455328 0008+00 s=6 e=0 z=0 None .sdata2 @2321 */ -SECTION_SDATA2 static u8 lit_2321[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2321 = 4503601774854144.0 /* cast s32 to float */; /* 8027B220-8027B33C 011C+00 s=1 e=0 z=0 None .text JPAVolumeLine__FP18JPAEmitterWorkData */ #pragma push @@ -133,9 +129,7 @@ SECTION_SDATA2 static f32 lit_2501[1 + 1 /* padding */] = { }; /* 80455330-80455338 0008+00 s=1 e=0 z=0 None .sdata2 @2503 */ -SECTION_SDATA2 static u8 lit_2503[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2503 = 4503599627370496.0 /* cast u32 to float */; /* 8027B5F0-8027B87C 028C+00 s=1 e=0 z=0 None .text JPAVolumeSphere__FP18JPAEmitterWorkData */ #pragma push diff --git a/libs/JSystem/JParticle/JPAEmitter.cpp b/libs/JSystem/JParticle/JPAEmitter.cpp index b619b761617..867297028fe 100644 --- a/libs/JSystem/JParticle/JPAEmitter.cpp +++ b/libs/JSystem/JParticle/JPAEmitter.cpp @@ -73,8 +73,6 @@ extern "C" void loadTexture__14JPABaseEmitterFUc11_GXTexMapID(); // void operator delete(void*); -extern "C" extern void* __vt__18JPAEmitterCallBack[7]; -extern "C" extern u32 __float_epsilon; extern "C" void init_p__15JPABaseParticleFP18JPAEmitterWorkData(); extern "C" void init_c__15JPABaseParticleFP18JPAEmitterWorkDataP15JPABaseParticle(); @@ -103,7 +101,7 @@ asm JPAEmitterCallBack::~JPAEmitterCallBack() { /* ############################################################################################## */ /* 80455370-80455374 0004+00 s=1 e=0 z=0 None .sdata2 @2440 */ -SECTION_SDATA2 static u32 lit_2440 = 0x42000000; +SECTION_SDATA2 static f32 lit_2440 = 32.0f; /* 80455374-80455378 0004+00 s=1 e=0 z=0 None .sdata2 @2441 */ SECTION_SDATA2 static u8 lit_2441[4] = { @@ -114,10 +112,10 @@ SECTION_SDATA2 static u8 lit_2441[4] = { }; /* 80455378-8045537C 0004+00 s=1 e=0 z=0 None .sdata2 @2442 */ -SECTION_SDATA2 static u32 lit_2442 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2442 = 0.5f; /* 8045537C-80455380 0004+00 s=1 e=0 z=0 None .sdata2 @2443 */ -SECTION_SDATA2 static u32 lit_2443 = 0x40400000; +SECTION_SDATA2 static f32 lit_2443 = 3.0f; /* 80455380-80455388 0004+04 s=1 e=0 z=0 None .sdata2 @2444 */ SECTION_SDATA2 static f32 lit_2444[1 + 1 /* padding */] = { diff --git a/libs/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/JParticle/JPAEmitterManager.cpp index 27fb9b31a26..940e4724789 100644 --- a/libs/JSystem/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/JParticle/JPAEmitterManager.cpp @@ -38,13 +38,6 @@ struct JPAResourceManager { struct JPAEmitterWorkData {}; -struct JPAEmitterCallBack {}; - -struct JPABaseEmitter; -struct JPAParticleCallBack {}; - -struct JPADrawInfo {}; - struct JGeometry { template struct TVec3 {}; @@ -54,6 +47,13 @@ struct JGeometry { struct JKRHeap {}; +struct JPAEmitterCallBack {}; + +struct JPADrawInfo {}; + +struct JPAParticleCallBack {}; + +struct JPABaseEmitter; struct JPAEmitterManager { /* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8); /* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3 const&, u16, u8, u8, @@ -117,7 +117,6 @@ extern "C" void __ct__14JPABaseEmitterFv(); void* operator new(u32, JKRHeap*, int); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u32 __float_epsilon; extern "C" void getResource__18JPAResourceManagerCFUs(); extern "C" void calc__11JPAResourceFP18JPAEmitterWorkDataP14JPABaseEmitter(); @@ -274,13 +273,13 @@ SECTION_SDATA2 static u8 lit_2632[4] = { }; /* 8045535C-80455360 0004+00 s=1 e=0 z=0 None .sdata2 @2633 */ -SECTION_SDATA2 static u32 lit_2633 = 0x42000000; +SECTION_SDATA2 static f32 lit_2633 = 32.0f; /* 80455360-80455364 0004+00 s=1 e=0 z=0 None .sdata2 @2634 */ -SECTION_SDATA2 static u32 lit_2634 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2634 = 0.5f; /* 80455364-80455368 0004+00 s=1 e=0 z=0 None .sdata2 @2635 */ -SECTION_SDATA2 static u32 lit_2635 = 0x40400000; +SECTION_SDATA2 static f32 lit_2635 = 3.0f; /* 80455368-80455370 0004+04 s=1 e=0 z=0 None .sdata2 @2636 */ SECTION_SDATA2 static f32 lit_2636[1 + 1 /* padding */] = { diff --git a/libs/JSystem/JParticle/JPAExtraShape.cpp b/libs/JSystem/JParticle/JPAExtraShape.cpp index 8a7263d3dcc..a7ce6227220 100644 --- a/libs/JSystem/JParticle/JPAExtraShape.cpp +++ b/libs/JSystem/JParticle/JPAExtraShape.cpp @@ -54,8 +54,6 @@ extern "C" void init__13JPAExtraShapeFv(); extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 sincosTable___5JMath[65536]; - // // Declarations: // @@ -114,9 +112,7 @@ asm void JPACalcScaleAnmNormal(JPAEmitterWorkData* param_0, JPABaseParticle* par /* ############################################################################################## */ /* 804552E8-804552F0 0008+00 s=5 e=0 z=0 None .sdata2 @2312 */ -SECTION_SDATA2 static u8 lit_2312[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2312 = 4503601774854144.0 /* cast s32 to float */; /* 8027AA20-8027AA84 0064+00 s=0 e=1 z=0 None .text * JPACalcScaleAnmRepeatX__FP18JPAEmitterWorkDataP15JPABaseParticle */ @@ -142,7 +138,7 @@ asm void JPACalcScaleAnmRepeatY(JPAEmitterWorkData* param_0, JPABaseParticle* pa /* ############################################################################################## */ /* 804552F0-804552F4 0004+00 s=2 e=0 z=0 None .sdata2 @2339 */ -SECTION_SDATA2 static u32 lit_2339 = 0x40000000; +SECTION_SDATA2 static f32 lit_2339 = 2.0f; /* 8027AAE8-8027AB7C 0094+00 s=0 e=1 z=0 None .text * JPACalcScaleAnmReverseX__FP18JPAEmitterWorkDataP15JPABaseParticle */ @@ -168,7 +164,7 @@ asm void JPACalcScaleAnmReverseY(JPAEmitterWorkData* param_0, JPABaseParticle* p /* ############################################################################################## */ /* 804552F4-804552F8 0004+00 s=2 e=0 z=0 None .sdata2 @2390 */ -SECTION_SDATA2 static u32 lit_2390 = 0x437F0000; +SECTION_SDATA2 static f32 lit_2390 = 255.0f; /* 8027AC10-8027AC98 0088+00 s=0 e=1 z=0 None .text * JPACalcAlphaAnm__FP18JPAEmitterWorkDataP15JPABaseParticle */ @@ -183,10 +179,10 @@ asm void JPACalcAlphaAnm(JPAEmitterWorkData* param_0, JPABaseParticle* param_1) /* ############################################################################################## */ /* 804552F8-804552FC 0004+00 s=1 e=0 z=0 None .sdata2 @2433 */ -SECTION_SDATA2 static u32 lit_2433 = 0x46800000; +SECTION_SDATA2 static f32 lit_2433 = 16384.0f; /* 804552FC-80455300 0004+00 s=1 e=0 z=0 None .sdata2 @2434 */ -SECTION_SDATA2 static u32 lit_2434 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2434 = 0.5f; /* 8027AC98-8027AD88 00F0+00 s=0 e=1 z=0 None .text * JPACalcAlphaFlickAnm__FP18JPAEmitterWorkDataP15JPABaseParticle */ @@ -211,16 +207,10 @@ asm JPAExtraShape::JPAExtraShape(u8 const* param_0) { /* ############################################################################################## */ /* 80455300-80455308 0004+04 s=1 e=0 z=0 None .sdata2 @2503 */ -SECTION_SDATA2 static u8 lit_2503[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_2503[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 8027ADBC-8027AEBC 0100+00 s=1 e=0 z=0 None .text init__13JPAExtraShapeFv */ diff --git a/libs/JSystem/JParticle/JPAFieldBlock.cpp b/libs/JSystem/JParticle/JPAFieldBlock.cpp index 71cfc0124df..c2af2025654 100644 --- a/libs/JSystem/JParticle/JPAFieldBlock.cpp +++ b/libs/JSystem/JParticle/JPAFieldBlock.cpp @@ -11,8 +11,6 @@ // Types: // -struct JPAEmitterWorkData {}; - struct JKRHeap {}; struct JPAFieldBlock { @@ -20,6 +18,8 @@ struct JPAFieldBlock { /* 8027D0C0 */ void init(JKRHeap*); }; +struct JPAEmitterWorkData {}; + struct JPABaseParticle {}; struct JPAFieldVortex { @@ -123,7 +123,6 @@ extern "C" void __dt__15JPAFieldGravityFv(); void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u32 __float_epsilon; extern "C" void prepare__12JPAFieldBaseFP18JPAEmitterWorkDataP13JPAFieldBlock(); extern "C" void* __nw__FUlP7JKRHeapi(); @@ -153,7 +152,7 @@ asm void JPAFieldBase::calcAffect(JPAFieldBlock* param_0, JPABaseParticle* param /* ############################################################################################## */ /* 80455338-8045533C 0004+00 s=6 e=0 z=0 None .sdata2 @2353 */ -SECTION_SDATA2 static u32 lit_2353 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2353 = 1.0f; /* 8045533C-80455340 0004+00 s=11 e=0 z=0 None .sdata2 @2354 */ SECTION_SDATA2 static u8 lit_2354[4] = { @@ -199,13 +198,13 @@ asm void JPAFieldGravity::calc(JPAEmitterWorkData* param_0, JPAFieldBlock* param /* ############################################################################################## */ /* 80455340-80455344 0004+00 s=8 e=0 z=0 None .sdata2 @2459 */ -SECTION_SDATA2 static u32 lit_2459 = 0x42000000; +SECTION_SDATA2 static f32 lit_2459 = 32.0f; /* 80455344-80455348 0004+00 s=9 e=0 z=0 None .sdata2 @2460 */ -SECTION_SDATA2 static u32 lit_2460 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2460 = 0.5f; /* 80455348-8045534C 0004+00 s=8 e=0 z=0 None .sdata2 @2461 */ -SECTION_SDATA2 static u32 lit_2461 = 0x40400000; +SECTION_SDATA2 static f32 lit_2461 = 3.0f; /* 8027C07C-8027C1B8 013C+00 s=1 e=0 z=0 None .text * prepare__11JPAFieldAirFP18JPAEmitterWorkDataP13JPAFieldBlock */ @@ -266,7 +265,7 @@ asm void JPAFieldNewton::prepare(JPAEmitterWorkData* param_0, JPAFieldBlock* par /* ############################################################################################## */ /* 8045534C-80455350 0004+00 s=1 e=0 z=0 None .sdata2 @2656 */ -SECTION_SDATA2 static u32 lit_2656 = 0x41200000; +SECTION_SDATA2 static f32 lit_2656 = 10.0f; /* 8027C3E0-8027C56C 018C+00 s=1 e=0 z=0 None .text * calc__14JPAFieldNewtonFP18JPAEmitterWorkDataP13JPAFieldBlockP15JPABaseParticle */ diff --git a/libs/JSystem/JParticle/JPAKeyBlock.cpp b/libs/JSystem/JParticle/JPAKeyBlock.cpp index 5370bc48a9e..765ead94364 100644 --- a/libs/JSystem/JParticle/JPAKeyBlock.cpp +++ b/libs/JSystem/JParticle/JPAKeyBlock.cpp @@ -47,9 +47,7 @@ asm JPAKeyBlock::JPAKeyBlock(u8 const* param_0) { /* ############################################################################################## */ /* 80455350-80455358 0008+00 s=1 e=0 z=0 None .sdata2 @2215 */ -SECTION_SDATA2 static u8 lit_2215[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2215 = 4503601774854144.0 /* cast s32 to float */; /* 8027D740-8027D7D4 0094+00 s=0 e=1 z=0 None .text calc__11JPAKeyBlockFf */ #pragma push diff --git a/libs/JSystem/JParticle/JPAMath.cpp b/libs/JSystem/JParticle/JPAMath.cpp index bb24a4c7492..13208f23f51 100644 --- a/libs/JSystem/JParticle/JPAMath.cpp +++ b/libs/JSystem/JParticle/JPAMath.cpp @@ -41,9 +41,6 @@ extern "C" void JPACalcKeyAnmValue__FfUsPCf(); // External References: // -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_epsilon; - extern "C" void PSMTXIdentity(); extern "C" void PSVECMag(); extern "C" void _savegpr_28(); @@ -57,7 +54,7 @@ extern "C" extern u32 __float_epsilon; /* ############################################################################################## */ /* 804553B8-804553BC 0004+00 s=2 e=0 z=0 None .sdata2 @2193 */ -SECTION_SDATA2 static u32 lit_2193 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2193 = 1.0f; /* 804553BC-804553C0 0004+00 s=4 e=0 z=0 None .sdata2 @2238 */ SECTION_SDATA2 static u8 lit_2238[4] = { diff --git a/libs/JSystem/JParticle/JPAParticle.cpp b/libs/JSystem/JParticle/JPAParticle.cpp index 33d550fd4e4..8cb758d152f 100644 --- a/libs/JSystem/JParticle/JPAParticle.cpp +++ b/libs/JSystem/JParticle/JPAParticle.cpp @@ -60,8 +60,6 @@ extern "C" void getHeight__15JPABaseParticleCFPC14JPABaseEmitter(); void JPAGetYZRotateMtx(s16, s16, f32 (*)[4]); void operator delete(void*); void JMAVECScaleAdd(Vec const*, Vec const*, Vec*, f32); -extern "C" extern void* __vt__19JPAParticleCallBack[5]; -extern "C" extern u32 __float_epsilon; extern "C" void calc_p__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle(); extern "C" void calc_c__11JPAResourceFP18JPAEmitterWorkDataP15JPABaseParticle(); @@ -95,7 +93,7 @@ asm JPAParticleCallBack::~JPAParticleCallBack() { /* ############################################################################################## */ /* 80455388-8045538C 0004+00 s=2 e=0 z=0 None .sdata2 @2565 */ -SECTION_SDATA2 static u32 lit_2565 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2565 = 1.0f; /* 8045538C-80455390 0004+00 s=4 e=0 z=0 None .sdata2 @2566 */ SECTION_SDATA2 static u8 lit_2566[4] = { @@ -106,26 +104,22 @@ SECTION_SDATA2 static u8 lit_2566[4] = { }; /* 80455390-80455394 0004+00 s=2 e=0 z=0 None .sdata2 @2567 */ -SECTION_SDATA2 static u32 lit_2567 = 0x42000000; +SECTION_SDATA2 static f32 lit_2567 = 32.0f; /* 80455394-80455398 0004+00 s=2 e=0 z=0 None .sdata2 @2568 */ -SECTION_SDATA2 static u32 lit_2568 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2568 = 0.5f; /* 80455398-8045539C 0004+00 s=2 e=0 z=0 None .sdata2 @2569 */ -SECTION_SDATA2 static u32 lit_2569 = 0x40400000; +SECTION_SDATA2 static f32 lit_2569 = 3.0f; /* 8045539C-804553A0 0004+00 s=1 e=0 z=0 None .sdata2 @2570 */ -SECTION_SDATA2 static u32 lit_2570 = 0x47000000; +SECTION_SDATA2 static f32 lit_2570 = 32768.0f; /* 804553A0-804553A8 0008+00 s=4 e=0 z=0 None .sdata2 @2572 */ -SECTION_SDATA2 static u8 lit_2572[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2572 = 4503601774854144.0 /* cast s32 to float */; /* 804553A8-804553B0 0008+00 s=2 e=0 z=0 None .sdata2 @2574 */ -SECTION_SDATA2 static u8 lit_2574[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2574 = 4503599627370496.0 /* cast u32 to float */; /* 8027EFEC-8027F8C8 08DC+00 s=0 e=1 z=0 None .text * init_p__15JPABaseParticleFP18JPAEmitterWorkData */ diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp index f8042e72975..e5b4bec9f44 100644 --- a/libs/JSystem/JParticle/JPAResource.cpp +++ b/libs/JSystem/JParticle/JPAResource.cpp @@ -19,16 +19,16 @@ struct JUTTexture { struct JPAEmitterWorkData {}; -struct JPABaseEmitter { - /* 8027EDD4 */ void processTillStartFrame(); - /* 8027EE14 */ void processTermination(); -}; - struct JPABaseParticle { /* 8027FFD0 */ void calc_p(JPAEmitterWorkData*); /* 80280260 */ void calc_c(JPAEmitterWorkData*); }; +struct JPABaseEmitter { + /* 8027EDD4 */ void processTillStartFrame(); + /* 8027EE14 */ void processTermination(); +}; + struct JKRHeap { /* 802CE474 */ void alloc(u32, int, JKRHeap*); }; @@ -734,13 +734,13 @@ asm void JPAResource::draw(JPAEmitterWorkData* param_0, JPABaseEmitter* param_1) /* ############################################################################################## */ /* 80455290-80455294 0004+00 s=2 e=0 z=0 None .sdata2 @3189 */ -SECTION_SDATA2 static u32 lit_3189 = 0x3F828F5C; +SECTION_SDATA2 static f32 lit_3189 = 51.0f / 50.0f; /* 80455294-80455298 0004+00 s=2 e=0 z=0 None .sdata2 @3190 */ -SECTION_SDATA2 static u32 lit_3190 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_3190 = 2.0f / 5.0f; /* 80455298-8045529C 0004+00 s=1 e=0 z=0 None .sdata2 @3191 */ -SECTION_SDATA2 static u32 lit_3191 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3191 = 1.0f; /* 8045529C-804552A0 0004+00 s=2 e=0 z=0 None .sdata2 @3192 */ SECTION_SDATA2 static u8 lit_3192[4] = { @@ -751,9 +751,7 @@ SECTION_SDATA2 static u8 lit_3192[4] = { }; /* 804552A0-804552A8 0008+00 s=3 e=0 z=0 None .sdata2 @3194 */ -SECTION_SDATA2 static u8 lit_3194[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3194 = 4503599627370496.0 /* cast u32 to float */; /* 80275B74-80275EB0 033C+00 s=1 e=0 z=0 None .text drawP__11JPAResourceFP18JPAEmitterWorkData */ diff --git a/libs/JSystem/JStage/JSGActor.cpp b/libs/JSystem/JStage/JSGActor.cpp index bfa84136f47..9cedd261824 100644 --- a/libs/JSystem/JStage/JSGActor.cpp +++ b/libs/JSystem/JStage/JSGActor.cpp @@ -59,8 +59,6 @@ struct JStage { // Forward References: // -extern "C" extern void* __vt__Q26JStage6TActor[35 + 1 /* padding */]; - extern "C" void __dt__Q26JStage6TActorFv(); extern "C" s32 JSGFGetType__Q26JStage6TActorCFv(); extern "C" void JSGGetTranslation__Q26JStage6TActorCFP3Vec(); @@ -220,16 +218,10 @@ void JStage::TActor::JSGSetAnimation(u32 param_0) { /* ############################################################################################## */ /* 804553C8-804553D0 0004+04 s=5 e=0 z=0 None .sdata2 @343 */ -SECTION_SDATA2 static u8 lit_343[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_343[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80280AE0-80280AE8 0008+00 s=1 e=1 z=0 None .text JSGGetAnimationFrame__Q26JStage6TActorCFv diff --git a/libs/JSystem/JStage/JSGAmbientLight.cpp b/libs/JSystem/JStage/JSGAmbientLight.cpp index 8d8341b91a9..0bac0c601e1 100644 --- a/libs/JSystem/JStage/JSGAmbientLight.cpp +++ b/libs/JSystem/JStage/JSGAmbientLight.cpp @@ -41,8 +41,6 @@ struct JStage { // Forward References: // -extern "C" extern void* __vt__Q26JStage13TAmbientLight[17 + 1 /* padding */]; - extern "C" void __dt__Q26JStage13TAmbientLightFv(); extern "C" s32 JSGFGetType__Q26JStage13TAmbientLightCFv(); extern "C" void JSGGetColor__Q26JStage13TAmbientLightCFv(); diff --git a/libs/JSystem/JStage/JSGCamera.cpp b/libs/JSystem/JStage/JSGCamera.cpp index 51522c5b828..acc1cc0eb5b 100644 --- a/libs/JSystem/JStage/JSGCamera.cpp +++ b/libs/JSystem/JStage/JSGCamera.cpp @@ -65,8 +65,6 @@ struct JStage { // Forward References: // -extern "C" extern void* __vt__Q26JStage7TCamera[37 + 1 /* padding */]; - extern "C" void __dt__Q26JStage7TCameraFv(); extern "C" s32 JSGFGetType__Q26JStage7TCameraCFv(); extern "C" bool JSGGetProjectionType__Q26JStage7TCameraCFv(); @@ -98,7 +96,6 @@ extern "C" extern void* __vt__Q26JStage7TCamera[37 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern u32 __float_max; extern "C" void __dt__Q26JStage7TObjectFv(); extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); @@ -192,16 +189,10 @@ void JStage::TCamera::JSGSetProjectionType(JStage::TECameraProjection param_0) { /* ############################################################################################## */ /* 804553D8-804553E0 0004+04 s=4 e=0 z=0 None .sdata2 @319 */ -SECTION_SDATA2 static u8 lit_319[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_319[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80280C14-80280C1C 0008+00 s=1 e=0 z=0 None .text JSGGetProjectionNear__Q26JStage7TCameraCFv diff --git a/libs/JSystem/JStage/JSGFog.cpp b/libs/JSystem/JStage/JSGFog.cpp index c2654293771..495987e1316 100644 --- a/libs/JSystem/JStage/JSGFog.cpp +++ b/libs/JSystem/JStage/JSGFog.cpp @@ -49,8 +49,6 @@ struct JStage { // Forward References: // -extern "C" extern void* __vt__Q26JStage4TFog[23 + 1 /* padding */]; - extern "C" void __dt__Q26JStage4TFogFv(); extern "C" s32 JSGFGetType__Q26JStage4TFogCFv(); extern "C" bool JSGGetFogFunction__Q26JStage4TFogCFv(); @@ -68,7 +66,6 @@ extern "C" extern void* __vt__Q26JStage4TFog[23 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern u32 __float_max; extern "C" void __dt__Q26JStage7TObjectFv(); extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); diff --git a/libs/JSystem/JStage/JSGLight.cpp b/libs/JSystem/JStage/JSGLight.cpp index 670f330f3e8..7a01dad5aa5 100644 --- a/libs/JSystem/JStage/JSGLight.cpp +++ b/libs/JSystem/JStage/JSGLight.cpp @@ -59,8 +59,6 @@ struct JStage { // Forward References: // -extern "C" extern void* __vt__Q26JStage6TLight[27 + 1 /* padding */]; - extern "C" void __dt__Q26JStage6TLightFv(); extern "C" s32 JSGFGetType__Q26JStage6TLightCFv(); extern "C" bool JSGGetLightType__Q26JStage6TLightCFv(); diff --git a/libs/JSystem/JStage/JSGObject.cpp b/libs/JSystem/JStage/JSGObject.cpp index 1e39f1513ad..40c217967fc 100644 --- a/libs/JSystem/JStage/JSGObject.cpp +++ b/libs/JSystem/JStage/JSGObject.cpp @@ -32,8 +32,6 @@ struct JStage { // Forward References: // -extern "C" extern void* __vt__Q26JStage7TObject[15 + 1 /* padding */]; - extern "C" void __dt__Q26JStage7TObjectFv(); extern "C" bool JSGGetName__Q26JStage7TObjectCFv(); extern "C" void JSGUpdate__Q26JStage7TObjectFv(); @@ -147,16 +145,10 @@ s32 JStage::TObject::JSGFindNodeID(char const* param_0) const { /* ############################################################################################## */ /* 804553F0-804553F8 0004+04 s=1 e=0 z=0 None .sdata2 @338 */ -SECTION_SDATA2 static u8 lit_338[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_338[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80280E54-80280E90 003C+00 s=1 e=11 z=0 None .text diff --git a/libs/JSystem/JStage/JSGSystem.cpp b/libs/JSystem/JStage/JSGSystem.cpp index 00e500eb708..a76b6e7d1cd 100644 --- a/libs/JSystem/JStage/JSGSystem.cpp +++ b/libs/JSystem/JStage/JSGSystem.cpp @@ -12,8 +12,6 @@ // struct JStage { - struct TEObject {}; - struct TObject { /* 80280DD4 */ ~TObject(); /* 80280E1C */ bool JSGGetName() const; @@ -29,6 +27,8 @@ struct JStage { /* 80280E54 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const; }; + struct TEObject {}; + struct TSystem { /* 80280E90 */ ~TSystem(); /* 80280EF0 */ bool JSGFGetType() const; @@ -44,8 +44,6 @@ struct JStage { // Forward References: // -extern "C" extern void* __vt__Q26JStage7TSystem[20]; - extern "C" void __dt__Q26JStage7TSystemFv(); extern "C" bool JSGFGetType__Q26JStage7TSystemCFv(); extern "C" bool JSGFindObject__Q26JStage7TSystemCFPPQ26JStage7TObjectPCcQ26JStage8TEObject(); diff --git a/libs/JSystem/JStudio/JStudio/ctb-data.cpp b/libs/JSystem/JStudio/JStudio/ctb-data.cpp index a0c6ea93398..a03fd7be31e 100644 --- a/libs/JSystem/JStudio/JStudio/ctb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/ctb-data.cpp @@ -13,8 +13,6 @@ extern "C" extern u32 ga4cSignature__Q37JStudio3ctb4data[1 + 1 /* padding */]; -extern "C" extern u32 ga4cSignature__Q37JStudio3ctb4data[1 + 1 /* padding */]; - // // External References: // diff --git a/libs/JSystem/JStudio/JStudio/ctb.cpp b/libs/JSystem/JStudio/JStudio/ctb.cpp index 9949795d4da..f5abf314c3a 100644 --- a/libs/JSystem/JStudio/JStudio/ctb.cpp +++ b/libs/JSystem/JStudio/JStudio/ctb.cpp @@ -11,32 +11,6 @@ // Types: // -namespace JGadget { -template -struct TLinkList {}; -/* TLinkList */ -struct TLinkList__template0 { - struct iterator {}; -}; - -struct binary { - struct TParse_header_block { - /* 802DC8C8 */ ~TParse_header_block(); - }; -}; - -struct TLinkListNode {}; - -struct TNodeLinkList { - struct iterator {}; - - /* 802DCA1C */ ~TNodeLinkList(); - /* 802DCBA8 */ void Insert(JGadget::TNodeLinkList::iterator, JGadget::TLinkListNode*); - /* 802DCBD4 */ void Erase(JGadget::TLinkListNode*); -}; - -}; // namespace JGadget - namespace JStudio { namespace ctb { struct TObject { @@ -90,6 +64,32 @@ struct object { }; // namespace JStudio +namespace JGadget { +template +struct TLinkList {}; +/* TLinkList */ +struct TLinkList__template0 { + struct iterator {}; +}; + +struct binary { + struct TParse_header_block { + /* 802DC8C8 */ ~TParse_header_block(); + }; +}; + +struct TLinkListNode {}; + +struct TNodeLinkList { + struct iterator {}; + + /* 802DCA1C */ ~TNodeLinkList(); + /* 802DCBA8 */ void Insert(JGadget::TNodeLinkList::iterator, JGadget::TLinkListNode*); + /* 802DCBD4 */ void Erase(JGadget::TLinkListNode*); +}; + +}; // namespace JGadget + namespace std { /* */ template /* */ void find_if(/* JGadget::TLinkList::iterator, JGadget::TLinkList::iterator, JStudio::object::TPRObject_ID_equal */); @@ -105,9 +105,6 @@ void find_if__template0(JGadget::TLinkList__template0::iterator, // Forward References: // -extern "C" extern void* __vt__Q37JGadget6binary19TParse_header_block[5]; -extern "C" extern void* __vt__Q37JStudio3ctb8TFactory[5]; - extern "C" void __dt__Q37JStudio3ctb7TObjectFv(); extern "C" void __ct__Q37JStudio3ctb14TObject_TxyzRyFRCQ47JStudio3ctb4data13TParse_TBlock(); extern "C" bool getScheme__Q37JStudio3ctb14TObject_TxyzRyCFv(); @@ -137,7 +134,6 @@ extern "C" extern void* __vt__Q37JStudio3ctb8TFactory[5]; void* operator new(u32); void operator delete(void*); -extern "C" extern u32 ga4cSignature__Q37JStudio3ctb4data[1 + 1 /* padding */]; extern "C" void isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData(); diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp index ea79f2be473..e6a8baf4a2d 100644 --- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp @@ -218,13 +218,6 @@ findUpperBound_binary_current__template3(JStudio::TFunctionValue_hermite::TItera // Forward References: // -extern "C" extern void* __vt__Q27JStudio22TFunctionValue_hermite[8]; -extern "C" extern void* __vt__Q27JStudio29TFunctionValue_list_parameter[8]; -extern "C" extern void* __vt__Q27JStudio19TFunctionValue_list[8]; -extern "C" extern void* __vt__Q27JStudio25TFunctionValue_transition[8]; -extern "C" extern void* __vt__Q27JStudio23TFunctionValue_constant[8]; -extern "C" extern void* __vt__Q27JStudio24TFunctionValue_composite[8]; - extern "C" void toFunction_outside__Q27JStudio14TFunctionValueFi(); extern "C" void __ct__Q27JStudio14TFunctionValueFv(); extern "C" void __dt__Q27JStudio14TFunctionValueFv(); @@ -326,7 +319,6 @@ extern "C" extern void* __vt__Q27JStudio24TFunctionValue_composite[8]; // void operator delete(void*); -extern "C" extern u32 __float_nan; extern "C" void __dl__FPv(); extern "C" void func_802DCCD0(); @@ -495,19 +487,13 @@ SECTION_SDATA2 static u8 lit_652[8] = { }; /* 80455408-80455410 0008+00 s=5 e=0 z=0 None .sdata2 @792 */ -SECTION_SDATA2 static u8 lit_792[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_792 = 1.0; /* 80455410-80455418 0008+00 s=1 e=0 z=0 None .sdata2 @793 */ -SECTION_SDATA2 static u8 lit_793[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_793 = 3.0; /* 80455418-80455420 0008+00 s=1 e=0 z=0 None .sdata2 @794 */ -SECTION_SDATA2 static u8 lit_794[8] = { - 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_794 = -2.0; /* 80281710-80281774 0064+00 s=4 e=0 z=0 None .text * interpolateValue_hermite__Q27JStudio13functionvalueFddddddd */ @@ -524,19 +510,13 @@ asm void JStudio::functionvalue::interpolateValue_hermite(f64 param_0, f64 param /* ############################################################################################## */ /* 80455420-80455428 0008+00 s=1 e=0 z=0 None .sdata2 @799 */ -SECTION_SDATA2 static u8 lit_799[8] = { - 0x3F, 0xC5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, -}; +SECTION_SDATA2 static f64 lit_799 = 1.0 / 6.0; /* 80455428-80455430 0008+00 s=5 e=0 z=0 None .sdata2 @800 */ -SECTION_SDATA2 static u8 lit_800[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_800 = 0.5; /* 80455430-80455438 0008+00 s=1 e=0 z=0 None .sdata2 @801 */ -SECTION_SDATA2 static u8 lit_801[8] = { - 0x3F, 0xE5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, -}; +SECTION_SDATA2 static f64 lit_801 = 2.0 / 3.0; /* 80281774-802817D8 0064+00 s=1 e=0 z=0 None .text * interpolateValue_BSpline_uniform__Q27JStudio13functionvalueFddddd */ @@ -566,9 +546,7 @@ asm void JStudio::functionvalue::interpolateValue_BSpline_nonuniform(f64 param_0 /* ############################################################################################## */ /* 80455438-80455440 0008+00 s=3 e=0 z=0 None .sdata2 @842 */ -SECTION_SDATA2 static u8 lit_842[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_842 = 2.0; /* 802818B8-80281918 0060+00 s=1 e=0 z=0 None .text * extrapolateParameter_turn__Q27JStudio13functionvalueFdd */ @@ -594,9 +572,7 @@ asm void JStudio::TFunctionValueAttribute_range::range_initialize() { /* ############################################################################################## */ /* 80455440-80455448 0008+00 s=1 e=0 z=0 None .sdata2 @867 */ -SECTION_SDATA2 static u8 lit_867[8] = { - 0xBF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_867 = -1.0; /* 8028194C-802819F4 00A8+00 s=4 e=0 z=0 None .text * range_prepare__Q27JStudio29TFunctionValueAttribute_rangeFv */ @@ -969,9 +945,7 @@ asm void JStudio::TFunctionValue_list::prepare() { /* ############################################################################################## */ /* 80455448-80455450 0008+00 s=1 e=0 z=0 None .sdata2 @1517 */ -SECTION_SDATA2 static u8 lit_1517[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1517 = 4503599627370496.0 /* cast u32 to float */; /* 80282858-80282C10 03B8+00 s=1 e=0 z=0 None .text getValue__Q27JStudio19TFunctionValue_listFd */ diff --git a/libs/JSystem/JStudio/JStudio/fvb-data.cpp b/libs/JSystem/JStudio/JStudio/fvb-data.cpp index 7d052b6c209..ad4d6f9c36e 100644 --- a/libs/JSystem/JStudio/JStudio/fvb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/fvb-data.cpp @@ -13,8 +13,6 @@ extern "C" extern u32 ga4cSignature__Q37JStudio3fvb4data[1 + 1 /* padding */]; -extern "C" extern u32 ga4cSignature__Q37JStudio3fvb4data[1 + 1 /* padding */]; - // // External References: // diff --git a/libs/JSystem/JStudio/JStudio/fvb.cpp b/libs/JSystem/JStudio/JStudio/fvb.cpp index bed0ced5bb4..f3205edac9f 100644 --- a/libs/JSystem/JStudio/JStudio/fvb.cpp +++ b/libs/JSystem/JStudio/JStudio/fvb.cpp @@ -212,8 +212,6 @@ void find_if__template1(JGadget::TLinkList__template1::iterator, // Forward References: // -extern "C" extern void* __vt__Q37JStudio3fvb8TFactory[5]; - extern "C" void __dt__Q37JStudio3fvb7TObjectFv(); extern "C" void prepare__Q37JStudio3fvb7TObjectFRCQ47JStudio3fvb4data13TParse_TBlockPQ37JStudio3fvb8TControl(); @@ -273,14 +271,6 @@ extern "C" extern void* __vt__Q37JStudio3fvb8TFactory[5]; void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__Q37JGadget6binary19TParse_header_block[5]; -extern "C" extern void* __vt__Q27JStudio22TFunctionValue_hermite[8]; -extern "C" extern void* __vt__Q27JStudio29TFunctionValue_list_parameter[8]; -extern "C" extern void* __vt__Q27JStudio19TFunctionValue_list[8]; -extern "C" extern void* __vt__Q27JStudio25TFunctionValue_transition[8]; -extern "C" extern void* __vt__Q27JStudio23TFunctionValue_constant[8]; -extern "C" extern void* __vt__Q27JStudio24TFunctionValue_composite[8]; -extern "C" extern u32 ga4cSignature__Q37JStudio3fvb4data[1 + 1 /* padding */]; extern "C" void __dt__Q27JStudio14TFunctionValueFv(); extern "C" void range_set__Q27JStudio29TFunctionValueAttribute_rangeFdd(); diff --git a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp index 3c46636b06c..3df1c507629 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-control.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-control.cpp @@ -14,6 +14,26 @@ struct Vec {}; namespace JStudio { +namespace ctb { +struct TObject {}; + +struct TControl { + /* 80280FC4 */ TControl(); + /* 80280FF4 */ ~TControl(); + /* 80281230 */ void getObject_index(u32); +}; + +struct TFactory { + /* 80281274 */ ~TFactory(); +}; + +struct TParse { + /* 8028135C */ TParse(JStudio::ctb::TControl*); + /* 8028137C */ ~TParse(); +}; + +}; // namespace ctb + struct TCreateObject { /* 80285488 */ ~TCreateObject(); }; @@ -56,26 +76,6 @@ struct TFactory { /* 802855AC */ void create(JStudio::stb::data::TParse_TBlock_object const&); }; -namespace ctb { -struct TObject {}; - -struct TControl { - /* 80280FC4 */ TControl(); - /* 80280FF4 */ ~TControl(); - /* 80281230 */ void getObject_index(u32); -}; - -struct TFactory { - /* 80281274 */ ~TFactory(); -}; - -struct TParse { - /* 8028135C */ TParse(JStudio::ctb::TControl*); - /* 8028137C */ ~TParse(); -}; - -}; // namespace ctb - struct TControl { /* 80285114 */ TControl(); /* 802851AC */ ~TControl(); @@ -136,8 +136,6 @@ struct TNodeLinkList { // Forward References: // -extern "C" extern void* __vt__Q27JStudio8TFactory[5]; - extern "C" void __ct__Q27JStudio8TControlFv(); extern "C" void __dt__Q27JStudio8TControlFv(); extern "C" void setFactory__Q27JStudio8TControlFPQ27JStudio8TFactory(); @@ -162,8 +160,6 @@ extern "C" extern void* __vt__Q27JStudio8TFactory[5]; // void operator delete(void*); -extern "C" extern void* __vt__Q27JStudio13TCreateObject[4]; -extern "C" extern u8 ga8cSignature__Q27JStudio4data[8]; extern "C" void __ct__Q37JStudio3ctb8TControlFv(); extern "C" void __dt__Q37JStudio3ctb8TControlFv(); @@ -283,7 +279,7 @@ asm void JStudio::TControl::setFactory(JStudio::TFactory* param_0) { /* ############################################################################################## */ /* 8045545C-80455460 0004+00 s=2 e=0 z=0 None .sdata2 @772 */ -SECTION_SDATA2 static u32 lit_772 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_772 = 0.01745329238474369f; /* 80285250-802852D0 0080+00 s=3 e=1 z=0 None .text * transformOnSet_setOrigin_TxyzRy__Q27JStudio8TControlFRC3Vecf */ diff --git a/libs/JSystem/JStudio/JStudio/jstudio-data.cpp b/libs/JSystem/JStudio/JStudio/jstudio-data.cpp index 4d6ec3457a0..a4c17aaa22e 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-data.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-data.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 ga8cSignature__Q27JStudio4data[8]; -extern "C" extern u8 ga8cSignature__Q27JStudio4data[8]; - // // External References: // diff --git a/libs/JSystem/JStudio/JStudio/jstudio-math.cpp b/libs/JSystem/JStudio/JStudio/jstudio-math.cpp index a97cc1d1d7e..ba719ca14d8 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-math.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-math.cpp @@ -34,8 +34,6 @@ extern "C" void getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4 // External References: // -extern "C" extern u32 __float_epsilon; - extern "C" void PSMTXConcat(); extern "C" void PSMTXTransApply(); extern "C" void PSMTXScale(); @@ -56,7 +54,7 @@ extern "C" extern u32 __float_epsilon; /* ############################################################################################## */ /* 80455468-8045546C 0004+00 s=1 e=0 z=0 None .sdata2 @488 */ -SECTION_SDATA2 static u32 lit_488 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_488 = 0.01745329238474369f; /* 8045546C-80455470 0004+00 s=2 e=0 z=0 None .sdata2 @489 */ SECTION_SDATA2 static u8 lit_489[4] = { @@ -96,9 +94,7 @@ SECTION_SDATA2 static u8 lit_623[8] = { }; /* 80455478-80455480 0008+00 s=1 e=0 z=0 None .sdata2 @624 */ -SECTION_SDATA2 static u8 lit_624[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_624 = 1.0; /* 80455480-80455488 0004+04 s=1 e=0 z=0 None .sdata2 @625 */ SECTION_SDATA2 static f32 lit_625[1 + 1 /* padding */] = { @@ -108,19 +104,13 @@ SECTION_SDATA2 static f32 lit_625[1 + 1 /* padding */] = { }; /* 80455488-80455490 0008+00 s=1 e=0 z=0 None .sdata2 @626 */ -SECTION_SDATA2 static u8 lit_626[8] = { - 0xBF, 0xF9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_626 = -1.5707963267948966; /* 80455490-80455498 0008+00 s=1 e=0 z=0 None .sdata2 @627 */ -SECTION_SDATA2 static u8 lit_627[8] = { - 0x3F, 0xF9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_627 = 1.5707963267948966; /* 80455498-804554A0 0008+00 s=1 e=0 z=0 None .sdata2 @628 */ -SECTION_SDATA2 static u8 lit_628[8] = { - 0x40, 0x4C, 0xA5, 0xDC, 0x1A, 0x63, 0xC1, 0xF8, -}; +SECTION_SDATA2 static f64 lit_628 = 57.29577951308232; /* 80285BCC-80285E0C 0240+00 s=0 e=2 z=0 None .text * getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf */ diff --git a/libs/JSystem/JStudio/JStudio/jstudio-object.cpp b/libs/JSystem/JStudio/JStudio/jstudio-object.cpp index 2fdb00323f8..d768f36477f 100644 --- a/libs/JSystem/JStudio/JStudio/jstudio-object.cpp +++ b/libs/JSystem/JStudio/JStudio/jstudio-object.cpp @@ -16,12 +16,12 @@ struct _GXColor {}; struct Vec {}; namespace JStudio { -struct TControl {}; - struct data { struct TEOperationData {}; }; +struct TControl {}; + struct TAdaptor { struct TSetVariableValue_immediate {}; @@ -195,77 +195,6 @@ struct TControl { // Forward References: // -extern "C" extern u8 const sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio14TAdaptor_actor[12]; -extern "C" extern u8 const sauVariableValue_3_ROTATION_XYZ__Q27JStudio14TAdaptor_actor[12]; -extern "C" extern u8 const sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor[12]; -extern "C" extern u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight[16]; -extern "C" extern u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera[12]; -extern "C" extern u8 const sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera[12]; -extern "C" extern u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog[16]; -extern "C" extern u8 const sauVariableValue_3_COLOR_RGB__Q27JStudio14TAdaptor_light[12]; -extern "C" extern u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio14TAdaptor_light[16]; -extern "C" extern u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_light[12]; -extern "C" extern u8 const sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio14TAdaptor_light[12]; -extern "C" extern u8 const sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" extern u8 const sauVariableValue_3_ROTATION_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" extern u8 const sauVariableValue_3_SCALING_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" extern u8 const sauVariableValue_3_COLOR_RGB__Q27JStudio17TAdaptor_particle[12]; -extern "C" extern u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio17TAdaptor_particle[16]; -extern "C" extern u8 const sauVariableValue_3_COLOR1_RGB__Q27JStudio17TAdaptor_particle[12]; -extern "C" extern u8 const sauVariableValue_4_COLOR1_RGBA__Q27JStudio17TAdaptor_particle[16]; -extern "C" extern u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_sound[12]; -extern "C" extern char const* const jstudio_object__stringBase0; -extern "C" extern u8 lit_1308[12]; -extern "C" extern u8 lit_1310[12]; -extern "C" extern u8 lit_1312[12]; -extern "C" extern u8 lit_1314[12]; -extern "C" extern u8 lit_1316[12]; -extern "C" extern u8 lit_1318[12]; -extern "C" extern u8 lit_1320[12]; -extern "C" extern u8 lit_1323[12]; -extern "C" extern u8 lit_1325[12]; -extern "C" extern u8 lit_1327[12]; -extern "C" extern u8 lit_1329[12]; -extern "C" extern u8 lit_1444[12]; -extern "C" extern u8 lit_1446[12]; -extern "C" extern u8 lit_1449[12]; -extern "C" extern u8 lit_1451[12]; -extern "C" extern u8 lit_1453[12]; -extern "C" extern u8 lit_1455[12]; -extern "C" extern u8 lit_1686[12]; -extern "C" extern u8 lit_1688[12]; -extern "C" extern u8 lit_1690[12]; -extern "C" extern u8 lit_1692[12]; -extern "C" extern u8 lit_1694[12]; -extern "C" extern u8 lit_1696[12]; -extern "C" extern u8 lit_1698[12]; -extern "C" extern u8 lit_1701[12]; -extern "C" extern u8 lit_1703[12]; -extern "C" extern u8 lit_1705[12]; -extern "C" extern u8 lit_1779[12]; -extern "C" extern u8 lit_1781[12]; -extern "C" extern u8 lit_1783[12]; -extern "C" extern u8 lit_1785[12]; -extern "C" extern u8 lit_1787[12]; -extern "C" extern u8 lit_1789[12]; -extern "C" extern u8 lit_1791[12]; -extern "C" extern u8 lit_1794[12]; -extern "C" extern u8 lit_1796[12]; -extern "C" extern u8 lit_1798[12]; -extern "C" extern u8 lit_1800[12]; -extern "C" extern void* __vt__Q27JStudio14TAdaptor_sound[20]; -extern "C" extern void* __vt__Q27JStudio17TAdaptor_particle[19]; -extern "C" extern void* __vt__Q27JStudio14TAdaptor_light[10]; -extern "C" extern void* __vt__Q27JStudio12TAdaptor_fog[8]; -extern "C" extern void* __vt__Q27JStudio15TAdaptor_camera[15]; -extern "C" extern void* __vt__Q27JStudio21TAdaptor_ambientLight[8]; -extern "C" extern void* __vt__Q27JStudio14TAdaptor_actor[20]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" extern u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; -extern "C" extern u8 data_804511F8[8]; -extern "C" extern u8 data_80451200[8]; - extern "C" void __dt__Q37JStudio14TVariableValue7TOutputFv(); extern "C" void update__Q27JStudio14TVariableValueFdPQ27JStudio8TAdaptor(); extern "C" void update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued(); @@ -435,8 +364,6 @@ extern "C" extern u8 data_80451200[8]; // void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__Q27JStudio16TAdaptor_message[9]; extern "C" void getObject__Q37JStudio3fvb8TControlFPCvUl(); extern "C" void getObject_index__Q37JStudio3fvb8TControlFUl(); @@ -1479,9 +1406,7 @@ asm void JStudio::TVariableValue::update_immediate_(JStudio::TVariableValue* par /* ############################################################################################## */ /* 804554A0-804554A8 0008+00 s=3 e=0 z=0 None .sdata2 @803 */ -SECTION_SDATA2 static u8 lit_803[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_803 = 4503599627370496.0 /* cast u32 to float */; /* 80285ECC-80285F08 003C+00 s=1 e=0 z=0 None .text * update_time___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued */ @@ -1649,7 +1574,7 @@ SECTION_SDATA2 static u8 lit_1094[4] = { }; /* 804554AC-804554B0 0004+00 s=1 e=0 z=0 None .sdata2 @1095 */ -SECTION_SDATA2 static u32 lit_1095 = 0x437F0000; +SECTION_SDATA2 static f32 lit_1095 = 255.0f; /* 8028638C-802864D8 014C+00 s=0 e=4 z=0 None .text * adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl */ diff --git a/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp b/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp index 285a3dc7296..c8b67607262 100644 --- a/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp +++ b/libs/JSystem/JStudio/JStudio/stb-data-parse.cpp @@ -62,8 +62,6 @@ getData__Q47JStudio3stb4data22TParse_TParagraph_dataCFPQ57JStudio3stb4data22TPar // External References: // -extern "C" extern u8 const gauDataSize_TEParagraph_data__Q37JStudio3stb4data[32]; - extern "C" void parseVariableUInt_16_32_following__Q27JGadget6binaryFPCvPUlPUlPQ37JGadget6binary5TEBit(); extern "C" extern u8 const gauDataSize_TEParagraph_data__Q37JStudio3stb4data[32]; diff --git a/libs/JSystem/JStudio/JStudio/stb-data.cpp b/libs/JSystem/JStudio/JStudio/stb-data.cpp index e1c410000ad..19a2736c287 100644 --- a/libs/JSystem/JStudio/JStudio/stb-data.cpp +++ b/libs/JSystem/JStudio/JStudio/stb-data.cpp @@ -14,9 +14,6 @@ extern "C" extern u8 const gauDataSize_TEParagraph_data__Q37JStudio3stb4data[32]; extern "C" extern u32 ga4cSignature__Q37JStudio3stb4data[1 + 1 /* padding */]; -extern "C" extern u8 const gauDataSize_TEParagraph_data__Q37JStudio3stb4data[32]; -extern "C" extern u32 ga4cSignature__Q37JStudio3stb4data[1 + 1 /* padding */]; - // // External References: // diff --git a/libs/JSystem/JStudio/JStudio/stb.cpp b/libs/JSystem/JStudio/JStudio/stb.cpp index 657f55754c2..4c007582300 100644 --- a/libs/JSystem/JStudio/JStudio/stb.cpp +++ b/libs/JSystem/JStudio/JStudio/stb.cpp @@ -11,6 +11,32 @@ // Types: // +namespace JGadget { +template +struct TLinkList {}; +/* TLinkList */ +struct TLinkList__template2 { + struct iterator {}; +}; + +struct binary { + struct TParse_header_block { + /* 802DC8C8 */ ~TParse_header_block(); + }; +}; + +struct TLinkListNode {}; + +struct TNodeLinkList { + struct iterator {}; + + /* 802DCA1C */ ~TNodeLinkList(); + /* 802DCBA8 */ void Insert(JGadget::TNodeLinkList::iterator, JGadget::TLinkListNode*); + /* 802DCBD4 */ void Erase(JGadget::TLinkListNode*); +}; + +}; // namespace JGadget + namespace JStudio { namespace stb { struct data { @@ -95,32 +121,6 @@ struct object { }; // namespace JStudio -namespace JGadget { -template -struct TLinkList {}; -/* TLinkList */ -struct TLinkList__template2 { - struct iterator {}; -}; - -struct binary { - struct TParse_header_block { - /* 802DC8C8 */ ~TParse_header_block(); - }; -}; - -struct TLinkListNode {}; - -struct TNodeLinkList { - struct iterator {}; - - /* 802DCA1C */ ~TNodeLinkList(); - /* 802DCBA8 */ void Insert(JGadget::TNodeLinkList::iterator, JGadget::TLinkListNode*); - /* 802DCBD4 */ void Erase(JGadget::TLinkListNode*); -}; - -}; // namespace JGadget - namespace std { /* */ template /* */ void find_if(/* JGadget::TLinkList::iterator, JGadget::TLinkList::iterator, JStudio::object::TPRObject_ID_equal */); @@ -136,8 +136,6 @@ void find_if__template2(JGadget::TLinkList__template2::iterator, // Forward References: // -extern "C" extern void* __vt__Q37JStudio3stb8TFactory[5]; - extern "C" void __ct__Q37JStudio3stb7TObjectFUlPCvUl(); extern "C" void __ct__Q37JStudio3stb7TObjectFRCQ47JStudio3stb4data20TParse_TBlock_object(); extern "C" void __dt__Q37JStudio3stb7TObjectFv(); @@ -181,8 +179,6 @@ extern "C" extern void* __vt__Q37JStudio3stb8TFactory[5]; // void operator delete(void*); -extern "C" extern void* __vt__Q37JGadget6binary19TParse_header_block[5]; -extern "C" extern u32 ga4cSignature__Q37JStudio3stb4data[1 + 1 /* padding */]; extern "C" void isEqual__Q37JStudio6object7TIDDataFRCQ37JStudio6object7TIDDataRCQ37JStudio6object7TIDData(); diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp index 32eb5c78175..276d4709f59 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/control.cpp @@ -52,8 +52,6 @@ struct JStudio_JAudio2 { // Forward References: // -extern "C" extern void* __vt__Q215JStudio_JAudio213TCreateObject[4]; - extern "C" void __dt__Q215JStudio_JAudio213TCreateObjectFv(); extern "C" void create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object(); diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index 3e403651995..c031fc0e10e 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/libs/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -177,13 +177,6 @@ extern "C" void func_8028E0F4(); // void operator delete(void*); -extern "C" extern u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_sound[12]; -extern "C" extern void* __vt__Q27JStudio14TAdaptor_sound[20]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; -extern "C" extern u8 data_804511F8[8]; extern "C" void __dt__Q37JStudio14TVariableValue7TOutputFv(); extern "C" void adaptor_do_begin__Q27JStudio8TAdaptorFv(); @@ -591,12 +584,10 @@ asm void JStudio_JAudio2::TAdaptor_sound::prepareSound_() { /* ############################################################################################## */ /* 80455514-80455518 0004+00 s=1 e=0 z=0 None .sdata2 @1805 */ -SECTION_SDATA2 static u32 lit_1805 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1805 = 1.0f; /* 80455518-80455520 0008+00 s=1 e=0 z=0 None .sdata2 @1807 */ -SECTION_SDATA2 static u8 lit_1807[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1807 = 4503599627370496.0 /* cast u32 to float */; /* 8028DFA4-8028E054 00B0+00 s=3 e=0 z=0 None .text * beginSound_fadeIn___Q215JStudio_JAudio214TAdaptor_soundFv */ diff --git a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp index 7a0d22c3b36..a0e242c8b02 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -74,8 +74,6 @@ struct JPAEmitterManager { // Forward References: // -extern "C" extern void* __vt__Q217JStudio_JParticle13TCreateObject[6]; - extern "C" void __dt__Q217JStudio_JParticle13TCreateObjectFv(); extern "C" void create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object(); diff --git a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp index f24cc90382f..b1e88a72221 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp +++ b/libs/JSystem/JStudio/JStudio_JParticle/object-particle.cpp @@ -159,15 +159,6 @@ void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*, JGeometry::TVec3__template0*); void operator delete(void*); -extern "C" extern u8 const sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" extern u8 const sauVariableValue_3_ROTATION_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" extern u8 const sauVariableValue_3_SCALING_XYZ__Q27JStudio17TAdaptor_particle[12]; -extern "C" extern u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio17TAdaptor_particle[16]; -extern "C" extern void* __vt__18JPAEmitterCallBack[7]; -extern "C" extern void* __vt__Q27JStudio17TAdaptor_particle[19]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80451200[8]; extern "C" void __dt__18JPAEmitterCallBackFv(); extern "C" void JPAGetXYZRotateMtx__FsssPA4_f(); @@ -300,7 +291,7 @@ SECTION_SDATA2 static u8 lit_1361[4] = { }; /* 80455524-80455528 0004+00 s=1 e=0 z=0 None .sdata2 @1362 */ -SECTION_SDATA2 static u32 lit_1362 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1362 = 1.0f; /* 80455528-80455530 0004+04 s=1 e=0 z=0 None .sdata2 @1363 */ SECTION_SDATA2 static f32 lit_1363[1 + 1 /* padding */] = { @@ -487,29 +478,19 @@ asm void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END( /* ############################################################################################## */ /* 80455530-80455538 0008+00 s=1 e=0 z=0 None .sdata2 @1622 */ -SECTION_SDATA2 static u8 lit_1622[8] = { - 0x40, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1622 = 65536.0; /* 80455538-80455540 0008+00 s=1 e=0 z=0 None .sdata2 @1623 */ -SECTION_SDATA2 static u8 lit_1623[8] = { - 0x40, 0x76, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1623 = 360.0; /* 80455540-80455548 0008+00 s=1 e=0 z=0 None .sdata2 @1624 */ -SECTION_SDATA2 static u8 lit_1624[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1624 = 1.0; /* 80455548-80455550 0008+00 s=1 e=0 z=0 None .sdata2 @1625 */ -SECTION_SDATA2 static u8 lit_1625[8] = { - 0x40, 0x6F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1625 = 255.0; /* 80455550-80455558 0008+00 s=2 e=0 z=0 None .sdata2 @1629 */ -SECTION_SDATA2 static u8 lit_1629[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1629 = 4503599627370496.0 /* cast u32 to float */; /* 8028ECC0-8028F060 03A0+00 s=1 e=0 z=0 None .text * execute__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter */ diff --git a/libs/JSystem/JStudio/JStudio_JStage/control.cpp b/libs/JSystem/JStudio/JStudio_JStage/control.cpp index 9838c0978e4..c0fb812ae70 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/control.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/control.cpp @@ -11,6 +11,20 @@ // Types: // +struct JStage { + struct TSystem {}; + + struct TActor {}; + + struct TAmbientLight {}; + + struct TCamera {}; + + struct TFog {}; + + struct TLight {}; +}; + namespace JStudio { struct TObject {}; @@ -62,20 +76,6 @@ struct TObject_light { }; // namespace JStudio -struct JStage { - struct TSystem {}; - - struct TActor {}; - - struct TAmbientLight {}; - - struct TCamera {}; - - struct TFog {}; - - struct TLight {}; -}; - struct JStudio_JStage { struct TCreateObject { /* 80289B00 */ ~TCreateObject(); @@ -108,8 +108,6 @@ struct JStudio_JStage { // Forward References: // -extern "C" extern void* __vt__Q214JStudio_JStage13TCreateObject[4]; - extern "C" void __dt__Q214JStudio_JStage13TCreateObjectFv(); extern "C" void create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object(); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 15563519442..84e9b9f1caf 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -13,6 +13,14 @@ struct Vec {}; +struct JStage { + struct TSystem {}; + + struct TActor {}; + + struct TObject {}; +}; + namespace JStudio { struct data { struct TEOperationData {}; @@ -50,14 +58,6 @@ struct TAdaptor_actor { }; // namespace JStudio -struct JStage { - struct TSystem {}; - - struct TActor {}; - - struct TObject {}; -}; - struct JStudio_JStage { struct TAdaptor_actor { struct TVVOutput_ANIMATION_FRAME_ { @@ -172,14 +172,6 @@ extern "C" void func_8028B5E0(); // void operator delete(void*); -extern "C" extern u8 const sauVariableValue_3_TRANSLATION_XYZ__Q27JStudio14TAdaptor_actor[12]; -extern "C" extern u8 const sauVariableValue_3_ROTATION_XYZ__Q27JStudio14TAdaptor_actor[12]; -extern "C" extern u8 const sauVariableValue_3_SCALING_XYZ__Q27JStudio14TAdaptor_actor[12]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__Q27JStudio14TAdaptor_actor[20]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" extern u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; extern "C" void toFunction_outside__Q27JStudio14TFunctionValueFi(); extern "C" void getFromTransformation_SRxyzT__Q27JStudio4mathFP3VecP3VecP3VecPA4_Cf(); @@ -645,16 +637,10 @@ asm void JStudio_JStage::TAdaptor_actor::getJSG_SRT_(JStudio::TControl const* pa /* ############################################################################################## */ /* 804554E0-804554E8 0004+04 s=1 e=0 z=0 None .sdata2 @1081 */ -SECTION_SDATA2 static u8 lit_1081[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_1081[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 8028B064-8028B138 00D4+00 s=1 e=0 z=0 None .text diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp index d5e073986f4..c33cae6a1cd 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-ambientlight.cpp @@ -69,9 +69,6 @@ extern "C" void adaptor_do_data__Q214JStudio_JStage21TAdaptor_ambientLightFPCvUl // void operator delete(void*); -extern "C" extern u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio21TAdaptor_ambientLight[16]; -extern "C" extern void* __vt__Q27JStudio21TAdaptor_ambientLight[8]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; extern "C" void adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor(); extern "C" void adaptor_getVariableValue_GXColor__Q27JStudio8TAdaptorCFP8_GXColorPCUl(); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp index f0d1a91ce58..cd15a37279a 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -13,6 +13,14 @@ struct Vec {}; +struct JStage { + struct TSystem {}; + + struct TCamera {}; + + struct TObject {}; +}; + namespace JStudio { struct data { struct TEOperationData {}; @@ -42,14 +50,6 @@ struct TAdaptor_camera { }; // namespace JStudio -struct JStage { - struct TSystem {}; - - struct TCamera {}; - - struct TObject {}; -}; - struct JStudio_JStage { struct TAdaptor_camera { /* 8028B8A0 */ TAdaptor_camera(JStage::TSystem const*, JStage::TCamera*); @@ -138,13 +138,6 @@ extern "C" void func_8028C544(); // void operator delete(void*); -extern "C" extern u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio15TAdaptor_camera[12]; -extern "C" extern u8 const sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio15TAdaptor_camera[12]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__Q27JStudio15TAdaptor_camera[15]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" extern u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; extern "C" void __dt__Q37JStudio14TVariableValue7TOutputFv(); extern "C" void update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued(); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp index 63e2e85e059..b481818f2a4 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-fog.cpp @@ -84,12 +84,6 @@ extern "C" void func_8028CB20(); // void operator delete(void*); -extern "C" extern u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio12TAdaptor_fog[16]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__Q27JStudio12TAdaptor_fog[8]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" extern u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; extern "C" void __dt__Q37JStudio14TVariableValue7TOutputFv(); extern "C" void update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued(); diff --git a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp index 86e3d1f5d4e..87665e11714 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/libs/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -98,14 +98,6 @@ extern "C" void func_8028D2B8(); // void operator delete(void*); -extern "C" extern u8 const sauVariableValue_4_COLOR_RGBA__Q27JStudio14TAdaptor_light[16]; -extern "C" extern u8 const sauVariableValue_3_POSITION_XYZ__Q27JStudio14TAdaptor_light[12]; -extern "C" extern u8 const sauVariableValue_3_TARGET_POSITION_XYZ__Q27JStudio14TAdaptor_light[12]; -extern "C" extern void* __vt__Q27JStudio14TAdaptor_light[10]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio14TVariableValue7TOutput[4]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 soOutput_none___Q27JStudio14TVariableValue[4 + 4 /* padding */]; extern "C" void __dt__Q37JStudio14TVariableValue7TOutputFv(); extern "C" void update_immediate___Q27JStudio14TVariableValueFPQ27JStudio14TVariableValued(); @@ -229,27 +221,17 @@ asm void JStudio_JStage::TAdaptor_light::adaptor_do_prepare() { /* ############################################################################################## */ /* 804554E8-804554F0 0004+04 s=1 e=0 z=0 None .sdata2 @846 */ -SECTION_SDATA2 static u8 lit_846[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_846[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 804554F0-804554F8 0008+00 s=1 e=0 z=0 None .sdata2 @847 */ -SECTION_SDATA2 static u8 lit_847[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_847 = 0.5; /* 804554F8-80455500 0008+00 s=1 e=0 z=0 None .sdata2 @848 */ -SECTION_SDATA2 static u8 lit_848[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_848 = 3.0; /* 80455500-80455508 0008+00 s=1 e=0 z=0 None .sdata2 @849 */ SECTION_SDATA2 static u8 lit_849[8] = { @@ -257,7 +239,7 @@ SECTION_SDATA2 static u8 lit_849[8] = { }; /* 80455508-8045550C 0004+00 s=1 e=0 z=0 None .sdata2 @850 */ -SECTION_SDATA2 static u32 lit_850 = 0x42652EE1; +SECTION_SDATA2 static f32 lit_850 = 57.295780181884766f; /* 8028CCB0-8028CF68 02B8+00 s=1 e=0 z=0 None .text * adaptor_do_begin__Q214JStudio_JStage14TAdaptor_lightFv */ @@ -283,7 +265,7 @@ asm void JStudio_JStage::TAdaptor_light::adaptor_do_end() { /* ############################################################################################## */ /* 8045550C-80455510 0004+00 s=1 e=0 z=0 None .sdata2 @898 */ -SECTION_SDATA2 static u32 lit_898 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_898 = 0.01745329238474369f; /* 8028CFBC-8028D18C 01D0+00 s=1 e=0 z=0 None .text * adaptor_do_update__Q214JStudio_JStage14TAdaptor_lightFUl */ diff --git a/libs/JSystem/JSupport/JSUFileStream.cpp b/libs/JSystem/JSupport/JSUFileStream.cpp index 10fae00db2b..eed0efc0c4d 100644 --- a/libs/JSystem/JSupport/JSUFileStream.cpp +++ b/libs/JSystem/JSupport/JSUFileStream.cpp @@ -33,8 +33,6 @@ struct JSUFileInputStream { // Forward References: // -extern "C" extern void* __vt__18JSUFileInputStream[9 + 1 /* padding */]; - extern "C" void __ct__18JSUFileInputStreamFP7JKRFile(); extern "C" void readData__18JSUFileInputStreamFPvl(); extern "C" void seekPos__18JSUFileInputStreamFl17JSUStreamSeekFrom(); @@ -46,10 +44,6 @@ extern "C" extern void* __vt__18JSUFileInputStream[9 + 1 /* padding */]; // External References: // -extern "C" extern void* __vt__10JSUIosBase[3]; -extern "C" extern void* __vt__20JSURandomInputStream[9]; -extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */]; - extern "C" void getAvailable__20JSURandomInputStreamCFv(); extern "C" void __dt__18JSUFileInputStreamFv(); extern "C" void skip__20JSURandomInputStreamFl(); diff --git a/libs/JSystem/JSupport/JSUInputStream.cpp b/libs/JSystem/JSupport/JSUInputStream.cpp index fcab6a82f68..64562518f8c 100644 --- a/libs/JSystem/JSupport/JSUInputStream.cpp +++ b/libs/JSystem/JSupport/JSUInputStream.cpp @@ -32,9 +32,6 @@ struct JSUInputStream { // Forward References: // -extern "C" extern void* __vt__20JSURandomInputStream[9]; -extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */]; - extern "C" void __dt__14JSUInputStreamFv(); extern "C" void read__14JSUInputStreamFPvl(); extern "C" void skip__14JSUInputStreamFl(); @@ -50,7 +47,6 @@ extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern void* __vt__10JSUIosBase[3]; extern "C" void __dt__20JSURandomInputStreamFv(); extern "C" void __dl__FPv(); diff --git a/libs/JSystem/JSupport/JSUMemoryStream.cpp b/libs/JSystem/JSupport/JSUMemoryStream.cpp index a369aa2e911..6f89f84e27f 100644 --- a/libs/JSystem/JSupport/JSUMemoryStream.cpp +++ b/libs/JSystem/JSupport/JSUMemoryStream.cpp @@ -31,8 +31,6 @@ struct JSUMemoryInputStream { // Forward References: // -extern "C" extern void* __vt__20JSUMemoryInputStream[9 + 1 /* padding */]; - extern "C" void setBuffer__20JSUMemoryInputStreamFPCvl(); extern "C" void readData__20JSUMemoryInputStreamFPvl(); extern "C" void seekPos__20JSUMemoryInputStreamFl17JSUStreamSeekFrom(); diff --git a/libs/JSystem/JUtility/JUTAssert.cpp b/libs/JSystem/JUtility/JUTAssert.cpp index 38e2de1127b..33b2aec8502 100644 --- a/libs/JSystem/JUtility/JUTAssert.cpp +++ b/libs/JSystem/JUtility/JUTAssert.cpp @@ -49,10 +49,6 @@ extern "C" void setMessageCount__12JUTAssertionFi(); // External References: // -extern "C" extern u8 data_804508F8[8]; -extern "C" extern u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */]; -extern "C" extern u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */]; - extern "C" void setCharColor__7JUTFontFQ28JUtility6TColor(); extern "C" void drawString_size_scale__7JUTFontFffffPCcUlb(); extern "C" void drawString__14JUTDirectPrintFUsUsPc(); @@ -108,10 +104,10 @@ asm void JUTAssertion::flushMessage() { /* ############################################################################################## */ /* 804560B8-804560BC 0004+00 s=1 e=0 z=0 None .sdata2 @724 */ -SECTION_SDATA2 static u32 lit_724 = 0x41F00000; +SECTION_SDATA2 static f32 lit_724 = 30.0f; /* 804560BC-804560C0 0004+00 s=1 e=0 z=0 None .sdata2 @725 */ -SECTION_SDATA2 static u32 lit_725 = 0x42100000; +SECTION_SDATA2 static f32 lit_725 = 36.0f; /* 804560C0-804560C8 0004+04 s=1 e=0 z=0 None .sdata2 @726 */ SECTION_SDATA2 static f32 lit_726[1 + 1 /* padding */] = { @@ -121,9 +117,7 @@ SECTION_SDATA2 static f32 lit_726[1 + 1 /* padding */] = { }; /* 804560C8-804560D0 0008+00 s=1 e=0 z=0 None .sdata2 @728 */ -SECTION_SDATA2 static u8 lit_728[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_728 = 4503601774854144.0 /* cast s32 to float */; /* 802E4A54-802E4C34 01E0+00 s=0 e=1 z=0 None .text flushMessage_dbPrint__12JUTAssertionFv */ #pragma push diff --git a/libs/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/JUtility/JUTCacheFont.cpp index dd2aedc1874..f4f9c1f5ba6 100644 --- a/libs/JSystem/JUtility/JUTCacheFont.cpp +++ b/libs/JSystem/JUtility/JUTCacheFont.cpp @@ -94,8 +94,6 @@ struct JKRAram { // Forward References: // -extern "C" extern char const* const JUTCacheFont__stringBase0; - extern "C" void __ct__12JUTCacheFontFPC7ResFONTUlP7JKRHeap(); extern "C" void __dt__12JUTCacheFontFv(); extern "C" void deleteMemBlocks_CacheFont__12JUTCacheFontFv(); @@ -131,8 +129,6 @@ void* operator new(u32, JKRHeap*, int); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern void* const saoAboutEncoding___10JUTResFont[3]; -extern "C" extern u8 sAramObject__7JKRAram[4]; SECTION_INIT void memcpy(); extern "C" void* __nw__FUlP7JKRHeapi(); @@ -335,16 +331,10 @@ asm void JUTCacheFont::determineBlankPage() { /* ############################################################################################## */ /* 80455FD0-80455FD8 0004+04 s=1 e=0 z=0 None .sdata2 @721 */ -SECTION_SDATA2 static u8 lit_721[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_721[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 802DDBBC-802DDCE4 0128+00 s=1 e=0 z=0 None .text diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp index 934a56803d9..86aabe6151d 100644 --- a/libs/JSystem/JUtility/JUTConsole.cpp +++ b/libs/JSystem/JUtility/JUTConsole.cpp @@ -85,9 +85,6 @@ struct J2DOrthoGraph { // Forward References: // -extern "C" extern char const* const JUTConsole__stringBase0; -extern "C" extern u8 sManager__17JUTConsoleManager[4]; - extern "C" void create__10JUTConsoleFUiUiP7JKRHeap(); extern "C" void create__10JUTConsoleFUiPvUl(); extern "C" void __ct__10JUTConsoleFUiUib(); @@ -129,11 +126,6 @@ extern "C" extern u8 sManager__17JUTConsoleManager[4]; void* operator new(u32, JKRHeap*, int); void operator delete(void*); void J2DFillBox(f32, f32, f32, f32, JUtility::TColor); -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */]; -extern "C" extern u8 sManager__8JUTVideo[4]; extern "C" void OSReport(); extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); @@ -263,7 +255,7 @@ asm void JUTConsole::clear() { /* ############################################################################################## */ /* 80456118-8045611C 0004+00 s=1 e=0 z=0 None .sdata2 @2460 */ -SECTION_SDATA2 static u32 lit_2460 = 0x40000000; +SECTION_SDATA2 static f32 lit_2460 = 2.0f; /* 8045611C-80456120 0004+00 s=1 e=0 z=0 None .sdata2 @2461 */ SECTION_SDATA2 static u8 lit_2461[4] = { @@ -274,16 +266,16 @@ SECTION_SDATA2 static u8 lit_2461[4] = { }; /* 80456120-80456124 0004+00 s=1 e=0 z=0 None .sdata2 @2462 */ -SECTION_SDATA2 static u32 lit_2462 = 0x44200000; +SECTION_SDATA2 static f32 lit_2462 = 640.0f; /* 80456124-80456128 0004+00 s=1 e=0 z=0 None .sdata2 @2463 */ -SECTION_SDATA2 static u32 lit_2463 = 0x43F00000; +SECTION_SDATA2 static f32 lit_2463 = 480.0f; /* 80456128-8045612C 0004+00 s=1 e=0 z=0 None .sdata2 @2464 */ -SECTION_SDATA2 static u32 lit_2464 = 0xBF800000; +SECTION_SDATA2 static f32 lit_2464 = -1.0f; /* 8045612C-80456130 0004+00 s=1 e=0 z=0 None .sdata2 @2465 */ -SECTION_SDATA2 static u32 lit_2465 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2465 = 1.0f; /* 80456130-80456138 0004+04 s=1 e=0 z=0 None .sdata2 @2466 */ SECTION_SDATA2 static f32 lit_2466[1 + 1 /* padding */] = { @@ -293,14 +285,10 @@ SECTION_SDATA2 static f32 lit_2466[1 + 1 /* padding */] = { }; /* 80456138-80456140 0008+00 s=1 e=0 z=0 None .sdata2 @2469 */ -SECTION_SDATA2 static u8 lit_2469[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2469 = 4503599627370496.0 /* cast u32 to float */; /* 80456140-80456148 0008+00 s=1 e=0 z=0 None .sdata2 @2471 */ -SECTION_SDATA2 static u8 lit_2471[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2471 = 4503601774854144.0 /* cast s32 to float */; /* 802E7648-802E7BB8 0570+00 s=2 e=0 z=0 None .text * doDraw__10JUTConsoleCFQ210JUTConsole12EConsoleType */ diff --git a/libs/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/JUtility/JUTDbPrint.cpp index a27c030f875..56be91a03e5 100644 --- a/libs/JSystem/JUtility/JUTDbPrint.cpp +++ b/libs/JSystem/JUtility/JUTDbPrint.cpp @@ -46,7 +46,6 @@ struct J2DOrthoGraph { void JUTReport(int, int, char const*, ...); void JUTReport(int, int, int, char const*, ...); -extern "C" extern u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */]; extern "C" void __ct__10JUTDbPrintFP7JUTFontP7JKRHeap(); extern "C" void start__10JUTDbPrintFP7JUTFontP7JKRHeap(); @@ -64,10 +63,6 @@ extern "C" extern u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */]; // void* operator new(u32); -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sManager__8JUTVideo[4]; extern "C" void alloc__7JKRHeapFUliP7JKRHeap(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); @@ -152,15 +147,13 @@ asm void JUTDbPrint::flush() { /* ############################################################################################## */ /* 80456008-8045600C 0004+00 s=1 e=0 z=0 None .sdata2 @835 */ -SECTION_SDATA2 static u32 lit_835 = 0xBF800000; +SECTION_SDATA2 static f32 lit_835 = -1.0f; /* 8045600C-80456010 0004+00 s=1 e=0 z=0 None .sdata2 @836 */ -SECTION_SDATA2 static u32 lit_836 = 0x3F800000; +SECTION_SDATA2 static f32 lit_836 = 1.0f; /* 80456010-80456018 0008+00 s=2 e=0 z=0 None .sdata2 @838 */ -SECTION_SDATA2 static u8 lit_838[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_838 = 4503601774854144.0 /* cast s32 to float */; /* 802E02DC-802E0440 0164+00 s=1 e=0 z=0 None .text flush__10JUTDbPrintFiiii */ #pragma push diff --git a/libs/JSystem/JUtility/JUTDirectPrint.cpp b/libs/JSystem/JUtility/JUTDirectPrint.cpp index 58f95f04a03..bbe07f71ae4 100644 --- a/libs/JSystem/JUtility/JUTDirectPrint.cpp +++ b/libs/JSystem/JUtility/JUTDirectPrint.cpp @@ -43,9 +43,6 @@ struct TFunctionValue_list_parameter { // Forward References: // -extern "C" extern char const* const JUTDirectPrint__stringBase0; -extern "C" extern u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */]; - extern "C" void __ct__14JUTDirectPrintFv(); extern "C" void start__14JUTDirectPrintFv(); extern "C" void erase__14JUTDirectPrintFiiii(); @@ -377,59 +374,37 @@ asm void JUTDirectPrint::setCharColor(JUtility::TColor param_0) { /* ############################################################################################## */ /* 80456060-80456068 0008+00 s=1 e=0 z=0 None .sdata2 @503 */ -SECTION_SDATA2 static u8 lit_503[8] = { - 0x40, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_503 = 128.0; /* 80456068-80456070 0008+00 s=1 e=0 z=0 None .sdata2 @504 */ -SECTION_SDATA2 static u8 lit_504[8] = { - 0x3F, 0xDC, 0x18, 0x93, 0x74, 0xBC, 0x6A, 0x7F, -}; +SECTION_SDATA2 static f64 lit_504 = 0.439; /* 80456070-80456078 0008+00 s=1 e=0 z=0 None .sdata2 @505 */ -SECTION_SDATA2 static u8 lit_505[8] = { - 0xBF, 0xC2, 0xF1, 0xA9, 0xFB, 0xE7, 0x6C, 0x8B, -}; +SECTION_SDATA2 static f64 lit_505 = -0.148; /* 80456078-80456080 0008+00 s=1 e=0 z=0 None .sdata2 @506 */ -SECTION_SDATA2 static u8 lit_506[8] = { - 0x3F, 0xD2, 0x9F, 0xBE, 0x76, 0xC8, 0xB4, 0x39, -}; +SECTION_SDATA2 static f64 lit_506 = 0.291; /* 80456080-80456088 0008+00 s=1 e=0 z=0 None .sdata2 @507 */ -SECTION_SDATA2 static u8 lit_507[8] = { - 0x3F, 0xD7, 0x8D, 0x4F, 0xDF, 0x3B, 0x64, 0x5A, -}; +SECTION_SDATA2 static f64 lit_507 = 0.368; /* 80456088-80456090 0008+00 s=1 e=0 z=0 None .sdata2 @508 */ -SECTION_SDATA2 static u8 lit_508[8] = { - 0x3F, 0xB2, 0x2D, 0x0E, 0x56, 0x04, 0x18, 0x93, -}; +SECTION_SDATA2 static f64 lit_508 = 0.071; /* 80456090-80456098 0008+00 s=1 e=0 z=0 None .sdata2 @509 */ -SECTION_SDATA2 static u8 lit_509[8] = { - 0x40, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_509 = 16.0; /* 80456098-804560A0 0008+00 s=1 e=0 z=0 None .sdata2 @510 */ -SECTION_SDATA2 static u8 lit_510[8] = { - 0x3F, 0xB9, 0x16, 0x87, 0x2B, 0x02, 0x0C, 0x4A, -}; +SECTION_SDATA2 static f64 lit_510 = 0.098; /* 804560A0-804560A8 0008+00 s=1 e=0 z=0 None .sdata2 @511 */ -SECTION_SDATA2 static u8 lit_511[8] = { - 0x3F, 0xD0, 0x72, 0xB0, 0x20, 0xC4, 0x9B, 0xA6, -}; +SECTION_SDATA2 static f64 lit_511 = 0.257; /* 804560A8-804560B0 0008+00 s=1 e=0 z=0 None .sdata2 @512 */ -SECTION_SDATA2 static u8 lit_512[8] = { - 0x3F, 0xE0, 0x20, 0xC4, 0x9B, 0xA5, 0xE3, 0x54, -}; +SECTION_SDATA2 static f64 lit_512 = 0.504; /* 804560B0-804560B8 0008+00 s=1 e=0 z=0 None .sdata2 @514 */ -SECTION_SDATA2 static u8 lit_514[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_514 = 4503601774854144.0 /* cast s32 to float */; /* 802E47C8-802E495C 0194+00 s=2 e=0 z=0 None .text setCharColor__14JUTDirectPrintFUcUcUc */ #pragma push diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index d8c5374ef06..f6173416269 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -122,10 +122,6 @@ struct JKRHeap {}; // static void search_name_part(u8*, u8*, int); -extern "C" extern char const* const JUTException__stringBase0; -extern "C" extern u8 data_804508F8[8]; -extern "C" extern u8 sErrorManager__12JUTException[4]; -extern "C" extern u8 sConsole__12JUTException[4]; extern "C" void __ct__12JUTExceptionFP14JUTDirectPrint(); extern "C" void create__12JUTExceptionFP14JUTDirectPrint(); @@ -172,10 +168,6 @@ extern "C" extern u8 sConsole__12JUTException[4]; void* operator new(u32); void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 GXNtsc480Int[60]; -extern "C" extern u32 __OSFpscrEnableBits; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sManager__17JUTConsoleManager[4]; SECTION_INIT void memcpy(); extern "C" void OSReport(); @@ -745,7 +737,7 @@ asm void JUTException::queryMapAddress_single(char* param_0, u32 param_1, s32 pa /* ############################################################################################## */ /* 80456054-80456058 0004+00 s=1 e=0 z=0 None .sdata2 @3034 */ -SECTION_SDATA2 static u32 lit_3034 = 0x41200000; +SECTION_SDATA2 static f32 lit_3034 = 10.0f; /* 80456058-80456060 0004+04 s=1 e=0 z=0 None .sdata2 @3035 */ SECTION_SDATA2 static f32 lit_3035[1 + 1 /* padding */] = { diff --git a/libs/JSystem/JUtility/JUTFader.cpp b/libs/JSystem/JUtility/JUTFader.cpp index bd0ea2d2a7e..ddbc82ee0c0 100644 --- a/libs/JSystem/JUtility/JUTFader.cpp +++ b/libs/JSystem/JUtility/JUTFader.cpp @@ -61,8 +61,6 @@ extern "C" void __dt__8JUTFaderFv(); // void operator delete(void*); -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; extern "C" void __dl__FPv(); extern "C" void @@ -88,9 +86,7 @@ SECTION_DATA static void* __vt__8JUTFader[6] = { }; /* 804560D0-804560D8 0008+00 s=1 e=0 z=0 None .sdata2 @2196 */ -SECTION_SDATA2 static u8 lit_2196[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2196 = 4503601774854144.0 /* cast s32 to float */; /* 802E5530-802E55DC 00AC+00 s=0 e=1 z=0 None .text __ct__8JUTFaderFiiiiQ28JUtility6TColor */ #pragma push diff --git a/libs/JSystem/JUtility/JUTFont.cpp b/libs/JSystem/JUtility/JUTFont.cpp index ff47b3c2077..2e25e1c43b0 100644 --- a/libs/JSystem/JUtility/JUTFont.cpp +++ b/libs/JSystem/JUtility/JUTFont.cpp @@ -37,8 +37,6 @@ extern "C" void drawString_size_scale__7JUTFontFffffPCcUlb(); // External References: // -extern "C" extern void* __vt__7JUTFont[17]; - extern "C" void _savegpr_27(); extern "C" void _restgpr_27(); extern "C" extern void* __vt__7JUTFont[17]; diff --git a/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp index 12ec8016cab..82762423435 100644 --- a/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp +++ b/libs/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 const JUTResFONT_Ascfont_fix12[16736]; -extern "C" extern u8 const JUTResFONT_Ascfont_fix12[16736]; - // // External References: // diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp index 039387e166a..5a2633a9000 100644 --- a/libs/JSystem/JUtility/JUTGamePad.cpp +++ b/libs/JSystem/JUtility/JUTGamePad.cpp @@ -27,10 +27,10 @@ struct JUTGamePad { /* 802E1CD8 */ CButton(); }; - struct EStickMode {}; - struct EWhichStick {}; + struct EStickMode {}; + struct CStick { /* 802E121C */ void clear(); /* 802E1238 */ void update(s8, s8, JUTGamePad::EStickMode, JUTGamePad::EWhichStick, u32); @@ -103,12 +103,6 @@ struct JKRDisposer { // static void getNumBit(u8*, int); -extern "C" extern u8 mPadStatus__10JUTGamePad[48]; -extern "C" extern u8 sAnalogMode__10JUTGamePad[4]; -extern "C" extern u8 sRumbleSupported__10JUTGamePad[4]; -extern "C" extern u8 sCallback__Q210JUTGamePad13C3ButtonReset[4]; -extern "C" extern u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451500[4]; extern "C" void __ct__10JUTGamePadFQ210JUTGamePad8EPadPort(); extern "C" void __dt__10JUTGamePadFv(); @@ -159,7 +153,6 @@ extern "C" extern u8 struct_80451500[4]; // void operator delete(void*); -extern "C" extern u32 __float_nan; extern "C" void __dl__FPv(); extern "C" void __ct__11JKRDisposerFv(); @@ -378,10 +371,10 @@ static u8 lit_1373[12]; static u8 sPatternList__19JUTGamePadLongPress[12]; /* 804508E0-804508E4 0004+00 s=1 e=0 z=0 None .sdata sPressPoint__Q210JUTGamePad6CStick */ -SECTION_SDATA static u32 sPressPoint__Q210JUTGamePad6CStick = 0x3F000000; +SECTION_SDATA static f32 sPressPoint__Q210JUTGamePad6CStick = 0.5f; /* 804508E4-804508E8 0004+00 s=1 e=0 z=0 None .sdata sReleasePoint__Q210JUTGamePad6CStick */ -SECTION_SDATA static u32 sReleasePoint__Q210JUTGamePad6CStick = 0x3E800000; +SECTION_SDATA static f32 sReleasePoint__Q210JUTGamePad6CStick = 0.25f; /* 804508E8-804508EC 0004+00 s=1 e=0 z=0 None .sdata sResetPattern__Q210JUTGamePad13C3ButtonReset */ @@ -440,9 +433,7 @@ SECTION_SDATA2 static f32 lit_1047[1 + 1 /* padding */] = { }; /* 80456020-80456028 0008+00 s=2 e=0 z=0 None .sdata2 @1050 */ -SECTION_SDATA2 static u8 lit_1050[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1050 = 4503601774854144.0 /* cast s32 to float */; /* 802E108C-802E121C 0190+00 s=1 e=0 z=0 None .text update__Q210JUTGamePad7CButtonFPC9PADStatusUl */ @@ -457,16 +448,10 @@ asm void JUTGamePad::CButton::update(PADStatus const* param_0, u32 param_1) { /* ############################################################################################## */ /* 80456028-80456030 0004+04 s=2 e=0 z=0 None .sdata2 @1056 */ -SECTION_SDATA2 static u8 lit_1056[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_1056[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 802E121C-802E1238 001C+00 s=2 e=0 z=0 None .text clear__Q210JUTGamePad6CStickFv */ @@ -481,14 +466,10 @@ asm void JUTGamePad::CStick::clear() { /* ############################################################################################## */ /* 80456030-80456038 0008+00 s=1 e=0 z=0 None .sdata2 @1117 */ -SECTION_SDATA2 static u8 lit_1117[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1117 = 0.5; /* 80456038-80456040 0008+00 s=1 e=0 z=0 None .sdata2 @1118 */ -SECTION_SDATA2 static u8 lit_1118[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1118 = 3.0; /* 80456040-80456048 0008+00 s=1 e=0 z=0 None .sdata2 @1119 */ SECTION_SDATA2 static u8 lit_1119[8] = { @@ -496,10 +477,10 @@ SECTION_SDATA2 static u8 lit_1119[8] = { }; /* 80456048-8045604C 0004+00 s=1 e=0 z=0 None .sdata2 @1120 */ -SECTION_SDATA2 static u32 lit_1120 = 0x3F800000; +SECTION_SDATA2 static f32 lit_1120 = 1.0f; /* 8045604C-80456050 0004+00 s=1 e=0 z=0 None .sdata2 @1121 */ -SECTION_SDATA2 static u32 lit_1121 = 0x4622F984; +SECTION_SDATA2 static f32 lit_1121 = 10430.37890625f; /* 802E1238-802E1500 02C8+00 s=1 e=0 z=0 None .text * update__Q210JUTGamePad6CStickFScScQ210JUTGamePad10EStickModeQ210JUTGamePad11EWhichStickUl */ diff --git a/libs/JSystem/JUtility/JUTGraphFifo.cpp b/libs/JSystem/JUtility/JUTGraphFifo.cpp index d686082c94b..9c14835f62f 100644 --- a/libs/JSystem/JUtility/JUTGraphFifo.cpp +++ b/libs/JSystem/JUtility/JUTGraphFifo.cpp @@ -33,7 +33,6 @@ extern "C" void __dt__12JUTGraphFifoFv(); // void operator delete(void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; extern "C" void alloc__7JKRHeapFUli(); extern "C" void free__7JKRHeapFPv(); diff --git a/libs/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/JUtility/JUTNameTab.cpp index e5007ef71b6..293a12eea02 100644 --- a/libs/JSystem/JUtility/JUTNameTab.cpp +++ b/libs/JSystem/JUtility/JUTNameTab.cpp @@ -37,8 +37,6 @@ extern "C" void calcKeyCode__10JUTNameTabCFPCc(); // External References: // -extern "C" extern void* __vt__10JUTNameTab[3]; - extern "C" void _savegpr_26(); extern "C" void _restgpr_26(); extern "C" void strcmp(); diff --git a/libs/JSystem/JUtility/JUTPalette.cpp b/libs/JSystem/JUtility/JUTPalette.cpp index d7e2c603bd8..a4d5b8a3b07 100644 --- a/libs/JSystem/JUtility/JUTPalette.cpp +++ b/libs/JSystem/JUtility/JUTPalette.cpp @@ -29,8 +29,6 @@ struct JUTPalette { // Forward References: // -extern "C" extern char const* const JUTPalette__stringBase0; - extern "C" void storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT(); extern "C" void storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv(); extern "C" void load__10JUTPaletteFv(); diff --git a/libs/JSystem/JUtility/JUTProcBar.cpp b/libs/JSystem/JUtility/JUTProcBar.cpp index 212dd3ba3b7..bf37387b1ab 100644 --- a/libs/JSystem/JUtility/JUTProcBar.cpp +++ b/libs/JSystem/JUtility/JUTProcBar.cpp @@ -44,7 +44,6 @@ struct JKRHeap { static void addrToXPos(void*, int); static void byteToXLen(int, int); static void heapBar(JKRHeap*, int, int, int, int, int); -extern "C" extern u8 sManager__10JUTProcBar[4]; extern "C" void __ct__10JUTProcBarFv(); extern "C" void __dt__10JUTProcBarFv(); @@ -71,15 +70,6 @@ void operator delete(void*); void J2DDrawLine(f32, f32, f32, f32, JUtility::TColor, int); void J2DFillBox(f32, f32, f32, f32, JUtility::TColor); void J2DDrawFrame(f32, f32, f32, f32, JUtility::TColor, u8); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sRootHeap__7JKRHeap[4]; -extern "C" extern u8 mCodeStart__7JKRHeap[4]; -extern "C" extern u8 mCodeEnd__7JKRHeap[4]; -extern "C" extern u8 mUserRamStart__7JKRHeap[4]; -extern "C" extern u8 mUserRamEnd__7JKRHeap[4]; -extern "C" extern u8 mMemorySize__7JKRHeap[4]; -extern "C" extern u8 sManager__8JUTVideo[4]; extern "C" void getTotalFreeSize__7JKRHeapFv(); extern "C" void* __nw__FUl(); @@ -157,16 +147,16 @@ asm void JUTProcBar::destroy() { /* ############################################################################################## */ /* 80450900-80450904 0004+00 s=2 e=0 z=0 None .sdata oneFrameRate */ -SECTION_SDATA static u32 oneFrameRate = 0x41000000; +SECTION_SDATA static f32 oneFrameRate = 8.0f; /* 80450904-80450908 0004+00 s=2 e=0 z=0 None .sdata oneFrameRateUser */ -SECTION_SDATA static u32 oneFrameRateUser = 0x41200000; +SECTION_SDATA static f32 oneFrameRateUser = 10.0f; /* 804560D8-804560DC 0004+00 s=1 e=0 z=0 None .sdata2 @2258 */ -SECTION_SDATA2 static u32 lit_2258 = 0x41000000; +SECTION_SDATA2 static f32 lit_2258 = 8.0f; /* 804560DC-804560E0 0004+00 s=2 e=0 z=0 None .sdata2 @2259 */ -SECTION_SDATA2 static u32 lit_2259 = 0x41200000; +SECTION_SDATA2 static f32 lit_2259 = 10.0f; /* 802E5A60-802E5B30 00D0+00 s=0 e=1 z=0 None .text clear__10JUTProcBarFv */ #pragma push @@ -187,9 +177,7 @@ SECTION_SDATA2 static f32 lit_2279[1 + 1 /* padding */] = { }; /* 804560E8-804560F0 0008+00 s=7 e=0 z=0 None .sdata2 @2281 */ -SECTION_SDATA2 static u8 lit_2281[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2281 = 4503601774854144.0 /* cast s32 to float */; /* 802E5B30-802E5CC4 0194+00 s=1 e=0 z=0 None .text * bar_subroutine__10JUTProcBarFiiiiiiiQ28JUtility6TColorQ28JUtility6TColor */ @@ -206,27 +194,25 @@ asm void JUTProcBar::bar_subroutine(int param_0, int param_1, int param_2, int p /* ############################################################################################## */ /* 804560F0-804560F4 0004+00 s=2 e=0 z=0 None .sdata2 @2308 */ -SECTION_SDATA2 static u32 lit_2308 = 0x41A00000; +SECTION_SDATA2 static f32 lit_2308 = 20.0f; /* 804560F4-804560F8 0004+00 s=1 e=0 z=0 None .sdata2 @2309 */ -SECTION_SDATA2 static u32 lit_2309 = 0x46823400; +SECTION_SDATA2 static f32 lit_2309 = 16666.0f; /* 804560F8-804560FC 0004+00 s=1 e=0 z=0 None .sdata2 @2310 */ -SECTION_SDATA2 static u32 lit_2310 = 0x41F00000; +SECTION_SDATA2 static f32 lit_2310 = 30.0f; /* 804560FC-80456100 0004+00 s=1 e=0 z=0 None .sdata2 @2311 */ -SECTION_SDATA2 static u32 lit_2311 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_2311 = 1.0f / 10.0f; /* 80456100-80456104 0004+00 s=1 e=0 z=0 None .sdata2 @2312 */ -SECTION_SDATA2 static u32 lit_2312 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_2312 = 1.0f / 5.0f; /* 80456104-80456108 0004+00 s=1 e=0 z=0 None .sdata2 @2313 */ -SECTION_SDATA2 static u32 lit_2313 = 0x42700000; +SECTION_SDATA2 static f32 lit_2313 = 60.0f; /* 80456108-80456110 0008+00 s=3 e=0 z=0 None .sdata2 @2315 */ -SECTION_SDATA2 static u8 lit_2315[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2315 = 4503599627370496.0 /* cast u32 to float */; /* 802E5CC4-802E5E08 0144+00 s=1 e=0 z=0 None .text adjustMeterLength__10JUTProcBarFUlPfffPi */ @@ -264,10 +250,10 @@ static u8 cntUser[4]; static u8 data_80451568[8]; /* 80456110-80456114 0004+00 s=1 e=0 z=0 None .sdata2 @2580 */ -SECTION_SDATA2 static u32 lit_2580 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2580 = 1.0f; /* 80456114-80456118 0004+00 s=1 e=0 z=0 None .sdata2 @2581 */ -SECTION_SDATA2 static u32 lit_2581 = 0x40400000; +SECTION_SDATA2 static f32 lit_2581 = 3.0f; /* 802E5E3C-802E6D3C 0F00+00 s=1 e=0 z=0 None .text drawProcessBar__10JUTProcBarFv */ #pragma push diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp index 526ec31f8aa..c6e23f176d4 100644 --- a/libs/JSystem/JUtility/JUTResFont.cpp +++ b/libs/JSystem/JUtility/JUTResFont.cpp @@ -65,9 +65,6 @@ struct JUTResFont { // Forward References: // -extern "C" extern void* const saoAboutEncoding___10JUTResFont[3]; -extern "C" extern char const* const JUTResFont__stringBase0; - extern "C" void __ct__10JUTResFontFv(); extern "C" void __ct__10JUTResFontFPC7ResFONTP7JKRHeap(); extern "C" void __dt__10JUTResFontFv(); @@ -101,7 +98,6 @@ extern "C" extern char const* const JUTResFont__stringBase0; void* operator new[](u32, JKRHeap*, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern void* __vt__7JUTFont[17]; extern "C" void* __nwa__FUlP7JKRHeapi(); extern "C" void __dl__FPv(); @@ -503,27 +499,17 @@ asm void JUTResFont::setGX(JUtility::TColor param_0, JUtility::TColor param_1) { /* ############################################################################################## */ /* 80455FF0-80455FF8 0004+04 s=2 e=0 z=0 None .sdata2 @647 */ -SECTION_SDATA2 static u8 lit_647[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_647[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80455FF8-80456000 0008+00 s=1 e=0 z=0 None .sdata2 @649 */ -SECTION_SDATA2 static u8 lit_649[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_649 = 4503601774854144.0 /* cast s32 to float */; /* 80456000-80456008 0008+00 s=1 e=0 z=0 None .sdata2 @651 */ -SECTION_SDATA2 static u8 lit_651[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_651 = 4503599627370496.0 /* cast u32 to float */; /* 802DF7C4-802DFBE8 0424+00 s=1 e=1 z=0 None .text drawChar_scale__10JUTResFontFffffib */ #pragma push diff --git a/libs/JSystem/JUtility/JUTResource.cpp b/libs/JSystem/JUtility/JUTResource.cpp index 1f5ebea92ce..fd3053f4809 100644 --- a/libs/JSystem/JUtility/JUTResource.cpp +++ b/libs/JSystem/JUtility/JUTResource.cpp @@ -11,14 +11,14 @@ // Types: // -struct JSUInputStream { - /* 802DC298 */ void read(void*, s32); -}; - struct JKRArchive { /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*); }; +struct JSUInputStream { + /* 802DC298 */ void read(void*, s32); +}; + struct JUTResReference { /* 802DE078 */ void getResource(JSUInputStream*, u32, JKRArchive*); /* 802DE120 */ void getResource(void const*, u32, JKRArchive*); diff --git a/libs/JSystem/JUtility/JUTTexture.cpp b/libs/JSystem/JUtility/JUTTexture.cpp index 2dc345fca3e..bdec594f4e2 100644 --- a/libs/JSystem/JUtility/JUTTexture.cpp +++ b/libs/JSystem/JUtility/JUTTexture.cpp @@ -141,20 +141,16 @@ asm void JUTTexture::init() { /* ############################################################################################## */ /* 80455FD8-80455FDC 0004+00 s=2 e=0 z=0 None .sdata2 @453 */ -SECTION_SDATA2 static u32 lit_453 = 0x3E000000; +SECTION_SDATA2 static f32 lit_453 = 0.125f; /* 80455FDC-80455FE0 0004+00 s=2 e=0 z=0 None .sdata2 @454 */ -SECTION_SDATA2 static u32 lit_454 = 0x42C80000; +SECTION_SDATA2 static f32 lit_454 = 100.0f; /* 80455FE0-80455FE8 0008+00 s=2 e=0 z=0 None .sdata2 @456 */ -SECTION_SDATA2 static u8 lit_456[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_456 = 4503599627370496.0 /* cast u32 to float */; /* 80455FE8-80455FF0 0008+00 s=2 e=0 z=0 None .sdata2 @459 */ -SECTION_SDATA2 static u8 lit_459[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_459 = 4503601774854144.0 /* cast s32 to float */; /* 802DE658-802DE744 00EC+00 s=2 e=0 z=0 None .text initTexObj__10JUTTextureFv */ #pragma push diff --git a/libs/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTVideo.cpp index edab8842695..c9abd3ae050 100644 --- a/libs/JSystem/JUtility/JUTVideo.cpp +++ b/libs/JSystem/JUtility/JUTVideo.cpp @@ -35,10 +35,6 @@ struct JUTDirectPrint { // Forward References: // -extern "C" extern u8 sManager__8JUTVideo[4]; -extern "C" extern u8 sVideoLastTick__8JUTVideo[4]; -extern "C" extern u8 sVideoInterval__8JUTVideo[4]; - extern "C" void createManager__8JUTVideoFPC16_GXRenderModeObj(); extern "C" void destroyManager__8JUTVideoFv(); extern "C" void __ct__8JUTVideoFPC16_GXRenderModeObj(); @@ -60,8 +56,6 @@ extern "C" extern u8 sVideoInterval__8JUTVideo[4]; void* operator new(u32); void operator delete(void*); -extern "C" extern u8 sDirectPrint__14JUTDirectPrint[4 + 4 /* padding */]; -extern "C" extern u8 sManager__6JUTXfb[4 + 4 /* padding */]; extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); diff --git a/libs/JSystem/JUtility/JUTXfb.cpp b/libs/JSystem/JUtility/JUTXfb.cpp index e614271c506..f8873300421 100644 --- a/libs/JSystem/JUtility/JUTXfb.cpp +++ b/libs/JSystem/JUtility/JUTXfb.cpp @@ -32,8 +32,6 @@ struct JUTXfb { // Forward References: // -extern "C" extern u8 sManager__6JUTXfb[4 + 4 /* padding */]; - extern "C" void clearIndex__6JUTXfbFv(); extern "C" void common_init__6JUTXfbFi(); extern "C" void __ct__6JUTXfbFPC16_GXRenderModeObjP7JKRHeapQ26JUTXfb10EXfbNumber(); @@ -51,8 +49,6 @@ extern "C" extern u8 sManager__6JUTXfb[4 + 4 /* padding */]; void* operator new(u32); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sManager__8JUTVideo[4]; extern "C" void* __nw__FUl(); extern "C" void* __nwa__FUlP7JKRHeapi(); diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp index 8686ca138b8..a84dbfee5e7 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/FILE_POS.cpp @@ -19,8 +19,6 @@ extern "C" void ftell(); // External References: // -extern "C" extern u8 errno[4 + 4 /* padding */]; - extern "C" void __flush_buffer(); extern "C" void __end_critical_region(); extern "C" void __begin_critical_region(); diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp index db6ea6c86ce..c44de32f1ea 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/abort_exit.cpp @@ -11,9 +11,6 @@ // Forward References: // -extern "C" extern u8 __stdio_exit[4]; -extern "C" extern u8 data_804519A0[8]; - extern "C" void exit(); extern "C" void abort(); extern "C" extern u8 __stdio_exit[4]; @@ -23,11 +20,6 @@ extern "C" extern u8 data_804519A0[8]; // External References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -#pragma section ".dtors$15" -__declspec(section ".dtors$15") extern void* const __fini_cpp_exceptions_reference; - extern "C" void _ExitProcess(); extern "C" void __destroy_global_chain(); extern "C" void __end_critical_region(); diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp index 14aa55694d7..1492a0e0e62 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/alloc.cpp @@ -20,8 +20,6 @@ extern "C" static void deallocate_from_var_pools(); // External References: // -extern "C" extern u8 data_804519A0[8]; - SECTION_INIT void memset(); extern "C" void __sys_free(); extern "C" void __end_critical_region(); diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp index 84a93de6128..0de024fe634 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ansi_files.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern void* __files[80]; - extern "C" void __flush_all(); extern "C" void __close_all(); extern "C" extern void* __files[80]; diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp index b5c1604e6e0..704516add11 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/ctype.cpp @@ -11,10 +11,6 @@ // Forward References: // -extern "C" extern u8 __ctype_map[256]; -extern "C" extern u8 __lower_map[256]; -extern "C" extern u8 __upper_map[256]; - extern "C" void tolower(); extern "C" extern u8 __ctype_map[256]; extern "C" extern u8 __lower_map[256]; diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp index 52d1952732e..22da426b31c 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/errno.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 errno[4 + 4 /* padding */]; -extern "C" extern u8 errno[4 + 4 /* padding */]; - // // External References: // diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp index af1dec6a536..1772d651061 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/extras.cpp @@ -18,8 +18,6 @@ extern "C" void stricmp(); // External References: // -extern "C" extern u8 __lower_map[256]; - extern "C" void __msl_strnicmp(); extern "C" extern u8 __lower_map[256]; diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp index 0c792554116..a840d7ee30a 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/file_io.cpp @@ -19,8 +19,6 @@ extern "C" void fclose(); // External References: // -extern "C" extern u8 __lower_map[256]; - extern "C" void free(); extern "C" void __flush_all(); extern "C" void __flush_buffer(); diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp index 43d44a6d030..f3452852cd1 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/float.cpp @@ -17,12 +17,6 @@ extern "C" extern u32 __float_max; extern "C" extern u32 __float_epsilon; extern "C" extern u32 data_80450AF0; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_huge; -extern "C" extern u32 __float_max; -extern "C" extern u32 __float_epsilon; -extern "C" extern u32 data_80450AF0; - // // External References: // diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp index 71483f26740..5948882cbee 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/misc_io.cpp @@ -17,8 +17,6 @@ extern "C" void __stdio_atexit(); // External References: // -extern "C" extern u8 __stdio_exit[4]; - extern "C" void __close_all(); extern "C" extern u8 __stdio_exit[4]; diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp index e864a64424a..c59d6b1b29e 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern char const* const MSL_Common_Src_printf__stringBase0; - extern "C" void sprintf(); extern "C" void snprintf(); extern "C" void vsnprintf(); @@ -34,9 +32,6 @@ extern "C" extern char const* const MSL_Common_Src_printf__stringBase0; // External References: // -extern "C" extern void* __files[80]; -extern "C" extern u8 __ctype_map[256]; - SECTION_INIT void memcpy(); extern "C" void __va_arg(); extern "C" void __div2u(); diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp index 98877ccf72c..94233c7d484 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common/Src/strtoul.cpp @@ -19,10 +19,6 @@ extern "C" static void __strtoul(); // External References: // -extern "C" extern u8 __ctype_map[256]; -extern "C" extern u8 __upper_map[256]; -extern "C" extern u8 errno[4 + 4 /* padding */]; - extern "C" void __StringRead(); extern "C" extern u8 __ctype_map[256]; extern "C" extern u8 __upper_map[256]; diff --git a/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp b/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp index 9363ec7143a..ca9d401b594 100644 --- a/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/MSL_Common_Embedded/Src/ansi_fp.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern char const* const MSL_Common_Embedded_Src_ansi_fp__stringBase0; - extern "C" void __num2dec(); extern "C" static void __num2dec_internal(); extern "C" static void __two_exp(); diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp index c88ce5aeebf..8ae238205cc 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_acos.cpp @@ -17,8 +17,6 @@ extern "C" void __ieee754_acos(); // External References: // -extern "C" extern u32 __float_nan; - extern "C" void sqrt(); extern "C" extern u32 __float_nan; @@ -33,84 +31,52 @@ SECTION_SDATA2 static u8 lit_83[8] = { }; /* 80456680-80456688 0008+00 s=1 e=0 z=0 None .sdata2 @84 */ -SECTION_SDATA2 static u8 lit_84[8] = { - 0x40, 0x09, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_84 = 3.141592653589793; /* 80456688-80456690 0008+00 s=1 e=0 z=0 None .sdata2 @85 */ -SECTION_SDATA2 static u8 lit_85[8] = { - 0x3F, 0xF9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_85 = 1.5707963267948966; /* 80456690-80456698 0008+00 s=1 e=0 z=0 None .sdata2 @86 */ -SECTION_SDATA2 static u8 lit_86[8] = { - 0x3C, 0x91, 0xA6, 0x26, 0x33, 0x14, 0x5C, 0x07, -}; +SECTION_SDATA2 static f64 lit_86 = 6.123233995736766e-17; /* 80456698-804566A0 0008+00 s=1 e=0 z=0 None .sdata2 @87 */ -SECTION_SDATA2 static u8 lit_87[8] = { - 0x3F, 0xC5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, -}; +SECTION_SDATA2 static f64 lit_87 = 1.0 / 6.0; /* 804566A0-804566A8 0008+00 s=1 e=0 z=0 None .sdata2 @88 */ -SECTION_SDATA2 static u8 lit_88[8] = { - 0xBF, 0xD4, 0xD6, 0x12, 0x03, 0xEB, 0x6F, 0x7D, -}; +SECTION_SDATA2 static f64 lit_88 = -0.3255658186224009; /* 804566A8-804566B0 0008+00 s=1 e=0 z=0 None .sdata2 @89 */ -SECTION_SDATA2 static u8 lit_89[8] = { - 0x3F, 0xC9, 0xC1, 0x55, 0x0E, 0x88, 0x44, 0x55, -}; +SECTION_SDATA2 static f64 lit_89 = 0.20121253213486293; /* 804566B0-804566B8 0008+00 s=1 e=0 z=0 None .sdata2 @90 */ -SECTION_SDATA2 static u8 lit_90[8] = { - 0xBF, 0xA4, 0x82, 0x28, 0xB5, 0x68, 0x8F, 0x3B, -}; +SECTION_SDATA2 static f64 lit_90 = -0.04005553450067941; /* 804566B8-804566C0 0008+00 s=1 e=0 z=0 None .sdata2 @91 */ -SECTION_SDATA2 static u8 lit_91[8] = { - 0x3F, 0x49, 0xEF, 0xE0, 0x75, 0x01, 0xB2, 0x88, -}; +SECTION_SDATA2 static f64 lit_91 = 0.0007915349942898145; /* 804566C0-804566C8 0008+00 s=1 e=0 z=0 None .sdata2 @92 */ -SECTION_SDATA2 static u8 lit_92[8] = { - 0x3F, 0x02, 0x3D, 0xE1, 0x0D, 0xFD, 0xF7, 0x09, -}; +SECTION_SDATA2 static f64 lit_92 = 3.479331075960212e-05; /* 804566C8-804566D0 0008+00 s=1 e=0 z=0 None .sdata2 @93 */ -SECTION_SDATA2 static u8 lit_93[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_93 = 1.0; /* 804566D0-804566D8 0008+00 s=1 e=0 z=0 None .sdata2 @94 */ -SECTION_SDATA2 static u8 lit_94[8] = { - 0xC0, 0x03, 0x3A, 0x27, 0x1C, 0x8A, 0x2D, 0x4B, -}; +SECTION_SDATA2 static f64 lit_94 = -2.403394911734414; /* 804566D8-804566E0 0008+00 s=1 e=0 z=0 None .sdata2 @95 */ -SECTION_SDATA2 static u8 lit_95[8] = { - 0x40, 0x00, 0x2A, 0xE5, 0x9C, 0x59, 0x8A, 0xC8, -}; +SECTION_SDATA2 static f64 lit_95 = 2.0209457602335057; /* 804566E0-804566E8 0008+00 s=1 e=0 z=0 None .sdata2 @96 */ -SECTION_SDATA2 static u8 lit_96[8] = { - 0xBF, 0xE6, 0x06, 0x6C, 0x1B, 0x8D, 0x01, 0x59, -}; +SECTION_SDATA2 static f64 lit_96 = -0.6882839716054533; /* 804566E8-804566F0 0008+00 s=1 e=0 z=0 None .sdata2 @97 */ -SECTION_SDATA2 static u8 lit_97[8] = { - 0x3F, 0xB3, 0xB8, 0xC5, 0xB1, 0x2E, 0x92, 0x82, -}; +SECTION_SDATA2 static f64 lit_97 = 0.07703815055590194; /* 804566F0-804566F8 0008+00 s=1 e=0 z=0 None .sdata2 @98 */ -SECTION_SDATA2 static u8 lit_98[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_98 = 0.5; /* 804566F8-80456700 0008+00 s=1 e=0 z=0 None .sdata2 @99 */ -SECTION_SDATA2 static u8 lit_99[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_99 = 2.0; /* 80369274-803694B0 023C+00 s=0 e=1 z=0 None .text __ieee754_acos */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp index 7665eff9251..3d46b34b996 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_asin.cpp @@ -17,8 +17,6 @@ extern "C" void __ieee754_asin(); // External References: // -extern "C" extern u32 __float_nan; - extern "C" void sqrt(); extern "C" extern u32 __float_nan; @@ -28,89 +26,55 @@ extern "C" extern u32 __float_nan; /* ############################################################################################## */ /* 80456700-80456708 0008+00 s=1 e=0 z=0 None .sdata2 @94 */ -SECTION_SDATA2 static u8 lit_94[8] = { - 0x3F, 0xF9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_94 = 1.5707963267948966; /* 80456708-80456710 0008+00 s=1 e=0 z=0 None .sdata2 @95 */ -SECTION_SDATA2 static u8 lit_95[8] = { - 0x3C, 0x91, 0xA6, 0x26, 0x33, 0x14, 0x5C, 0x07, -}; +SECTION_SDATA2 static f64 lit_95 = 6.123233995736766e-17; /* 80456710-80456718 0008+00 s=1 e=0 z=0 None .sdata2 @96 */ -SECTION_SDATA2 static u8 lit_96[8] = { - 0x7E, 0x37, 0xE4, 0x3C, 0x88, 0x00, 0x75, 0x9C, -}; +SECTION_SDATA2 static f64 lit_96 = 1e+300; /* 80456718-80456720 0008+00 s=1 e=0 z=0 None .sdata2 @97 */ -SECTION_SDATA2 static u8 lit_97[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_97 = 1.0; /* 80456720-80456728 0008+00 s=1 e=0 z=0 None .sdata2 @98 */ -SECTION_SDATA2 static u8 lit_98[8] = { - 0x3F, 0xC5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, -}; +SECTION_SDATA2 static f64 lit_98 = 1.0 / 6.0; /* 80456728-80456730 0008+00 s=1 e=0 z=0 None .sdata2 @99 */ -SECTION_SDATA2 static u8 lit_99[8] = { - 0xBF, 0xD4, 0xD6, 0x12, 0x03, 0xEB, 0x6F, 0x7D, -}; +SECTION_SDATA2 static f64 lit_99 = -0.3255658186224009; /* 80456730-80456738 0008+00 s=1 e=0 z=0 None .sdata2 @100 */ -SECTION_SDATA2 static u8 lit_100[8] = { - 0x3F, 0xC9, 0xC1, 0x55, 0x0E, 0x88, 0x44, 0x55, -}; +SECTION_SDATA2 static f64 lit_100 = 0.20121253213486293; /* 80456738-80456740 0008+00 s=1 e=0 z=0 None .sdata2 @101 */ -SECTION_SDATA2 static u8 lit_101[8] = { - 0xBF, 0xA4, 0x82, 0x28, 0xB5, 0x68, 0x8F, 0x3B, -}; +SECTION_SDATA2 static f64 lit_101 = -0.04005553450067941; /* 80456740-80456748 0008+00 s=1 e=0 z=0 None .sdata2 @102 */ -SECTION_SDATA2 static u8 lit_102[8] = { - 0x3F, 0x49, 0xEF, 0xE0, 0x75, 0x01, 0xB2, 0x88, -}; +SECTION_SDATA2 static f64 lit_102 = 0.0007915349942898145; /* 80456748-80456750 0008+00 s=1 e=0 z=0 None .sdata2 @103 */ -SECTION_SDATA2 static u8 lit_103[8] = { - 0x3F, 0x02, 0x3D, 0xE1, 0x0D, 0xFD, 0xF7, 0x09, -}; +SECTION_SDATA2 static f64 lit_103 = 3.479331075960212e-05; /* 80456750-80456758 0008+00 s=1 e=0 z=0 None .sdata2 @104 */ -SECTION_SDATA2 static u8 lit_104[8] = { - 0xC0, 0x03, 0x3A, 0x27, 0x1C, 0x8A, 0x2D, 0x4B, -}; +SECTION_SDATA2 static f64 lit_104 = -2.403394911734414; /* 80456758-80456760 0008+00 s=1 e=0 z=0 None .sdata2 @105 */ -SECTION_SDATA2 static u8 lit_105[8] = { - 0x40, 0x00, 0x2A, 0xE5, 0x9C, 0x59, 0x8A, 0xC8, -}; +SECTION_SDATA2 static f64 lit_105 = 2.0209457602335057; /* 80456760-80456768 0008+00 s=1 e=0 z=0 None .sdata2 @106 */ -SECTION_SDATA2 static u8 lit_106[8] = { - 0xBF, 0xE6, 0x06, 0x6C, 0x1B, 0x8D, 0x01, 0x59, -}; +SECTION_SDATA2 static f64 lit_106 = -0.6882839716054533; /* 80456768-80456770 0008+00 s=1 e=0 z=0 None .sdata2 @107 */ -SECTION_SDATA2 static u8 lit_107[8] = { - 0x3F, 0xB3, 0xB8, 0xC5, 0xB1, 0x2E, 0x92, 0x82, -}; +SECTION_SDATA2 static f64 lit_107 = 0.07703815055590194; /* 80456770-80456778 0008+00 s=1 e=0 z=0 None .sdata2 @108 */ -SECTION_SDATA2 static u8 lit_108[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_108 = 0.5; /* 80456778-80456780 0008+00 s=1 e=0 z=0 None .sdata2 @109 */ -SECTION_SDATA2 static u8 lit_109[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_109 = 2.0; /* 80456780-80456788 0008+00 s=1 e=0 z=0 None .sdata2 @110 */ -SECTION_SDATA2 static u8 lit_110[8] = { - 0x3F, 0xE9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_110 = 0.7853981633974483; /* 803694B0-803696E8 0238+00 s=0 e=1 z=0 None .text __ieee754_asin */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp index 0d56aa057a5..e468d7b49b9 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_atan2.cpp @@ -25,44 +25,28 @@ extern "C" void atan(); /* ############################################################################################## */ /* 80456788-80456790 0008+00 s=1 e=0 z=0 None .sdata2 @145 */ -SECTION_SDATA2 static u8 lit_145[8] = { - 0x40, 0x09, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_145 = 3.141592653589793; /* 80456790-80456798 0008+00 s=1 e=0 z=0 None .sdata2 @146 */ -SECTION_SDATA2 static u8 lit_146[8] = { - 0xC0, 0x09, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_146 = -3.141592653589793; /* 80456798-804567A0 0008+00 s=1 e=0 z=0 None .sdata2 @147 */ -SECTION_SDATA2 static u8 lit_147[8] = { - 0xBF, 0xF9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_147 = -1.5707963267948966; /* 804567A0-804567A8 0008+00 s=1 e=0 z=0 None .sdata2 @148 */ -SECTION_SDATA2 static u8 lit_148[8] = { - 0x3F, 0xF9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_148 = 1.5707963267948966; /* 804567A8-804567B0 0008+00 s=1 e=0 z=0 None .sdata2 @149 */ -SECTION_SDATA2 static u8 lit_149[8] = { - 0x3F, 0xE9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_149 = 0.7853981633974483; /* 804567B0-804567B8 0008+00 s=1 e=0 z=0 None .sdata2 @150 */ -SECTION_SDATA2 static u8 lit_150[8] = { - 0xBF, 0xE9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_150 = -0.7853981633974483; /* 804567B8-804567C0 0008+00 s=1 e=0 z=0 None .sdata2 @151 */ -SECTION_SDATA2 static u8 lit_151[8] = { - 0x40, 0x02, 0xD9, 0x7C, 0x7F, 0x33, 0x21, 0xD2, -}; +SECTION_SDATA2 static f64 lit_151 = 2.356194490192345; /* 804567C0-804567C8 0008+00 s=1 e=0 z=0 None .sdata2 @152 */ -SECTION_SDATA2 static u8 lit_152[8] = { - 0xC0, 0x02, 0xD9, 0x7C, 0x7F, 0x33, 0x21, 0xD2, -}; +SECTION_SDATA2 static f64 lit_152 = -2.356194490192345; /* 804567C8-804567D0 0008+00 s=1 e=0 z=0 None .sdata2 @153 */ SECTION_SDATA2 static u8 lit_153[8] = { @@ -70,14 +54,10 @@ SECTION_SDATA2 static u8 lit_153[8] = { }; /* 804567D0-804567D8 0008+00 s=1 e=0 z=0 None .sdata2 @154 */ -SECTION_SDATA2 static u8 lit_154[8] = { - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_154 = -0.0; /* 804567D8-804567E0 0008+00 s=1 e=0 z=0 None .sdata2 @155 */ -SECTION_SDATA2 static u8 lit_155[8] = { - 0x3C, 0xA1, 0xA6, 0x26, 0x33, 0x14, 0x5C, 0x07, -}; +SECTION_SDATA2 static f64 lit_155 = 1.2246467991473532e-16; /* 803696E8-80369978 0290+00 s=0 e=1 z=0 None .text __ieee754_atan2 */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp index 56ea831ee39..43cc93e17bc 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_exp.cpp @@ -43,74 +43,46 @@ SECTION_SDATA2 static u8 lit_115[8] = { }; /* 804567E8-804567F0 0008+00 s=1 e=0 z=0 None .sdata2 @116 */ -SECTION_SDATA2 static u8 lit_116[8] = { - 0x40, 0x86, 0x2E, 0x42, 0xFE, 0xFA, 0x39, 0xEF, -}; +SECTION_SDATA2 static f64 lit_116 = 709.782712893384; /* 804567F0-804567F8 0008+00 s=1 e=0 z=0 None .sdata2 @117 */ -SECTION_SDATA2 static u8 lit_117[8] = { - 0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_117 = DOUBLE_INF; /* 804567F8-80456800 0008+00 s=1 e=0 z=0 None .sdata2 @118 */ -SECTION_SDATA2 static u8 lit_118[8] = { - 0xC0, 0x87, 0x49, 0x10, 0xD5, 0x2D, 0x30, 0x51, -}; +SECTION_SDATA2 static f64 lit_118 = -745.1332191019411; /* 80456800-80456808 0008+00 s=1 e=0 z=0 None .sdata2 @119 */ -SECTION_SDATA2 static u8 lit_119[8] = { - 0x3F, 0xF7, 0x15, 0x47, 0x65, 0x2B, 0x82, 0xFE, -}; +SECTION_SDATA2 static f64 lit_119 = 1.4426950408889634; /* 80456808-80456810 0008+00 s=1 e=0 z=0 None .sdata2 @120 */ -SECTION_SDATA2 static u8 lit_120[8] = { - 0x7E, 0x37, 0xE4, 0x3C, 0x88, 0x00, 0x75, 0x9C, -}; +SECTION_SDATA2 static f64 lit_120 = 1e+300; /* 80456810-80456818 0008+00 s=1 e=0 z=0 None .sdata2 @121 */ -SECTION_SDATA2 static u8 lit_121[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_121 = 1.0; /* 80456818-80456820 0008+00 s=1 e=0 z=0 None .sdata2 @122 */ -SECTION_SDATA2 static u8 lit_122[8] = { - 0x3F, 0xC5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3E, -}; +SECTION_SDATA2 static f64 lit_122 = 0.16666666666666602; /* 80456820-80456828 0008+00 s=1 e=0 z=0 None .sdata2 @123 */ -SECTION_SDATA2 static u8 lit_123[8] = { - 0xBF, 0x66, 0xC1, 0x6C, 0x16, 0xBE, 0xBD, 0x93, -}; +SECTION_SDATA2 static f64 lit_123 = -0.0027777777777015593; /* 80456828-80456830 0008+00 s=1 e=0 z=0 None .sdata2 @124 */ -SECTION_SDATA2 static u8 lit_124[8] = { - 0x3F, 0x11, 0x56, 0x6A, 0xAF, 0x25, 0xDE, 0x2C, -}; +SECTION_SDATA2 static f64 lit_124 = 6.613756321437934e-05; /* 80456830-80456838 0008+00 s=1 e=0 z=0 None .sdata2 @125 */ -SECTION_SDATA2 static u8 lit_125[8] = { - 0xBE, 0xBB, 0xBD, 0x41, 0xC5, 0xD2, 0x6B, 0xF1, -}; +SECTION_SDATA2 static f64 lit_125 = -1.6533902205465252e-06; /* 80456838-80456840 0008+00 s=1 e=0 z=0 None .sdata2 @126 */ -SECTION_SDATA2 static u8 lit_126[8] = { - 0x3E, 0x66, 0x37, 0x69, 0x72, 0xBE, 0xA4, 0xD0, -}; +SECTION_SDATA2 static f64 lit_126 = 4.1381367970572385e-08; /* 80456840-80456848 0008+00 s=1 e=0 z=0 None .sdata2 @127 */ -SECTION_SDATA2 static u8 lit_127[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_127 = 2.0; /* 80456848-80456850 0008+00 s=1 e=0 z=0 None .sdata2 @128 */ -SECTION_SDATA2 static u8 lit_128[8] = { - 0x01, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_128 = 9.332636185032189e-302; /* 80456850-80456858 0008+00 s=1 e=0 z=0 None .sdata2 @131 */ -SECTION_SDATA2 static u8 lit_131[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_131 = 4503601774854144.0 /* cast s32 to float */; /* 80369978-80369B9C 0224+00 s=0 e=1 z=0 None .text __ieee754_exp */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp index 7f069809bf9..108f9daa74d 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_pow.cpp @@ -17,9 +17,6 @@ extern "C" void __ieee754_pow(); // External References: // -extern "C" extern u32 __float_nan; -extern "C" extern u8 errno[4 + 4 /* padding */]; - extern "C" void ldexp(); extern "C" void sqrt(); extern "C" extern u32 __float_nan; @@ -46,9 +43,7 @@ SECTION_RODATA static u8 const dp_l[16] = { }; /* 80456858-80456860 0008+00 s=1 e=0 z=0 None .sdata2 @336 */ -SECTION_SDATA2 static u8 lit_336[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_336 = 1.0; /* 80456860-80456868 0008+00 s=1 e=0 z=0 None .sdata2 @337 */ SECTION_SDATA2 static u8 lit_337[8] = { @@ -56,164 +51,100 @@ SECTION_SDATA2 static u8 lit_337[8] = { }; /* 80456868-80456870 0008+00 s=1 e=0 z=0 None .sdata2 @338 */ -SECTION_SDATA2 static u8 lit_338[8] = { - 0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_338 = DOUBLE_INF; /* 80456870-80456878 0008+00 s=1 e=0 z=0 None .sdata2 @339 */ -SECTION_SDATA2 static u8 lit_339[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_339 = 0.5; /* 80456878-80456880 0008+00 s=1 e=0 z=0 None .sdata2 @340 */ -SECTION_SDATA2 static u8 lit_340[8] = { - 0x3F, 0xD5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, -}; +SECTION_SDATA2 static f64 lit_340 = 1.0 / 3.0; /* 80456880-80456888 0008+00 s=1 e=0 z=0 None .sdata2 @341 */ -SECTION_SDATA2 static u8 lit_341[8] = { - 0x3F, 0xD0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_341 = 0.25; /* 80456888-80456890 0008+00 s=1 e=0 z=0 None .sdata2 @342 */ -SECTION_SDATA2 static u8 lit_342[8] = { - 0x3F, 0xF7, 0x15, 0x47, 0x60, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_342 = 1.4426950216293335; /* 80456890-80456898 0008+00 s=1 e=0 z=0 None .sdata2 @343 */ -SECTION_SDATA2 static u8 lit_343[8] = { - 0x3E, 0x54, 0xAE, 0x0B, 0xF8, 0x5D, 0xDF, 0x44, -}; +SECTION_SDATA2 static f64 lit_343 = 1.9259629911266175e-08; /* 80456898-804568A0 0008+00 s=1 e=0 z=0 None .sdata2 @344 */ -SECTION_SDATA2 static u8 lit_344[8] = { - 0x3F, 0xF7, 0x15, 0x47, 0x65, 0x2B, 0x82, 0xFE, -}; +SECTION_SDATA2 static f64 lit_344 = 1.4426950408889634; /* 804568A0-804568A8 0008+00 s=1 e=0 z=0 None .sdata2 @345 */ -SECTION_SDATA2 static u8 lit_345[8] = { - 0x43, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_345 = 9007199254740992.0; /* 804568A8-804568B0 0008+00 s=1 e=0 z=0 None .sdata2 @346 */ -SECTION_SDATA2 static u8 lit_346[8] = { - 0x3F, 0xE3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x03, -}; +SECTION_SDATA2 static f64 lit_346 = 0.5999999999999946; /* 804568B0-804568B8 0008+00 s=1 e=0 z=0 None .sdata2 @347 */ -SECTION_SDATA2 static u8 lit_347[8] = { - 0x3F, 0xDB, 0x6D, 0xB6, 0xDB, 0x6F, 0xAB, 0xFF, -}; +SECTION_SDATA2 static f64 lit_347 = 0.4285714285785502; /* 804568B8-804568C0 0008+00 s=1 e=0 z=0 None .sdata2 @348 */ -SECTION_SDATA2 static u8 lit_348[8] = { - 0x3F, 0xD5, 0x55, 0x55, 0x51, 0x8F, 0x26, 0x4D, -}; +SECTION_SDATA2 static f64 lit_348 = 0.33333332981837743; /* 804568C0-804568C8 0008+00 s=1 e=0 z=0 None .sdata2 @349 */ -SECTION_SDATA2 static u8 lit_349[8] = { - 0x3F, 0xD1, 0x74, 0x60, 0xA9, 0x1D, 0x41, 0x01, -}; +SECTION_SDATA2 static f64 lit_349 = 0.272728123808534; /* 804568C8-804568D0 0008+00 s=1 e=0 z=0 None .sdata2 @350 */ -SECTION_SDATA2 static u8 lit_350[8] = { - 0x3F, 0xCD, 0x86, 0x4A, 0x93, 0xC9, 0xDB, 0x65, -}; +SECTION_SDATA2 static f64 lit_350 = 0.23066074577556175; /* 804568D0-804568D8 0008+00 s=1 e=0 z=0 None .sdata2 @351 */ -SECTION_SDATA2 static u8 lit_351[8] = { - 0x3F, 0xCA, 0x7E, 0x28, 0x4A, 0x45, 0x4E, 0xEF, -}; +SECTION_SDATA2 static f64 lit_351 = 0.20697501780033842; /* 804568D8-804568E0 0008+00 s=1 e=0 z=0 None .sdata2 @352 */ -SECTION_SDATA2 static u8 lit_352[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_352 = 3.0; /* 804568E0-804568E8 0008+00 s=1 e=0 z=0 None .sdata2 @353 */ -SECTION_SDATA2 static u8 lit_353[8] = { - 0x3F, 0xEE, 0xC7, 0x09, 0xE0, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_353 = 0.9617967009544373; /* 804568E8-804568F0 0008+00 s=1 e=0 z=0 None .sdata2 @354 */ -SECTION_SDATA2 static u8 lit_354[8] = { - 0xBE, 0x3E, 0x2F, 0xE0, 0x14, 0x5B, 0x01, 0xF5, -}; +SECTION_SDATA2 static f64 lit_354 = -7.028461650952758e-09; /* 804568F0-804568F8 0008+00 s=1 e=0 z=0 None .sdata2 @355 */ -SECTION_SDATA2 static u8 lit_355[8] = { - 0x3F, 0xEE, 0xC7, 0x09, 0xDC, 0x3A, 0x03, 0xFD, -}; +SECTION_SDATA2 static f64 lit_355 = 0.9617966939259756; /* 804568F8-80456900 0008+00 s=1 e=0 z=0 None .sdata2 @356 */ -SECTION_SDATA2 static u8 lit_356[8] = { - 0xBF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_356 = -1.0; /* 80456900-80456908 0008+00 s=1 e=0 z=0 None .sdata2 @357 */ -SECTION_SDATA2 static u8 lit_357[8] = { - 0x7E, 0x37, 0xE4, 0x3C, 0x88, 0x00, 0x75, 0x9C, -}; +SECTION_SDATA2 static f64 lit_357 = 1e+300; /* 80456908-80456910 0008+00 s=1 e=0 z=0 None .sdata2 @358 */ -SECTION_SDATA2 static u8 lit_358[8] = { - 0x3C, 0x97, 0x15, 0x47, 0x65, 0x2B, 0x82, 0xFE, -}; +SECTION_SDATA2 static f64 lit_358 = 8.008566259537294e-17; /* 80456910-80456918 0008+00 s=1 e=0 z=0 None .sdata2 @359 */ -SECTION_SDATA2 static u8 lit_359[8] = { - 0x01, 0xA5, 0x6E, 0x1F, 0xC2, 0xF8, 0xF3, 0x59, -}; +SECTION_SDATA2 static f64 lit_359 = 1e-300; /* 80456918-80456920 0008+00 s=1 e=0 z=0 None .sdata2 @360 */ -SECTION_SDATA2 static u8 lit_360[8] = { - 0x3F, 0xE6, 0x2E, 0x43, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_360 = 0.6931471824645996; /* 80456920-80456928 0008+00 s=1 e=0 z=0 None .sdata2 @361 */ -SECTION_SDATA2 static u8 lit_361[8] = { - 0x3F, 0xE6, 0x2E, 0x42, 0xFE, 0xFA, 0x39, 0xEF, -}; +SECTION_SDATA2 static f64 lit_361 = 0.6931471805599453; /* 80456928-80456930 0008+00 s=1 e=0 z=0 None .sdata2 @362 */ -SECTION_SDATA2 static u8 lit_362[8] = { - 0xBE, 0x20, 0x5C, 0x61, 0x0C, 0xA8, 0x6C, 0x39, -}; +SECTION_SDATA2 static f64 lit_362 = -1.904654299957768e-09; /* 80456930-80456938 0008+00 s=1 e=0 z=0 None .sdata2 @363 */ -SECTION_SDATA2 static u8 lit_363[8] = { - 0x3F, 0xC5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x3E, -}; +SECTION_SDATA2 static f64 lit_363 = 0.16666666666666602; /* 80456938-80456940 0008+00 s=1 e=0 z=0 None .sdata2 @364 */ -SECTION_SDATA2 static u8 lit_364[8] = { - 0xBF, 0x66, 0xC1, 0x6C, 0x16, 0xBE, 0xBD, 0x93, -}; +SECTION_SDATA2 static f64 lit_364 = -0.0027777777777015593; /* 80456940-80456948 0008+00 s=1 e=0 z=0 None .sdata2 @365 */ -SECTION_SDATA2 static u8 lit_365[8] = { - 0x3F, 0x11, 0x56, 0x6A, 0xAF, 0x25, 0xDE, 0x2C, -}; +SECTION_SDATA2 static f64 lit_365 = 6.613756321437934e-05; /* 80456948-80456950 0008+00 s=1 e=0 z=0 None .sdata2 @366 */ -SECTION_SDATA2 static u8 lit_366[8] = { - 0xBE, 0xBB, 0xBD, 0x41, 0xC5, 0xD2, 0x6B, 0xF1, -}; +SECTION_SDATA2 static f64 lit_366 = -1.6533902205465252e-06; /* 80456950-80456958 0008+00 s=1 e=0 z=0 None .sdata2 @367 */ -SECTION_SDATA2 static u8 lit_367[8] = { - 0x3E, 0x66, 0x37, 0x69, 0x72, 0xBE, 0xA4, 0xD0, -}; +SECTION_SDATA2 static f64 lit_367 = 4.1381367970572385e-08; /* 80456958-80456960 0008+00 s=1 e=0 z=0 None .sdata2 @368 */ -SECTION_SDATA2 static u8 lit_368[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_368 = 2.0; /* 80456960-80456968 0008+00 s=1 e=0 z=0 None .sdata2 @370 */ -SECTION_SDATA2 static u8 lit_370[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_370 = 4503601774854144.0 /* cast s32 to float */; /* 80369ED8-8036A708 0830+00 s=0 e=1 z=0 None .text __ieee754_pow */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp index 8dae43e40d6..458f48b4cf4 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_rem_pio2.cpp @@ -63,54 +63,34 @@ SECTION_SDATA2 static u8 lit_145[8] = { }; /* 80456970-80456978 0008+00 s=1 e=0 z=0 None .sdata2 @146 */ -SECTION_SDATA2 static u8 lit_146[8] = { - 0x3F, 0xF9, 0x21, 0xFB, 0x54, 0x40, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_146 = 1.5707963267341256; /* 80456978-80456980 0008+00 s=1 e=0 z=0 None .sdata2 @147 */ -SECTION_SDATA2 static u8 lit_147[8] = { - 0x3D, 0xD0, 0xB4, 0x61, 0x1A, 0x62, 0x63, 0x31, -}; +SECTION_SDATA2 static f64 lit_147 = 6.077100506506192e-11; /* 80456980-80456988 0008+00 s=1 e=0 z=0 None .sdata2 @148 */ -SECTION_SDATA2 static u8 lit_148[8] = { - 0x3D, 0xD0, 0xB4, 0x61, 0x1A, 0x60, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_148 = 6.077100506303966e-11; /* 80456988-80456990 0008+00 s=1 e=0 z=0 None .sdata2 @149 */ -SECTION_SDATA2 static u8 lit_149[8] = { - 0x3B, 0xA3, 0x19, 0x8A, 0x2E, 0x03, 0x70, 0x73, -}; +SECTION_SDATA2 static f64 lit_149 = 2.0222662487959506e-21; /* 80456990-80456998 0008+00 s=1 e=0 z=0 None .sdata2 @150 */ -SECTION_SDATA2 static u8 lit_150[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_150 = 0.5; /* 80456998-804569A0 0008+00 s=1 e=0 z=0 None .sdata2 @151 */ -SECTION_SDATA2 static u8 lit_151[8] = { - 0x3F, 0xE4, 0x5F, 0x30, 0x6D, 0xC9, 0xC8, 0x83, -}; +SECTION_SDATA2 static f64 lit_151 = 0.6366197723675814; /* 804569A0-804569A8 0008+00 s=1 e=0 z=0 None .sdata2 @152 */ -SECTION_SDATA2 static u8 lit_152[8] = { - 0x3B, 0xA3, 0x19, 0x8A, 0x2E, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_152 = 2.0222662487111665e-21; /* 804569A8-804569B0 0008+00 s=1 e=0 z=0 None .sdata2 @153 */ -SECTION_SDATA2 static u8 lit_153[8] = { - 0x39, 0x7B, 0x83, 0x9A, 0x25, 0x20, 0x49, 0xC1, -}; +SECTION_SDATA2 static f64 lit_153 = 8.4784276603689e-32; /* 804569B0-804569B8 0008+00 s=1 e=0 z=0 None .sdata2 @154 */ -SECTION_SDATA2 static u8 lit_154[8] = { - 0x41, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_154 = 16777216.0; /* 804569B8-804569C0 0008+00 s=1 e=0 z=0 None .sdata2 @157 */ -SECTION_SDATA2 static u8 lit_157[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_157 = 4503601774854144.0 /* cast s32 to float */; /* 8036A708-8036AAA8 03A0+00 s=0 e=3 z=0 None .text __ieee754_rem_pio2 */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp index 8a1af6a44cc..2f86a74e9fe 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/e_sqrt.cpp @@ -20,18 +20,13 @@ extern "C" void __ieee754_sqrt(); extern "C" extern u32 __float_nan; extern "C" extern u8 errno[4 + 4 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 errno[4 + 4 /* padding */]; - // // Declarations: // /* ############################################################################################## */ /* 80456B48-80456B50 0008+00 s=1 e=0 z=0 None .sdata2 @164 */ -SECTION_SDATA2 static u8 lit_164[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_164 = 1.0; /* 8036C7A0-8036C9C4 0224+00 s=0 e=1 z=0 None .text __ieee754_sqrt */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp index fe8a3e94045..ba3581b8f5c 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_cos.cpp @@ -23,49 +23,31 @@ extern "C" void __kernel_cos(); /* ############################################################################################## */ /* 804569C0-804569C8 0008+00 s=1 e=0 z=0 None .sdata2 @65 */ -SECTION_SDATA2 static u8 lit_65[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_65 = 1.0; /* 804569C8-804569D0 0008+00 s=1 e=0 z=0 None .sdata2 @66 */ -SECTION_SDATA2 static u8 lit_66[8] = { - 0x3F, 0xA5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x4C, -}; +SECTION_SDATA2 static f64 lit_66 = 0.0416666666666666; /* 804569D0-804569D8 0008+00 s=1 e=0 z=0 None .sdata2 @67 */ -SECTION_SDATA2 static u8 lit_67[8] = { - 0xBF, 0x56, 0xC1, 0x6C, 0x16, 0xC1, 0x51, 0x77, -}; +SECTION_SDATA2 static f64 lit_67 = -0.001388888888887411; /* 804569D8-804569E0 0008+00 s=1 e=0 z=0 None .sdata2 @68 */ -SECTION_SDATA2 static u8 lit_68[8] = { - 0x3E, 0xFA, 0x01, 0xA0, 0x19, 0xCB, 0x15, 0x90, -}; +SECTION_SDATA2 static f64 lit_68 = 2.480158728947673e-05; /* 804569E0-804569E8 0008+00 s=1 e=0 z=0 None .sdata2 @69 */ -SECTION_SDATA2 static u8 lit_69[8] = { - 0xBE, 0x92, 0x7E, 0x4F, 0x80, 0x9C, 0x52, 0xAD, -}; +SECTION_SDATA2 static f64 lit_69 = -2.7557314351390663e-07; /* 804569E8-804569F0 0008+00 s=1 e=0 z=0 None .sdata2 @70 */ -SECTION_SDATA2 static u8 lit_70[8] = { - 0x3E, 0x21, 0xEE, 0x9E, 0xBD, 0xB4, 0xB1, 0xC4, -}; +SECTION_SDATA2 static f64 lit_70 = 2.087572321298175e-09; /* 804569F0-804569F8 0008+00 s=1 e=0 z=0 None .sdata2 @71 */ -SECTION_SDATA2 static u8 lit_71[8] = { - 0xBD, 0xA8, 0xFA, 0xE9, 0xBE, 0x88, 0x38, 0xD4, -}; +SECTION_SDATA2 static f64 lit_71 = -1.1359647557788195e-11; /* 804569F8-80456A00 0008+00 s=1 e=0 z=0 None .sdata2 @72 */ -SECTION_SDATA2 static u8 lit_72[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_72 = 0.5; /* 80456A00-80456A08 0008+00 s=1 e=0 z=0 None .sdata2 @73 */ -SECTION_SDATA2 static u8 lit_73[8] = { - 0x3F, 0xD2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_73 = 0.28125; /* 8036AAA8-8036AB9C 00F4+00 s=0 e=2 z=0 None .text __kernel_cos */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp index c1523e0030c..4f56488375b 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_rem_pio2.cpp @@ -46,39 +46,25 @@ SECTION_SDATA2 static u8 lit_436[8] = { }; /* 80456A10-80456A18 0008+00 s=1 e=0 z=0 None .sdata2 @437 */ -SECTION_SDATA2 static u8 lit_437[8] = { - 0x3E, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_437 = 5.960464477539063e-08; /* 80456A18-80456A20 0008+00 s=1 e=0 z=0 None .sdata2 @438 */ -SECTION_SDATA2 static u8 lit_438[8] = { - 0x41, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_438 = 16777216.0; /* 80456A20-80456A28 0008+00 s=1 e=0 z=0 None .sdata2 @439 */ -SECTION_SDATA2 static u8 lit_439[8] = { - 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_439 = 8.0; /* 80456A28-80456A30 0008+00 s=1 e=0 z=0 None .sdata2 @440 */ -SECTION_SDATA2 static u8 lit_440[8] = { - 0x3F, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_440 = 0.125; /* 80456A30-80456A38 0008+00 s=1 e=0 z=0 None .sdata2 @441 */ -SECTION_SDATA2 static u8 lit_441[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_441 = 0.5; /* 80456A38-80456A40 0008+00 s=1 e=0 z=0 None .sdata2 @442 */ -SECTION_SDATA2 static u8 lit_442[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_442 = 1.0; /* 80456A40-80456A48 0008+00 s=1 e=0 z=0 None .sdata2 @445 */ -SECTION_SDATA2 static u8 lit_445[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_445 = 4503601774854144.0 /* cast s32 to float */; /* 8036AB9C-8036B9F0 0E54+00 s=0 e=1 z=0 None .text __kernel_rem_pio2 */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp index 817ffb032a9..760b6c08557 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_sin.cpp @@ -23,39 +23,25 @@ extern "C" void __kernel_sin(); /* ############################################################################################## */ /* 80456A48-80456A50 0008+00 s=1 e=0 z=0 None .sdata2 @60 */ -SECTION_SDATA2 static u8 lit_60[8] = { - 0x3F, 0x81, 0x11, 0x11, 0x11, 0x10, 0xF8, 0xA6, -}; +SECTION_SDATA2 static f64 lit_60 = 0.00833333333332249; /* 80456A50-80456A58 0008+00 s=1 e=0 z=0 None .sdata2 @61 */ -SECTION_SDATA2 static u8 lit_61[8] = { - 0xBF, 0x2A, 0x01, 0xA0, 0x19, 0xC1, 0x61, 0xD5, -}; +SECTION_SDATA2 static f64 lit_61 = -0.0001984126982985795; /* 80456A58-80456A60 0008+00 s=1 e=0 z=0 None .sdata2 @62 */ -SECTION_SDATA2 static u8 lit_62[8] = { - 0x3E, 0xC7, 0x1D, 0xE3, 0x57, 0xB1, 0xFE, 0x7D, -}; +SECTION_SDATA2 static f64 lit_62 = 2.7557313707070068e-06; /* 80456A60-80456A68 0008+00 s=1 e=0 z=0 None .sdata2 @63 */ -SECTION_SDATA2 static u8 lit_63[8] = { - 0xBE, 0x5A, 0xE5, 0xE6, 0x8A, 0x2B, 0x9C, 0xEB, -}; +SECTION_SDATA2 static f64 lit_63 = -2.5050760253406863e-08; /* 80456A68-80456A70 0008+00 s=1 e=0 z=0 None .sdata2 @64 */ -SECTION_SDATA2 static u8 lit_64[8] = { - 0x3D, 0xE5, 0xD9, 0x3A, 0x5A, 0xCF, 0xD5, 0x7C, -}; +SECTION_SDATA2 static f64 lit_64 = 1.58969099521155e-10; /* 80456A70-80456A78 0008+00 s=1 e=0 z=0 None .sdata2 @65 */ -SECTION_SDATA2 static u8 lit_65[8] = { - 0xBF, 0xC5, 0x55, 0x55, 0x55, 0x55, 0x55, 0x49, -}; +SECTION_SDATA2 static f64 lit_65 = -0.16666666666666632; /* 80456A78-80456A80 0008+00 s=1 e=0 z=0 None .sdata2 @66 */ -SECTION_SDATA2 static u8 lit_66[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_66 = 0.5; /* 8036B9F0-8036BA90 00A0+00 s=0 e=2 z=0 None .text __kernel_sin */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp index fb6cce3cafe..d46cf29d945 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/k_tan.cpp @@ -34,24 +34,16 @@ SECTION_RODATA static u8 const T[104] = { }; /* 80456A80-80456A88 0008+00 s=1 e=0 z=0 None .sdata2 @94 */ -SECTION_SDATA2 static u8 lit_94[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_94 = 1.0; /* 80456A88-80456A90 0008+00 s=1 e=0 z=0 None .sdata2 @95 */ -SECTION_SDATA2 static u8 lit_95[8] = { - 0xBF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_95 = -1.0; /* 80456A90-80456A98 0008+00 s=1 e=0 z=0 None .sdata2 @96 */ -SECTION_SDATA2 static u8 lit_96[8] = { - 0x3F, 0xE9, 0x21, 0xFB, 0x54, 0x44, 0x2D, 0x18, -}; +SECTION_SDATA2 static f64 lit_96 = 0.7853981633974483; /* 80456A98-80456AA0 0008+00 s=1 e=0 z=0 None .sdata2 @97 */ -SECTION_SDATA2 static u8 lit_97[8] = { - 0x3C, 0x81, 0xA6, 0x26, 0x33, 0x14, 0x5C, 0x07, -}; +SECTION_SDATA2 static f64 lit_97 = 3.061616997868383e-17; /* 80456AA0-80456AA8 0008+00 s=1 e=0 z=0 None .sdata2 @98 */ SECTION_SDATA2 static u8 lit_98[8] = { @@ -59,14 +51,10 @@ SECTION_SDATA2 static u8 lit_98[8] = { }; /* 80456AA8-80456AB0 0008+00 s=1 e=0 z=0 None .sdata2 @99 */ -SECTION_SDATA2 static u8 lit_99[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_99 = 2.0; /* 80456AB0-80456AB8 0008+00 s=1 e=0 z=0 None .sdata2 @101 */ -SECTION_SDATA2 static u8 lit_101[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_101 = 4503601774854144.0 /* cast s32 to float */; /* 8036BA90-8036BCA4 0214+00 s=0 e=1 z=0 None .text __kernel_tan */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp index b3438a7581a..d1627386cab 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_atan.cpp @@ -45,29 +45,19 @@ SECTION_RODATA static u8 const aT[88] = { }; /* 80456AB8-80456AC0 0008+00 s=1 e=0 z=0 None .sdata2 @115 */ -SECTION_SDATA2 static u8 lit_115[8] = { - 0x7E, 0x37, 0xE4, 0x3C, 0x88, 0x00, 0x75, 0x9C, -}; +SECTION_SDATA2 static f64 lit_115 = 1e+300; /* 80456AC0-80456AC8 0008+00 s=1 e=0 z=0 None .sdata2 @116 */ -SECTION_SDATA2 static u8 lit_116[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_116 = 1.0; /* 80456AC8-80456AD0 0008+00 s=1 e=0 z=0 None .sdata2 @117 */ -SECTION_SDATA2 static u8 lit_117[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_117 = 2.0; /* 80456AD0-80456AD8 0008+00 s=1 e=0 z=0 None .sdata2 @118 */ -SECTION_SDATA2 static u8 lit_118[8] = { - 0x3F, 0xF8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_118 = 1.5; /* 80456AD8-80456AE0 0008+00 s=1 e=0 z=0 None .sdata2 @119 */ -SECTION_SDATA2 static u8 lit_119[8] = { - 0xBF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_119 = -1.0; /* 8036BCA4-8036BEBC 0218+00 s=0 e=2 z=0 None .text atan */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp index fd3088c82a7..8a0426802d2 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ceil.cpp @@ -23,9 +23,7 @@ extern "C" void ceil(); /* ############################################################################################## */ /* 80456AE0-80456AE8 0008+00 s=1 e=0 z=0 None .sdata2 @124 */ -SECTION_SDATA2 static u8 lit_124[8] = { - 0x7E, 0x37, 0xE4, 0x3C, 0x88, 0x00, 0x75, 0x9C, -}; +SECTION_SDATA2 static f64 lit_124 = 1e+300; /* 80456AE8-80456AF0 0008+00 s=1 e=0 z=0 None .sdata2 @125 */ SECTION_SDATA2 static u8 lit_125[8] = { diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp index af40ef3a862..62b32160714 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_floor.cpp @@ -23,9 +23,7 @@ extern "C" void floor(); /* ############################################################################################## */ /* 80456AF8-80456B00 0008+00 s=1 e=0 z=0 None .sdata2 @124 */ -SECTION_SDATA2 static u8 lit_124[8] = { - 0x7E, 0x37, 0xE4, 0x3C, 0x88, 0x00, 0x75, 0x9C, -}; +SECTION_SDATA2 static f64 lit_124 = 1e+300; /* 80456B00-80456B08 0008+00 s=1 e=0 z=0 None .sdata2 @125 */ SECTION_SDATA2 static u8 lit_125[8] = { diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp index d8e93633885..4f6254ae4a8 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_frexp.cpp @@ -23,9 +23,7 @@ extern "C" void frexp(); /* ############################################################################################## */ /* 80456B08-80456B10 0008+00 s=1 e=0 z=0 None .sdata2 @57 */ -SECTION_SDATA2 static u8 lit_57[8] = { - 0x43, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_57 = 1.8014398509481984e+16; /* 8036C244-8036C2D0 008C+00 s=0 e=1 z=0 None .text frexp */ #pragma push diff --git a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp index d46c9fc5ae7..0547b1751f4 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp +++ b/libs/MSL_C.PPCEABI.bare.H/Math/Double_precision/s_ldexp.cpp @@ -30,24 +30,16 @@ SECTION_SDATA2 static u8 lit_91[8] = { }; /* 80456B18-80456B20 0008+00 s=1 e=0 z=0 None .sdata2 @92 */ -SECTION_SDATA2 static u8 lit_92[8] = { - 0x43, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_92 = 1.8014398509481984e+16; /* 80456B20-80456B28 0008+00 s=1 e=0 z=0 None .sdata2 @93 */ -SECTION_SDATA2 static u8 lit_93[8] = { - 0x01, 0xA5, 0x6E, 0x1F, 0xC2, 0xF8, 0xF3, 0x59, -}; +SECTION_SDATA2 static f64 lit_93 = 1e-300; /* 80456B28-80456B30 0008+00 s=1 e=0 z=0 None .sdata2 @94 */ -SECTION_SDATA2 static u8 lit_94[8] = { - 0x7E, 0x37, 0xE4, 0x3C, 0x88, 0x00, 0x75, 0x9C, -}; +SECTION_SDATA2 static f64 lit_94 = 1e+300; /* 80456B30-80456B38 0008+00 s=1 e=0 z=0 None .sdata2 @95 */ -SECTION_SDATA2 static u8 lit_95[8] = { - 0x3C, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_95 = 5.551115123125783e-17; /* 8036C2D0-8036C494 01C4+00 s=0 e=3 z=0 None .text ldexp */ #pragma push diff --git a/libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp b/libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp index c6d5c03ab9f..9f3c5a2acf2 100644 --- a/libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp +++ b/libs/Runtime.PPCEABI.H/GCN_mem_alloc.cpp @@ -17,8 +17,6 @@ extern "C" void __sys_free(); // External References: // -extern "C" extern u32 __OSCurrHeap[1 + 1 /* padding */]; - extern "C" void OSReport(); extern "C" void OSFreeToHeap(); extern "C" void OSSetCurrentHeap(); diff --git a/libs/Runtime.PPCEABI.H/NMWException.cpp b/libs/Runtime.PPCEABI.H/NMWException.cpp index b695e940111..53ebd0fa50e 100644 --- a/libs/Runtime.PPCEABI.H/NMWException.cpp +++ b/libs/Runtime.PPCEABI.H/NMWException.cpp @@ -19,17 +19,6 @@ struct __partial_array_destructor { // Forward References: // -#pragma section "extabindex_" -extern void* const lit_211[3]; -#pragma section "extabindex_" -extern void* const lit_232[3]; -#pragma section "extabindex_" -extern void* const lit_240[3]; -#pragma section "extabindex_" -extern void* const lit_263[3]; -#pragma section "extabindex_" -extern void* const data_8000569C[8]; - #pragma section "extabindex_" extern void* const lit_211[3]; #pragma section "extabindex_" @@ -50,8 +39,6 @@ extern "C" void __construct_new_array(); // External References: // -#pragma section "extab_" -extern "C" extern void* const _section_symbol_extab[18]; void operator delete(void*); void operator delete[](void*); diff --git a/libs/Runtime.PPCEABI.H/__init_cpp_exceptions.cpp b/libs/Runtime.PPCEABI.H/__init_cpp_exceptions.cpp index bc38f00d05f..b293320e598 100644 --- a/libs/Runtime.PPCEABI.H/__init_cpp_exceptions.cpp +++ b/libs/Runtime.PPCEABI.H/__init_cpp_exceptions.cpp @@ -11,15 +11,6 @@ // Forward References: // -#pragma section ".ctors$10" -__declspec(section ".ctors$10") extern void* const __init_cpp_exceptions_reference; -#pragma section ".ctors$15" -__declspec(section ".ctors$10") extern void* const _ctors[106]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -#pragma section ".dtors$15" -__declspec(section ".dtors$15") extern void* const __fini_cpp_exceptions_reference; - extern "C" void __fini_cpp_exceptions(); extern "C" void __init_cpp_exceptions(); #pragma section ".ctors$10" @@ -35,9 +26,6 @@ __declspec(section ".dtors$15") extern void* const __fini_cpp_exceptions_referen // External References: // -#pragma section "extabindex_" -extern void* const data_8000569C[8]; - #pragma section "extabindex_" extern void* const data_8000569C[8]; extern "C" void __sinit_m_Do_main_cpp(); diff --git a/libs/Runtime.PPCEABI.H/ptmf.cpp b/libs/Runtime.PPCEABI.H/ptmf.cpp index 455a334c9f3..32520fad49b 100644 --- a/libs/Runtime.PPCEABI.H/ptmf.cpp +++ b/libs/Runtime.PPCEABI.H/ptmf.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; - extern "C" void __ptmf_test(); extern "C" void __ptmf_cmpr(); extern "C" void __ptmf_scall(); diff --git a/libs/SSystem/SComponent/c_API.cpp b/libs/SSystem/SComponent/c_API.cpp index 5f6d463f4b2..2c24060505c 100644 --- a/libs/SSystem/SComponent/c_API.cpp +++ b/libs/SSystem/SComponent/c_API.cpp @@ -13,8 +13,6 @@ extern "C" extern void* g_cAPI_Interface[6]; -extern "C" extern void* g_cAPI_Interface[6]; - // // External References: // diff --git a/libs/SSystem/SComponent/c_API_controller_pad.cpp b/libs/SSystem/SComponent/c_API_controller_pad.cpp index 15aeba8df1e..11a4d317616 100644 --- a/libs/SSystem/SComponent/c_API_controller_pad.cpp +++ b/libs/SSystem/SComponent/c_API_controller_pad.cpp @@ -29,8 +29,6 @@ extern "C" void cAPICPad_ANY_BUTTON__FUl(); // External References: // -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; - extern "C" void recalibrate__8mDoCPd_cFv(); extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; diff --git a/libs/SSystem/SComponent/c_API_graphic.cpp b/libs/SSystem/SComponent/c_API_graphic.cpp index 0d223474fd0..98997e1e36c 100644 --- a/libs/SSystem/SComponent/c_API_graphic.cpp +++ b/libs/SSystem/SComponent/c_API_graphic.cpp @@ -25,8 +25,6 @@ extern "C" void cAPIGph_AfterOfDraw__Fv(); extern "C" extern void* g_cAPI_Interface[6]; -extern "C" extern void* g_cAPI_Interface[6]; - // // Declarations: // diff --git a/libs/SSystem/SComponent/c_angle.cpp b/libs/SSystem/SComponent/c_angle.cpp index 244800696f2..a38e7a1ceb5 100644 --- a/libs/SSystem/SComponent/c_angle.cpp +++ b/libs/SSystem/SComponent/c_angle.cpp @@ -13,6 +13,7 @@ struct cXyz {}; +struct cSPolar; struct cSAngle { /* 80030510 */ ~cSAngle(); /* 80270F98 */ cSAngle(s16); @@ -40,7 +41,6 @@ struct cSAngle { /* 802712B4 */ void operator*=(f32); }; -struct cSPolar; struct cSGlobe { /* 80271820 */ cSGlobe(f32, s16, s16); /* 80271880 */ cSGlobe(cXyz const&); @@ -89,10 +89,6 @@ struct cAngle { void operator+(s16, cSAngle const&); void operator-(s16, cSAngle const&); -extern "C" extern u8 _0__7cSAngle[2 + 2 /* padding */]; -extern "C" extern u8 _90__7cSAngle[2 + 2 /* padding */]; -extern "C" extern u8 _180__7cSAngle[2 + 2 /* padding */]; -extern "C" extern u8 _270__7cSAngle[2 + 6 /* padding */]; extern "C" void __ct__7cSAngleFRC7cSAngle(); extern "C" void __ct__7cSAngleFs(); @@ -222,7 +218,7 @@ asm void cSAngle::Val(s16 param_0) { /* ############################################################################################## */ /* 80455208-8045520C 0004+00 s=1 e=0 z=0 None .sdata2 @2248 */ -SECTION_SDATA2 static u32 lit_2248 = 0x43360B61; +SECTION_SDATA2 static f32 lit_2248 = 182.04444885253906f; /* 8027100C-80271030 0024+00 s=1 e=8 z=0 None .text Val__7cSAngleFf */ #pragma push @@ -236,12 +232,10 @@ asm void cSAngle::Val(f32 param_0) { /* ############################################################################################## */ /* 8045520C-80455210 0004+00 s=1 e=0 z=0 None .sdata2 @2260 */ -SECTION_SDATA2 static u32 lit_2260 = 0x3BB40000; +SECTION_SDATA2 static f32 lit_2260 = 0.0054931640625f; /* 80455210-80455218 0008+00 s=5 e=0 z=0 None .sdata2 @2263 */ -SECTION_SDATA2 static u8 lit_2263[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2263 = 4503601774854144.0 /* cast s32 to float */; /* 80271030-80271064 0034+00 s=0 e=11 z=0 None .text Degree__7cSAngleCFv */ #pragma push @@ -255,7 +249,7 @@ asm void cSAngle::Degree() const { /* ############################################################################################## */ /* 80455218-8045521C 0004+00 s=1 e=0 z=0 None .sdata2 @2269 */ -SECTION_SDATA2 static u32 lit_2269 = 0x38C90FDB; +SECTION_SDATA2 static f32 lit_2269 = 9.58738019107841e-05f; /* 80271064-80271098 0034+00 s=3 e=0 z=0 None .text Radian__7cSAngleCFv */ #pragma push @@ -269,7 +263,7 @@ asm void cSAngle::Radian() const { /* ############################################################################################## */ /* 8045521C-80455220 0004+00 s=1 e=0 z=0 None .sdata2 @2277 */ -SECTION_SDATA2 static u32 lit_2277 = 0x38000000; +SECTION_SDATA2 static f32 lit_2277 = 3.0517578125e-05f; /* 80271098-802710CC 0034+00 s=0 e=1 z=0 None .text Norm__7cSAngleCFv */ #pragma push @@ -453,10 +447,10 @@ asm cDegree::cDegree(f32 param_0) { /* ############################################################################################## */ /* 80455220-80455224 0004+00 s=1 e=0 z=0 None .sdata2 @2440 */ -SECTION_SDATA2 static u32 lit_2440 = 0xC3340000; +SECTION_SDATA2 static f32 lit_2440 = -180.0f; /* 80455224-80455228 0004+00 s=1 e=0 z=0 None .sdata2 @2441 */ -SECTION_SDATA2 static u32 lit_2441 = 0x43340000; +SECTION_SDATA2 static f32 lit_2441 = 180.0f; /* 8027137C-802713BC 0040+00 s=1 e=0 z=0 None .text Formal__7cDegreeFv */ #pragma push @@ -480,7 +474,7 @@ asm void cDegree::Val(f32 param_0) { /* ############################################################################################## */ /* 80455228-8045522C 0004+00 s=1 e=0 z=0 None .sdata2 @2474 */ -SECTION_SDATA2 static u32 lit_2474 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_2474 = 0.01745329238474369f; /* 802713E0-802713F0 0010+00 s=3 e=0 z=0 None .text Radian__7cDegreeCFv */ #pragma push @@ -568,7 +562,7 @@ SECTION_SDATA2 static u8 lit_2671[8] = { }; /* 80455238-8045523C 0004+00 s=1 e=0 z=0 None .sdata2 @2672 */ -SECTION_SDATA2 static u32 lit_2672 = 0x4622F983; +SECTION_SDATA2 static f32 lit_2672 = 10430.3779296875f; /* 802715BC-802716EC 0130+00 s=1 e=0 z=0 None .text Val__7cSPolarFRC4cXyz */ #pragma push @@ -712,7 +706,7 @@ asm void cSGlobe::Polar(cSPolar* param_0) const { /* ############################################################################################## */ /* 8045523C-80455240 0004+00 s=1 e=0 z=0 None .sdata2 @2744 */ -SECTION_SDATA2 static u32 lit_2744 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2744 = 1.0f; /* 80271B30-80271B7C 004C+00 s=0 e=3 z=0 None .text Norm__7cSGlobeCFv */ #pragma push diff --git a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp index 7295e8ad2fe..be26de08383 100644 --- a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp @@ -49,7 +49,6 @@ extern "C" static void func_80267D54(); // void operator delete(void*); -extern "C" extern f32 Zero__4cXyz[3]; extern "C" void __ct__8cBgS_ChkFv(); extern "C" void __dt__8cBgS_ChkFv(); diff --git a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp index ecc4b61b383..b82f2e300f6 100644 --- a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp @@ -52,8 +52,6 @@ extern "C" static void func_80267F80(); // void operator delete(void*); -extern "C" extern void* __vt__8cM3dGLin[3]; -extern "C" extern f32 Zero__4cXyz[3]; extern "C" void __ct__8cBgS_ChkFv(); extern "C" void __dt__8cBgS_ChkFv(); diff --git a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp index c0802aacd5d..68cacd3d911 100644 --- a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp +++ b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp @@ -47,7 +47,6 @@ extern "C" void SetCallback__13cBgS_ShdwDrawFPFP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP // void operator delete(void*); -extern "C" extern void* __vt__8cM3dGAab[3]; extern "C" void __ct__8cBgS_ChkFv(); extern "C" void __dt__8cBgS_ChkFv(); diff --git a/libs/SSystem/SComponent/c_bg_w.cpp b/libs/SSystem/SComponent/c_bg_w.cpp index 2a67ba75c77..3bb036e4beb 100644 --- a/libs/SSystem/SComponent/c_bg_w.cpp +++ b/libs/SSystem/SComponent/c_bg_w.cpp @@ -72,7 +72,7 @@ asm void cBgW_BgId::ChkUsed() const { /* ############################################################################################## */ /* 804550E8-804550EC 0004+00 s=1 e=0 z=0 None .sdata2 @2242 */ -SECTION_SDATA2 static u32 lit_2242 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2242 = 0.5f; /* 802681E4-802681FC 0018+00 s=1 e=22 z=8 None .text cBgW_CheckBGround__Ff */ #pragma push @@ -86,7 +86,7 @@ asm void cBgW_CheckBGround(f32 param_0) { /* ############################################################################################## */ /* 804550EC-804550F0 0004+00 s=1 e=0 z=0 None .sdata2 @2249 */ -SECTION_SDATA2 static u32 lit_2249 = 0xBF4CCCCD; +SECTION_SDATA2 static f32 lit_2249 = -4.0f / 5.0f; /* 802681FC-80268210 0014+00 s=1 e=6 z=0 None .text cBgW_CheckBRoof__Ff */ #pragma push diff --git a/libs/SSystem/SComponent/c_cc_d.cpp b/libs/SSystem/SComponent/c_cc_d.cpp index f7b88472dc8..62afd156be6 100644 --- a/libs/SSystem/SComponent/c_cc_d.cpp +++ b/libs/SSystem/SComponent/c_cc_d.cpp @@ -41,7 +41,8 @@ struct cM3dGAab { /* 8026EE68 */ void PlusR(f32); }; -struct cCcD_CpsAttr; +struct cCcD_PntAttr {}; + struct cCcD_ShapeAttr { struct Shape {}; @@ -53,35 +54,11 @@ struct cCcD_ShapeAttr { /* 802649E0 */ bool CrossCo(cCcD_ShapeAttr const&, f32*) const; }; -struct cCcD_CylAttr; struct cCcD_TriAttr; -struct cCcD_PntAttr {}; - +struct cCcD_SphAttr; +struct cCcD_CpsAttr; struct cCcD_AabAttr {}; -struct cCcD_SphAttr { - /* 80084B44 */ void GetCoCP() const; - /* 80037A54 */ void GetCoCP(); - /* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; - /* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; - /* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; - /* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; - /* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const; - /* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const; - /* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const; - /* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; - /* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const; - /* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const; - /* 8008721C */ ~cCcD_SphAttr(); - /* 802646E0 */ void CalcAabBox(); - /* 8026476C */ void GetNVec(cXyz const&, cXyz*) const; - /* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; -}; - struct cCcD_CylAttr { /* 80084CC0 */ void GetCoCP() const; /* 80037A4C */ void GetCoCP(); @@ -125,6 +102,29 @@ struct cCcD_CpsAttr { /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const; }; +struct cCcD_SphAttr { + /* 80084B44 */ void GetCoCP() const; + /* 80037A54 */ void GetCoCP(); + /* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; + /* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const; + /* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const; + /* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const; + /* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const; + /* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const; + /* 8008721C */ ~cCcD_SphAttr(); + /* 802646E0 */ void CalcAabBox(); + /* 8026476C */ void GetNVec(cXyz const&, cXyz*) const; + /* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; +}; + struct cCcD_TriAttr { /* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; /* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; @@ -216,14 +216,6 @@ struct cCcD_DivideArea { // Forward References: // -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__12cCcD_TriAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_virtual_center__14cCcD_ShapeAttr[12]; - extern "C" void Set__15cCcD_DivideInfoFUlUlUl(); extern "C" void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(); extern "C" void SetArea__15cCcD_DivideAreaFRC8cM3dGAab(); @@ -322,11 +314,6 @@ void cM3d_Cross_CpsSph(cM3dGCps const&, cM3dGSph const&, Vec*); void cM3d_Cross_TriTri(cM3dGTri const&, cM3dGTri const&, Vec*); void cM3d_Cross_CpsTri(cM3dGCps const&, cM3dGTri, Vec*); void operator delete(void*); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__8cM3dGTri[3]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void __dt__4cXyzFv(); extern "C" void GetCoCP__12cCcD_CylAttrFv(); @@ -435,10 +422,10 @@ asm void cCcD_DivideInfo::Chk(cCcD_DivideInfo const& param_0) const { /* ############################################################################################## */ /* 80455018-8045501C 0004+00 s=1 e=0 z=0 None .sdata2 @2305 */ -SECTION_SDATA2 static u32 lit_2305 = 0x3D000000; +SECTION_SDATA2 static f32 lit_2305 = 0.03125f; /* 8045501C-80455020 0004+00 s=2 e=0 z=0 None .sdata2 @2306 */ -SECTION_SDATA2 static u32 lit_2306 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2306 = 1.0f; /* 802633A8-802634D4 012C+00 s=0 e=2 z=0 None .text SetArea__15cCcD_DivideAreaFRC8cM3dGAab */ #pragma push @@ -509,16 +496,10 @@ asm void cCcD_Stts::Init(int param_0, int param_1, void* param_2, unsigned int p /* ############################################################################################## */ /* 80455020-80455028 0004+04 s=13 e=0 z=0 None .sdata2 @2431 */ -SECTION_SDATA2 static u8 lit_2431[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_2431[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80263904-80263934 0030+00 s=1 e=1 z=0 None .text Ct__9cCcD_SttsFv */ @@ -563,9 +544,7 @@ asm void cCcD_Stts::PlusDmg(int param_0) { /* ############################################################################################## */ /* 80455028-80455030 0008+00 s=1 e=0 z=0 None .sdata2 @2472 */ -SECTION_SDATA2 static u8 lit_2472[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2472 = 4503601774854144.0 /* cast s32 to float */; /* 80263984-802639B0 002C+00 s=0 e=1 z=0 None .text GetWeightF__9cCcD_SttsCFv */ #pragma push diff --git a/libs/SSystem/SComponent/c_cc_s.cpp b/libs/SSystem/SComponent/c_cc_s.cpp index 279badea24e..f04cf7436c6 100644 --- a/libs/SSystem/SComponent/c_cc_s.cpp +++ b/libs/SSystem/SComponent/c_cc_s.cpp @@ -21,6 +21,8 @@ struct cM3dGAab { /* 8026EE24 */ void CalcCenter(cXyz*) const; }; +struct cCcD_GStts {}; + struct cCcD_Stts { /* 80263934 */ void PlusCcMove(f32, f32, f32); /* 8026395C */ void ClrCcMove(); @@ -28,14 +30,12 @@ struct cCcD_Stts { /* 80263984 */ void GetWeightF() const; }; +struct cCcD_GObjInf {}; + struct cCcD_Obj { /* 80263A48 */ void GetAc(); }; -struct cCcD_GStts {}; - -struct cCcD_GObjInf {}; - struct cCcS { /* 80030BDC */ ~cCcS(); /* 80264A6C */ cCcS(); @@ -96,9 +96,6 @@ struct cCcD_DivideArea { // Forward References: // -extern "C" extern void* __vt__4cCcS[12]; -extern "C" extern f32 lit_2762[1 + 1 /* padding */]; - extern "C" void __ct__4cCcSFv(); extern "C" void Ct__4cCcSFv(); extern "C" void Dt__4cCcSFv(); @@ -135,12 +132,6 @@ extern "C" extern f32 lit_2762[1 + 1 /* padding */]; // External References: // -extern "C" extern void* __vt__15cCcD_DivideArea[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80451158[8]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; - extern "C" void __dt__4cXyzFv(); extern "C" void __dt__4cCcSFv(); extern "C" void Chk__15cCcD_DivideInfoCFRC15cCcD_DivideInfo(); @@ -377,13 +368,13 @@ asm void cCcS::SetCoCommonHitInf(cCcD_Obj* param_0, cXyz* param_1, cCcD_Obj* par /* ############################################################################################## */ /* 8045503C-80455040 0004+00 s=1 e=0 z=0 None .sdata2 @2759 */ -SECTION_SDATA2 static u32 lit_2759 = 0x3C03126F; +SECTION_SDATA2 static f32 lit_2759 = 1.0f / 125.0f; /* 80455040-80455044 0004+00 s=1 e=0 z=0 None .sdata2 @2760 */ -SECTION_SDATA2 static u32 lit_2760 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2760 = 1.0f; /* 80455044-80455048 0004+00 s=1 e=0 z=0 None .sdata2 @2761 */ -SECTION_SDATA2 static u32 lit_2761 = 0x40000000; +SECTION_SDATA2 static f32 lit_2761 = 2.0f; /* 80455048-80455050 0004+04 s=1 e=1 z=0 None .sdata2 @2762 */ SECTION_SDATA2 f32 lit_2762[1 + 1 /* padding */] = { @@ -393,14 +384,10 @@ SECTION_SDATA2 f32 lit_2762[1 + 1 /* padding */] = { }; /* 80455050-80455058 0008+00 s=1 e=0 z=0 None .sdata2 @2763 */ -SECTION_SDATA2 static u8 lit_2763[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2763 = 0.5; /* 80455058-80455060 0008+00 s=1 e=0 z=0 None .sdata2 @2764 */ -SECTION_SDATA2 static u8 lit_2764[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2764 = 3.0; /* 80455060-80455068 0008+00 s=1 e=0 z=0 None .sdata2 @2765 */ SECTION_SDATA2 static u8 lit_2765[8] = { diff --git a/libs/SSystem/SComponent/c_counter.cpp b/libs/SSystem/SComponent/c_counter.cpp index 4123a7965c7..a9836b847e9 100644 --- a/libs/SSystem/SComponent/c_counter.cpp +++ b/libs/SSystem/SComponent/c_counter.cpp @@ -12,7 +12,6 @@ // void cCt_Counter(int); -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; extern "C" void cCt_Counter__Fi(); extern "C" extern u8 g_Counter[12 + 4 /* padding */]; diff --git a/libs/SSystem/SComponent/c_lib.cpp b/libs/SSystem/SComponent/c_lib.cpp index 622cf43c550..b021777f1c8 100644 --- a/libs/SSystem/SComponent/c_lib.cpp +++ b/libs/SSystem/SComponent/c_lib.cpp @@ -53,7 +53,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void MtxPush(); void MtxPull(); -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void cLib_memCpy__FPvPCvUl(); extern "C" void cLib_memSet__FPviUl(); @@ -90,8 +89,6 @@ extern "C" extern void* calc_mtx[1 + 1 /* padding */]; // void cM_atan2s(f32, f32); -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); SECTION_INIT void memcpy(); @@ -140,16 +137,10 @@ asm void cLib_memSet(void* param_0, int param_1, u32 param_2) { /* ############################################################################################## */ /* 804551E0-804551E8 0004+04 s=9 e=0 z=0 None .sdata2 @2262 */ -SECTION_SDATA2 static u8 lit_2262[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_2262[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 8026F97C-8026FA3C 00C0+00 s=0 e=50 z=178 None .text cLib_addCalc__FPfffff */ @@ -184,14 +175,10 @@ asm void cLib_addCalc0(f32* param_0, f32 param_1, f32 param_2) { /* ############################################################################################## */ /* 804551E8-804551F0 0008+00 s=7 e=0 z=0 None .sdata2 @2379 */ -SECTION_SDATA2 static u8 lit_2379[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2379 = 0.5; /* 804551F0-804551F8 0008+00 s=7 e=0 z=0 None .sdata2 @2380 */ -SECTION_SDATA2 static u8 lit_2380[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2380 = 3.0; /* 804551F8-80455200 0008+00 s=7 e=0 z=0 None .sdata2 @2381 */ SECTION_SDATA2 static u8 lit_2381[8] = { diff --git a/libs/SSystem/SComponent/c_m2d.cpp b/libs/SSystem/SComponent/c_m2d.cpp index c5a65b00927..77523a81ad5 100644 --- a/libs/SSystem/SComponent/c_m2d.cpp +++ b/libs/SSystem/SComponent/c_m2d.cpp @@ -28,19 +28,16 @@ extern "C" void cM2d_CrossCirLin__FR8cM2dGCirffffPfPf(); extern "C" extern u32 __float_nan; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; - // // Declarations: // /* ############################################################################################## */ /* 804550F0-804550F4 0004+00 s=1 e=0 z=0 None .sdata2 @2266 */ -SECTION_SDATA2 static u32 lit_2266 = 0x40000000; +SECTION_SDATA2 static f32 lit_2266 = 2.0f; /* 804550F4-804550F8 0004+00 s=1 e=0 z=0 None .sdata2 @2267 */ -SECTION_SDATA2 static u32 lit_2267 = 0x40800000; +SECTION_SDATA2 static f32 lit_2267 = 4.0f; /* 804550F8-804550FC 0004+00 s=1 e=0 z=0 None .sdata2 @2268 */ SECTION_SDATA2 static u8 lit_2268[4] = { @@ -51,17 +48,13 @@ SECTION_SDATA2 static u8 lit_2268[4] = { }; /* 804550FC-80455100 0004+00 s=1 e=0 z=0 None .sdata2 @2269 */ -SECTION_SDATA2 static u32 lit_2269 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2269 = 1.0f; /* 80455100-80455108 0008+00 s=1 e=0 z=0 None .sdata2 @2270 */ -SECTION_SDATA2 static u8 lit_2270[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2270 = 0.5; /* 80455108-80455110 0008+00 s=1 e=0 z=0 None .sdata2 @2271 */ -SECTION_SDATA2 static u8 lit_2271[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2271 = 3.0; /* 80455110-80455118 0008+00 s=1 e=0 z=0 None .sdata2 @2272 */ SECTION_SDATA2 static u8 lit_2272[8] = { diff --git a/libs/SSystem/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp index 09889c25ece..648ebad9264 100644 --- a/libs/SSystem/SComponent/c_m3d.cpp +++ b/libs/SSystem/SComponent/c_m3d.cpp @@ -108,7 +108,6 @@ void cM3d_lineVsPosSuisenCross(cM3dGLin const*, Vec const*, Vec*); void cM3d_lineVsPosSuisenCross(Vec const&, Vec const&, Vec const&, Vec*); void cM3d_2PlaneLinePosNearPos(cM3dGPla const&, cM3dGPla const&, Vec const*, Vec*); void cM3d_CrawVec(Vec const&, Vec const&, Vec*); -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" static void cM3d_InDivPos1__FPC3VecPC3VecfP3Vec(); extern "C" void cM3d_InDivPos2__FPC3VecPC3VecfP3Vec(); @@ -182,11 +181,6 @@ extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; // void cM_atan2s(f32, f32); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__8cM3dGLin[3]; -extern "C" extern void* __vt__8cM3dGSph[3]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_epsilon; extern "C" void cM_atan2s__Fff(); extern "C" void __ct__8cM3dGLinFRC4cXyzRC4cXyz(); @@ -256,27 +250,17 @@ asm void cM3d_Len2dSq(f32 param_0, f32 param_1, f32 param_2, f32 param_3) { f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; /* 80455118-80455120 0004+04 s=28 e=0 z=0 None .sdata2 @2256 */ -SECTION_SDATA2 static u8 lit_2256[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_2256[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80455120-80455128 0008+00 s=9 e=0 z=0 None .sdata2 @2257 */ -SECTION_SDATA2 static u8 lit_2257[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2257 = 0.5; /* 80455128-80455130 0008+00 s=9 e=0 z=0 None .sdata2 @2258 */ -SECTION_SDATA2 static u8 lit_2258[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2258 = 3.0; /* 80455130-80455138 0008+00 s=9 e=0 z=0 None .sdata2 @2259 */ SECTION_SDATA2 static u8 lit_2259[8] = { @@ -284,7 +268,7 @@ SECTION_SDATA2 static u8 lit_2259[8] = { }; /* 80455138-8045513C 0004+00 s=14 e=0 z=0 None .sdata2 @2273 */ -SECTION_SDATA2 static u32 lit_2273 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2273 = 1.0f; /* 8026862C-80268710 00E4+00 s=0 e=10 z=3 None .text cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf */ @@ -346,7 +330,7 @@ asm void cM3d_VectorProduct(cXyz const* param_0, cXyz const* param_1, cXyz const /* ############################################################################################## */ /* 8045513C-80455140 0004+00 s=1 e=0 z=0 None .sdata2 @2346 */ -SECTION_SDATA2 static u32 lit_2346 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_2346 = 1.0f / 50.0f; /* 8026891C-802689E8 00CC+00 s=0 e=2 z=0 None .text cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf */ @@ -509,7 +493,7 @@ SECTION_SDATA2 static u32 BEVEL3D_OUTCODE6 = 0x00000040; SECTION_SDATA2 static u32 BEVEL3D_OUTCODE7 = 0x00000080; /* 804551A8-804551AC 0004+00 s=1 e=0 z=0 None .sdata2 @3082 */ -SECTION_SDATA2 static u32 lit_3082 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3082 = -1.0f; /* 80269050-80269C2C 0BDC+00 s=0 e=2 z=0 None .text * cM3d_Cross_MinMaxBoxLine__FPC3VecPC3VecPC3VecPC3Vec */ @@ -551,7 +535,7 @@ asm static void cM3d_InclusionCheckPosIn3PosBox2d(f32 param_0, f32 param_1, f32 /* ############################################################################################## */ /* 804551AC-804551B0 0004+00 s=11 e=0 z=0 None .sdata2 @3205 */ -SECTION_SDATA2 static u32 lit_3205 = 0x3BA3D70A; +SECTION_SDATA2 static f32 lit_3205 = 0.004999999888241291f; /* 80269E18-80269FBC 01A4+00 s=1 e=0 z=0 None .text cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf */ #pragma push @@ -565,10 +549,10 @@ asm static void cM3d_CrossX_Tri(cM3dGTri const* param_0, Vec const* param_1, f32 /* ############################################################################################## */ /* 804551B0-804551B4 0004+00 s=7 e=0 z=0 None .sdata2 @3229 */ -SECTION_SDATA2 static u32 lit_3229 = 0x41A00000; +SECTION_SDATA2 static f32 lit_3229 = 20.0f; /* 804551B4-804551B8 0004+00 s=8 e=0 z=0 None .sdata2 @3230 */ -SECTION_SDATA2 static u32 lit_3230 = 0xC1A00000; +SECTION_SDATA2 static f32 lit_3230 = -20.0f; /* 80269FBC-8026A160 01A4+00 s=1 e=0 z=0 None .text cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vec */ #pragma push @@ -701,7 +685,7 @@ asm static void cM3d_CrossZ_LinTri_proc(cM3dGTri const* param_0, Vec const* para /* ############################################################################################## */ /* 804551B8-804551BC 0004+00 s=1 e=0 z=0 None .sdata2 @3497 */ -SECTION_SDATA2 static u32 lit_3497 = 0x3C03126F; +SECTION_SDATA2 static f32 lit_3497 = 1.0f / 125.0f; /* 8026B0A4-8026B17C 00D8+00 s=1 e=1 z=0 None .text * cM3d_Cross_LinTri__FPC8cM3dGLinPC8cM3dGTriP3Vecbb */ @@ -749,10 +733,10 @@ asm void cM3d_Cross_LinSph(cM3dGLin const* param_0, cM3dGSph const* param_1, Vec /* ############################################################################################## */ /* 804551BC-804551C0 0004+00 s=2 e=0 z=0 None .sdata2 @3739 */ -SECTION_SDATA2 static u32 lit_3739 = 0x40000000; +SECTION_SDATA2 static f32 lit_3739 = 2.0f; /* 804551C0-804551C4 0004+00 s=2 e=0 z=0 None .sdata2 @3740 */ -SECTION_SDATA2 static u32 lit_3740 = 0x40800000; +SECTION_SDATA2 static f32 lit_3740 = 4.0f; /* 8026B4E8-8026B8A4 03BC+00 s=1 e=2 z=0 None .text * cM3d_Cross_LinSph_CrossPos__FRC8cM3dGSphRC8cM3dGLinP3VecP3Vec */ @@ -825,7 +809,7 @@ asm void cM3d_Cross_SphSph(cM3dGSph const* param_0, cM3dGSph const* param_1, Vec /* ############################################################################################## */ /* 804551C4-804551C8 0004+00 s=8 e=0 z=0 None .sdata2 @3892 */ -SECTION_SDATA2 static u32 lit_3892 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3892 = 0.5f; /* 8026BE5C-8026BF04 00A8+00 s=1 e=0 z=0 None .text * cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec */ @@ -874,7 +858,7 @@ asm void cM3d_Cross_CylCyl(cM3dGCyl const* param_0, cM3dGCyl const* param_1, Vec /* ############################################################################################## */ /* 804551C8-804551CC 0004+00 s=1 e=0 z=0 None .sdata2 @4255 */ -SECTION_SDATA2 static u32 lit_4255 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_4255 = 1000000000.0f; /* 8026C5D0-8026C944 0374+00 s=0 e=2 z=0 None .text * cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec */ @@ -1092,7 +1076,7 @@ asm void cM3d_CrawVec(Vec const& param_0, Vec const& param_1, Vec* param_2) { /* ############################################################################################## */ /* 804551CC-804551D0 0004+00 s=1 e=0 z=0 None .sdata2 @5508 */ -SECTION_SDATA2 static u32 lit_5508 = 0x42000000; +SECTION_SDATA2 static f32 lit_5508 = 32.0f; /* 8026EC3C-8026EC54 0018+00 s=0 e=1 z=0 None .text __sinit_c_m3d_cpp */ #pragma push diff --git a/libs/SSystem/SComponent/c_m3d_g_aab.cpp b/libs/SSystem/SComponent/c_m3d_g_aab.cpp index f7ab4b7f479..74a9752ffb4 100644 --- a/libs/SSystem/SComponent/c_m3d_g_aab.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_aab.cpp @@ -96,10 +96,10 @@ asm void cM3dGAab::TopPlaneYUnder(f32 param_0) const { /* ############################################################################################## */ /* 804551D0-804551D4 0004+00 s=1 e=0 z=0 None .sdata2 @416 */ -SECTION_SDATA2 static u32 lit_416 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_416 = 1000000000.0f; /* 804551D4-804551D8 0004+00 s=1 e=0 z=0 None .sdata2 @417 */ -SECTION_SDATA2 static u32 lit_417 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_417 = -1000000000.0f; /* 8026ECF8-8026ED1C 0024+00 s=0 e=6 z=0 None .text ClearForMinMax__8cM3dGAabFv */ #pragma push diff --git a/libs/SSystem/SComponent/c_m3d_g_cps.cpp b/libs/SSystem/SComponent/c_m3d_g_cps.cpp index ab051ca6eeb..51858ec6426 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cps.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cps.cpp @@ -45,7 +45,6 @@ extern "C" void SetCps__8cM3dGCpsFRC8cM3dGCps(); // void operator delete(void*); -extern "C" extern void* __vt__8cM3dGLin[3]; extern "C" void SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz(); extern "C" void SetStartEnd__8cM3dGLinFRC3VecRC3Vec(); diff --git a/libs/SSystem/SComponent/c_m3d_g_cyl.cpp b/libs/SSystem/SComponent/c_m3d_g_cyl.cpp index 8bdd33e7786..2ef35fd553e 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cyl.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cyl.cpp @@ -51,7 +51,6 @@ extern "C" void calcMinMax__8cM3dGCylFP4cXyzP4cXyz(); void cM3d_Cross_CylSph(cM3dGCyl const*, cM3dGSph const*, Vec*, f32*); void cM3d_Cross_CylCyl(cM3dGCyl const*, cM3dGCyl const*, Vec*); -extern "C" extern void* __vt__8cM3dGCyl[3]; extern "C" void cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf(); extern "C" void cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec(); diff --git a/libs/SSystem/SComponent/c_m3d_g_lin.cpp b/libs/SSystem/SComponent/c_m3d_g_lin.cpp index aed5ee4103e..3597b6f96cb 100644 --- a/libs/SSystem/SComponent/c_m3d_g_lin.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_lin.cpp @@ -37,8 +37,6 @@ extern "C" void SetEnd__8cM3dGLinFRC4cXyz(); // External References: // -extern "C" extern void* __vt__8cM3dGLin[3]; - extern "C" void PSVECAdd(); extern "C" void PSVECSubtract(); extern "C" void PSVECScale(); diff --git a/libs/SSystem/SComponent/c_m3d_g_pla.cpp b/libs/SSystem/SComponent/c_m3d_g_pla.cpp index dfd782c5f0f..0048cb0de1a 100644 --- a/libs/SSystem/SComponent/c_m3d_g_pla.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_pla.cpp @@ -42,8 +42,6 @@ extern "C" void Set__8cM3dGPlaFPC8cM3dGPla(); // void cM3d_InDivPos2(Vec const*, Vec const*, f32, Vec*); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void cM3d_InDivPos2__FPC3VecPC3VecfP3Vec(); extern "C" void PSVECNormalize(); diff --git a/libs/SSystem/SComponent/c_malloc.cpp b/libs/SSystem/SComponent/c_malloc.cpp index 34aba32e535..5d517775367 100644 --- a/libs/SSystem/SComponent/c_malloc.cpp +++ b/libs/SSystem/SComponent/c_malloc.cpp @@ -26,8 +26,6 @@ struct cMl { // Forward References: // -extern "C" extern u8 data_80451158[8]; - extern "C" void init__3cMlFP7JKRHeap(); extern "C" void memalignB__3cMlFiUl(); extern "C" void free__3cMlFPv(); diff --git a/libs/SSystem/SComponent/c_math.cpp b/libs/SSystem/SComponent/c_math.cpp index b8fe547e89d..4f5cf957fac 100644 --- a/libs/SSystem/SComponent/c_math.cpp +++ b/libs/SSystem/SComponent/c_math.cpp @@ -41,8 +41,6 @@ extern "C" void cM_rndFX2__Ff(); // External References: // -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; - extern "C" void fmod(); extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; @@ -52,12 +50,10 @@ extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; /* ############################################################################################## */ /* 804550A8-804550B0 0008+00 s=1 e=0 z=0 None .sdata2 @2201 */ -SECTION_SDATA2 static u8 lit_2201[8] = { - 0x40, 0x19, 0x21, 0xFB, 0x60, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2201 = 6.2831854820251465; /* 804550B0-804550B4 0004+00 s=1 e=0 z=0 None .sdata2 @2215 */ -SECTION_SDATA2 static u32 lit_2215 = 0x4622F983; +SECTION_SDATA2 static f32 lit_2215 = 10430.3779296875f; /* 802675E4-80267640 005C+00 s=0 e=23 z=11 None .text cM_rad2s__Ff */ #pragma push @@ -2132,7 +2128,7 @@ SECTION_DATA static u8 atntable[2050 + 6 /* padding */] = { }; /* 804550B4-804550B8 0004+00 s=1 e=0 z=0 None .sdata2 @2232 */ -SECTION_SDATA2 static u32 lit_2232 = 0x44800000; +SECTION_SDATA2 static f32 lit_2232 = 1024.0f; /* 80267640-80267674 0034+00 s=1 e=0 z=0 None .text U_GetAtanTable__Fff */ #pragma push @@ -2165,12 +2161,10 @@ asm void cM_atan2s(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 804550BC-804550C0 0004+00 s=1 e=0 z=0 None .sdata2 @2282 */ -SECTION_SDATA2 static u32 lit_2282 = 0x38C90FDB; +SECTION_SDATA2 static f32 lit_2282 = 9.58738019107841e-05f; /* 804550C0-804550C8 0008+00 s=3 e=0 z=0 None .sdata2 @2284 */ -SECTION_SDATA2 static u8 lit_2284[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2284 = 4503601774854144.0 /* cast s32 to float */; /* 80267814-8026785C 0048+00 s=0 e=4 z=5 None .text cM_atan2f__Fff */ #pragma push @@ -2204,10 +2198,10 @@ asm void cM_initRnd(int param_0, int param_1, int param_2) { /* ############################################################################################## */ /* 804550C8-804550CC 0004+00 s=2 e=0 z=0 None .sdata2 @2296 */ -SECTION_SDATA2 static u32 lit_2296 = 0x46ECE600; +SECTION_SDATA2 static f32 lit_2296 = 30323.0f; /* 804550CC-804550D0 0004+00 s=2 e=0 z=0 None .sdata2 @2297 */ -SECTION_SDATA2 static u32 lit_2297 = 0x46EC7A00; +SECTION_SDATA2 static f32 lit_2297 = 30269.0f; /* 804550D0-804550D8 0004+04 s=2 e=0 z=0 None .sdata2 @2298 */ SECTION_SDATA2 static f32 lit_2298[1 + 1 /* padding */] = { @@ -2217,9 +2211,7 @@ SECTION_SDATA2 static f32 lit_2298[1 + 1 /* padding */] = { }; /* 804550D8-804550E0 0008+00 s=2 e=0 z=0 None .sdata2 @2299 */ -SECTION_SDATA2 static u8 lit_2299[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2299 = 1.0; /* 8026786C-80267954 00E8+00 s=2 e=15 z=113 None .text cM_rnd__Fv */ #pragma push @@ -2243,10 +2235,10 @@ asm void cM_rndF(f32 param_0) { /* ############################################################################################## */ /* 804550E0-804550E4 0004+00 s=2 e=0 z=0 None .sdata2 @2311 */ -SECTION_SDATA2 static u32 lit_2311 = 0x40000000; +SECTION_SDATA2 static f32 lit_2311 = 2.0f; /* 804550E4-804550E8 0004+00 s=2 e=0 z=0 None .sdata2 @2312 */ -SECTION_SDATA2 static u32 lit_2312 = 0x3F000000; +SECTION_SDATA2 static f32 lit_2312 = 0.5f; /* 8026798C-802679D4 0048+00 s=0 e=24 z=450 None .text cM_rndFX__Ff */ #pragma push diff --git a/libs/SSystem/SComponent/c_sxyz.cpp b/libs/SSystem/SComponent/c_sxyz.cpp index 6a521180770..03671b25c5c 100644 --- a/libs/SSystem/SComponent/c_sxyz.cpp +++ b/libs/SSystem/SComponent/c_sxyz.cpp @@ -24,9 +24,6 @@ struct csXyz { // Forward References: // -extern "C" extern u8 Zero__5csXyz[4]; -extern "C" extern u8 data_80451164[4]; - extern "C" void __ct__5csXyzFsss(); extern "C" void __pl__5csXyzFR5csXyz(); extern "C" void __apl__5csXyzFR5csXyz(); @@ -89,9 +86,7 @@ asm void csXyz::operator-(csXyz& param_0) { /* ############################################################################################## */ /* 804550A0-804550A8 0008+00 s=1 e=0 z=0 None .sdata2 @151 */ -SECTION_SDATA2 static u8 lit_151[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_151 = 4503601774854144.0 /* cast s32 to float */; /* 802674E8-8026758C 00A4+00 s=0 e=0 z=1 None .text __ml__5csXyzFf */ #pragma push diff --git a/libs/SSystem/SComponent/c_xyz.cpp b/libs/SSystem/SComponent/c_xyz.cpp index 3285880d6e0..960c9532431 100644 --- a/libs/SSystem/SComponent/c_xyz.cpp +++ b/libs/SSystem/SComponent/c_xyz.cpp @@ -39,11 +39,6 @@ struct cXyz { // Forward References: // -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 BaseZ__4cXyz[12]; - extern "C" void __pl__4cXyzCFRC3Vec(); extern "C" void __mi__4cXyzCFRC3Vec(); extern "C" void __ml__4cXyzCFf(); @@ -73,8 +68,6 @@ extern "C" extern u8 BaseZ__4cXyz[12]; // void cM_atan2s(f32, f32); -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_epsilon; extern "C" void __dt__4cXyzFv(); extern "C" void cM_atan2s__Fff(); @@ -134,7 +127,7 @@ asm void cXyz::operator*(Vec const& param_0) const { /* ############################################################################################## */ /* 80455070-80455074 0004+00 s=3 e=0 z=0 None .sdata2 @2201 */ -SECTION_SDATA2 static u32 lit_2201 = 0x3F800000; +SECTION_SDATA2 static f32 lit_2201 = 1.0f; /* 80266C18-80266C6C 0054+00 s=0 e=3 z=12 None .text __dv__4cXyzCFf */ #pragma push @@ -184,7 +177,7 @@ static u8 lit_2450[12]; f32 Zero__4cXyz[3]; /* 80455074-80455078 0004+00 s=4 e=0 z=0 None .sdata2 @2288 */ -SECTION_SDATA2 static u32 lit_2288 = 0x2EAFEBFF; +SECTION_SDATA2 static f32 lit_2288 = 7.999999968033578e-11f; /* 80266D30-80266DC4 0094+00 s=1 e=4 z=0 None .text normZP__4cXyzCFv */ #pragma push @@ -219,10 +212,10 @@ SECTION_RODATA static u8 const lit_2299[12 + 4 /* padding */] = { }; /* 80455078-8045507C 0004+00 s=1 e=0 z=0 None .sdata2 @2325 */ -SECTION_SDATA2 static u32 lit_2325 = 0x3FA00000; +SECTION_SDATA2 static f32 lit_2325 = 1.25f; /* 8045507C-80455080 0004+00 s=1 e=0 z=0 None .sdata2 @2326 */ -SECTION_SDATA2 static u32 lit_2326 = 0x49742400; +SECTION_SDATA2 static f32 lit_2326 = 1000000.0f; /* 80455080-80455084 0004+00 s=3 e=0 z=0 None .sdata2 @2327 */ SECTION_SDATA2 static u8 lit_2327[4] = { @@ -294,7 +287,7 @@ asm bool cXyz::operator!=(Vec const& param_0) const { /* ############################################################################################## */ /* 80455084-80455088 0004+00 s=1 e=0 z=0 None .sdata2 @2405 */ -SECTION_SDATA2 static u32 lit_2405 = 0x42000000; +SECTION_SDATA2 static f32 lit_2405 = 32.0f; /* 802670AC-80267128 007C+00 s=0 e=4 z=7 None .text isZero__4cXyzCFv */ #pragma push @@ -318,14 +311,10 @@ asm void cXyz::atan2sX_Z() const { /* ############################################################################################## */ /* 80455088-80455090 0008+00 s=1 e=0 z=0 None .sdata2 @2446 */ -SECTION_SDATA2 static u8 lit_2446[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2446 = 0.5; /* 80455090-80455098 0008+00 s=1 e=0 z=0 None .sdata2 @2447 */ -SECTION_SDATA2 static u8 lit_2447[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_2447 = 3.0; /* 80455098-804550A0 0008+00 s=1 e=0 z=0 None .sdata2 @2448 */ SECTION_SDATA2 static u8 lit_2448[8] = { diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.cpp index 17eab2c9a2b..7ce8972c078 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/main_TRK.cpp @@ -11,8 +11,6 @@ // Forward References: // -SECTION_BSS u8 TRK_mainError[4 + 4 /* padding */]; - extern "C" void TRK_main(); SECTION_BSS u8 TRK_mainError[4 + 4 /* padding */]; diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mainloop.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mainloop.cpp index 33de30823f4..5892b454ac4 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mainloop.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/mainloop.cpp @@ -17,8 +17,6 @@ extern "C" void TRKNubMainLoop(); // External References: // -extern "C" extern u8 gTRKInputPendingPtr[4 + 4 /* padding */]; - extern "C" void TRKDestructEvent(); extern "C" void TRKGetNextEvent(); extern "C" void TRKGetBuffer(); diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.cpp index 0d577b9a7d2..8761e8491ac 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msgbuf.cpp @@ -30,8 +30,6 @@ extern "C" void TRKInitializeMessageBuffers(); // External References: // -SECTION_BSS extern u8 gTRKBigEndian[4 + 4 /* padding */]; - SECTION_INIT void TRK_memset(); SECTION_INIT void TRK_memcpy(); extern "C" void usr_puts_serial(); diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.cpp index 88e281f7c1e..82f81e54edb 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/msghndlr.cpp @@ -11,9 +11,6 @@ // Forward References: // -extern "C" extern u8 const lit_402[31 + 1 /* padding */]; -SECTION_BSS u8 IsTRKConnected[4 + 4 /* padding */]; - extern "C" void TRKDoSetOption(); extern "C" void TRKDoStop(); extern "C" void TRKDoStep(); diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.cpp index 124f9720a87..44eaf9abc7b 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/nubinit.cpp @@ -11,8 +11,6 @@ // Forward References: // -SECTION_BSS extern u8 gTRKBigEndian[4 + 4 /* padding */]; - extern "C" void TRKNubWelcome(); extern "C" void TRKTerminateNub(); extern "C" void TRKInitializeNub(); @@ -22,8 +20,6 @@ SECTION_BSS extern u8 gTRKBigEndian[4 + 4 /* padding */]; // External References: // -extern "C" extern u8 gTRKInputPendingPtr[4 + 4 /* padding */]; - extern "C" void TRKInitializeEventQueue(); extern "C" void TRKInitializeMessageBuffers(); extern "C" bool TRKTerminateSerialHandler(); diff --git a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.cpp b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.cpp index e45150607f4..015c1b5dacf 100644 --- a/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/MetroTRK/Portable/serpoll.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern u8 gTRKInputPendingPtr[4 + 4 /* padding */]; - extern "C" bool TRKTerminateSerialHandler(); extern "C" void TRKInitializeSerialHandler(); extern "C" void TRKProcessInput(); diff --git a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.cpp b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.cpp index 2cea883f11e..ccca637b9c1 100644 --- a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk.cpp @@ -21,8 +21,6 @@ struct daBgObj_c { // Forward References: // -SECTION_BSS u8 lc_base[4 + 4 /* padding */]; - extern "C" void InitMetroTRK(); extern "C" void InitMetroTRK_BBA(); extern "C" void TRK__write_aram(); @@ -37,10 +35,6 @@ SECTION_BSS u8 lc_base[4 + 4 /* padding */]; // External References: // -extern "C" extern u8 const __TRK_unknown_data[7988]; -extern "C" extern u8 gTRKState[164]; -extern "C" extern u8 gTRKCPUState[1072]; - SECTION_INIT void TRK_memcpy(); extern "C" extern u8 const __TRK_unknown_data[7988]; extern "C" void ARGetDMAStatus(); diff --git a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.cpp b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.cpp index 507bb0001da..74d1bcda76a 100644 --- a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/dolphin_trk_glue.cpp @@ -11,10 +11,6 @@ // Forward References: // -SECTION_BSS u8 data_8044F820[4]; -SECTION_BSS extern u8 _MetroTRK_Has_Framing[4]; -SECTION_BSS extern u8 data_8044F828[8]; - extern "C" static void TRKLoadContext(); extern "C" void TRKUARTInterruptHandler(); extern "C" void InitializeProgramEndTrap(); diff --git a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.cpp b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.cpp index 73b81051a27..95161d2acd9 100644 --- a/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/Os/dolphin/target_options.cpp @@ -20,8 +20,6 @@ extern "C" void SetUseSerialIO(); SECTION_BSS extern u8 data_8044F828[8]; -SECTION_BSS extern u8 data_8044F828[8]; - // // Declarations: // diff --git a/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/mpc_7xx_603e.cpp b/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/mpc_7xx_603e.cpp index 983d92e8dda..1e99bac800b 100644 --- a/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/mpc_7xx_603e.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/mpc_7xx_603e.cpp @@ -26,9 +26,6 @@ extern "C" void TRKRestoreExtended1Block(); // External References: // -extern "C" extern u8 gTRKRestoreFlags[9 + 3 /* padding */]; -extern "C" extern u8 gTRKCPUState[1072]; - extern "C" extern u8 gTRKRestoreFlags[9 + 3 /* padding */]; extern "C" extern u8 gTRKCPUState[1072]; extern "C" void initAtt__9daBgObj_cFv(); diff --git a/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.cpp b/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.cpp index c70605de325..275b9bf2fb4 100644 --- a/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.cpp +++ b/libs/TRK_MINNOW_DOLPHIN/ppc/Generic/targimpl.cpp @@ -11,11 +11,6 @@ // Forward References: // -extern "C" extern u8 gTRKRestoreFlags[9 + 3 /* padding */]; -SECTION_BSS u8 TRK_saved_exceptionID[2 + 2 /* padding */]; -extern "C" extern u8 gTRKState[164]; -extern "C" extern u8 gTRKCPUState[1072]; - extern "C" void __TRK_get_MSR(); extern "C" static void __TRK_set_MSR(); extern "C" static void TRK_ppc_memcpy(); diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp index a64066c1002..9155db9a17c 100644 --- a/libs/Z2AudioLib/Z2Audience.cpp +++ b/libs/Z2AudioLib/Z2Audience.cpp @@ -11,7 +11,10 @@ // Types: // -struct Vec {}; +struct JASSoundParams { + /* 8029E3B0 */ void clamp(); + /* 8029E47C */ void combine(JASSoundParams const&, JASSoundParams const&); +}; struct JGeometry { template @@ -20,11 +23,6 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JASSoundParams { - /* 8029E3B0 */ void clamp(); - /* 8029E47C */ void combine(JASSoundParams const&, JASSoundParams const&); -}; - struct Z2Audible { /* 802BBD94 */ Z2Audible(JGeometry::TVec3 const&, JGeometry::TVec3 const*, u32, bool); /* 802BBE98 */ void calc(); @@ -35,6 +33,8 @@ struct Z2Audible { /* 802BD510 */ ~Z2Audible(); }; +struct Vec {}; + struct Z2AudioCamera { /* 802BC758 */ Z2AudioCamera(); /* 802BC788 */ void init(); @@ -138,10 +138,6 @@ struct JAIAudience { // Forward References: // -extern "C" extern u8 data_804341E4[16 + 4 /* padding */]; -extern "C" extern u8 data_80451354[4]; -extern "C" extern u8 struct_80451358[8]; - extern "C" void func_802BBCDC(); extern "C" void func_802BBD18(); extern "C" void func_802BBD94(); @@ -202,20 +198,6 @@ extern "C" extern u8 struct_80451358[8]; // void operator delete(void*); -extern "C" extern void* __vt__10JAIAudible[5 + 1 /* padding */]; -extern "C" extern void* __vt__11JAIAudience[8]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 DISTANCE_MAX__7Z2Param; -extern "C" extern u32 MAX_VOLUME_DISTANCE__7Z2Param; -extern "C" extern u32 DOLBY_CENTER_VALUE__7Z2Param; -extern "C" extern u32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param; -extern "C" extern u32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param; -extern "C" extern u32 DISTANCE_FX_PARAM__7Z2Param; -extern "C" extern u32 SONIC_SPEED__7Z2Param; -extern "C" extern u32 __float_epsilon; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern f32 MIN_DISTANCE_VOLUME__7Z2Param; extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void __dt__17JASGenericMemPoolFv(); @@ -250,13 +232,13 @@ extern "C" void _restgpr_29(); extern "C" extern void* __vt__10JAIAudible[5 + 1 /* padding */]; extern "C" extern void* __vt__11JAIAudience[8]; extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 DISTANCE_MAX__7Z2Param; -extern "C" extern u32 MAX_VOLUME_DISTANCE__7Z2Param; -extern "C" extern u32 DOLBY_CENTER_VALUE__7Z2Param; -extern "C" extern u32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param; -extern "C" extern u32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param; -extern "C" extern u32 DISTANCE_FX_PARAM__7Z2Param; -extern "C" extern u32 SONIC_SPEED__7Z2Param; +extern "C" extern f32 DISTANCE_MAX__7Z2Param; +extern "C" extern f32 MAX_VOLUME_DISTANCE__7Z2Param; +extern "C" extern f32 DOLBY_CENTER_VALUE__7Z2Param; +extern "C" extern f32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param; +extern "C" extern f32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param; +extern "C" extern f32 DISTANCE_FX_PARAM__7Z2Param; +extern "C" extern f32 SONIC_SPEED__7Z2Param; extern "C" extern u32 __float_epsilon; extern "C" extern u8 data_80450B44[4]; extern "C" extern u8 data_80450B4C[4]; @@ -323,13 +305,13 @@ SECTION_DATA static void* __vt__9Z2Audible[5 + 1 /* padding */] = { }; /* 80455AA4-80455AA8 0004+00 s=16 e=0 z=0 None .sdata2 @894 */ -SECTION_SDATA2 static u32 lit_894 = 0x3F800000; +SECTION_SDATA2 static f32 lit_894 = 1.0f; /* 80455AA8-80455AAC 0004+00 s=10 e=0 z=0 None .sdata2 @895 */ -SECTION_SDATA2 static u32 lit_895 = 0x3F000000; +SECTION_SDATA2 static f32 lit_895 = 0.5f; /* 80455AAC-80455AB0 0004+00 s=5 e=0 z=0 None .sdata2 @896 */ -SECTION_SDATA2 static u32 lit_896 = 0xBF800000; +SECTION_SDATA2 static f32 lit_896 = -1.0f; /* 802BBD94-802BBE74 00E0+00 s=1 e=0 z=0 None .text * __ct__9Z2AudibleFRCQ29JGeometry8TVec3PCQ29JGeometry8TVec3Ulb */ @@ -375,22 +357,22 @@ asm void Z2Audible::getOuterParams(int param_0) { /* ############################################################################################## */ /* 80455AB0-80455AB4 0004+00 s=4 e=0 z=0 None .sdata2 @998 */ -SECTION_SDATA2 static u32 lit_998 = 0x40400000; +SECTION_SDATA2 static f32 lit_998 = 3.0f; /* 80455AB4-80455AB8 0004+00 s=1 e=0 z=0 None .sdata2 @999 */ -SECTION_SDATA2 static u32 lit_999 = 0x41700000; +SECTION_SDATA2 static f32 lit_999 = 15.0f; /* 80455AB8-80455ABC 0004+00 s=4 e=0 z=0 None .sdata2 @1000 */ -SECTION_SDATA2 static u32 lit_1000 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_1000 = 3.0f / 10.0f; /* 80455ABC-80455AC0 0004+00 s=1 e=0 z=0 None .sdata2 @1001 */ -SECTION_SDATA2 static u32 lit_1001 = 0x3A83126F; +SECTION_SDATA2 static f32 lit_1001 = 0.0010000000474974513f; /* 80455AC0-80455AC4 0004+00 s=2 e=0 z=0 None .sdata2 @1002 */ -SECTION_SDATA2 static u32 lit_1002 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_1002 = 1.0f / 10.0f; /* 80455AC4-80455AC8 0004+00 s=1 e=0 z=0 None .sdata2 @1003 */ -SECTION_SDATA2 static u32 lit_1003 = 0x3D088889; +SECTION_SDATA2 static f32 lit_1003 = 1.0f / 30.0f; /* 80455AC8-80455AD0 0004+04 s=1 e=0 z=0 None .sdata2 @1004 */ SECTION_SDATA2 static f32 lit_1004[1 + 1 /* padding */] = { @@ -400,9 +382,7 @@ SECTION_SDATA2 static f32 lit_1004[1 + 1 /* padding */] = { }; /* 80455AD0-80455AD8 0008+00 s=4 e=0 z=0 None .sdata2 @1008 */ -SECTION_SDATA2 static u8 lit_1008[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_1008 = 4503599627370496.0 /* cast u32 to float */; /* 802BBEE4-802BC204 0320+00 s=1 e=0 z=0 None .text * setOuterParams__9Z2AudibleFRC14JASSoundParamsRC14JASSoundParamsi */ @@ -448,7 +428,7 @@ asm Z2Audience3DSetting::Z2Audience3DSetting() { /* ############################################################################################## */ /* 80455AD8-80455ADC 0004+00 s=4 e=0 z=0 None .sdata2 @1036 */ -SECTION_SDATA2 static u32 lit_1036 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_1036 = 1.5f; /* 802BC284-802BC308 0084+00 s=1 e=0 z=0 None .text init__19Z2Audience3DSettingFv */ #pragma push @@ -462,34 +442,34 @@ asm void Z2Audience3DSetting::init() { /* ############################################################################################## */ /* 80455ADC-80455AE0 0004+00 s=2 e=0 z=0 None .sdata2 @1058 */ -SECTION_SDATA2 static u32 lit_1058 = 0x3FA00000; +SECTION_SDATA2 static f32 lit_1058 = 1.25f; /* 80455AE0-80455AE4 0004+00 s=3 e=0 z=0 None .sdata2 @1059 */ -SECTION_SDATA2 static u32 lit_1059 = 0x40000000; +SECTION_SDATA2 static f32 lit_1059 = 2.0f; /* 80455AE4-80455AE8 0004+00 s=2 e=0 z=0 None .sdata2 @1060 */ -SECTION_SDATA2 static u32 lit_1060 = 0x40800000; +SECTION_SDATA2 static f32 lit_1060 = 4.0f; /* 80455AE8-80455AEC 0004+00 s=2 e=0 z=0 None .sdata2 @1061 */ -SECTION_SDATA2 static u32 lit_1061 = 0x40C00000; +SECTION_SDATA2 static f32 lit_1061 = 6.0f; /* 80455AEC-80455AF0 0004+00 s=2 e=0 z=0 None .sdata2 @1062 */ -SECTION_SDATA2 static u32 lit_1062 = 0x41000000; +SECTION_SDATA2 static f32 lit_1062 = 8.0f; /* 80455AF0-80455AF4 0004+00 s=2 e=0 z=0 None .sdata2 @1063 */ -SECTION_SDATA2 static u32 lit_1063 = 0x3F666666; +SECTION_SDATA2 static f32 lit_1063 = 9.0f / 10.0f; /* 80455AF4-80455AF8 0004+00 s=2 e=0 z=0 None .sdata2 @1064 */ -SECTION_SDATA2 static u32 lit_1064 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_1064 = 4.0f / 5.0f; /* 80455AF8-80455AFC 0004+00 s=2 e=0 z=0 None .sdata2 @1065 */ -SECTION_SDATA2 static u32 lit_1065 = 0x3F333333; +SECTION_SDATA2 static f32 lit_1065 = 7.0f / 10.0f; /* 80455AFC-80455B00 0004+00 s=2 e=0 z=0 None .sdata2 @1066 */ -SECTION_SDATA2 static u32 lit_1066 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_1066 = 3.0f / 5.0f; /* 80455B00-80455B04 0004+00 s=2 e=0 z=0 None .sdata2 @1067 */ -SECTION_SDATA2 static u32 lit_1067 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_1067 = 2.0f / 5.0f; /* 802BC308-802BC4D0 01C8+00 s=2 e=0 z=0 None .text initVolumeDist__19Z2Audience3DSettingFv */ #pragma push @@ -549,7 +529,7 @@ asm Z2AudioCamera::Z2AudioCamera() { /* ############################################################################################## */ /* 80455B04-80455B08 0004+00 s=1 e=0 z=0 None .sdata2 @1135 */ -SECTION_SDATA2 static u32 lit_1135 = 0x47C35000; +SECTION_SDATA2 static f32 lit_1135 = 100000.0f; /* 802BC788-802BC7DC 0054+00 s=1 e=0 z=0 None .text init__13Z2AudioCameraFv */ #pragma push @@ -595,25 +575,25 @@ SECTION_RODATA static u8 const lit_1193[12 + 4 /* padding */] = { }; /* 80455B08-80455B0C 0004+00 s=1 e=0 z=0 None .sdata2 @1267 */ -SECTION_SDATA2 static u32 lit_1267 = 0xC1B60B61; +SECTION_SDATA2 static f32 lit_1267 = -22.755556106567383f; /* 80455B0C-80455B10 0004+00 s=1 e=0 z=0 None .sdata2 @1268 */ -SECTION_SDATA2 static u32 lit_1268 = 0x41B60B61; +SECTION_SDATA2 static f32 lit_1268 = 22.755556106567383f; /* 80455B10-80455B14 0004+00 s=1 e=0 z=0 None .sdata2 @1269 */ -SECTION_SDATA2 static u32 lit_1269 = 0x42480000; +SECTION_SDATA2 static f32 lit_1269 = 50.0f; /* 80455B14-80455B18 0004+00 s=1 e=0 z=0 None .sdata2 @1270 */ -SECTION_SDATA2 static u32 lit_1270 = 0x40093F9A; +SECTION_SDATA2 static f32 lit_1270 = 2.1445069313049316f; /* 80455B18-80455B1C 0004+00 s=2 e=0 z=0 None .sdata2 @1271 */ -SECTION_SDATA2 static u32 lit_1271 = 0x42000000; +SECTION_SDATA2 static f32 lit_1271 = 32.0f; /* 80455B1C-80455B20 0004+00 s=1 e=0 z=0 None .sdata2 @1272 */ -SECTION_SDATA2 static u32 lit_1272 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_1272 = -100.0f; /* 80455B20-80455B24 0004+00 s=1 e=0 z=0 None .sdata2 @1273 */ -SECTION_SDATA2 static u32 lit_1273 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_1273 = 0.01745329238474369f; /* 802BC8AC-802BCBEC 0340+00 s=1 e=0 z=0 None .text * setCameraState__13Z2AudioCameraFPA4_fR3VecR3Vecffbb */ @@ -661,16 +641,16 @@ asm void Z2AudioCamera::isInSight(Vec& param_0) const { /* ############################################################################################## */ /* 80455B24-80455B28 0004+00 s=1 e=0 z=0 None .sdata2 @1334 */ -SECTION_SDATA2 static u32 lit_1334 = 0x43480000; +SECTION_SDATA2 static f32 lit_1334 = 200.0f; /* 80455B28-80455B2C 0004+00 s=1 e=0 z=0 None .sdata2 @1335 */ -SECTION_SDATA2 static u32 lit_1335 = 0x43C80000; +SECTION_SDATA2 static f32 lit_1335 = 400.0f; /* 80455B2C-80455B30 0004+00 s=2 e=0 z=0 None .sdata2 @1336 */ -SECTION_SDATA2 static u32 lit_1336 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_1336 = 1.0f / 5.0f; /* 80455B30-80455B34 0004+00 s=1 e=0 z=0 None .sdata2 @1337 */ -SECTION_SDATA2 static u32 lit_1337 = 0x437F0000; +SECTION_SDATA2 static f32 lit_1337 = 255.0f; /* 802BCD28-802BCDA8 0080+00 s=1 e=0 z=0 None .text __ct__9Z2SpotMicFv */ #pragma push @@ -959,7 +939,7 @@ asm void Z2Audience::calcFxMix_(f32 param_0, int param_1) const { /* ############################################################################################## */ /* 80455B34-80455B38 0004+00 s=1 e=0 z=0 None .sdata2 @1988 */ -SECTION_SDATA2 static u32 lit_1988 = 0x3D888889; +SECTION_SDATA2 static f32 lit_1988 = 1.0f / 15.0f; /* 802BDD48-802BDED4 018C+00 s=1 e=0 z=0 None .text * calcPitch___10Z2AudienceCFP16Z2AudibleChannelPC9Z2AudiblePC13Z2AudioCamera */ diff --git a/libs/Z2AudioLib/Z2AudioArcLoader.cpp b/libs/Z2AudioLib/Z2AudioArcLoader.cpp index 75b43c2cadc..cc811ca0a57 100644 --- a/libs/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/libs/Z2AudioLib/Z2AudioArcLoader.cpp @@ -61,8 +61,6 @@ struct JAUAudioArcInterpreter { // Forward References: // -extern "C" extern void* __vt__16Z2AudioArcLoader[17 + 1 /* padding */]; - extern "C" void __ct__16Z2AudioArcLoaderFP10JAUSection(); extern "C" void readCommandMore__16Z2AudioArcLoaderFUl(); extern "C" void readBFCA__16Z2AudioArcLoaderFPCv(); @@ -75,10 +73,6 @@ extern "C" extern void* __vt__16Z2AudioArcLoader[17 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern void* __vt__17JAUAudioArcLoader[17 + 1 /* padding */]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; extern "C" void __dt__22JAUAudioArcInterpreterFv(); extern "C" void __ct__17JAUAudioArcLoaderFP10JAUSection(); diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp index d34a67d9566..9264431b3a0 100644 --- a/libs/Z2AudioLib/Z2AudioMgr.cpp +++ b/libs/Z2AudioLib/Z2AudioMgr.cpp @@ -58,12 +58,6 @@ struct Z2FxLineMgr { /* 802BA7DC */ Z2FxLineMgr(); }; -struct JAISoundID {}; - -struct JKRSolidHeap {}; - -struct JAISoundHandle {}; - struct JGeometry { template struct TVec3 {}; @@ -73,6 +67,12 @@ struct JGeometry { struct JKRArchive {}; +struct JKRSolidHeap {}; + +struct JAISoundID {}; + +struct JAISoundHandle {}; + struct Z2AudioMgr { /* 802CD248 */ Z2AudioMgr(); /* 802CD34C */ void init(JKRSolidHeap*, u32, void*, JKRArchive*); @@ -213,10 +213,6 @@ struct JAISeMgr { // Forward References: // -extern "C" extern char const* const Z2AudioMgr__stringBase0; -extern "C" extern void* __vt__10Z2AudioMgr[3]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - extern "C" void __ct__10Z2AudioMgrFv(); extern "C" void init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive(); extern "C" void func_802CD7F8(); @@ -242,30 +238,6 @@ void JAUNewSectionHeap(bool); void seqCallback(JASTrack*, u16); void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern void* __vt__12JAUSoundInfo[4 + 1 /* padding */]; -extern "C" extern void* __vt__16JAIStreamAramMgr[5]; -extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */]; -extern "C" extern void* __vt__17JAUAudioArcLoader[17 + 1 /* padding */]; -extern "C" extern void* __vt__16Z2AudioArcLoader[17 + 1 /* padding */]; -extern "C" extern void* __vt__11Z2SoundInfo[20]; -extern "C" extern void* __files[80]; -extern "C" extern u8 data_804341C4[16 + 4 /* padding */]; -extern "C" extern u8 data_804341E4[16 + 4 /* padding */]; -extern "C" extern u32 VOL_BGM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B50[4]; -extern "C" extern u8 sCallBackFunc__12JASSeqParser[4]; -extern "C" extern u8 sBlockSize__13JASAramStream[4]; -extern "C" extern u8 data_80451348[8]; -extern "C" extern u8 data_80451354[4]; extern "C" void alloc__7JASHeapFP7JASHeapUl(); extern "C" void free__7JASHeapFv(); @@ -347,15 +319,15 @@ extern "C" extern void* __vt__11Z2SoundInfo[20]; extern "C" extern void* __files[80]; extern "C" extern u8 data_804341C4[16 + 4 /* padding */]; extern "C" extern u8 data_804341E4[16 + 4 /* padding */]; -extern "C" extern u32 VOL_BGM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_BGM_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_OBJECT_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; extern "C" extern u8 data_80450B4C[4]; extern "C" extern u8 data_80450B50[4]; extern "C" extern u8 sCallBackFunc__12JASSeqParser[4]; @@ -424,10 +396,10 @@ static u8 lit_3779[12]; static u8 lit_3783[12]; /* 80455F58-80455F5C 0004+00 s=1 e=0 z=0 None .sdata2 @3931 */ -SECTION_SDATA2 static u32 lit_3931 = 0x3FA66666; +SECTION_SDATA2 static f32 lit_3931 = 13.0f / 10.0f; /* 80455F5C-80455F60 0004+00 s=2 e=0 z=0 None .sdata2 @3932 */ -SECTION_SDATA2 static u32 lit_3932 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3932 = 1.0f; /* 802CD34C-802CD7F8 04AC+00 s=0 e=1 z=0 None .text * init__10Z2AudioMgrFP12JKRSolidHeapUlPvP10JKRArchive */ @@ -492,16 +464,10 @@ asm void Z2AudioMgr::resetProcess(u32 param_0, bool param_1) { /* ############################################################################################## */ /* 80455F60-80455F68 0004+04 s=1 e=0 z=0 None .sdata2 @4035 */ -SECTION_SDATA2 static u8 lit_4035[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_4035[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 802CD9CC-802CDA6C 00A0+00 s=0 e=1 z=0 None .text resetRecover__10Z2AudioMgrFv */ diff --git a/libs/Z2AudioLib/Z2Calc.cpp b/libs/Z2AudioLib/Z2Calc.cpp index 4811a10b52f..e05ec4d38d5 100644 --- a/libs/Z2AudioLib/Z2Calc.cpp +++ b/libs/Z2AudioLib/Z2Calc.cpp @@ -36,9 +36,6 @@ struct JMath { // Forward References: // -extern "C" extern u32 cEqualCSlope__6Z2Calc; -extern "C" extern u32 cEqualPSlope__6Z2Calc; - extern "C" void linearTransform__6Z2CalcFfffffb(); extern "C" void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(); extern "C" void getRandom__6Z2CalcFfff(); @@ -46,8 +43,8 @@ extern "C" void getRandom_0_1__6Z2CalcFv(); extern "C" void setParam__Q26Z2Calc8FNoise1fFfff(); extern "C" void tau__Q26Z2Calc8FNoise1fFf(); extern "C" void calcNoise1f__Q26Z2Calc8FNoise1fFv(); -extern "C" extern u32 cEqualCSlope__6Z2Calc; -extern "C" extern u32 cEqualPSlope__6Z2Calc; +extern "C" extern f32 cEqualCSlope__6Z2Calc; +extern "C" extern f32 cEqualPSlope__6Z2Calc; // // External References: @@ -74,10 +71,10 @@ asm void Z2Calc::linearTransform(f32 param_0, f32 param_1, f32 param_2, f32 para /* ############################################################################################## */ /* 80455820-80455824 0004+00 s=0 e=1 z=0 None .sdata2 cEqualCSlope__6Z2Calc */ -SECTION_SDATA2 u32 cEqualCSlope__6Z2Calc = 0x3F800000; +SECTION_SDATA2 f32 cEqualCSlope__6Z2Calc = 1.0f; /* 80455824-80455828 0004+00 s=0 e=1 z=0 None .sdata2 cEqualPSlope__6Z2Calc */ -SECTION_SDATA2 u32 cEqualPSlope__6Z2Calc = 0x3F000000; +SECTION_SDATA2 f32 cEqualPSlope__6Z2Calc = 0.5f; /* 80455828-8045582C 0004+00 s=1 e=0 z=0 None .sdata2 @380 */ SECTION_SDATA2 static u8 lit_380[4] = { @@ -88,7 +85,7 @@ SECTION_SDATA2 static u8 lit_380[4] = { }; /* 8045582C-80455830 0004+00 s=4 e=0 z=0 None .sdata2 @381 */ -SECTION_SDATA2 static u32 lit_381 = 0x3F800000; +SECTION_SDATA2 static f32 lit_381 = 1.0f; /* 802A96F4-802A9814 0120+00 s=0 e=29 z=0 None .text * getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign */ @@ -104,10 +101,10 @@ asm void Z2Calc::getParamByExp(f32 param_0, f32 param_1, f32 param_2, f32 param_ /* ############################################################################################## */ /* 80455830-80455834 0004+00 s=1 e=0 z=0 None .sdata2 @396 */ -SECTION_SDATA2 static u32 lit_396 = 0x40000000; +SECTION_SDATA2 static f32 lit_396 = 2.0f; /* 80455834-80455838 0004+00 s=1 e=0 z=0 None .sdata2 @397 */ -SECTION_SDATA2 static u32 lit_397 = 0xC0000000; +SECTION_SDATA2 static f32 lit_397 = -2.0f; /* 802A9814-802A98D4 00C0+00 s=0 e=2 z=0 None .text getRandom__6Z2CalcFfff */ #pragma push diff --git a/libs/Z2AudioLib/Z2Creature.cpp b/libs/Z2AudioLib/Z2Creature.cpp index b6df71930cb..e9c261d49fc 100644 --- a/libs/Z2AudioLib/Z2Creature.cpp +++ b/libs/Z2AudioLib/Z2Creature.cpp @@ -199,8 +199,6 @@ static void Z2_E_sw_modPitch(Z2SoundHandlePool*, u32); static void Z2_E_ms_modVol(Z2SoundHandlePool*, u32); static void Z2_E_mm_modPitch(Z2SoundHandlePool*, u32); static void Z2_B_zan_modPitch(Z2SoundHandlePool*, u32); -extern "C" extern void* __vt__13Z2CreatureGob[12]; -extern "C" extern void* __vt__16Z2CreatureSumomo[12]; extern "C" void __ct__10Z2CreatureFv(); extern "C" void __dt__10Z2CreatureFv(); @@ -275,18 +273,6 @@ extern "C" extern void* __vt__16Z2CreatureSumomo[12]; // void operator delete(void*); -extern "C" extern void* __vt__15Z2SoundObjAnime[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 struct_80450868[4]; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 struct_80451358[8]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __dt__16Z2SoundObjSimpleFv(); extern "C" void moveVolume__18JAISoundParamsMoveFfUl(); @@ -787,22 +773,22 @@ SECTION_SDATA2 static u32 sAreaSmallFloating = 0x000001F4; SECTION_SDATA2 static u32 data_80455C04 = 0x032004B0; /* 80455C08-80455C0C 0004+00 s=3 e=0 z=0 None .sdata2 @3663 */ -SECTION_SDATA2 static u32 lit_3663 = 0x41F00000; +SECTION_SDATA2 static f32 lit_3663 = 30.0f; /* 80455C0C-80455C10 0004+00 s=4 e=0 z=0 None .sdata2 @3664 */ -SECTION_SDATA2 static u32 lit_3664 = 0x42C80000; +SECTION_SDATA2 static f32 lit_3664 = 100.0f; /* 80455C10-80455C14 0004+00 s=2 e=0 z=0 None .sdata2 @3665 */ -SECTION_SDATA2 static u32 lit_3665 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_3665 = 3.0f / 10.0f; /* 80455C14-80455C18 0004+00 s=4 e=0 z=0 None .sdata2 @3666 */ -SECTION_SDATA2 static u32 lit_3666 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_3666 = 4.0f / 5.0f; /* 80455C18-80455C1C 0004+00 s=4 e=0 z=0 None .sdata2 @3667 */ -SECTION_SDATA2 static u32 lit_3667 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_3667 = 6.0f / 5.0f; /* 80455C1C-80455C20 0004+00 s=5 e=0 z=0 None .sdata2 @3668 */ -SECTION_SDATA2 static u32 lit_3668 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3668 = 0.5f; /* 80455C20-80455C28 0004+04 s=11 e=0 z=0 None .sdata2 @3669 */ SECTION_SDATA2 static f32 lit_3669[1 + 1 /* padding */] = { @@ -812,9 +798,7 @@ SECTION_SDATA2 static f32 lit_3669[1 + 1 /* padding */] = { }; /* 80455C28-80455C30 0008+00 s=8 e=0 z=0 None .sdata2 @3672 */ -SECTION_SDATA2 static u8 lit_3672[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3672 = 4503599627370496.0 /* cast u32 to float */; /* 802C0720-802C087C 015C+00 s=4 e=2 z=0 None .text * startCreatureSound__10Z2CreatureF10JAISoundIDUlSc */ @@ -829,7 +813,7 @@ asm void Z2Creature::startCreatureSound(JAISoundID param_0, u32 param_1, s8 para /* ############################################################################################## */ /* 80455C30-80455C34 0004+00 s=1 e=0 z=0 None .sdata2 @3716 */ -SECTION_SDATA2 static u32 lit_3716 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3716 = -1.0f; /* 80455C34-80455C38 0004+00 s=6 e=0 z=0 None .sdata2 @3717 */ SECTION_SDATA2 static u8 lit_3717[4] = { @@ -840,13 +824,13 @@ SECTION_SDATA2 static u8 lit_3717[4] = { }; /* 80455C38-80455C3C 0004+00 s=1 e=0 z=0 None .sdata2 @3718 */ -SECTION_SDATA2 static u32 lit_3718 = 0x42B80000; +SECTION_SDATA2 static f32 lit_3718 = 92.0f; /* 80455C3C-80455C40 0004+00 s=1 e=0 z=0 None .sdata2 @3719 */ -SECTION_SDATA2 static u32 lit_3719 = 0x3E800000; +SECTION_SDATA2 static f32 lit_3719 = 0.25f; /* 80455C40-80455C44 0004+00 s=5 e=0 z=0 None .sdata2 @3720 */ -SECTION_SDATA2 static u32 lit_3720 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_3720 = 2.0f / 5.0f; /* 802C087C-802C0A4C 01D0+00 s=4 e=2 z=0 None .text * startCreatureSoundLevel__10Z2CreatureF10JAISoundIDUlSc */ @@ -1039,13 +1023,13 @@ asm void Z2CreatureEnemy::framework(u32 param_0, s8 param_1) { /* ############################################################################################## */ /* 80455C44-80455C48 0004+00 s=1 e=0 z=0 None .sdata2 @4090 */ -SECTION_SDATA2 static u32 lit_4090 = 0x41200000; +SECTION_SDATA2 static f32 lit_4090 = 10.0f; /* 80455C48-80455C4C 0004+00 s=3 e=0 z=0 None .sdata2 @4091 */ -SECTION_SDATA2 static u32 lit_4091 = 0x42480000; +SECTION_SDATA2 static f32 lit_4091 = 50.0f; /* 80455C4C-80455C50 0004+00 s=3 e=0 z=0 None .sdata2 @4092 */ -SECTION_SDATA2 static u32 lit_4092 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4092 = 1.0f / 10.0f; /* 802C110C-802C136C 0260+00 s=4 e=0 z=0 None .text * startCreatureSound__15Z2CreatureEnemyF10JAISoundIDUlSc */ @@ -1060,28 +1044,28 @@ asm void Z2CreatureEnemy::startCreatureSound(JAISoundID param_0, u32 param_1, s8 /* ############################################################################################## */ /* 80455C50-80455C54 0004+00 s=1 e=0 z=0 None .sdata2 @4187 */ -SECTION_SDATA2 static u32 lit_4187 = 0x40000000; +SECTION_SDATA2 static f32 lit_4187 = 2.0f; /* 80455C54-80455C58 0004+00 s=4 e=0 z=0 None .sdata2 @4188 */ -SECTION_SDATA2 static u32 lit_4188 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_4188 = 11.0f / 10.0f; /* 80455C58-80455C5C 0004+00 s=1 e=0 z=0 None .sdata2 @4189 */ -SECTION_SDATA2 static u32 lit_4189 = 0x40800000; +SECTION_SDATA2 static f32 lit_4189 = 4.0f; /* 80455C5C-80455C60 0004+00 s=1 e=0 z=0 None .sdata2 @4190 */ -SECTION_SDATA2 static u32 lit_4190 = 0x420C0000; +SECTION_SDATA2 static f32 lit_4190 = 35.0f; /* 80455C60-80455C64 0004+00 s=1 e=0 z=0 None .sdata2 @4191 */ -SECTION_SDATA2 static u32 lit_4191 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4191 = 3.0f / 5.0f; /* 80455C64-80455C68 0004+00 s=3 e=0 z=0 None .sdata2 @4192 */ -SECTION_SDATA2 static u32 lit_4192 = 0x3F333333; +SECTION_SDATA2 static f32 lit_4192 = 7.0f / 10.0f; /* 80455C68-80455C6C 0004+00 s=1 e=0 z=0 None .sdata2 @4193 */ -SECTION_SDATA2 static u32 lit_4193 = 0x457A0000; +SECTION_SDATA2 static f32 lit_4193 = 4000.0f; /* 80455C6C-80455C70 0004+00 s=1 e=0 z=0 None .sdata2 @4194 */ -SECTION_SDATA2 static u32 lit_4194 = 0x464B2000; +SECTION_SDATA2 static f32 lit_4194 = 13000.0f; /* 802C136C-802C168C 0320+00 s=2 e=0 z=0 None .text * startCreatureSoundLevel__15Z2CreatureEnemyF10JAISoundIDUlSc */ @@ -1222,10 +1206,10 @@ asm void Z2SoundObjBeeGroup::init(Vec* param_0, u8 param_1) { /* ############################################################################################## */ /* 80455C70-80455C74 0004+00 s=2 e=0 z=0 None .sdata2 @4561 */ -SECTION_SDATA2 static u32 lit_4561 = 0x40A00000; +SECTION_SDATA2 static f32 lit_4561 = 5.0f; /* 80455C74-80455C78 0004+00 s=1 e=0 z=0 None .sdata2 @4562 */ -SECTION_SDATA2 static u32 lit_4562 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4562 = 20.0f; /* 802C1D6C-802C1F54 01E8+00 s=0 e=0 z=2 None .text * playBeeGroupSound__18Z2SoundObjBeeGroupF10JAISoundIDUc */ @@ -1295,10 +1279,10 @@ asm void Z2CreatureFM::startChainSound(JAISoundID param_0, u8 param_1, f32 param /* ############################################################################################## */ /* 80455C78-80455C7C 0004+00 s=1 e=0 z=0 None .sdata2 @4681 */ -SECTION_SDATA2 static u32 lit_4681 = 0x3F87AE14; +SECTION_SDATA2 static f32 lit_4681 = 53.0f / 50.0f; /* 80455C7C-80455C80 0004+00 s=1 e=0 z=0 None .sdata2 @4682 */ -SECTION_SDATA2 static u32 lit_4682 = 0x3CF5C28F; +SECTION_SDATA2 static f32 lit_4682 = 3.0f / 100.0f; /* 802C2290-802C24B0 0220+00 s=0 e=0 z=1 None .text * startChainSoundLevel__12Z2CreatureFMF10JAISoundIDUcfUlSc */ @@ -1380,10 +1364,10 @@ asm void Z2CreatureOI::framework(u32 param_0, s8 param_1) { /* ############################################################################################## */ /* 80455C80-80455C84 0004+00 s=1 e=0 z=0 None .sdata2 @4837 */ -SECTION_SDATA2 static u32 lit_4837 = 0x42280000; +SECTION_SDATA2 static f32 lit_4837 = 42.0f; /* 80455C84-80455C88 0004+00 s=2 e=0 z=0 None .sdata2 @4838 */ -SECTION_SDATA2 static u32 lit_4838 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4838 = 9.0f / 10.0f; /* 802C29D4-802C2C84 02B0+00 s=1 e=0 z=0 None .text * startCreatureSoundLevel__12Z2CreatureOIF10JAISoundIDUlSc */ @@ -1409,7 +1393,7 @@ asm void Z2CreatureOI::startTentacleSound(JAISoundID param_0, u8 param_1, u32 pa /* ############################################################################################## */ /* 80455C88-80455C8C 0004+00 s=1 e=0 z=0 None .sdata2 @4875 */ -SECTION_SDATA2 static u32 lit_4875 = 0x42700000; +SECTION_SDATA2 static f32 lit_4875 = 60.0f; /* 802C2CD4-802C2DE0 010C+00 s=0 e=0 z=1 None .text * startTentacleSoundLevel__12Z2CreatureOIF10JAISoundIDUcfUlSc */ @@ -1436,7 +1420,7 @@ asm static void Z2_E_sw_modPitch(Z2SoundHandlePool* param_0, u32 param_1) { /* ############################################################################################## */ /* 80455C8C-80455C90 0004+00 s=1 e=0 z=0 None .sdata2 @4906 */ -SECTION_SDATA2 static u32 lit_4906 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_4906 = 1.0f / 5.0f; /* 802C2E54-802C2E9C 0048+00 s=2 e=0 z=0 None .text Z2_E_ms_modVol__FP17Z2SoundHandlePoolUl */ #pragma push @@ -1461,10 +1445,10 @@ asm static void Z2_E_mm_modPitch(Z2SoundHandlePool* param_0, u32 param_1) { /* ############################################################################################## */ /* 80455C90-80455C94 0004+00 s=1 e=0 z=0 None .sdata2 @4944 */ -SECTION_SDATA2 static u32 lit_4944 = 0x43960000; +SECTION_SDATA2 static f32 lit_4944 = 300.0f; /* 80455C94-80455C98 0004+00 s=1 e=0 z=0 None .sdata2 @4945 */ -SECTION_SDATA2 static u32 lit_4945 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_4945 = 1.5f; /* 802C2EE4-802C3040 015C+00 s=2 e=0 z=0 None .text Z2_B_zan_modPitch__FP17Z2SoundHandlePoolUl */ diff --git a/libs/Z2AudioLib/Z2EnvSeMgr.cpp b/libs/Z2AudioLib/Z2EnvSeMgr.cpp index 884ab130112..43b91cc2fea 100644 --- a/libs/Z2AudioLib/Z2EnvSeMgr.cpp +++ b/libs/Z2AudioLib/Z2EnvSeMgr.cpp @@ -214,19 +214,6 @@ extern "C" void startLv3WaterSe__10Z2EnvSeMgrFSc(); void dComIfGp_getReverb(int); void operator delete(void*); void JMAFastVECNormalize(Vec const*, Vec*); -extern "C" extern u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450B3C[4]; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; -extern "C" extern u32 cEqualCSlope__6Z2Calc; -extern "C" extern u32 cEqualPSlope__6Z2Calc; extern "C" void dComIfGp_getReverb__Fi(); extern "C" void isSwitch__12dSv_memBit_cCFi(); @@ -278,8 +265,8 @@ extern "C" extern u8 data_80450B7C[4]; extern "C" extern u8 data_80450B80[4]; extern "C" extern u8 data_80450B88[4]; extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; -extern "C" extern u32 cEqualCSlope__6Z2Calc; -extern "C" extern u32 cEqualPSlope__6Z2Calc; +extern "C" extern f32 cEqualCSlope__6Z2Calc; +extern "C" extern f32 cEqualPSlope__6Z2Calc; // // Declarations: @@ -307,10 +294,10 @@ asm Z2EnvSeBase::~Z2EnvSeBase() { /* ############################################################################################## */ /* 80455D40-80455D44 0004+00 s=2 e=0 z=0 None .sdata2 @3501 */ -SECTION_SDATA2 static u32 lit_3501 = 0x3EA8F5C3; +SECTION_SDATA2 static f32 lit_3501 = 33.0f / 100.0f; /* 80455D44-80455D48 0004+00 s=24 e=0 z=0 None .sdata2 @3502 */ -SECTION_SDATA2 static u32 lit_3502 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3502 = 1.0f; /* 80455D48-80455D4C 0004+00 s=19 e=0 z=0 None .sdata2 @3503 */ SECTION_SDATA2 static u8 lit_3503[4] = { @@ -321,7 +308,7 @@ SECTION_SDATA2 static u8 lit_3503[4] = { }; /* 80455D4C-80455D50 0004+00 s=2 e=0 z=0 None .sdata2 @3504 */ -SECTION_SDATA2 static u32 lit_3504 = 0x44BB8000; +SECTION_SDATA2 static f32 lit_3504 = 1500.0f; /* 80455D50-80455D58 0004+04 s=9 e=0 z=0 None .sdata2 @3505 */ SECTION_SDATA2 static f32 lit_3505[1 + 1 /* padding */] = { @@ -331,9 +318,7 @@ SECTION_SDATA2 static f32 lit_3505[1 + 1 /* padding */] = { }; /* 80455D58-80455D60 0008+00 s=8 e=0 z=0 None .sdata2 @3508 */ -SECTION_SDATA2 static u8 lit_3508[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3508 = 4503599627370496.0 /* cast u32 to float */; /* 802C5908-802C5AB4 01AC+00 s=2 e=0 z=0 None .text startEnvSe__11Z2EnvSeBaseF10JAISoundIDfffffUl */ @@ -382,7 +367,7 @@ SECTION_RODATA static u8 const cNullVec__6Z2Calc[12 + 4 /* padding */] = { }; /* 80455D60-80455D64 0004+00 s=10 e=0 z=0 None .sdata2 @3574 */ -SECTION_SDATA2 static u32 lit_3574 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3574 = 0.5f; /* 802C5C9C-802C5D1C 0080+00 s=1 e=0 z=0 None .text __ct__10Z2EnvSeDirFP3Vec */ #pragma push @@ -406,7 +391,7 @@ asm Z2EnvSeDir::~Z2EnvSeDir() { /* ############################################################################################## */ /* 80455D64-80455D68 0004+00 s=1 e=0 z=0 None .sdata2 @3585 */ -SECTION_SDATA2 static u32 lit_3585 = 0xC47A0000; +SECTION_SDATA2 static f32 lit_3585 = -1000.0f; /* 802C5D70-802C5D9C 002C+00 s=2 e=0 z=0 None .text setPanDir__10Z2EnvSeDirFP3Vec */ #pragma push @@ -441,10 +426,10 @@ asm void Z2EnvSeDir::startEnvSeDirLevel(JAISoundID param_0, f32 param_1, f32 par /* ############################################################################################## */ /* 80455D68-80455D6C 0004+00 s=3 e=0 z=0 None .sdata2 @3654 */ -SECTION_SDATA2 static u32 lit_3654 = 0x3AF330E5; +SECTION_SDATA2 static f32 lit_3654 = 0.0018554000416770577f; /* 80455D6C-80455D70 0004+00 s=3 e=0 z=0 None .sdata2 @3655 */ -SECTION_SDATA2 static u32 lit_3655 = 0x3A603CEC; +SECTION_SDATA2 static f32 lit_3655 = 0.0008553999941796064f; /* 802C5ECC-802C5F28 005C+00 s=1 e=0 z=0 None .text __ct__14Z2EnvSeAutoPanFv */ #pragma push @@ -479,10 +464,10 @@ asm void Z2EnvSeAutoPan::setPanParam(f32 param_0, f32 param_1, bool param_2, boo /* ############################################################################################## */ /* 80455D70-80455D74 0004+00 s=4 e=0 z=0 None .sdata2 @3704 */ -SECTION_SDATA2 static u32 lit_3704 = 0x40000000; +SECTION_SDATA2 static f32 lit_3704 = 2.0f; /* 80455D74-80455D78 0004+00 s=7 e=0 z=0 None .sdata2 @3705 */ -SECTION_SDATA2 static u32 lit_3705 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3705 = -1.0f; /* 802C5F98-802C60E0 0148+00 s=2 e=0 z=0 None .text calcPan__14Z2EnvSeAutoPanFv */ #pragma push @@ -508,91 +493,91 @@ asm void Z2EnvSeAutoPan::startEnvSeAutoPanLevel(JAISoundID param_0, f32 param_1, /* ############################################################################################## */ /* 80455D78-80455D7C 0004+00 s=8 e=0 z=0 None .sdata2 @3749 */ -SECTION_SDATA2 static u32 lit_3749 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_3749 = 1.0f / 100.0f; /* 80455D7C-80455D80 0004+00 s=1 e=0 z=0 None .sdata2 @3750 */ -SECTION_SDATA2 static u32 lit_3750 = 0x3C002F3F; +SECTION_SDATA2 static f32 lit_3750 = 0.007823764346539974f; /* 80455D80-80455D84 0004+00 s=1 e=0 z=0 None .sdata2 @3751 */ -SECTION_SDATA2 static u32 lit_3751 = 0x3D75C28F; +SECTION_SDATA2 static f32 lit_3751 = 3.0f / 50.0f; /* 80455D84-80455D88 0004+00 s=4 e=0 z=0 None .sdata2 @3752 */ -SECTION_SDATA2 static u32 lit_3752 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_3752 = 1.0f / 5.0f; /* 80455D88-80455D8C 0004+00 s=1 e=0 z=0 None .sdata2 @3753 */ -SECTION_SDATA2 static u32 lit_3753 = 0x3CD77864; +SECTION_SDATA2 static f32 lit_3753 = 0.026302523910999298f; /* 80455D8C-80455D90 0004+00 s=1 e=0 z=0 None .sdata2 @3754 */ -SECTION_SDATA2 static u32 lit_3754 = 0x3BA3D70A; +SECTION_SDATA2 static f32 lit_3754 = 0.004999999888241291f; /* 80455D90-80455D94 0004+00 s=2 e=0 z=0 None .sdata2 @3755 */ -SECTION_SDATA2 static u32 lit_3755 = 0x3F666666; +SECTION_SDATA2 static f32 lit_3755 = 9.0f / 10.0f; /* 80455D94-80455D98 0004+00 s=1 e=0 z=0 None .sdata2 @3756 */ -SECTION_SDATA2 static u32 lit_3756 = 0x3CBEF4DA; +SECTION_SDATA2 static f32 lit_3756 = 0.023310113698244095f; /* 80455D98-80455D9C 0004+00 s=1 e=0 z=0 None .sdata2 @3757 */ -SECTION_SDATA2 static u32 lit_3757 = 0x3B449BA6; +SECTION_SDATA2 static f32 lit_3757 = 0.003000000026077032f; /* 80455D9C-80455DA0 0004+00 s=1 e=0 z=0 None .sdata2 @3758 */ -SECTION_SDATA2 static u32 lit_3758 = 0x3BD13A95; +SECTION_SDATA2 static f32 lit_3758 = 0.006385157350450754f; /* 80455DA0-80455DA4 0004+00 s=1 e=0 z=0 None .sdata2 @3759 */ -SECTION_SDATA2 static u32 lit_3759 = 0x3B83126F; +SECTION_SDATA2 static f32 lit_3759 = 0.004000000189989805f; /* 80455DA4-80455DA8 0004+00 s=6 e=0 z=0 None .sdata2 @3760 */ -SECTION_SDATA2 static u32 lit_3760 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_3760 = 4.0f / 5.0f; /* 80455DA8-80455DAC 0004+00 s=1 e=0 z=0 None .sdata2 @3761 */ -SECTION_SDATA2 static u32 lit_3761 = 0x3BCACB76; +SECTION_SDATA2 static f32 lit_3761 = 0.006188805215060711f; /* 80455DAC-80455DB0 0004+00 s=1 e=0 z=0 None .sdata2 @3762 */ -SECTION_SDATA2 static u32 lit_3762 = 0x3B9374BC; +SECTION_SDATA2 static f32 lit_3762 = 0.0044999998062849045f; /* 80455DB0-80455DB4 0004+00 s=6 e=0 z=0 None .sdata2 @3763 */ -SECTION_SDATA2 static u32 lit_3763 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_3763 = 3.0f / 10.0f; /* 80455DB4-80455DB8 0004+00 s=1 e=0 z=0 None .sdata2 @3764 */ -SECTION_SDATA2 static u32 lit_3764 = 0x3D5ADC8B; +SECTION_SDATA2 static f32 lit_3764 = 0.05343298241496086f; /* 80455DB8-80455DBC 0004+00 s=1 e=0 z=0 None .sdata2 @3765 */ -SECTION_SDATA2 static u32 lit_3765 = 0x3B03126F; +SECTION_SDATA2 static f32 lit_3765 = 0.0020000000949949026f; /* 80455DBC-80455DC0 0004+00 s=7 e=0 z=0 None .sdata2 @3766 */ -SECTION_SDATA2 static u32 lit_3766 = 0x3F333333; +SECTION_SDATA2 static f32 lit_3766 = 7.0f / 10.0f; /* 80455DC0-80455DC4 0004+00 s=1 e=0 z=0 None .sdata2 @3767 */ -SECTION_SDATA2 static u32 lit_3767 = 0x3D2E59F9; +SECTION_SDATA2 static f32 lit_3767 = 0.04256627336144447f; /* 80455DC4-80455DC8 0004+00 s=1 e=0 z=0 None .sdata2 @3768 */ -SECTION_SDATA2 static u32 lit_3768 = 0x3B23D70A; +SECTION_SDATA2 static f32 lit_3768 = 0.0024999999441206455f; /* 80455DC8-80455DCC 0004+00 s=5 e=0 z=0 None .sdata2 @3769 */ -SECTION_SDATA2 static u32 lit_3769 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_3769 = 2.0f / 5.0f; /* 80455DCC-80455DD0 0004+00 s=1 e=0 z=0 None .sdata2 @3770 */ -SECTION_SDATA2 static u32 lit_3770 = 0x3C53E8F0; +SECTION_SDATA2 static f32 lit_3770 = 0.01293395459651947f; /* 80455DD0-80455DD4 0004+00 s=1 e=0 z=0 None .sdata2 @3771 */ -SECTION_SDATA2 static u32 lit_3771 = 0x3BC49BA6; +SECTION_SDATA2 static f32 lit_3771 = 0.006000000052154064f; /* 80455DD4-80455DD8 0004+00 s=3 e=0 z=0 None .sdata2 @3772 */ -SECTION_SDATA2 static u32 lit_3772 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_3772 = 3.0f / 5.0f; /* 80455DD8-80455DDC 0004+00 s=1 e=0 z=0 None .sdata2 @3773 */ -SECTION_SDATA2 static u32 lit_3773 = 0x3C472FE3; +SECTION_SDATA2 static f32 lit_3773 = 0.012157413177192211f; /* 80455DDC-80455DE0 0004+00 s=1 e=0 z=0 None .sdata2 @3774 */ -SECTION_SDATA2 static u32 lit_3774 = 0x3BD4FDF4; +SECTION_SDATA2 static f32 lit_3774 = 0.006500000134110451f; /* 80455DE0-80455DE4 0004+00 s=1 e=0 z=0 None .sdata2 @3775 */ -SECTION_SDATA2 static u32 lit_3775 = 0x3CAB67EA; +SECTION_SDATA2 static f32 lit_3775 = 0.020923573523759842f; /* 80455DE4-80455DE8 0004+00 s=1 e=0 z=0 None .sdata2 @3776 */ -SECTION_SDATA2 static u32 lit_3776 = 0x3A83126F; +SECTION_SDATA2 static f32 lit_3776 = 0.0010000000474974513f; /* 80455DE8-80455DEC 0004+00 s=1 e=0 z=0 None .sdata2 @3777 */ -SECTION_SDATA2 static u32 lit_3777 = 0x3B787063; +SECTION_SDATA2 static f32 lit_3777 = 0.0037908784579485655f; /* 802C611C-802C6540 0424+00 s=0 e=1 z=0 None .text __ct__10Z2EnvSeMgrFv */ #pragma push @@ -616,7 +601,7 @@ asm Z2EnvSeMgr::~Z2EnvSeMgr() { /* ############################################################################################## */ /* 80455DEC-80455DF0 0004+00 s=1 e=0 z=0 None .sdata2 @3928 */ -SECTION_SDATA2 static u32 lit_3928 = 0x41F00000; +SECTION_SDATA2 static f32 lit_3928 = 30.0f; /* 802C66B0-802C6998 02E8+00 s=0 e=1 z=0 None .text framework__10Z2EnvSeMgrFv */ #pragma push @@ -645,7 +630,7 @@ asm void Z2EnvSeMgr::resetSceneInner() { /* ############################################################################################## */ /* 80455DF0-80455DF4 0004+00 s=2 e=0 z=0 None .sdata2 @3963 */ -SECTION_SDATA2 static u32 lit_3963 = 0x42C80000; +SECTION_SDATA2 static f32 lit_3963 = 100.0f; /* 802C6AC0-802C6C1C 015C+00 s=0 e=1 z=0 None .text initSceneEnvSe__10Z2EnvSeMgrFlScf */ #pragma push @@ -713,31 +698,31 @@ SECTION_DATA static void* lit_4272[12] = { }; /* 80455DF4-80455DF8 0004+00 s=9 e=0 z=0 None .sdata2 @4260 */ -SECTION_SDATA2 static u32 lit_4260 = 0x42FE0000; +SECTION_SDATA2 static f32 lit_4260 = 127.0f; /* 80455DF8-80455DFC 0004+00 s=1 e=0 z=0 None .sdata2 @4261 */ -SECTION_SDATA2 static u32 lit_4261 = 0x40066666; +SECTION_SDATA2 static f32 lit_4261 = 21.0f / 10.0f; /* 80455DFC-80455E00 0004+00 s=1 e=0 z=0 None .sdata2 @4262 */ -SECTION_SDATA2 static u32 lit_4262 = 0x42800000; +SECTION_SDATA2 static f32 lit_4262 = 64.0f; /* 80455E00-80455E04 0004+00 s=1 e=0 z=0 None .sdata2 @4263 */ -SECTION_SDATA2 static u32 lit_4263 = 0x3EB33333; +SECTION_SDATA2 static f32 lit_4263 = 7.0f / 20.0f; /* 80455E04-80455E08 0004+00 s=1 e=0 z=0 None .sdata2 @4264 */ -SECTION_SDATA2 static u32 lit_4264 = 0x3F933333; +SECTION_SDATA2 static f32 lit_4264 = 23.0f / 20.0f; /* 80455E08-80455E0C 0004+00 s=1 e=0 z=0 None .sdata2 @4265 */ -SECTION_SDATA2 static u32 lit_4265 = 0x3FCCCCCD; +SECTION_SDATA2 static f32 lit_4265 = 8.0f / 5.0f; /* 80455E0C-80455E10 0004+00 s=1 e=0 z=0 None .sdata2 @4266 */ -SECTION_SDATA2 static u32 lit_4266 = 0x3F266666; +SECTION_SDATA2 static f32 lit_4266 = 13.0f / 20.0f; /* 80455E10-80455E14 0004+00 s=1 e=0 z=0 None .sdata2 @4267 */ -SECTION_SDATA2 static u32 lit_4267 = 0x3DF5C28F; +SECTION_SDATA2 static f32 lit_4267 = 3.0f / 25.0f; /* 80455E14-80455E18 0004+00 s=1 e=0 z=0 None .sdata2 @4268 */ -SECTION_SDATA2 static u32 lit_4268 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_4268 = 17.0f / 20.0f; /* 80455E18-80455E20 0004+04 s=3 e=0 z=0 None .sdata2 @4269 */ SECTION_SDATA2 static f32 lit_4269[1 + 1 /* padding */] = { @@ -747,9 +732,7 @@ SECTION_SDATA2 static f32 lit_4269[1 + 1 /* padding */] = { }; /* 80455E20-80455E28 0008+00 s=9 e=0 z=0 None .sdata2 @4271 */ -SECTION_SDATA2 static u8 lit_4271[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4271 = 4503601774854144.0 /* cast s32 to float */; /* 802C70C8-802C780C 0744+00 s=2 e=1 z=0 None .text startStaticEnvSe__10Z2EnvSeMgrFSc */ #pragma push @@ -773,7 +756,7 @@ asm void Z2EnvSeMgr::registWindowPos(Vec* param_0) { /* ############################################################################################## */ /* 80455E28-80455E2C 0004+00 s=3 e=0 z=0 None .sdata2 @4400 */ -SECTION_SDATA2 static u32 lit_4400 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_4400 = 11.0f / 10.0f; /* 802C7830-802C7CF4 04C4+00 s=1 e=1 z=0 None .text startRainSe__10Z2EnvSeMgrFlSc */ #pragma push @@ -787,7 +770,7 @@ asm void Z2EnvSeMgr::startRainSe(s32 param_0, s8 param_1) { /* ############################################################################################## */ /* 80455E2C-80455E30 0004+00 s=1 e=0 z=0 None .sdata2 @4422 */ -SECTION_SDATA2 static u32 lit_4422 = 0x3E800000; +SECTION_SDATA2 static f32 lit_4422 = 0.25f; /* 802C7CF4-802C7E68 0174+00 s=0 e=1 z=0 None .text startNearThunderSe__10Z2EnvSeMgrFSc */ #pragma push @@ -851,10 +834,10 @@ asm void Z2EnvSeMgr::startStrongWindSe(s8 param_0) { /* ############################################################################################## */ /* 80455E30-80455E34 0004+00 s=3 e=0 z=0 None .sdata2 @4510 */ -SECTION_SDATA2 static u32 lit_4510 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_4510 = 1.5f; /* 80455E34-80455E38 0004+00 s=3 e=0 z=0 None .sdata2 @4511 */ -SECTION_SDATA2 static u32 lit_4511 = 0x40400000; +SECTION_SDATA2 static f32 lit_4511 = 3.0f; /* 802C80F8-802C8234 013C+00 s=0 e=1 z=0 None .text initRiverSe__10Z2EnvSeMgrFUcUcUcUc */ #pragma push @@ -934,10 +917,10 @@ SECTION_DATA static void* lit_4622[42] = { }; /* 80455E38-80455E3C 0004+00 s=2 e=0 z=0 None .sdata2 @4619 */ -SECTION_SDATA2 static u32 lit_4619 = 0xC6629000; +SECTION_SDATA2 static f32 lit_4619 = -14500.0f; /* 80455E3C-80455E40 0004+00 s=1 e=0 z=0 None .sdata2 @4621 */ -SECTION_SDATA2 static u32 lit_4621 = 0x43160000; +SECTION_SDATA2 static f32 lit_4621 = 150.0f; /* 802C8300-802C8730 0430+00 s=2 e=1 z=0 None .text startRiverSe__10Z2EnvSeMgrFSc */ #pragma push @@ -1001,7 +984,7 @@ SECTION_DATA static void* lit_4734[16] = { }; /* 80455E40-80455E44 0004+00 s=1 e=0 z=0 None .sdata2 @4732 */ -SECTION_SDATA2 static u32 lit_4732 = 0x40800000; +SECTION_SDATA2 static f32 lit_4732 = 4.0f; /* 802C8A90-802C8C24 0194+00 s=2 e=1 z=0 None .text initEtcSe__10Z2EnvSeMgrFUcUcUcUc */ #pragma push @@ -1061,19 +1044,19 @@ SECTION_DATA static void* lit_4839[32] = { }; /* 80455E44-80455E48 0004+00 s=1 e=0 z=0 None .sdata2 @4833 */ -SECTION_SDATA2 static u32 lit_4833 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_4833 = 6.0f / 5.0f; /* 80455E48-80455E4C 0004+00 s=1 e=0 z=0 None .sdata2 @4834 */ -SECTION_SDATA2 static u32 lit_4834 = 0x3FA66666; +SECTION_SDATA2 static f32 lit_4834 = 13.0f / 10.0f; /* 80455E4C-80455E50 0004+00 s=1 e=0 z=0 None .sdata2 @4835 */ -SECTION_SDATA2 static u32 lit_4835 = 0x3F63D70A; +SECTION_SDATA2 static f32 lit_4835 = 89.0f / 100.0f; /* 80455E50-80455E54 0004+00 s=2 e=0 z=0 None .sdata2 @4836 */ -SECTION_SDATA2 static u32 lit_4836 = 0x3EA9FBE7; +SECTION_SDATA2 static f32 lit_4836 = 0.3319999873638153f; /* 80455E54-80455E58 0004+00 s=2 e=0 z=0 None .sdata2 @4837 */ -SECTION_SDATA2 static u32 lit_4837 = 0x3F2B020C; +SECTION_SDATA2 static f32 lit_4837 = 0.6679999828338623f; /* 802C8C48-802C92C8 0680+00 s=2 e=1 z=0 None .text startEtcSe__10Z2EnvSeMgrFSc */ #pragma push @@ -1098,7 +1081,7 @@ asm void Z2EnvSeMgr::registWolfSmellSePos(Vec* param_0) { /* ############################################################################################## */ /* 80455E58-80455E5C 0004+00 s=1 e=0 z=0 None .sdata2 @4856 */ -SECTION_SDATA2 static u32 lit_4856 = 0x43AA0000; +SECTION_SDATA2 static f32 lit_4856 = 340.0f; /* 802C92EC-802C93A0 00B4+00 s=0 e=0 z=1 None .text startFogWipeTrigger__10Z2EnvSeMgrFP3Vec */ #pragma push @@ -1132,7 +1115,7 @@ asm void Z2EnvSeMgr::getFogDensity() { /* ############################################################################################## */ /* 80455E5C-80455E60 0004+00 s=1 e=0 z=0 None .sdata2 @4879 */ -SECTION_SDATA2 static u32 lit_4879 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4879 = 20.0f; /* 802C9400-802C950C 010C+00 s=0 e=0 z=1 None .text startFogSe__10Z2EnvSeMgrFv */ #pragma push diff --git a/libs/Z2AudioLib/Z2FxLineMgr.cpp b/libs/Z2AudioLib/Z2FxLineMgr.cpp index 5780d51fa6c..f18e72fdeba 100644 --- a/libs/Z2AudioLib/Z2FxLineMgr.cpp +++ b/libs/Z2AudioLib/Z2FxLineMgr.cpp @@ -11,17 +11,17 @@ // Types: // +struct JKRArchive { + /* 802D5D38 */ void getResource(u16); + /* 802D610C */ void countResource() const; +}; + struct JKRHeap { /* 802CE500 */ void free(void*, JKRHeap*); }; struct Z2FxLineConfig {}; -struct JKRArchive { - /* 802D5D38 */ void getResource(u16); - /* 802D610C */ void countResource() const; -}; - struct Z2FxLineMgr { /* 802BA7DC */ Z2FxLineMgr(); /* 802BA7FC */ void initDataArc(JKRArchive*, JKRHeap*); @@ -64,12 +64,6 @@ extern "C" void setSceneFx__11Z2FxLineMgrFl(); // void* operator new[](u32, JKRHeap*, int); -extern "C" extern void* __vt__10JSUIosBase[3]; -extern "C" extern void* __vt__20JSURandomInputStream[9]; -extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */]; -extern "C" extern void* __vt__20JSUMemoryInputStream[9 + 1 /* padding */]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B80[4]; extern "C" void setFXLine__6JASDspFUcPsPQ26JASDsp13FxlineConfig_(); extern "C" void free__7JKRHeapFPvP7JKRHeap(); diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index 86eea11b0d3..d66f7fbd49b 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -17,6 +17,8 @@ struct dSv_event_c { struct JAISoundID {}; +struct JAISoundHandle {}; + struct JGeometry { template struct TVec3 {}; @@ -24,8 +26,6 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JAISoundHandle {}; - struct Z2SoundStarter { /* 802AAB94 */ Z2SoundStarter(bool); /* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, @@ -182,9 +182,6 @@ struct JAISound { // Forward References: // -extern "C" extern void* __vt__15Z2SoundObjCoach[8]; -extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; - extern "C" void setLinkGroupInfo__14Z2CreatureLinkFUc(); extern "C" void setLinkHp__14Z2CreatureLinkFll(); extern "C" void setLinkSwordType__14Z2CreatureLinkFll(); @@ -236,19 +233,6 @@ extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; // void operator delete(void*); -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; extern "C" void isEventBit__11dSv_event_cCFUs(); extern "C" void stop__8JAISoundFUl(); @@ -521,33 +505,23 @@ asm void Z2CreatureLink::setKanteraState(u8 param_0) { /* ############################################################################################## */ /* 80455C98-80455C9C 0004+00 s=9 e=0 z=0 None .sdata2 @3721 */ -SECTION_SDATA2 static u32 lit_3721 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3721 = 1.0f; /* 80455C9C-80455CA0 0004+00 s=2 e=0 z=0 None .sdata2 @3722 */ -SECTION_SDATA2 static u32 lit_3722 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3722 = -1.0f; /* 80455CA0-80455CA8 0004+04 s=11 e=0 z=0 None .sdata2 @3723 */ -SECTION_SDATA2 static u8 lit_3723[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3723[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80455CA8-80455CB0 0008+00 s=1 e=0 z=0 None .sdata2 @3724 */ -SECTION_SDATA2 static u8 lit_3724[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3724 = 0.5; /* 80455CB0-80455CB8 0008+00 s=1 e=0 z=0 None .sdata2 @3725 */ -SECTION_SDATA2 static u8 lit_3725[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3725 = 3.0; /* 80455CB8-80455CC0 0008+00 s=1 e=0 z=0 None .sdata2 @3726 */ SECTION_SDATA2 static u8 lit_3726[8] = { @@ -576,7 +550,7 @@ asm void Z2CreatureLink::setSinkDepth(s8 param_0) { /* ############################################################################################## */ /* 80455CC0-80455CC4 0004+00 s=1 e=0 z=0 None .sdata2 @3743 */ -SECTION_SDATA2 static u32 lit_3743 = 0x3EB33333; +SECTION_SDATA2 static f32 lit_3743 = 7.0f / 20.0f; /* 802C3A6C-802C3AEC 0080+00 s=0 e=4 z=0 None .text setRiding__14Z2CreatureLinkFb */ #pragma push @@ -610,19 +584,19 @@ asm void Z2CreatureLink::setWolfEyeOpen(bool param_0) { /* ############################################################################################## */ /* 80455CC4-80455CC8 0004+00 s=1 e=0 z=0 None .sdata2 @3834 */ -SECTION_SDATA2 static u32 lit_3834 = 0x42000000; +SECTION_SDATA2 static f32 lit_3834 = 32.0f; /* 80455CC8-80455CCC 0004+00 s=4 e=0 z=0 None .sdata2 @3835 */ -SECTION_SDATA2 static u32 lit_3835 = 0x42FE0000; +SECTION_SDATA2 static f32 lit_3835 = 127.0f; /* 80455CCC-80455CD0 0004+00 s=2 e=0 z=0 None .sdata2 @3836 */ -SECTION_SDATA2 static u32 lit_3836 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_3836 = 2.0f / 5.0f; /* 80455CD0-80455CD4 0004+00 s=4 e=0 z=0 None .sdata2 @3837 */ -SECTION_SDATA2 static u32 lit_3837 = 0x3F333333; +SECTION_SDATA2 static f32 lit_3837 = 7.0f / 10.0f; /* 80455CD4-80455CD8 0004+00 s=3 e=0 z=0 None .sdata2 @3838 */ -SECTION_SDATA2 static u32 lit_3838 = 0x41B80000; +SECTION_SDATA2 static f32 lit_3838 = 23.0f; /* 80455CD8-80455CE0 0004+04 s=4 e=0 z=0 None .sdata2 @3839 */ SECTION_SDATA2 static f32 lit_3839[1 + 1 /* padding */] = { @@ -632,9 +606,7 @@ SECTION_SDATA2 static f32 lit_3839[1 + 1 /* padding */] = { }; /* 80455CE0-80455CE8 0008+00 s=3 e=0 z=0 None .sdata2 @3842 */ -SECTION_SDATA2 static u8 lit_3842[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3842 = 4503601774854144.0 /* cast s32 to float */; /* 802C3BD4-802C3E68 0294+00 s=3 e=3 z=0 None .text * startLinkSound__14Z2CreatureLinkF10JAISoundIDUlSc */ @@ -649,39 +621,37 @@ asm void Z2CreatureLink::startLinkSound(JAISoundID param_0, u32 param_1, s8 para /* ############################################################################################## */ /* 80455CE8-80455CEC 0004+00 s=1 e=0 z=0 None .sdata2 @3941 */ -SECTION_SDATA2 static u32 lit_3941 = 0x41F00000; +SECTION_SDATA2 static f32 lit_3941 = 30.0f; /* 80455CEC-80455CF0 0004+00 s=3 e=0 z=0 None .sdata2 @3942 */ -SECTION_SDATA2 static u32 lit_3942 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_3942 = 3.0f / 10.0f; /* 80455CF0-80455CF4 0004+00 s=4 e=0 z=0 None .sdata2 @3943 */ -SECTION_SDATA2 static u32 lit_3943 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_3943 = 4.0f / 5.0f; /* 80455CF4-80455CF8 0004+00 s=1 e=0 z=0 None .sdata2 @3944 */ -SECTION_SDATA2 static u32 lit_3944 = 0x43340000; +SECTION_SDATA2 static f32 lit_3944 = 180.0f; /* 80455CF8-80455CFC 0004+00 s=1 e=0 z=0 None .sdata2 @3945 */ -SECTION_SDATA2 static u32 lit_3945 = 0x42F00000; +SECTION_SDATA2 static f32 lit_3945 = 120.0f; /* 80455CFC-80455D00 0004+00 s=4 e=0 z=0 None .sdata2 @3946 */ -SECTION_SDATA2 static u32 lit_3946 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_3946 = 3.0f / 5.0f; /* 80455D00-80455D04 0004+00 s=1 e=0 z=0 None .sdata2 @3947 */ -SECTION_SDATA2 static u32 lit_3947 = 0x42A00000; +SECTION_SDATA2 static f32 lit_3947 = 80.0f; /* 80455D04-80455D08 0004+00 s=1 e=0 z=0 None .sdata2 @3948 */ -SECTION_SDATA2 static u32 lit_3948 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_3948 = 6.0f / 5.0f; /* 80455D08-80455D0C 0004+00 s=2 e=0 z=0 None .sdata2 @3949 */ -SECTION_SDATA2 static u32 lit_3949 = 0x3E800000; +SECTION_SDATA2 static f32 lit_3949 = 0.25f; /* 80455D0C-80455D10 0004+00 s=1 e=0 z=0 None .sdata2 @3950 */ -SECTION_SDATA2 static u32 lit_3950 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_3950 = 11.0f / 10.0f; /* 80455D10-80455D18 0008+00 s=2 e=0 z=0 None .sdata2 @3954 */ -SECTION_SDATA2 static u8 lit_3954[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3954 = 4503599627370496.0 /* cast u32 to float */; /* 802C3E68-802C4320 04B8+00 s=1 e=3 z=0 None .text * startLinkSoundLevel__14Z2CreatureLinkF10JAISoundIDUlSc */ @@ -739,7 +709,7 @@ asm void Z2CreatureLink::startCollisionSE(u32 param_0, u32 param_1) { /* ############################################################################################## */ /* 80455D18-80455D1C 0004+00 s=1 e=0 z=0 None .sdata2 @4178 */ -SECTION_SDATA2 static u32 lit_4178 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4178 = 100.0f; /* 802C4814-802C48D8 00C4+00 s=0 e=4 z=2 None .text * startHitItemSE__14Z2CreatureLinkFUlUlP14Z2SoundObjBasef */ @@ -775,7 +745,7 @@ asm Z2LinkSoundStarter::Z2LinkSoundStarter() { /* ############################################################################################## */ /* 80455D1C-80455D20 0004+00 s=2 e=0 z=0 None .sdata2 @4399 */ -SECTION_SDATA2 static u32 lit_4399 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4399 = 9.0f / 10.0f; /* 802C4928-802C4FFC 06D4+00 s=2 e=0 z=0 None .text * startSound__18Z2LinkSoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl */ @@ -898,19 +868,19 @@ asm void Z2SoundObjCoach::init(Vec* param_0, u8 param_1) { /* ############################################################################################## */ /* 80455D20-80455D24 0004+00 s=1 e=0 z=0 None .sdata2 @4621 */ -SECTION_SDATA2 static u32 lit_4621 = 0x40000000; +SECTION_SDATA2 static f32 lit_4621 = 2.0f; /* 80455D24-80455D28 0004+00 s=1 e=0 z=0 None .sdata2 @4622 */ -SECTION_SDATA2 static u32 lit_4622 = 0x420C0000; +SECTION_SDATA2 static f32 lit_4622 = 35.0f; /* 80455D28-80455D2C 0004+00 s=1 e=0 z=0 None .sdata2 @4623 */ -SECTION_SDATA2 static u32 lit_4623 = 0x3F6147AE; +SECTION_SDATA2 static f32 lit_4623 = 22.0f / 25.0f; /* 80455D2C-80455D30 0004+00 s=3 e=0 z=0 None .sdata2 @4624 */ -SECTION_SDATA2 static u32 lit_4624 = 0x3FA00000; +SECTION_SDATA2 static f32 lit_4624 = 1.25f; /* 80455D30-80455D34 0004+00 s=2 e=0 z=0 None .sdata2 @4625 */ -SECTION_SDATA2 static u32 lit_4625 = 0x42480000; +SECTION_SDATA2 static f32 lit_4625 = 50.0f; /* 802C551C-802C56C0 01A4+00 s=0 e=0 z=1 None .text startWheelSound__15Z2SoundObjCoachFf */ #pragma push @@ -924,13 +894,13 @@ asm void Z2SoundObjCoach::startWheelSound(f32 param_0) { /* ############################################################################################## */ /* 80455D34-80455D38 0004+00 s=1 e=0 z=0 None .sdata2 @4645 */ -SECTION_SDATA2 static u32 lit_4645 = 0x44BB8000; +SECTION_SDATA2 static f32 lit_4645 = 1500.0f; /* 80455D38-80455D3C 0004+00 s=2 e=0 z=0 None .sdata2 @4646 */ -SECTION_SDATA2 static u32 lit_4646 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_4646 = 1.0f / 5.0f; /* 80455D3C-80455D40 0004+00 s=2 e=0 z=0 None .sdata2 @4647 */ -SECTION_SDATA2 static u32 lit_4647 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_4647 = 17.0f / 20.0f; /* 802C56C0-802C57C0 0100+00 s=0 e=0 z=1 None .text startFireSound__15Z2SoundObjCoachFUs */ #pragma push diff --git a/libs/Z2AudioLib/Z2Param.cpp b/libs/Z2AudioLib/Z2Param.cpp index 585ddb52b9b..b4740aca4af 100644 --- a/libs/Z2AudioLib/Z2Param.cpp +++ b/libs/Z2AudioLib/Z2Param.cpp @@ -11,83 +11,40 @@ // Forward References: // -extern "C" extern u32 DISTANCE_MAX__7Z2Param; -extern "C" extern u32 MAX_VOLUME_DISTANCE__7Z2Param; -extern "C" extern u32 DOLBY_CENTER_VALUE__7Z2Param; -extern "C" extern u32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param; -extern "C" extern u32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param; -extern "C" extern u32 DISTANCE_FX_PARAM__7Z2Param; -extern "C" extern u32 SONIC_SPEED__7Z2Param; -extern "C" extern u32 VOL_BGM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_BGM_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param; -extern "C" extern u32 VOL_BGM_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param; -extern "C" extern u8 struct_80450860[4]; -extern "C" extern u8 struct_80450864[4]; -extern "C" extern u8 struct_80450868[4]; -extern "C" extern u32 data_8045086C; -extern "C" extern f32 MIN_DISTANCE_VOLUME__7Z2Param; -extern "C" extern f32 ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param; -extern "C" extern u8 struct_80451340[8]; -extern "C" extern u8 data_80451348[8]; - -extern "C" extern u32 DISTANCE_MAX__7Z2Param; -extern "C" extern u32 MAX_VOLUME_DISTANCE__7Z2Param; -extern "C" extern u32 DOLBY_CENTER_VALUE__7Z2Param; -extern "C" extern u32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param; -extern "C" extern u32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param; -extern "C" extern u32 DISTANCE_FX_PARAM__7Z2Param; -extern "C" extern u32 SONIC_SPEED__7Z2Param; -extern "C" extern u32 VOL_BGM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_BGM_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param; -extern "C" extern u32 VOL_BGM_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param; +extern "C" extern f32 DISTANCE_MAX__7Z2Param; +extern "C" extern f32 MAX_VOLUME_DISTANCE__7Z2Param; +extern "C" extern f32 DOLBY_CENTER_VALUE__7Z2Param; +extern "C" extern f32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param; +extern "C" extern f32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param; +extern "C" extern f32 DISTANCE_FX_PARAM__7Z2Param; +extern "C" extern f32 SONIC_SPEED__7Z2Param; +extern "C" extern f32 VOL_BGM_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_OBJECT_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_BGM_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_SYSTEM_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_VOICE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_MOTION_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_OBJECT_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param; +extern "C" extern f32 VOL_BGM_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_SYSTEM_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_OBJECT_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param; extern "C" extern u8 struct_80450860[4]; extern "C" extern u8 struct_80450864[4]; extern "C" extern u8 struct_80450868[4]; @@ -107,106 +64,106 @@ extern "C" extern u8 data_80451348[8]; /* ############################################################################################## */ /* 804507D8-804507DC 0004+00 s=0 e=4 z=0 None .sdata DISTANCE_MAX__7Z2Param */ -SECTION_SDATA u32 DISTANCE_MAX__7Z2Param = 0x44FA0000; +SECTION_SDATA f32 DISTANCE_MAX__7Z2Param = 2000.0f; /* 804507DC-804507E0 0004+00 s=0 e=3 z=0 None .sdata MAX_VOLUME_DISTANCE__7Z2Param */ -SECTION_SDATA u32 MAX_VOLUME_DISTANCE__7Z2Param = 0x43960000; +SECTION_SDATA f32 MAX_VOLUME_DISTANCE__7Z2Param = 300.0f; /* 804507E0-804507E4 0004+00 s=0 e=1 z=0 None .sdata DOLBY_CENTER_VALUE__7Z2Param */ -SECTION_SDATA u32 DOLBY_CENTER_VALUE__7Z2Param = 0x3E99999A; +SECTION_SDATA f32 DOLBY_CENTER_VALUE__7Z2Param = 3.0f / 10.0f; /* 804507E4-804507E8 0004+00 s=0 e=3 z=0 None .sdata DOLBY_FLONT_DISTANCE_MAX__7Z2Param */ -SECTION_SDATA u32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param = 0xC3960000; +SECTION_SDATA f32 DOLBY_FLONT_DISTANCE_MAX__7Z2Param = -300.0f; /* 804507E8-804507EC 0004+00 s=0 e=3 z=0 None .sdata DOLBY_BEHIND_DISTANCE_MAX__7Z2Param */ -SECTION_SDATA u32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param = 0x44160000; +SECTION_SDATA f32 DOLBY_BEHIND_DISTANCE_MAX__7Z2Param = 600.0f; /* 804507EC-804507F0 0004+00 s=0 e=1 z=0 None .sdata DISTANCE_FX_PARAM__7Z2Param */ -SECTION_SDATA u32 DISTANCE_FX_PARAM__7Z2Param = 0x3DA14285; +SECTION_SDATA f32 DISTANCE_FX_PARAM__7Z2Param = 10.0f / 127.0f; /* 804507F0-804507F4 0004+00 s=0 e=1 z=0 None .sdata SONIC_SPEED__7Z2Param */ -SECTION_SDATA u32 SONIC_SPEED__7Z2Param = 0x43B40000; +SECTION_SDATA f32 SONIC_SPEED__7Z2Param = 360.0f; /* 804507F4-804507F8 0004+00 s=0 e=3 z=0 None .sdata VOL_BGM_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_BGM_DEFAULT__7Z2Param = 0x3F800000; +SECTION_SDATA f32 VOL_BGM_DEFAULT__7Z2Param = 1.0f; /* 804507F8-804507FC 0004+00 s=0 e=2 z=0 None .sdata VOL_SE_SYSTEM_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_SE_SYSTEM_DEFAULT__7Z2Param = 0x3F71E3C8; +SECTION_SDATA f32 VOL_SE_SYSTEM_DEFAULT__7Z2Param = 120.0f / 127.0f; /* 804507FC-80450800 0004+00 s=0 e=3 z=0 None .sdata VOL_SE_LINK_VOICE_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param = 0x3F800000; +SECTION_SDATA f32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param = 1.0f; /* 80450800-80450804 0004+00 s=0 e=3 z=0 None .sdata VOL_SE_LINK_MOTION_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param = 0x3F71E3C8; +SECTION_SDATA f32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param = 120.0f / 127.0f; /* 80450804-80450808 0004+00 s=0 e=3 z=0 None .sdata VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param = 0x3F71E3C8; +SECTION_SDATA f32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param = 120.0f / 127.0f; /* 80450808-8045080C 0004+00 s=0 e=3 z=0 None .sdata VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param = 0x3F71E3C8; +SECTION_SDATA f32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param = 120.0f / 127.0f; /* 8045080C-80450810 0004+00 s=0 e=3 z=0 None .sdata VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param = 0x3F71E3C8; +SECTION_SDATA f32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param = 120.0f / 127.0f; /* 80450810-80450814 0004+00 s=0 e=3 z=0 None .sdata VOL_SE_OBJECT_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_SE_OBJECT_DEFAULT__7Z2Param = 0x3F71E3C8; +SECTION_SDATA f32 VOL_SE_OBJECT_DEFAULT__7Z2Param = 120.0f / 127.0f; /* 80450814-80450818 0004+00 s=0 e=3 z=0 None .sdata VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param */ -SECTION_SDATA u32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param = 0x3F71E3C8; +SECTION_SDATA f32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param = 120.0f / 127.0f; /* 80450818-8045081C 0004+00 s=0 e=1 z=0 None .sdata VOL_BGM_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_BGM_TALKING__7Z2Param = 0x3F000000; +SECTION_SDATA f32 VOL_BGM_TALKING__7Z2Param = 0.5f; /* 8045081C-80450820 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_SYSTEM_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_SYSTEM_TALKING__7Z2Param = 0x3F61C387; +SECTION_SDATA f32 VOL_SE_SYSTEM_TALKING__7Z2Param = 112.0f / 127.0f; /* 80450820-80450824 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_LINK_VOICE_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_VOICE_TALKING__7Z2Param = 0x3F51A347; +SECTION_SDATA f32 VOL_SE_LINK_VOICE_TALKING__7Z2Param = 104.0f / 127.0f; /* 80450824-80450828 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_LINK_MOTION_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_MOTION_TALKING__7Z2Param = 0x3F418306; +SECTION_SDATA f32 VOL_SE_LINK_MOTION_TALKING__7Z2Param = 96.0f / 127.0f; /* 80450828-8045082C 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param = 0x3F418306; +SECTION_SDATA f32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param = 96.0f / 127.0f; /* 8045082C-80450830 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_CHAR_VOICE_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param = 0x3F71E3C8; +SECTION_SDATA f32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param = 120.0f / 127.0f; /* 80450830-80450834 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_CHAR_MOVE_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param = 0x3F6FDFBF; +SECTION_SDATA f32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param = 119.0f / 127.0f; /* 80450834-80450838 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_OBJECT_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_OBJECT_TALKING__7Z2Param = 0x3F418306; +SECTION_SDATA f32 VOL_SE_OBJECT_TALKING__7Z2Param = 96.0f / 127.0f; /* 80450838-8045083C 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_ATMOSPHERE_TALKING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param = 0x3F418306; +SECTION_SDATA f32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param = 96.0f / 127.0f; /* 8045083C-80450840 0004+00 s=0 e=1 z=0 None .sdata VOL_BGM_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_BGM_PAUSING__7Z2Param = 0x3E99999A; +SECTION_SDATA f32 VOL_BGM_PAUSING__7Z2Param = 3.0f / 10.0f; /* 80450840-80450844 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_SYSTEM_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_SYSTEM_PAUSING__7Z2Param = 0x3F61C387; +SECTION_SDATA f32 VOL_SE_SYSTEM_PAUSING__7Z2Param = 112.0f / 127.0f; /* 80450844-80450848 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_LINK_VOICE_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param = 0x3F214285; +SECTION_SDATA f32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param = 80.0f / 127.0f; /* 80450848-8045084C 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_LINK_MOTION_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param = 0x3F112245; +SECTION_SDATA f32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param = 72.0f / 127.0f; /* 8045084C-80450850 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param = 0x3F112245; +SECTION_SDATA f32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param = 72.0f / 127.0f; /* 80450850-80450854 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_CHAR_VOICE_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param = 0x3F112245; +SECTION_SDATA f32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param = 72.0f / 127.0f; /* 80450854-80450858 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_CHAR_MOVE_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param = 0x3F112245; +SECTION_SDATA f32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param = 72.0f / 127.0f; /* 80450858-8045085C 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_OBJECT_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_OBJECT_PAUSING__7Z2Param = 0x3F112245; +SECTION_SDATA f32 VOL_SE_OBJECT_PAUSING__7Z2Param = 72.0f / 127.0f; /* 8045085C-80450860 0004+00 s=0 e=1 z=0 None .sdata VOL_SE_ATMOSPHERE_PAUSING__7Z2Param */ -SECTION_SDATA u32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param = 0x3F112245; +SECTION_SDATA f32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param = 72.0f / 127.0f; /* 80450860-80450864 0004+00 s=0 e=15 z=0 None .sdata None */ SECTION_SDATA u8 struct_80450860[4] = { diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp index 9ca960d34c1..09b80d895a5 100644 --- a/libs/Z2AudioLib/Z2SceneMgr.cpp +++ b/libs/Z2AudioLib/Z2SceneMgr.cpp @@ -142,7 +142,6 @@ struct JAISound { static void dComIfGs_getStartPoint(); static void dComIfGs_isSaveSwitch(int); -extern "C" extern char const* const Z2SceneMgr__stringBase0; extern "C" void __ct__10Z2SceneMgrFv(); extern "C" void setInDarkness__10Z2SceneMgrFb(); @@ -187,19 +186,6 @@ extern "C" extern char const* const Z2SceneMgr__stringBase0; void dComIfGs_isStageSwitch(int, int); void dComIfGs_isEventBit(u16); -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450860[4]; -extern "C" extern u8 data_80450B3C[4]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B58[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; extern "C" void dComIfGs_isStageSwitch__Fii(); extern "C" void isSwitch__12dSv_memBit_cCFi(); @@ -289,7 +275,7 @@ SECTION_SDATA2 static u8 lit_3511[4] = { }; /* 80455A3C-80455A40 0004+00 s=6 e=0 z=0 None .sdata2 @3512 */ -SECTION_SDATA2 static u32 lit_3512 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3512 = 1.0f; /* 802B68E0-802B697C 009C+00 s=3 e=2 z=2 None .text setSceneExist__10Z2SceneMgrFb */ #pragma push @@ -310,9 +296,7 @@ SECTION_SDATA2 static f32 lit_3529[1 + 1 /* padding */] = { }; /* 80455A48-80455A50 0008+00 s=5 e=0 z=0 None .sdata2 @3531 */ -SECTION_SDATA2 static u8 lit_3531[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3531 = 4503599627370496.0 /* cast u32 to float */; /* 802B697C-802B6A18 009C+00 s=0 e=1 z=0 None .text setFadeOutStart__10Z2SceneMgrFUc */ #pragma push @@ -717,22 +701,22 @@ SECTION_DATA static void* lit_5347[81] = { }; /* 80455A50-80455A54 0004+00 s=1 e=0 z=0 None .sdata2 @5341 */ -SECTION_SDATA2 static u32 lit_5341 = 0xBF800000; +SECTION_SDATA2 static f32 lit_5341 = -1.0f; /* 80455A54-80455A58 0004+00 s=2 e=0 z=0 None .sdata2 @5342 */ -SECTION_SDATA2 static u32 lit_5342 = 0x3F000000; +SECTION_SDATA2 static f32 lit_5342 = 0.5f; /* 80455A58-80455A5C 0004+00 s=1 e=0 z=0 None .sdata2 @5343 */ -SECTION_SDATA2 static u32 lit_5343 = 0x3F333333; +SECTION_SDATA2 static f32 lit_5343 = 7.0f / 10.0f; /* 80455A5C-80455A60 0004+00 s=1 e=0 z=0 None .sdata2 @5344 */ -SECTION_SDATA2 static u32 lit_5344 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_5344 = 4.0f / 5.0f; /* 80455A60-80455A64 0004+00 s=1 e=0 z=0 None .sdata2 @5345 */ -SECTION_SDATA2 static u32 lit_5345 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_5345 = 1.0f / 10.0f; /* 80455A64-80455A68 0004+00 s=1 e=0 z=0 None .sdata2 @5346 */ -SECTION_SDATA2 static u32 lit_5346 = 0x3DA3D70A; +SECTION_SDATA2 static f32 lit_5346 = 2.0f / 25.0f; /* 802B6AF8-802B995C 2E64+00 s=8 e=1 z=0 None .text setSceneName__10Z2SceneMgrFPcll */ #pragma push diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp index 4fecc3f2772..c6adc619491 100644 --- a/libs/Z2AudioLib/Z2SeMgr.cpp +++ b/libs/Z2AudioLib/Z2SeMgr.cpp @@ -154,40 +154,6 @@ extern "C" void getDolbyPower__12Z2MultiSeMgrFv(); // void operator delete(void*); -extern "C" extern u32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; extern "C" void __dt__14JAISoundHandleFv(); extern "C" void __dt__12Z2MultiSeObjFv(); @@ -227,30 +193,30 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_29(); -extern "C" extern u32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param; -extern "C" extern u32 VOL_SE_SYSTEM_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_OBJECT_PAUSING__7Z2Param; -extern "C" extern u32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_SYSTEM_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_VOICE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_MOTION_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_FOOTNOTE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_VOICE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_MOVE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_OBJECT_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_ATMOSPHERE_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_SE_SYSTEM_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_VOICE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_MOTION_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_FOOTNOTE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_VOICE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_MOVE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_OBJECT_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_ATMOSPHERE_TALKING__7Z2Param; +extern "C" extern f32 VOL_SE_SYSTEM_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_VOICE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_MOTION_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_LINK_FOOTNOTE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_VOICE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_CHAR_MOVE_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_OBJECT_PAUSING__7Z2Param; +extern "C" extern f32 VOL_SE_ATMOSPHERE_PAUSING__7Z2Param; extern "C" extern u32 __float_nan; extern "C" extern u8 data_80450B44[4]; extern "C" extern u8 data_80450B60[4]; @@ -338,10 +304,10 @@ asm void Z2SeMgr::decrCrowdSize() { /* ############################################################################################## */ /* 80455870-80455874 0004+00 s=1 e=0 z=0 None .sdata2 @4038 */ -SECTION_SDATA2 static u32 lit_4038 = 0x461C4000; +SECTION_SDATA2 static f32 lit_4038 = 10000.0f; /* 80455874-80455878 0004+00 s=2 e=0 z=0 None .sdata2 @4039 */ -SECTION_SDATA2 static u32 lit_4039 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4039 = 100.0f; /* 80455878-8045587C 0004+00 s=11 e=0 z=0 None .sdata2 @4040 */ SECTION_SDATA2 static u8 lit_4040[4] = { @@ -352,83 +318,79 @@ SECTION_SDATA2 static u8 lit_4040[4] = { }; /* 8045587C-80455880 0004+00 s=2 e=0 z=0 None .sdata2 @4041 */ -SECTION_SDATA2 static u32 lit_4041 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_4041 = 1.0f / 5.0f; /* 80455880-80455884 0004+00 s=8 e=0 z=0 None .sdata2 @4042 */ -SECTION_SDATA2 static u32 lit_4042 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4042 = 1.0f; /* 80455884-80455888 0004+00 s=3 e=0 z=0 None .sdata2 @4043 */ -SECTION_SDATA2 static u32 lit_4043 = 0x3F333333; +SECTION_SDATA2 static f32 lit_4043 = 7.0f / 10.0f; /* 80455888-8045588C 0004+00 s=1 e=0 z=0 None .sdata2 @4044 */ -SECTION_SDATA2 static u32 lit_4044 = 0x3FA00000; +SECTION_SDATA2 static f32 lit_4044 = 1.25f; /* 8045588C-80455890 0004+00 s=2 e=0 z=0 None .sdata2 @4045 */ -SECTION_SDATA2 static u32 lit_4045 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_4045 = 2.0f / 5.0f; /* 80455890-80455894 0004+00 s=1 e=0 z=0 None .sdata2 @4046 */ -SECTION_SDATA2 static u32 lit_4046 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_4046 = 1.5f; /* 80455894-80455898 0004+00 s=1 e=0 z=0 None .sdata2 @4047 */ -SECTION_SDATA2 static u32 lit_4047 = 0x420C0000; +SECTION_SDATA2 static f32 lit_4047 = 35.0f; /* 80455898-8045589C 0004+00 s=1 e=0 z=0 None .sdata2 @4048 */ -SECTION_SDATA2 static u32 lit_4048 = 0x43828000; +SECTION_SDATA2 static f32 lit_4048 = 261.0f; /* 8045589C-804558A0 0004+00 s=1 e=0 z=0 None .sdata2 @4049 */ -SECTION_SDATA2 static u32 lit_4049 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4049 = 1.0f / 20.0f; /* 804558A0-804558A4 0004+00 s=1 e=0 z=0 None .sdata2 @4050 */ -SECTION_SDATA2 static u32 lit_4050 = 0x3FB33333; +SECTION_SDATA2 static f32 lit_4050 = 7.0f / 5.0f; /* 804558A4-804558A8 0004+00 s=1 e=0 z=0 None .sdata2 @4051 */ -SECTION_SDATA2 static u32 lit_4051 = 0x423C0000; +SECTION_SDATA2 static f32 lit_4051 = 47.0f; /* 804558A8-804558AC 0004+00 s=5 e=0 z=0 None .sdata2 @4052 */ -SECTION_SDATA2 static u32 lit_4052 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4052 = 0.5f; /* 804558AC-804558B0 0004+00 s=2 e=0 z=0 None .sdata2 @4053 */ -SECTION_SDATA2 static u32 lit_4053 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4053 = 9.0f / 10.0f; /* 804558B0-804558B4 0004+00 s=1 e=0 z=0 None .sdata2 @4054 */ -SECTION_SDATA2 static u32 lit_4054 = 0x42240000; +SECTION_SDATA2 static f32 lit_4054 = 41.0f; /* 804558B4-804558B8 0004+00 s=2 e=0 z=0 None .sdata2 @4055 */ -SECTION_SDATA2 static u32 lit_4055 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_4055 = 3.0f / 10.0f; /* 804558B8-804558BC 0004+00 s=3 e=0 z=0 None .sdata2 @4056 */ -SECTION_SDATA2 static u32 lit_4056 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4056 = -1.0f; /* 804558BC-804558C0 0004+00 s=2 e=0 z=0 None .sdata2 @4057 */ -SECTION_SDATA2 static u32 lit_4057 = 0x43C80000; +SECTION_SDATA2 static f32 lit_4057 = 400.0f; /* 804558C0-804558C4 0004+00 s=2 e=0 z=0 None .sdata2 @4058 */ -SECTION_SDATA2 static u32 lit_4058 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_4058 = 4.0f / 5.0f; /* 804558C4-804558C8 0004+00 s=2 e=0 z=0 None .sdata2 @4059 */ -SECTION_SDATA2 static u32 lit_4059 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_4059 = 11.0f / 10.0f; /* 804558C8-804558CC 0004+00 s=1 e=0 z=0 None .sdata2 @4060 */ -SECTION_SDATA2 static u32 lit_4060 = 0x41700000; +SECTION_SDATA2 static f32 lit_4060 = 15.0f; /* 804558CC-804558D0 0004+00 s=1 e=0 z=0 None .sdata2 @4061 */ -SECTION_SDATA2 static u32 lit_4061 = 0x42700000; +SECTION_SDATA2 static f32 lit_4061 = 60.0f; /* 804558D0-804558D4 0004+00 s=2 e=0 z=0 None .sdata2 @4062 */ -SECTION_SDATA2 static u32 lit_4062 = 0x42FE0000; +SECTION_SDATA2 static f32 lit_4062 = 127.0f; /* 804558D4-804558D8 0004+00 s=2 e=0 z=0 None .sdata2 @4063 */ -SECTION_SDATA2 static u32 lit_4063 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_4063 = 6.0f / 5.0f; /* 804558D8-804558E0 0008+00 s=2 e=0 z=0 None .sdata2 @4067 */ -SECTION_SDATA2 static u8 lit_4067[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4067 = 4503599627370496.0 /* cast u32 to float */; /* 804558E0-804558E8 0008+00 s=2 e=0 z=0 None .sdata2 @4070 */ -SECTION_SDATA2 static u8 lit_4070[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4070 = 4503601774854144.0 /* cast s32 to float */; /* 802AB984-802AC50C 0B88+00 s=1 e=196 z=549 None .text * seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc */ @@ -472,16 +434,16 @@ SECTION_DATA static void* lit_4619[24] = { }; /* 804558E8-804558EC 0004+00 s=1 e=0 z=0 None .sdata2 @4586 */ -SECTION_SDATA2 static u32 lit_4586 = 0x41C80000; +SECTION_SDATA2 static f32 lit_4586 = 25.0f; /* 804558EC-804558F0 0004+00 s=1 e=0 z=0 None .sdata2 @4587 */ -SECTION_SDATA2 static u32 lit_4587 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4587 = 1.0f / 10.0f; /* 804558F0-804558F4 0004+00 s=1 e=0 z=0 None .sdata2 @4588 */ -SECTION_SDATA2 static u32 lit_4588 = 0x41200000; +SECTION_SDATA2 static f32 lit_4588 = 10.0f; /* 804558F4-804558F8 0004+00 s=1 e=0 z=0 None .sdata2 @4589 */ -SECTION_SDATA2 static u32 lit_4589 = 0x40000000; +SECTION_SDATA2 static f32 lit_4589 = 2.0f; /* 804558F8-80455900 0004+04 s=2 e=0 z=0 None .sdata2 @4590 */ SECTION_SDATA2 static f32 lit_4590[1 + 1 /* padding */] = { @@ -491,63 +453,49 @@ SECTION_SDATA2 static f32 lit_4590[1 + 1 /* padding */] = { }; /* 80455900-80455908 0008+00 s=1 e=0 z=0 None .sdata2 @4591 */ -SECTION_SDATA2 static u8 lit_4591[8] = { - 0x3F, 0xE6, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, -}; +SECTION_SDATA2 static f64 lit_4591 = 0.7; /* 80455908-80455910 0008+00 s=1 e=0 z=0 None .sdata2 @4592 */ -SECTION_SDATA2 static u8 lit_4592[8] = { - 0x3F, 0x43, 0xA9, 0x2A, 0x30, 0x55, 0x32, 0x61, -}; +SECTION_SDATA2 static f64 lit_4592 = 0.0006; /* 80455910-80455918 0008+00 s=1 e=0 z=0 None .sdata2 @4593 */ -SECTION_SDATA2 static u8 lit_4593[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4593 = 1.0; /* 80455918-80455920 0008+00 s=1 e=0 z=0 None .sdata2 @4594 */ -SECTION_SDATA2 static u8 lit_4594[8] = { - 0x3F, 0x58, 0x93, 0x74, 0xBC, 0x6A, 0x7E, 0xFA, -}; +SECTION_SDATA2 static f64 lit_4594 = 0.0015; /* 80455920-80455928 0008+00 s=1 e=0 z=0 None .sdata2 @4595 */ -SECTION_SDATA2 static u8 lit_4595[8] = { - 0x3F, 0x74, 0x7A, 0xE1, 0x47, 0xAE, 0x14, 0x7B, -}; +SECTION_SDATA2 static f64 lit_4595 = 0.005; /* 80455928-80455930 0008+00 s=1 e=0 z=0 None .sdata2 @4596 */ -SECTION_SDATA2 static u8 lit_4596[8] = { - 0x3F, 0xD3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, -}; +SECTION_SDATA2 static f64 lit_4596 = 0.3; /* 80455930-80455938 0008+00 s=1 e=0 z=0 None .sdata2 @4597 */ -SECTION_SDATA2 static u8 lit_4597[8] = { - 0x3F, 0x50, 0x62, 0x4D, 0xD2, 0xF1, 0xA9, 0xFC, -}; +SECTION_SDATA2 static f64 lit_4597 = 0.001; /* 80455938-8045593C 0004+00 s=1 e=0 z=0 None .sdata2 @4598 */ -SECTION_SDATA2 static u32 lit_4598 = 0x457A0000; +SECTION_SDATA2 static f32 lit_4598 = 4000.0f; /* 8045593C-80455940 0004+00 s=1 e=0 z=0 None .sdata2 @4599 */ -SECTION_SDATA2 static u32 lit_4599 = 0x455AC000; +SECTION_SDATA2 static f32 lit_4599 = 3500.0f; /* 80455940-80455944 0004+00 s=1 e=0 z=0 None .sdata2 @4600 */ -SECTION_SDATA2 static u32 lit_4600 = 0x41D00000; +SECTION_SDATA2 static f32 lit_4600 = 26.0f; /* 80455944-80455948 0004+00 s=1 e=0 z=0 None .sdata2 @4601 */ -SECTION_SDATA2 static u32 lit_4601 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4601 = 3.0f / 5.0f; /* 80455948-8045594C 0004+00 s=1 e=0 z=0 None .sdata2 @4602 */ -SECTION_SDATA2 static u32 lit_4602 = 0x42800000; +SECTION_SDATA2 static f32 lit_4602 = 64.0f; /* 8045594C-80455950 0004+00 s=1 e=0 z=0 None .sdata2 @4603 */ -SECTION_SDATA2 static u32 lit_4603 = 0x458CA000; +SECTION_SDATA2 static f32 lit_4603 = 4500.0f; /* 80455950-80455954 0004+00 s=1 e=0 z=0 None .sdata2 @4604 */ -SECTION_SDATA2 static u32 lit_4604 = 0x42200000; +SECTION_SDATA2 static f32 lit_4604 = 40.0f; /* 80455954-80455958 0004+00 s=1 e=0 z=0 None .sdata2 @4605 */ -SECTION_SDATA2 static u32 lit_4605 = 0x42F00000; +SECTION_SDATA2 static f32 lit_4605 = 120.0f; /* 80455958-80455960 0004+04 s=1 e=0 z=0 None .sdata2 @4606 */ SECTION_SDATA2 static f32 lit_4606[1 + 1 /* padding */] = { @@ -557,14 +505,10 @@ SECTION_SDATA2 static f32 lit_4606[1 + 1 /* padding */] = { }; /* 80455960-80455968 0008+00 s=1 e=0 z=0 None .sdata2 @4607 */ -SECTION_SDATA2 static u8 lit_4607[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4607 = 0.5; /* 80455968-80455970 0008+00 s=1 e=0 z=0 None .sdata2 @4608 */ -SECTION_SDATA2 static u8 lit_4608[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4608 = 3.0; /* 80455970-80455978 0008+00 s=1 e=0 z=0 None .sdata2 @4609 */ SECTION_SDATA2 static u8 lit_4609[8] = { @@ -572,22 +516,22 @@ SECTION_SDATA2 static u8 lit_4609[8] = { }; /* 80455978-8045597C 0004+00 s=1 e=0 z=0 None .sdata2 @4610 */ -SECTION_SDATA2 static u32 lit_4610 = 0x44FA0000; +SECTION_SDATA2 static f32 lit_4610 = 2000.0f; /* 8045597C-80455980 0004+00 s=1 e=0 z=0 None .sdata2 @4611 */ -SECTION_SDATA2 static u32 lit_4611 = 0x459C4000; +SECTION_SDATA2 static f32 lit_4611 = 5000.0f; /* 80455980-80455984 0004+00 s=1 e=0 z=0 None .sdata2 @4612 */ -SECTION_SDATA2 static u32 lit_4612 = 0x3EE66666; +SECTION_SDATA2 static f32 lit_4612 = 9.0f / 20.0f; /* 80455984-80455988 0004+00 s=1 e=0 z=0 None .sdata2 @4613 */ -SECTION_SDATA2 static u32 lit_4613 = 0x42480000; +SECTION_SDATA2 static f32 lit_4613 = 50.0f; /* 80455988-8045598C 0004+00 s=1 e=0 z=0 None .sdata2 @4614 */ -SECTION_SDATA2 static u32 lit_4614 = 0x44160000; +SECTION_SDATA2 static f32 lit_4614 = 600.0f; /* 8045598C-80455990 0004+00 s=1 e=0 z=0 None .sdata2 @4615 */ -SECTION_SDATA2 static u32 lit_4615 = 0x42B40000; +SECTION_SDATA2 static f32 lit_4615 = 90.0f; /* 802AC50C-802AD8B0 13A4+00 s=3 e=19 z=199 None .text * seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc */ @@ -678,7 +622,7 @@ SECTION_RODATA static u8 const lit_5054[12] = { }; /* 80455990-80455994 0004+00 s=1 e=0 z=0 None .sdata2 @5085 */ -SECTION_SDATA2 static u32 lit_5085 = 0x40800000; +SECTION_SDATA2 static f32 lit_5085 = 4.0f; /* 802ADE5C-802ADFF4 0198+00 s=1 e=0 z=0 None .text setLevObjSE__7Z2SeMgrFUlP3VecSc */ #pragma push @@ -697,7 +641,7 @@ SECTION_RODATA static u8 const lit_5100[12] = { }; /* 80455994-80455998 0004+00 s=1 e=0 z=0 None .sdata2 @5134 */ -SECTION_SDATA2 static u32 lit_5134 = 0x40400000; +SECTION_SDATA2 static f32 lit_5134 = 3.0f; /* 802ADFF4-802AE184 0190+00 s=1 e=0 z=0 None .text setMultiTriggerSE__7Z2SeMgrFUlP3VecSc */ #pragma push diff --git a/libs/Z2AudioLib/Z2SeqMgr.cpp b/libs/Z2AudioLib/Z2SeqMgr.cpp index 72f3abd2147..5dfed902089 100644 --- a/libs/Z2AudioLib/Z2SeqMgr.cpp +++ b/libs/Z2AudioLib/Z2SeqMgr.cpp @@ -125,8 +125,6 @@ struct JAISeqMgr { // Forward References: // -extern "C" extern char const* const Z2SeqMgr__stringBase0; - extern "C" void __ct__8Z2SeqMgrFv(); extern "C" void bgmStart__8Z2SeqMgrFUlUll(); extern "C" void bgmStop__8Z2SeqMgrFUll(); @@ -180,22 +178,6 @@ extern "C" extern char const* const Z2SeqMgr__stringBase0; // External References: // -extern "C" extern u32 VOL_BGM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_BGM_TALKING__7Z2Param; -extern "C" extern u32 VOL_BGM_PAUSING__7Z2Param; -extern "C" extern u8 struct_80450860[4]; -extern "C" extern u8 struct_80450864[4]; -extern "C" extern u8 struct_80450868[4]; -extern "C" extern u32 data_8045086C; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern f32 ENEMY_LASTHIT_MUTE_VOLUME__7Z2Param; -extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; - extern "C" void calc__9JAISeqMgrFv(); extern "C" void stop__9JAISeqMgrFUl(); extern "C" void mixOut__9JAISeqMgrFv(); @@ -227,9 +209,9 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern u32 VOL_BGM_DEFAULT__7Z2Param; -extern "C" extern u32 VOL_BGM_TALKING__7Z2Param; -extern "C" extern u32 VOL_BGM_PAUSING__7Z2Param; +extern "C" extern f32 VOL_BGM_DEFAULT__7Z2Param; +extern "C" extern f32 VOL_BGM_TALKING__7Z2Param; +extern "C" extern f32 VOL_BGM_PAUSING__7Z2Param; extern "C" extern u8 struct_80450860[4]; extern "C" extern u8 struct_80450864[4]; extern "C" extern u8 struct_80450868[4]; @@ -249,7 +231,7 @@ extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80455998-8045599C 0004+00 s=23 e=0 z=0 None .sdata2 @3372 */ -SECTION_SDATA2 static u32 lit_3372 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3372 = 1.0f; /* 8045599C-804559A0 0004+00 s=23 e=0 z=0 None .sdata2 @3373 */ SECTION_SDATA2 static u8 lit_3373[4] = { @@ -278,9 +260,7 @@ SECTION_SDATA2 static f32 lit_3559[1 + 1 /* padding */] = { }; /* 804559A8-804559B0 0008+00 s=22 e=0 z=0 None .sdata2 @3561 */ -SECTION_SDATA2 static u8 lit_3561[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3561 = 4503599627370496.0 /* cast u32 to float */; /* 802AF010-802AF408 03F8+00 s=3 e=5 z=38 None .text bgmStart__8Z2SeqMgrFUlUll */ #pragma push @@ -814,40 +794,40 @@ SECTION_DATA static void* lit_4739[13] = { }; /* 804559B0-804559B4 0004+00 s=1 e=0 z=0 None .sdata2 @4726 */ -SECTION_SDATA2 static u32 lit_4726 = 0x3F266666; +SECTION_SDATA2 static f32 lit_4726 = 13.0f / 20.0f; /* 804559B4-804559B8 0004+00 s=10 e=0 z=0 None .sdata2 @4727 */ -SECTION_SDATA2 static u32 lit_4727 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4727 = -1.0f; /* 804559B8-804559BC 0004+00 s=1 e=0 z=0 None .sdata2 @4728 */ -SECTION_SDATA2 static u32 lit_4728 = 0x3E947AE1; +SECTION_SDATA2 static f32 lit_4728 = 29.0f / 100.0f; /* 804559BC-804559C0 0004+00 s=1 e=0 z=0 None .sdata2 @4729 */ -SECTION_SDATA2 static u32 lit_4729 = 0x3EB33333; +SECTION_SDATA2 static f32 lit_4729 = 7.0f / 20.0f; /* 804559C0-804559C4 0004+00 s=1 e=0 z=0 None .sdata2 @4730 */ -SECTION_SDATA2 static u32 lit_4730 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4730 = 3.0f / 5.0f; /* 804559C4-804559C8 0004+00 s=2 e=0 z=0 None .sdata2 @4731 */ -SECTION_SDATA2 static u32 lit_4731 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4731 = 0.5f; /* 804559C8-804559CC 0004+00 s=3 e=0 z=0 None .sdata2 @4732 */ -SECTION_SDATA2 static u32 lit_4732 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_4732 = 3.0f / 10.0f; /* 804559CC-804559D0 0004+00 s=1 e=0 z=0 None .sdata2 @4733 */ -SECTION_SDATA2 static u32 lit_4733 = 0x4541C000; +SECTION_SDATA2 static f32 lit_4733 = 3100.0f; /* 804559D0-804559D4 0004+00 s=1 e=0 z=0 None .sdata2 @4734 */ -SECTION_SDATA2 static u32 lit_4734 = 0x43480000; +SECTION_SDATA2 static f32 lit_4734 = 200.0f; /* 804559D4-804559D8 0004+00 s=1 e=0 z=0 None .sdata2 @4735 */ -SECTION_SDATA2 static u32 lit_4735 = 0x44C80000; +SECTION_SDATA2 static f32 lit_4735 = 1600.0f; /* 804559D8-804559DC 0004+00 s=1 e=0 z=0 None .sdata2 @4736 */ -SECTION_SDATA2 static u32 lit_4736 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_4736 = 4.0f / 5.0f; /* 804559DC-804559E0 0004+00 s=1 e=0 z=0 None .sdata2 @4737 */ -SECTION_SDATA2 static u32 lit_4737 = 0x4544E000; +SECTION_SDATA2 static f32 lit_4737 = 3150.0f; /* 804559E0-804559E8 0004+04 s=1 e=0 z=0 None .sdata2 @4738 */ SECTION_SDATA2 static f32 lit_4738[1 + 1 /* padding */] = { @@ -857,9 +837,7 @@ SECTION_SDATA2 static f32 lit_4738[1 + 1 /* padding */] = { }; /* 804559E8-804559F0 0008+00 s=1 e=0 z=0 None .sdata2 @4741 */ -SECTION_SDATA2 static u8 lit_4741[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4741 = 4503601774854144.0 /* cast s32 to float */; /* 802AFF8C-802B1DF4 1E68+00 s=5 e=8 z=26 None .text changeBgmStatus__8Z2SeqMgrFl */ #pragma push @@ -1086,10 +1064,10 @@ asm void Z2SeqMgr::setTimeProcVolMod(bool param_0, u32 param_1) { /* ############################################################################################## */ /* 80450870-80450874 0004+00 s=1 e=0 z=0 None .sdata sDeathMtBottom */ -SECTION_SDATA static u32 sDeathMtBottom = 0xC47A0000; +SECTION_SDATA static f32 sDeathMtBottom = -1000.0f; /* 80450874-80450878 0004+00 s=1 e=0 z=0 None .sdata sDeathMtTop */ -SECTION_SDATA static u32 sDeathMtTop = 0x45642000; +SECTION_SDATA static f32 sDeathMtTop = 3650.0f; /* 80450878-80450880 0004+04 s=1 e=0 z=0 None .sdata sUnderWaterDepthMax */ SECTION_SDATA static f32 sUnderWaterDepthMax[1 + 1 /* padding */] = { @@ -1099,31 +1077,31 @@ SECTION_SDATA static f32 sUnderWaterDepthMax[1 + 1 /* padding */] = { }; /* 804559F0-804559F4 0004+00 s=1 e=0 z=0 None .sdata2 @5673 */ -SECTION_SDATA2 static u32 lit_5673 = 0xC6241000; +SECTION_SDATA2 static f32 lit_5673 = -10500.0f; /* 804559F4-804559F8 0004+00 s=1 e=0 z=0 None .sdata2 @5674 */ -SECTION_SDATA2 static u32 lit_5674 = 0xC5EA6000; +SECTION_SDATA2 static f32 lit_5674 = -7500.0f; /* 804559F8-804559FC 0004+00 s=1 e=0 z=0 None .sdata2 @5675 */ -SECTION_SDATA2 static u32 lit_5675 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_5675 = 1.0f / 10.0f; /* 804559FC-80455A00 0004+00 s=1 e=0 z=0 None .sdata2 @5676 */ -SECTION_SDATA2 static u32 lit_5676 = 0xC4BB8000; +SECTION_SDATA2 static f32 lit_5676 = -1500.0f; /* 80455A00-80455A04 0004+00 s=1 e=0 z=0 None .sdata2 @5677 */ -SECTION_SDATA2 static u32 lit_5677 = 0xC64B2000; +SECTION_SDATA2 static f32 lit_5677 = -13000.0f; /* 80455A04-80455A08 0004+00 s=1 e=0 z=0 None .sdata2 @5678 */ -SECTION_SDATA2 static u32 lit_5678 = 0xC58CA000; +SECTION_SDATA2 static f32 lit_5678 = -4500.0f; /* 80455A08-80455A0C 0004+00 s=1 e=0 z=0 None .sdata2 @5679 */ -SECTION_SDATA2 static u32 lit_5679 = 0xC72FC800; +SECTION_SDATA2 static f32 lit_5679 = -45000.0f; /* 80455A0C-80455A10 0004+00 s=1 e=0 z=0 None .sdata2 @5680 */ -SECTION_SDATA2 static u32 lit_5680 = 0xC53B8000; +SECTION_SDATA2 static f32 lit_5680 = -3000.0f; /* 80455A10-80455A14 0004+00 s=1 e=0 z=0 None .sdata2 @5681 */ -SECTION_SDATA2 static u32 lit_5681 = 0x44610000; +SECTION_SDATA2 static f32 lit_5681 = 900.0f; /* 802B33A8-802B3EAC 0B04+00 s=0 e=1 z=0 None .text processBgmFramework__8Z2SeqMgrFv */ #pragma push @@ -1210,7 +1188,7 @@ asm void Z2SeqMgr::setBattleDistIgnore(bool param_0) { /* ############################################################################################## */ /* 80455A14-80455A18 0004+00 s=1 e=0 z=0 None .sdata2 @5913 */ -SECTION_SDATA2 static u32 lit_5913 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_5913 = 2.0f / 5.0f; /* 802B43E0-802B4498 00B8+00 s=0 e=2 z=0 None .text setBattleGhostMute__8Z2SeqMgrFb */ #pragma push diff --git a/libs/Z2AudioLib/Z2SoundHandles.cpp b/libs/Z2AudioLib/Z2SoundHandles.cpp index a131792576b..e14936e90b3 100644 --- a/libs/Z2AudioLib/Z2SoundHandles.cpp +++ b/libs/Z2AudioLib/Z2SoundHandles.cpp @@ -72,8 +72,6 @@ struct JAISound { // Forward References: // -extern "C" extern u8 data_804341C4[16 + 4 /* padding */]; - extern "C" void __ct__14Z2SoundHandlesFv(); extern "C" void __dt__14Z2SoundHandlesFv(); extern "C" void initHandlesPool__14Z2SoundHandlesFUc(); @@ -93,8 +91,6 @@ extern "C" extern u8 data_804341C4[16 + 4 /* padding */]; // void operator delete(void*); -extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80451348[8]; extern "C" void __ct__17JASGenericMemPoolFv(); extern "C" void __dt__17JASGenericMemPoolFv(); diff --git a/libs/Z2AudioLib/Z2SoundInfo.cpp b/libs/Z2AudioLib/Z2SoundInfo.cpp index 1b2a5d3fde8..aaaf4fcf34f 100644 --- a/libs/Z2AudioLib/Z2SoundInfo.cpp +++ b/libs/Z2AudioLib/Z2SoundInfo.cpp @@ -11,15 +11,15 @@ // Types: // -struct JAISoundID {}; - -struct JAISe {}; +struct JAISeq {}; struct JAIStream {}; -struct JAISound {}; +struct JAISe {}; -struct JAISeq {}; +struct JAISoundID {}; + +struct JAISound {}; struct Z2SoundInfo { /* 802BB00C */ void getBgmSeqResourceID(JAISoundID) const; @@ -60,8 +60,6 @@ struct JAISoundInfo { // Forward References: // -extern "C" extern void* __vt__11Z2SoundInfo[20]; - extern "C" void getBgmSeqResourceID__11Z2SoundInfoCF10JAISoundID(); extern "C" void getSoundType__11Z2SoundInfoCF10JAISoundID(); extern "C" void getCategory__11Z2SoundInfoCF10JAISoundID(); @@ -87,10 +85,6 @@ extern "C" extern void* __vt__11Z2SoundInfo[20]; // void operator delete(void*); -extern "C" extern void* __vt__12JAUSoundInfo[4 + 1 /* padding */]; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B50[4]; -extern "C" extern u8 data_80450B58[4]; extern "C" void __dt__12JAISoundInfoFv(); extern "C" void __dt__16JAIStreamDataMgrFv(); @@ -185,19 +179,19 @@ asm void Z2SoundInfo::getAudibleSw(JAISoundID param_0) const { /* ############################################################################################## */ /* 80455A68-80455A6C 0004+00 s=1 e=0 z=0 None .sdata2 @963 */ -SECTION_SDATA2 static u32 lit_963 = 0x41000000; +SECTION_SDATA2 static f32 lit_963 = 8.0f; /* 80455A6C-80455A70 0004+00 s=1 e=0 z=0 None .sdata2 @964 */ -SECTION_SDATA2 static u32 lit_964 = 0x41700000; +SECTION_SDATA2 static f32 lit_964 = 15.0f; /* 80455A70-80455A74 0004+00 s=1 e=0 z=0 None .sdata2 @965 */ -SECTION_SDATA2 static u32 lit_965 = 0x41800000; +SECTION_SDATA2 static f32 lit_965 = 16.0f; /* 80455A74-80455A78 0004+00 s=1 e=0 z=0 None .sdata2 @966 */ -SECTION_SDATA2 static u32 lit_966 = 0x41C00000; +SECTION_SDATA2 static f32 lit_966 = 24.0f; /* 80455A78-80455A7C 0004+00 s=1 e=0 z=0 None .sdata2 @967 */ -SECTION_SDATA2 static u32 lit_967 = 0x42400000; +SECTION_SDATA2 static f32 lit_967 = 48.0f; /* 80455A7C-80455A80 0004+00 s=2 e=0 z=0 None .sdata2 @968 */ SECTION_SDATA2 static u8 lit_968[4] = { @@ -215,9 +209,7 @@ SECTION_SDATA2 static f32 lit_969[1 + 1 /* padding */] = { }; /* 80455A88-80455A90 0008+00 s=2 e=0 z=0 None .sdata2 @973 */ -SECTION_SDATA2 static u8 lit_973[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_973 = 4503599627370496.0 /* cast u32 to float */; /* 802BB6DC-802BB8B4 01D8+00 s=1 e=0 z=0 None .text getSeInfo__11Z2SoundInfoCF10JAISoundIDP5JAISe */ @@ -246,7 +238,7 @@ asm void Z2SoundInfo::getSeqInfo(JAISoundID param_0, JAISeq* param_1) const { SECTION_SDATA2 static u32 STRM_CH_SHIFT__20JAUStdSoundTableType = 0x00000002; /* 80455A94-80455A98 0004+00 s=1 e=0 z=0 None .sdata2 @1010 */ -SECTION_SDATA2 static u32 lit_1010 = 0x3F000000; +SECTION_SDATA2 static f32 lit_1010 = 0.5f; /* 802BB8E0-802BBA10 0130+00 s=1 e=0 z=0 None .text * getStreamInfo__11Z2SoundInfoCF10JAISoundIDP9JAIStream */ diff --git a/libs/Z2AudioLib/Z2SoundMgr.cpp b/libs/Z2AudioLib/Z2SoundMgr.cpp index b3669588c3d..0b7faa60b41 100644 --- a/libs/Z2AudioLib/Z2SoundMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundMgr.cpp @@ -17,6 +17,10 @@ struct Z2SpeechMgr2 { struct JAISoundID {}; +struct JAISoundHandle {}; + +struct JAISound {}; + struct JGeometry { template struct TVec3 {}; @@ -24,10 +28,6 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JAISoundHandle {}; - -struct JAISound {}; - struct Z2SoundMgr { /* 802A9E80 */ Z2SoundMgr(); /* 802A9EE8 */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*); @@ -121,8 +121,6 @@ struct JAISeCategoryMgr { // void seqCallback(JASTrack*, u16); -extern "C" extern char const* const Z2SoundMgr__stringBase0; -extern "C" extern void* __vt__10Z2SoundMgr[3 + 1 /* padding */]; extern "C" void seqCallback__FP8JASTrackUs(); extern "C" void __ct__10Z2SoundMgrFv(); @@ -148,15 +146,6 @@ extern "C" extern void* __vt__10Z2SoundMgr[3 + 1 /* padding */]; // void dComIfGs_staffroll_next_go(); -extern "C" extern u8 const CUTOFF_TO_IIR_TABLE__7JASCalc[1024]; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451340[8]; extern "C" void dComIfGs_staffroll_next_go__Fv(); extern "C" void setFIR__8JASTrackFPCs(); @@ -250,10 +239,10 @@ SECTION_DATA static void* lit_3690[22] = { }; /* 80455838-8045583C 0004+00 s=5 e=0 z=0 None .sdata2 @3688 */ -SECTION_SDATA2 static u32 lit_3688 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3688 = 1.0f; /* 8045583C-80455840 0004+00 s=1 e=0 z=0 None .sdata2 @3689 */ -SECTION_SDATA2 static u32 lit_3689 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3689 = -1.0f; /* 802A9BC8-802A9E80 02B8+00 s=1 e=1 z=0 None .text seqCallback__FP8JASTrackUs */ #pragma push @@ -301,7 +290,7 @@ SECTION_DEAD static char const* const pad_8039B9ED = "\0\0"; #pragma pop /* 80455840-80455844 0004+00 s=1 e=0 z=0 None .sdata2 @3904 */ -SECTION_SDATA2 static u32 lit_3904 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_3904 = 3.0f / 10.0f; /* 80455844-80455848 0004+00 s=3 e=0 z=0 None .sdata2 @3905 */ SECTION_SDATA2 static u8 lit_3905[4] = { @@ -312,9 +301,7 @@ SECTION_SDATA2 static u8 lit_3905[4] = { }; /* 80455848-80455850 0008+00 s=2 e=0 z=0 None .sdata2 @3909 */ -SECTION_SDATA2 static u8 lit_3909[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3909 = 4503599627370496.0 /* cast u32 to float */; /* 802A9EE8-802AA1B0 02C8+00 s=1 e=0 z=0 None .text * startSound__10Z2SoundMgrF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 */ diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp index 90ea748ffcd..0857ed8bfc9 100644 --- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp +++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp @@ -74,11 +74,6 @@ extern "C" void __sinit_Z2SoundObjMgr_cpp(); // External References: // -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; - extern "C" void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(); extern "C" void changeBgmStatus__8Z2SeqMgrFl(); extern "C" void changeSubBgmStatus__8Z2SeqMgrFl(); @@ -313,30 +308,28 @@ SECTION_SDATA2 static u8 lit_3694[4] = { }; /* 80455BB4-80455BB8 0004+00 s=1 e=0 z=0 None .sdata2 @3695 */ -SECTION_SDATA2 static u32 lit_3695 = 0x42C80000; +SECTION_SDATA2 static f32 lit_3695 = 100.0f; /* 80455BB8-80455BBC 0004+00 s=1 e=0 z=0 None .sdata2 @3696 */ -SECTION_SDATA2 static u32 lit_3696 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_3696 = 3.0f / 10.0f; /* 80455BBC-80455BC0 0004+00 s=1 e=0 z=0 None .sdata2 @3697 */ -SECTION_SDATA2 static u32 lit_3697 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3697 = 1.0f; /* 80455BC0-80455BC4 0004+00 s=1 e=0 z=0 None .sdata2 @3698 */ -SECTION_SDATA2 static u32 lit_3698 = 0x40200000; +SECTION_SDATA2 static f32 lit_3698 = 2.5f; /* 80455BC4-80455BC8 0004+00 s=1 e=0 z=0 None .sdata2 @3699 */ -SECTION_SDATA2 static u32 lit_3699 = 0x459C4000; +SECTION_SDATA2 static f32 lit_3699 = 5000.0f; /* 80455BC8-80455BCC 0004+00 s=1 e=0 z=0 None .sdata2 @3700 */ -SECTION_SDATA2 static u32 lit_3700 = 0x40000000; +SECTION_SDATA2 static f32 lit_3700 = 2.0f; /* 80455BCC-80455BD0 0004+00 s=1 e=0 z=0 None .sdata2 @3701 */ -SECTION_SDATA2 static u32 lit_3701 = 0x40800000; +SECTION_SDATA2 static f32 lit_3701 = 4.0f; /* 80455BD0-80455BD8 0008+00 s=1 e=0 z=0 None .sdata2 @3703 */ -SECTION_SDATA2 static u8 lit_3703[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3703 = 4503599627370496.0 /* cast u32 to float */; /* 802BF994-802BFFEC 0658+00 s=1 e=1 z=0 None .text searchEnemy__13Z2SoundObjMgrFv */ #pragma push diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp index 0abc13f0d81..b49b680f2fa 100644 --- a/libs/Z2AudioLib/Z2SoundObject.cpp +++ b/libs/Z2AudioLib/Z2SoundObject.cpp @@ -137,10 +137,6 @@ struct JAISound { // Forward References: // -extern "C" extern void* __vt__15Z2SoundObjAnime[8]; -extern "C" extern void* __vt__15Z2SoundObjArrow[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; - extern "C" void __ct__14Z2SoundObjBaseFv(); extern "C" void __dt__14Z2SoundObjBaseFv(); extern "C" void init__14Z2SoundObjBaseFP3VecUc(); @@ -181,11 +177,6 @@ extern "C" extern void* __vt__16Z2SoundObjSimple[8]; // void operator delete(void*); -extern "C" extern u32 __float_max; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B88[4]; extern "C" void releaseSound__14JAISoundHandleFv(); extern "C" void acceptsNewAudible__8JAISoundCFv(); @@ -361,10 +352,10 @@ asm void Z2SoundObjBase::stopOK(Z2SoundHandlePool& param_0) { /* ############################################################################################## */ /* 80455B38-80455B3C 0004+00 s=5 e=0 z=0 None .sdata2 @3559 */ -SECTION_SDATA2 static u32 lit_3559 = 0x42FE0000; +SECTION_SDATA2 static f32 lit_3559 = 127.0f; /* 80455B3C-80455B40 0004+00 s=4 e=0 z=0 None .sdata2 @3560 */ -SECTION_SDATA2 static u32 lit_3560 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3560 = 1.0f; /* 80455B40-80455B48 0004+04 s=3 e=0 z=0 None .sdata2 @3561 */ SECTION_SDATA2 static f32 lit_3561[1 + 1 /* padding */] = { @@ -374,9 +365,7 @@ SECTION_SDATA2 static f32 lit_3561[1 + 1 /* padding */] = { }; /* 80455B48-80455B50 0008+00 s=3 e=0 z=0 None .sdata2 @3564 */ -SECTION_SDATA2 static u8 lit_3564[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3564 = 4503601774854144.0 /* cast s32 to float */; /* 802BE144-802BE2D4 0190+00 s=5 e=3 z=0 None .text startSound__14Z2SoundObjBaseF10JAISoundIDUlSc */ @@ -525,13 +514,13 @@ SECTION_SDATA2 static u8 lit_3821[4] = { }; /* 80455B54-80455B58 0004+00 s=2 e=0 z=0 None .sdata2 @3822 */ -SECTION_SDATA2 static u32 lit_3822 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_3822 = 1.0f / 5.0f; /* 80455B58-80455B5C 0004+00 s=2 e=0 z=0 None .sdata2 @3823 */ -SECTION_SDATA2 static u32 lit_3823 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_3823 = 2.0f / 5.0f; /* 80455B5C-80455B60 0004+00 s=2 e=0 z=0 None .sdata2 @3824 */ -SECTION_SDATA2 static u32 lit_3824 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_3824 = 3.0f / 5.0f; /* 80455B60-80455B68 0004+04 s=2 e=0 z=0 None .sdata2 @3825 */ SECTION_SDATA2 static f32 lit_3825[1 + 1 /* padding */] = { @@ -541,9 +530,7 @@ SECTION_SDATA2 static f32 lit_3825[1 + 1 /* padding */] = { }; /* 80455B68-80455B70 0008+00 s=3 e=0 z=0 None .sdata2 @3828 */ -SECTION_SDATA2 static u8 lit_3828[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3828 = 4503599627370496.0 /* cast u32 to float */; /* 802BE8A0-802BE9B0 0110+00 s=1 e=0 z=0 None .text * startSound__16Z2SoundObjSimpleF10JAISoundIDUlSc */ @@ -558,16 +545,16 @@ asm void Z2SoundObjSimple::startSound(JAISoundID param_0, u32 param_1, s8 param_ /* ############################################################################################## */ /* 80455B70-80455B74 0004+00 s=1 e=0 z=0 None .sdata2 @3859 */ -SECTION_SDATA2 static u32 lit_3859 = 0x40000000; +SECTION_SDATA2 static f32 lit_3859 = 2.0f; /* 80455B74-80455B78 0004+00 s=1 e=0 z=0 None .sdata2 @3860 */ -SECTION_SDATA2 static u32 lit_3860 = 0x41B00000; +SECTION_SDATA2 static f32 lit_3860 = 22.0f; /* 80455B78-80455B7C 0004+00 s=1 e=0 z=0 None .sdata2 @3861 */ -SECTION_SDATA2 static u32 lit_3861 = 0x42480000; +SECTION_SDATA2 static f32 lit_3861 = 50.0f; /* 80455B7C-80455B80 0004+00 s=1 e=0 z=0 None .sdata2 @3862 */ -SECTION_SDATA2 static u32 lit_3862 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_3862 = 1.5f; /* 802BE9B0-802BEB38 0188+00 s=1 e=0 z=0 None .text * startLevelSound__16Z2SoundObjSimpleF10JAISoundIDUlSc */ diff --git a/libs/Z2AudioLib/Z2SoundStarter.cpp b/libs/Z2AudioLib/Z2SoundStarter.cpp index 2572f556362..44ec8ed9ef9 100644 --- a/libs/Z2AudioLib/Z2SoundStarter.cpp +++ b/libs/Z2AudioLib/Z2SoundStarter.cpp @@ -13,6 +13,8 @@ struct JAISoundID {}; +struct JAISoundHandle {}; + struct JGeometry { template struct TVec3 {}; @@ -20,8 +22,6 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JAISoundHandle {}; - struct Z2SoundStarter { /* 802AAB94 */ Z2SoundStarter(bool); /* 802AAC3C */ void startSound(JAISoundID, JAISoundHandle*, JGeometry::TVec3 const*, u32, @@ -59,8 +59,6 @@ struct JAISoundParamsMove { // Forward References: // -extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; - extern "C" void __ct__14Z2SoundStarterFb(); extern "C" void func_802AABF4(); extern "C" void func_802AAC3C(); @@ -74,11 +72,6 @@ extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; // void operator delete(void*); -extern "C" extern u8 data_80450B3C[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void openChild__8JASTrackFUl(); extern "C" void writePort__8JASTrackFUlUs(); @@ -138,10 +131,10 @@ SECTION_SDATA2 static u8 lit_3597[4] = { }; /* 8045585C-80455860 0004+00 s=2 e=0 z=0 None .sdata2 @3598 */ -SECTION_SDATA2 static u32 lit_3598 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3598 = 1.0f; /* 80455860-80455864 0004+00 s=2 e=0 z=0 None .sdata2 @3599 */ -SECTION_SDATA2 static u32 lit_3599 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3599 = -1.0f; /* 802AABF4-802AAC3C 0048+00 s=1 e=5 z=0 None .text * startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3 */ @@ -157,12 +150,10 @@ asm void Z2SoundStarter::startSound(JAISoundID param_0, JAISoundHandle* param_1, /* ############################################################################################## */ /* 80455864-80455868 0004+00 s=1 e=0 z=0 None .sdata2 @3713 */ -SECTION_SDATA2 static u32 lit_3713 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3713 = 0.5f; /* 80455868-80455870 0008+00 s=1 e=0 z=0 None .sdata2 @3717 */ -SECTION_SDATA2 static u8 lit_3717[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3717 = 4503599627370496.0 /* cast u32 to float */; /* 802AAC3C-802AAEDC 02A0+00 s=2 e=2 z=0 None .text * startSound__14Z2SoundStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl */ diff --git a/libs/Z2AudioLib/Z2SpeechMgr2.cpp b/libs/Z2AudioLib/Z2SpeechMgr2.cpp index 428ce5180e4..37ca430ebd3 100644 --- a/libs/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/libs/Z2AudioLib/Z2SpeechMgr2.cpp @@ -13,6 +13,10 @@ struct JAISoundID {}; +struct JAISoundHandle { + /* 802A2184 */ void releaseSound(); +}; + struct JGeometry { template struct TVec3 {}; @@ -20,10 +24,6 @@ struct JGeometry { struct TVec3__template0 {}; }; -struct JAISoundHandle { - /* 802A2184 */ void releaseSound(); -}; - struct Z2SpeechStarter { /* 802CBCEC */ ~Z2SpeechStarter(); /* 802CCFB8 */ Z2SpeechStarter(); @@ -86,8 +86,6 @@ struct JAISound { // Forward References: // -extern "C" extern void* __vt__15Z2SpeechStarter[5]; - extern "C" void __ct__12Z2SpeechMgr2Fv(); extern "C" void __dt__15Z2SpeechStarterFv(); extern "C" void setString__12Z2SpeechMgr2FPCUssUcUs(); @@ -109,14 +107,6 @@ extern "C" extern void* __vt__15Z2SpeechStarter[5]; void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; -extern "C" extern u8 data_80450B3C[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void dComIfGp_getReverb__Fi(); extern "C" void releaseSound__14JAISoundHandleFv(); @@ -449,10 +439,10 @@ SECTION_SDATA2 static u8 lit_3836[4] = { }; /* 80455F34-80455F38 0004+00 s=6 e=0 z=0 None .sdata2 @3837 */ -SECTION_SDATA2 static u32 lit_3837 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3837 = 1.0f; /* 80455F38-80455F3C 0004+00 s=4 e=0 z=0 None .sdata2 @3838 */ -SECTION_SDATA2 static u32 lit_3838 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3838 = -1.0f; /* 802CBF60-802CC190 0230+00 s=1 e=2 z=0 None .text setTextCount__12Z2SpeechMgr2Fs */ #pragma push @@ -466,12 +456,10 @@ asm void Z2SpeechMgr2::setTextCount(s16 param_0) { /* ############################################################################################## */ /* 80455F3C-80455F40 0004+00 s=2 e=0 z=0 None .sdata2 @3885 */ -SECTION_SDATA2 static u32 lit_3885 = 0x42FE0000; +SECTION_SDATA2 static f32 lit_3885 = 127.0f; /* 80455F40-80455F48 0008+00 s=2 e=0 z=0 None .sdata2 @3887 */ -SECTION_SDATA2 static u8 lit_3887[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3887 = 4503601774854144.0 /* cast s32 to float */; /* 802CC190-802CC2FC 016C+00 s=1 e=1 z=0 None .text speakOneWord__12Z2SpeechMgr2Fb */ #pragma push @@ -1549,9 +1537,7 @@ SECTION_RODATA static void* const sPrm__8Z2MdnPrm[51] = { }; /* 80455F48-80455F50 0008+00 s=3 e=0 z=0 None .sdata2 @4083 */ -SECTION_SDATA2 static u8 lit_4083[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4083 = 4503599627370496.0 /* cast u32 to float */; /* 80456BA8-80456BAC 0002+02 s=1 e=0 z=0 None .sbss2 @4003 */ SECTION_SBSS2 static u8 lit_4003[2 + 2 /* padding */]; @@ -1623,10 +1609,10 @@ asm Z2SpeechStarter::Z2SpeechStarter() { /* ############################################################################################## */ /* 80455F50-80455F54 0004+00 s=1 e=0 z=0 None .sdata2 @4571 */ -SECTION_SDATA2 static u32 lit_4571 = 0x3D8F5C29; +SECTION_SDATA2 static f32 lit_4571 = 7.0f / 100.0f; /* 80455F54-80455F58 0004+00 s=1 e=0 z=0 None .sdata2 @4572 */ -SECTION_SDATA2 static u32 lit_4572 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4572 = 0.5f; /* 802CCFF8-802CD248 0250+00 s=1 e=0 z=0 None .text * startSound__15Z2SpeechStarterF10JAISoundIDP14JAISoundHandlePCQ29JGeometry8TVec3UlfffffUl */ diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp index a1894d9ce10..38cd5df2d5b 100644 --- a/libs/Z2AudioLib/Z2StatusMgr.cpp +++ b/libs/Z2AudioLib/Z2StatusMgr.cpp @@ -76,8 +76,6 @@ struct JAISoundParamsMove { // Forward References: // -extern "C" extern char const* const Z2StatusMgr__stringBase0; - extern "C" void __ct__11Z2StatusMgrFv(); extern "C" void heartGaugeOn__11Z2StatusMgrFv(); extern "C" void processHeartGaugeSound__11Z2StatusMgrFv(); @@ -99,17 +97,6 @@ extern "C" extern char const* const Z2StatusMgr__stringBase0; // External References: // -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450860[4]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; - extern "C" void moveVolume__18JAISoundParamsMoveFfUl(); extern "C" void getParamByExp__6Z2CalcFffffffQ26Z2Calc9CurveSign(); extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); @@ -150,7 +137,7 @@ extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80455A18-80455A1C 0004+00 s=1 e=0 z=0 None .sdata2 @3395 */ -SECTION_SDATA2 static u32 lit_3395 = 0x4B189680; +SECTION_SDATA2 static f32 lit_3395 = 10000000.0f; /* 80455A1C-80455A20 0004+00 s=3 e=0 z=0 None .sdata2 @3396 */ SECTION_SDATA2 static u8 lit_3396[4] = { @@ -182,10 +169,10 @@ asm void Z2StatusMgr::heartGaugeOn() { /* ############################################################################################## */ /* 80455A20-80455A24 0004+00 s=3 e=0 z=0 None .sdata2 @3467 */ -SECTION_SDATA2 static u32 lit_3467 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3467 = 1.0f; /* 80455A24-80455A28 0004+00 s=1 e=0 z=0 None .sdata2 @3468 */ -SECTION_SDATA2 static u32 lit_3468 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3468 = -1.0f; /* 802B5F7C-802B60CC 0150+00 s=0 e=1 z=0 None .text processHeartGaugeSound__11Z2StatusMgrFv */ #pragma push @@ -406,9 +393,7 @@ SECTION_DATA static void* lit_3732[46] = { }; /* 80455A28-80455A30 0008+00 s=1 e=0 z=0 None .sdata2 @3731 */ -SECTION_SDATA2 static u8 lit_3731[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3731 = 4503599627370496.0 /* cast u32 to float */; /* 802B61E8-802B671C 0534+00 s=1 e=7 z=11 None .text setDemoName__11Z2StatusMgrFPc */ #pragma push @@ -468,10 +453,10 @@ void Z2StatusMgr::setCameraGroupInfo(u8 param_0) { /* ############################################################################################## */ /* 80455A30-80455A34 0004+00 s=1 e=0 z=0 None .sdata2 @3798 */ -SECTION_SDATA2 static u32 lit_3798 = 0x44FA0000; +SECTION_SDATA2 static f32 lit_3798 = 2000.0f; /* 80455A34-80455A38 0004+00 s=1 e=0 z=0 None .sdata2 @3799 */ -SECTION_SDATA2 static u32 lit_3799 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_3799 = 1.0f / 5.0f; /* 802B6788-802B6840 00B8+00 s=0 e=2 z=0 None .text setCameraInWaterDepth__11Z2StatusMgrFf */ #pragma push diff --git a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp index 7b3e1842918..966e33ba918 100644 --- a/libs/Z2AudioLib/Z2WolfHowlMgr.cpp +++ b/libs/Z2AudioLib/Z2WolfHowlMgr.cpp @@ -11,10 +11,10 @@ // Types: // -struct Vec {}; - struct Z2WolfHowlData {}; +struct Vec {}; + struct Z2WolfHowlMgr { /* 802CAAC0 */ Z2WolfHowlMgr(); /* 802CAB8C */ void resetState(); @@ -99,16 +99,6 @@ extern "C" void __sinit_Z2WolfHowlMgr_cpp(); // External References: // -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80450B38[4]; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; - extern "C" void stop__8JAISoundFUl(); extern "C" void stop__8JAISoundFv(); extern "C" void moveVolume__18JAISoundParamsMoveFfUl(); @@ -248,7 +238,7 @@ SECTION_SDATA static u8 struct_8045088C[4] = { }; /* 80450890-80450894 0004+00 s=1 e=0 z=0 None .sdata cR_FlatWidth */ -SECTION_SDATA static u32 cR_FlatWidth = 0x3F71A177; +SECTION_SDATA static f32 cR_FlatWidth = 0.9438700079917908f; /* 80450894-80450898 0004+00 s=3 e=0 z=0 None .sdata None */ SECTION_SDATA static u8 struct_80450894[4] = { @@ -261,10 +251,10 @@ SECTION_SDATA static u8 struct_80450894[4] = { }; /* 80450898-8045089C 0004+00 s=1 e=0 z=0 None .sdata sStickHigh */ -SECTION_SDATA static u32 sStickHigh = 0x3F000000; +SECTION_SDATA static f32 sStickHigh = 0.5f; /* 8045089C-804508A0 0004+00 s=1 e=0 z=0 None .sdata sStickCenter */ -SECTION_SDATA static u32 sStickCenter = 0x3E4CCCCD; +SECTION_SDATA static f32 sStickCenter = 1.0f / 5.0f; /* 804508A0-804508A8 0008+00 s=1 e=0 z=0 None .sdata sHowlTobikusa */ SECTION_SDATA static u8 sHowlTobikusa[8] = { @@ -280,7 +270,7 @@ SECTION_SDATA2 static u8 lit_3485[4] = { }; /* 80455E64-80455E68 0004+00 s=11 e=0 z=0 None .sdata2 @3486 */ -SECTION_SDATA2 static u32 lit_3486 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3486 = 1.0f; /* 802CAAC0-802CAB8C 00CC+00 s=0 e=1 z=0 None .text __ct__13Z2WolfHowlMgrFv */ #pragma push @@ -304,15 +294,13 @@ asm void Z2WolfHowlMgr::resetState() { /* ############################################################################################## */ /* 80455E68-80455E6C 0004+00 s=2 e=0 z=0 None .sdata2 @3527 */ -SECTION_SDATA2 static u32 lit_3527 = 0x41F00000; +SECTION_SDATA2 static f32 lit_3527 = 30.0f; /* 80455E6C-80455E70 0004+00 s=1 e=0 z=0 None .sdata2 @3528 */ -SECTION_SDATA2 static u32 lit_3528 = 0x40000000; +SECTION_SDATA2 static f32 lit_3528 = 2.0f; /* 80455E70-80455E78 0008+00 s=2 e=0 z=0 None .sdata2 @3530 */ -SECTION_SDATA2 static u8 lit_3530[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3530 = 4503599627370496.0 /* cast u32 to float */; /* 802CABEC-802CACB0 00C4+00 s=1 e=0 z=0 None .text calcVolumeMod__13Z2WolfHowlMgrFf */ #pragma push @@ -346,10 +334,10 @@ asm void Z2WolfHowlMgr::getNowInputValue() { /* ############################################################################################## */ /* 80455E78-80455E7C 0004+00 s=1 e=0 z=0 None .sdata2 @3589 */ -SECTION_SDATA2 static u32 lit_3589 = 0x3F7851EC; +SECTION_SDATA2 static f32 lit_3589 = 97.0f / 100.0f; /* 80455E7C-80455E80 0004+00 s=4 e=0 z=0 None .sdata2 @3590 */ -SECTION_SDATA2 static u32 lit_3590 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3590 = -1.0f; /* 802CACD4-802CAED4 0200+00 s=1 e=0 z=0 None .text calcPitchMod__13Z2WolfHowlMgrFff */ #pragma push @@ -374,34 +362,34 @@ asm void Z2WolfHowlMgr::startWolfHowlSound(f32 param_0, f32 param_1, bool param_ /* ############################################################################################## */ /* 80455E80-80455E84 0004+00 s=1 e=0 z=0 None .sdata2 @3711 */ -SECTION_SDATA2 static u32 lit_3711 = 0x3F8FACC5; +SECTION_SDATA2 static f32 lit_3711 = 1.1224600076675415f; /* 80455E84-80455E88 0004+00 s=1 e=0 z=0 None .sdata2 @3712 */ -SECTION_SDATA2 static u32 lit_3712 = 0x3F879C63; +SECTION_SDATA2 static f32 lit_3712 = 1.0594600439071655f; /* 80455E88-80455E8C 0004+00 s=1 e=0 z=0 None .sdata2 @3713 */ -SECTION_SDATA2 static u32 lit_3713 = 0x3F4B2F01; +SECTION_SDATA2 static f32 lit_3713 = 0.7936859726905823f; /* 80455E8C-80455E90 0004+00 s=1 e=0 z=0 None .sdata2 @3714 */ -SECTION_SDATA2 static u32 lit_3714 = 0x3FA1449A; +SECTION_SDATA2 static f32 lit_3714 = 1.2599060535430908f; /* 80455E90-80455E94 0004+00 s=1 e=0 z=0 None .sdata2 @3715 */ -SECTION_SDATA2 static u32 lit_3715 = 0x3F71A177; +SECTION_SDATA2 static f32 lit_3715 = 0.9438700079917908f; /* 80455E94-80455E98 0004+00 s=1 e=0 z=0 None .sdata2 @3716 */ -SECTION_SDATA2 static u32 lit_3716 = 0x3F57443D; +SECTION_SDATA2 static f32 lit_3716 = 0.8408849835395813f; /* 80455E98-80455E9C 0004+00 s=1 e=0 z=0 None .sdata2 @3717 */ -SECTION_SDATA2 static u32 lit_3717 = 0x3FAADC0A; +SECTION_SDATA2 static f32 lit_3717 = 1.3348400592803955f; /* 80455E9C-80455EA0 0004+00 s=1 e=0 z=0 None .sdata2 @3718 */ -SECTION_SDATA2 static u32 lit_3718 = 0x3F641206; +SECTION_SDATA2 static f32 lit_3718 = 0.8909000158309937f; /* 80455EA0-80455EA4 0004+00 s=1 e=0 z=0 None .sdata2 @3719 */ -SECTION_SDATA2 static u32 lit_3719 = 0x3F3FC84B; +SECTION_SDATA2 static f32 lit_3719 = 0.7491499781608582f; /* 80455EA4-80455EA8 0004+00 s=1 e=0 z=0 None .sdata2 @3720 */ -SECTION_SDATA2 static u32 lit_3720 = 0x3F9837B5; +SECTION_SDATA2 static f32 lit_3720 = 1.1892000436782837f; /* 802CB100-802CB320 0220+00 s=0 e=1 z=0 None .text * setCorrectData__13Z2WolfHowlMgrFScP14Z2WolfHowlData */ @@ -466,14 +454,10 @@ asm void Z2WolfHowlMgr::getOnLineNum() { /* ############################################################################################## */ /* 80455EA8-80455EB0 0008+00 s=1 e=0 z=0 None .sdata2 @4032 */ -SECTION_SDATA2 static u8 lit_4032[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4032 = 0.5; /* 80455EB0-80455EB8 0008+00 s=1 e=0 z=0 None .sdata2 @4033 */ -SECTION_SDATA2 static u8 lit_4033[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4033 = 3.0; /* 80455EB8-80455EC0 0008+00 s=1 e=0 z=0 None .sdata2 @4034 */ SECTION_SDATA2 static u8 lit_4034[8] = { @@ -481,22 +465,22 @@ SECTION_SDATA2 static u8 lit_4034[8] = { }; /* 80455EC0-80455EC4 0004+00 s=1 e=0 z=0 None .sdata2 @4035 */ -SECTION_SDATA2 static u32 lit_4035 = 0x45034000; +SECTION_SDATA2 static f32 lit_4035 = 2100.0f; /* 80455EC4-80455EC8 0004+00 s=1 e=0 z=0 None .sdata2 @4036 */ -SECTION_SDATA2 static u32 lit_4036 = 0x43160000; +SECTION_SDATA2 static f32 lit_4036 = 150.0f; /* 80455EC8-80455ECC 0004+00 s=1 e=0 z=0 None .sdata2 @4037 */ -SECTION_SDATA2 static u32 lit_4037 = 0x44FA0000; +SECTION_SDATA2 static f32 lit_4037 = 2000.0f; /* 80455ECC-80455ED0 0004+00 s=1 e=0 z=0 None .sdata2 @4038 */ -SECTION_SDATA2 static u32 lit_4038 = 0x3EE66666; +SECTION_SDATA2 static f32 lit_4038 = 9.0f / 20.0f; /* 80455ED0-80455ED4 0004+00 s=1 e=0 z=0 None .sdata2 @4039 */ -SECTION_SDATA2 static u32 lit_4039 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4039 = 1.0f / 20.0f; /* 80455ED4-80455ED8 0004+00 s=1 e=0 z=0 None .sdata2 @4040 */ -SECTION_SDATA2 static u32 lit_4040 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_4040 = 2.0f / 5.0f; /* 80455ED8-80455EE0 0004+04 s=1 e=0 z=0 None .sdata2 @4041 */ SECTION_SDATA2 static f32 lit_4041[1 + 1 /* padding */] = { diff --git a/libs/dolphin/card/CARDBios.cpp b/libs/dolphin/card/CARDBios.cpp index 7012272f78f..b797b61227c 100644 --- a/libs/dolphin/card/CARDBios.cpp +++ b/libs/dolphin/card/CARDBios.cpp @@ -11,9 +11,6 @@ // Forward References: // -extern "C" extern u8 __CARDBlock[544]; -extern "C" extern u8 __CARDDiskNone[32]; - extern "C" void __CARDDefaultApiCallback(); extern "C" void __CARDSyncCallback(); extern "C" void __CARDExtHandler(); diff --git a/libs/dolphin/card/CARDBlock.cpp b/libs/dolphin/card/CARDBlock.cpp index 4ec551eed1d..95d5db8ab80 100644 --- a/libs/dolphin/card/CARDBlock.cpp +++ b/libs/dolphin/card/CARDBlock.cpp @@ -21,8 +21,6 @@ extern "C" void __CARDUpdateFatBlock(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - SECTION_INIT void memcpy(); extern "C" void DCStoreRange(); extern "C" void __CARDEraseSector(); diff --git a/libs/dolphin/card/CARDCheck.cpp b/libs/dolphin/card/CARDCheck.cpp index 577f32bb173..d73631b55b1 100644 --- a/libs/dolphin/card/CARDCheck.cpp +++ b/libs/dolphin/card/CARDCheck.cpp @@ -23,8 +23,6 @@ extern "C" void CARDCheck(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - SECTION_INIT void memset(); SECTION_INIT void memcpy(); extern "C" void OSDisableInterrupts(); diff --git a/libs/dolphin/card/CARDCreate.cpp b/libs/dolphin/card/CARDCreate.cpp index 06ee1526e41..31344f21c2d 100644 --- a/libs/dolphin/card/CARDCreate.cpp +++ b/libs/dolphin/card/CARDCreate.cpp @@ -19,8 +19,6 @@ extern "C" void CARDCreate(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - SECTION_INIT void memcpy(); extern "C" void OSGetTime(); extern "C" void __CARDDefaultApiCallback(); diff --git a/libs/dolphin/card/CARDDir.cpp b/libs/dolphin/card/CARDDir.cpp index f7ecc0d5b92..a9c6bb95d32 100644 --- a/libs/dolphin/card/CARDDir.cpp +++ b/libs/dolphin/card/CARDDir.cpp @@ -20,8 +20,6 @@ extern "C" void __CARDUpdateDir(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - SECTION_INIT void memcpy(); extern "C" void DCStoreRange(); extern "C" void __CARDEraseSector(); diff --git a/libs/dolphin/card/CARDFormat.cpp b/libs/dolphin/card/CARDFormat.cpp index 79d83ce18c8..da29411b84a 100644 --- a/libs/dolphin/card/CARDFormat.cpp +++ b/libs/dolphin/card/CARDFormat.cpp @@ -19,8 +19,6 @@ extern "C" void CARDFormat(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - SECTION_INIT void memset(); SECTION_INIT void memcpy(); extern "C" void DCStoreRange(); diff --git a/libs/dolphin/card/CARDMount.cpp b/libs/dolphin/card/CARDMount.cpp index 58487445140..b2fa9978d70 100644 --- a/libs/dolphin/card/CARDMount.cpp +++ b/libs/dolphin/card/CARDMount.cpp @@ -25,9 +25,6 @@ extern "C" void CARDUnmount(); // External References: // -extern "C" extern u8 __CARDBlock[544]; -extern "C" extern u8 struct_80450A70[8]; - extern "C" void OSCancelAlarm(); extern "C" void DCInvalidateRange(); extern "C" void OSDisableInterrupts(); diff --git a/libs/dolphin/card/CARDNet.cpp b/libs/dolphin/card/CARDNet.cpp index f1fcaa2c321..00b21c0df84 100644 --- a/libs/dolphin/card/CARDNet.cpp +++ b/libs/dolphin/card/CARDNet.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern u8 struct_80450A70[8]; - extern "C" void CARDGetSerialNo(); extern "C" extern u8 struct_80450A70[8]; diff --git a/libs/dolphin/card/CARDOpen.cpp b/libs/dolphin/card/CARDOpen.cpp index e7f4803156d..ea0ce8f2653 100644 --- a/libs/dolphin/card/CARDOpen.cpp +++ b/libs/dolphin/card/CARDOpen.cpp @@ -22,9 +22,6 @@ extern "C" void CARDClose(); // External References: // -extern "C" extern u8 __CARDDiskNone[32]; -extern "C" extern u8 struct_80450A70[8]; - extern "C" void __CARDGetControlBlock(); extern "C" void __CARDPutControlBlock(); extern "C" void __CARDGetDirBlock(); diff --git a/libs/dolphin/card/CARDRdwr.cpp b/libs/dolphin/card/CARDRdwr.cpp index f67b236604a..e76f5134062 100644 --- a/libs/dolphin/card/CARDRdwr.cpp +++ b/libs/dolphin/card/CARDRdwr.cpp @@ -20,8 +20,6 @@ extern "C" void __CARDWrite(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - extern "C" void __CARDReadSegment(); extern "C" void __CARDWritePage(); extern "C" void __CARDPutControlBlock(); diff --git a/libs/dolphin/card/CARDRead.cpp b/libs/dolphin/card/CARDRead.cpp index b950ad7c096..bc7e7c32359 100644 --- a/libs/dolphin/card/CARDRead.cpp +++ b/libs/dolphin/card/CARDRead.cpp @@ -20,8 +20,6 @@ extern "C" void CARDRead(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - extern "C" void DCInvalidateRange(); extern "C" void __CARDDefaultApiCallback(); extern "C" void __CARDSyncCallback(); diff --git a/libs/dolphin/card/CARDUnlock.cpp b/libs/dolphin/card/CARDUnlock.cpp index b42b179c9dc..2dbf29e764f 100644 --- a/libs/dolphin/card/CARDUnlock.cpp +++ b/libs/dolphin/card/CARDUnlock.cpp @@ -22,8 +22,6 @@ extern "C" static void DoneCallback(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - SECTION_INIT void memset(); extern "C" void DSPAddTask(); extern "C" void DCInvalidateRange(); diff --git a/libs/dolphin/card/CARDWrite.cpp b/libs/dolphin/card/CARDWrite.cpp index a48966cea2f..4cc9c75a580 100644 --- a/libs/dolphin/card/CARDWrite.cpp +++ b/libs/dolphin/card/CARDWrite.cpp @@ -20,8 +20,6 @@ extern "C" void CARDWrite(); // External References: // -extern "C" extern u8 __CARDBlock[544]; - extern "C" void DCStoreRange(); extern "C" void OSGetTime(); extern "C" void __CARDDefaultApiCallback(); diff --git a/libs/dolphin/dsp/dsp.cpp b/libs/dolphin/dsp/dsp.cpp index 4ffb0a90b8a..3e92d807b14 100644 --- a/libs/dolphin/dsp/dsp.cpp +++ b/libs/dolphin/dsp/dsp.cpp @@ -22,11 +22,6 @@ extern "C" void DSPInit(); // External References: // -extern "C" extern u8 __DSP_tmp_task[4]; -extern "C" extern u8 __DSP_last_task[4]; -extern "C" extern u8 __DSP_first_task[4]; -extern "C" extern u8 __DSP_curr_task[4]; - extern "C" void __DSPHandler(); extern "C" void OSRegisterVersion(); extern "C" void OSDisableInterrupts(); diff --git a/libs/dolphin/dsp/dsp_task.cpp b/libs/dolphin/dsp/dsp_task.cpp index 0486f5da240..836ba71d002 100644 --- a/libs/dolphin/dsp/dsp_task.cpp +++ b/libs/dolphin/dsp/dsp_task.cpp @@ -11,12 +11,6 @@ // Forward References: // -extern "C" extern u8 lit_294[43 + 5 /* padding */]; -extern "C" extern u8 __DSP_tmp_task[4]; -extern "C" extern u8 __DSP_last_task[4]; -extern "C" extern u8 __DSP_first_task[4]; -extern "C" extern u8 __DSP_curr_task[4]; - extern "C" void __DSP_exec_task(); extern "C" void __DSP_boot_task(); extern "C" void __DSP_insert_task(); diff --git a/libs/dolphin/dvd/dvd.cpp b/libs/dolphin/dvd/dvd.cpp index a4169d51745..9b9e26851ed 100644 --- a/libs/dolphin/dvd/dvd.cpp +++ b/libs/dolphin/dvd/dvd.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern u8 lit_789[65 + 3 /* padding */]; - extern "C" static void defaultOptionalCommandChecker(); extern "C" void DVDInit(); extern "C" static void stateReadingFST(); @@ -66,8 +64,6 @@ extern "C" extern u8 lit_789[65 + 3 /* padding */]; // External References: // -extern "C" extern u8 __DVDThreadQueue[8]; - SECTION_INIT void memcpy(); extern "C" void OSReport(); extern "C" void OSPanic(); diff --git a/libs/dolphin/dvd/dvdfs.cpp b/libs/dolphin/dvd/dvdfs.cpp index feca375c140..6ce02641067 100644 --- a/libs/dolphin/dvd/dvdfs.cpp +++ b/libs/dolphin/dvd/dvdfs.cpp @@ -11,9 +11,6 @@ // Forward References: // -extern "C" extern u8 __DVDLongFileNameFlag[4]; -extern "C" extern u8 __DVDThreadQueue[8]; - extern "C" void __DVDFSInit(); extern "C" void DVDConvertPathToEntrynum(); extern "C" void DVDFastOpen(); diff --git a/libs/dolphin/gd/GDBase.cpp b/libs/dolphin/gd/GDBase.cpp index afce712456e..ee04a91325b 100644 --- a/libs/dolphin/gd/GDBase.cpp +++ b/libs/dolphin/gd/GDBase.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern u8 __GDCurrentDL[4]; - extern "C" void GDInitGDLObj(); extern "C" void GDFlushCurrToMem(); extern "C" void GDPadCurr32(); diff --git a/libs/dolphin/gd/GDGeometry.cpp b/libs/dolphin/gd/GDGeometry.cpp index 2b9ed0d49e7..4cb2142b479 100644 --- a/libs/dolphin/gd/GDGeometry.cpp +++ b/libs/dolphin/gd/GDGeometry.cpp @@ -19,8 +19,6 @@ extern "C" void GDSetArrayRaw(); // External References: // -extern "C" extern u8 __GDCurrentDL[4]; - extern "C" void GDOverflowed(); extern "C" extern u8 __GDCurrentDL[4]; diff --git a/libs/dolphin/gf/GFGeometry.cpp b/libs/dolphin/gf/GFGeometry.cpp index 208462b0721..3c94a7f989d 100644 --- a/libs/dolphin/gf/GFGeometry.cpp +++ b/libs/dolphin/gf/GFGeometry.cpp @@ -18,7 +18,6 @@ struct _GXCullMode {}; // void GFSetGenMode2(u8, u8, u8, u8, _GXCullMode); -extern "C" extern u8 data_804508B0[8]; extern "C" void GFSetGenMode2__FUcUcUcUc11_GXCullMode(); extern "C" extern u8 data_804508B0[8]; diff --git a/libs/dolphin/gf/GFPixel.cpp b/libs/dolphin/gf/GFPixel.cpp index b06927fd37b..7df2c821d3b 100644 --- a/libs/dolphin/gf/GFPixel.cpp +++ b/libs/dolphin/gf/GFPixel.cpp @@ -58,12 +58,10 @@ SECTION_SDATA2 static u8 lit_293[4] = { }; /* 80455F6C-80455F70 0004+00 s=1 e=0 z=0 None .sdata2 @294 */ -SECTION_SDATA2 static u32 lit_294 = 0x3F000000; +SECTION_SDATA2 static f32 lit_294 = 0.5f; /* 80455F70-80455F78 0008+00 s=1 e=0 z=0 None .sdata2 @295 */ -SECTION_SDATA2 static u8 lit_295[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_295 = 1.0; /* 80455F78-80455F80 0004+04 s=1 e=0 z=0 None .sdata2 @296 */ SECTION_SDATA2 static f32 lit_296[1 + 1 /* padding */] = { @@ -73,9 +71,7 @@ SECTION_SDATA2 static f32 lit_296[1 + 1 /* padding */] = { }; /* 80455F80-80455F88 0008+00 s=1 e=0 z=0 None .sdata2 @297 */ -SECTION_SDATA2 static u8 lit_297[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_297 = 0.5; /* 80455F88-80455F90 0004+04 s=1 e=0 z=0 None .sdata2 @298 */ SECTION_SDATA2 static f32 lit_298[1 + 1 /* padding */] = { @@ -85,9 +81,7 @@ SECTION_SDATA2 static f32 lit_298[1 + 1 /* padding */] = { }; /* 80455F90-80455F98 0008+00 s=1 e=0 z=0 None .sdata2 @301 */ -SECTION_SDATA2 static u8 lit_301[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_301 = 4503601774854144.0 /* cast s32 to float */; /* 802CDE9C-802CE004 0168+00 s=0 e=1 z=0 None .text GFSetFog__F10_GXFogTypeffff8_GXColor */ #pragma push diff --git a/libs/dolphin/gx/GXAttr.cpp b/libs/dolphin/gx/GXAttr.cpp index 8a2d5790434..957b52793ef 100644 --- a/libs/dolphin/gx/GXAttr.cpp +++ b/libs/dolphin/gx/GXAttr.cpp @@ -28,8 +28,6 @@ extern "C" void GXSetNumTexGens(); // External References: // -extern "C" extern void* __GXData; - extern "C" void __GXSetMatrixIndex(); extern "C" extern void* __GXData; diff --git a/libs/dolphin/gx/GXBump.cpp b/libs/dolphin/gx/GXBump.cpp index eb9a679650b..489caa5c81c 100644 --- a/libs/dolphin/gx/GXBump.cpp +++ b/libs/dolphin/gx/GXBump.cpp @@ -27,8 +27,6 @@ extern "C" void __GXFlushTextureState(); extern "C" extern void* __GXData; -extern "C" extern void* __GXData; - // // Declarations: // diff --git a/libs/dolphin/gx/GXDisplayList.cpp b/libs/dolphin/gx/GXDisplayList.cpp index 87cd1d015d5..a39e6434207 100644 --- a/libs/dolphin/gx/GXDisplayList.cpp +++ b/libs/dolphin/gx/GXDisplayList.cpp @@ -17,8 +17,6 @@ extern "C" void GXCallDisplayList(); // External References: // -extern "C" extern void* __GXData; - extern "C" void __GXSetDirtyState(); extern "C" void __GXSendFlushPrim(); extern "C" extern void* __GXData; diff --git a/libs/dolphin/gx/GXFifo.cpp b/libs/dolphin/gx/GXFifo.cpp index 5e9bf813a46..27beecc60d4 100644 --- a/libs/dolphin/gx/GXFifo.cpp +++ b/libs/dolphin/gx/GXFifo.cpp @@ -39,10 +39,6 @@ extern "C" void GXGetGPFifo(); // External References: // -extern "C" extern u8 __piReg[4]; -extern "C" extern u8 __cpReg[4]; -extern "C" extern void* __GXData; - extern "C" void PPCSync(); extern "C" void OSSetCurrentContext(); extern "C" void OSClearContext(); diff --git a/libs/dolphin/gx/GXFrameBuf.cpp b/libs/dolphin/gx/GXFrameBuf.cpp index 8a3c1c6967a..a4ea147ed85 100644 --- a/libs/dolphin/gx/GXFrameBuf.cpp +++ b/libs/dolphin/gx/GXFrameBuf.cpp @@ -11,12 +11,6 @@ // Forward References: // -extern "C" extern u8 GXNtsc480IntDf[60]; -extern "C" extern u8 GXNtsc480Int[60]; -extern "C" extern u8 GXMpal480IntDf[60]; -extern "C" extern u8 GXPal528IntDf[60]; -extern "C" extern u8 GXEurgb60Hz480IntDf[60 + 4 /* padding */]; - extern "C" void GXSetDispCopySrc(); extern "C" void GXSetTexCopySrc(); extern "C" void GXSetDispCopyDst(); @@ -42,8 +36,6 @@ extern "C" extern u8 GXEurgb60Hz480IntDf[60 + 4 /* padding */]; // External References: // -extern "C" extern void* __GXData; - extern "C" void __GetImageTileCount(); extern "C" void __cvt_fp2unsigned(); extern "C" extern void* __GXData; @@ -132,9 +124,7 @@ extern "C" asm void GXGetNumXfbLines() { /* ############################################################################################## */ /* 804565B0-804565B8 0008+00 s=1 e=0 z=0 None .sdata2 @234 */ -SECTION_SDATA2 static u8 lit_234[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_234 = 4503599627370496.0 /* cast u32 to float */; /* 8035CD6C-8035CFA4 0238+00 s=0 e=2 z=0 None .text GXGetYScaleFactor */ #pragma push diff --git a/libs/dolphin/gx/GXGeometry.cpp b/libs/dolphin/gx/GXGeometry.cpp index 8321b588b39..772a59c9f78 100644 --- a/libs/dolphin/gx/GXGeometry.cpp +++ b/libs/dolphin/gx/GXGeometry.cpp @@ -25,8 +25,6 @@ extern "C" static void __GXSetGenMode(); // External References: // -extern "C" extern void* __GXData; - extern "C" void __GXSetVCD(); extern "C" void __GXCalculateVLim(); extern "C" void __GXSetVAT(); diff --git a/libs/dolphin/gx/GXInit.cpp b/libs/dolphin/gx/GXInit.cpp index f8a6b094bdb..be376e11ab1 100644 --- a/libs/dolphin/gx/GXInit.cpp +++ b/libs/dolphin/gx/GXInit.cpp @@ -11,12 +11,6 @@ // Forward References: // -extern "C" extern u8 __piReg[4]; -extern "C" extern u8 __cpReg[4]; -extern "C" extern u8 __peReg[4]; -extern "C" extern u8 __memReg[4]; -extern "C" extern void* __GXData; - extern "C" static void __GXDefaultTexRegionCallback(); extern "C" static void __GXDefaultTlutRegionCallback(); extern "C" static void __GXShutdown(); @@ -33,11 +27,6 @@ extern "C" extern void* __GXData; // External References: // -extern "C" extern u8 GXNtsc480IntDf[60]; -extern "C" extern u8 GXMpal480IntDf[60]; -extern "C" extern u8 GXPal528IntDf[60]; -extern "C" extern u8 GXEurgb60Hz480IntDf[60 + 4 /* padding */]; - extern "C" void PPCSync(); extern "C" void PPCMfhid2(); extern "C" void PPCMthid2(); @@ -387,7 +376,7 @@ SECTION_SDATA static void* __GXVersion[1 + 1 /* padding */] = { static u8 resetFuncRegistered[4]; /* 80456584-80456588 0004+00 s=1 e=0 z=0 None .sdata2 @267 */ -SECTION_SDATA2 static u32 lit_267 = 0x4B800000; +SECTION_SDATA2 static f32 lit_267 = 16777216.0f; /* 80456588-8045658C 0004+00 s=2 e=0 z=0 None .sdata2 @268 */ SECTION_SDATA2 static u8 lit_268[4] = { @@ -423,15 +412,13 @@ SECTION_SDATA2 static u8 lit_270[4] = { SECTION_SDATA2 static u32 lit_271 = 0xFFFFFFFF; /* 80456598-8045659C 0004+00 s=1 e=0 z=0 None .sdata2 @331 */ -SECTION_SDATA2 static u32 lit_331 = 0x3F800000; +SECTION_SDATA2 static f32 lit_331 = 1.0f; /* 8045659C-804565A0 0004+00 s=1 e=0 z=0 None .sdata2 @332 */ -SECTION_SDATA2 static u32 lit_332 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_332 = 1.0f / 10.0f; /* 804565A0-804565A8 0008+00 s=1 e=0 z=0 None .sdata2 @334 */ -SECTION_SDATA2 static u8 lit_334[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_334 = 4503599627370496.0 /* cast u32 to float */; /* 80359C70-8035A5A8 0938+00 s=1 e=0 z=0 None .text __GXInitGX */ #pragma push diff --git a/libs/dolphin/gx/GXLight.cpp b/libs/dolphin/gx/GXLight.cpp index 81c5938d610..39847a3b5a4 100644 --- a/libs/dolphin/gx/GXLight.cpp +++ b/libs/dolphin/gx/GXLight.cpp @@ -27,8 +27,6 @@ extern "C" void GXSetChanCtrl(); // External References: // -extern "C" extern void* __GXData; - extern "C" void cosf(); extern "C" extern void* __GXData; @@ -69,34 +67,34 @@ SECTION_SDATA2 static u8 lit_134[4] = { }; /* 804565BC-804565C0 0004+00 s=1 e=0 z=0 None .sdata2 @135 */ -SECTION_SDATA2 static u32 lit_135 = 0x42B40000; +SECTION_SDATA2 static f32 lit_135 = 90.0f; /* 804565C0-804565C4 0004+00 s=1 e=0 z=0 None .sdata2 @136 */ -SECTION_SDATA2 static u32 lit_136 = 0x40490FDB; +SECTION_SDATA2 static f32 lit_136 = 3.1415927410125732f; /* 804565C4-804565C8 0004+00 s=1 e=0 z=0 None .sdata2 @137 */ -SECTION_SDATA2 static u32 lit_137 = 0x43340000; +SECTION_SDATA2 static f32 lit_137 = 180.0f; /* 804565C8-804565CC 0004+00 s=1 e=0 z=0 None .sdata2 @138 */ -SECTION_SDATA2 static u32 lit_138 = 0xC47A0000; +SECTION_SDATA2 static f32 lit_138 = -1000.0f; /* 804565CC-804565D0 0004+00 s=1 e=0 z=0 None .sdata2 @139 */ -SECTION_SDATA2 static u32 lit_139 = 0x447A0000; +SECTION_SDATA2 static f32 lit_139 = 1000.0f; /* 804565D0-804565D4 0004+00 s=2 e=0 z=0 None .sdata2 @140 */ -SECTION_SDATA2 static u32 lit_140 = 0x3F800000; +SECTION_SDATA2 static f32 lit_140 = 1.0f; /* 804565D4-804565D8 0004+00 s=1 e=0 z=0 None .sdata2 @141 */ -SECTION_SDATA2 static u32 lit_141 = 0x40000000; +SECTION_SDATA2 static f32 lit_141 = 2.0f; /* 804565D8-804565DC 0004+00 s=1 e=0 z=0 None .sdata2 @142 */ -SECTION_SDATA2 static u32 lit_142 = 0xC0800000; +SECTION_SDATA2 static f32 lit_142 = -4.0f; /* 804565DC-804565E0 0004+00 s=1 e=0 z=0 None .sdata2 @143 */ -SECTION_SDATA2 static u32 lit_143 = 0x40800000; +SECTION_SDATA2 static f32 lit_143 = 4.0f; /* 804565E0-804565E4 0004+00 s=1 e=0 z=0 None .sdata2 @144 */ -SECTION_SDATA2 static u32 lit_144 = 0xC0000000; +SECTION_SDATA2 static f32 lit_144 = -2.0f; /* 8035D64C-8035D7DC 0190+00 s=1 e=2 z=0 None .text GXInitLightSpot */ #pragma push @@ -110,7 +108,7 @@ extern "C" asm void GXInitLightSpot() { /* ############################################################################################## */ /* 804565E4-804565E8 0004+00 s=1 e=0 z=0 None .sdata2 @160 */ -SECTION_SDATA2 static u32 lit_160 = 0x3F000000; +SECTION_SDATA2 static f32 lit_160 = 0.5f; /* 8035D7DC-8035D8AC 00D0+00 s=0 e=2 z=0 None .text GXInitLightDistAttn */ #pragma push diff --git a/libs/dolphin/gx/GXMisc.cpp b/libs/dolphin/gx/GXMisc.cpp index 9f5a3973cb6..f1738f793ea 100644 --- a/libs/dolphin/gx/GXMisc.cpp +++ b/libs/dolphin/gx/GXMisc.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern u8 pad_8045197C[4]; - extern "C" void GXSetMisc(); extern "C" void GXFlush(); extern "C" void __GXAbort(); @@ -40,10 +38,6 @@ extern "C" extern u8 pad_8045197C[4]; // External References: // -extern "C" extern u8 __peReg[4]; -extern "C" extern u8 __memReg[4]; -extern "C" extern void* __GXData; - extern "C" void PPCSync(); extern "C" void OSSetCurrentContext(); extern "C" void OSClearContext(); diff --git a/libs/dolphin/gx/GXPerf.cpp b/libs/dolphin/gx/GXPerf.cpp index 7a5ecca4071..bb9e86f2ae4 100644 --- a/libs/dolphin/gx/GXPerf.cpp +++ b/libs/dolphin/gx/GXPerf.cpp @@ -22,9 +22,6 @@ extern "C" void GXReadXfRasMetric(); extern "C" extern u8 __cpReg[4]; extern "C" extern void* __GXData; -extern "C" extern u8 __cpReg[4]; -extern "C" extern void* __GXData; - // // Declarations: // diff --git a/libs/dolphin/gx/GXPixel.cpp b/libs/dolphin/gx/GXPixel.cpp index 2812ce67d9c..131db01be19 100644 --- a/libs/dolphin/gx/GXPixel.cpp +++ b/libs/dolphin/gx/GXPixel.cpp @@ -28,8 +28,6 @@ extern "C" void GXSetFieldMode(); // External References: // -extern "C" extern void* __GXData; - extern "C" void __GXFlushTextureState(); extern "C" void __cvt_fp2unsigned(); extern "C" extern void* __GXData; @@ -48,7 +46,7 @@ SECTION_SDATA2 static u8 lit_211[4] = { }; /* 8045661C-80456620 0004+00 s=1 e=0 z=0 None .sdata2 @212 */ -SECTION_SDATA2 static u32 lit_212 = 0x3F800000; +SECTION_SDATA2 static f32 lit_212 = 1.0f; /* 80456620-80456628 0004+04 s=1 e=0 z=0 None .sdata2 @213 */ SECTION_SDATA2 static f32 lit_213[1 + 1 /* padding */] = { @@ -58,9 +56,7 @@ SECTION_SDATA2 static f32 lit_213[1 + 1 /* padding */] = { }; /* 80456628-80456630 0008+00 s=1 e=0 z=0 None .sdata2 @214 */ -SECTION_SDATA2 static u8 lit_214[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_214 = 1.0; /* 80456630-80456638 0004+04 s=1 e=0 z=0 None .sdata2 @215 */ SECTION_SDATA2 static f32 lit_215[1 + 1 /* padding */] = { @@ -70,9 +66,7 @@ SECTION_SDATA2 static f32 lit_215[1 + 1 /* padding */] = { }; /* 80456638-80456640 0008+00 s=1 e=0 z=0 None .sdata2 @216 */ -SECTION_SDATA2 static u8 lit_216[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_216 = 0.5; /* 80456640-80456648 0004+04 s=1 e=0 z=0 None .sdata2 @217 */ SECTION_SDATA2 static f32 lit_217[1 + 1 /* padding */] = { @@ -82,9 +76,7 @@ SECTION_SDATA2 static f32 lit_217[1 + 1 /* padding */] = { }; /* 80456648-80456650 0008+00 s=1 e=0 z=0 None .sdata2 @219 */ -SECTION_SDATA2 static u8 lit_219[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_219 = 4503601774854144.0 /* cast s32 to float */; /* 8035F8B8-8035FACC 0214+00 s=0 e=20 z=2 None .text GXSetFog */ #pragma push diff --git a/libs/dolphin/gx/GXTev.cpp b/libs/dolphin/gx/GXTev.cpp index 3963713c930..91d45453ec3 100644 --- a/libs/dolphin/gx/GXTev.cpp +++ b/libs/dolphin/gx/GXTev.cpp @@ -11,10 +11,6 @@ // Forward References: // -extern "C" extern u8 TEVCOpTableST1[20]; -extern "C" extern u8 TEVAOpTableST0[20]; -extern "C" extern u8 TEVAOpTableST1[20]; - extern "C" void GXSetTevOp(); extern "C" void GXSetTevColorIn(); extern "C" void GXSetTevAlphaIn(); @@ -41,8 +37,6 @@ extern "C" extern u8 TEVAOpTableST1[20]; extern "C" extern void* __GXData; -extern "C" extern void* __GXData; - // // Declarations: // diff --git a/libs/dolphin/gx/GXTexture.cpp b/libs/dolphin/gx/GXTexture.cpp index 163ccc9f8ad..ce3e2e2d020 100644 --- a/libs/dolphin/gx/GXTexture.cpp +++ b/libs/dolphin/gx/GXTexture.cpp @@ -41,8 +41,6 @@ extern "C" void __GXSetTmemConfig(); // External References: // -extern "C" extern void* __GXData; - SECTION_INIT void memset(); extern "C" void __GXFlushTextureState(); extern "C" extern void* __GXData; @@ -173,9 +171,7 @@ SECTION_SDATA2 static f32 lit_220[1 + 1 /* padding */] = { }; /* 804565F0-804565F8 0008+00 s=1 e=0 z=0 None .sdata2 @222 */ -SECTION_SDATA2 static u8 lit_222[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_222 = 4503599627370496.0 /* cast u32 to float */; /* 8035DE40-8035E08C 024C+00 s=2 e=22 z=3 None .text GXInitTexObj */ #pragma push @@ -247,16 +243,16 @@ SECTION_SDATA static u8 GX2HWFiltConv[6 + 2 /* padding */] = { }; /* 804565F8-804565FC 0004+00 s=1 e=0 z=0 None .sdata2 @288 */ -SECTION_SDATA2 static u32 lit_288 = 0xC0800000; +SECTION_SDATA2 static f32 lit_288 = -4.0f; /* 804565FC-80456600 0004+00 s=1 e=0 z=0 None .sdata2 @289 */ -SECTION_SDATA2 static u32 lit_289 = 0x40800000; +SECTION_SDATA2 static f32 lit_289 = 4.0f; /* 80456600-80456604 0004+00 s=1 e=0 z=0 None .sdata2 @290 */ -SECTION_SDATA2 static u32 lit_290 = 0x407F5C29; +SECTION_SDATA2 static f32 lit_290 = 3.990000009536743f; /* 80456604-80456608 0004+00 s=1 e=0 z=0 None .sdata2 @291 */ -SECTION_SDATA2 static u32 lit_291 = 0x42000000; +SECTION_SDATA2 static f32 lit_291 = 32.0f; /* 80456608-8045660C 0004+00 s=1 e=0 z=0 None .sdata2 @292 */ SECTION_SDATA2 static u8 lit_292[4] = { @@ -267,7 +263,7 @@ SECTION_SDATA2 static u8 lit_292[4] = { }; /* 8045660C-80456610 0004+00 s=1 e=0 z=0 None .sdata2 @293 */ -SECTION_SDATA2 static u32 lit_293 = 0x41200000; +SECTION_SDATA2 static f32 lit_293 = 10.0f; /* 8035E0D4-8035E238 0164+00 s=0 e=21 z=4 None .text GXInitTexObjLOD */ #pragma push diff --git a/libs/dolphin/gx/GXTransform.cpp b/libs/dolphin/gx/GXTransform.cpp index a72b5641de0..c8dc25253a9 100644 --- a/libs/dolphin/gx/GXTransform.cpp +++ b/libs/dolphin/gx/GXTransform.cpp @@ -34,8 +34,6 @@ extern "C" void __GXSetMatrixIndex(); extern "C" extern void* __GXData; -extern "C" extern void* __GXData; - // // Declarations: // @@ -50,10 +48,10 @@ SECTION_SDATA2 static u8 lit_26[4] = { }; /* 80456654-80456658 0004+00 s=2 e=0 z=0 None .sdata2 @27 */ -SECTION_SDATA2 static u32 lit_27 = 0x3F800000; +SECTION_SDATA2 static f32 lit_27 = 1.0f; /* 80456658-8045665C 0004+00 s=2 e=0 z=0 None .sdata2 @28 */ -SECTION_SDATA2 static u32 lit_28 = 0x3F000000; +SECTION_SDATA2 static f32 lit_28 = 0.5f; /* 8035FF60-803600D4 0174+00 s=0 e=1 z=0 None .text GXProject */ #pragma push @@ -137,7 +135,7 @@ extern "C" asm void GXLoadTexMtxImm() { /* ############################################################################################## */ /* 8045665C-80456660 0004+00 s=1 e=0 z=0 None .sdata2 @201 */ -SECTION_SDATA2 static u32 lit_201 = 0x43AB0000; +SECTION_SDATA2 static f32 lit_201 = 342.0f; /* 803603D4-80360464 0090+00 s=1 e=0 z=0 None .text __GXSetViewport */ #pragma push diff --git a/libs/dolphin/mtx/mtx.cpp b/libs/dolphin/mtx/mtx.cpp index 04f0d73db88..deee7eb0f83 100644 --- a/libs/dolphin/mtx/mtx.cpp +++ b/libs/dolphin/mtx/mtx.cpp @@ -44,7 +44,7 @@ extern "C" void cosf(); /* ############################################################################################## */ /* 80456508-8045650C 0004+00 s=6 e=0 z=0 None .sdata2 @96 */ -SECTION_SDATA2 static u32 lit_96 = 0x3F800000; +SECTION_SDATA2 static f32 lit_96 = 1.0f; /* 8045650C-80456510 0004+00 s=6 e=0 z=0 None .sdata2 @97 */ SECTION_SDATA2 static u8 lit_97[4] = { @@ -122,10 +122,10 @@ extern "C" asm static void PSMTXRotTrig() { /* ############################################################################################## */ /* 80456510-80456514 0004+00 s=2 e=0 z=0 None .sdata2 @190 */ -SECTION_SDATA2 static u32 lit_190 = 0x3F000000; +SECTION_SDATA2 static f32 lit_190 = 0.5f; /* 80456514-80456518 0004+00 s=1 e=0 z=0 None .sdata2 @191 */ -SECTION_SDATA2 static u32 lit_191 = 0x40400000; +SECTION_SDATA2 static f32 lit_191 = 3.0f; /* 803467C8-80346878 00B0+00 s=1 e=0 z=0 None .text __PSMTXRotAxisRadInternal */ #pragma push @@ -209,10 +209,10 @@ extern "C" asm void C_MTXLookAt() { /* ############################################################################################## */ /* 80456518-8045651C 0004+00 s=1 e=0 z=0 None .sdata2 @206 */ -SECTION_SDATA2 static u32 lit_206 = 0x40000000; +SECTION_SDATA2 static f32 lit_206 = 2.0f; /* 8045651C-80456520 0004+00 s=1 e=0 z=0 None .sdata2 @227 */ -SECTION_SDATA2 static u32 lit_227 = 0xBF800000; +SECTION_SDATA2 static f32 lit_227 = -1.0f; /* 80456520-80456528 0004+04 s=1 e=0 z=0 None .sdata2 @230 */ SECTION_SDATA2 static f32 lit_230[1 + 1 /* padding */] = { diff --git a/libs/dolphin/mtx/mtx44.cpp b/libs/dolphin/mtx/mtx44.cpp index 6cc7cac5380..dbb208d0526 100644 --- a/libs/dolphin/mtx/mtx44.cpp +++ b/libs/dolphin/mtx/mtx44.cpp @@ -26,10 +26,10 @@ extern "C" void tanf(); /* ############################################################################################## */ /* 80456528-8045652C 0004+00 s=2 e=0 z=0 None .sdata2 @99 */ -SECTION_SDATA2 static u32 lit_99 = 0x3F800000; +SECTION_SDATA2 static f32 lit_99 = 1.0f; /* 8045652C-80456530 0004+00 s=1 e=0 z=0 None .sdata2 @100 */ -SECTION_SDATA2 static u32 lit_100 = 0x40000000; +SECTION_SDATA2 static f32 lit_100 = 2.0f; /* 80456530-80456534 0004+00 s=2 e=0 z=0 None .sdata2 @101 */ SECTION_SDATA2 static u8 lit_101[4] = { @@ -40,13 +40,13 @@ SECTION_SDATA2 static u8 lit_101[4] = { }; /* 80456534-80456538 0004+00 s=2 e=0 z=0 None .sdata2 @102 */ -SECTION_SDATA2 static u32 lit_102 = 0xBF800000; +SECTION_SDATA2 static f32 lit_102 = -1.0f; /* 80456538-8045653C 0004+00 s=1 e=0 z=0 None .sdata2 @105 */ -SECTION_SDATA2 static u32 lit_105 = 0x3F000000; +SECTION_SDATA2 static f32 lit_105 = 0.5f; /* 8045653C-80456540 0004+00 s=1 e=0 z=0 None .sdata2 @106 */ -SECTION_SDATA2 static u32 lit_106 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_106 = 0.01745329238474369f; /* 80346F28-80346FF8 00D0+00 s=0 e=6 z=0 None .text C_MTXPerspective */ #pragma push diff --git a/libs/dolphin/mtx/quat.cpp b/libs/dolphin/mtx/quat.cpp index 69fd6c46772..69907e2f18c 100644 --- a/libs/dolphin/mtx/quat.cpp +++ b/libs/dolphin/mtx/quat.cpp @@ -48,10 +48,10 @@ SECTION_SDATA2 static u8 lit_130[4] = { }; /* 80456554-80456558 0004+00 s=1 e=0 z=0 None .sdata2 @133 */ -SECTION_SDATA2 static u32 lit_133 = 0x3F800000; +SECTION_SDATA2 static f32 lit_133 = 1.0f; /* 80456558-8045655C 0004+00 s=1 e=0 z=0 None .sdata2 @135 */ -SECTION_SDATA2 static u32 lit_135 = 0x3F000000; +SECTION_SDATA2 static f32 lit_135 = 0.5f; /* 80347474-80347500 008C+00 s=0 e=1 z=0 None .text C_QUATRotAxisRad */ #pragma push @@ -65,7 +65,7 @@ extern "C" asm void C_QUATRotAxisRad() { /* ############################################################################################## */ /* 8045655C-80456560 0004+00 s=1 e=0 z=0 None .sdata2 @261 */ -SECTION_SDATA2 static u32 lit_261 = 0x3F7FFF58; +SECTION_SDATA2 static f32 lit_261 = 0.9999899864196777f; /* 80347500-80347674 0174+00 s=0 e=0 z=2 None .text C_QUATSlerp */ #pragma push diff --git a/libs/dolphin/mtx/vec.cpp b/libs/dolphin/mtx/vec.cpp index 7402638f453..9a1e28e9b67 100644 --- a/libs/dolphin/mtx/vec.cpp +++ b/libs/dolphin/mtx/vec.cpp @@ -72,10 +72,10 @@ SECTION_SDATA2 static u8 lit_113[4] = { }; /* 80456544-80456548 0004+00 s=3 e=0 z=0 None .sdata2 @118 */ -SECTION_SDATA2 static u32 lit_118 = 0x3F000000; +SECTION_SDATA2 static f32 lit_118 = 0.5f; /* 80456548-8045654C 0004+00 s=3 e=0 z=0 None .sdata2 @119 */ -SECTION_SDATA2 static u32 lit_119 = 0x40400000; +SECTION_SDATA2 static f32 lit_119 = 3.0f; /* 803470F4-80347138 0044+00 s=2 e=16 z=0 None .text PSVECNormalize */ #pragma push @@ -139,7 +139,7 @@ extern "C" asm void C_VECHalfAngle() { /* ############################################################################################## */ /* 8045654C-80456550 0004+00 s=1 e=0 z=0 None .sdata2 @161 */ -SECTION_SDATA2 static u32 lit_161 = 0x40000000; +SECTION_SDATA2 static f32 lit_161 = 2.0f; /* 803472C8-8034739C 00D4+00 s=0 e=1 z=11 None .text C_VECReflect */ #pragma push diff --git a/libs/dolphin/os/OS.cpp b/libs/dolphin/os/OS.cpp index d88beaa81e3..2842f758f0e 100644 --- a/libs/dolphin/os/OS.cpp +++ b/libs/dolphin/os/OS.cpp @@ -21,12 +21,6 @@ struct daBgObj_c { // Forward References: // -extern "C" extern u8 __OSRebootParams[28 + 4 /* padding */]; -extern "C" extern u8 __OSIsGcam[4]; -extern "C" extern u8 __OSInIPL[4 + 4 /* padding */]; -extern "C" extern u8 __OSStartTime[4]; -extern "C" extern u8 data_80451634[4]; - extern "C" void __OSFPRInit(); extern "C" void OSGetConsoleType(); extern "C" static void InquiryCallback(); @@ -54,9 +48,6 @@ extern "C" extern u8 data_80451634[4]; // External References: // -extern "C" extern u8 __DVDLongFileNameFlag[4]; -extern "C" extern u8 __PADSpec[4 + 4 /* padding */]; - SECTION_INIT void memset(); SECTION_INIT void memcpy(); extern "C" void OSReport(); diff --git a/libs/dolphin/os/OSAlloc.cpp b/libs/dolphin/os/OSAlloc.cpp index 257fed0ff87..f4dfdaf0ea5 100644 --- a/libs/dolphin/os/OSAlloc.cpp +++ b/libs/dolphin/os/OSAlloc.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern u32 __OSCurrHeap[1 + 1 /* padding */]; - extern "C" static void DLInsert(); extern "C" void OSFreeToHeap(); extern "C" void OSSetCurrentHeap(); diff --git a/libs/dolphin/os/OSError.cpp b/libs/dolphin/os/OSError.cpp index 654bf453227..6be3ae517ae 100644 --- a/libs/dolphin/os/OSError.cpp +++ b/libs/dolphin/os/OSError.cpp @@ -11,17 +11,6 @@ // Forward References: // -extern "C" extern u8 lit_14[38 + 2 /* padding */]; -extern "C" extern u8 lit_15[28]; -extern "C" extern u8 lit_80[76]; -extern "C" extern u8 lit_81[98 + 2 /* padding */]; -extern "C" extern u8 lit_82[96]; -extern "C" extern u8 lit_83[31 + 1 /* padding */]; -extern "C" extern u8 lit_84[31 + 1 /* padding */]; -extern "C" extern u8 lit_85[27 + 1 /* padding */]; -extern "C" extern u8 __OSErrorTable[68 + 12 /* padding */]; -extern "C" extern u32 __OSFpscrEnableBits; - extern "C" void OSSetErrorHandler(); extern "C" void __OSUnhandledException(); extern "C" extern u8 lit_14[38 + 2 /* padding */]; @@ -39,11 +28,6 @@ extern "C" extern u32 __OSFpscrEnableBits; // External References: // -extern "C" extern u8 __OSLastInterruptSrr0[4]; -extern "C" extern u8 __OSLastInterrupt[2 + 6 /* padding */]; -extern "C" extern u8 __OSLastInterruptTime[4]; -extern "C" extern u8 data_80451684[4]; - extern "C" void OSReport(); extern "C" void PPCMfmsr(); extern "C" void PPCMtmsr(); diff --git a/libs/dolphin/os/OSExec.cpp b/libs/dolphin/os/OSExec.cpp index 07bac54db1b..773aa3b7e42 100644 --- a/libs/dolphin/os/OSExec.cpp +++ b/libs/dolphin/os/OSExec.cpp @@ -24,8 +24,6 @@ extern "C" void __OSBootDol(); // External References: // -extern "C" extern u8 __OSIsGcam[4]; - SECTION_INIT void memset(); SECTION_INIT void memcpy(); extern "C" void OSReport(); diff --git a/libs/dolphin/os/OSInterrupt.cpp b/libs/dolphin/os/OSInterrupt.cpp index 4d59b765a4b..c6de65fd301 100644 --- a/libs/dolphin/os/OSInterrupt.cpp +++ b/libs/dolphin/os/OSInterrupt.cpp @@ -11,11 +11,6 @@ // Forward References: // -extern "C" extern u8 __OSLastInterruptSrr0[4]; -extern "C" extern u8 __OSLastInterrupt[2 + 6 /* padding */]; -extern "C" extern u8 __OSLastInterruptTime[4]; -extern "C" extern u8 data_80451684[4]; - extern "C" void OSDisableInterrupts(); extern "C" void __RAS_OSDisableInterrupts_end(); extern "C" void OSEnableInterrupts(); diff --git a/libs/dolphin/os/OSMemory.cpp b/libs/dolphin/os/OSMemory.cpp index 8b18c9f87a3..ce6355730cd 100644 --- a/libs/dolphin/os/OSMemory.cpp +++ b/libs/dolphin/os/OSMemory.cpp @@ -23,8 +23,6 @@ extern "C" void __OSInitMemoryProtection(); // External References: // -extern "C" extern u8 __OSErrorTable[68 + 12 /* padding */]; - extern "C" void DCInvalidateRange(); extern "C" void DCFlushRange(); extern "C" void __OSUnhandledException(); diff --git a/libs/dolphin/os/OSReset.cpp b/libs/dolphin/os/OSReset.cpp index 04f4fae65ce..0066cd0aca8 100644 --- a/libs/dolphin/os/OSReset.cpp +++ b/libs/dolphin/os/OSReset.cpp @@ -23,8 +23,6 @@ extern "C" void OSGetResetCode(); // External References: // -extern "C" extern u8 __OSRebootParams[28 + 4 /* padding */]; - SECTION_INIT void memset(); extern "C" void OSReport(); extern "C" void __OSStopAudioSystem(); diff --git a/libs/dolphin/os/OSResetSW.cpp b/libs/dolphin/os/OSResetSW.cpp index 4a9f3e294a0..f98d920fa1f 100644 --- a/libs/dolphin/os/OSResetSW.cpp +++ b/libs/dolphin/os/OSResetSW.cpp @@ -19,9 +19,6 @@ extern "C" void OSGetResetSwitchState(); // External References: // -extern "C" extern u8 __OSStartTime[4]; -extern "C" extern u8 data_80451634[4]; - extern "C" void OSDisableInterrupts(); extern "C" void OSRestoreInterrupts(); extern "C" void __OSMaskInterrupts(); diff --git a/libs/dolphin/os/OSThread.cpp b/libs/dolphin/os/OSThread.cpp index ea0849df4fa..684efe65e66 100644 --- a/libs/dolphin/os/OSThread.cpp +++ b/libs/dolphin/os/OSThread.cpp @@ -11,9 +11,6 @@ // Forward References: // -extern "C" extern u8 IdleThread[792]; -extern "C" extern u8 data_804516D0[8]; - extern "C" static void DefaultSwitchThreadCallback(); extern "C" void OSSetSwitchThreadCallback(); extern "C" void __OSThreadInit(); @@ -49,9 +46,6 @@ extern "C" extern u8 data_804516D0[8]; // External References: // -extern "C" extern u8 __OSErrorTable[68 + 12 /* padding */]; -extern "C" extern u32 __OSFpscrEnableBits; - extern "C" void OSReport(); extern "C" void OSPanic(); extern "C" void OSSetCurrentContext(); diff --git a/libs/dolphin/os/__ppc_eabi_init.cpp b/libs/dolphin/os/__ppc_eabi_init.cpp index d946a3270b6..b15d22ee6fd 100644 --- a/libs/dolphin/os/__ppc_eabi_init.cpp +++ b/libs/dolphin/os/__ppc_eabi_init.cpp @@ -19,11 +19,6 @@ extern "C" void _ExitProcess(); // External References: // -#pragma section ".ctors$10" -__declspec(section ".ctors$10") extern void* const __init_cpp_exceptions_reference; -#pragma section ".ctors$15" -__declspec(section ".ctors$10") extern void* const _ctors[106]; - extern "C" void PPCHalt(); #pragma section ".ctors$10" __declspec(section ".ctors$10") extern void* const __init_cpp_exceptions_reference; diff --git a/libs/dolphin/pad/Pad.cpp b/libs/dolphin/pad/Pad.cpp index 55807deffe2..6f367ba41db 100644 --- a/libs/dolphin/pad/Pad.cpp +++ b/libs/dolphin/pad/Pad.cpp @@ -11,8 +11,6 @@ // Forward References: // -extern "C" extern u8 __PADSpec[4 + 4 /* padding */]; - extern "C" static void UpdateOrigin(); extern "C" static void PADOriginCallback(); extern "C" static void PADOriginUpdateCallback(); @@ -39,8 +37,6 @@ extern "C" extern u8 __PADSpec[4 + 4 /* padding */]; // External References: // -extern "C" extern u8 __PADFixBits[4 + 4 /* padding */]; - SECTION_INIT void memset(); extern "C" void OSRegisterVersion(); extern "C" void OSSetCurrentContext(); diff --git a/libs/dolphin/pad/Padclamp.cpp b/libs/dolphin/pad/Padclamp.cpp index 8e99c83fe83..1d124285217 100644 --- a/libs/dolphin/pad/Padclamp.cpp +++ b/libs/dolphin/pad/Padclamp.cpp @@ -36,32 +36,20 @@ extern "C" asm static void ClampStick() { /* ############################################################################################## */ /* 80456560-80456568 0004+04 s=1 e=0 z=0 None .sdata2 @160 */ -SECTION_SDATA2 static u8 lit_160[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_160[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80456568-80456570 0008+00 s=1 e=0 z=0 None .sdata2 @161 */ -SECTION_SDATA2 static u8 lit_161[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_161 = 0.5; /* 80456570-80456578 0008+00 s=1 e=0 z=0 None .sdata2 @162 */ -SECTION_SDATA2 static u8 lit_162[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_162 = 3.0; /* 80456578-80456580 0008+00 s=1 e=0 z=0 None .sdata2 @164 */ -SECTION_SDATA2 static u8 lit_164[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_164 = 4503601774854144.0 /* cast s32 to float */; /* 8034DEEC-8034E094 01A8+00 s=1 e=0 z=0 None .text ClampCircle */ #pragma push diff --git a/libs/dolphin/si/SIBios.cpp b/libs/dolphin/si/SIBios.cpp index 7ae46162c19..77bf9681bf6 100644 --- a/libs/dolphin/si/SIBios.cpp +++ b/libs/dolphin/si/SIBios.cpp @@ -11,22 +11,6 @@ // Forward References: // -extern "C" extern u8 lit_457[12]; -extern "C" extern u8 lit_459[15 + 1 /* padding */]; -extern "C" extern u8 lit_460[15 + 1 /* padding */]; -extern "C" extern u8 lit_461[13 + 3 /* padding */]; -extern "C" extern u8 lit_462[10 + 2 /* padding */]; -extern "C" extern u8 lit_463[16]; -extern "C" extern u8 lit_464[20]; -extern "C" extern u8 lit_465[18 + 2 /* padding */]; -extern "C" extern u8 lit_466[20]; -extern "C" extern u8 lit_467[9 + 3 /* padding */]; -extern "C" extern u8 lit_468[9 + 7 /* padding */]; -extern "C" extern u8 InputBufferValid[16]; -extern "C" extern u8 InputBuffer[32]; -extern "C" extern u8 data_8044C820[16]; -extern "C" extern u8 __PADFixBits[4 + 4 /* padding */]; - extern "C" void SIBusy(); extern "C" void SIIsChanBusy(); extern "C" static void CompleteTransfer(); diff --git a/libs/dolphin/vi/vi.cpp b/libs/dolphin/vi/vi.cpp index 814c92bf999..03a6d2feae2 100644 --- a/libs/dolphin/vi/vi.cpp +++ b/libs/dolphin/vi/vi.cpp @@ -11,9 +11,6 @@ // Forward References: // -extern "C" extern u8 shdwRegs[118 + 2 /* padding */]; -extern "C" extern u8 pad_80450A19[4]; - extern "C" static void __VIRetraceHandler(); extern "C" void VISetPreRetraceCallback(); extern "C" void VISetPostRetraceCallback(); diff --git a/libs/exi/EXIBios.cpp b/libs/exi/EXIBios.cpp index ac480f638b2..174293ce3dc 100644 --- a/libs/exi/EXIBios.cpp +++ b/libs/exi/EXIBios.cpp @@ -11,19 +11,6 @@ // Forward References: // -extern "C" extern u8 lit_473[15 + 1 /* padding */]; -extern "C" extern u8 lit_474[16]; -extern "C" extern u8 lit_475[16]; -extern "C" extern u8 lit_476[16]; -extern "C" extern u8 lit_477[17 + 3 /* padding */]; -extern "C" extern u8 lit_478[17 + 3 /* padding */]; -extern "C" extern u8 lit_479[12]; -extern "C" extern u8 lit_485[9 + 3 /* padding */]; -extern "C" extern u8 lit_486[13 + 3 /* padding */]; -extern "C" extern u8 lit_487[18 + 2 /* padding */]; -extern "C" extern u8 lit_489[14 + 2 /* padding */]; -extern "C" extern u8 lit_490[14 + 6 /* padding */]; - extern "C" static void SetExiInterruptMask(); extern "C" void EXIImm(); extern "C" void EXIImmEx(); @@ -64,8 +51,6 @@ extern "C" extern u8 lit_490[14 + 6 /* padding */]; // External References: // -extern "C" extern u8 __OSInIPL[4 + 4 /* padding */]; - extern "C" void OSGetConsoleType(); extern "C" void __OSGetDIConfig(); extern "C" void OSRegisterVersion(); diff --git a/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp b/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp index 7bd24742812..fb5c432ae21 100644 --- a/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp +++ b/libs/odemuexi2/src/OdemuExi2Lib/DebuggerDriver.cpp @@ -30,8 +30,6 @@ extern "C" static void DBGEXIImm(); // External References: // -extern "C" extern u32 data_80450AF0; - extern "C" void OSDisableInterrupts(); extern "C" void OSRestoreInterrupts(); extern "C" void __OSSetInterruptHandler(); diff --git a/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp b/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp index 41d0c1c5bde..e638ee66ca0 100644 --- a/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp +++ b/rel/d/a/b/d_a_b_bh/d_a_b_bh.cpp @@ -21,13 +21,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -221,47 +221,6 @@ static bool daB_BH_IsDelete(b_bh_class*); static void daB_BH_Delete(b_bh_class*); static void useHeapInit(fopAc_ac_c*); static void daB_BH_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_B_BH[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_805B341C[4]; -extern "C" extern u8 data_805B3420[4]; -extern "C" extern u8 data_805B3424[4]; -extern "C" extern u8 data_805B3428[4]; -extern "C" extern u8 data_805B342C[4]; -extern "C" extern u8 data_805B3430[4]; -extern "C" extern u8 data_805B3434[4]; -extern "C" extern u8 data_805B3438[4]; -extern "C" extern u8 data_805B343C[4]; -extern "C" extern u8 data_805B3440[4]; -extern "C" extern u8 data_805B3444[4]; -extern "C" extern u8 data_805B3448[4]; -extern "C" extern u8 data_805B344C[4]; -extern "C" extern u8 data_805B3450[4]; -extern "C" extern u8 data_805B3454[4]; -extern "C" extern u8 data_805B3458[4]; -extern "C" extern u8 data_805B345C[4]; -extern "C" extern u8 data_805B3460[4]; -extern "C" extern u8 data_805B3464[4]; -extern "C" extern u8 data_805B3468[4]; -extern "C" extern u8 data_805B346C[4]; -extern "C" extern u8 data_805B3470[4]; -extern "C" extern u8 data_805B3474[4]; -extern "C" extern u8 data_805B3478[4]; -extern "C" extern u8 data_805B347C[4]; extern "C" void __ct__12daB_BH_HIO_cFv(); extern "C" static void anm_init__FP10b_bh_classifUcf(); @@ -382,22 +341,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_bh/executor.cpp b/rel/d/a/b/d_a_b_bh/executor.cpp index d4eddcb517c..79234f25bda 100644 --- a/rel/d/a/b/d_a_b_bh/executor.cpp +++ b/rel/d/a/b/d_a_b_bh/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805B312C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_bh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_bh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 988fb5b8611..c8ea087f9c6 100644 --- a/rel/d/a/b/d_a_b_bh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_bh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805B3138[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805B3138-805B3140 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805B3138[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805B33A8-805B33B0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_bh/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_bh/unknown_translation_unit_ctors.cpp index c76657bad7d..3c76c8ccef3 100644 --- a/rel/d/a/b/d_a_b_bh/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_bh/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805B312C[2]; -extern void* const data_805B312C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_bh_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805B312C-805B3134 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805B312C[2] = { + (void*)__sinit_d_a_b_bh_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp index 6cf058e2068..c6a7b40e114 100644 --- a/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp +++ b/rel/d/a/b/d_a_b_bq/d_a_b_bq.cpp @@ -69,13 +69,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -338,117 +338,6 @@ static void mDoAud_seStart(u32, Vec const*, u32, s8); static void cM_ssin(s16); static void dComIfGp_getEvent(); static void dComIfGp_getVibration(); -extern "C" extern u32 const lit_5960; -extern "C" extern u32 const lit_5961; -extern "C" extern u32 const lit_5962; -extern "C" extern u32 const lit_5963; -extern "C" extern u32 const lit_5964; -extern "C" extern u32 const lit_5965; -extern "C" extern u32 const lit_5966; -extern "C" extern u32 const lit_5967; -extern "C" extern u32 const lit_5968; -extern "C" extern u32 const lit_5969; -extern "C" extern u32 const lit_5970; -extern "C" extern u32 const lit_5971; -extern "C" extern u32 const lit_5972; -extern "C" extern u32 const lit_5973; -extern "C" extern u32 const lit_5974; -extern "C" extern u32 const lit_5975; -extern "C" extern u32 const lit_5976; -extern "C" extern u32 const lit_5977; -extern "C" extern u32 const lit_5978; -extern "C" extern u32 const lit_5979; -extern "C" extern u32 const lit_5980; -extern "C" extern u32 const lit_5981; -extern "C" extern u32 const lit_5982; -extern "C" extern u32 const lit_5983; -extern "C" extern u32 const lit_5984; -extern "C" extern u32 const lit_5985; -extern "C" extern u32 const lit_5986; -extern "C" extern u32 const lit_5988; -extern "C" extern u32 const lit_5989; -extern "C" extern u32 const lit_5990; -extern "C" extern u32 const lit_5991; -extern "C" extern u32 const lit_5992; -extern "C" extern u32 const lit_5993; -extern "C" extern u32 const lit_5994; -extern "C" extern u32 const lit_5995; -extern "C" extern u32 const lit_5997; -extern "C" extern u32 const lit_5998; -extern "C" extern u32 const lit_5999; -extern "C" extern u32 const lit_6000; -extern "C" extern u32 const lit_6001; -extern "C" extern u32 const lit_6003; -extern "C" extern u32 const lit_6004; -extern "C" extern u32 const lit_6005; -extern "C" extern u32 const lit_6006; -extern "C" extern u32 const lit_6007; -extern "C" extern u32 const lit_6008; -extern "C" extern u32 const lit_6009; -extern "C" extern u32 const lit_6010; -extern "C" extern u32 const lit_6011; -extern "C" extern u32 const lit_6012; -extern "C" extern u32 const lit_6013; -extern "C" extern u32 const lit_6014; -extern "C" extern u32 const lit_6015; -extern "C" extern u32 const lit_6016; -extern "C" extern u32 const lit_6017; -extern "C" extern u32 const lit_6018; -extern "C" extern u32 const lit_6019; -extern "C" extern u32 const lit_6020; -extern "C" extern u32 const lit_6021; -extern "C" extern u32 const lit_6022; -extern "C" extern u32 const lit_6023; -extern "C" extern u32 const lit_6024; -extern "C" extern u32 const lit_6025; -extern "C" extern u32 const lit_6026; -extern "C" extern u32 const lit_6027; -extern "C" extern u32 const lit_6028; -extern "C" extern u32 const lit_6029; -extern "C" extern u32 const lit_6031; -extern "C" extern u32 const lit_6032; -extern "C" extern u32 const lit_6033; -extern "C" extern u32 const lit_6034; -extern "C" extern u32 const lit_6035; -extern "C" extern u32 const lit_6036; -extern "C" extern u32 const lit_6037; -extern "C" extern u32 const lit_6038; -extern "C" extern u32 const lit_6039; -extern "C" extern u32 const lit_6041; -extern "C" extern u32 const lit_6042; -extern "C" extern u32 const lit_6043; -extern "C" extern u32 const lit_6044; -extern "C" extern u32 const lit_6045; -extern "C" extern u32 const lit_6046; -extern "C" extern u32 const lit_6047; -extern "C" extern u32 const lit_6048; -extern "C" extern u32 const lit_6049; -extern "C" extern u32 const lit_6051; -extern "C" extern u32 const lit_6052; -extern "C" extern u32 const lit_6053; -extern "C" extern u32 const lit_6054; -extern "C" extern u32 const lit_6055; -extern "C" extern u32 const lit_6056; -extern "C" extern u32 const lit_6057; -extern "C" extern u32 const lit_6058; -extern "C" extern u32 const lit_6059; -extern "C" extern u32 const lit_6060; -extern "C" extern u32 const lit_6061; -extern "C" extern u32 const lit_6062; -extern "C" extern u32 const lit_6063; -extern "C" extern u32 const lit_6064; -extern "C" extern u32 const lit_6065; -extern "C" extern u32 const lit_6066; -extern "C" extern u32 const lit_6067; -extern "C" extern u32 const lit_6068; -extern "C" extern u32 const lit_6069; -extern "C" extern u32 const lit_6070; -extern "C" extern u32 const lit_6073; -extern "C" extern u32 const lit_6074; -extern "C" extern u32 const lit_6075[1 + 1 /* padding */]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_BQ[12]; extern "C" void __ct__12daB_BQ_HIO_cFv(); extern "C" static void anm_init__FP10b_bq_classifUcf(); @@ -684,24 +573,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void onBlure__13mDoGph_gInf_cFv(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_bq/executor.cpp b/rel/d/a/b/d_a_b_bq/executor.cpp index 185c9819bf9..668e4a3a01d 100644 --- a/rel/d/a/b/d_a_b_bq/executor.cpp +++ b/rel/d/a/b/d_a_b_bq/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805BA574[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_bq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_bq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c569f7c54f1..f8281d5b89f 100644 --- a/rel/d/a/b/d_a_b_bq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_bq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805BA580[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805BA580-805BA588 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805BA580[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805BAD48-805BAD50 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_bq/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_bq/unknown_translation_unit_ctors.cpp index 983a29d1105..b65cb1104c2 100644 --- a/rel/d/a/b/d_a_b_bq/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_bq/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805BA574[2]; -extern void* const data_805BA574[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_bq_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805BA574-805BA57C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805BA574[2] = { + (void*)__sinit_d_a_b_bq_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp b/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp index 5ad1ff3317b..cc8dd02b364 100644 --- a/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp +++ b/rel/d/a/b/d_a_b_dr/d_a_b_dr.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -25,6 +23,8 @@ struct cXyz { /* 805BB0E4 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -47,13 +47,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -73,10 +73,10 @@ struct daPy_py_c { /* 8015F398 */ void checkMasterSwordEquip(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daB_DR_c { /* 805BAF80 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 805BB120 */ void JointCallBack(J3DJoint*, int); @@ -186,12 +186,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -384,85 +384,6 @@ static void useHeapInit(fopAc_ac_c*); static void daB_DR_Create(daB_DR_c*); static void cLib_calcTimer__template0(int*); static void cLib_calcTimer__template1(u8*); -extern "C" extern u32 const lit_4312; -extern "C" extern u32 const lit_4314; -extern "C" extern u32 const lit_4315; -extern "C" extern u32 const lit_4316; -extern "C" extern u32 const lit_4317; -extern "C" extern u32 const lit_4318; -extern "C" extern u32 const lit_4319; -extern "C" extern u32 const lit_4320; -extern "C" extern u32 const lit_4324; -extern "C" extern u32 const lit_4325; -extern "C" extern u32 const lit_4326; -extern "C" extern u32 const lit_4327; -extern "C" extern u32 const lit_4328; -extern "C" extern u32 const lit_4329; -extern "C" extern u32 const lit_4330; -extern "C" extern u32 const lit_4331; -extern "C" extern u32 const lit_4332; -extern "C" extern u32 const lit_4333; -extern "C" extern u32 const lit_4334; -extern "C" extern u32 const lit_4335; -extern "C" extern u32 const lit_4336; -extern "C" extern u32 const lit_4337; -extern "C" extern u32 const lit_4339; -extern "C" extern u32 const lit_4340; -extern "C" extern u32 const lit_4341; -extern "C" extern u32 const lit_4617; -extern "C" extern u32 const lit_6770; -extern "C" extern u32 const lit_6772; -extern "C" extern u32 const lit_6773; -extern "C" extern u32 const lit_6774; -extern "C" extern u32 const lit_6775; -extern "C" extern u32 const lit_7382; -extern "C" extern u32 const lit_7383; -extern "C" extern u32 const lit_7384; -extern "C" extern u32 const lit_7385; -extern "C" extern u32 const lit_7386; -extern "C" extern u32 const lit_7558; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_DR[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_805C79DC[4]; -extern "C" extern u8 data_805C79E0[4]; -extern "C" extern u8 data_805C79E4[4]; -extern "C" extern u8 data_805C79E8[4]; -extern "C" extern u8 data_805C79EC[4]; -extern "C" extern u8 data_805C79F0[4]; -extern "C" extern u8 data_805C79F4[4]; -extern "C" extern u8 data_805C79F8[4]; -extern "C" extern u8 data_805C79FC[4]; -extern "C" extern u8 data_805C7A00[4]; -extern "C" extern u8 data_805C7A04[4]; -extern "C" extern u8 data_805C7A08[4]; -extern "C" extern u8 data_805C7A0C[4]; -extern "C" extern u8 data_805C7A10[4]; -extern "C" extern u8 data_805C7A14[4]; -extern "C" extern u8 data_805C7A18[4]; -extern "C" extern u8 data_805C7A1C[4]; -extern "C" extern u8 data_805C7A20[4]; -extern "C" extern u8 data_805C7A24[4]; -extern "C" extern u8 data_805C7A28[4]; -extern "C" extern u8 data_805C7A2C[4]; -extern "C" extern u8 data_805C7A30[4]; -extern "C" extern u8 data_805C7A34[4]; -extern "C" extern u8 data_805C7A38[4]; -extern "C" extern u8 data_805C7A3C[4]; extern "C" void __ct__12daB_DR_HIO_cFv(); extern "C" void ctrlJoint__8daB_DR_cFP8J3DJointP8J3DModel(); @@ -686,26 +607,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_dr/executor.cpp b/rel/d/a/b/d_a_b_dr/executor.cpp index d771f2d9b76..c5c2f4f56b0 100644 --- a/rel/d/a/b/d_a_b_dr/executor.cpp +++ b/rel/d/a/b/d_a_b_dr/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805C6C60[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_dr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_dr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d554b1955d8..66f08edf21a 100644 --- a/rel/d/a/b/d_a_b_dr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_dr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805C6C6C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805C6C6C-805C6C74 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805C6C6C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805C78B8-805C78C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_dr/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_dr/unknown_translation_unit_ctors.cpp index b29648d51ef..f75cdaf4a6f 100644 --- a/rel/d/a/b/d_a_b_dr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_dr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805C6C60[2]; -extern void* const data_805C6C60[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_dr_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805C6C60-805C6C68 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805C6C60[2] = { + (void*)__sinit_d_a_b_dr_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp index fe1d15ba1bd..4c03fe6f53b 100644 --- a/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp +++ b/rel/d/a/b/d_a_b_dre/d_a_b_dre.cpp @@ -50,13 +50,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -215,93 +215,6 @@ static void daB_DRE_Delete(daB_DRE_c*); static void daB_DRE_Draw(daB_DRE_c*); static void daB_DRE_Execute(daB_DRE_c*); static bool daB_DRE_IsDelete(daB_DRE_c*); -extern "C" extern u32 const lit_4408; -extern "C" extern u32 const lit_4410; -extern "C" extern u32 const lit_4412; -extern "C" extern u32 const lit_4413; -extern "C" extern u32 const lit_4414; -extern "C" extern u32 const lit_4415; -extern "C" extern u32 const lit_4606; -extern "C" extern u32 const lit_4607; -extern "C" extern u32 const lit_4608; -extern "C" extern u32 const lit_4609; -extern "C" extern u32 const lit_4610; -extern "C" extern u32 const lit_4611; -extern "C" extern u32 const lit_4612; -extern "C" extern u32 const lit_4613; -extern "C" extern u32 const lit_4614; -extern "C" extern u32 const lit_4615; -extern "C" extern u32 const lit_4616; -extern "C" extern u32 const lit_4617; -extern "C" extern u32 const lit_4618; -extern "C" extern u32 const lit_4619; -extern "C" extern u32 const lit_4620; -extern "C" extern u32 const lit_4758; -extern "C" extern u32 const lit_4759; -extern "C" extern u32 const lit_4760; -extern "C" extern u32 const lit_4761; -extern "C" extern u32 const lit_4762; -extern "C" extern u32 const lit_4763; -extern "C" extern u32 const lit_4764; -extern "C" extern u32 const lit_4765; -extern "C" extern u32 const lit_4766; -extern "C" extern u32 const lit_4767; -extern "C" extern u32 const lit_4768; -extern "C" extern u32 const lit_4769; -extern "C" extern u32 const lit_4770; -extern "C" extern u32 const lit_4771; -extern "C" extern u32 const lit_4772; -extern "C" extern u32 const lit_4773; -extern "C" extern u32 const lit_4774; -extern "C" extern u32 const lit_4775; -extern "C" extern u32 const lit_4776; -extern "C" extern u32 const lit_4777; -extern "C" extern u32 const lit_4778; -extern "C" extern u32 const lit_4779; -extern "C" extern u32 const lit_4780; -extern "C" extern u32 const lit_4781; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_B_DRE[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_805CB0D8[4]; -extern "C" extern u8 data_805CB0DC[4]; -extern "C" extern u8 data_805CB0E0[4]; -extern "C" extern u8 data_805CB0E4[4]; -extern "C" extern u8 data_805CB0E8[4]; -extern "C" extern u8 data_805CB0EC[4]; -extern "C" extern u8 data_805CB0F0[4]; -extern "C" extern u8 data_805CB0F4[4]; -extern "C" extern u8 data_805CB0F8[4]; -extern "C" extern u8 data_805CB0FC[4]; -extern "C" extern u8 data_805CB100[4]; -extern "C" extern u8 data_805CB104[4]; -extern "C" extern u8 data_805CB108[4]; -extern "C" extern u8 data_805CB10C[4]; -extern "C" extern u8 data_805CB110[4]; -extern "C" extern u8 data_805CB114[4]; -extern "C" extern u8 data_805CB118[4]; -extern "C" extern u8 data_805CB11C[4]; -extern "C" extern u8 data_805CB120[4]; -extern "C" extern u8 data_805CB124[4]; -extern "C" extern u8 data_805CB128[4]; -extern "C" extern u8 data_805CB12C[4]; -extern "C" extern u8 data_805CB130[4]; -extern "C" extern u8 data_805CB134[4]; -extern "C" extern u8 data_805CB138[4]; extern "C" static void useHeapInit__FP10fopAc_ac_c(); extern "C" void __dt__12J3DFrameCtrlFv(); @@ -457,15 +370,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void onBlure__13mDoGph_gInf_cFv(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/b/d_a_b_dre/executor.cpp b/rel/d/a/b/d_a_b_dre/executor.cpp index 82f5113cd9a..7e28469698d 100644 --- a/rel/d/a/b/d_a_b_dre/executor.cpp +++ b/rel/d/a/b/d_a_b_dre/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805CAD48[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_dre/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_dre/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 994b5aa6eaf..96c9bcb5c79 100644 --- a/rel/d/a/b/d_a_b_dre/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_dre/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805CAD54[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805CAD54-805CAD5C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805CAD54[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805CB038-805CB040 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_dre/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_dre/unknown_translation_unit_ctors.cpp index 23896cc7bf5..46de348ed11 100644 --- a/rel/d/a/b/d_a_b_dre/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_dre/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805CAD48[2]; -extern void* const data_805CAD48[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_dre_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805CAD48-805CAD50 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805CAD48[2] = { + (void*)__sinit_d_a_b_dre_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp index c3e150ed125..6cac30b0337 100644 --- a/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp +++ b/rel/d/a/b/d_a_b_ds/d_a_b_ds.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -31,6 +29,8 @@ struct cXyz { /* 805DCA28 */ void zero(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -64,13 +64,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -92,10 +92,10 @@ struct daPy_py_c { /* 805DC9DC */ void changeDemoMode(u32, int, int, s16); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daB_DS_c { /* 805CB314 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 805CB4A4 */ void JointCallBack(J3DJoint*, int); @@ -423,116 +423,6 @@ static void useHeapInit(fopAc_ac_c*); static void daB_DS_Create(daB_DS_c*); static void cLib_calcTimer__template0(int*); static void cLib_calcTimer__template1(u8*); -extern "C" extern u8 const data_805DCAF4[128]; -extern "C" extern u32 const lit_5973; -extern "C" extern u32 const lit_5974; -extern "C" extern u32 const lit_5975; -extern "C" extern u32 const lit_5976; -extern "C" extern u32 const lit_5977; -extern "C" extern u32 const lit_5978; -extern "C" extern u32 const lit_5979; -extern "C" extern u32 const lit_5982; -extern "C" extern u32 const lit_5984; -extern "C" extern u32 const lit_5985; -extern "C" extern u32 const lit_5988; -extern "C" extern u32 const lit_5989; -extern "C" extern u32 const lit_5991; -extern "C" extern u32 const lit_5992; -extern "C" extern u32 const lit_7932; -extern "C" extern u32 const lit_7933; -extern "C" extern u32 const lit_7934; -extern "C" extern u32 const lit_7935; -extern "C" extern u32 const lit_7936; -extern "C" extern u32 const lit_7937; -extern "C" extern u32 const lit_7938; -extern "C" extern u32 const lit_9573; -extern "C" extern u32 const lit_9574; -extern "C" extern u32 const lit_9575; -extern "C" extern u32 const lit_9576; -extern "C" extern u32 const lit_9577; -extern "C" extern u32 const lit_9578; -extern "C" extern u32 const lit_9579; -extern "C" extern u32 const lit_9580; -extern "C" extern u32 const lit_9581; -extern "C" extern u32 const lit_9582; -extern "C" extern u32 const lit_9583; -extern "C" extern u32 const lit_9584; -extern "C" extern u32 const lit_9585; -extern "C" extern u32 const lit_9586; -extern "C" extern u32 const lit_9587; -extern "C" extern u32 const lit_9588; -extern "C" extern u32 const lit_9589; -extern "C" extern u32 const lit_9590; -extern "C" extern u32 const lit_9967; -extern "C" extern u32 const lit_9968; -extern "C" extern u32 const lit_9969; -extern "C" extern u32 const lit_9970; -extern "C" extern u32 const lit_9971; -extern "C" extern u32 const lit_9972; -extern "C" extern u32 const lit_9973; -extern "C" extern u32 const lit_9974; -extern "C" extern u32 const lit_9975; -extern "C" extern u32 const lit_9976; -extern "C" extern u32 const lit_9977; -extern "C" extern u32 const lit_9978; -extern "C" extern u32 const lit_9979; -extern "C" extern u32 const lit_9980; -extern "C" extern u32 const lit_9981; -extern "C" extern u32 const lit_9982; -extern "C" extern u32 const lit_9983; -extern "C" extern u32 const lit_9984; -extern "C" extern u32 const lit_10107; -extern "C" extern u32 const lit_10108; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_805DD268[8]; -extern "C" extern u8 data_805DD270[8]; -extern "C" extern u8 data_805DD278[6 + 2 /* padding */]; -extern "C" extern u8 data_805DD300[64]; -extern "C" extern u8 data_805DD4A8[4]; -extern "C" extern u8 data_805DD4AC[8]; -extern "C" extern u8 data_805DD4B4[6 + 2 /* padding */]; -extern "C" extern u8 data_805DD938[72]; -extern "C" extern void* g_profile_B_DS[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_805DE2AC[4]; -extern "C" extern u8 data_805DE2B0[4]; -extern "C" extern u8 data_805DE2B4[4]; -extern "C" extern u8 data_805DE2B8[4]; -extern "C" extern u8 data_805DE2BC[4]; -extern "C" extern u8 data_805DE2C0[4]; -extern "C" extern u8 data_805DE2C4[4]; -extern "C" extern u8 data_805DE2C8[4]; -extern "C" extern u8 data_805DE2CC[4]; -extern "C" extern u8 data_805DE2D0[4]; -extern "C" extern u8 data_805DE2D4[4]; -extern "C" extern u8 data_805DE2D8[4]; -extern "C" extern u8 data_805DE2DC[4]; -extern "C" extern u8 data_805DE2E0[4]; -extern "C" extern u8 data_805DE2E4[4]; -extern "C" extern u8 data_805DE2E8[4]; -extern "C" extern u8 data_805DE2EC[4]; -extern "C" extern u8 data_805DE2F0[4]; -extern "C" extern u8 data_805DE2F4[4]; -extern "C" extern u8 data_805DE2F8[4]; -extern "C" extern u8 data_805DE2FC[4]; -extern "C" extern u8 data_805DE300[4]; -extern "C" extern u8 data_805DE304[4]; -extern "C" extern u8 data_805DE308[4]; -extern "C" extern u8 data_805DE30C[4]; extern "C" void __ct__12daB_DS_HIO_cFv(); extern "C" void ctrlJoint__8daB_DS_cFP8J3DJointP8J3DModel(); @@ -807,28 +697,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_ds/executor.cpp b/rel/d/a/b/d_a_b_ds/executor.cpp index 6cccbeacc8d..fe3f10fb7ed 100644 --- a/rel/d/a/b/d_a_b_ds/executor.cpp +++ b/rel/d/a/b/d_a_b_ds/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805DCA40[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_ds/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_ds/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a83d18ff985..ab3b6017f9a 100644 --- a/rel/d/a/b/d_a_b_ds/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_ds/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805DCA4C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805DCA4C-805DCA54 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805DCA4C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805DDA68-805DDA70 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_ds/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_ds/unknown_translation_unit_ctors.cpp index 4490d97bb26..9344a2986a0 100644 --- a/rel/d/a/b/d_a_b_ds/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_ds/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805DCA40[2]; -extern void* const data_805DCA40[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_ds_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805DCA40-805DCA48 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805DCA40[2] = { + (void*)__sinit_d_a_b_ds_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp index 86928768aeb..3b2ec6e80c0 100644 --- a/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp +++ b/rel/d/a/b/d_a_b_gg/d_a_b_gg.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 8026745C */ void operator+=(csXyz&); -}; - struct Vec {}; struct cXyz { @@ -24,6 +20,10 @@ struct cXyz { /* 805ED010 */ ~cXyz(); }; +struct csXyz { + /* 8026745C */ void operator+=(csXyz&); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -36,13 +36,13 @@ struct mDoGph_gInf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -66,10 +66,10 @@ struct daPy_py_c { /* 8015F8E4 */ void cancelBoomerangLockActor(fopAc_ac_c*); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daB_GG_c { /* 805DE464 */ void CreateHeap(); /* 805DE650 */ void initCc(); @@ -365,83 +365,6 @@ static bool daB_GG_IsDelete(daB_GG_c*); static void daB_GG_Delete(daB_GG_c*); static void daB_GG_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5009; -extern "C" extern u32 const lit_5011; -extern "C" extern u32 const lit_5014; -extern "C" extern u32 const lit_5015; -extern "C" extern u32 const lit_5016; -extern "C" extern u32 const lit_5017; -extern "C" extern u32 const lit_5019; -extern "C" extern u32 const lit_5020; -extern "C" extern u32 const lit_5021; -extern "C" extern u32 const lit_5025; -extern "C" extern u32 const lit_5029; -extern "C" extern u32 const lit_5033; -extern "C" extern u32 const lit_5034; -extern "C" extern u32 const lit_5035; -extern "C" extern u32 const lit_5036; -extern "C" extern u32 const lit_5642; -extern "C" extern u32 const lit_5643; -extern "C" extern u32 const lit_5644; -extern "C" extern u32 const lit_5645; -extern "C" extern u32 const lit_5646; -extern "C" extern u32 const lit_5648; -extern "C" extern u32 const lit_5649; -extern "C" extern u32 const lit_5650; -extern "C" extern u32 const lit_6626; -extern "C" extern u32 const lit_7819; -extern "C" extern u32 const lit_8733; -extern "C" extern u32 const lit_8734; -extern "C" extern u32 const lit_8735; -extern "C" extern u32 const lit_8736; -extern "C" extern u32 const lit_8737; -extern "C" extern u32 const lit_8738; -extern "C" extern u32 const lit_8739; -extern "C" extern u32 const lit_8740; -extern "C" extern u32 const lit_8741; -extern "C" extern u32 const lit_8742; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_GG[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_805ED7E0[4]; -extern "C" extern u8 data_805ED7E4[4]; -extern "C" extern u8 data_805ED7E8[4]; -extern "C" extern u8 data_805ED7EC[4]; -extern "C" extern u8 data_805ED7F0[4]; -extern "C" extern u8 data_805ED7F4[4]; -extern "C" extern u8 data_805ED7F8[4]; -extern "C" extern u8 data_805ED7FC[4]; -extern "C" extern u8 data_805ED800[4]; -extern "C" extern u8 data_805ED804[4]; -extern "C" extern u8 data_805ED808[4]; -extern "C" extern u8 data_805ED80C[4]; -extern "C" extern u8 data_805ED810[4]; -extern "C" extern u8 data_805ED814[4]; -extern "C" extern u8 data_805ED818[4]; -extern "C" extern u8 data_805ED81C[4]; -extern "C" extern u8 data_805ED820[4]; -extern "C" extern u8 data_805ED824[4]; -extern "C" extern u8 data_805ED828[4]; -extern "C" extern u8 data_805ED82C[4]; -extern "C" extern u8 data_805ED830[4]; -extern "C" extern u8 data_805ED834[4]; -extern "C" extern u8 data_805ED838[4]; -extern "C" extern u8 data_805ED83C[4]; -extern "C" extern u8 data_805ED840[4]; extern "C" void __ct__12daB_GG_HIO_cFv(); extern "C" void CreateHeap__8daB_GG_cFv(); @@ -670,28 +593,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void onBlure__13mDoGph_gInf_cFv(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_gg/executor.cpp b/rel/d/a/b/d_a_b_gg/executor.cpp index bef63c05969..724fd5027b4 100644 --- a/rel/d/a/b/d_a_b_gg/executor.cpp +++ b/rel/d/a/b/d_a_b_gg/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805ED04C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_gg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_gg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2f8521d3348..2219cd87f51 100644 --- a/rel/d/a/b/d_a_b_gg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_gg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805ED058[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805ED058-805ED060 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805ED058[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805ED6B8-805ED6C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_gg/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_gg/unknown_translation_unit_ctors.cpp index 89f86101b40..5bae11350e6 100644 --- a/rel/d/a/b/d_a_b_gg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_gg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805ED04C[2]; -extern void* const data_805ED04C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_gg_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805ED04C-805ED054 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805ED04C[2] = { + (void*)__sinit_d_a_b_gg_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp b/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp index 263c5167e6e..c2c4d5c0fbc 100644 --- a/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp +++ b/rel/d/a/b/d_a_b_gm/d_a_b_gm.cpp @@ -46,13 +46,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -318,82 +318,6 @@ static void daB_GM_Delete(b_gm_class*); static void useHeapInit(fopAc_ac_c*); static void daB_GM_Create(fopAc_ac_c*); static void dComIfGp_particle_set(u16, cXyz const*, csXyz const*, cXyz const*); -extern "C" extern u32 const lit_4347[1 + 1 /* padding */]; -extern "C" extern u32 const lit_4353; -extern "C" extern u32 const lit_4618; -extern "C" extern u32 const lit_5484; -extern "C" extern u32 const lit_5485; -extern "C" extern u32 const lit_5486; -extern "C" extern u32 const lit_5487; -extern "C" extern u32 const lit_5488; -extern "C" extern u32 const lit_5489; -extern "C" extern u32 const lit_5490; -extern "C" extern u32 const lit_5491; -extern "C" extern u32 const lit_5492; -extern "C" extern u32 const lit_5494; -extern "C" extern u32 const lit_5495; -extern "C" extern u32 const lit_5496; -extern "C" extern u32 const lit_5497; -extern "C" extern u32 const lit_5498; -extern "C" extern u32 const lit_5499; -extern "C" extern u32 const lit_5500; -extern "C" extern u32 const lit_5502; -extern "C" extern u32 const lit_5503; -extern "C" extern u32 const lit_5504; -extern "C" extern u32 const lit_5505; -extern "C" extern u32 const lit_5506; -extern "C" extern u32 const lit_5507; -extern "C" extern u32 const lit_5508; -extern "C" extern u32 const lit_5509; -extern "C" extern u32 const lit_5510; -extern "C" extern u32 const lit_5511; -extern "C" extern u32 const lit_5512; -extern "C" extern u32 const lit_5513; -extern "C" extern u32 const lit_5514; -extern "C" extern u32 const lit_5516; -extern "C" extern u32 const lit_5517; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_GM[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_805F48EC[4]; -extern "C" extern u8 data_805F48F0[4]; -extern "C" extern u8 data_805F48F4[4]; -extern "C" extern u8 data_805F48F8[4]; -extern "C" extern u8 data_805F48FC[4]; -extern "C" extern u8 data_805F4900[4]; -extern "C" extern u8 data_805F4904[4]; -extern "C" extern u8 data_805F4908[4]; -extern "C" extern u8 data_805F490C[4]; -extern "C" extern u8 data_805F4910[4]; -extern "C" extern u8 data_805F4914[4]; -extern "C" extern u8 data_805F4918[4]; -extern "C" extern u8 data_805F491C[4]; -extern "C" extern u8 data_805F4920[4]; -extern "C" extern u8 data_805F4924[4]; -extern "C" extern u8 data_805F4928[4]; -extern "C" extern u8 data_805F492C[4]; -extern "C" extern u8 data_805F4930[4]; -extern "C" extern u8 data_805F4934[4]; -extern "C" extern u8 data_805F4938[4]; -extern "C" extern u8 data_805F493C[4]; -extern "C" extern u8 data_805F4940[4]; -extern "C" extern u8 data_805F4944[4]; -extern "C" extern u8 data_805F4948[4]; -extern "C" extern u8 data_805F494C[4]; extern "C" void __ct__12daB_GM_HIO_cFv(); extern "C" static void anm_init__FP10b_gm_classifUcf(); @@ -569,23 +493,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_gm/executor.cpp b/rel/d/a/b/d_a_b_gm/executor.cpp index da982ec7614..c849ceb570b 100644 --- a/rel/d/a/b/d_a_b_gm/executor.cpp +++ b/rel/d/a/b/d_a_b_gm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805F4174[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 80bbb999754..cff9ff5e203 100644 --- a/rel/d/a/b/d_a_b_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805F4180[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805F4180-805F4188 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805F4180[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805F4788-805F4790 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_gm/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_gm/unknown_translation_unit_ctors.cpp index 1aa0c064b13..0da989cf9bb 100644 --- a/rel/d/a/b/d_a_b_gm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_gm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805F4174[2]; -extern void* const data_805F4174[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_gm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805F4174-805F417C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805F4174[2] = { + (void*)__sinit_d_a_b_gm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp index 683400d588b..fc5dea341be 100644 --- a/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp +++ b/rel/d/a/b/d_a_b_gnd/d_a_b_gnd.cpp @@ -31,10 +31,10 @@ struct mDoExt_morf_c { /* 806024EC */ void isStop(); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -60,13 +60,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -94,10 +94,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; - struct dKy_tevstr_c {}; +struct ResTIMG {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -458,136 +458,6 @@ static void dComIfGp_particle_set(u16, cXyz const*, csXyz const*, cXyz const*); static void dComIfGp_getCamera(int); static void dComIfGp_getPlayerCameraID(int); static void dComIfGp_getPlayer(int); -extern "C" extern u32 const lit_4965; -extern "C" extern u32 const lit_4973; -extern "C" extern u32 const lit_4974; -extern "C" extern u32 const lit_5307; -extern "C" extern u32 const lit_5536; -extern "C" extern u32 const lit_5537; -extern "C" extern u32 const lit_5538; -extern "C" extern u32 const lit_5539; -extern "C" extern u32 const lit_6508; -extern "C" extern u32 const lit_6509; -extern "C" extern u32 const lit_7202; -extern "C" extern u32 const lit_7203; -extern "C" extern u32 const lit_7204; -extern "C" extern u32 const lit_7205; -extern "C" extern u32 const lit_7206; -extern "C" extern u32 const lit_7208; -extern "C" extern u32 const lit_7209; -extern "C" extern u32 const lit_7210; -extern "C" extern u32 const lit_7211; -extern "C" extern u32 const lit_7212; -extern "C" extern u32 const lit_7213; -extern "C" extern u32 const lit_7214; -extern "C" extern u32 const lit_7215; -extern "C" extern u32 const lit_7216; -extern "C" extern u32 const lit_7217; -extern "C" extern u32 const lit_7218; -extern "C" extern u32 const lit_7219; -extern "C" extern u32 const lit_7220; -extern "C" extern u32 const lit_7221; -extern "C" extern u32 const lit_7223; -extern "C" extern u32 const lit_7224; -extern "C" extern u32 const lit_7226; -extern "C" extern u32 const lit_7228; -extern "C" extern u32 const lit_7229; -extern "C" extern u32 const lit_7230; -extern "C" extern u32 const lit_7231; -extern "C" extern u32 const lit_7232; -extern "C" extern u32 const lit_7234; -extern "C" extern u32 const lit_7235; -extern "C" extern u32 const lit_7236; -extern "C" extern u32 const lit_7237; -extern "C" extern u32 const lit_7238; -extern "C" extern u32 const lit_7239; -extern "C" extern u32 const lit_7241; -extern "C" extern u32 const lit_7242; -extern "C" extern u32 const lit_7243; -extern "C" extern u32 const lit_7244; -extern "C" extern u32 const lit_7245; -extern "C" extern u32 const lit_7246; -extern "C" extern u32 const lit_7247; -extern "C" extern u32 const lit_7248; -extern "C" extern u32 const lit_7249; -extern "C" extern u32 const lit_7250; -extern "C" extern u32 const lit_7251; -extern "C" extern u32 const lit_7252; -extern "C" extern u32 const lit_7253; -extern "C" extern u32 const lit_7254; -extern "C" extern u32 const lit_7255; -extern "C" extern u32 const lit_7256; -extern "C" extern u32 const lit_7257; -extern "C" extern u32 const lit_7258; -extern "C" extern u32 const lit_7259; -extern "C" extern u32 const lit_7260; -extern "C" extern u32 const lit_7262; -extern "C" extern u32 const lit_7263; -extern "C" extern u32 const lit_7264; -extern "C" extern u32 const lit_7265; -extern "C" extern u32 const lit_7266; -extern "C" extern u32 const lit_7267; -extern "C" extern u32 const lit_7268; -extern "C" extern u32 const lit_7269; -extern "C" extern u32 const lit_7270; -extern "C" extern u32 const lit_7271; -extern "C" extern u32 const lit_7273; -extern "C" extern u32 const lit_7274; -extern "C" extern u32 const lit_7275; -extern "C" extern u32 const lit_7276; -extern "C" extern u32 const lit_7277; -extern "C" extern u32 const lit_7278; -extern "C" extern u32 const lit_7279; -extern "C" extern u32 const lit_7280; -extern "C" extern u32 const lit_7281; -extern "C" extern u32 const lit_7282; -extern "C" extern u32 const lit_7283; -extern "C" extern u32 const lit_7286; -extern "C" extern u32 const lit_7287; -extern "C" extern u32 const lit_7288; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_80602ADC[6 + 2 /* padding */]; -extern "C" extern void* g_profile_B_GND[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8060305C[4]; -extern "C" extern u8 data_80603060[4]; -extern "C" extern u8 data_80603064[4]; -extern "C" extern u8 data_80603068[4]; -extern "C" extern u8 data_8060306C[4]; -extern "C" extern u8 data_80603070[4]; -extern "C" extern u8 data_80603074[4]; -extern "C" extern u8 data_80603078[4]; -extern "C" extern u8 data_8060307C[4]; -extern "C" extern u8 data_80603080[4]; -extern "C" extern u8 data_80603084[4]; -extern "C" extern u8 data_80603088[4]; -extern "C" extern u8 data_8060308C[4]; -extern "C" extern u8 data_80603090[4]; -extern "C" extern u8 data_80603094[4]; -extern "C" extern u8 data_80603098[4]; -extern "C" extern u8 data_8060309C[4]; -extern "C" extern u8 data_806030A0[4]; -extern "C" extern u8 data_806030A4[4]; -extern "C" extern u8 data_806030A8[4]; -extern "C" extern u8 data_806030AC[4]; -extern "C" extern u8 data_806030B0[4]; -extern "C" extern u8 data_806030B4[4]; -extern "C" extern u8 data_806030B8[4]; -extern "C" extern u8 data_806030BC[4]; extern "C" void __ct__13daB_GND_HIO_cFv(); extern "C" static void anm_init__FP11b_gnd_classifUcf(); @@ -867,32 +737,6 @@ void MtxPush(); void MtxPull(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_gnd/executor.cpp b/rel/d/a/b/d_a_b_gnd/executor.cpp index 74244fbf842..fc02ddb9f78 100644 --- a/rel/d/a/b/d_a_b_gnd/executor.cpp +++ b/rel/d/a/b/d_a_b_gnd/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80602650[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_gnd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_gnd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3250fb2d9f5..fc9b113397e 100644 --- a/rel/d/a/b/d_a_b_gnd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_gnd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8060265C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8060265C-80602664 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8060265C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80602F60-80602F68 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_gnd/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_gnd/unknown_translation_unit_ctors.cpp index 9d9503bb3cb..313752a6e1a 100644 --- a/rel/d/a/b/d_a_b_gnd/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_gnd/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80602650[2]; -extern void* const data_80602650[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_gnd_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80602650-80602658 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80602650[2] = { + (void*)__sinit_d_a_b_gnd_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp index 711df46681a..2cec995ae2f 100644 --- a/rel/d/a/b/d_a_b_go/d_a_b_go.cpp +++ b/rel/d/a/b/d_a_b_go/d_a_b_go.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -47,10 +47,10 @@ struct daB_GO_HIO_c { /* 80603F9C */ ~daB_GO_HIO_c(); }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -135,8 +135,6 @@ static bool daB_GO_IsDelete(b_go_class*); static void daB_GO_Delete(b_go_class*); static void useHeapInit(fopAc_ac_c*); static void daB_GO_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_B_GO[12]; extern "C" void __ct__12daB_GO_HIO_cFv(); extern "C" static void daB_GO_Draw__FP10b_go_class(); @@ -187,19 +185,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_go/executor.cpp b/rel/d/a/b/d_a_b_go/executor.cpp index 4ad01efd010..fc8952f426a 100644 --- a/rel/d/a/b/d_a_b_go/executor.cpp +++ b/rel/d/a/b/d_a_b_go/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80604030[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_go/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_go/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 0ece1d25597..241d911734c 100644 --- a/rel/d/a/b/d_a_b_go/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_go/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8060403C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8060403C-80604044 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8060403C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80604138-80604140 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_go/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_go/unknown_translation_unit_ctors.cpp index eba9dda8957..bd6eb4fd7d1 100644 --- a/rel/d/a/b/d_a_b_go/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_go/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80604030[2]; -extern void* const data_80604030[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_go_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80604030-80604038 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80604030[2] = { + (void*)__sinit_d_a_b_go_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp index f9dfda5434c..01d71d4c823 100644 --- a/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp +++ b/rel/d/a/b/d_a_b_gos/d_a_b_gos.cpp @@ -20,13 +20,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -48,8 +48,6 @@ struct daB_GOS_HIO_c { /* 80605320 */ ~daB_GOS_HIO_c(); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -57,6 +55,8 @@ struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -162,8 +162,6 @@ static bool daB_GOS_IsDelete(b_gos_class*); static void daB_GOS_Delete(b_gos_class*); static void useHeapInit(fopAc_ac_c*); static void daB_GOS_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_B_GOS[12]; extern "C" void __ct__13daB_GOS_HIO_cFv(); extern "C" static void daB_GOS_Draw__FP11b_gos_class(); @@ -217,20 +215,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_gos/executor.cpp b/rel/d/a/b/d_a_b_gos/executor.cpp index 8bec45a8bfe..3bf0ad67272 100644 --- a/rel/d/a/b/d_a_b_gos/executor.cpp +++ b/rel/d/a/b/d_a_b_gos/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806053B4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_gos/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_gos/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f88d4da3f03..24ee9d01835 100644 --- a/rel/d/a/b/d_a_b_gos/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_gos/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806053C0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806053C0-806053C8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806053C0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80605600-80605608 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_gos/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_gos/unknown_translation_unit_ctors.cpp index 523bdb244ef..acade696a80 100644 --- a/rel/d/a/b/d_a_b_gos/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_gos/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806053B4[2]; -extern void* const data_806053B4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_gos_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806053B4-806053BC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806053B4[2] = { + (void*)__sinit_d_a_b_gos_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp index 301b4104b79..3c69dd1fe2a 100644 --- a/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp +++ b/rel/d/a/b/d_a_b_mgn/d_a_b_mgn.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -26,6 +22,10 @@ struct cXyz { /* 8060FD78 */ ~cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -64,13 +64,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -96,10 +96,10 @@ struct daObjBHASHI_c { /* 80577500 */ void Obj_Damage(cXyz); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daB_MGN_c { /* 8060577C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8060584C */ void JointCallBack(J3DJoint*, int); @@ -377,35 +377,6 @@ static void daB_MGN_Delete(daB_MGN_c*); static void useHeapInit(fopAc_ac_c*); static void daB_MGN_Create(daB_MGN_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u8 const lit_5170[24]; -extern "C" extern u32 const lit_5700; -extern "C" extern u32 const lit_6080; -extern "C" extern u32 const lit_6081; -extern "C" extern u32 const lit_6260; -extern "C" extern u32 const lit_6422; -extern "C" extern u32 const lit_6836; -extern "C" extern u32 const lit_6837; -extern "C" extern u32 const lit_6838; -extern "C" extern u32 const lit_7360; -extern "C" extern u32 const lit_7361; -extern "C" extern u32 const lit_7362; -extern "C" extern u32 const lit_7363; -extern "C" extern u32 const lit_7364; -extern "C" extern u32 const lit_7365; -extern "C" extern u32 const lit_7366; -extern "C" extern u32 const lit_7367; -extern "C" extern u32 const lit_7368; -extern "C" extern u32 const lit_7369; -extern "C" extern u32 const lit_7370; -extern "C" extern u32 const lit_7371; -extern "C" extern u32 const lit_7372; -extern "C" extern u32 const lit_7373; -extern "C" extern u32 const lit_7374; -extern "C" extern u32 const lit_7375; -extern "C" extern u32 const lit_7853; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_MGN[12]; extern "C" void __ct__13daB_MGN_HIO_cFv(); extern "C" void ctrlJoint__9daB_MGN_cFP8J3DJointP8J3DModel(); @@ -568,24 +539,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void onBlure__13mDoGph_gInf_cFv(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_mgn/executor.cpp b/rel/d/a/b/d_a_b_mgn/executor.cpp index 3c8300ff2bd..9727b888fd8 100644 --- a/rel/d/a/b/d_a_b_mgn/executor.cpp +++ b/rel/d/a/b/d_a_b_mgn/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8060FDCC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_mgn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_mgn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c9c347f415c..b0d69e9d0db 100644 --- a/rel/d/a/b/d_a_b_mgn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_mgn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8060FDD8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8060FDD8-8060FDE0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8060FDD8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80610438-80610440 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_mgn/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_mgn/unknown_translation_unit_ctors.cpp index bd0908aa7ce..b40978ea38b 100644 --- a/rel/d/a/b/d_a_b_mgn/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_mgn/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8060FDCC[2]; -extern void* const data_8060FDCC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_mgn_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8060FDCC-8060FDD4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8060FDCC[2] = { + (void*)__sinit_d_a_b_mgn_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp index 2b80019344a..87d139133a2 100644 --- a/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp +++ b/rel/d/a/b/d_a_b_ob/d_a_b_ob.cpp @@ -88,15 +88,15 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C06F4 */ void stopAnime(); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C06F4 */ void stopAnime(); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -403,135 +403,6 @@ static void dComIfGp_particle_set(u16, cXyz const*, csXyz const*, cXyz const*); static void dComIfGp_getEvent(); static void mDoAud_seStart(u32, Vec const*, u32, s8); static void dComIfGp_getVibration(); -extern "C" extern u32 const lit_6726; -extern "C" extern u32 const lit_6727; -extern "C" extern u32 const lit_6728; -extern "C" extern u32 const lit_6729; -extern "C" extern u32 const lit_6730; -extern "C" extern u32 const lit_6731; -extern "C" extern u32 const lit_6732; -extern "C" extern u32 const lit_6733; -extern "C" extern u32 const lit_6734; -extern "C" extern u32 const lit_6735; -extern "C" extern u32 const lit_6736; -extern "C" extern u32 const lit_6737; -extern "C" extern u32 const lit_6738; -extern "C" extern u32 const lit_6739; -extern "C" extern u32 const lit_6740; -extern "C" extern u32 const lit_6741; -extern "C" extern u32 const lit_6742; -extern "C" extern u32 const lit_6743; -extern "C" extern u32 const lit_6744; -extern "C" extern u32 const lit_6745; -extern "C" extern u32 const lit_6746; -extern "C" extern u32 const lit_6747; -extern "C" extern u32 const lit_6748; -extern "C" extern u32 const lit_6749; -extern "C" extern u32 const lit_6750; -extern "C" extern u32 const lit_6751; -extern "C" extern u32 const lit_6752; -extern "C" extern u32 const lit_6753; -extern "C" extern u32 const lit_6754; -extern "C" extern u32 const lit_6755; -extern "C" extern u32 const lit_6756; -extern "C" extern u32 const lit_6757; -extern "C" extern u32 const lit_6758; -extern "C" extern u32 const lit_6759; -extern "C" extern u32 const lit_6760; -extern "C" extern u32 const lit_6761; -extern "C" extern u32 const lit_6762; -extern "C" extern u32 const lit_6763; -extern "C" extern u32 const lit_6764; -extern "C" extern u32 const lit_6765; -extern "C" extern u32 const lit_6766; -extern "C" extern u32 const lit_6767; -extern "C" extern u32 const lit_6768; -extern "C" extern u32 const lit_6769; -extern "C" extern u32 const lit_6770; -extern "C" extern u32 const lit_6771; -extern "C" extern u32 const lit_6772; -extern "C" extern u32 const lit_6773; -extern "C" extern u32 const lit_6774; -extern "C" extern u32 const lit_6775; -extern "C" extern u32 const lit_6776; -extern "C" extern u32 const lit_6777; -extern "C" extern u32 const lit_6778; -extern "C" extern u32 const lit_6779; -extern "C" extern u32 const lit_6780; -extern "C" extern u32 const lit_6781; -extern "C" extern u32 const lit_6782; -extern "C" extern u32 const lit_6783; -extern "C" extern u32 const lit_6784; -extern "C" extern u32 const lit_6785; -extern "C" extern u32 const lit_6786; -extern "C" extern u32 const lit_6787; -extern "C" extern u32 const lit_6788; -extern "C" extern u32 const lit_6789; -extern "C" extern u32 const lit_6790; -extern "C" extern u32 const lit_6791; -extern "C" extern u32 const lit_6792; -extern "C" extern u32 const lit_6793; -extern "C" extern u32 const lit_6794; -extern "C" extern u32 const lit_6795; -extern "C" extern u32 const lit_6796; -extern "C" extern u32 const lit_6797; -extern "C" extern u32 const lit_6798; -extern "C" extern u32 const lit_6799; -extern "C" extern u32 const lit_6800; -extern "C" extern u32 const lit_6801; -extern "C" extern u32 const lit_6802; -extern "C" extern u32 const lit_6803; -extern "C" extern u32 const lit_6804; -extern "C" extern u32 const lit_6808; -extern "C" extern u32 const lit_6809; -extern "C" extern u32 const lit_6810; -extern "C" extern u32 const lit_6811; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_OB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_6147[12 + 4 /* padding */]; -extern "C" extern u8 data_8061B5B4[12]; -extern "C" extern u8 lit_6151[12 + 4 /* padding */]; -extern "C" extern u8 data_8061B5D0[12]; -extern "C" extern u8 data_8061B5DC[4]; -extern "C" extern u8 data_8061B5E0[4]; -extern "C" extern u8 data_8061B5E4[4]; -extern "C" extern u8 data_8061B5E8[4]; -extern "C" extern u8 data_8061B5EC[4]; -extern "C" extern u8 data_8061B5F0[4]; -extern "C" extern u8 data_8061B5F4[4]; -extern "C" extern u8 data_8061B5F8[4]; -extern "C" extern u8 data_8061B5FC[4]; -extern "C" extern u8 data_8061B600[4]; -extern "C" extern u8 data_8061B604[4]; -extern "C" extern u8 data_8061B608[4]; -extern "C" extern u8 data_8061B60C[4]; -extern "C" extern u8 data_8061B610[4]; -extern "C" extern u8 data_8061B614[4]; -extern "C" extern u8 data_8061B618[4]; -extern "C" extern u8 data_8061B61C[4]; -extern "C" extern u8 data_8061B620[4]; -extern "C" extern u8 data_8061B624[4]; -extern "C" extern u8 data_8061B628[4]; -extern "C" extern u8 data_8061B62C[4]; -extern "C" extern u8 data_8061B630[4]; -extern "C" extern u8 data_8061B634[4]; -extern "C" extern u8 data_8061B638[4]; -extern "C" extern u8 data_8061B63C[4]; extern "C" void __ct__12daB_OB_HIO_cFv(); extern "C" static void anm_init__FP10b_ob_classifUcf(); @@ -818,26 +689,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void onBlure__13mDoGph_gInf_cFv(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_ob/executor.cpp b/rel/d/a/b/d_a_b_ob/executor.cpp index 8f7c113517c..13af1f6aea6 100644 --- a/rel/d/a/b/d_a_b_ob/executor.cpp +++ b/rel/d/a/b/d_a_b_ob/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8061AD70[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_ob/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_ob/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 30ce897a967..cb8063b0509 100644 --- a/rel/d/a/b/d_a_b_ob/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_ob/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8061AD7C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8061AD7C-8061AD84 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8061AD7C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8061B4B8-8061B4C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_ob/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_ob/unknown_translation_unit_ctors.cpp index 3023bf9beca..ecfe62473cb 100644 --- a/rel/d/a/b/d_a_b_ob/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_ob/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8061AD70[2]; -extern void* const data_8061AD70[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_ob_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8061AD70-8061AD78 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8061AD70[2] = { + (void*)__sinit_d_a_b_ob_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp index c532ce2b322..754854942cd 100644 --- a/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp +++ b/rel/d/a/b/d_a_b_oh/d_a_b_oh.cpp @@ -53,11 +53,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -193,52 +193,6 @@ static bool daB_OH_IsDelete(b_oh_class*); static void daB_OH_Delete(b_oh_class*); static void useHeapInit(fopAc_ac_c*); static void daB_OH_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4160; -extern "C" extern u32 const lit_4161; -extern "C" extern u32 const lit_4162; -extern "C" extern u32 const lit_4165; -extern "C" extern u8 const lit_4168[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_B_OH[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8061DBDC[4]; -extern "C" extern u8 data_8061DBE0[4]; -extern "C" extern u8 data_8061DBE4[4]; -extern "C" extern u8 data_8061DBE8[4]; -extern "C" extern u8 data_8061DBEC[4]; -extern "C" extern u8 data_8061DBF0[4]; -extern "C" extern u8 data_8061DBF4[4]; -extern "C" extern u8 data_8061DBF8[4]; -extern "C" extern u8 data_8061DBFC[4]; -extern "C" extern u8 data_8061DC00[4]; -extern "C" extern u8 data_8061DC04[4]; -extern "C" extern u8 data_8061DC08[4]; -extern "C" extern u8 data_8061DC0C[4]; -extern "C" extern u8 data_8061DC10[4]; -extern "C" extern u8 data_8061DC14[4]; -extern "C" extern u8 data_8061DC18[4]; -extern "C" extern u8 data_8061DC1C[4]; -extern "C" extern u8 data_8061DC20[4]; -extern "C" extern u8 data_8061DC24[4]; -extern "C" extern u8 data_8061DC28[4]; -extern "C" extern u8 data_8061DC2C[4]; -extern "C" extern u8 data_8061DC30[4]; -extern "C" extern u8 data_8061DC34[4]; -extern "C" extern u8 data_8061DC38[4]; -extern "C" extern u8 data_8061DC3C[4]; extern "C" void __ct__12daB_OH_HIO_cFv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -341,22 +295,6 @@ void MtxTrans(f32, f32, f32, u8); void MtxScale(f32, f32, f32, u8); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_oh/executor.cpp b/rel/d/a/b/d_a_b_oh/executor.cpp index f55c9c337ae..019fcec22d0 100644 --- a/rel/d/a/b/d_a_b_oh/executor.cpp +++ b/rel/d/a/b/d_a_b_oh/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8061D9C0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_oh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_oh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2f5d9d598a7..385d40ff27c 100644 --- a/rel/d/a/b/d_a_b_oh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_oh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8061D9CC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8061D9CC-8061D9D4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8061D9CC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8061DB70-8061DB78 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_oh/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_oh/unknown_translation_unit_ctors.cpp index 341c004ee20..3327c1555a6 100644 --- a/rel/d/a/b/d_a_b_oh/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_oh/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8061D9C0[2]; -extern void* const data_8061D9C0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_oh_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8061D9C0-8061D9C8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8061D9C0[2] = { + (void*)__sinit_d_a_b_oh_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp index c8747773701..7936fb616b5 100644 --- a/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp +++ b/rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp @@ -50,13 +50,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -116,8 +116,6 @@ static bool daB_OH2_IsDelete(b_oh2_class*); static void daB_OH2_Delete(b_oh2_class*); static void useHeapInit(fopAc_ac_c*); static void daB_OH2_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_B_OH2[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" static void daB_OH2_Draw__FP11b_oh2_class(); @@ -158,14 +156,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_oh2/executor.cpp b/rel/d/a/b/d_a_b_oh2/executor.cpp index 3708b95e865..ca525ce5bd9 100644 --- a/rel/d/a/b/d_a_b_oh2/executor.cpp +++ b/rel/d/a/b/d_a_b_oh2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8061EA30[4]; -extern u8 const data_8061EA34[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_oh2/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_oh2/unknown_translation_unit_ctors.cpp index 09f98d3bcba..4cadf74a291 100644 --- a/rel/d/a/b/d_a_b_oh2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_oh2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8061EA30[4]; -extern u8 const data_8061EA30[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8061EA30[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8061EA30-8061EA34 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8061EA30[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/b/d_a_b_oh2/unknown_translation_unit_dtors.cpp b/rel/d/a/b/d_a_b_oh2/unknown_translation_unit_dtors.cpp index 30bc2e1f8c1..aadc35291b2 100644 --- a/rel/d/a/b/d_a_b_oh2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/b/d_a_b_oh2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8061EA34[4]; -extern u8 const data_8061EA34[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8061EA34[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8061EA34-8061EA38 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8061EA34[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp index da3af4323b2..4783d06ba61 100644 --- a/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp +++ b/rel/d/a/b/d_a_b_tn/d_a_b_tn.cpp @@ -13,12 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - /* 8062D91C */ csXyz(); - /* 8062E590 */ ~csXyz(); -}; - struct Vec {}; struct cXyz { @@ -27,6 +21,12 @@ struct cXyz { /* 8062E5CC */ ~cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); + /* 8062D91C */ csXyz(); + /* 8062E590 */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -46,13 +46,13 @@ struct mDoExt_brkAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -75,6 +75,10 @@ struct daPy_py_c { /* 8062E608 */ void checkNowWolf(); }; +struct J3DJoint {}; + +struct J3DModel {}; + struct dCcD_SrcSph {}; struct dCcD_Sph { @@ -84,10 +88,6 @@ struct dCcD_Sph { /* 8062D678 */ dCcD_Sph(); }; -struct J3DModel {}; - -struct J3DJoint {}; - struct daB_TN_c { /* 8061EC58 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8061ED10 */ void JointCallBack(J3DJoint*, int); @@ -192,12 +192,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -375,80 +375,6 @@ static void daB_TN_Delete(daB_TN_c*); static void useHeapInit(fopAc_ac_c*); static void daB_TN_Create(daB_TN_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4657; -extern "C" extern u32 const lit_6386; -extern "C" extern u32 const lit_6388; -extern "C" extern u32 const lit_6389; -extern "C" extern u32 const lit_6392; -extern "C" extern u32 const lit_6393; -extern "C" extern u32 const lit_6395; -extern "C" extern u32 const lit_6396; -extern "C" extern u32 const lit_6397; -extern "C" extern u32 const lit_6398; -extern "C" extern u32 const lit_6399; -extern "C" extern u32 const lit_6400; -extern "C" extern u32 const lit_6401; -extern "C" extern u32 const lit_6402; -extern "C" extern u32 const lit_6794; -extern "C" extern u32 const lit_6795; -extern "C" extern u32 const lit_6798; -extern "C" extern u32 const lit_6800; -extern "C" extern u32 const lit_6801; -extern "C" extern u32 const lit_6804; -extern "C" extern u32 const lit_6805; -extern "C" extern u32 const lit_6806; -extern "C" extern u32 const lit_6807; -extern "C" extern u32 const lit_6808; -extern "C" extern u32 const lit_6809; -extern "C" extern u32 const lit_6810; -extern "C" extern u32 const lit_6811; -extern "C" extern u32 const lit_6812; -extern "C" extern u32 const lit_6813; -extern "C" extern u32 const lit_8049; -extern "C" extern u32 const lit_8050; -extern "C" extern u32 const lit_9572; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_TN[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8062F304[4]; -extern "C" extern u8 data_8062F308[4]; -extern "C" extern u8 data_8062F30C[4]; -extern "C" extern u8 data_8062F310[4]; -extern "C" extern u8 data_8062F314[4]; -extern "C" extern u8 data_8062F318[4]; -extern "C" extern u8 data_8062F31C[4]; -extern "C" extern u8 data_8062F320[4]; -extern "C" extern u8 data_8062F324[4]; -extern "C" extern u8 data_8062F328[4]; -extern "C" extern u8 data_8062F32C[4]; -extern "C" extern u8 data_8062F330[4]; -extern "C" extern u8 data_8062F334[4]; -extern "C" extern u8 data_8062F338[4]; -extern "C" extern u8 data_8062F33C[4]; -extern "C" extern u8 data_8062F340[4]; -extern "C" extern u8 data_8062F344[4]; -extern "C" extern u8 data_8062F348[4]; -extern "C" extern u8 data_8062F34C[4]; -extern "C" extern u8 data_8062F350[4]; -extern "C" extern u8 data_8062F354[4]; -extern "C" extern u8 data_8062F358[4]; -extern "C" extern u8 data_8062F35C[4]; -extern "C" extern u8 data_8062F360[4]; -extern "C" extern u8 data_8062F364[4]; extern "C" void __ct__12daB_TN_HIO_cFv(); extern "C" void ctrlJoint__8daB_TN_cFP8J3DJointP8J3DModel(); @@ -670,27 +596,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_tn/executor.cpp b/rel/d/a/b/d_a_b_tn/executor.cpp index ad1bbe76f0e..1925aefe66e 100644 --- a/rel/d/a/b/d_a_b_tn/executor.cpp +++ b/rel/d/a/b/d_a_b_tn/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8062E620[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_tn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_tn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 11cf2acc93b..645f754b4ae 100644 --- a/rel/d/a/b/d_a_b_tn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_tn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8062E62C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8062E62C-8062E634 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8062E62C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8062EFD8-8062EFE0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_tn/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_tn/unknown_translation_unit_ctors.cpp index c6f3aec11c4..cd98f879c12 100644 --- a/rel/d/a/b/d_a_b_tn/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_tn/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8062E620[2]; -extern void* const data_8062E620[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_tn_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8062E620-8062E628 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8062E620[2] = { + (void*)__sinit_d_a_b_tn_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp index fe0c07f0c7c..bd065f1309c 100644 --- a/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp +++ b/rel/d/a/b/d_a_b_yo/d_a_b_yo.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -26,6 +22,10 @@ struct cXyz { /* 806396CC */ void abs(Vec const&) const; }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct obj_ystone_class { /* 80639694 */ void setShapeAngle(csXyz); /* 806396B0 */ void setCurrentPos(cXyz); @@ -42,12 +42,12 @@ struct mDoGph_gInf_c { /* 80008078 */ void onBlure(); }; -struct J3DAnmTexPattern {}; - struct J3DAnmTextureSRTKey {}; struct J3DAnmTevRegKey {}; +struct J3DAnmTexPattern {}; + struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -75,13 +75,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -396,87 +396,6 @@ static void daB_YO_Delete(daB_YO_c*); static void useHeapInit(fopAc_ac_c*); static void useHeapInit2(fopAc_ac_c*); static void daB_YO_Create(daB_YO_c*); -extern "C" extern u32 const lit_5308; -extern "C" extern u32 const lit_5309; -extern "C" extern u32 const lit_5310; -extern "C" extern u32 const lit_5311; -extern "C" extern u32 const lit_5312; -extern "C" extern u32 const lit_5313; -extern "C" extern u32 const lit_5315; -extern "C" extern u32 const lit_5317; -extern "C" extern u32 const lit_5320; -extern "C" extern u32 const lit_5321; -extern "C" extern u32 const lit_5322; -extern "C" extern u32 const lit_5323; -extern "C" extern u32 const lit_5324; -extern "C" extern u32 const lit_5325; -extern "C" extern u32 const lit_5326; -extern "C" extern u32 const lit_5327; -extern "C" extern u32 const lit_5328; -extern "C" extern u32 const lit_5329; -extern "C" extern u32 const lit_5330; -extern "C" extern u32 const lit_5331; -extern "C" extern u32 const lit_5332; -extern "C" extern u32 const lit_5333; -extern "C" extern u32 const lit_5334; -extern "C" extern u32 const lit_5340; -extern "C" extern u32 const lit_5344; -extern "C" extern u32 const lit_5345; -extern "C" extern u32 const lit_5348; -extern "C" extern u32 const lit_5349; -extern "C" extern u32 const lit_5350; -extern "C" extern u32 const lit_5352; -extern "C" extern u32 const lit_5354; -extern "C" extern u32 const lit_5355; -extern "C" extern u32 const lit_5356[1 + 1 /* padding */]; -extern "C" extern u32 const lit_7261; -extern "C" extern u32 const lit_7262; -extern "C" extern u32 const lit_7263; -extern "C" extern u32 const lit_7264; -extern "C" extern u32 const lit_7265; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_YO[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80639FF8[4]; -extern "C" extern u8 data_80639FFC[4]; -extern "C" extern u8 data_8063A000[4]; -extern "C" extern u8 data_8063A004[4]; -extern "C" extern u8 data_8063A008[4]; -extern "C" extern u8 data_8063A00C[4]; -extern "C" extern u8 data_8063A010[4]; -extern "C" extern u8 data_8063A014[4]; -extern "C" extern u8 data_8063A018[4]; -extern "C" extern u8 data_8063A01C[4]; -extern "C" extern u8 data_8063A020[4]; -extern "C" extern u8 data_8063A024[4]; -extern "C" extern u8 data_8063A028[4]; -extern "C" extern u8 data_8063A02C[4]; -extern "C" extern u8 data_8063A030[4]; -extern "C" extern u8 data_8063A034[4]; -extern "C" extern u8 data_8063A038[4]; -extern "C" extern u8 data_8063A03C[4]; -extern "C" extern u8 data_8063A040[4]; -extern "C" extern u8 data_8063A044[4]; -extern "C" extern u8 data_8063A048[4]; -extern "C" extern u8 data_8063A04C[4]; -extern "C" extern u8 data_8063A050[4]; -extern "C" extern u8 data_8063A054[4]; -extern "C" extern u8 data_8063A058[4]; -extern "C" extern u8 data_8063A05C[4]; extern "C" void __ct__12daB_YO_HIO_cFv(); extern "C" void draw__8daB_YO_cFv(); @@ -687,27 +606,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 j3dZModeTable[96]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void onBlure__13mDoGph_gInf_cFv(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/b/d_a_b_yo/executor.cpp b/rel/d/a/b/d_a_b_yo/executor.cpp index 6b4ae1dc7f9..60c5f5f52dc 100644 --- a/rel/d/a/b/d_a_b_yo/executor.cpp +++ b/rel/d/a/b/d_a_b_yo/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806397E0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_yo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_yo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 337cdb08fbc..ee2d1add98e 100644 --- a/rel/d/a/b/d_a_b_yo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_yo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806397EC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806397EC-806397F4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806397EC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80639F30-80639F38 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_yo/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_yo/unknown_translation_unit_ctors.cpp index d7c86d770cf..ed5a38d6179 100644 --- a/rel/d/a/b/d_a_b_yo/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_yo/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806397E0[2]; -extern void* const data_806397E0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_yo_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806397E0-806397E8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806397E0[2] = { + (void*)__sinit_d_a_b_yo_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp b/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp index ed04615741c..60de5a0e20c 100644 --- a/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp +++ b/rel/d/a/b/d_a_b_yo_ice/d_a_b_yo_ice.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 80267404 */ void operator+(csXyz&); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -206,16 +206,6 @@ static bool daB_YOI_IsDelete(daB_YOI_c*); static void daB_YOI_Delete(daB_YOI_c*); static void useHeapInit(fopAc_ac_c*); static void daB_YOI_Create(daB_YOI_c*); -extern "C" extern u32 const lit_4172; -extern "C" extern u32 const lit_4175; -extern "C" extern u32 const lit_4179; -extern "C" extern u32 const lit_4376; -extern "C" extern u32 const lit_4377; -extern "C" extern u32 const lit_4381; -extern "C" extern u32 const lit_4382; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_YOI[12]; extern "C" void __ct__13daB_YOI_HIO_cFv(); extern "C" void draw__9daB_YOI_cFv(); @@ -302,18 +292,6 @@ void cLib_chasePosXZ(cXyz*, cXyz const&, f32); void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/b/d_a_b_yo_ice/executor.cpp b/rel/d/a/b/d_a_b_yo_ice/executor.cpp index aa1bee9a2de..53834736bb0 100644 --- a/rel/d/a/b/d_a_b_yo_ice/executor.cpp +++ b/rel/d/a/b/d_a_b_yo_ice/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8063DC70[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_yo_ice/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_yo_ice/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8d9b2510634..604abdd9cf7 100644 --- a/rel/d/a/b/d_a_b_yo_ice/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_yo_ice/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8063DC7C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8063DC7C-8063DC84 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8063DC7C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8063DFE0-8063DFE8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_yo_ice/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_yo_ice/unknown_translation_unit_ctors.cpp index 0829b985dbf..5e38aea6e59 100644 --- a/rel/d/a/b/d_a_b_yo_ice/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_yo_ice/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8063DC70[2]; -extern void* const data_8063DC70[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_yo_ice_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8063DC70-8063DC78 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8063DC70[2] = { + (void*)__sinit_d_a_b_yo_ice_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp index 4b7df932789..59a1f06aa01 100644 --- a/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp +++ b/rel/d/a/b/d_a_b_zant/d_a_b_zant.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,6 +21,8 @@ struct cXyz { /* 8063E568 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -53,13 +53,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -86,6 +86,8 @@ struct daMirror_c { /* 8003194C */ void entry(J3DModel*); }; +struct J3DJoint {}; + struct dCcD_SrcSph {}; struct dCcD_Sph { @@ -95,8 +97,6 @@ struct dCcD_Sph { /* 8064E76C */ dCcD_Sph(); }; -struct J3DJoint {}; - struct daB_ZANT_c { /* 8063E19C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8063E264 */ void JointCallBack(J3DJoint*, int); @@ -223,12 +223,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -410,77 +410,6 @@ static bool daB_ZANT_IsDelete(daB_ZANT_c*); static void daB_ZANT_Delete(daB_ZANT_c*); static void useHeapInit(fopAc_ac_c*); static void daB_ZANT_Create(daB_ZANT_c*); -extern "C" extern u32 const lit_6164; -extern "C" extern u32 const lit_6165; -extern "C" extern u32 const lit_6167; -extern "C" extern u32 const lit_6169; -extern "C" extern u32 const lit_6170; -extern "C" extern u32 const lit_6866; -extern "C" extern u32 const lit_6867; -extern "C" extern u32 const lit_7980; -extern "C" extern u32 const lit_8452; -extern "C" extern u32 const lit_8453; -extern "C" extern u32 const lit_8793; -extern "C" extern u32 const lit_8795; -extern "C" extern u32 const lit_8796; -extern "C" extern u32 const lit_8797; -extern "C" extern u32 const lit_8798; -extern "C" extern u32 const lit_8799; -extern "C" extern u32 const lit_8800; -extern "C" extern u32 const lit_8801; -extern "C" extern u32 const lit_8802; -extern "C" extern u32 const lit_9164; -extern "C" extern u32 const lit_9165; -extern "C" extern u32 const lit_9166; -extern "C" extern u32 const lit_9167; -extern "C" extern u32 const lit_9786; -extern "C" extern u32 const lit_9787; -extern "C" extern u32 const lit_9788; -extern "C" extern u32 const lit_9789; -extern "C" extern u32 const lit_9868; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_ZANT[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8064F694[4]; -extern "C" extern u8 data_8064F698[4]; -extern "C" extern u8 data_8064F69C[4]; -extern "C" extern u8 data_8064F6A0[4]; -extern "C" extern u8 data_8064F6A4[4]; -extern "C" extern u8 data_8064F6A8[4]; -extern "C" extern u8 data_8064F6AC[4]; -extern "C" extern u8 data_8064F6B0[4]; -extern "C" extern u8 data_8064F6B4[4]; -extern "C" extern u8 data_8064F6B8[4]; -extern "C" extern u8 data_8064F6BC[4]; -extern "C" extern u8 data_8064F6C0[4]; -extern "C" extern u8 data_8064F6C4[4]; -extern "C" extern u8 data_8064F6C8[4]; -extern "C" extern u8 data_8064F6CC[4]; -extern "C" extern u8 data_8064F6D0[4]; -extern "C" extern u8 data_8064F6D4[4]; -extern "C" extern u8 data_8064F6D8[4]; -extern "C" extern u8 data_8064F6DC[4]; -extern "C" extern u8 data_8064F6E0[4]; -extern "C" extern u8 data_8064F6E4[4]; -extern "C" extern u8 data_8064F6E8[4]; -extern "C" extern u8 data_8064F6EC[4]; -extern "C" extern u8 data_8064F6F0[4]; -extern "C" extern u8 data_8064F6F4[4]; -extern "C" extern u8 data_8064F6F8[4]; extern "C" void __ct__14daB_ZANT_HIO_cFv(); extern "C" void ctrlJoint__10daB_ZANT_cFP8J3DJointP8J3DModel(); @@ -721,30 +650,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 data_804505F0[8]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 data_80450D68[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_zant/executor.cpp b/rel/d/a/b/d_a_b_zant/executor.cpp index aace67ac794..8332a7eeb54 100644 --- a/rel/d/a/b/d_a_b_zant/executor.cpp +++ b/rel/d/a/b/d_a_b_zant/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8064EB08[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_zant/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_zant/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c39b408ef48..2f4653d6c7e 100644 --- a/rel/d/a/b/d_a_b_zant/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_zant/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8064EB14[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8064EB14-8064EB1C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8064EB14[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8064F5B0-8064F5B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_zant/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_zant/unknown_translation_unit_ctors.cpp index 2847e2e1b56..788332ed5d6 100644 --- a/rel/d/a/b/d_a_b_zant/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_zant/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8064EB08[2]; -extern void* const data_8064EB08[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_zant_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8064EB08-8064EB10 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8064EB08[2] = { + (void*)__sinit_d_a_b_zant_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp b/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp index 1fa9c8cbe36..e5f7ecf2d70 100644 --- a/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp +++ b/rel/d/a/b/d_a_b_zant_magic/d_a_b_zant_magic.cpp @@ -172,8 +172,6 @@ static void daB_ZANTM_Execute(daB_ZANTM_c*); static bool daB_ZANTM_IsDelete(daB_ZANTM_c*); static void daB_ZANTM_Delete(daB_ZANTM_c*); static void daB_ZANTM_Create(daB_ZANTM_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_B_ZANTM[12]; extern "C" void draw__11daB_ZANTM_cFv(); extern "C" static void daB_ZANTM_Draw__FP11daB_ZANTM_c(); @@ -214,22 +212,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/b/d_a_b_zant_magic/executor.cpp b/rel/d/a/b/d_a_b_zant_magic/executor.cpp index b6e8e700654..7d69d7b9aa8 100644 --- a/rel/d/a/b/d_a_b_zant_magic/executor.cpp +++ b/rel/d/a/b/d_a_b_zant_magic/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80650494[4]; -extern u8 const data_80650498[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_zant_magic/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_zant_magic/unknown_translation_unit_ctors.cpp index 5a955a0c4d8..fb873f2ddf2 100644 --- a/rel/d/a/b/d_a_b_zant_magic/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_zant_magic/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80650494[4]; -extern u8 const data_80650494[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80650494[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80650494-80650498 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80650494[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/b/d_a_b_zant_magic/unknown_translation_unit_dtors.cpp b/rel/d/a/b/d_a_b_zant_magic/unknown_translation_unit_dtors.cpp index 7a40fe7149a..419bab5664e 100644 --- a/rel/d/a/b/d_a_b_zant_magic/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/b/d_a_b_zant_magic/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80650498[4]; -extern u8 const data_80650498[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80650498[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80650498-8065049C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80650498[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp b/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp index ef2e1231b50..eeeec40bf27 100644 --- a/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp +++ b/rel/d/a/b/d_a_b_zant_mobile/d_a_b_zant_mobile.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -39,13 +39,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -237,8 +237,6 @@ static bool daB_ZANTZ_IsDelete(daB_ZANTZ_c*); static void daB_ZANTZ_Delete(daB_ZANTZ_c*); static void useHeapInit(fopAc_ac_c*); static void daB_ZANTZ_Create(daB_ZANTZ_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_B_ZANTZ[12]; extern "C" void __ct__15daB_ZANTZ_HIO_cFv(); extern "C" void draw__11daB_ZANTZ_cFv(); @@ -296,20 +294,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/b/d_a_b_zant_mobile/executor.cpp b/rel/d/a/b/d_a_b_zant_mobile/executor.cpp index 427e3be204d..11ee1e3e57a 100644 --- a/rel/d/a/b/d_a_b_zant_mobile/executor.cpp +++ b/rel/d/a/b/d_a_b_zant_mobile/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80652728[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_zant_mobile/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/b/d_a_b_zant_mobile/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5b576af8ab8..f9f66b794ea 100644 --- a/rel/d/a/b/d_a_b_zant_mobile/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/b/d_a_b_zant_mobile/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80652734[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80652734-8065273C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80652734[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80652920-80652928 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/b/d_a_b_zant_mobile/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_zant_mobile/unknown_translation_unit_ctors.cpp index 0062c439e11..034bd782597 100644 --- a/rel/d/a/b/d_a_b_zant_mobile/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_zant_mobile/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80652728[2]; -extern void* const data_80652728[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_b_zant_mobile_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80652728-80652730 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80652728[2] = { + (void*)__sinit_d_a_b_zant_mobile_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp b/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp index 71703096efe..a8807c50033 100644 --- a/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp +++ b/rel/d/a/b/d_a_b_zant_sima/d_a_b_zant_sima.cpp @@ -53,12 +53,12 @@ struct daB_ZANTS_c { /* 806531E8 */ void create(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -111,8 +111,6 @@ static bool daB_ZANTS_IsDelete(daB_ZANTS_c*); static void daB_ZANTS_Delete(daB_ZANTS_c*); static void useHeapInit(fopAc_ac_c*); static void daB_ZANTS_Create(daB_ZANTS_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_B_ZANTS[12]; extern "C" void draw__11daB_ZANTS_cFv(); extern "C" static void daB_ZANTS_Draw__FP11daB_ZANTS_c(); @@ -152,12 +150,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseAngleS(s16*, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/b/d_a_b_zant_sima/executor.cpp b/rel/d/a/b/d_a_b_zant_sima/executor.cpp index 6c9f2f17359..5256ef8223e 100644 --- a/rel/d/a/b/d_a_b_zant_sima/executor.cpp +++ b/rel/d/a/b/d_a_b_zant_sima/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80653324[4]; -extern u8 const data_80653328[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/b/d_a_b_zant_sima/unknown_translation_unit_ctors.cpp b/rel/d/a/b/d_a_b_zant_sima/unknown_translation_unit_ctors.cpp index 56d4d7613e4..0da36e68706 100644 --- a/rel/d/a/b/d_a_b_zant_sima/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/b/d_a_b_zant_sima/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80653324[4]; -extern u8 const data_80653324[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80653324[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80653324-80653328 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80653324[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/b/d_a_b_zant_sima/unknown_translation_unit_dtors.cpp b/rel/d/a/b/d_a_b_zant_sima/unknown_translation_unit_dtors.cpp index b2f8fdc1e61..b5c9b4c247b 100644 --- a/rel/d/a/b/d_a_b_zant_sima/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/b/d_a_b_zant_sima/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80653328[4]; -extern u8 const data_80653328[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80653328[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80653328-8065332C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80653328[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp b/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp index 54a55c9e97b..88811c76253 100644 --- a/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp +++ b/rel/d/a/d_a_L7demo_dr/d_a_L7demo_dr.cpp @@ -15,10 +15,10 @@ struct stage_tgsc_class {}; struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -26,13 +26,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -122,8 +122,6 @@ static bool daDr_IsDelete(daDr_c*); static void daDr_Delete(daDr_c*); static void useHeapInit(fopAc_ac_c*); static void daDr_Create(daDr_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_DR[12]; extern "C" void setAction__6daDr_cFM6daDr_cFPCvPv_v(); extern "C" void action__6daDr_cFv(); @@ -164,11 +162,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/d_a_L7demo_dr/executor.cpp b/rel/d/a/d_a_L7demo_dr/executor.cpp index 60ab48f2760..c1caba4cd77 100644 --- a/rel/d/a/d_a_L7demo_dr/executor.cpp +++ b/rel/d/a/d_a_L7demo_dr/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805AA44C[4]; -extern u8 const data_805AA450[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_L7demo_dr/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_L7demo_dr/unknown_translation_unit_ctors.cpp index 51b005f58b7..4f6ae44d464 100644 --- a/rel/d/a/d_a_L7demo_dr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_L7demo_dr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805AA44C[4]; -extern u8 const data_805AA44C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805AA44C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805AA44C-805AA450 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805AA44C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_L7demo_dr/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_L7demo_dr/unknown_translation_unit_dtors.cpp index 5943d3e3acf..5365138b4cb 100644 --- a/rel/d/a/d_a_L7demo_dr/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_L7demo_dr/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805AA450[4]; -extern u8 const data_805AA450[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805AA450[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805AA450-805AA454 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805AA450[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp b/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp index a8bbceb9dac..3c94824f299 100644 --- a/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp +++ b/rel/d/a/d_a_L7low_dr/d_a_L7low_dr.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -24,13 +24,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -97,8 +97,6 @@ static void useHeapInit(fopAc_ac_c*); static void daL7lowDr_Create(daL7lowDr_c*); static void daL7lowDr_Draw(daL7lowDr_c*); static bool daL7lowDr_IsDelete(daL7lowDr_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_L7lowDr[12]; extern "C" void setAction__11daL7lowDr_cFM11daL7lowDr_cFPCvPv_v(); extern "C" void action__11daL7lowDr_cFv(); @@ -132,13 +130,6 @@ void cM_rndFX(f32); void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/d_a_L7low_dr/executor.cpp b/rel/d/a/d_a_L7low_dr/executor.cpp index 03f4951337c..a076954c26f 100644 --- a/rel/d/a/d_a_L7low_dr/executor.cpp +++ b/rel/d/a/d_a_L7low_dr/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805AAF6C[4]; -extern u8 const data_805AAF70[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_L7low_dr/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_L7low_dr/unknown_translation_unit_ctors.cpp index 0bdaa70b6a5..b81759744f8 100644 --- a/rel/d/a/d_a_L7low_dr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_L7low_dr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805AAF6C[4]; -extern u8 const data_805AAF6C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805AAF6C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805AAF6C-805AAF70 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805AAF6C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_L7low_dr/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_L7low_dr/unknown_translation_unit_dtors.cpp index 82b23943db1..1a4ed9887b4 100644 --- a/rel/d/a/d_a_L7low_dr/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_L7low_dr/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805AAF70[4]; -extern u8 const data_805AAF70[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805AAF70[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805AAF70-805AAF74 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805AAF70[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp b/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp index 63c893d56b5..81c026866d1 100644 --- a/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp +++ b/rel/d/a/d_a_L7op_demo_dr/d_a_L7op_demo_dr.cpp @@ -15,8 +15,6 @@ struct request_of_phase_process_class {}; struct Vec {}; -struct csXyz {}; - struct cXyz { /* 8026702C */ bool operator==(Vec const&) const; /* 805ADDD8 */ void abs(Vec const&) const; @@ -24,6 +22,8 @@ struct cXyz { /* 805ADF2C */ void operator=(cXyz const&); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -37,13 +37,13 @@ struct mDoExt_morf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -167,8 +167,6 @@ static bool daL7ODR_IsDelete(daL7ODR_c*); static void daL7ODR_Delete(daL7ODR_c*); static void useHeapInit(fopAc_ac_c*); static void daL7ODR_Create(daL7ODR_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_L7ODR[12]; extern "C" void setAction__9daL7ODR_cFM9daL7ODR_cFPCvPv_v(); extern "C" void action__9daL7ODR_cFv(); @@ -233,15 +231,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_L7op_demo_dr/executor.cpp b/rel/d/a/d_a_L7op_demo_dr/executor.cpp index 104aa2e6364..4238064888c 100644 --- a/rel/d/a/d_a_L7op_demo_dr/executor.cpp +++ b/rel/d/a/d_a_L7op_demo_dr/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805ADF48[4]; -extern u8 const data_805ADF4C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_L7op_demo_dr/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_L7op_demo_dr/unknown_translation_unit_ctors.cpp index 918321778ee..84572e31ae6 100644 --- a/rel/d/a/d_a_L7op_demo_dr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_L7op_demo_dr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805ADF48[4]; -extern u8 const data_805ADF48[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805ADF48[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805ADF48-805ADF4C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805ADF48[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_L7op_demo_dr/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_L7op_demo_dr/unknown_translation_unit_dtors.cpp index 00e4d62696f..4cba120c588 100644 --- a/rel/d/a/d_a_L7op_demo_dr/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_L7op_demo_dr/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805ADF4C[4]; -extern u8 const data_805ADF4C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805ADF4C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805ADF4C-805ADF50 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805ADF4C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_alldie/d_a_alldie.cpp b/rel/d/a/d_a_alldie/d_a_alldie.cpp index 202d4b13655..bda450b12b4 100644 --- a/rel/d/a/d_a_alldie/d_a_alldie.cpp +++ b/rel/d/a/d_a_alldie/d_a_alldie.cpp @@ -52,7 +52,6 @@ static void daAlldie_Execute(daAlldie_c*); static bool daAlldie_IsDelete(daAlldie_c*); static void daAlldie_Delete(daAlldie_c*); static void daAlldie_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_ALLDIE[12]; extern "C" void getEventNo__10daAlldie_cFv(); extern "C" void getSwbit__10daAlldie_cFv(); @@ -76,9 +75,6 @@ extern "C" extern void* g_profile_ALLDIE[12]; void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); void fopAcM_myRoomSearchEnemy(s8); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_alldie/executor.cpp b/rel/d/a/d_a_alldie/executor.cpp index 00c91658e22..922c84f3347 100644 --- a/rel/d/a/d_a_alldie/executor.cpp +++ b/rel/d/a/d_a_alldie/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804D5D1C[4]; -extern u8 const data_804D5D20[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_alldie/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_alldie/unknown_translation_unit_ctors.cpp index 14bbd0795bd..6b73cf590b1 100644 --- a/rel/d/a/d_a_alldie/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_alldie/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D5D1C[4]; -extern u8 const data_804D5D1C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804D5D1C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804D5D1C-804D5D20 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804D5D1C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_alldie/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_alldie/unknown_translation_unit_dtors.cpp index b5397e827fc..0021256b919 100644 --- a/rel/d/a/d_a_alldie/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_alldie/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D5D20[4]; -extern u8 const data_804D5D20[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804D5D20[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804D5D20-804D5D24 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804D5D20[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_andsw/d_a_andsw.cpp b/rel/d/a/d_a_andsw/d_a_andsw.cpp index 4395a45b08e..ed1863ca2fe 100644 --- a/rel/d/a/d_a_andsw/d_a_andsw.cpp +++ b/rel/d/a/d_a_andsw/d_a_andsw.cpp @@ -34,7 +34,6 @@ struct dSv_info_c { static void daAndsw_Execute(daAndsw_c*); static void daAndsw_Delete(daAndsw_c*); static void daAndsw_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_ANDSW[12]; extern "C" void Create__9daAndsw_cFv(); extern "C" void create__9daAndsw_cFv(); @@ -50,9 +49,6 @@ extern "C" extern void* g_profile_ANDSW[12]; // void fopAcM_delete(fopAc_ac_c*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_delete__FP10fopAc_ac_c(); diff --git a/rel/d/a/d_a_andsw/executor.cpp b/rel/d/a/d_a_andsw/executor.cpp index 7365635671b..b76188a43d5 100644 --- a/rel/d/a/d_a_andsw/executor.cpp +++ b/rel/d/a/d_a_andsw/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80457B24[4]; -extern u8 const data_80457B28[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_andsw/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_andsw/unknown_translation_unit_ctors.cpp index ae6cfa651c7..594139c6c56 100644 --- a/rel/d/a/d_a_andsw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_andsw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80457B24[4]; -extern u8 const data_80457B24[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80457B24[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80457B24-80457B28 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80457B24[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_andsw/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_andsw/unknown_translation_unit_dtors.cpp index 3e426dc4074..b410d92b576 100644 --- a/rel/d/a/d_a_andsw/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_andsw/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80457B28[4]; -extern u8 const data_80457B28[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80457B28[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80457B28-80457B2C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80457B28[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_andsw2/d_a_andsw2.cpp b/rel/d/a/d_a_andsw2/d_a_andsw2.cpp index 7783b2d0e1c..7928fad5b61 100644 --- a/rel/d/a/d_a_andsw2/d_a_andsw2.cpp +++ b/rel/d/a/d_a_andsw2/d_a_andsw2.cpp @@ -60,7 +60,6 @@ static bool daAndsw2_actionWait(daAndsw2_c*); static void daAndsw2_Execute(daAndsw2_c*); static void daAndsw2_Delete(daAndsw2_c*); static void daAndsw2_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_ANDSW2[12]; extern "C" void getEventNo__10daAndsw2_cFv(); extern "C" void getSwbit__10daAndsw2_cFv(); @@ -93,9 +92,6 @@ extern "C" extern void* g_profile_ANDSW2[12]; void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); void dLib_getEventSwitchNo(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_andsw2/executor.cpp b/rel/d/a/d_a_andsw2/executor.cpp index fd38079ffa9..584e19c86fd 100644 --- a/rel/d/a/d_a_andsw2/executor.cpp +++ b/rel/d/a/d_a_andsw2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804D6AC0[4]; -extern u8 const data_804D6AC4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_andsw2/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_andsw2/unknown_translation_unit_ctors.cpp index ce942f12c09..4cb151ec311 100644 --- a/rel/d/a/d_a_andsw2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_andsw2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D6AC0[4]; -extern u8 const data_804D6AC0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804D6AC0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804D6AC0-804D6AC4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804D6AC0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_andsw2/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_andsw2/unknown_translation_unit_dtors.cpp index ef84b8a5aa5..f1bcffc539f 100644 --- a/rel/d/a/d_a_andsw2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_andsw2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D6AC4[4]; -extern u8 const data_804D6AC4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804D6AC4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804D6AC4-804D6AC8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804D6AC4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_arrow/d_a_arrow.cpp b/rel/d/a/d_a_arrow/d_a_arrow.cpp index 4b171fbc509..fd37fa2ecef 100644 --- a/rel/d/a/d_a_arrow/d_a_arrow.cpp +++ b/rel/d/a/d_a_arrow/d_a_arrow.cpp @@ -298,50 +298,6 @@ static void daAlink_searchHorseZelda(fopAc_ac_c*, void*); static void daArrow_create(daArrow_c*); static void daArrow_delete(daArrow_c*); static void cLib_calcTimer__template0(s16*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_ARROW[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8049DFBC[4]; -extern "C" extern u8 data_8049DFC0[4]; -extern "C" extern u8 data_8049DFC4[4]; -extern "C" extern u8 data_8049DFC8[4]; -extern "C" extern u8 data_8049DFCC[4]; -extern "C" extern u8 data_8049DFD0[4]; -extern "C" extern u8 data_8049DFD4[4]; -extern "C" extern u8 data_8049DFD8[4]; -extern "C" extern u8 data_8049DFDC[4]; -extern "C" extern u8 data_8049DFE0[4]; -extern "C" extern u8 data_8049DFE4[4]; -extern "C" extern u8 data_8049DFE8[4]; -extern "C" extern u8 data_8049DFEC[4]; -extern "C" extern u8 data_8049DFF0[4]; -extern "C" extern u8 data_8049DFF4[4]; -extern "C" extern u8 data_8049DFF8[4]; -extern "C" extern u8 data_8049DFFC[4]; -extern "C" extern u8 data_8049E000[4]; -extern "C" extern u8 data_8049E004[4]; -extern "C" extern u8 data_8049E008[4]; -extern "C" extern u8 data_8049E00C[4]; -extern "C" extern u8 data_8049E010[4]; -extern "C" extern u8 data_8049E014[4]; -extern "C" extern u8 data_8049E018[4]; -extern "C" extern u8 data_8049E01C[4]; -extern "C" extern u8 data_8049E020[4]; extern "C" void createHeap__9daArrow_cFv(); extern "C" static void daArrow_createHeap__FP10fopAc_ac_c(); @@ -476,31 +432,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__22dPa_hermiteEcallBack_c[9]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__15Z2SoundObjArrow[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 struct_80450D88[4]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/d_a_arrow/executor.cpp b/rel/d/a/d_a_arrow/executor.cpp index 1ab509734f9..cb03ef8a11f 100644 --- a/rel/d/a/d_a_arrow/executor.cpp +++ b/rel/d/a/d_a_arrow/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8049DC74[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_arrow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_arrow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 626ea82aeff..6addb3dec5d 100644 --- a/rel/d/a/d_a_arrow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_arrow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8049DC7C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8049DC7C-8049DC84 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8049DC7C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8049DF58-8049DF60 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_arrow/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_arrow/unknown_translation_unit_ctors.cpp index f826c8da21f..537f36ecb44 100644 --- a/rel/d/a/d_a_arrow/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_arrow/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8049DC74[4]; -extern u8 const data_8049DC74[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8049DC74[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8049DC74-8049DC78 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8049DC74[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp b/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp index 53886e48aa8..028c5a3f99a 100644 --- a/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp +++ b/rel/d/a/d_a_balloon_2D/d_a_balloon_2D.cpp @@ -130,8 +130,6 @@ static void daBalloon2D_create(daBalloon2D_c*); static void daBalloon2D_destroy(daBalloon2D_c*); static void daBalloon2D_execute(daBalloon2D_c*); static void daBalloon2D_draw(daBalloon2D_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_BALLOON2D[12]; extern "C" void draw__Q213daBalloon2D_c6c_listFv(); extern "C" static void daBalloon2D_createHeap__FP10fopAc_ac_c(); @@ -183,11 +181,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 sincosTable___5JMath[65536]; SECTION_INIT void memcpy(); extern "C" void mDoExt_getMesgFont__Fv(); diff --git a/rel/d/a/d_a_balloon_2D/executor.cpp b/rel/d/a/d_a_balloon_2D/executor.cpp index a6ce9a10a07..ed427b800b8 100644 --- a/rel/d/a/d_a_balloon_2D/executor.cpp +++ b/rel/d/a/d_a_balloon_2D/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80655598[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_balloon_2D/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_balloon_2D/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4f666089ce1..5dad565ec8e 100644 --- a/rel/d/a/d_a_balloon_2D/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_balloon_2D/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806555A4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806555A4-806555AC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806555A4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80655768-80655770 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_balloon_2D/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_balloon_2D/unknown_translation_unit_ctors.cpp index 6edb8b7ec59..1bb7b80c3e9 100644 --- a/rel/d/a/d_a_balloon_2D/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_balloon_2D/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80655598[2]; -extern void* const data_80655598[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_balloon_2D_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80655598-806555A0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80655598[2] = { + (void*)__sinit_d_a_balloon_2D_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_bd/d_a_bd.cpp b/rel/d/a/d_a_bd/d_a_bd.cpp index 844933dd18c..2c81ab05148 100644 --- a/rel/d/a/d_a_bd/d_a_bd.cpp +++ b/rel/d/a/d_a_bd/d_a_bd.cpp @@ -30,11 +30,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -57,13 +57,13 @@ struct daBd_HIO_c { /* 804D9CB8 */ ~daBd_HIO_c(); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 804D6ED4 */ ~cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -189,49 +189,6 @@ static bool daBd_IsDelete(bd_class*); static void daBd_Delete(bd_class*); static void useHeapInit(fopAc_ac_c*); static void daBd_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4759; -extern "C" extern u32 const lit_4760; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_BD[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_804DA3F0[4]; -extern "C" extern u8 data_804DA3F4[4]; -extern "C" extern u8 data_804DA3F8[4]; -extern "C" extern u8 data_804DA3FC[4]; -extern "C" extern u8 data_804DA400[4]; -extern "C" extern u8 data_804DA404[4]; -extern "C" extern u8 data_804DA408[4]; -extern "C" extern u8 data_804DA40C[4]; -extern "C" extern u8 data_804DA410[4]; -extern "C" extern u8 data_804DA414[4]; -extern "C" extern u8 data_804DA418[4]; -extern "C" extern u8 data_804DA41C[4]; -extern "C" extern u8 data_804DA420[4]; -extern "C" extern u8 data_804DA424[4]; -extern "C" extern u8 data_804DA428[4]; -extern "C" extern u8 data_804DA42C[4]; -extern "C" extern u8 data_804DA430[4]; -extern "C" extern u8 data_804DA434[4]; -extern "C" extern u8 data_804DA438[4]; -extern "C" extern u8 data_804DA43C[4]; -extern "C" extern u8 data_804DA440[4]; -extern "C" extern u8 data_804DA444[4]; -extern "C" extern u8 data_804DA448[4]; -extern "C" extern u8 data_804DA44C[4]; -extern "C" extern u8 data_804DA450[4]; extern "C" void __ct__10daBd_HIO_cFv(); extern "C" static void anm_init__FP8bd_classifUcf(); @@ -342,19 +299,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_bd/executor.cpp b/rel/d/a/d_a_bd/executor.cpp index 957f17dac29..62729016fbb 100644 --- a/rel/d/a/d_a_bd/executor.cpp +++ b/rel/d/a/d_a_bd/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804D9E50[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_bd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_bd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9443f546a8a..93ec405baa0 100644 --- a/rel/d/a/d_a_bd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_bd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804D9E5C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804D9E5C-804D9E64 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804D9E5C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804DA318-804DA320 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_bd/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_bd/unknown_translation_unit_ctors.cpp index e61e190bb57..95dbe22935e 100644 --- a/rel/d/a/d_a_bd/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_bd/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804D9E50[2]; -extern void* const data_804D9E50[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_bd_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804D9E50-804D9E58 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804D9E50[2] = { + (void*)__sinit_d_a_bd_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_bg/d_a_bg.cpp b/rel/d/a/d_a_bg/d_a_bg.cpp index 02ed5f53912..1333607191d 100644 --- a/rel/d/a/d_a_bg/d_a_bg.cpp +++ b/rel/d/a/d_a_bg/d_a_bg.cpp @@ -77,10 +77,10 @@ struct dStage_roomControl_c { /* 800243B0 */ void getMemoryBlock(int); }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -195,8 +195,6 @@ static void daBg_Execute(daBg_c*); static bool daBg_IsDelete(daBg_c*); static void daBg_Delete(daBg_c*); static void daBg_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_BG[13]; extern "C" void setArcName__6daBg_cFv(); extern "C" static void createMatAnm__FP12J3DModelDataUs(); @@ -250,18 +248,6 @@ void dKy_tevstr_init(dKy_tevstr_c*, s8, u8); void dKy_bg_MAxx_proc(void*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mRoom__7daSus_c[256]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 m_frame__7dDemo_c[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/d_a_bg/executor.cpp b/rel/d/a/d_a_bg/executor.cpp index f770644dfe3..f5baa27761d 100644 --- a/rel/d/a/d_a_bg/executor.cpp +++ b/rel/d/a/d_a_bg/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8045936C[4]; -extern u8 const data_80459370[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_bg/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_bg/unknown_translation_unit_ctors.cpp index 26da15aa9fc..f18692960a2 100644 --- a/rel/d/a/d_a_bg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_bg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8045936C[4]; -extern u8 const data_8045936C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8045936C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8045936C-80459370 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8045936C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_bg/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_bg/unknown_translation_unit_dtors.cpp index 2f9f88ecb42..692972266f2 100644 --- a/rel/d/a/d_a_bg/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_bg/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80459370[4]; -extern u8 const data_80459370[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80459370[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80459370-80459374 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80459370[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp index eb2312263a9..4a467ae6c95 100644 --- a/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp +++ b/rel/d/a/d_a_bg_obj/d_a_bg_obj.cpp @@ -54,10 +54,10 @@ struct dBgW { /* 8007B9C0 */ void Move(); }; -struct cCcD_Obj {}; - struct J3DModel {}; +struct cCcD_Obj {}; + struct daBgObj_c { struct spec_data_c { /* 804597E8 */ void initParticleBlock(u8*); @@ -283,8 +283,6 @@ static void daBgObj_create1st(daBgObj_c*); static void daBgObj_MoveBGDelete(daBgObj_c*); static void daBgObj_MoveBGExecute(daBgObj_c*); static void daBgObj_MoveBGDraw(daBgObj_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_BG_OBJ[12]; extern "C" static void getBmdName__Fii(); extern "C" static void getBtkName__Fii(); @@ -376,22 +374,6 @@ void cM_atan2s(f32, f32); void* operator new(u32); void operator delete(void*); void J3DGetTranslateRotateMtx(J3DTransformInfo const&, f32 (*)[4]); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Tri[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_TriAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_bg_obj/executor.cpp b/rel/d/a/d_a_bg_obj/executor.cpp index 63966a57937..3e0ac60fd09 100644 --- a/rel/d/a/d_a_bg_obj/executor.cpp +++ b/rel/d/a/d_a_bg_obj/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8045C9AC[2]; -extern u8 const data_8045C9B4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_bg_obj/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_bg_obj/unknown_translation_unit_ctors.cpp index 7ff23e533bb..d9e48ed47e8 100644 --- a/rel/d/a/d_a_bg_obj/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_bg_obj/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8045C9AC[2]; -extern void* const data_8045C9AC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_bg_obj_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8045C9AC-8045C9B4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8045C9AC[2] = { + (void*)__sinit_d_a_bg_obj_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_bg_obj/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_bg_obj/unknown_translation_unit_dtors.cpp index 6a7ae2ccf2d..0b6d1698312 100644 --- a/rel/d/a/d_a_bg_obj/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_bg_obj/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8045C9B4[4]; -extern u8 const data_8045C9B4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8045C9B4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8045C9B4-8045C9B8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8045C9B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp index 11478e93b58..b5ad6e29d42 100644 --- a/rel/d/a/d_a_boomerang/d_a_boomerang.cpp +++ b/rel/d/a/d_a_boomerang/d_a_boomerang.cpp @@ -11,10 +11,6 @@ // Types: // -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -26,6 +22,10 @@ struct cXyz { /* 804A27FC */ cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -141,6 +141,8 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; +struct dBgS_AcchCir {}; + struct cBgS_PolyInfo {}; struct dBgS { @@ -150,8 +152,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -346,58 +346,6 @@ static void daBoomerang_Execute(daBoomerang_c*); static void daBoomerang_Delete(daBoomerang_c*); static void daBoomerang_createHeap(fopAc_ac_c*); static void daBoomerang_Create(fopAc_ac_c*); -extern "C" extern u8 const l_blurTop[12]; -extern "C" extern u8 const struct_804A2868[20]; -extern "C" extern u32 const m_minCircleR__18daBoomerang_HIO_c0; -extern "C" extern u32 const m_middleCircleR__18daBoomerang_HIO_c0; -extern "C" extern u32 const m_maxCircleR__18daBoomerang_HIO_c0; -extern "C" extern u32 const m_scale__18daBoomerang_HIO_c0; -extern "C" extern u32 const m_lockWindScale__18daBoomerang_HIO_c0; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_BOOMERANG[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 l_HIO[1 + 3 /* padding */]; -extern "C" extern u8 data_804A2D50[4]; -extern "C" extern u8 data_804A2D54[4]; -extern "C" extern u8 data_804A2D58[4]; -extern "C" extern u8 data_804A2D5C[4]; -extern "C" extern u8 data_804A2D60[4]; -extern "C" extern u8 data_804A2D64[4]; -extern "C" extern u8 data_804A2D68[4]; -extern "C" extern u8 data_804A2D6C[4]; -extern "C" extern u8 data_804A2D70[4]; -extern "C" extern u8 data_804A2D74[4]; -extern "C" extern u8 data_804A2D78[4]; -extern "C" extern u8 data_804A2D7C[4]; -extern "C" extern u8 data_804A2D80[4]; -extern "C" extern u8 data_804A2D84[4]; -extern "C" extern u8 data_804A2D88[4]; -extern "C" extern u8 data_804A2D8C[4]; -extern "C" extern u8 data_804A2D90[4]; -extern "C" extern u8 data_804A2D94[4]; -extern "C" extern u8 data_804A2D98[4]; -extern "C" extern u8 data_804A2D9C[4]; -extern "C" extern u8 data_804A2DA0[4]; -extern "C" extern u8 data_804A2DA4[4]; -extern "C" extern u8 data_804A2DA8[4]; -extern "C" extern u8 data_804A2DAC[4]; -extern "C" extern u8 data_804A2DB0[4]; -extern "C" extern u8 data_804A2DB4[4]; extern "C" void createHeap__19daBoomerang_sight_cFv(); extern "C" void initialize__19daBoomerang_sight_cFv(); @@ -542,29 +490,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mRoofCheck__11fopAcM_rc_c[80]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mRoofY__11fopAcM_rc_c[4]; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 struct_8045101C[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_boomerang/executor.cpp b/rel/d/a/d_a_boomerang/executor.cpp index 658da6ab07c..4b3b4acaee9 100644 --- a/rel/d/a/d_a_boomerang/executor.cpp +++ b/rel/d/a/d_a_boomerang/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804A2848[4]; -extern u8 const data_804A284C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_boomerang/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_boomerang/unknown_translation_unit_ctors.cpp index 4d036a6b757..f1e290e0af1 100644 --- a/rel/d/a/d_a_boomerang/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_boomerang/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804A2848[4]; -extern u8 const data_804A2848[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804A2848[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804A2848-804A284C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804A2848[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_boomerang/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_boomerang/unknown_translation_unit_dtors.cpp index 8e223c01605..ed11f7e5e7e 100644 --- a/rel/d/a/d_a_boomerang/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_boomerang/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804A284C[4]; -extern u8 const data_804A284C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804A284C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804A284C-804A2850 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804A284C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_bullet/d_a_bullet.cpp b/rel/d/a/d_a_bullet/d_a_bullet.cpp index 2c6a6f92bdf..63163c9304b 100644 --- a/rel/d/a/d_a_bullet/d_a_bullet.cpp +++ b/rel/d/a/d_a_bullet/d_a_bullet.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -147,10 +147,6 @@ static void daBullet_Execute(void*); static void daBullet_Draw(void*); static bool daBullet_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 const lit_3843; -extern "C" extern u32 const lit_3844; -extern "C" extern u8 const lit_3845[4]; -extern "C" extern void* g_profile_BULLET[12]; extern "C" void __dt__10daBullet_cFv(); extern "C" void create__10daBullet_cFv(); @@ -200,19 +196,6 @@ void fopAcM_posMoveF(fopAc_ac_c*, cXyz const*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern void* const pad_8065670C[2]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/d_a_bullet/executor.cpp b/rel/d/a/d_a_bullet/executor.cpp index 8dc0f8fce12..d31a9894218 100644 --- a/rel/d/a/d_a_bullet/executor.cpp +++ b/rel/d/a/d_a_bullet/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80656700[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_bullet/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_bullet/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4154f25a11b..52028c0e8fa 100644 --- a/rel/d/a/d_a_bullet/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_bullet/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8065670C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8065670C-80656714 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_8065670C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806568B8-806568C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_bullet/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_bullet/unknown_translation_unit_ctors.cpp index 30d1c43256e..f9ddcd07535 100644 --- a/rel/d/a/d_a_bullet/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_bullet/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80656700[2]; -extern void* const data_80656700[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_bullet_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80656700-80656708 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80656700[2] = { + (void*)__sinit_d_a_bullet_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_canoe/d_a_canoe.cpp b/rel/d/a/d_a_canoe/d_a_canoe.cpp index 6a2e3ff35ba..9ff64932cb3 100644 --- a/rel/d/a/d_a_canoe/d_a_canoe.cpp +++ b/rel/d/a/d_a_canoe/d_a_canoe.cpp @@ -275,49 +275,6 @@ static void daCanoe_Create(fopAc_ac_c*); static void daCanoe_Delete(daCanoe_c*); static void daCanoe_Execute(daCanoe_c*); static void daCanoe_Draw(daCanoe_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_CANOE[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_804DD870[4]; -extern "C" extern u8 data_804DD874[4]; -extern "C" extern u8 data_804DD878[4]; -extern "C" extern u8 data_804DD87C[4]; -extern "C" extern u8 data_804DD880[4]; -extern "C" extern u8 data_804DD884[4]; -extern "C" extern u8 data_804DD888[4]; -extern "C" extern u8 data_804DD88C[4]; -extern "C" extern u8 data_804DD890[4]; -extern "C" extern u8 data_804DD894[4]; -extern "C" extern u8 data_804DD898[4]; -extern "C" extern u8 data_804DD89C[4]; -extern "C" extern u8 data_804DD8A0[4]; -extern "C" extern u8 data_804DD8A4[4]; -extern "C" extern u8 data_804DD8A8[4]; -extern "C" extern u8 data_804DD8AC[4]; -extern "C" extern u8 data_804DD8B0[4]; -extern "C" extern u8 data_804DD8B4[4]; -extern "C" extern u8 data_804DD8B8[4]; -extern "C" extern u8 data_804DD8BC[4]; -extern "C" extern u8 data_804DD8C0[4]; -extern "C" extern u8 data_804DD8C4[4]; -extern "C" extern u8 data_804DD8C8[4]; -extern "C" extern u8 data_804DD8CC[4]; -extern "C" extern u8 data_804DD8D0[4]; -extern "C" extern u8 data_804DD8D4[4]; extern "C" static void daCanoe_searchTagWaterFall__FP10fopAc_ac_cPv(); extern "C" void __dt__4cXyzFv(); @@ -425,28 +382,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_distanceAngleS(s16, s16); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/d_a_canoe/executor.cpp b/rel/d/a/d_a_canoe/executor.cpp index c854b7a1e3e..46ac78871d8 100644 --- a/rel/d/a/d_a_canoe/executor.cpp +++ b/rel/d/a/d_a_canoe/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804DD5CC[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_canoe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_canoe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 76e6cc8b919..93e8b64fb3d 100644 --- a/rel/d/a/d_a_canoe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_canoe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804DD5D4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804DD5D4-804DD5DC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804DD5D4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804DD7F0-804DD7F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_canoe/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_canoe/unknown_translation_unit_ctors.cpp index 93949241181..0b619100a18 100644 --- a/rel/d/a/d_a_canoe/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_canoe/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804DD5CC[4]; -extern u8 const data_804DD5CC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804DD5CC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804DD5CC-804DD5D0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804DD5CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp b/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp index 0473f99d5e0..89404c01eb0 100644 --- a/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp +++ b/rel/d/a/d_a_coach_2D/d_a_coach_2D.cpp @@ -115,8 +115,6 @@ static void daCoach2D_create(daCoach2D_c*); static void daCoach2D_destroy(daCoach2D_c*); static void daCoach2D_execute(daCoach2D_c*); static void daCoach2D_draw(daCoach2D_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_COACH2D[12]; extern "C" void draw__Q211daCoach2D_c6c_listFv(); extern "C" static void daCoach2D_createHeap__FP10fopAc_ac_c(); @@ -152,10 +150,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; SECTION_INIT void memcpy(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_coach_2D/executor.cpp b/rel/d/a/d_a_coach_2D/executor.cpp index 389e1b13ade..d53bac1bb91 100644 --- a/rel/d/a/d_a_coach_2D/executor.cpp +++ b/rel/d/a/d_a_coach_2D/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80657910[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_coach_2D/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_coach_2D/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 91ddde96ab5..73b5f1a09e9 100644 --- a/rel/d/a/d_a_coach_2D/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_coach_2D/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8065791C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8065791C-80657924 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8065791C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80657A88-80657A90 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_coach_2D/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_coach_2D/unknown_translation_unit_ctors.cpp index 79d69ba0411..5e6b38ea34e 100644 --- a/rel/d/a/d_a_coach_2D/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_coach_2D/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80657910[2]; -extern void* const data_80657910[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_coach_2D_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80657910-80657918 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80657910[2] = { + (void*)__sinit_d_a_coach_2D_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp b/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp index 51a94802955..a19242dabf7 100644 --- a/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp +++ b/rel/d/a/d_a_coach_fire/d_a_coach_fire.cpp @@ -30,18 +30,18 @@ struct daCoachFire_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -109,8 +109,6 @@ static void daCoachFire_Execute(daCoachFire_c*); static bool daCoachFire_IsDelete(daCoachFire_c*); static void daCoachFire_Delete(daCoachFire_c*); static void daCoachFire_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_COACH_FIRE[12]; extern "C" void create_init__13daCoachFire_cFv(); extern "C" void initBaseMtx__13daCoachFire_cFv(); @@ -139,16 +137,6 @@ void fpcEx_SearchByID(unsigned int); void dKy_plight_set(LIGHT_INFLUENCE*); void dKy_plight_cut(LIGHT_INFLUENCE*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_coach_fire/executor.cpp b/rel/d/a/d_a_coach_fire/executor.cpp index 7de8892250d..180a1c7476b 100644 --- a/rel/d/a/d_a_coach_fire/executor.cpp +++ b/rel/d/a/d_a_coach_fire/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_806583E0[4]; -extern u8 const data_806583E4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_coach_fire/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_coach_fire/unknown_translation_unit_ctors.cpp index 42bcaa3964e..007c3eb27e8 100644 --- a/rel/d/a/d_a_coach_fire/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_coach_fire/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_806583E0[4]; -extern u8 const data_806583E0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_806583E0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806583E0-806583E4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_806583E0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_coach_fire/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_coach_fire/unknown_translation_unit_dtors.cpp index 2bf2c421a19..ea818e6972b 100644 --- a/rel/d/a/d_a_coach_fire/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_coach_fire/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_806583E4[4]; -extern u8 const data_806583E4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_806583E4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 806583E4-806583E8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_806583E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_cow/d_a_cow.cpp b/rel/d/a/d_a_cow/d_a_cow.cpp index ea609f0fdcc..2f381478191 100644 --- a/rel/d/a/d_a_cow/d_a_cow.cpp +++ b/rel/d/a/d_a_cow/d_a_cow.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,16 +21,18 @@ struct cXyz { /* 80658A68 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); /* 8000CF44 */ void ZXYrotM(csXyz const&); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -44,16 +44,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -187,8 +187,6 @@ struct dRes_control_c { struct dPath {}; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -196,6 +194,8 @@ struct dBgS_AcchCir { /* 806625B4 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -339,54 +339,6 @@ static void daCow_Draw(void*); static void daCow_Delete(void*); static bool daCow_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 const lit_6980; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_7144[3]; -extern "C" extern void* lit_7150[3]; -extern "C" extern void* lit_7153[3]; -extern "C" extern void* g_profile_COW[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 m_search_range[4]; -extern "C" extern u8 data_80663558[4]; -extern "C" extern u8 data_8066355C[4]; -extern "C" extern u8 data_80663560[4]; -extern "C" extern u8 data_80663564[4]; -extern "C" extern u8 data_80663568[4]; -extern "C" extern u8 data_8066356C[4]; -extern "C" extern u8 data_80663570[4]; -extern "C" extern u8 data_80663574[4]; -extern "C" extern u8 data_80663578[4]; -extern "C" extern u8 data_8066357C[4]; -extern "C" extern u8 data_80663580[4]; -extern "C" extern u8 data_80663584[4]; -extern "C" extern u8 data_80663588[4]; -extern "C" extern u8 data_8066358C[4]; -extern "C" extern u8 data_80663590[4]; -extern "C" extern u8 data_80663594[4]; -extern "C" extern u8 data_80663598[4]; -extern "C" extern u8 data_8066359C[4]; -extern "C" extern u8 data_806635A0[4]; -extern "C" extern u8 data_806635A4[4]; -extern "C" extern u8 data_806635A8[4]; -extern "C" extern u8 data_806635AC[4]; -extern "C" extern u8 data_806635B0[4]; -extern "C" extern u8 data_806635B4[4]; -extern "C" extern u8 data_806635B8[4]; extern "C" void calcRunAnime__7daCow_cFi(); extern "C" void setBck__7daCow_cFiUcff(); @@ -592,24 +544,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 m_emitterTwoData__8dPaPoT_c[36]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_cow/executor.cpp b/rel/d/a/d_a_cow/executor.cpp index 3edd6dd0b26..c706549801a 100644 --- a/rel/d/a/d_a_cow/executor.cpp +++ b/rel/d/a/d_a_cow/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80662D9C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_cow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_cow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f82537aaa8a..1b95dfef8d1 100644 --- a/rel/d/a/d_a_cow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_cow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80662DA8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80662DA8-80662DB0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80662DA8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80663458-80663460 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_cow/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_cow/unknown_translation_unit_ctors.cpp index 59ac4f7fea4..decc94716da 100644 --- a/rel/d/a/d_a_cow/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_cow/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80662D9C[2]; -extern void* const data_80662D9C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_cow_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80662D9C-80662DA4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80662D9C[2] = { + (void*)__sinit_d_a_cow_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_crod/d_a_crod.cpp b/rel/d/a/d_a_crod/d_a_crod.cpp index 47393846091..cbd4a8af9eb 100644 --- a/rel/d/a/d_a_crod/d_a_crod.cpp +++ b/rel/d/a/d_a_crod/d_a_crod.cpp @@ -11,8 +11,6 @@ // Types: // -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -20,6 +18,8 @@ struct cXyz { /* 80267128 */ void atan2sX_Z() const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -172,7 +172,6 @@ static void daCrod_Create(fopAc_ac_c*); static void daCrod_Delete(daCrod_c*); static void daCrod_Execute(daCrod_c*); static void daCrod_Draw(daCrod_c*); -extern "C" extern void* g_profile_CROD[12]; extern "C" void createHeap__8daCrod_cFv(); extern "C" static void daCrod_createHeap__FP10fopAc_ac_c(); @@ -211,20 +210,6 @@ void dKy_plight_set(LIGHT_INFLUENCE*); void dKy_plight_cut(LIGHT_INFLUENCE*); void cM_atan2s(f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_804A4218[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/d_a_crod/executor.cpp b/rel/d/a/d_a_crod/executor.cpp index 2f58f5c4c14..162900907ef 100644 --- a/rel/d/a/d_a_crod/executor.cpp +++ b/rel/d/a/d_a_crod/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804A40E4[4]; -extern u8 const data_804A40E8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_crod/unknown_translation_unit_bss.cpp b/rel/d/a/d_a_crod/unknown_translation_unit_bss.cpp index 6ff07c0b143..3c2885e30ce 100644 --- a/rel/d/a/d_a_crod/unknown_translation_unit_bss.cpp +++ b/rel/d/a/d_a_crod/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_804A4218[4]; -extern "C" extern u8 data_804A4218[4]; - // // External References: // diff --git a/rel/d/a/d_a_crod/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_crod/unknown_translation_unit_ctors.cpp index b7603dec979..92b063e998f 100644 --- a/rel/d/a/d_a_crod/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_crod/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804A40E4[4]; -extern u8 const data_804A40E4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804A40E4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804A40E4-804A40E8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804A40E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_crod/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_crod/unknown_translation_unit_dtors.cpp index b19b5c0390e..de00d6dc28c 100644 --- a/rel/d/a/d_a_crod/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_crod/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804A40E8[4]; -extern u8 const data_804A40E8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804A40E8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804A40E8-804A40EC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804A40E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_cstaf/d_a_cstaF.cpp b/rel/d/a/d_a_cstaf/d_a_cstaF.cpp index 4fea7f8c0aa..ef85596a73d 100644 --- a/rel/d/a/d_a_cstaf/d_a_cstaF.cpp +++ b/rel/d/a/d_a_cstaf/d_a_cstaF.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz { /* 80267128 */ void atan2sX_Z() const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -59,10 +59,6 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -71,6 +67,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -146,6 +146,12 @@ struct dPa_control_c { cXyz const*, f32); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 804DE220 */ ~dBgS_AcchCir(); +}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; @@ -155,12 +161,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 804DE220 */ ~dBgS_AcchCir(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -294,7 +294,6 @@ static void daCstaF_Create(fopAc_ac_c*); static void daCstaF_Delete(daCstaF_c*); static void daCstaF_Execute(daCstaF_c*); static void daCstaF_Draw(daCstaF_c*); -extern "C" extern void* g_profile_CSTAF[12]; extern "C" static void daCstaF_rideCB__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" void CreateHeap__9daCstaF_cFv(); @@ -349,22 +348,6 @@ void dKy_pol_sound_get(cBgS_PolyInfo const*); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/d_a_cstaf/executor.cpp b/rel/d/a/d_a_cstaf/executor.cpp index 9636ef7fded..3980d4770e1 100644 --- a/rel/d/a/d_a_cstaf/executor.cpp +++ b/rel/d/a/d_a_cstaf/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804DF8AC[2]; -extern u8 const data_804DF8B4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_cstaf/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_cstaf/unknown_translation_unit_ctors.cpp index faace608660..6aa6ab1dbf0 100644 --- a/rel/d/a/d_a_cstaf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_cstaf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804DF8AC[2]; -extern void* const data_804DF8AC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_cstaF_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804DF8AC-804DF8B4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804DF8AC[2] = { + (void*)__sinit_d_a_cstaF_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_cstaf/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_cstaf/unknown_translation_unit_dtors.cpp index fa49619b545..e9c9b424d3e 100644 --- a/rel/d/a/d_a_cstaf/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_cstaf/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804DF8B4[4]; -extern u8 const data_804DF8B4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804DF8B4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804DF8B4-804DF8B8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804DF8B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp index b3861c2cddc..f7a36e3290d 100644 --- a/rel/d/a/d_a_cstatue/d_a_cstatue.cpp +++ b/rel/d/a/d_a_cstatue/d_a_cstatue.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -26,6 +22,10 @@ struct cXyz { /* 80663B34 */ ~cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -65,18 +65,18 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -174,6 +174,12 @@ struct dPa_control_c { cXyz const*, f32); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 80664768 */ ~dBgS_AcchCir(); +}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; @@ -185,12 +191,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 80664768 */ ~dBgS_AcchCir(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -336,49 +336,6 @@ static void daCstatue_Create(fopAc_ac_c*); static void daCstatue_Delete(daCstatue_c*); static void daCstatue_Execute(daCstatue_c*); static void daCstatue_Draw(daCstatue_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_CSTATUE[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80667BDC[4]; -extern "C" extern u8 data_80667BE0[4]; -extern "C" extern u8 data_80667BE4[4]; -extern "C" extern u8 data_80667BE8[4]; -extern "C" extern u8 data_80667BEC[4]; -extern "C" extern u8 data_80667BF0[4]; -extern "C" extern u8 data_80667BF4[4]; -extern "C" extern u8 data_80667BF8[4]; -extern "C" extern u8 data_80667BFC[4]; -extern "C" extern u8 data_80667C00[4]; -extern "C" extern u8 data_80667C04[4]; -extern "C" extern u8 data_80667C08[4]; -extern "C" extern u8 data_80667C0C[4]; -extern "C" extern u8 data_80667C10[4]; -extern "C" extern u8 data_80667C14[4]; -extern "C" extern u8 data_80667C18[4]; -extern "C" extern u8 data_80667C1C[4]; -extern "C" extern u8 data_80667C20[4]; -extern "C" extern u8 data_80667C24[4]; -extern "C" extern u8 data_80667C28[4]; -extern "C" extern u8 data_80667C2C[4]; -extern "C" extern u8 data_80667C30[4]; -extern "C" extern u8 data_80667C34[4]; -extern "C" extern u8 data_80667C38[4]; -extern "C" extern u8 data_80667C3C[4]; -extern "C" extern u8 data_80667C40[4]; extern "C" void atHitCallback__11daCstatue_cFP10fopAc_ac_c(); extern "C" static void @@ -486,28 +443,6 @@ void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 Zero__5csXyz[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/d_a_cstatue/executor.cpp b/rel/d/a/d_a_cstatue/executor.cpp index ffa01315cd5..38d06e22c0f 100644 --- a/rel/d/a/d_a_cstatue/executor.cpp +++ b/rel/d/a/d_a_cstatue/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80667688[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_cstatue/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_cstatue/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6d09df02a52..f2e14944c5f 100644 --- a/rel/d/a/d_a_cstatue/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_cstatue/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80667690[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80667690-80667698 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80667690[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80667B78-80667B80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_cstatue/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_cstatue/unknown_translation_unit_ctors.cpp index e4cf0be8f2f..64f480d1434 100644 --- a/rel/d/a/d_a_cstatue/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_cstatue/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80667688[4]; -extern u8 const data_80667688[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80667688[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80667688-8066768C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80667688[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_demo00/d_a_demo00.cpp b/rel/d/a/d_a_demo00/d_a_demo00.cpp index 829161d1a26..44497bbdb9f 100644 --- a/rel/d/a/d_a_demo00/d_a_demo00.cpp +++ b/rel/d/a/d_a_demo00/d_a_demo00.cpp @@ -46,13 +46,13 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DAnmTexPattern {}; - struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; + struct J3DAnmTevRegKey {}; -struct J3DAnmColor {}; +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -93,18 +93,18 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -124,10 +124,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; - struct dKy_tevstr_c {}; +struct ResTIMG {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -275,53 +275,6 @@ static void daDemo00_Execute(daDemo00_c*); static bool daDemo00_IsDelete(daDemo00_c*); static void daDemo00_Delete(daDemo00_c*); static void daDemo00_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_6393; -extern "C" extern u32 const lit_6394; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* l_lightData[6]; -extern "C" extern void* g_profile_DEMO00[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_804A8E20[4]; -extern "C" extern u8 data_804A8E24[4]; -extern "C" extern u8 data_804A8E28[4]; -extern "C" extern u8 data_804A8E2C[4]; -extern "C" extern u8 data_804A8E30[4]; -extern "C" extern u8 data_804A8E34[4]; -extern "C" extern u8 data_804A8E38[4]; -extern "C" extern u8 data_804A8E3C[4]; -extern "C" extern u8 data_804A8E40[4]; -extern "C" extern u8 data_804A8E44[4]; -extern "C" extern u8 data_804A8E48[4]; -extern "C" extern u8 data_804A8E4C[4]; -extern "C" extern u8 data_804A8E50[4]; -extern "C" extern u8 data_804A8E54[4]; -extern "C" extern u8 data_804A8E58[4]; -extern "C" extern u8 data_804A8E5C[4]; -extern "C" extern u8 data_804A8E60[4]; -extern "C" extern u8 data_804A8E64[4]; -extern "C" extern u8 data_804A8E68[4]; -extern "C" extern u8 data_804A8E6C[4]; -extern "C" extern u8 data_804A8E70[4]; -extern "C" extern u8 data_804A8E74[4]; -extern "C" extern u8 data_804A8E78[4]; -extern "C" extern u8 data_804A8E7C[4]; -extern "C" extern u8 data_804A8E80[4]; -extern "C" extern u8 data_804A8E84[4]; extern "C" void reset__16daDemo00_resID_cFv(); extern "C" void reset__16daDemo00_model_cFv(); @@ -450,28 +403,6 @@ void MtxPush(); void MtxPull(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern u32 g_saftyWhiteColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_object__7dDemo_c[4]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void fadeOut__13mDoGph_gInf_cFf(); diff --git a/rel/d/a/d_a_demo00/executor.cpp b/rel/d/a/d_a_demo00/executor.cpp index de9223045d4..94cdf069ed9 100644 --- a/rel/d/a/d_a_demo00/executor.cpp +++ b/rel/d/a/d_a_demo00/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804A884C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_demo00/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_demo00/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4a4f31f7412..5fa683e26fb 100644 --- a/rel/d/a/d_a_demo00/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_demo00/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804A8858[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804A8858-804A8860 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804A8858[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804A8C10-804A8C18 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_demo00/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_demo00/unknown_translation_unit_ctors.cpp index 02beca19a55..6c2b36be22c 100644 --- a/rel/d/a/d_a_demo00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_demo00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804A884C[2]; -extern void* const data_804A884C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_demo00_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804A884C-804A8854 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804A884C[2] = { + (void*)__sinit_d_a_demo00_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_demo_item/d_a_demo_item.cpp b/rel/d/a/d_a_demo_item/d_a_demo_item.cpp index a862cf509be..cbe751622e8 100644 --- a/rel/d/a/d_a_demo_item/d_a_demo_item.cpp +++ b/rel/d/a/d_a_demo_item/d_a_demo_item.cpp @@ -67,14 +67,14 @@ struct dSv_event_c { /* 80034A04 */ void getEventReg(u16) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct cXyz { /* 804E00A0 */ ~cXyz(); }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -157,48 +157,6 @@ static void daDitem_Delete(daDitem_c*); static void daDitem_Create(daDitem_c*); static void daDitem_Execute(daDitem_c*); static void daDitem_Draw(daDitem_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Demo_Item[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_804E1CBC[4]; -extern "C" extern u8 data_804E1CC0[4]; -extern "C" extern u8 data_804E1CC4[4]; -extern "C" extern u8 data_804E1CC8[4]; -extern "C" extern u8 data_804E1CCC[4]; -extern "C" extern u8 data_804E1CD0[4]; -extern "C" extern u8 data_804E1CD4[4]; -extern "C" extern u8 data_804E1CD8[4]; -extern "C" extern u8 data_804E1CDC[4]; -extern "C" extern u8 data_804E1CE0[4]; -extern "C" extern u8 data_804E1CE4[4]; -extern "C" extern u8 data_804E1CE8[4]; -extern "C" extern u8 data_804E1CEC[4]; -extern "C" extern u8 data_804E1CF0[4]; -extern "C" extern u8 data_804E1CF4[4]; -extern "C" extern u8 data_804E1CF8[4]; -extern "C" extern u8 data_804E1CFC[4]; -extern "C" extern u8 data_804E1D00[4]; -extern "C" extern u8 data_804E1D04[4]; -extern "C" extern u8 data_804E1D08[4]; -extern "C" extern u8 data_804E1D0C[4]; -extern "C" extern u8 data_804E1D10[4]; -extern "C" extern u8 data_804E1D14[4]; -extern "C" extern u8 data_804E1D18[4]; -extern "C" extern u8 data_804E1D1C[4]; extern "C" bool __CreateHeap__9daDitem_cFv(); extern "C" void CreateInit__9daDitem_cFv(); @@ -298,19 +256,6 @@ void cLib_chaseUC(u8*, u8, u8); void cLib_chaseF(f32*, f32, f32); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* item_resource__10dItem_data[1530]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; SECTION_INIT void __init_data(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_demo_item/executor.cpp b/rel/d/a/d_a_demo_item/executor.cpp index dda793b5e8d..a5b924fa793 100644 --- a/rel/d/a/d_a_demo_item/executor.cpp +++ b/rel/d/a/d_a_demo_item/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804E19C0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_demo_item/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_demo_item/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9742c8ce5d0..7154cc55598 100644 --- a/rel/d/a/d_a_demo_item/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_demo_item/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804E19CC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804E19CC-804E19D4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804E19CC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804E1BE0-804E1BE8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_demo_item/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_demo_item/unknown_translation_unit_ctors.cpp index 481404f0f93..7b1500147fe 100644 --- a/rel/d/a/d_a_demo_item/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_demo_item/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804E19C0[2]; -extern void* const data_804E19C0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_demo_item_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804E19C0-804E19C8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804E19C0[2] = { + (void*)__sinit_d_a_demo_item_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_disappear/d_a_disappear.cpp b/rel/d/a/d_a_disappear/d_a_disappear.cpp index 80f2afe9a0b..7144c7a6ca1 100644 --- a/rel/d/a/d_a_disappear/d_a_disappear.cpp +++ b/rel/d/a/d_a_disappear/d_a_disappear.cpp @@ -19,14 +19,14 @@ struct disappear_class {}; struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -54,7 +54,6 @@ static void yami_disappear(disappear_class*, f32); static void ghost_disappear(disappear_class*, f32); static void set_disappear(disappear_class*, f32); static void daDisappear_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_DISAPPEAR[12]; extern "C" static bool daDisappear_Draw__FP15disappear_class(); extern "C" static void s_ks_sub__FPvPv(); @@ -77,10 +76,6 @@ void fopAcM_createItemFromEnemyID(u8, cXyz const*, int, int, csXyz const*, cXyz void fpcEx_Search(void* (*)(void*, void*), void*); void dComIfGp_getReverb(int); void dKy_Sound_set(cXyz, int, unsigned int, int); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAc_IsActor__FPv(); diff --git a/rel/d/a/d_a_disappear/executor.cpp b/rel/d/a/d_a_disappear/executor.cpp index 2f212506a72..96a9017f4e1 100644 --- a/rel/d/a/d_a_disappear/executor.cpp +++ b/rel/d/a/d_a_disappear/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804A9458[4]; -extern u8 const data_804A945C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_disappear/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_disappear/unknown_translation_unit_ctors.cpp index 041f4d6fa50..7f40eb673f0 100644 --- a/rel/d/a/d_a_disappear/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_disappear/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804A9458[4]; -extern u8 const data_804A9458[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804A9458[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804A9458-804A945C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804A9458[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_disappear/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_disappear/unknown_translation_unit_dtors.cpp index 95fb894c6fe..2cbf490a35f 100644 --- a/rel/d/a/d_a_disappear/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_disappear/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804A945C[4]; -extern u8 const data_804A945C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804A945C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804A945C-804A9460 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804A945C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp index d78c578b14b..b9fdb15dde5 100644 --- a/rel/d/a/d_a_dmidna/d_a_dmidna.cpp +++ b/rel/d/a/d_a_dmidna/d_a_dmidna.cpp @@ -21,13 +21,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -75,7 +75,6 @@ static void daDmidna_Create(fopAc_ac_c*); static void daDmidna_Delete(daDmidna_c*); static void daDmidna_Execute(daDmidna_c*); static void daDmidna_Draw(daDmidna_c*); -extern "C" extern void* g_profile_DMIDNA[12]; extern "C" void createHeap__10daDmidna_cFv(); extern "C" static void daDmidna_createHeap__FP10fopAc_ac_c(); @@ -101,11 +100,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/d_a_dmidna/executor.cpp b/rel/d/a/d_a_dmidna/executor.cpp index 6f5e61574bd..97e8760d477 100644 --- a/rel/d/a/d_a_dmidna/executor.cpp +++ b/rel/d/a/d_a_dmidna/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8045D288[4]; -extern u8 const data_8045D28C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_dmidna/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_dmidna/unknown_translation_unit_ctors.cpp index 03d63403e38..0b573653e4d 100644 --- a/rel/d/a/d_a_dmidna/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_dmidna/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8045D288[4]; -extern u8 const data_8045D288[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8045D288[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8045D288-8045D28C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8045D288[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_dmidna/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_dmidna/unknown_translation_unit_dtors.cpp index 3904b16ac09..0c4b5b1f264 100644 --- a/rel/d/a/d_a_dmidna/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_dmidna/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8045D28C[4]; -extern u8 const data_8045D28C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8045D28C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8045D28C-8045D290 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8045D28C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_do/d_a_do.cpp b/rel/d/a/d_a_do/d_a_do.cpp index 8fed7243ee7..7330c1176fe 100644 --- a/rel/d/a/d_a_do/d_a_do.cpp +++ b/rel/d/a/d_a_do/d_a_do.cpp @@ -17,10 +17,10 @@ struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -37,11 +37,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -75,8 +75,6 @@ struct daDo_HIO_c { /* 8066ED40 */ ~daDo_HIO_c(); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -84,6 +82,8 @@ struct cXyz { /* 80668134 */ ~cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -277,73 +277,6 @@ static bool daDo_IsDelete(do_class*); static void daDo_Delete(do_class*); static void useHeapInit(fopAc_ac_c*); static void daDo_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4193; -extern "C" extern u32 const lit_4546; -extern "C" extern u32 const lit_4547; -extern "C" extern u32 const lit_4548; -extern "C" extern u32 const lit_4549; -extern "C" extern u32 const lit_4550; -extern "C" extern u32 const lit_4552; -extern "C" extern u32 const lit_4553; -extern "C" extern u32 const lit_4554; -extern "C" extern u32 const lit_4962; -extern "C" extern u32 const lit_4963; -extern "C" extern u32 const lit_4964; -extern "C" extern u32 const lit_4965; -extern "C" extern u32 const lit_4966; -extern "C" extern u32 const lit_4967; -extern "C" extern u32 const lit_4968; -extern "C" extern u32 const lit_5346; -extern "C" extern u32 const lit_5347; -extern "C" extern u32 const lit_5949; -extern "C" extern u32 const lit_5950; -extern "C" extern u32 const lit_5951; -extern "C" extern u32 const lit_5952; -extern "C" extern u32 const lit_5953; -extern "C" extern u32 const lit_5954; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_DO[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_5578[12 + 4 /* padding */]; -extern "C" extern u8 data_8066F320[12]; -extern "C" extern u8 data_8066F32C[4]; -extern "C" extern u8 data_8066F330[4]; -extern "C" extern u8 data_8066F334[4]; -extern "C" extern u8 data_8066F338[4]; -extern "C" extern u8 data_8066F33C[4]; -extern "C" extern u8 data_8066F340[4]; -extern "C" extern u8 data_8066F344[4]; -extern "C" extern u8 data_8066F348[4]; -extern "C" extern u8 data_8066F34C[4]; -extern "C" extern u8 data_8066F350[4]; -extern "C" extern u8 data_8066F354[4]; -extern "C" extern u8 data_8066F358[4]; -extern "C" extern u8 data_8066F35C[4]; -extern "C" extern u8 data_8066F360[4]; -extern "C" extern u8 data_8066F364[4]; -extern "C" extern u8 data_8066F368[4]; -extern "C" extern u8 data_8066F36C[4]; -extern "C" extern u8 data_8066F370[4]; -extern "C" extern u8 data_8066F374[4]; -extern "C" extern u8 data_8066F378[4]; -extern "C" extern u8 data_8066F37C[4]; -extern "C" extern u8 data_8066F380[4]; -extern "C" extern u8 data_8066F384[4]; -extern "C" extern u8 data_8066F388[4]; -extern "C" extern u8 data_8066F38C[4]; extern "C" void __ct__10daDo_HIO_cFv(); extern "C" static void anm_init__FP8do_classifUcf(); @@ -499,23 +432,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_do/executor.cpp b/rel/d/a/d_a_do/executor.cpp index ffa00791138..d91bc84bf43 100644 --- a/rel/d/a/d_a_do/executor.cpp +++ b/rel/d/a/d_a_do/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8066EDD4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_do/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_do/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ce37988ef14..b7468641321 100644 --- a/rel/d/a/d_a_do/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_do/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8066EDE0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8066EDE0-8066EDE8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8066EDE0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8066F270-8066F278 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_do/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_do/unknown_translation_unit_ctors.cpp index eb306a7ff58..c4743227b9b 100644 --- a/rel/d/a/d_a_do/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_do/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8066EDD4[2]; -extern void* const data_8066EDD4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_do_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8066EDD4-8066EDDC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8066EDD4[2] = { + (void*)__sinit_d_a_do_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp index d39cf19881b..c087802a452 100644 --- a/rel/d/a/d_a_dshutter/d_a_dshutter.cpp +++ b/rel/d/a/d_a_dshutter/d_a_dshutter.cpp @@ -114,48 +114,6 @@ static bool daDsh_IsDelete(daDsh_c*); static void daDsh_Delete(daDsh_c*); static void daDsh_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(s16*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_DSHUTTER[13]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80468110[4]; -extern "C" extern u8 data_80468114[4]; -extern "C" extern u8 data_80468118[4]; -extern "C" extern u8 data_8046811C[4]; -extern "C" extern u8 data_80468120[4]; -extern "C" extern u8 data_80468124[4]; -extern "C" extern u8 data_80468128[4]; -extern "C" extern u8 data_8046812C[4]; -extern "C" extern u8 data_80468130[4]; -extern "C" extern u8 data_80468134[4]; -extern "C" extern u8 data_80468138[4]; -extern "C" extern u8 data_8046813C[4]; -extern "C" extern u8 data_80468140[4]; -extern "C" extern u8 data_80468144[4]; -extern "C" extern u8 data_80468148[4]; -extern "C" extern u8 data_8046814C[4]; -extern "C" extern u8 data_80468150[4]; -extern "C" extern u8 data_80468154[4]; -extern "C" extern u8 data_80468158[4]; -extern "C" extern u8 data_8046815C[4]; -extern "C" extern u8 data_80468160[4]; -extern "C" extern u8 data_80468164[4]; -extern "C" extern u8 data_80468168[4]; -extern "C" extern u8 data_8046816C[4]; -extern "C" extern u8 data_80468170[4]; extern "C" void __dt__7daDsh_cFv(); extern "C" void CreateHeap__7daDsh_cFv(); @@ -235,25 +193,6 @@ void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs void cM_rndFX(f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u32 OPEN_SIZE__7daDsh_c; -extern "C" extern u32 OPEN_ACCEL__7daDsh_c; -extern "C" extern u32 OPEN_SPEED__7daDsh_c; -extern "C" extern u32 OPEN_BOUND_SPEED__7daDsh_c; -extern "C" extern u32 OPEN_BOUND_RATIO__7daDsh_c; -extern "C" extern u32 CLOSE_ACCEL__7daDsh_c; -extern "C" extern u32 CLOSE_SPEED__7daDsh_c; -extern "C" extern u32 CLOSE_BOUND_SPEED__7daDsh_c; -extern "C" extern u32 CLOSE_BOUND_RATIO__7daDsh_c; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/d_a_dshutter/executor.cpp b/rel/d/a/d_a_dshutter/executor.cpp index a709da74492..0e8f66e48d4 100644 --- a/rel/d/a/d_a_dshutter/executor.cpp +++ b/rel/d/a/d_a_dshutter/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80467EF8[2]; -extern u8 const data_80467F00[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_dshutter/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_dshutter/unknown_translation_unit_ctors.cpp index a7167baaf6d..f53602ab722 100644 --- a/rel/d/a/d_a_dshutter/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_dshutter/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80467EF8[2]; -extern void* const data_80467EF8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_dshutter_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80467EF8-80467F00 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80467EF8[2] = { + (void*)__sinit_d_a_dshutter_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_dshutter/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_dshutter/unknown_translation_unit_dtors.cpp index bce89b75540..64157f55fd7 100644 --- a/rel/d/a/d_a_dshutter/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_dshutter/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80467F00[4]; -extern u8 const data_80467F00[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80467F00[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80467F00-80467F04 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80467F00[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_econt/d_a_econt.cpp b/rel/d/a/d_a_econt/d_a_econt.cpp index 00d7d8c2d94..989e8f1c8c0 100644 --- a/rel/d/a/d_a_econt/d_a_econt.cpp +++ b/rel/d/a/d_a_econt/d_a_econt.cpp @@ -32,7 +32,6 @@ static void daEcont_Execute(econt_class*); static bool daEcont_IsDelete(econt_class*); static void daEcont_Delete(econt_class*); static void daEcont_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_ECONT[12]; extern "C" static bool daEcont_Draw__FP11econt_class(); extern "C" static void s_rd_sub__FPvPv(); @@ -53,11 +52,6 @@ void fpcEx_Search(void* (*)(void*, void*), void*); void dComIfG_TimerStart(int, s16); void dComIfG_TimerDeleteRequest(int); void dTimer_createTimer(s32, u32, u8, u8, f32, f32, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 data_805197E0[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAc_IsActor__FPv(); diff --git a/rel/d/a/d_a_econt/executor.cpp b/rel/d/a/d_a_econt/executor.cpp index ecdff2a5050..1aea83bceec 100644 --- a/rel/d/a/d_a_econt/executor.cpp +++ b/rel/d/a/d_a_econt/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80519774[4]; -extern u8 const data_80519778[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_econt/unknown_translation_unit_bss.cpp b/rel/d/a/d_a_econt/unknown_translation_unit_bss.cpp index 5b3f1378d8c..82589459306 100644 --- a/rel/d/a/d_a_econt/unknown_translation_unit_bss.cpp +++ b/rel/d/a/d_a_econt/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_805197E0[4]; -extern "C" extern u8 data_805197E0[4]; - // // External References: // diff --git a/rel/d/a/d_a_econt/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_econt/unknown_translation_unit_ctors.cpp index 1febcea08f3..3e1bbd4720d 100644 --- a/rel/d/a/d_a_econt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_econt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80519774[4]; -extern u8 const data_80519774[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80519774[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80519774-80519778 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80519774[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_econt/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_econt/unknown_translation_unit_dtors.cpp index b1cc1642d26..35f4e11c092 100644 --- a/rel/d/a/d_a_econt/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_econt/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80519778[4]; -extern u8 const data_80519778[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80519778[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80519778-8051977C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80519778[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_ep/d_a_ep.cpp b/rel/d/a/d_a_ep/d_a_ep.cpp index 0e1081df705..59713523245 100644 --- a/rel/d/a/d_a_ep/d_a_ep.cpp +++ b/rel/d/a/d_a_ep/d_a_ep.cpp @@ -233,8 +233,6 @@ static void daEp_Delete(ep_class*); static void daEp_CreateHeap(fopAc_ac_c*); static void daEp_CreateInit(fopAc_ac_c*); static void daEp_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_EP[12]; extern "C" static void hahen_draw__FP8ep_class(); extern "C" static void move_calc__FP8ep_classP10ep_hahen_s(); @@ -307,28 +305,6 @@ void MtxTrans(f32, f32, f32, u8); void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_whiteColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mSystemFar__14mDoLib_clipper; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_ep/executor.cpp b/rel/d/a/d_a_ep/executor.cpp index 20f749e132a..852ff097a58 100644 --- a/rel/d/a/d_a_ep/executor.cpp +++ b/rel/d/a/d_a_ep/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8046AFBC[4]; -extern u8 const data_8046AFC0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_ep/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_ep/unknown_translation_unit_ctors.cpp index 41a55db5502..c34f06cfc3e 100644 --- a/rel/d/a/d_a_ep/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_ep/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046AFBC[4]; -extern u8 const data_8046AFBC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8046AFBC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8046AFBC-8046AFC0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8046AFBC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_ep/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_ep/unknown_translation_unit_dtors.cpp index 26139c2d6d1..6eaccbcc7ae 100644 --- a/rel/d/a/d_a_ep/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_ep/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046AFC0[4]; -extern u8 const data_8046AFC0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8046AFC0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8046AFC0-8046AFC4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8046AFC0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp b/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp index 78611550ca0..aae1ff22164 100644 --- a/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp +++ b/rel/d/a/d_a_formation_mng/d_a_formation_mng.cpp @@ -91,8 +91,6 @@ static void daFmtMng_Execute(daFmtMng_c*); static bool daFmtMng_IsDelete(daFmtMng_c*); static void daFmtMng_Delete(daFmtMng_c*); static void daFmtMng_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_FORMATION_MNG[12]; extern "C" void initWait__10daFmtMng_cFv(); extern "C" void initMemberPos__10daFmtMng_cFv(); @@ -150,13 +148,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_distanceAngleS(s16, s16); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void push__14mDoMtx_stack_cFv(); diff --git a/rel/d/a/d_a_formation_mng/executor.cpp b/rel/d/a/d_a_formation_mng/executor.cpp index b8d873c06ff..07d087c08a6 100644 --- a/rel/d/a/d_a_formation_mng/executor.cpp +++ b/rel/d/a/d_a_formation_mng/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8083789C[2]; -extern u8 const data_808378A4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_formation_mng/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_formation_mng/unknown_translation_unit_ctors.cpp index 1cf02a89f4e..bbde7d89109 100644 --- a/rel/d/a/d_a_formation_mng/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_formation_mng/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8083789C[2]; -extern void* const data_8083789C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_formation_mng_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8083789C-808378A4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8083789C[2] = { + (void*)__sinit_d_a_formation_mng_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_formation_mng/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_formation_mng/unknown_translation_unit_dtors.cpp index ad4ae12d9fa..731de9ba840 100644 --- a/rel/d/a/d_a_formation_mng/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_formation_mng/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_808378A4[4]; -extern u8 const data_808378A4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_808378A4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 808378A4-808378A8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_808378A4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_fr/d_a_fr.cpp b/rel/d/a/d_a_fr/d_a_fr.cpp index 2fe7a35873b..0706792dd20 100644 --- a/rel/d/a/d_a_fr/d_a_fr.cpp +++ b/rel/d/a/d_a_fr/d_a_fr.cpp @@ -30,11 +30,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -57,13 +57,13 @@ struct daFr_HIO_c { /* 8051B920 */ ~daFr_HIO_c(); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80266B84 */ void operator*(f32) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -188,10 +188,6 @@ static bool daFr_IsDelete(fr_class*); static void daFr_Delete(fr_class*); static void useHeapIfrt(fopAc_ac_c*); static void daFr_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4224; -extern "C" extern u32 const lit_4225; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_FR[12]; extern "C" void __ct__10daFr_HIO_cFv(); extern "C" static void anm_init__FP8fr_classifUcf(); @@ -260,21 +256,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_fr/executor.cpp b/rel/d/a/d_a_fr/executor.cpp index 36cdc388cbd..0e6733d56c5 100644 --- a/rel/d/a/d_a_fr/executor.cpp +++ b/rel/d/a/d_a_fr/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8051B9B4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_fr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_fr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 41c129b1822..0143aed88fd 100644 --- a/rel/d/a/d_a_fr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_fr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8051B9C0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8051B9C0-8051B9C8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8051B9C0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8051BC08-8051BC10 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_fr/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_fr/unknown_translation_unit_ctors.cpp index 08ce064278b..660d6b3d9c8 100644 --- a/rel/d/a/d_a_fr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_fr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8051B9B4[2]; -extern void* const data_8051B9B4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_fr_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8051B9B4-8051B9BC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8051B9B4[2] = { + (void*)__sinit_d_a_fr_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_grass/d_a_grass.cpp b/rel/d/a/d_a_grass/d_a_grass.cpp index 417e2420077..e6a5380625e 100644 --- a/rel/d/a/d_a_grass/d_a_grass.cpp +++ b/rel/d/a/d_a_grass/d_a_grass.cpp @@ -63,22 +63,22 @@ struct csXyz { /* 8051EB4C */ ~csXyz(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, cXyz const*, f32); }; -struct cCcD_Obj {}; - struct dCcMassS_HitInf { /* 8051ED98 */ ~dCcMassS_HitInf(); }; +struct cCcD_Obj {}; + struct dGrass_data_c { /* 8051D88C */ void WorkCo(fopAc_ac_c*, u32, int); /* 8051DA20 */ void WorkAt_NoCutAnim(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*); @@ -209,55 +209,6 @@ static void daGrass_draw(daGrass_c*); static void cLib_calcTimer__template0(u8*); void checkGroundY(cXyz&); static void flowerCheckGroundY(cXyz&); -extern "C" extern u32 const lit_5958; -extern "C" extern u8 const lit_5961[8]; -extern "C" extern u32 const lit_6080; -extern "C" extern u32 const lit_6081; -extern "C" extern u32 const lit_6082; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_J_hana01_c_00DL[222 + 2 /* padding */]; -extern "C" extern void* g_profile_GRASS[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_805287EC[4]; -extern "C" extern u8 data_805287F0[4]; -extern "C" extern u8 data_805287F4[4]; -extern "C" extern u8 data_805287F8[4]; -extern "C" extern u8 data_805287FC[4]; -extern "C" extern u8 data_80528800[4]; -extern "C" extern u8 data_80528804[4]; -extern "C" extern u8 data_80528808[4]; -extern "C" extern u8 data_8052880C[4]; -extern "C" extern u8 data_80528810[4]; -extern "C" extern u8 data_80528814[4]; -extern "C" extern u8 data_80528818[4]; -extern "C" extern u8 data_8052881C[4]; -extern "C" extern u8 data_80528820[4]; -extern "C" extern u8 data_80528824[4]; -extern "C" extern u8 data_80528828[4]; -extern "C" extern u8 data_8052882C[4]; -extern "C" extern u8 data_80528830[4]; -extern "C" extern u8 data_80528834[4]; -extern "C" extern u8 data_80528838[4]; -extern "C" extern u8 data_8052883C[4]; -extern "C" extern u8 data_80528840[4]; -extern "C" extern u8 data_80528844[4]; -extern "C" extern u8 data_80528848[4]; -extern "C" extern u8 data_8052884C[4]; extern "C" static void randam_addcol_set__FPs(); extern "C" void createGrass__9daGrass_cFv(); @@ -408,30 +359,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void GFSetTevColorS10(_GXTevRegID, _GXColorS10); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 m_deleteRoom__15dGrass_packet_c[12]; -extern "C" extern u8 m_deleteRoom__16dFlower_packet_c[12]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mSystemFar__14mDoLib_clipper; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_myObj__9daGrass_c[4]; -extern "C" extern u8 m_grass__9daGrass_c[4]; -extern "C" extern u8 m_flower__9daGrass_c[4]; -extern "C" extern u8 mLight8EcallBack__13dPa_control_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_grass/executor.cpp b/rel/d/a/d_a_grass/executor.cpp index b6af3971165..9cd7a543c60 100644 --- a/rel/d/a/d_a_grass/executor.cpp +++ b/rel/d/a/d_a_grass/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80523014[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_grass/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_grass/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b00e562fbc7..b957e693266 100644 --- a/rel/d/a/d_a_grass/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_grass/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80523020[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80523020-80523028 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80523020[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805278C8-805278D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_grass/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_grass/unknown_translation_unit_ctors.cpp index eb566da7bc7..3a9b7665f49 100644 --- a/rel/d/a/d_a_grass/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_grass/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80523014[2]; -extern void* const data_80523014[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_grass_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80523014-8052301C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80523014[2] = { + (void*)__sinit_d_a_grass_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp index ab7d843d999..eed02ad98b3 100644 --- a/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp +++ b/rel/d/a/d_a_guard_mng/d_a_guard_mng.cpp @@ -41,7 +41,6 @@ static void daGuardMng_Execute(daGuardMng_c*); static bool daGuardMng_IsDelete(daGuardMng_c*); static void daGuardMng_Delete(daGuardMng_c*); static void daGuardMng_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_GUARD_MNG[12]; extern "C" static void s_sub__FPvPv(); extern "C" void checkMerchantNum__12daGuardMng_cFv(); @@ -58,9 +57,6 @@ extern "C" extern void* g_profile_GUARD_MNG[12]; void fopAc_IsActor(void*); void fpcEx_Search(void* (*)(void*, void*), void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_guard_mng/executor.cpp b/rel/d/a/d_a_guard_mng/executor.cpp index 863e7602027..b37edd2dc03 100644 --- a/rel/d/a/d_a_guard_mng/executor.cpp +++ b/rel/d/a/d_a_guard_mng/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80837DDC[4]; -extern u8 const data_80837DE0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_guard_mng/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_guard_mng/unknown_translation_unit_ctors.cpp index 07db54f4849..2a46b322eb1 100644 --- a/rel/d/a/d_a_guard_mng/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_guard_mng/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80837DDC[4]; -extern u8 const data_80837DDC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80837DDC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80837DDC-80837DE0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80837DDC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_guard_mng/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_guard_mng/unknown_translation_unit_dtors.cpp index 8e7a6686b1f..69fbdca367c 100644 --- a/rel/d/a/d_a_guard_mng/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_guard_mng/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80837DE0[4]; -extern u8 const data_80837DE0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80837DE0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80837DE0-80837DE4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80837DE0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp index ccb3e819d2b..8c06dabe1a5 100644 --- a/rel/d/a/d_a_hitobj/d_a_hitobj.cpp +++ b/rel/d/a/d_a_hitobj/d_a_hitobj.cpp @@ -63,8 +63,6 @@ static void daHitobj_Execute(hitobj_class*); static bool daHitobj_IsDelete(hitobj_class*); static void daHitobj_Delete(hitobj_class*); static void daHitobj_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_HITOBJ[12]; extern "C" static bool daHitobj_Draw__FP12hitobj_class(); extern "C" static void daHitobj_Execute__FP12hitobj_class(); @@ -84,14 +82,6 @@ void fopKyM_Delete(void*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopKyM_Delete__FPv(); diff --git a/rel/d/a/d_a_hitobj/executor.cpp b/rel/d/a/d_a_hitobj/executor.cpp index 3d52e70fcf6..d8e0ddeeeeb 100644 --- a/rel/d/a/d_a_hitobj/executor.cpp +++ b/rel/d/a/d_a_hitobj/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8046B5CC[4]; -extern u8 const data_8046B5D0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_hitobj/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_hitobj/unknown_translation_unit_ctors.cpp index 72fd0d0e979..0b32f290e11 100644 --- a/rel/d/a/d_a_hitobj/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_hitobj/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046B5CC[4]; -extern u8 const data_8046B5CC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8046B5CC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8046B5CC-8046B5D0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8046B5CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_hitobj/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_hitobj/unknown_translation_unit_dtors.cpp index 6c6340ce066..6c4b9e2e16e 100644 --- a/rel/d/a/d_a_hitobj/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_hitobj/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046B5D0[4]; -extern u8 const data_8046B5D0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8046B5D0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8046B5D0-8046B5D4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8046B5D0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_horse/d_a_horse.cpp b/rel/d/a/d_a_horse/d_a_horse.cpp index 644953275c4..f5c66995565 100644 --- a/rel/d/a/d_a_horse/d_a_horse.cpp +++ b/rel/d/a/d_a_horse/d_a_horse.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct Quaternion {}; - struct Vec {}; struct cXyz { @@ -28,6 +26,8 @@ struct cXyz { /* 808392D8 */ cXyz(); }; +struct Quaternion {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -35,10 +35,10 @@ struct mDoMtx_stack_c { /* 8000CF7C */ void quatM(Quaternion const*); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -59,11 +59,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -271,6 +271,12 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); + /* 808452E4 */ ~dBgS_AcchCir(); +}; + struct dBgS { /* 80074B98 */ void GetExitId(cBgS_PolyInfo const&); /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); @@ -280,12 +286,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); - /* 808452E4 */ ~dBgS_AcchCir(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -530,51 +530,6 @@ static void daHorse_searchSceneChangeArea(fopAc_ac_c*, void*); static void daHorse_Execute(daHorse_c*); static void daHorse_Draw(daHorse_c*); static void daHorse_Delete(daHorse_c*); -extern "C" extern u32 const m_callLimitDistance2__9daHorse_c; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_HORSE[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80845DB0[4]; -extern "C" extern u8 data_80845DB4[4]; -extern "C" extern u8 data_80845DB8[4]; -extern "C" extern u8 data_80845DBC[4]; -extern "C" extern u8 data_80845DC0[4]; -extern "C" extern u8 data_80845DC4[4]; -extern "C" extern u8 data_80845DC8[4]; -extern "C" extern u8 data_80845DCC[4]; -extern "C" extern u8 data_80845DD0[4]; -extern "C" extern u8 data_80845DD4[4]; -extern "C" extern u8 data_80845DD8[4]; -extern "C" extern u8 data_80845DDC[4]; -extern "C" extern u8 data_80845DE0[4]; -extern "C" extern u8 data_80845DE4[4]; -extern "C" extern u8 data_80845DE8[4]; -extern "C" extern u8 data_80845DEC[4]; -extern "C" extern u8 data_80845DF0[4]; -extern "C" extern u8 data_80845DF4[4]; -extern "C" extern u8 data_80845DF8[4]; -extern "C" extern u8 data_80845DFC[4]; -extern "C" extern u8 data_80845E00[4]; -extern "C" extern u8 data_80845E04[4]; -extern "C" extern u8 data_80845E08[4]; -extern "C" extern u8 data_80845E0C[4]; -extern "C" extern u8 data_80845E10[4]; -extern "C" extern u8 data_80845E14[4]; extern "C" void setReinPos__13daHorseRein_cFi(); extern "C" void __dt__4cXyzFv(); @@ -805,44 +760,6 @@ void* operator new(u32); void* operator new[](u32); void operator delete(void*); void JMAEulerToQuat(s16, s16, s16, Quaternion*); -extern "C" extern u8 const m_handLeftInSidePos__9daAlink_c[12]; -extern "C" extern u8 const m_handRightInSidePos__9daAlink_c[12]; -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* __vt__28mDoExt_MtxCalcAnmBlendTblOld[11]; -extern "C" extern void* __vt__25mDoExt_MtxCalcAnmBlendTbl[11]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 m_typeFourData__8dPaPoF_c[60]; -extern "C" extern u8 m_emitterFourData__8dPaPoF_c[60 + 28 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_top__12daTagHstop_c[4 + 4 /* padding */]; -extern "C" extern u8 m_object__7dDemo_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 mJoint__10J3DMtxCalc[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_horse/executor.cpp b/rel/d/a/d_a_horse/executor.cpp index 51b959a9fa7..060f2c396bd 100644 --- a/rel/d/a/d_a_horse/executor.cpp +++ b/rel/d/a/d_a_horse/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80845498[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_horse/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_horse/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5cc9edecf3b..96bd8fcdf54 100644 --- a/rel/d/a/d_a_horse/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_horse/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_808454A4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 808454A4-808454AC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_808454A4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80845BB0-80845BB8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_horse/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_horse/unknown_translation_unit_ctors.cpp index b35654d1765..cea35d50bf6 100644 --- a/rel/d/a/d_a_horse/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_horse/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80845498[2]; -extern void* const data_80845498[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_horse_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80845498-808454A0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80845498[2] = { + (void*)__sinit_d_a_horse_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_hozelda/d_a_hozelda.cpp b/rel/d/a/d_a_hozelda/d_a_hozelda.cpp index 4e46d1e4688..19e0eea36e3 100644 --- a/rel/d/a/d_a_hozelda/d_a_hozelda.cpp +++ b/rel/d/a/d_a_hozelda/d_a_hozelda.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct Quaternion {}; - struct Vec {}; struct cXyz { @@ -23,18 +21,20 @@ struct cXyz { /* 80267150 */ void atan2sY_XZ() const; }; +struct Quaternion {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); /* 8000CF7C */ void quatM(Quaternion const*); }; +struct J3DMaterialTable {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DMaterialTable {}; - struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -243,7 +243,6 @@ static void daHoZelda_Delete(daHoZelda_c*); static void daHoZelda_Execute(daHoZelda_c*); static void daHoZelda_Draw(daHoZelda_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern void* g_profile_HOZELDA[12]; extern "C" static void daHoZelda_searchGanon__FP10fopAc_ac_cPv(); extern "C" void init__18daHoZelda_matAnm_cFv(); @@ -336,19 +335,6 @@ void cLib_distanceAngleS(s16, s16); void* operator new(u32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* __vt__28mDoExt_MtxCalcAnmBlendTblOld[11]; -extern "C" extern void* __vt__25mDoExt_MtxCalcAnmBlendTbl[11]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mJoint__10J3DMtxCalc[4]; -extern "C" extern u8 struct_80849010[4]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/d_a_hozelda/executor.cpp b/rel/d/a/d_a_hozelda/executor.cpp index e77e4a9868c..19585b3aafe 100644 --- a/rel/d/a/d_a_hozelda/executor.cpp +++ b/rel/d/a/d_a_hozelda/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80848E34[4]; -extern u8 const data_80848E38[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_hozelda/unknown_translation_unit_bss.cpp b/rel/d/a/d_a_hozelda/unknown_translation_unit_bss.cpp index d063f0d768c..1b085ea41d8 100644 --- a/rel/d/a/d_a_hozelda/unknown_translation_unit_bss.cpp +++ b/rel/d/a/d_a_hozelda/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80849010[4]; -extern "C" extern u8 struct_80849010[4]; - // // External References: // diff --git a/rel/d/a/d_a_hozelda/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_hozelda/unknown_translation_unit_ctors.cpp index d779ad456fe..eda1e057513 100644 --- a/rel/d/a/d_a_hozelda/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_hozelda/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80848E34[4]; -extern u8 const data_80848E34[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80848E34[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80848E34-80848E38 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80848E34[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_hozelda/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_hozelda/unknown_translation_unit_dtors.cpp index 54a145c6a30..5fed0e5c11e 100644 --- a/rel/d/a/d_a_hozelda/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_hozelda/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80848E38[4]; -extern u8 const data_80848E38[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80848E38[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80848E38-80848E3C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80848E38[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp index e4b5f619b42..e5f09f14b71 100644 --- a/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp +++ b/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.cpp @@ -77,8 +77,6 @@ static void daIzumiGate_Execute(daIzumiGate_c*); static bool daIzumiGate_IsDelete(daIzumiGate_c*); static void daIzumiGate_Delete(daIzumiGate_c*); static void daIzumiGate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Izumi_Gate[12]; extern "C" void initBaseMtx__13daIzumiGate_cFv(); extern "C" void setBaseMtx__13daIzumiGate_cFv(); @@ -104,12 +102,6 @@ void mDoExt_J3DModel__create(J3DModelData*, u32, u32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/d_a_izumi_gate/executor.cpp b/rel/d/a/d_a_izumi_gate/executor.cpp index 7c7f6c91c9c..0a9e67f9d51 100644 --- a/rel/d/a/d_a_izumi_gate/executor.cpp +++ b/rel/d/a/d_a_izumi_gate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80849400[4]; -extern u8 const data_80849404[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_izumi_gate/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_izumi_gate/unknown_translation_unit_ctors.cpp index f61b02bc3df..504876233d8 100644 --- a/rel/d/a/d_a_izumi_gate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_izumi_gate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80849400[4]; -extern u8 const data_80849400[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80849400[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80849400-80849404 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80849400[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_izumi_gate/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_izumi_gate/unknown_translation_unit_dtors.cpp index e5c8cb44a40..ae5ebef223e 100644 --- a/rel/d/a/d_a_izumi_gate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_izumi_gate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80849404[4]; -extern u8 const data_80849404[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80849404[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80849404-80849408 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80849404[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_kago/d_a_kago.cpp b/rel/d/a/d_a_kago/d_a_kago.cpp index 86952c73aa4..2677b3e507c 100644 --- a/rel/d/a/d_a_kago/d_a_kago.cpp +++ b/rel/d/a/d_a_kago/d_a_kago.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -27,6 +23,10 @@ struct cXyz { /* 80854A28 */ cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -36,13 +36,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -71,10 +71,10 @@ struct daObj_Balloon_c { /* 80BA80F4 */ void saveBestScore(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daKago_c { /* 80849660 */ void getBckName(int); /* 808496F0 */ void setBck(int, u8, f32, f32); @@ -380,38 +380,6 @@ static bool daKago_IsDelete(daKago_c*); static void daKago_Delete(daKago_c*); static void useHeapInit(fopAc_ac_c*); static void daKago_Create(daKago_c*); -extern "C" extern u32 const lit_4478; -extern "C" extern u32 const lit_4479; -extern "C" extern u32 const lit_4480; -extern "C" extern u32 const lit_4481; -extern "C" extern u32 const lit_4483; -extern "C" extern u32 const lit_4485; -extern "C" extern u32 const lit_4487; -extern "C" extern u32 const lit_4488; -extern "C" extern u32 const lit_4489; -extern "C" extern u32 const lit_4490; -extern "C" extern u32 const lit_4491; -extern "C" extern u32 const lit_4492; -extern "C" extern u32 const lit_4493; -extern "C" extern u32 const lit_4494; -extern "C" extern u32 const lit_4495; -extern "C" extern u32 const lit_6162; -extern "C" extern u32 const lit_6164; -extern "C" extern u32 const lit_6551; -extern "C" extern u32 const lit_6553; -extern "C" extern u32 const lit_6554; -extern "C" extern u32 const lit_6555; -extern "C" extern u32 const lit_6556; -extern "C" extern u32 const lit_6557; -extern "C" extern u32 const lit_6558; -extern "C" extern u32 const lit_6559; -extern "C" extern u32 const lit_6922; -extern "C" extern u32 const lit_6923; -extern "C" extern u32 const lit_7127; -extern "C" extern u32 const lit_7128; -extern "C" extern u32 const lit_7129; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_KAGO[12]; extern "C" void __ct__12daKago_HIO_cFv(); extern "C" void getBckName__8daKago_cFi(); @@ -582,26 +550,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_kago/executor.cpp b/rel/d/a/d_a_kago/executor.cpp index d5cd9bab20e..3f60f9077b1 100644 --- a/rel/d/a/d_a_kago/executor.cpp +++ b/rel/d/a/d_a_kago/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80854AF0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_kago/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_kago/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c1e1b922894..76f8cfa1dee 100644 --- a/rel/d/a/d_a_kago/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_kago/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80854AFC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80854AFC-80854B04 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80854AFC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80854F60-80854F68 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_kago/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_kago/unknown_translation_unit_ctors.cpp index 1ec6a38b22c..13938852f9b 100644 --- a/rel/d/a/d_a_kago/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_kago/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80854AF0[2]; -extern void* const data_80854AF0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_kago_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80854AF0-80854AF8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80854AF0[2] = { + (void*)__sinit_d_a_kago_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_mant/d_a_mant.cpp b/rel/d/a/d_a_mant/d_a_mant.cpp index 09908fb2db7..e6b4dd98fc6 100644 --- a/rel/d/a/d_a_mant/d_a_mant.cpp +++ b/rel/d/a/d_a_mant/d_a_mant.cpp @@ -29,8 +29,6 @@ struct daMant_packet_c { struct dStage_dt_c {}; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -41,6 +39,8 @@ struct cXyz { /* 80862C40 */ cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); }; @@ -87,14 +87,6 @@ static void daMant_Execute(mant_class*); static bool daMant_IsDelete(mant_class*); static bool daMant_Delete(mant_class*); static void daMant_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_pos[2028]; -extern "C" extern u8 l_normal[12]; -extern "C" extern u8 l_texCoord[1352]; -extern "C" extern u8 l_Egnd_mantDL[1004]; -extern "C" extern void* pal_d; -extern "C" extern void* tex_d[2]; -extern "C" extern void* g_profile_MANT[12]; extern "C" void draw__15daMant_packet_cFv(); extern "C" static void daMant_Draw__FP10mant_class(); @@ -144,16 +136,6 @@ void cLib_addCalc0(f32*, f32, f32); void MtxTrans(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_mant/executor.cpp b/rel/d/a/d_a_mant/executor.cpp index 4b91bbd34d8..b5f2ed420b1 100644 --- a/rel/d/a/d_a_mant/executor.cpp +++ b/rel/d/a/d_a_mant/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80862C44[4]; -extern u8 const data_80862C48[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_mant/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_mant/unknown_translation_unit_ctors.cpp index 0900aa5371c..91dc841f3a9 100644 --- a/rel/d/a/d_a_mant/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_mant/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80862C44[4]; -extern u8 const data_80862C44[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80862C44[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80862C44-80862C48 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80862C44[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_mant/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_mant/unknown_translation_unit_dtors.cpp index 469be98f0f1..81564e8f253 100644 --- a/rel/d/a/d_a_mant/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_mant/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80862C48[4]; -extern u8 const data_80862C48[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80862C48[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80862C48-80862C4C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80862C48[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp b/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp index 1bb4d54eea6..0d87cefeba6 100644 --- a/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp +++ b/rel/d/a/d_a_mg_fish/d_a_mg_fish.cpp @@ -25,10 +25,10 @@ struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -49,11 +49,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -71,10 +71,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -354,64 +354,6 @@ static void daMg_Fish_Delete(mg_fish_class*); static void useHeapInit2(fopAc_ac_c*); static void useHeapImg_fisht(fopAc_ac_c*); static void daMg_Fish_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_7224; -extern "C" extern u32 const lit_7225; -extern "C" extern u32 const lit_7226; -extern "C" extern u32 const lit_7227; -extern "C" extern u32 const lit_7228; -extern "C" extern u32 const lit_7230; -extern "C" extern u32 const lit_7231; -extern "C" extern u32 const lit_7232; -extern "C" extern u32 const lit_7233; -extern "C" extern u32 const lit_7235; -extern "C" extern u32 const lit_7236; -extern "C" extern u32 const lit_7237; -extern "C" extern u32 const lit_7238; -extern "C" extern u32 const lit_7239; -extern "C" extern u32 const lit_7240; -extern "C" extern u32 const lit_7241; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_MG_FISH[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80536CF8[4]; -extern "C" extern u8 data_80536CFC[4]; -extern "C" extern u8 data_80536D00[4]; -extern "C" extern u8 data_80536D04[4]; -extern "C" extern u8 data_80536D08[4]; -extern "C" extern u8 data_80536D0C[4]; -extern "C" extern u8 data_80536D10[4]; -extern "C" extern u8 data_80536D14[4]; -extern "C" extern u8 data_80536D18[4]; -extern "C" extern u8 data_80536D1C[4]; -extern "C" extern u8 data_80536D20[4]; -extern "C" extern u8 data_80536D24[4]; -extern "C" extern u8 data_80536D28[4]; -extern "C" extern u8 data_80536D2C[4]; -extern "C" extern u8 data_80536D30[4]; -extern "C" extern u8 data_80536D34[4]; -extern "C" extern u8 data_80536D38[4]; -extern "C" extern u8 data_80536D3C[4]; -extern "C" extern u8 data_80536D40[4]; -extern "C" extern u8 data_80536D44[4]; -extern "C" extern u8 data_80536D48[4]; -extern "C" extern u8 data_80536D4C[4]; -extern "C" extern u8 data_80536D50[4]; -extern "C" extern u8 data_80536D54[4]; -extern "C" extern u8 data_80536D58[4]; extern "C" void __ct__15daMg_Fish_HIO_cFv(); extern "C" static void hit_vib_set__FP13mg_fish_class(); @@ -602,27 +544,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_mg_fish/executor.cpp b/rel/d/a/d_a_mg_fish/executor.cpp index 53490d93c62..dff76f3f526 100644 --- a/rel/d/a/d_a_mg_fish/executor.cpp +++ b/rel/d/a/d_a_mg_fish/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80536154[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_mg_fish/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_mg_fish/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 75511102b26..8d71c9bc8c7 100644 --- a/rel/d/a/d_a_mg_fish/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_mg_fish/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80536160[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80536160-80536168 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80536160[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80536B78-80536B80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_mg_fish/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_mg_fish/unknown_translation_unit_ctors.cpp index 42b17ddb2d3..c62918a0ef8 100644 --- a/rel/d/a/d_a_mg_fish/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_mg_fish/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80536154[2]; -extern void* const data_80536154[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_mg_fish_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80536154-8053615C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80536154[2] = { + (void*)__sinit_d_a_mg_fish_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp index 84a6ae5e7f3..b2ab8f296f6 100644 --- a/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp +++ b/rel/d/a/d_a_mg_fshop/d_a_mg_fshop.cpp @@ -28,10 +28,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012874 */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); @@ -73,8 +73,6 @@ struct dSv_event_c { /* 80034A04 */ void getEventReg(u16) const; }; -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -85,6 +83,8 @@ struct cXyz { /* 8086FF80 */ cXyz(); }; +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -221,52 +221,6 @@ static void koro2_heapinit(fopAc_ac_c*); static void useHeapInit(fopAc_ac_c*); static void BalluseHeapInit(fopAc_ac_c*); static void daFshop_Create(fopAc_ac_c*); -extern "C" extern u8 const lit_5249[32]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 lure_scale[12]; -extern "C" extern u8 lure_eye_off[12]; -extern "C" extern void* g_profile_FSHOP[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80870AC8[4]; -extern "C" extern u8 data_80870ACC[4]; -extern "C" extern u8 data_80870AD0[4]; -extern "C" extern u8 data_80870AD4[4]; -extern "C" extern u8 data_80870AD8[4]; -extern "C" extern u8 data_80870ADC[4]; -extern "C" extern u8 data_80870AE0[4]; -extern "C" extern u8 data_80870AE4[4]; -extern "C" extern u8 data_80870AE8[4]; -extern "C" extern u8 data_80870AEC[4]; -extern "C" extern u8 data_80870AF0[4]; -extern "C" extern u8 data_80870AF4[4]; -extern "C" extern u8 data_80870AF8[4]; -extern "C" extern u8 data_80870AFC[4]; -extern "C" extern u8 data_80870B00[4]; -extern "C" extern u8 data_80870B04[4]; -extern "C" extern u8 data_80870B08[4]; -extern "C" extern u8 data_80870B0C[4]; -extern "C" extern u8 data_80870B10[4]; -extern "C" extern u8 data_80870B14[4]; -extern "C" extern u8 data_80870B18[4]; -extern "C" extern u8 data_80870B1C[4]; -extern "C" extern u8 data_80870B20[4]; -extern "C" extern u8 data_80870B24[4]; -extern "C" extern u8 data_80870B28[4]; extern "C" static void ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" static void Reel_CallBack__FP8J3DJointi(); @@ -393,19 +347,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_mg_fshop/executor.cpp b/rel/d/a/d_a_mg_fshop/executor.cpp index 331cc98a596..7fabc7c500f 100644 --- a/rel/d/a/d_a_mg_fshop/executor.cpp +++ b/rel/d/a/d_a_mg_fshop/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80870080[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_mg_fshop/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_mg_fshop/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 231d62fb6c2..c1d71384d32 100644 --- a/rel/d/a/d_a_mg_fshop/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_mg_fshop/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8087008C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8087008C-80870094 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8087008C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80870950-80870958 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_mg_fshop/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_mg_fshop/unknown_translation_unit_ctors.cpp index 177589753e2..a636d8d7806 100644 --- a/rel/d/a/d_a_mg_fshop/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_mg_fshop/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80870080[2]; -extern void* const data_80870080[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_mg_fshop_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80870080-80870088 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80870080[2] = { + (void*)__sinit_d_a_mg_fshop_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp index 6c8e309db56..24a6f08d7fe 100644 --- a/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp +++ b/rel/d/a/d_a_mg_rod/d_a_mg_rod.cpp @@ -53,10 +53,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -421,51 +421,6 @@ static void mDoAud_seStart(u32, Vec const*, u32, s8); static void cM_ssin(s16); static void dComIfGp_setDoStatusForce(u8, u8); static void dComIfGp_setZStatusForce(u8, u8); -extern "C" extern u32 const lit_7880; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_MG_ROD[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_804BC128[4]; -extern "C" extern u8 data_804BC12C[4]; -extern "C" extern u8 data_804BC130[4]; -extern "C" extern u8 data_804BC134[4]; -extern "C" extern u8 data_804BC138[4]; -extern "C" extern u8 data_804BC13C[4]; -extern "C" extern u8 data_804BC140[4]; -extern "C" extern u8 data_804BC144[4]; -extern "C" extern u8 data_804BC148[4]; -extern "C" extern u8 data_804BC14C[4]; -extern "C" extern u8 data_804BC150[4]; -extern "C" extern u8 data_804BC154[4]; -extern "C" extern u8 data_804BC158[4]; -extern "C" extern u8 data_804BC15C[4]; -extern "C" extern u8 data_804BC160[4]; -extern "C" extern u8 data_804BC164[4]; -extern "C" extern u8 data_804BC168[4]; -extern "C" extern u8 data_804BC16C[4]; -extern "C" extern u8 data_804BC170[4]; -extern "C" extern u8 data_804BC174[4]; -extern "C" extern u8 data_804BC178[4]; -extern "C" extern u8 data_804BC17C[4]; -extern "C" extern u8 data_804BC180[4]; -extern "C" extern u8 data_804BC184[4]; -extern "C" extern u8 data_804BC188[4]; -extern "C" extern u8 data_804BC18C[4]; extern "C" void __ct__13dmg_rod_HIO_cFv(); extern "C" static void frog_nodeCallBack__FP8J3DJointi(); @@ -674,29 +629,6 @@ void MtxPush(); void MtxPull(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450C9C[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_mg_rod/executor.cpp b/rel/d/a/d_a_mg_rod/executor.cpp index fb2dc1e4f14..9d3849e60f1 100644 --- a/rel/d/a/d_a_mg_rod/executor.cpp +++ b/rel/d/a/d_a_mg_rod/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804BB520[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_mg_rod/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_mg_rod/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 85da43d29c0..2c1690fe725 100644 --- a/rel/d/a/d_a_mg_rod/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_mg_rod/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804BB52C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804BB52C-804BB534 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804BB52C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804BBB88-804BBB90 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_mg_rod/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_mg_rod/unknown_translation_unit_ctors.cpp index 5c5fe99bf45..e70eae38fd6 100644 --- a/rel/d/a/d_a_mg_rod/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_mg_rod/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804BB520[2]; -extern void* const data_804BB520[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_mg_rod_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804BB520-804BB528 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804BB520[2] = { + (void*)__sinit_d_a_mg_rod_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_midna/d_a_midna.cpp b/rel/d/a/d_a_midna/d_a_midna.cpp index 8b66f22ad57..b646dc0d078 100644 --- a/rel/d/a/d_a_midna/d_a_midna.cpp +++ b/rel/d/a/d_a_midna/d_a_midna.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -27,6 +25,8 @@ struct cXyz { /* 804BD8F4 */ cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -73,7 +73,7 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; +struct J3DTransformInfo {}; struct Z2Creature { /* 802C03C8 */ Z2Creature(); @@ -83,7 +83,7 @@ struct Z2Creature { /* 802C06D0 */ void updateAnime(f32, f32); }; -struct J3DTransformInfo {}; +struct mDoExt_McaMorfCallBack1_c {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -338,17 +338,17 @@ struct J3DAnmTextureSRTKey { /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); }; -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); -}; - struct J3DAnmTevRegKey { /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const; /* 8032B4BC */ void getTevKonstReg(u16, _GXColor*) const; /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; + /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); +}; + struct J3DMaterialTable { /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); @@ -393,8 +393,6 @@ static void daMidna_Execute(daMidna_c*); static void daMidna_Draw(daMidna_c*); static void daMidna_Delete(daMidna_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_MIDNA[12]; extern "C" void init__16daMidna_matAnm_cFv(); extern "C" void calc__16daMidna_matAnm_cCFP11J3DMaterial(); @@ -512,27 +510,6 @@ void cLib_chasePos(cXyz*, cXyz const&, f32); void* operator new(u32); void operator delete(void*); void JMAEulerToQuat(s16, s16, s16, Quaternion*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_object__7dDemo_c[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_804C6CD8[4]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/d_a_midna/executor.cpp b/rel/d/a/d_a_midna/executor.cpp index 55789554aae..d7957fe3475 100644 --- a/rel/d/a/d_a_midna/executor.cpp +++ b/rel/d/a/d_a_midna/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804C64C0[4]; -extern u8 const data_804C64C4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_midna/unknown_translation_unit_bss.cpp b/rel/d/a/d_a_midna/unknown_translation_unit_bss.cpp index 41dd3be3397..253bfc600e7 100644 --- a/rel/d/a/d_a_midna/unknown_translation_unit_bss.cpp +++ b/rel/d/a/d_a_midna/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_804C6CD8[4]; -extern "C" extern u8 struct_804C6CD8[4]; - // // External References: // diff --git a/rel/d/a/d_a_midna/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_midna/unknown_translation_unit_ctors.cpp index b05a4c8f960..210b281f200 100644 --- a/rel/d/a/d_a_midna/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_midna/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804C64C0[4]; -extern u8 const data_804C64C0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804C64C0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804C64C0-804C64C4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804C64C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_midna/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_midna/unknown_translation_unit_dtors.cpp index 372d692f8f0..2233d8a0377 100644 --- a/rel/d/a/d_a_midna/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_midna/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804C64C4[4]; -extern u8 const data_804C64C4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804C64C4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804C64C4-804C64C8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804C64C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_mirror/d_a_mirror.cpp b/rel/d/a/d_a_mirror/d_a_mirror.cpp index c88b07d01d2..58d4f25facb 100644 --- a/rel/d/a/d_a_mirror/d_a_mirror.cpp +++ b/rel/d/a/d_a_mirror/d_a_mirror.cpp @@ -131,8 +131,6 @@ static void daMirror_create(daMirror_c*); static void daMirror_Delete(daMirror_c*); static void daMirror_execute(daMirror_c*); static void daMirror_draw(daMirror_c*); -extern "C" extern u8 const lit_4406[48]; -extern "C" extern void* g_profile_MIRROR[12]; extern "C" static void daMirror_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__16dMirror_packet_cFv(); @@ -179,21 +177,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void GFSetGenMode2(u8, u8, u8, u8, _GXCullMode); void GFSetChanAmbColor(_GXChannelID, _GXColor); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 m_entryModel__10daMirror_c[12]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u32 __float_max; -extern "C" extern f32 mSystemFar__14mDoLib_clipper; -extern "C" extern u8 m_myObj__10daMirror_c[4]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_mirror/executor.cpp b/rel/d/a/d_a_mirror/executor.cpp index a3249b03d07..0abb025a103 100644 --- a/rel/d/a/d_a_mirror/executor.cpp +++ b/rel/d/a/d_a_mirror/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80872584[4]; -extern u8 const data_80872588[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_mirror/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_mirror/unknown_translation_unit_ctors.cpp index 95882ccbe91..27e6553bc62 100644 --- a/rel/d/a/d_a_mirror/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_mirror/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80872584[4]; -extern u8 const data_80872584[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80872584[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80872584-80872588 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80872584[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_mirror/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_mirror/unknown_translation_unit_dtors.cpp index 5625e03b564..ee6ba446648 100644 --- a/rel/d/a/d_a_mirror/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_mirror/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80872588[4]; -extern u8 const data_80872588[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80872588[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80872588-8087258C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80872588[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp index b7a274ce7e9..0986303b71d 100644 --- a/rel/d/a/d_a_movie_player/d_a_movie_player.cpp +++ b/rel/d/a/d_a_movie_player/d_a_movie_player.cpp @@ -173,61 +173,6 @@ static void fopAcM_OnCondition(fopAc_ac_c*, u32); static void* operator new(u32, void*); static void fopAcM_CheckCondition(fopAc_ac_c*, u32); static bool daMP_Callback_Dummy(daMP_c*); -extern "C" extern u32 const lit_4466; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_MOVIE_PLAYER[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 THPStatistics[1120]; -extern "C" extern u8 daMP_FreeTextureSetMessage[12]; -extern "C" extern u8 daMP_DecodedTextureSetMessage[12]; -extern "C" extern u8 daMP_AudioDecodeThreadStack[409600]; -extern "C" extern u8 daMP_FreeAudioBufferMessage[12]; -extern "C" extern u8 daMP_DecodedAudioBufferMessage[12]; -extern "C" extern u8 daMP_UsedTextureSetMessage[12]; -extern "C" extern u8 daMP_OldAIDCallback[4]; -extern "C" extern u8 daMP_LastAudioBuffer[4]; -extern "C" extern u8 daMP_CurAudioBuffer[4]; -extern "C" extern u8 daMP_AudioSystem[4 + 24 /* padding */]; -extern "C" extern u8 daMP_audioInfo[16]; -extern "C" extern u8 data_80945B10[4]; -extern "C" extern u8 data_80945B14[4]; -extern "C" extern u8 data_80945B18[4]; -extern "C" extern u8 data_80945B1C[4]; -extern "C" extern u8 data_80945B20[4]; -extern "C" extern u8 data_80945B24[4]; -extern "C" extern u8 data_80945B28[4]; -extern "C" extern u8 data_80945B2C[4]; -extern "C" extern u8 data_80945B30[4]; -extern "C" extern u8 data_80945B34[4]; -extern "C" extern u8 data_80945B38[4]; -extern "C" extern u8 data_80945B3C[4]; -extern "C" extern u8 data_80945B40[4]; -extern "C" extern u8 data_80945B44[4]; -extern "C" extern u8 data_80945B48[4]; -extern "C" extern u8 data_80945B4C[4]; -extern "C" extern u8 data_80945B50[4]; -extern "C" extern u8 data_80945B54[4]; -extern "C" extern u8 data_80945B58[4]; -extern "C" extern u8 data_80945B5C[4]; -extern "C" extern u8 data_80945B60[4]; -extern "C" extern u8 data_80945B64[4]; -extern "C" extern u8 data_80945B68[4]; -extern "C" extern u8 data_80945B6C[4]; -extern "C" extern u8 data_80945B70[4]; extern "C" static void THPAudioDecode(); extern "C" static void __THPAudioGetNewSample(); @@ -427,14 +372,6 @@ extern "C" extern u8 data_80945B70[4]; void mDoExt_getArchiveHeap(); void fopOvlpM_IsPeek(); void cAPICPad_ANY_BUTTON(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 m_myObj__6daMP_c[4]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 sManager__8JUTVideo[4]; SECTION_INIT void memset(); SECTION_INIT void memcpy(); diff --git a/rel/d/a/d_a_movie_player/executor.cpp b/rel/d/a/d_a_movie_player/executor.cpp index 8efe9543e92..b901afa90c2 100644 --- a/rel/d/a/d_a_movie_player/executor.cpp +++ b/rel/d/a/d_a_movie_player/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80879028[2]; -extern u8 const data_80879030[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_movie_player/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_movie_player/unknown_translation_unit_ctors.cpp index b74bb98c89b..b3b80956448 100644 --- a/rel/d/a/d_a_movie_player/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_movie_player/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80879028[2]; -extern void* const data_80879028[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_movie_player_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80879028-80879030 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80879028[2] = { + (void*)__sinit_d_a_movie_player_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_movie_player/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_movie_player/unknown_translation_unit_dtors.cpp index 07dfa1ef946..4ce41f237d0 100644 --- a/rel/d/a/d_a_movie_player/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_movie_player/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80879030[4]; -extern u8 const data_80879030[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80879030[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80879030-80879034 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80879030[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_myna/d_a_myna.cpp b/rel/d/a/d_a_myna/d_a_myna.cpp index ea8316604b2..08a18320f39 100644 --- a/rel/d/a/d_a_myna/d_a_myna.cpp +++ b/rel/d/a/d_a_myna/d_a_myna.cpp @@ -15,8 +15,6 @@ struct request_of_phase_process_class {}; struct msg_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -24,6 +22,8 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -52,18 +52,18 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -92,17 +92,17 @@ struct daObj_SSItem_c { /* 80CE77F8 */ void getExchangeItemPtr(); }; +struct J3DJoint {}; + +struct J3DModel {}; + struct J3DFrameCtrl { /* 803283FC */ void init(s16); /* 80946370 */ ~J3DFrameCtrl(); }; -struct J3DModel {}; - struct J3DAnmTransformKey {}; -struct J3DJoint {}; - struct daMyna_c { /* 80945E80 */ void baseMotion00(int); /* 80945EC0 */ void baseMotion01(int); @@ -311,48 +311,6 @@ static void daMyna_Draw(void*); static bool daMyna_IsDelete(void*); static void cLib_calcTimer__template0(s16*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_MYNA[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8094BAD0[4]; -extern "C" extern u8 data_8094BAD4[4]; -extern "C" extern u8 data_8094BAD8[4]; -extern "C" extern u8 data_8094BADC[4]; -extern "C" extern u8 data_8094BAE0[4]; -extern "C" extern u8 data_8094BAE4[4]; -extern "C" extern u8 data_8094BAE8[4]; -extern "C" extern u8 data_8094BAEC[4]; -extern "C" extern u8 data_8094BAF0[4]; -extern "C" extern u8 data_8094BAF4[4]; -extern "C" extern u8 data_8094BAF8[4]; -extern "C" extern u8 data_8094BAFC[4]; -extern "C" extern u8 data_8094BB00[4]; -extern "C" extern u8 data_8094BB04[4]; -extern "C" extern u8 data_8094BB08[4]; -extern "C" extern u8 data_8094BB0C[4]; -extern "C" extern u8 data_8094BB10[4]; -extern "C" extern u8 data_8094BB14[4]; -extern "C" extern u8 data_8094BB18[4]; -extern "C" extern u8 data_8094BB1C[4]; -extern "C" extern u8 data_8094BB20[4]; -extern "C" extern u8 data_8094BB24[4]; -extern "C" extern u8 data_8094BB28[4]; -extern "C" extern u8 data_8094BB2C[4]; -extern "C" extern u8 data_8094BB30[4]; extern "C" static void createHeapCallBack__FP10fopAc_ac_c(); extern "C" static void jntNodeCallBack__FP8J3DJointi(); @@ -536,21 +494,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; SECTION_INIT void memcpy(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_myna/executor.cpp b/rel/d/a/d_a_myna/executor.cpp index 9c42cc672c5..c88e50f3beb 100644 --- a/rel/d/a/d_a_myna/executor.cpp +++ b/rel/d/a/d_a_myna/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8094B19C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_myna/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_myna/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1abffb9979f..4273f6ca6d6 100644 --- a/rel/d/a/d_a_myna/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_myna/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8094B1A8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8094B1A8-8094B1B0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8094B1A8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8094B9E8-8094B9F0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_myna/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_myna/unknown_translation_unit_ctors.cpp index 9e22e7f9f32..ddf819a0421 100644 --- a/rel/d/a/d_a_myna/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_myna/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8094B19C[2]; -extern void* const data_8094B19C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_myna_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8094B19C-8094B1A4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8094B19C[2] = { + (void*)__sinit_d_a_myna_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp index 25cba0bae9a..3a8c93aeefa 100644 --- a/rel/d/a/d_a_nbomb/d_a_nbomb.cpp +++ b/rel/d/a/d_a_nbomb/d_a_nbomb.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -27,6 +25,8 @@ struct cXyz { /* 804C6F78 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -319,49 +319,6 @@ static void daNbomb_Create(fopAc_ac_c*); static void daNbomb_Delete(daNbomb_c*); static void daNbomb_Execute(daNbomb_c*); static void daNbomb_Draw(daNbomb_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NBOMB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_804CC6E4[4]; -extern "C" extern u8 data_804CC6E8[4]; -extern "C" extern u8 data_804CC6EC[4]; -extern "C" extern u8 data_804CC6F0[4]; -extern "C" extern u8 data_804CC6F4[4]; -extern "C" extern u8 data_804CC6F8[4]; -extern "C" extern u8 data_804CC6FC[4]; -extern "C" extern u8 data_804CC700[4]; -extern "C" extern u8 data_804CC704[4]; -extern "C" extern u8 data_804CC708[4]; -extern "C" extern u8 data_804CC70C[4]; -extern "C" extern u8 data_804CC710[4]; -extern "C" extern u8 data_804CC714[4]; -extern "C" extern u8 data_804CC718[4]; -extern "C" extern u8 data_804CC71C[4]; -extern "C" extern u8 data_804CC720[4]; -extern "C" extern u8 data_804CC724[4]; -extern "C" extern u8 data_804CC728[4]; -extern "C" extern u8 data_804CC72C[4]; -extern "C" extern u8 data_804CC730[4]; -extern "C" extern u8 data_804CC734[4]; -extern "C" extern u8 data_804CC738[4]; -extern "C" extern u8 data_804CC73C[4]; -extern "C" extern u8 data_804CC740[4]; -extern "C" extern u8 data_804CC744[4]; -extern "C" extern u8 data_804CC748[4]; extern "C" void coHitCallback__9daNbomb_cFP10fopAc_ac_c(); extern "C" static void @@ -510,28 +467,6 @@ void cLib_chaseF(f32*, f32, f32); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 BaseZ__4cXyz[12]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_nbomb/executor.cpp b/rel/d/a/d_a_nbomb/executor.cpp index f6cf0c6fe3e..91f25abd8f3 100644 --- a/rel/d/a/d_a_nbomb/executor.cpp +++ b/rel/d/a/d_a_nbomb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804CC32C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_nbomb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_nbomb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fbdd40b6ab2..15c25cee561 100644 --- a/rel/d/a/d_a_nbomb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_nbomb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804CC338[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804CC338-804CC340 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804CC338[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804CC680-804CC688 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_nbomb/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_nbomb/unknown_translation_unit_ctors.cpp index 0707902a351..26237198287 100644 --- a/rel/d/a/d_a_nbomb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_nbomb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804CC32C[2]; -extern void* const data_804CC32C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_nbomb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804CC32C-804CC334 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804CC32C[2] = { + (void*)__sinit_d_a_nbomb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_ni/d_a_ni.cpp b/rel/d/a/d_a_ni/d_a_ni.cpp index 1832239e484..2688e652a9b 100644 --- a/rel/d/a/d_a_ni/d_a_ni.cpp +++ b/rel/d/a/d_a_ni/d_a_ni.cpp @@ -39,11 +39,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -292,63 +292,6 @@ static bool daNi_IsDelete(ni_class*); static void daNi_Delete(ni_class*); static void useHeapInit(fopAc_ac_c*); static void daNi_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_5118; -extern "C" extern u32 const lit_5119; -extern "C" extern u32 const lit_5121; -extern "C" extern u32 const lit_5123; -extern "C" extern u32 const lit_5124; -extern "C" extern u32 const lit_5661; -extern "C" extern u32 const lit_5662; -extern "C" extern u32 const lit_5663; -extern "C" extern u32 const lit_5664; -extern "C" extern u32 const lit_5665; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_809513D4[16]; -extern "C" extern u8 data_809513E4[16]; -extern "C" extern u8 data_809513F4[8]; -extern "C" extern void* g_profile_NI[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_5415[12 + 4 /* padding */]; -extern "C" extern u8 data_80951614[12]; -extern "C" extern u8 data_80951620[4]; -extern "C" extern u8 data_80951624[4]; -extern "C" extern u8 data_80951628[4]; -extern "C" extern u8 data_8095162C[4]; -extern "C" extern u8 data_80951630[4]; -extern "C" extern u8 data_80951634[4]; -extern "C" extern u8 data_80951638[4]; -extern "C" extern u8 data_8095163C[4]; -extern "C" extern u8 data_80951640[4]; -extern "C" extern u8 data_80951644[4]; -extern "C" extern u8 data_80951648[4]; -extern "C" extern u8 data_8095164C[4]; -extern "C" extern u8 data_80951650[4]; -extern "C" extern u8 data_80951654[4]; -extern "C" extern u8 data_80951658[4]; -extern "C" extern u8 data_8095165C[4]; -extern "C" extern u8 data_80951660[4]; -extern "C" extern u8 data_80951664[4]; -extern "C" extern u8 data_80951668[4]; -extern "C" extern u8 data_8095166C[4]; -extern "C" extern u8 data_80951670[4]; -extern "C" extern u8 data_80951674[4]; -extern "C" extern u8 data_80951678[4]; -extern "C" extern u8 data_8095167C[4]; -extern "C" extern u8 data_80951680[4]; extern "C" void __ct__10daNi_HIO_cFv(); extern "C" static void anm_init__FP8ni_classifUcf(); @@ -491,26 +434,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_ni/executor.cpp b/rel/d/a/d_a_ni/executor.cpp index 9f91490b0d5..c76b6de53e2 100644 --- a/rel/d/a/d_a_ni/executor.cpp +++ b/rel/d/a/d_a_ni/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809511AC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_ni/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_ni/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b061a5702d6..1fb7e29749e 100644 --- a/rel/d/a/d_a_ni/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_ni/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809511B8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809511B8-809511C0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809511B8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80951548-80951550 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_ni/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_ni/unknown_translation_unit_ctors.cpp index 5cbbe7d8b9c..c27cb465a93 100644 --- a/rel/d/a/d_a_ni/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_ni/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809511AC[2]; -extern void* const data_809511AC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_ni_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809511AC-809511B4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809511AC[2] = { + (void*)__sinit_d_a_ni_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp b/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp index 83907d03142..3fa1d8f400b 100644 --- a/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp +++ b/rel/d/a/d_a_passer_mng/d_a_passer_mng.cpp @@ -47,7 +47,6 @@ static bool daPasserMng_IsDelete(daPasserMng_c*); static void daPasserMng_Delete(daPasserMng_c*); static void daPasserMng_Create(fopAc_ac_c*); static void cLib_getRndValue__template0(int, int); -extern "C" extern void* g_profile_PASSER_MNG[12]; extern "C" static void daPasserMng_Execute__FP13daPasserMng_c(); extern "C" void execute__13daPasserMng_cFv(); @@ -81,10 +80,6 @@ void cM_rndF(f32); void cLib_targetAngleY(Vec const&, Vec const&); void* operator new[](u32); void operator delete[](void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_passer_mng/executor.cpp b/rel/d/a/d_a_passer_mng/executor.cpp index 76086093013..5f2fb195025 100644 --- a/rel/d/a/d_a_passer_mng/executor.cpp +++ b/rel/d/a/d_a_passer_mng/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D46C18[4]; -extern u8 const data_80D46C1C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_passer_mng/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_passer_mng/unknown_translation_unit_ctors.cpp index e7bb7a119e6..f6c04a1cdb5 100644 --- a/rel/d/a/d_a_passer_mng/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_passer_mng/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D46C18[4]; -extern u8 const data_80D46C18[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D46C18[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D46C18-80D46C1C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D46C18[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_passer_mng/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_passer_mng/unknown_translation_unit_dtors.cpp index 47bc1618ebf..91c4fae7bab 100644 --- a/rel/d/a/d_a_passer_mng/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_passer_mng/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D46C1C[4]; -extern u8 const data_80D46C1C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D46C1C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D46C1C-80D46C20 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D46C1C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_path_line/d_a_path_line.cpp b/rel/d/a/d_a_path_line/d_a_path_line.cpp index 4e788ebe6ff..8320d01eb07 100644 --- a/rel/d/a/d_a_path_line/d_a_path_line.cpp +++ b/rel/d/a/d_a_path_line/d_a_path_line.cpp @@ -13,8 +13,6 @@ extern "C" extern void* g_profile_PATH_LINE[13]; -extern "C" extern void* g_profile_PATH_LINE[13]; - // // External References: // @@ -22,9 +20,6 @@ extern "C" extern void* g_profile_PATH_LINE[13]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/rel/d/a/d_a_path_line/executor.cpp b/rel/d/a/d_a_path_line/executor.cpp index 227d7243681..1e68868f6c7 100644 --- a/rel/d/a/d_a_path_line/executor.cpp +++ b/rel/d/a/d_a_path_line/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80485778[4]; -extern u8 const data_8048577C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_path_line/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_path_line/unknown_translation_unit_ctors.cpp index 935d74e36d9..f29944fd7fc 100644 --- a/rel/d/a/d_a_path_line/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_path_line/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80485778[4]; -extern u8 const data_80485778[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80485778[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80485778-8048577C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80485778[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_path_line/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_path_line/unknown_translation_unit_dtors.cpp index cb9bc34c21a..fe4947d1ed8 100644 --- a/rel/d/a/d_a_path_line/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_path_line/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048577C[4]; -extern u8 const data_8048577C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048577C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048577C-80485780 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048577C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_peru/d_a_peru.cpp b/rel/d/a/d_a_peru/d_a_peru.cpp index 226e111b062..e75dab856dc 100644 --- a/rel/d/a/d_a_peru/d_a_peru.cpp +++ b/rel/d/a/d_a_peru/d_a_peru.cpp @@ -22,12 +22,6 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -36,6 +30,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -144,13 +144,13 @@ struct daObjCatDoor_c { struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -409,48 +409,6 @@ static void daPeru_Delete(void*); static void daPeru_Execute(void*); static void daPeru_Draw(void*); static bool daPeru_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_PERU[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80D4C85C[4]; -extern "C" extern u8 data_80D4C860[4]; -extern "C" extern u8 data_80D4C864[4]; -extern "C" extern u8 data_80D4C868[4]; -extern "C" extern u8 data_80D4C86C[4]; -extern "C" extern u8 data_80D4C870[4]; -extern "C" extern u8 data_80D4C874[4]; -extern "C" extern u8 data_80D4C878[4]; -extern "C" extern u8 data_80D4C87C[4]; -extern "C" extern u8 data_80D4C880[4]; -extern "C" extern u8 data_80D4C884[4]; -extern "C" extern u8 data_80D4C888[4]; -extern "C" extern u8 data_80D4C88C[4]; -extern "C" extern u8 data_80D4C890[4]; -extern "C" extern u8 data_80D4C894[4]; -extern "C" extern u8 data_80D4C898[4]; -extern "C" extern u8 data_80D4C89C[4]; -extern "C" extern u8 data_80D4C8A0[4]; -extern "C" extern u8 data_80D4C8A4[4]; -extern "C" extern u8 data_80D4C8A8[4]; -extern "C" extern u8 data_80D4C8AC[4]; -extern "C" extern u8 data_80D4C8B0[4]; -extern "C" extern u8 data_80D4C8B4[4]; -extern "C" extern u8 data_80D4C8B8[4]; -extern "C" extern u8 data_80D4C8BC[4]; extern "C" void __dt__8daPeru_cFv(); extern "C" void create__8daPeru_cFv(); @@ -633,23 +591,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/d_a_peru/executor.cpp b/rel/d/a/d_a_peru/executor.cpp index d454305735d..87de8270ab0 100644 --- a/rel/d/a/d_a_peru/executor.cpp +++ b/rel/d/a/d_a_peru/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D4C04C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_peru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_peru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 33d8486b6ea..dc4e271b59a 100644 --- a/rel/d/a/d_a_peru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_peru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D4C058[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D4C058-80D4C060 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D4C058[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D4C7E8-80D4C7F0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_peru/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_peru/unknown_translation_unit_ctors.cpp index 7122b369bf2..5d7f5bb5d24 100644 --- a/rel/d/a/d_a_peru/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_peru/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D4C04C[2]; -extern void* const data_80D4C04C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_peru_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D4C04C-80D4C054 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D4C04C[2] = { + (void*)__sinit_d_a_peru_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp b/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp index 6743fbb5166..6d13d8bddeb 100644 --- a/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp +++ b/rel/d/a/d_a_ppolamp/d_a_ppolamp.cpp @@ -44,8 +44,6 @@ struct daPPolamp_c { /* 80D4D10C */ void initParam(); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -54,6 +52,8 @@ struct cXyz { /* 80267150 */ void atan2sY_XZ() const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -81,48 +81,6 @@ static void daPPolamp_create(daPPolamp_c*); static void daPPolamp_Delete(daPPolamp_c*); static void daPPolamp_execute(daPPolamp_c*); static void daPPolamp_draw(daPPolamp_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_PPolamp[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80D4D394[4]; -extern "C" extern u8 data_80D4D398[4]; -extern "C" extern u8 data_80D4D39C[4]; -extern "C" extern u8 data_80D4D3A0[4]; -extern "C" extern u8 data_80D4D3A4[4]; -extern "C" extern u8 data_80D4D3A8[4]; -extern "C" extern u8 data_80D4D3AC[4]; -extern "C" extern u8 data_80D4D3B0[4]; -extern "C" extern u8 data_80D4D3B4[4]; -extern "C" extern u8 data_80D4D3B8[4]; -extern "C" extern u8 data_80D4D3BC[4]; -extern "C" extern u8 data_80D4D3C0[4]; -extern "C" extern u8 data_80D4D3C4[4]; -extern "C" extern u8 data_80D4D3C8[4]; -extern "C" extern u8 data_80D4D3CC[4]; -extern "C" extern u8 data_80D4D3D0[4]; -extern "C" extern u8 data_80D4D3D4[4]; -extern "C" extern u8 data_80D4D3D8[4]; -extern "C" extern u8 data_80D4D3DC[4]; -extern "C" extern u8 data_80D4D3E0[4]; -extern "C" extern u8 data_80D4D3E4[4]; -extern "C" extern u8 data_80D4D3E8[4]; -extern "C" extern u8 data_80D4D3EC[4]; -extern "C" extern u8 data_80D4D3F0[4]; -extern "C" extern u8 data_80D4D3F4[4]; extern "C" static void daPPolamp_c_createHeap__FP10fopAc_ac_c(); extern "C" void __dt__11daPPolamp_cFv(); @@ -199,11 +157,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_ppolamp/executor.cpp b/rel/d/a/d_a_ppolamp/executor.cpp index 33e43a33005..c20b8498c4f 100644 --- a/rel/d/a/d_a_ppolamp/executor.cpp +++ b/rel/d/a/d_a_ppolamp/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D4D274[4]; -extern u8 const data_80D4D278[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_ppolamp/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_ppolamp/unknown_translation_unit_ctors.cpp index 678058daa4e..7e9ba492ebf 100644 --- a/rel/d/a/d_a_ppolamp/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_ppolamp/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4D274[4]; -extern u8 const data_80D4D274[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D4D274[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D4D274-80D4D278 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D4D274[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_ppolamp/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_ppolamp/unknown_translation_unit_dtors.cpp index 94019a445c6..31e7ff93254 100644 --- a/rel/d/a/d_a_ppolamp/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_ppolamp/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4D278[4]; -extern u8 const data_80D4D278[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D4D278[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D4D278-80D4D27C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D4D278[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp index 17e5369dcb1..f6d3bacce05 100644 --- a/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp +++ b/rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp @@ -43,7 +43,6 @@ struct Z2SeMgr { static void daScex_Create(fopAc_ac_c*); static void daScex_Execute(daScex_c*); -extern "C" extern void* g_profile_SCENE_EXIT[13]; extern "C" void checkWork__8daScex_cFv(); extern "C" static void daScex_Create__FP10fopAc_ac_c(); @@ -56,12 +55,6 @@ extern "C" extern void* g_profile_SCENE_EXIT[13]; // void mDoMtx_YrotM(f32 (*)[4], s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_scene_exit/executor.cpp b/rel/d/a/d_a_scene_exit/executor.cpp index d42d4b726db..55af93bf5ed 100644 --- a/rel/d/a/d_a_scene_exit/executor.cpp +++ b/rel/d/a/d_a_scene_exit/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80485C90[4]; -extern u8 const data_80485C94[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_scene_exit/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_scene_exit/unknown_translation_unit_ctors.cpp index cc1095ed515..48af6dfa991 100644 --- a/rel/d/a/d_a_scene_exit/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_scene_exit/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80485C90[4]; -extern u8 const data_80485C90[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80485C90[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80485C90-80485C94 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80485C90[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_scene_exit/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_scene_exit/unknown_translation_unit_dtors.cpp index 12bb407d57d..24b4ed0700b 100644 --- a/rel/d/a/d_a_scene_exit/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_scene_exit/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80485C94[4]; -extern u8 const data_80485C94[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80485C94[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80485C94-80485C98 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80485C94[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp b/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp index 3abe2dec5e5..12dccf23a77 100644 --- a/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp +++ b/rel/d/a/d_a_scene_exit2/d_a_scene_exit2.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -73,9 +73,6 @@ static void daScExit_Execute(daScExit_c*); static void daScExit_Delete(daScExit_c*); static void daScExit_Create(daScExit_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u8 const lit_3800[4]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_SCENE_EXIT2[12]; extern "C" void initBaseMtx__10daScExit_cFv(); extern "C" void setBaseMtx__10daScExit_cFv(); @@ -110,11 +107,6 @@ void dStage_changeScene(int, f32, u32, s8, s16, int); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_8059E920[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/d_a_scene_exit2/executor.cpp b/rel/d/a/d_a_scene_exit2/executor.cpp index 6b464a96aa0..f4092f0d784 100644 --- a/rel/d/a/d_a_scene_exit2/executor.cpp +++ b/rel/d/a/d_a_scene_exit2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8059E7EC[4]; -extern u8 const data_8059E7F0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_scene_exit2/unknown_translation_unit_bss.cpp b/rel/d/a/d_a_scene_exit2/unknown_translation_unit_bss.cpp index 555cbbc1bf9..12f60660cf0 100644 --- a/rel/d/a/d_a_scene_exit2/unknown_translation_unit_bss.cpp +++ b/rel/d/a/d_a_scene_exit2/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_8059E920[4]; -extern "C" extern u8 data_8059E920[4]; - // // External References: // diff --git a/rel/d/a/d_a_scene_exit2/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_scene_exit2/unknown_translation_unit_ctors.cpp index cb6e08f44e6..c84c8380e20 100644 --- a/rel/d/a/d_a_scene_exit2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_scene_exit2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059E7EC[4]; -extern u8 const data_8059E7EC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8059E7EC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8059E7EC-8059E7F0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8059E7EC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_scene_exit2/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_scene_exit2/unknown_translation_unit_dtors.cpp index 3929499d8b9..b6ec3457131 100644 --- a/rel/d/a/d_a_scene_exit2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_scene_exit2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059E7F0[4]; -extern u8 const data_8059E7F0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8059E7F0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8059E7F0-8059E7F4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8059E7F0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp index c2a388716f4..68293370141 100644 --- a/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp +++ b/rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp @@ -40,8 +40,6 @@ struct cXyz {}; static void daSetBgObj_Delete(daSetBgObj_c*); static void daSetBgObj_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_SET_BG_OBJ[12]; extern "C" void CreateInit__12daSetBgObj_cFv(); extern "C" void create__12daSetBgObj_cFv(); @@ -58,9 +56,6 @@ extern "C" extern void* g_profile_SET_BG_OBJ[12]; void fopAcM_create(s16, u32, cXyz const*, int, csXyz const*, cXyz const*, s8); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); diff --git a/rel/d/a/d_a_set_bgobj/executor.cpp b/rel/d/a/d_a_set_bgobj/executor.cpp index 9c48e4b279e..2e18c4cb56e 100644 --- a/rel/d/a/d_a_set_bgobj/executor.cpp +++ b/rel/d/a/d_a_set_bgobj/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80485EF8[4]; -extern u8 const data_80485EFC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_set_bgobj/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_set_bgobj/unknown_translation_unit_ctors.cpp index 4b45e160ab4..61711bcc911 100644 --- a/rel/d/a/d_a_set_bgobj/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_set_bgobj/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80485EF8[4]; -extern u8 const data_80485EF8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80485EF8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80485EF8-80485EFC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80485EF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_set_bgobj/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_set_bgobj/unknown_translation_unit_dtors.cpp index afb5e1ebbfe..eac70e05cfb 100644 --- a/rel/d/a/d_a_set_bgobj/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_set_bgobj/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80485EFC[4]; -extern u8 const data_80485EFC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80485EFC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80485EFC-80485F00 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80485EFC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_shop_item/d_a_shop_item.cpp b/rel/d/a/d_a_shop_item/d_a_shop_item.cpp index 40f129eab67..193e2434d87 100644 --- a/rel/d/a/d_a_shop_item/d_a_shop_item.cpp +++ b/rel/d/a/d_a_shop_item/d_a_shop_item.cpp @@ -101,8 +101,6 @@ static void daShopItem_Delete(void*); static void daShopItem_Draw(void*); static void daShopItem_Execute(void*); static bool daShopItem_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_ShopItem[12]; extern "C" void getShopArcname__12daShopItem_cFv(); extern "C" void getHeapSize__12daShopItem_cFv(); @@ -145,19 +143,6 @@ void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_Poly dKy_tevstr_c*, s16, f32, _GXTexObj*); void CheckShopItemCreateHeap(fopAc_ac_c*); void operator delete(void*); -extern "C" extern void* const mData__12daShopItem_c[276]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern f32 mSystemFar__14mDoLib_clipper; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_shop_item/executor.cpp b/rel/d/a/d_a_shop_item/executor.cpp index fdbd2fe32c6..e7e95955fef 100644 --- a/rel/d/a/d_a_shop_item/executor.cpp +++ b/rel/d/a/d_a_shop_item/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8059F430[4]; -extern u8 const data_8059F434[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_shop_item/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_shop_item/unknown_translation_unit_ctors.cpp index ae3bbabd55d..50f61f7641c 100644 --- a/rel/d/a/d_a_shop_item/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_shop_item/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059F430[4]; -extern u8 const data_8059F430[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8059F430[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8059F430-8059F434 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8059F430[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_shop_item/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_shop_item/unknown_translation_unit_dtors.cpp index c7f048451d1..4ac8c5fc2cf 100644 --- a/rel/d/a/d_a_shop_item/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_shop_item/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059F434[4]; -extern u8 const data_8059F434[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8059F434[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8059F434-8059F438 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8059F434[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp b/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp index 40ba616037b..4a0165dbca1 100644 --- a/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp +++ b/rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp @@ -46,7 +46,6 @@ static void daSkip2D_Delete(void*); static void daSkip2D_Execute(void*); static void daSkip2D_Draw(void*); static bool daSkip2D_IsDelete(void*); -extern "C" extern void* g_profile_SKIP2D[12]; extern "C" static void daSkip2D_createHeap__FP10fopAc_ac_c(); extern "C" void createHeap__10daSkip2D_cFv(); @@ -70,9 +69,6 @@ extern "C" extern void* g_profile_SKIP2D[12]; void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_skip_2D/executor.cpp b/rel/d/a/d_a_skip_2D/executor.cpp index 74b0abc818c..83d0bbc2806 100644 --- a/rel/d/a/d_a_skip_2D/executor.cpp +++ b/rel/d/a/d_a_skip_2D/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D4D6D4[4]; -extern u8 const data_80D4D6D8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_skip_2D/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_skip_2D/unknown_translation_unit_ctors.cpp index cc4cfeee9c0..2c974aa8caf 100644 --- a/rel/d/a/d_a_skip_2D/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_skip_2D/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4D6D4[4]; -extern u8 const data_80D4D6D4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D4D6D4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D4D6D4-80D4D6D8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D4D6D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_skip_2D/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_skip_2D/unknown_translation_unit_dtors.cpp index ab67544697e..ff3a0bd7dcf 100644 --- a/rel/d/a/d_a_skip_2D/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_skip_2D/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4D6D8[4]; -extern u8 const data_80D4D6D8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D4D6D8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D4D6D8-80D4D6DC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D4D6D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_spinner/d_a_spinner.cpp b/rel/d/a/d_a_spinner/d_a_spinner.cpp index 6d643ef9bbc..a3757ff8375 100644 --- a/rel/d/a/d_a_spinner/d_a_spinner.cpp +++ b/rel/d/a/d_a_spinner/d_a_spinner.cpp @@ -11,8 +11,6 @@ // Types: // -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,6 +21,8 @@ struct cXyz { /* 804D1E4C */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -107,12 +107,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -126,6 +126,13 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F40 */ void SetWallR(f32); + /* 80075F58 */ void SetWall(f32, f32); + /* 804D1EF8 */ ~dBgS_AcchCir(); +}; + struct dBgS { /* 80074BE8 */ void GetPolyColor(cBgS_PolyInfo const&); /* 80074CBC */ void GetSpecialCode(cBgS_PolyInfo const&); @@ -134,13 +141,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 804D1EF8 */ ~dBgS_AcchCir(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -280,49 +280,6 @@ static void daSpinner_Create(fopAc_ac_c*); static void daSpinner_Delete(daSpinner_c*); static void daSpinner_Execute(daSpinner_c*); static void daSpinner_Draw(daSpinner_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_SPINNER[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_804D5030[4]; -extern "C" extern u8 data_804D5034[4]; -extern "C" extern u8 data_804D5038[4]; -extern "C" extern u8 data_804D503C[4]; -extern "C" extern u8 data_804D5040[4]; -extern "C" extern u8 data_804D5044[4]; -extern "C" extern u8 data_804D5048[4]; -extern "C" extern u8 data_804D504C[4]; -extern "C" extern u8 data_804D5050[4]; -extern "C" extern u8 data_804D5054[4]; -extern "C" extern u8 data_804D5058[4]; -extern "C" extern u8 data_804D505C[4]; -extern "C" extern u8 data_804D5060[4]; -extern "C" extern u8 data_804D5064[4]; -extern "C" extern u8 data_804D5068[4]; -extern "C" extern u8 data_804D506C[4]; -extern "C" extern u8 data_804D5070[4]; -extern "C" extern u8 data_804D5074[4]; -extern "C" extern u8 data_804D5078[4]; -extern "C" extern u8 data_804D507C[4]; -extern "C" extern u8 data_804D5080[4]; -extern "C" extern u8 data_804D5084[4]; -extern "C" extern u8 data_804D5088[4]; -extern "C" extern u8 data_804D508C[4]; -extern "C" extern u8 data_804D5090[4]; -extern "C" extern u8 data_804D5094[4]; extern "C" void createHeap__11daSpinner_cFv(); extern "C" static void daSpinner_createHeap__FP10fopAc_ac_c(); @@ -434,22 +391,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_distanceAngleS(s16, s16); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_spinner/executor.cpp b/rel/d/a/d_a_spinner/executor.cpp index 3a28f7ac393..a87be6a281f 100644 --- a/rel/d/a/d_a_spinner/executor.cpp +++ b/rel/d/a/d_a_spinner/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804D4D80[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_spinner/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_spinner/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7ede4d62d4d..213b39dfbd7 100644 --- a/rel/d/a/d_a_spinner/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_spinner/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804D4D88[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804D4D88-804D4D90 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804D4D88[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804D4FC0-804D4FC8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_spinner/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_spinner/unknown_translation_unit_ctors.cpp index 717706557de..9b9e219fd28 100644 --- a/rel/d/a/d_a_spinner/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_spinner/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D4D80[4]; -extern u8 const data_804D4D80[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804D4D80[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804D4D80-804D4D84 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804D4D80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_sq/d_a_sq.cpp b/rel/d/a/d_a_sq/d_a_sq.cpp index 27aa2833746..eabd03f06df 100644 --- a/rel/d/a/d_a_sq/d_a_sq.cpp +++ b/rel/d/a/d_a_sq/d_a_sq.cpp @@ -32,11 +32,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -57,12 +57,12 @@ struct daSq_HIO_c { /* 805A10B0 */ ~daSq_HIO_c(); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -185,8 +185,6 @@ static bool daSq_IsDelete(sq_class*); static void daSq_Delete(sq_class*); static void useHeapInit(fopAc_ac_c*); static void daSq_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_SQ[12]; extern "C" void __ct__10daSq_HIO_cFv(); extern "C" static void anm_init__FP8sq_classifUcfi(); @@ -241,18 +239,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_sq/executor.cpp b/rel/d/a/d_a_sq/executor.cpp index 7c7e9ca5ae1..f7fc616a06c 100644 --- a/rel/d/a/d_a_sq/executor.cpp +++ b/rel/d/a/d_a_sq/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805A1144[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_sq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_sq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2b26df2ef44..f0dbd54c3d3 100644 --- a/rel/d/a/d_a_sq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_sq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805A1150[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805A1150-805A1158 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805A1150[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805A1328-805A1330 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_sq/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_sq/unknown_translation_unit_ctors.cpp index 394bec2f829..7192cdd62d7 100644 --- a/rel/d/a/d_a_sq/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_sq/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805A1144[2]; -extern void* const data_805A1144[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_sq_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A1144-805A114C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805A1144[2] = { + (void*)__sinit_d_a_sq_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp b/rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp index 47652a88586..e7de1dcd953 100644 --- a/rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp +++ b/rel/d/a/d_a_startAndGoal/d_a_startAndGoal.cpp @@ -70,7 +70,6 @@ static void daStartAndGoal_Draw(daStartAndGoal_c*); static bool daStartAndGoal_IsDelete(daStartAndGoal_c*); static void daStartAndGoal_Delete(daStartAndGoal_c*); static void daStartAndGoal_create(fopAc_ac_c*); -extern "C" extern void* g_profile_START_AND_GOAL[12]; extern "C" void chkPassed2__21daStartAndGoal_Path_cF4cXyz(); extern "C" void getType__16daStartAndGoal_cFv(); @@ -104,11 +103,6 @@ void dTimer_createTimer(s32, u32, u8, u8, f32, f32, f32, f32); void dTimer_isStart(); void dTimer_isReadyFlag(); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void getTimerNowTimeMs__14dComIfG_play_cFv(); diff --git a/rel/d/a/d_a_startAndGoal/executor.cpp b/rel/d/a/d_a_startAndGoal/executor.cpp index 943dbe3d33f..b33e9943c90 100644 --- a/rel/d/a/d_a_startAndGoal/executor.cpp +++ b/rel/d/a/d_a_startAndGoal/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D4DEB0[4]; -extern u8 const data_80D4DEB4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_startAndGoal/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_startAndGoal/unknown_translation_unit_ctors.cpp index 935ecb36116..d75485d0e60 100644 --- a/rel/d/a/d_a_startAndGoal/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_startAndGoal/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4DEB0[4]; -extern u8 const data_80D4DEB0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D4DEB0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D4DEB0-80D4DEB4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D4DEB0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_startAndGoal/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_startAndGoal/unknown_translation_unit_dtors.cpp index 277786d485e..f8ade5ecbcc 100644 --- a/rel/d/a/d_a_startAndGoal/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_startAndGoal/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4DEB4[4]; -extern u8 const data_80D4DEB4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D4DEB4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D4DEB4-80D4DEB8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D4DEB4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_suspend/d_a_suspend.cpp b/rel/d/a/d_a_suspend/d_a_suspend.cpp index 5a6c400e96f..41acd6d4322 100644 --- a/rel/d/a/d_a_suspend/d_a_suspend.cpp +++ b/rel/d/a/d_a_suspend/d_a_suspend.cpp @@ -27,7 +27,6 @@ struct daSus_c { // static void daSus_create(daSus_c*); -extern "C" extern void* g_profile_SUSPEND[12]; extern "C" void create__7daSus_cFv(); extern "C" static void daSus_create__FP7daSus_c(); @@ -37,9 +36,6 @@ extern "C" extern void* g_profile_SUSPEND[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void newData__7daSus_cFScRC4cXyzRC4cXyzUcUcUc(); extern "C" extern void* g_fopAc_Method[8]; diff --git a/rel/d/a/d_a_suspend/executor.cpp b/rel/d/a/d_a_suspend/executor.cpp index 6e1cfbdf60e..7ae4da9d5d0 100644 --- a/rel/d/a/d_a_suspend/executor.cpp +++ b/rel/d/a/d_a_suspend/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804D5234[4]; -extern u8 const data_804D5238[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_suspend/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_suspend/unknown_translation_unit_ctors.cpp index 3ceca554c4e..c5b279f7b30 100644 --- a/rel/d/a/d_a_suspend/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_suspend/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D5234[4]; -extern u8 const data_804D5234[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804D5234[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804D5234-804D5238 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804D5234[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_suspend/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_suspend/unknown_translation_unit_dtors.cpp index cd2c77177a6..857c995397e 100644 --- a/rel/d/a/d_a_suspend/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_suspend/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D5238[4]; -extern u8 const data_804D5238[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804D5238[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804D5238-804D523C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804D5238[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swBall/d_a_swBall.cpp b/rel/d/a/d_a_swBall/d_a_swBall.cpp index 08c37e90dd8..0d5a2fa2588 100644 --- a/rel/d/a/d_a_swBall/d_a_swBall.cpp +++ b/rel/d/a/d_a_swBall/d_a_swBall.cpp @@ -52,8 +52,6 @@ static void daSwBall_Execute(daSwBall_c*); static void daSwBall_Delete(daSwBall_c*); static void daSwBall_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_SwBall[12]; extern "C" static void s_ball_sub__FPvPv(); extern "C" void checkArea_sub__10daSwBall_cFP10fopAc_ac_c(); @@ -87,9 +85,6 @@ void fpcFCtRq_Do(fast_create_request*); void dLib_checkActorInRectangle(fopAc_ac_c*, fopAc_ac_c*, cXyz const*, cXyz const*); void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAc_IsActor__FPv(); diff --git a/rel/d/a/d_a_swBall/executor.cpp b/rel/d/a/d_a_swBall/executor.cpp index 1b555328789..00eb59fc268 100644 --- a/rel/d/a/d_a_swBall/executor.cpp +++ b/rel/d/a/d_a_swBall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D4E990[4]; -extern u8 const data_80D4E994[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_swBall/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_swBall/unknown_translation_unit_ctors.cpp index fe90eca2f94..56e8662b6a0 100644 --- a/rel/d/a/d_a_swBall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_swBall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4E990[4]; -extern u8 const data_80D4E990[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D4E990[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D4E990-80D4E994 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D4E990[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swBall/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_swBall/unknown_translation_unit_dtors.cpp index 15c27bbb8f0..dc40337dd2a 100644 --- a/rel/d/a/d_a_swBall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_swBall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4E994[4]; -extern u8 const data_80D4E994[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D4E994[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D4E994-80D4E998 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D4E994[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swLBall/d_a_swLBall.cpp b/rel/d/a/d_a_swLBall/d_a_swLBall.cpp index 4f5ab8aae00..ab5208ae7df 100644 --- a/rel/d/a/d_a_swLBall/d_a_swLBall.cpp +++ b/rel/d/a/d_a_swLBall/d_a_swLBall.cpp @@ -48,8 +48,6 @@ static void daSwLBall_Execute(daSwLBall_c*); static void daSwLBall_Delete(daSwLBall_c*); static void daSwLBall_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_SwLBall[12]; extern "C" static void s_lb_sub__FPvPv(); extern "C" void checkArea_sub__11daSwLBall_cFP10fopAc_ac_c(); @@ -82,9 +80,6 @@ void fpcSch_JudgeByID(void*, void*); void dLib_checkActorInRectangle(fopAc_ac_c*, fopAc_ac_c*, cXyz const*, cXyz const*); void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAc_IsActor__FPv(); diff --git a/rel/d/a/d_a_swLBall/executor.cpp b/rel/d/a/d_a_swLBall/executor.cpp index d4cc9878099..50e3fe37089 100644 --- a/rel/d/a/d_a_swLBall/executor.cpp +++ b/rel/d/a/d_a_swLBall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D4F4C8[4]; -extern u8 const data_80D4F4CC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_swLBall/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_swLBall/unknown_translation_unit_ctors.cpp index 33cc0e6308d..13a06d676b7 100644 --- a/rel/d/a/d_a_swLBall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_swLBall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4F4C8[4]; -extern u8 const data_80D4F4C8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D4F4C8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D4F4C8-80D4F4CC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D4F4C8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swLBall/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_swLBall/unknown_translation_unit_dtors.cpp index ab9daa54c3d..445c06371f4 100644 --- a/rel/d/a/d_a_swLBall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_swLBall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4F4CC[4]; -extern u8 const data_80D4F4CC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D4F4CC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D4F4CC-80D4F4D0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D4F4CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swTime/d_a_swTime.cpp b/rel/d/a/d_a_swTime/d_a_swTime.cpp index 0e638348dc6..9d49ea71fca 100644 --- a/rel/d/a/d_a_swTime/d_a_swTime.cpp +++ b/rel/d/a/d_a_swTime/d_a_swTime.cpp @@ -34,7 +34,6 @@ struct dSv_info_c { static void daSwTime_Execute(daSwTime_c*); static void daSwTime_Delete(daSwTime_c*); static void daSwTime_Create(daSwTime_c*); -extern "C" extern void* g_profile_SwTime[12]; extern "C" void Create__10daSwTime_cFv(); extern "C" void create__10daSwTime_cFv(); @@ -51,9 +50,6 @@ extern "C" extern void* g_profile_SwTime[12]; void dKy_getdaytime_hour(); void dKy_getdaytime_minute(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void onSwitch__10dSv_info_cFii(); diff --git a/rel/d/a/d_a_swTime/executor.cpp b/rel/d/a/d_a_swTime/executor.cpp index 9fe4c424769..c2090fa4341 100644 --- a/rel/d/a/d_a_swTime/executor.cpp +++ b/rel/d/a/d_a_swTime/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D4F7C0[4]; -extern u8 const data_80D4F7C4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_swTime/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_swTime/unknown_translation_unit_ctors.cpp index d84ac937f35..fd8f8aba008 100644 --- a/rel/d/a/d_a_swTime/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_swTime/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4F7C0[4]; -extern u8 const data_80D4F7C0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D4F7C0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D4F7C0-80D4F7C4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D4F7C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swTime/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_swTime/unknown_translation_unit_dtors.cpp index 2075187cb8f..32e134b445c 100644 --- a/rel/d/a/d_a_swTime/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_swTime/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D4F7C4[4]; -extern u8 const data_80D4F7C4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D4F7C4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D4F7C4-80D4F7C8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D4F7C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swc00/d_a_swc00.cpp b/rel/d/a/d_a_swc00/d_a_swc00.cpp index 984e373c668..f76c52b8ace 100644 --- a/rel/d/a/d_a_swc00/d_a_swc00.cpp +++ b/rel/d/a/d_a_swc00/d_a_swc00.cpp @@ -54,14 +54,6 @@ static void daSwc00_Execute(daSwc00_c*); static bool daSwc00_IsDelete(daSwc00_c*); static bool daSwc00_Delete(daSwc00_c*); static void daSwc00_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3991; -extern "C" extern u32 const lit_3992; -extern "C" extern u32 const lit_3993; -extern "C" extern u32 const lit_3994; -extern "C" extern u32 const lit_3995; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_SWC00[12]; extern "C" static void hitCheck__FP9daSwc00_c(); extern "C" static void daSwc00_Execute__FP9daSwc00_c(); @@ -91,11 +83,6 @@ void mDoMtx_YrotS(f32 (*)[4], s16); void fopAcM_delete(fopAc_ac_c*); void fopAcM_searchActorDistanceXZ2(fopAc_ac_c const*, fopAc_ac_c const*); void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_805A1F28[4]; extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_swc00/executor.cpp b/rel/d/a/d_a_swc00/executor.cpp index 3e47c79e49b..b4c6e17f918 100644 --- a/rel/d/a/d_a_swc00/executor.cpp +++ b/rel/d/a/d_a_swc00/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A1D8C[4]; -extern u8 const data_805A1D90[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_swc00/unknown_translation_unit_bss.cpp b/rel/d/a/d_a_swc00/unknown_translation_unit_bss.cpp index b04489e60b2..051e637514c 100644 --- a/rel/d/a/d_a_swc00/unknown_translation_unit_bss.cpp +++ b/rel/d/a/d_a_swc00/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_805A1F28[4]; -extern "C" extern u8 data_805A1F28[4]; - // // External References: // diff --git a/rel/d/a/d_a_swc00/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_swc00/unknown_translation_unit_ctors.cpp index a3658b6f1ef..f775d276bec 100644 --- a/rel/d/a/d_a_swc00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_swc00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A1D8C[4]; -extern u8 const data_805A1D8C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A1D8C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A1D8C-805A1D90 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A1D8C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swc00/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_swc00/unknown_translation_unit_dtors.cpp index f41e2f50a9a..f7c56d8e1c5 100644 --- a/rel/d/a/d_a_swc00/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_swc00/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A1D90[4]; -extern u8 const data_805A1D90[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A1D90[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A1D90-805A1D94 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A1D90[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swhit0/d_a_swhit0.cpp b/rel/d/a/d_a_swhit0/d_a_swhit0.cpp index 6b3cb6faf24..60517cb1afb 100644 --- a/rel/d/a/d_a_swhit0/d_a_swhit0.cpp +++ b/rel/d/a/d_a_swhit0/d_a_swhit0.cpp @@ -72,10 +72,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A441C */ void setLightTevColorType(J3DModelData*, dKy_tevstr_c*); @@ -161,7 +161,6 @@ static void daSwhit0_Execute(daSwhit0_c*); static void daSwhit0_Delete(daSwhit0_c*); static void daSwhit0_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern void* g_profile_SWHIT0[12]; extern "C" void getSwNo__10daSwhit0_cFv(); extern "C" void getSwNo2__10daSwhit0_cFv(); @@ -212,18 +211,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/d_a_swhit0/executor.cpp b/rel/d/a/d_a_swhit0/executor.cpp index fe67df32a45..6c718332698 100644 --- a/rel/d/a/d_a_swhit0/executor.cpp +++ b/rel/d/a/d_a_swhit0/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80487368[4]; -extern u8 const data_8048736C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_swhit0/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_swhit0/unknown_translation_unit_ctors.cpp index 432de75b54f..e68e9f19359 100644 --- a/rel/d/a/d_a_swhit0/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_swhit0/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80487368[4]; -extern u8 const data_80487368[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80487368[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80487368-8048736C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80487368[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_swhit0/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_swhit0/unknown_translation_unit_dtors.cpp index c195d72144c..07c2c1c3d50 100644 --- a/rel/d/a/d_a_swhit0/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_swhit0/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048736C[4]; -extern u8 const data_8048736C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048736C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048736C-80487370 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048736C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_talk/d_a_talk.cpp b/rel/d/a/d_a_talk/d_a_talk.cpp index b51b0e7fde2..859c1c4c800 100644 --- a/rel/d/a/d_a_talk/d_a_talk.cpp +++ b/rel/d/a/d_a_talk/d_a_talk.cpp @@ -54,7 +54,6 @@ static void daTalk_Create(fopAc_ac_c*); static void daTalk_Delete(daTalk_c*); static void daTalk_Execute(daTalk_c*); static void daTalk_Draw(daTalk_c*); -extern "C" extern void* g_profile_TALK[12]; extern "C" void __dt__8daTalk_cFv(); extern "C" void create__8daTalk_cFv(); @@ -77,10 +76,6 @@ void fopAcM_delete(fopAc_ac_c*); void fopAcM_searchActorDistanceXZ(fopAc_ac_c const*, fopAc_ac_c const*); void fopMsgM_messageSet(u32, fopAc_ac_c*, u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/d_a_talk/executor.cpp b/rel/d/a/d_a_talk/executor.cpp index 83ace89c888..424d89a8cef 100644 --- a/rel/d/a/d_a_talk/executor.cpp +++ b/rel/d/a/d_a_talk/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D6676C[4]; -extern u8 const data_80D66770[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_talk/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_talk/unknown_translation_unit_ctors.cpp index 615d73a72fb..817df2ffe8f 100644 --- a/rel/d/a/d_a_talk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_talk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D6676C[4]; -extern u8 const data_80D6676C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D6676C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D6676C-80D66770 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D6676C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_talk/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_talk/unknown_translation_unit_dtors.cpp index 3bebecfa095..a6946eebb86 100644 --- a/rel/d/a/d_a_talk/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_talk/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D66770[4]; -extern u8 const data_80D66770[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D66770[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D66770-80D66774 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D66770[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_tbox/d_a_tbox.cpp b/rel/d/a/d_a_tbox/d_a_tbox.cpp index 00a70a454ef..43159b196b1 100644 --- a/rel/d/a/d_a_tbox/d_a_tbox.cpp +++ b/rel/d/a/d_a_tbox/d_a_tbox.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 80490DCC */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -197,12 +197,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -383,48 +383,6 @@ static void daTbox_create1st(daTbox_c*); static void daTbox_MoveBGDelete(daTbox_c*); static void daTbox_MoveBGExecute(daTbox_c*); static void daTbox_MoveBGDraw(daTbox_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_TBOX[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80496934[4]; -extern "C" extern u8 data_80496938[4]; -extern "C" extern u8 data_8049693C[4]; -extern "C" extern u8 data_80496940[4]; -extern "C" extern u8 data_80496944[4]; -extern "C" extern u8 data_80496948[4]; -extern "C" extern u8 data_8049694C[4]; -extern "C" extern u8 data_80496950[4]; -extern "C" extern u8 data_80496954[4]; -extern "C" extern u8 data_80496958[4]; -extern "C" extern u8 data_8049695C[4]; -extern "C" extern u8 data_80496960[4]; -extern "C" extern u8 data_80496964[4]; -extern "C" extern u8 data_80496968[4]; -extern "C" extern u8 data_8049696C[4]; -extern "C" extern u8 data_80496970[4]; -extern "C" extern u8 data_80496974[4]; -extern "C" extern u8 data_80496978[4]; -extern "C" extern u8 data_8049697C[4]; -extern "C" extern u8 data_80496980[4]; -extern "C" extern u8 data_80496984[4]; -extern "C" extern u8 data_80496988[4]; -extern "C" extern u8 data_8049698C[4]; -extern "C" extern u8 data_80496990[4]; -extern "C" extern u8 data_80496994[4]; extern "C" void __ct__12daTbox_HIO_cFv(); extern "C" void __dt__4cXyzFv(); @@ -594,26 +552,6 @@ void cLib_chaseS(s16*, s16, s16); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/d_a_tbox/executor.cpp b/rel/d/a/d_a_tbox/executor.cpp index 58165a58eac..3193b59f53d 100644 --- a/rel/d/a/d_a_tbox/executor.cpp +++ b/rel/d/a/d_a_tbox/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804961C0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_tbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_tbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2a688a560e5..1fcec599685 100644 --- a/rel/d/a/d_a_tbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_tbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804961CC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804961CC-804961D4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804961CC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80496890-80496898 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_tbox/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_tbox/unknown_translation_unit_ctors.cpp index ba119928934..f66ffc6a8fa 100644 --- a/rel/d/a/d_a_tbox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_tbox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804961C0[2]; -extern void* const data_804961C0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tbox_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804961C0-804961C8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804961C0[2] = { + (void*)__sinit_d_a_tbox_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp index 512b6c93cd2..38c2b112156 100644 --- a/rel/d/a/d_a_tbox2/d_a_tbox2.cpp +++ b/rel/d/a/d_a_tbox2/d_a_tbox2.cpp @@ -238,8 +238,6 @@ static void daTbox2_create1st(daTbox2_c*); static void daTbox2_MoveBGDelete(daTbox2_c*); static void daTbox2_MoveBGExecute(daTbox2_c*); static void daTbox2_MoveBGDraw(daTbox2_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_TBOX2[12]; extern "C" void initBaseMtx__9daTbox2_cFv(); extern "C" void setBaseMtx__9daTbox2_cFv(); @@ -302,21 +300,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void dKy_set_allcol_ratio(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80498480[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_tbox2/executor.cpp b/rel/d/a/d_a_tbox2/executor.cpp index 7fd499d57c3..3df0bd87c4d 100644 --- a/rel/d/a/d_a_tbox2/executor.cpp +++ b/rel/d/a/d_a_tbox2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80498158[4]; -extern u8 const data_8049815C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp b/rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp index f0f45faa2c8..6103332a16f 100644 --- a/rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp +++ b/rel/d/a/d_a_tbox2/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80498480[4]; -extern "C" extern u8 struct_80498480[4]; - // // External References: // diff --git a/rel/d/a/d_a_tbox2/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_tbox2/unknown_translation_unit_ctors.cpp index a1d9b7f221a..83fb7f8c2d2 100644 --- a/rel/d/a/d_a_tbox2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_tbox2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80498158[4]; -extern u8 const data_80498158[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80498158[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80498158-8049815C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80498158[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_tbox2/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_tbox2/unknown_translation_unit_dtors.cpp index 52da8a6a592..dd18d0c011d 100644 --- a/rel/d/a/d_a_tbox2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_tbox2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8049815C[4]; -extern u8 const data_8049815C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8049815C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8049815C-80498160 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8049815C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp b/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp index 316bbbaf517..6e8988df3eb 100644 --- a/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp +++ b/rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp @@ -39,7 +39,6 @@ static void daTboxSw_Draw(daTboxSw_c*); static void daTboxSw_Execute(daTboxSw_c*); static void daTboxSw_Delete(daTboxSw_c*); static void daTboxSw_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_TBOX_SW[12]; extern "C" bool Create__10daTboxSw_cFv(); extern "C" void create__10daTboxSw_cFv(); @@ -57,9 +56,6 @@ extern "C" extern void* g_profile_TBOX_SW[12]; // void fopAcM_delete(fopAc_ac_c*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_delete__FP10fopAc_ac_c(); diff --git a/rel/d/a/d_a_tboxSw/executor.cpp b/rel/d/a/d_a_tboxSw/executor.cpp index 94124050629..473f1c48897 100644 --- a/rel/d/a/d_a_tboxSw/executor.cpp +++ b/rel/d/a/d_a_tboxSw/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D669C8[4]; -extern u8 const data_80D669CC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_tboxSw/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_tboxSw/unknown_translation_unit_ctors.cpp index 291dc38cc5c..64073e3bb06 100644 --- a/rel/d/a/d_a_tboxSw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_tboxSw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D669C8[4]; -extern u8 const data_80D669C8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D669C8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D669C8-80D669CC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D669C8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_tboxSw/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_tboxSw/unknown_translation_unit_dtors.cpp index 7c6615251ad..53f26358dec 100644 --- a/rel/d/a/d_a_tboxSw/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_tboxSw/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D669CC[4]; -extern u8 const data_80D669CC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D669CC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D669CC-80D669D0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D669CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_title/d_a_title.cpp b/rel/d/a/d_a_title/d_a_title.cpp index 4ca625968ca..e08b3d76df7 100644 --- a/rel/d/a/d_a_title/d_a_title.cpp +++ b/rel/d/a/d_a_title/d_a_title.cpp @@ -177,9 +177,6 @@ static void daTitle_Draw(daTitle_c*); static void daTitle_Execute(daTitle_c*); static void daTitle_Delete(daTitle_c*); static void daTitle_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_TITLE[12]; extern "C" void __ct__11daTit_HIO_cFv(); extern "C" void CreateHeap__9daTitle_cFv(); @@ -234,18 +231,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_blackColor; -extern "C" extern u32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 mProcID__20dStage_roomControl_c[4]; -extern "C" extern u8 m_object__7dDemo_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss(); diff --git a/rel/d/a/d_a_title/executor.cpp b/rel/d/a/d_a_title/executor.cpp index 0fcf8757ac4..e34dacd1bfc 100644 --- a/rel/d/a/d_a_title/executor.cpp +++ b/rel/d/a/d_a_title/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D67BC0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_title/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_title/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index db450b22c1b..8ccb347fbc2 100644 --- a/rel/d/a/d_a_title/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_title/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D67BCC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D67BCC-80D67BD4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D67BCC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D67D78-80D67D80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_title/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_title/unknown_translation_unit_ctors.cpp index 02ea1e8d529..cf4dfb2456d 100644 --- a/rel/d/a/d_a_title/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_title/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D67BC0[2]; -extern void* const data_80D67BC0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_title_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D67BC0-80D67BC8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D67BC0[2] = { + (void*)__sinit_d_a_title_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp index da45de38b77..185f0684722 100644 --- a/rel/d/a/d_a_vrbox/d_a_vrbox.cpp +++ b/rel/d/a/d_a_vrbox/d_a_vrbox.cpp @@ -36,8 +36,6 @@ static bool daVrbox_IsDelete(vrbox_class*); static bool daVrbox_Delete(vrbox_class*); static void daVrbox_solidHeapCB(fopAc_ac_c*); static void daVrbox_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_VRBOX[12]; extern "C" static void daVrbox_Draw__FP11vrbox_class(); extern "C" static void daVrbox_color_set__FP11vrbox_class(); @@ -58,13 +56,6 @@ void mDoExt_J3DModel__create(J3DModelData*, u32, u32); void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void dComIfG_getStageRes(char const*); void dKy_GxFog_set(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); diff --git a/rel/d/a/d_a_vrbox/executor.cpp b/rel/d/a/d_a_vrbox/executor.cpp index c1595d7f343..0a9bb103e9e 100644 --- a/rel/d/a/d_a_vrbox/executor.cpp +++ b/rel/d/a/d_a_vrbox/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80498988[4]; -extern u8 const data_8049898C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_vrbox/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_vrbox/unknown_translation_unit_ctors.cpp index 72aab124d83..15ef2c2e1ca 100644 --- a/rel/d/a/d_a_vrbox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_vrbox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80498988[4]; -extern u8 const data_80498988[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80498988[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80498988-8049898C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80498988[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_vrbox/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_vrbox/unknown_translation_unit_dtors.cpp index e7afe2662fe..7dcfa137d03 100644 --- a/rel/d/a/d_a_vrbox/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_vrbox/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8049898C[4]; -extern u8 const data_8049898C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8049898C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8049898C-80498990 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8049898C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp index cc16472ebbc..9ac2e5fdcff 100644 --- a/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp +++ b/rel/d/a/d_a_vrbox2/d_a_vrbox2.cpp @@ -65,8 +65,6 @@ static bool daVrbox2_IsDelete(vrbox2_class*); static bool daVrbox2_Delete(vrbox2_class*); static void daVrbox2_solidHeapCB(fopAc_ac_c*); static void daVrbox2_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_VRBOX2[12]; extern "C" static void texScrollCheck__FRf(); extern "C" static void daVrbox2_Draw__FP12vrbox2_class(); @@ -102,13 +100,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_vrbox2/executor.cpp b/rel/d/a/d_a_vrbox2/executor.cpp index 42cb4e69371..f19923bced8 100644 --- a/rel/d/a/d_a_vrbox2/executor.cpp +++ b/rel/d/a/d_a_vrbox2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80499A64[4]; -extern u8 const data_80499A68[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_vrbox2/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_vrbox2/unknown_translation_unit_ctors.cpp index a6edc00680e..f19cdac120f 100644 --- a/rel/d/a/d_a_vrbox2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_vrbox2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80499A64[4]; -extern u8 const data_80499A64[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80499A64[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80499A64-80499A68 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80499A64[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_vrbox2/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_vrbox2/unknown_translation_unit_dtors.cpp index 5429da9e5bb..0435172aea9 100644 --- a/rel/d/a/d_a_vrbox2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_vrbox2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80499A68[4]; -extern u8 const data_80499A68[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80499A68[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80499A68-80499A6C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80499A68[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp b/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp index d0617fbf298..a9239e45d6c 100644 --- a/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp +++ b/rel/d/a/d_a_warp_bug/d_a_warp_bug.cpp @@ -60,8 +60,6 @@ static void daWarpBug_Execute(daWarpBug_c*); static bool daWarpBug_IsDelete(daWarpBug_c*); static void daWarpBug_Delete(daWarpBug_c*); static void daWarpBug_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_WarpBug[12]; extern "C" void create_init__11daWarpBug_cFv(); extern "C" static void createSolidHeap__FP10fopAc_ac_c(); @@ -85,10 +83,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); diff --git a/rel/d/a/d_a_warp_bug/executor.cpp b/rel/d/a/d_a_warp_bug/executor.cpp index 1656411bcc0..e257df7dd17 100644 --- a/rel/d/a/d_a_warp_bug/executor.cpp +++ b/rel/d/a/d_a_warp_bug/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D681D4[4]; -extern u8 const data_80D681D8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_warp_bug/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_warp_bug/unknown_translation_unit_ctors.cpp index 25487e71145..2523fc79c45 100644 --- a/rel/d/a/d_a_warp_bug/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_warp_bug/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D681D4[4]; -extern u8 const data_80D681D4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D681D4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D681D4-80D681D8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D681D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_warp_bug/unknown_translation_unit_dtors.cpp b/rel/d/a/d_a_warp_bug/unknown_translation_unit_dtors.cpp index fbbf58f9483..b6d46d33eb7 100644 --- a/rel/d/a/d_a_warp_bug/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/d_a_warp_bug/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D681D8[4]; -extern u8 const data_80D681D8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D681D8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D681D8-80D681DC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D681D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/d_a_ykgr/d_a_ykgr.cpp b/rel/d/a/d_a_ykgr/d_a_ykgr.cpp index 42147f0d6f4..c84248fc62a 100644 --- a/rel/d/a/d_a_ykgr/d_a_ykgr.cpp +++ b/rel/d/a/d_a_ykgr/d_a_ykgr.cpp @@ -29,14 +29,14 @@ struct daYkgr_HIO_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -75,48 +75,6 @@ static bool daYkgrDelete(void*); static void daYkgrExecute(void*); static void daYkgrDraw(void*); static bool daYkgrIsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Ykgr[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_805A9158[4]; -extern "C" extern u8 data_805A915C[4]; -extern "C" extern u8 data_805A9160[4]; -extern "C" extern u8 data_805A9164[4]; -extern "C" extern u8 data_805A9168[4]; -extern "C" extern u8 data_805A916C[4]; -extern "C" extern u8 data_805A9170[4]; -extern "C" extern u8 data_805A9174[4]; -extern "C" extern u8 data_805A9178[4]; -extern "C" extern u8 data_805A917C[4]; -extern "C" extern u8 data_805A9180[4]; -extern "C" extern u8 data_805A9184[4]; -extern "C" extern u8 data_805A9188[4]; -extern "C" extern u8 data_805A918C[4]; -extern "C" extern u8 data_805A9190[4]; -extern "C" extern u8 data_805A9194[4]; -extern "C" extern u8 data_805A9198[4]; -extern "C" extern u8 data_805A919C[4]; -extern "C" extern u8 data_805A91A0[4]; -extern "C" extern u8 data_805A91A4[4]; -extern "C" extern u8 data_805A91A8[4]; -extern "C" extern u8 data_805A91AC[4]; -extern "C" extern u8 data_805A91B0[4]; -extern "C" extern u8 data_805A91B4[4]; -extern "C" extern u8 data_805A91B8[4]; extern "C" void draw__17dPa_YkgrPcallBackFP14JPABaseEmitterP15JPABaseParticle(); extern "C" void setParam__17dPa_YkgrPcallBackFf(); @@ -189,16 +147,6 @@ void cM_atan2s(f32, f32); void cLib_addCalc2(f32*, f32, f32, f32); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D8C[4]; -extern "C" extern u8 m_aim_rate__8daYkgr_c[4]; -extern "C" extern u8 m_path__8daYkgr_c[4]; -extern "C" extern u8 m_emitter__8daYkgr_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/d_a_ykgr/executor.cpp b/rel/d/a/d_a_ykgr/executor.cpp index c099aad4919..841d57a620b 100644 --- a/rel/d/a/d_a_ykgr/executor.cpp +++ b/rel/d/a/d_a_ykgr/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805A8FA8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/d_a_ykgr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/d_a_ykgr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6273aa32943..2eb97a0c3c0 100644 --- a/rel/d/a/d_a_ykgr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/d_a_ykgr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805A8FB4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805A8FB4-805A8FBC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805A8FB4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805A90B0-805A90B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/d_a_ykgr/unknown_translation_unit_ctors.cpp b/rel/d/a/d_a_ykgr/unknown_translation_unit_ctors.cpp index 9580eff806a..71e476d9a3a 100644 --- a/rel/d/a/d_a_ykgr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/d_a_ykgr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805A8FA8[2]; -extern void* const data_805A8FA8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_ykgr_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A8FA8-805A8FB0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805A8FA8[2] = { + (void*)__sinit_d_a_ykgr_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp index 9da9e35bb79..849ae9ae4cd 100644 --- a/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp +++ b/rel/d/a/door/d_a_door_boss/d_a_door_boss.cpp @@ -204,13 +204,6 @@ static void daBdoor_Draw(daBdoor_c*); static void daBdoor_Execute(daBdoor_c*); static void daBdoor_Delete(daBdoor_c*); static void daBdoor_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3934; -extern "C" extern u32 const lit_3935; -extern "C" extern u32 const lit_3936; -extern "C" extern u32 const lit_3937; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_BOSS_DOOR[12]; extern "C" void getArcName__9daBdoor_cFv(); extern "C" void getBmd__9daBdoor_cFv(); @@ -270,15 +263,6 @@ void dComIfG_getStageRes(char const*); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80670BB0[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/door/d_a_door_boss/executor.cpp b/rel/d/a/door/d_a_door_boss/executor.cpp index 2b04ecb0fb3..65621200cf8 100644 --- a/rel/d/a/door/d_a_door_boss/executor.cpp +++ b/rel/d/a/door/d_a_door_boss/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8067090C[4]; -extern u8 const data_80670910[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_boss/unknown_translation_unit_bss.cpp b/rel/d/a/door/d_a_door_boss/unknown_translation_unit_bss.cpp index 9715f62a201..8e1d66dfa83 100644 --- a/rel/d/a/door/d_a_door_boss/unknown_translation_unit_bss.cpp +++ b/rel/d/a/door/d_a_door_boss/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80670BB0[4]; -extern "C" extern u8 data_80670BB0[4]; - // // External References: // diff --git a/rel/d/a/door/d_a_door_boss/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_boss/unknown_translation_unit_ctors.cpp index 9e56b8e8020..67bcb663f90 100644 --- a/rel/d/a/door/d_a_door_boss/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_boss/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8067090C[4]; -extern u8 const data_8067090C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8067090C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8067090C-80670910 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8067090C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_boss/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_boss/unknown_translation_unit_dtors.cpp index 7754dd36b91..73d02104dde 100644 --- a/rel/d/a/door/d_a_door_boss/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_boss/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80670910[4]; -extern u8 const data_80670910[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80670910[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80670910-80670914 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80670910[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp b/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp index 696a57d7c7e..8df1ec9e134 100644 --- a/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp +++ b/rel/d/a/door/d_a_door_bossL5/d_a_door_bossL5.cpp @@ -208,9 +208,6 @@ static void daBdoorL5_Execute(daBdoorL5_c*); static void daBdoorL5_Delete(daBdoorL5_c*); static void daBdoorL5_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_L5BOSS_DOOR[12]; extern "C" void getArcName__11daBdoorL5_cFv(); extern "C" void getAlwaysArcName__11daBdoorL5_cFv(); @@ -282,16 +279,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_806727A0[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/door/d_a_door_bossL5/executor.cpp b/rel/d/a/door/d_a_door_bossL5/executor.cpp index 7d197557388..380e3cf5c6a 100644 --- a/rel/d/a/door/d_a_door_bossL5/executor.cpp +++ b/rel/d/a/door/d_a_door_bossL5/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_806724C0[4]; -extern u8 const data_806724C4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.cpp b/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.cpp index 23818db4cb3..93de270c648 100644 --- a/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.cpp +++ b/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_806727A0[4]; -extern "C" extern u8 data_806727A0[4]; - // // External References: // diff --git a/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_ctors.cpp index 7273e3570f3..5f4b4648116 100644 --- a/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_806724C0[4]; -extern u8 const data_806724C0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_806724C0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806724C0-806724C4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_806724C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_dtors.cpp index 843c73d0195..75c3295b117 100644 --- a/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_bossL5/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_806724C4[4]; -extern u8 const data_806724C4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_806724C4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 806724C4-806724C8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_806724C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp b/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp index a1efdeda766..d6b24d79f5f 100644 --- a/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp +++ b/rel/d/a/door/d_a_door_bossl1/d_a_door_bossL1.cpp @@ -137,12 +137,12 @@ struct dPa_levelEcallBack {}; struct csXyz {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -241,8 +241,6 @@ static void daBdoorL1_Execute(daBdoorL1_c*); static void daBdoorL1_Delete(daBdoorL1_c*); static void daBdoorL1_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_L1BOSS_DOOR[12]; extern "C" static void getNowLevel__Fv(); extern "C" void getDoorEventName__11daBdoorL1_cFv(); @@ -320,17 +318,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_804E50A8[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/door/d_a_door_bossl1/executor.cpp b/rel/d/a/door/d_a_door_bossl1/executor.cpp index 6b4ba5a322b..37caf8f211a 100644 --- a/rel/d/a/door/d_a_door_bossl1/executor.cpp +++ b/rel/d/a/door/d_a_door_bossl1/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804E4A0C[4]; -extern u8 const data_804E4A10[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_bss.cpp b/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_bss.cpp index 8497da7c863..31767b2aec5 100644 --- a/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_bss.cpp +++ b/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_804E50A8[4]; -extern "C" extern u8 data_804E50A8[4]; - // // External References: // diff --git a/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_ctors.cpp index 41a4370095a..494fcef8e35 100644 --- a/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804E4A0C[4]; -extern u8 const data_804E4A0C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804E4A0C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804E4A0C-804E4A10 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804E4A0C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_dtors.cpp index 9a5d990b292..6444ef50f97 100644 --- a/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_bossl1/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804E4A10[4]; -extern u8 const data_804E4A10[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804E4A10[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804E4A10-804E4A14 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804E4A10[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp index 6fdec4debfb..6941e7a6658 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/d_a_door_dbdoor00.cpp @@ -60,16 +60,16 @@ struct dStage_roomControl_c { /* 800244E8 */ void checkRoomDisp(int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -145,12 +145,6 @@ static void daDbdoor00_Execute(daDbDoor00_c*); static bool daDbdoor00_IsDelete(daDbDoor00_c*); static void daDbdoor00_Delete(daDbDoor00_c*); static void daDbdoor00_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3953; -extern "C" extern u32 const lit_3954; -extern "C" extern u32 const lit_3955; -extern "C" extern u32 const lit_3956; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_DBDOOR[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" void getAlwaysArcName__12daDbDoor00_cFv(); @@ -207,15 +201,6 @@ void dComIfGp_getReverb(int); void dComIfG_getStageRes(char const*); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/door/d_a_door_dbdoor00/executor.cpp b/rel/d/a/door/d_a_door_dbdoor00/executor.cpp index 0486db15509..f086f08a595 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/executor.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8045E52C[4]; -extern u8 const data_8045E530[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_dbdoor00/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_dbdoor00/unknown_translation_unit_ctors.cpp index 222c5fc3956..024bab86d46 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8045E52C[4]; -extern u8 const data_8045E52C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8045E52C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8045E52C-8045E530 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8045E52C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_dbdoor00/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_dbdoor00/unknown_translation_unit_dtors.cpp index a44eb2da2f8..46d718fd823 100644 --- a/rel/d/a/door/d_a_door_dbdoor00/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_dbdoor00/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8045E530[4]; -extern u8 const data_8045E530[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8045E530[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8045E530-8045E534 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8045E530[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp b/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp index 8b9543f1a70..ffa1375de48 100644 --- a/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp +++ b/rel/d/a/door/d_a_door_knob00/d_a_door_knob00.cpp @@ -183,8 +183,6 @@ static void daKnob20_Draw(daKnob20_c*); static void daKnob20_Execute(daKnob20_c*); static void daKnob20_Delete(daKnob20_c*); static void daKnob20_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_KNOB20[12]; extern "C" void getDoorModel__12knob_param_cFP10fopAc_ac_c(); extern "C" void getDoorLightInf__12knob_param_cFP10fopAc_ac_c(); @@ -253,16 +251,6 @@ void dComIfG_getStageRes(char const*); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/door/d_a_door_knob00/executor.cpp b/rel/d/a/door/d_a_door_knob00/executor.cpp index f458be66117..88a620189cb 100644 --- a/rel/d/a/door/d_a_door_knob00/executor.cpp +++ b/rel/d/a/door/d_a_door_knob00/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80460660[4]; -extern u8 const data_80460664[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_knob00/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_knob00/unknown_translation_unit_ctors.cpp index f9069e47d6d..312fef12654 100644 --- a/rel/d/a/door/d_a_door_knob00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_knob00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80460660[4]; -extern u8 const data_80460660[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80460660[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80460660-80460664 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80460660[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_knob00/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_knob00/unknown_translation_unit_dtors.cpp index fe5b6d725fe..ebb0a9a4124 100644 --- a/rel/d/a/door/d_a_door_knob00/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_knob00/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80460664[4]; -extern u8 const data_80460664[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80460664[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80460664-80460668 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80460664[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp index 5b78da9d89b..267bd50be1e 100644 --- a/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/d_a_door_mbossL1.cpp @@ -171,12 +171,12 @@ struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -297,12 +297,6 @@ static void daMBdoorL1_Execute(daMBdoorL1_c*); static void daMBdoorL1_Delete(daMBdoorL1_c*); static void daMBdoorL1_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 const lit_4675; -extern "C" extern u32 const lit_4677; -extern "C" extern u32 const lit_5279; -extern "C" extern u32 const lit_5280; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_L1MBOSS_DOOR[12]; extern "C" static void getNowLevel__FP10fopAc_ac_c(); extern "C" static void searchStop__FPvPv(); @@ -424,18 +418,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80677D38[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/door/d_a_door_mbossL1/executor.cpp b/rel/d/a/door/d_a_door_mbossL1/executor.cpp index 4761a3f3fdc..c99896c69f1 100644 --- a/rel/d/a/door/d_a_door_mbossL1/executor.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80677550[4]; -extern u8 const data_80677554[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_bss.cpp b/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_bss.cpp index 93021a33218..b87f27cfd97 100644 --- a/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_bss.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80677D38[4]; -extern "C" extern u8 data_80677D38[4]; - // // External References: // diff --git a/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_ctors.cpp index d27fd298bfe..cb8e7dd38ff 100644 --- a/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80677550[4]; -extern u8 const data_80677550[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80677550[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80677550-80677554 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80677550[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_dtors.cpp index eede43c1c3e..37e9d9dea55 100644 --- a/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_mbossL1/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80677554[4]; -extern u8 const data_80677554[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80677554[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80677554-80677558 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80677554[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp index 770179e24d7..a2a3908c34d 100644 --- a/rel/d/a/door/d_a_door_push/d_a_door_push.cpp +++ b/rel/d/a/door/d_a_door_push/d_a_door_push.cpp @@ -137,10 +137,6 @@ static void daDoorPush_MoveBGDelete(daDoorPush_c*); static void daDoorPush_MoveBGExecute(daDoorPush_c*); static void daDoorPush_MoveBGDraw(daDoorPush_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 const lit_3985; -extern "C" extern u32 const lit_3986; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_PushDoor[12]; extern "C" static void PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); extern "C" static void PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); @@ -193,15 +189,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80679070[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/door/d_a_door_push/executor.cpp b/rel/d/a/door/d_a_door_push/executor.cpp index 117784b642b..d4e93e56025 100644 --- a/rel/d/a/door/d_a_door_push/executor.cpp +++ b/rel/d/a/door/d_a_door_push/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80678EC4[4]; -extern u8 const data_80678EC8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp b/rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp index 2e75b743c1d..5902ac86ad8 100644 --- a/rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp +++ b/rel/d/a/door/d_a_door_push/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80679070[4]; -extern "C" extern u8 struct_80679070[4]; - // // External References: // diff --git a/rel/d/a/door/d_a_door_push/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_push/unknown_translation_unit_ctors.cpp index 3236ff5d9ec..fcb4cb060ee 100644 --- a/rel/d/a/door/d_a_door_push/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_push/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80678EC4[4]; -extern u8 const data_80678EC4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80678EC4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80678EC4-80678EC8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80678EC4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_push/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_push/unknown_translation_unit_dtors.cpp index 124745c2b7d..750c52733e7 100644 --- a/rel/d/a/door/d_a_door_push/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_push/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80678EC8[4]; -extern u8 const data_80678EC8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80678EC8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80678EC8-80678ECC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80678EC8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp index 1e6f62a7edc..3826e5e4868 100644 --- a/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp +++ b/rel/d/a/door/d_a_door_shutter/d_a_door_shutter.cpp @@ -195,12 +195,12 @@ struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -333,11 +333,6 @@ static void daDoor20_Execute(daDoor20_c*); static void daDoor20_Delete(daDoor20_c*); static void daDoor20_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 const lit_5338; -extern "C" extern u32 const lit_5339; -extern "C" extern u32 const lit_5340; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_DOOR20[12]; extern "C" void getStopBmdName__10daDoor20_cFv(); extern "C" void getStopModelData__10daDoor20_cFv(); @@ -464,19 +459,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 mNextRoomNo__10dMapInfo_c; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/door/d_a_door_shutter/executor.cpp b/rel/d/a/door/d_a_door_shutter/executor.cpp index 91b6c9e8fed..c341d799f43 100644 --- a/rel/d/a/door/d_a_door_shutter/executor.cpp +++ b/rel/d/a/door/d_a_door_shutter/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80466818[4]; -extern u8 const data_8046681C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_shutter/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_shutter/unknown_translation_unit_ctors.cpp index 3521708dc29..dadb8a09c95 100644 --- a/rel/d/a/door/d_a_door_shutter/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_shutter/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80466818[4]; -extern u8 const data_80466818[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80466818[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80466818-8046681C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80466818[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_shutter/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_shutter/unknown_translation_unit_dtors.cpp index b83cfc5b0dd..b67453f2803 100644 --- a/rel/d/a/door/d_a_door_shutter/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_shutter/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046681C[4]; -extern u8 const data_8046681C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8046681C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8046681C-80466820 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8046681C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp b/rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp index a72cdc96b91..d41c1beb7cd 100644 --- a/rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp +++ b/rel/d/a/door/d_a_door_spiral/d_a_door_spiral.cpp @@ -13,8 +13,6 @@ extern "C" extern void* g_profile_SPIRAL_DOOR[12]; -extern "C" extern void* g_profile_SPIRAL_DOOR[12]; - // // External References: // @@ -22,9 +20,6 @@ extern "C" extern void* g_profile_SPIRAL_DOOR[12]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/rel/d/a/door/d_a_door_spiral/executor.cpp b/rel/d/a/door/d_a_door_spiral/executor.cpp index ff856b825b4..7d1c3203df4 100644 --- a/rel/d/a/door/d_a_door_spiral/executor.cpp +++ b/rel/d/a/door/d_a_door_spiral/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804673D8[4]; -extern u8 const data_804673DC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/door/d_a_door_spiral/unknown_translation_unit_ctors.cpp b/rel/d/a/door/d_a_door_spiral/unknown_translation_unit_ctors.cpp index 8639fd14ebe..8f01973c88b 100644 --- a/rel/d/a/door/d_a_door_spiral/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/door/d_a_door_spiral/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804673D8[4]; -extern u8 const data_804673D8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804673D8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804673D8-804673DC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804673D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/door/d_a_door_spiral/unknown_translation_unit_dtors.cpp b/rel/d/a/door/d_a_door_spiral/unknown_translation_unit_dtors.cpp index a08f67d0b69..b35a3a4cad2 100644 --- a/rel/d/a/door/d_a_door_spiral/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/door/d_a_door_spiral/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804673DC[4]; -extern u8 const data_804673DC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804673DC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804673DC-804673E0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804673DC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp b/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp index 2633f0ce765..971b0bdfd9b 100644 --- a/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp +++ b/rel/d/a/e/d_a_e_ai/d_a_e_ai.cpp @@ -42,13 +42,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -258,9 +258,6 @@ static void daE_AI_Delete(e_ai_class*); static void useHeapInit(fopAc_ac_c*); static void daE_AI_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_AI[12]; extern "C" void __ct__12daE_AI_HIO_cFv(); extern "C" void initCcCylinder__10e_ai_classFv(); @@ -338,24 +335,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ai/executor.cpp b/rel/d/a/e/d_a_e_ai/executor.cpp index 25e4a55fc98..0771ca68cd5 100644 --- a/rel/d/a/e/d_a_e_ai/executor.cpp +++ b/rel/d/a/e/d_a_e_ai/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8067C3E8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ai/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ai/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 159407261cb..435eb9fb5f1 100644 --- a/rel/d/a/e/d_a_e_ai/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ai/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8067C3F4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8067C3F4-8067C3FC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8067C3F4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8067C690-8067C698 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ai/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ai/unknown_translation_unit_ctors.cpp index 482079616d7..37bb9365032 100644 --- a/rel/d/a/e/d_a_e_ai/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ai/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8067C3E8[2]; -extern void* const data_8067C3E8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ai_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8067C3E8-8067C3F0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8067C3E8[2] = { + (void*)__sinit_d_a_e_ai_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp b/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp index 96e88a4af31..2093d59e8da 100644 --- a/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp +++ b/rel/d/a/e/d_a_e_arrow/d_a_e_arrow.cpp @@ -26,8 +26,6 @@ struct fast_create_request {}; struct e_arrow_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -37,6 +35,8 @@ struct cXyz { /* 8067CB68 */ ~cXyz(); }; +struct csXyz {}; + struct daAlink_c { /* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int); /* 800DCA2C */ void checkWoodShieldEquipNotIronBall() const; @@ -222,50 +222,6 @@ static bool daE_ARROW_IsDelete(e_arrow_class*); static void daE_ARROW_Delete(e_arrow_class*); static void useHeapInit(fopAc_ac_c*); static void daE_ARROW_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_ARROW[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8067EB90[4]; -extern "C" extern u8 data_8067EB94[4]; -extern "C" extern u8 data_8067EB98[4]; -extern "C" extern u8 data_8067EB9C[4]; -extern "C" extern u8 data_8067EBA0[4]; -extern "C" extern u8 data_8067EBA4[4]; -extern "C" extern u8 data_8067EBA8[4]; -extern "C" extern u8 data_8067EBAC[4]; -extern "C" extern u8 data_8067EBB0[4]; -extern "C" extern u8 data_8067EBB4[4]; -extern "C" extern u8 data_8067EBB8[4]; -extern "C" extern u8 data_8067EBBC[4]; -extern "C" extern u8 data_8067EBC0[4]; -extern "C" extern u8 data_8067EBC4[4]; -extern "C" extern u8 data_8067EBC8[4]; -extern "C" extern u8 data_8067EBCC[4]; -extern "C" extern u8 data_8067EBD0[4]; -extern "C" extern u8 data_8067EBD4[4]; -extern "C" extern u8 data_8067EBD8[4]; -extern "C" extern u8 data_8067EBDC[4]; -extern "C" extern u8 data_8067EBE0[4]; -extern "C" extern u8 data_8067EBE4[4]; -extern "C" extern u8 data_8067EBE8[4]; -extern "C" extern u8 data_8067EBEC[4]; -extern "C" extern u8 data_8067EBF0[4]; -extern "C" extern u8 data_8067EBF4[4]; extern "C" static void daE_ARROW_Draw__FP13e_arrow_class(); extern "C" static void fire_eff_set__FP13e_arrow_class(); @@ -375,23 +331,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_arrow/executor.cpp b/rel/d/a/e/d_a_e_arrow/executor.cpp index 8244d132258..956a968261f 100644 --- a/rel/d/a/e/d_a_e_arrow/executor.cpp +++ b/rel/d/a/e/d_a_e_arrow/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8067E870[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_arrow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_arrow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f9fe04d5c88..32713a89aeb 100644 --- a/rel/d/a/e/d_a_e_arrow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_arrow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8067E878[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8067E878-8067E880 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8067E878[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8067EB10-8067EB18 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_arrow/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_arrow/unknown_translation_unit_ctors.cpp index f1882f61d56..060761d0076 100644 --- a/rel/d/a/e/d_a_e_arrow/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_arrow/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8067E870[4]; -extern u8 const data_8067E870[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8067E870[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8067E870-8067E874 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8067E870[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp b/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp index 1f881e9516a..eed7a70faf2 100644 --- a/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp +++ b/rel/d/a/e/d_a_e_ba/d_a_e_ba.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -239,9 +239,6 @@ static void daE_BA_Delete(e_ba_class*); static void useHeapInit(fopAc_ac_c*); static void daE_BA_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4747; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_BA[12]; extern "C" void __ct__12daE_BA_HIO_cFv(); extern "C" static void ba_disappear__FP10fopAc_ac_c(); @@ -323,21 +320,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ba/executor.cpp b/rel/d/a/e/d_a_e_ba/executor.cpp index a9871d4c4d3..232d009006a 100644 --- a/rel/d/a/e/d_a_e_ba/executor.cpp +++ b/rel/d/a/e/d_a_e_ba/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806823A8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ba/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ba/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3ca99a2e221..a502b63870c 100644 --- a/rel/d/a/e/d_a_e_ba/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ba/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806823B4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806823B4-806823BC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806823B4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80682630-80682638 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ba/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ba/unknown_translation_unit_ctors.cpp index 46eaf5675f8..c78349e11b2 100644 --- a/rel/d/a/e/d_a_e_ba/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ba/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806823A8[2]; -extern void* const data_806823A8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ba_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806823A8-806823B0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806823A8[2] = { + (void*)__sinit_d_a_e_ba_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp b/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp index 121538c92ec..9e206cac86c 100644 --- a/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp +++ b/rel/d/a/e/d_a_e_bee/d_a_e_bee.cpp @@ -187,47 +187,6 @@ static bool daE_Bee_IsDelete(e_bee_class*); static void daE_Bee_Delete(e_bee_class*); static void useHeapInit(fopAc_ac_c*); static void daE_Bee_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_BEE[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_806856B4[4]; -extern "C" extern u8 data_806856B8[4]; -extern "C" extern u8 data_806856BC[4]; -extern "C" extern u8 data_806856C0[4]; -extern "C" extern u8 data_806856C4[4]; -extern "C" extern u8 data_806856C8[4]; -extern "C" extern u8 data_806856CC[4]; -extern "C" extern u8 data_806856D0[4]; -extern "C" extern u8 data_806856D4[4]; -extern "C" extern u8 data_806856D8[4]; -extern "C" extern u8 data_806856DC[4]; -extern "C" extern u8 data_806856E0[4]; -extern "C" extern u8 data_806856E4[4]; -extern "C" extern u8 data_806856E8[4]; -extern "C" extern u8 data_806856EC[4]; -extern "C" extern u8 data_806856F0[4]; -extern "C" extern u8 data_806856F4[4]; -extern "C" extern u8 data_806856F8[4]; -extern "C" extern u8 data_806856FC[4]; -extern "C" extern u8 data_80685700[4]; -extern "C" extern u8 data_80685704[4]; -extern "C" extern u8 data_80685708[4]; -extern "C" extern u8 data_8068570C[4]; -extern "C" extern u8 data_80685710[4]; -extern "C" extern u8 data_80685714[4]; extern "C" void __ct__13daE_Bee_HIO_cFv(); extern "C" static void daE_Bee_Draw__FP11e_bee_class(); @@ -321,22 +280,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_bee/executor.cpp b/rel/d/a/e/d_a_e_bee/executor.cpp index a8821e88000..73282fe9586 100644 --- a/rel/d/a/e/d_a_e_bee/executor.cpp +++ b/rel/d/a/e/d_a_e_bee/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80685420[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_bee/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_bee/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 936ce68ec3f..d8d3f3928c1 100644 --- a/rel/d/a/e/d_a_e_bee/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_bee/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8068542C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8068542C-80685434 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8068542C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80685630-80685638 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_bee/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_bee/unknown_translation_unit_ctors.cpp index 0fcbf8a5413..66daae4c9a8 100644 --- a/rel/d/a/e/d_a_e_bee/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_bee/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80685420[2]; -extern void* const data_80685420[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_bee_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80685420-80685428 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80685420[2] = { + (void*)__sinit_d_a_e_bee_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp b/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp index 8ed70ed180f..fa985795b97 100644 --- a/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp +++ b/rel/d/a/e/d_a_e_bg/d_a_e_bg.cpp @@ -32,13 +32,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -58,10 +58,10 @@ struct fopAc_ac_c { struct fast_create_request {}; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_BG_c { /* 8068585C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 80685948 */ void JointCallBack(J3DJoint*, int); @@ -103,10 +103,10 @@ struct dStage_roomControl_c { /* 800244E8 */ void checkRoomDisp(int) const; }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -267,13 +267,6 @@ static bool daE_BG_IsDelete(daE_BG_c*); static void daE_BG_Delete(daE_BG_c*); static void useHeapInit(fopAc_ac_c*); static void daE_BG_Create(daE_BG_c*); -extern "C" extern u32 const lit_4647; -extern "C" extern u32 const lit_5095; -extern "C" extern u32 const lit_5096; -extern "C" extern u32 const lit_5097; -extern "C" extern u32 const lit_5158; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_BG[12]; extern "C" void __ct__12daE_BG_HIO_cFv(); extern "C" void ctrlJoint__8daE_BG_cFP8J3DJointP8J3DModel(); @@ -365,23 +358,6 @@ void cLib_distanceAngleS(s16, s16); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_bg/executor.cpp b/rel/d/a/e/d_a_e_bg/executor.cpp index e2105b458f0..7e77316aa9e 100644 --- a/rel/d/a/e/d_a_e_bg/executor.cpp +++ b/rel/d/a/e/d_a_e_bg/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8068A230[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_bg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_bg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 664b8568417..079fe38715d 100644 --- a/rel/d/a/e/d_a_e_bg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_bg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8068A23C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8068A23C-8068A244 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8068A23C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8068A4B0-8068A4B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_bg/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_bg/unknown_translation_unit_ctors.cpp index f4a486c10ba..ebedddeb039 100644 --- a/rel/d/a/e/d_a_e_bg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_bg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8068A230[2]; -extern void* const data_8068A230[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_bg_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8068A230-8068A238 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8068A230[2] = { + (void*)__sinit_d_a_e_bg_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp b/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp index 7d94f6d73d8..9c74669689b 100644 --- a/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp +++ b/rel/d/a/e/d_a_e_bi/d_a_e_bi.cpp @@ -20,13 +20,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -263,53 +263,6 @@ static void daE_BI_Delete(e_bi_class*); static void useHeapInit(fopAc_ac_c*); static void daE_BI_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4659; -extern "C" extern u32 const lit_4660; -extern "C" extern u32 const lit_4661; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_BI[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_4522[12 + 4 /* padding */]; -extern "C" extern u8 data_8068DB58[12]; -extern "C" extern u8 data_8068DB64[4]; -extern "C" extern u8 data_8068DB68[4]; -extern "C" extern u8 data_8068DB6C[4]; -extern "C" extern u8 data_8068DB70[4]; -extern "C" extern u8 data_8068DB74[4]; -extern "C" extern u8 data_8068DB78[4]; -extern "C" extern u8 data_8068DB7C[4]; -extern "C" extern u8 data_8068DB80[4]; -extern "C" extern u8 data_8068DB84[4]; -extern "C" extern u8 data_8068DB88[4]; -extern "C" extern u8 data_8068DB8C[4]; -extern "C" extern u8 data_8068DB90[4]; -extern "C" extern u8 data_8068DB94[4]; -extern "C" extern u8 data_8068DB98[4]; -extern "C" extern u8 data_8068DB9C[4]; -extern "C" extern u8 data_8068DBA0[4]; -extern "C" extern u8 data_8068DBA4[4]; -extern "C" extern u8 data_8068DBA8[4]; -extern "C" extern u8 data_8068DBAC[4]; -extern "C" extern u8 data_8068DBB0[4]; -extern "C" extern u8 data_8068DBB4[4]; -extern "C" extern u8 data_8068DBB8[4]; -extern "C" extern u8 data_8068DBBC[4]; -extern "C" extern u8 data_8068DBC0[4]; -extern "C" extern u8 data_8068DBC4[4]; extern "C" void __ct__12daE_BI_HIO_cFv(); extern "C" static void anm_init__FP10e_bi_classifUcf(); @@ -438,24 +391,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_bi/executor.cpp b/rel/d/a/e/d_a_e_bi/executor.cpp index 8815870ab9b..1c84445a55c 100644 --- a/rel/d/a/e/d_a_e_bi/executor.cpp +++ b/rel/d/a/e/d_a_e_bi/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8068D7D8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_bi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_bi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2049a36454c..4562b5301a9 100644 --- a/rel/d/a/e/d_a_e_bi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_bi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8068D7E4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8068D7E4-8068D7EC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8068D7E4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8068DAD8-8068DAE0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_bi/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_bi/unknown_translation_unit_ctors.cpp index d67658e8918..03869efa768 100644 --- a/rel/d/a/e/d_a_e_bi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_bi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8068D7D8[2]; -extern void* const data_8068D7D8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_bi_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8068D7D8-8068D7E0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8068D7D8[2] = { + (void*)__sinit_d_a_e_bi_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp b/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp index 15273c2c696..afef72aa804 100644 --- a/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp +++ b/rel/d/a/e/d_a_e_bi_leaf/d_a_e_bi_leaf.cpp @@ -19,12 +19,12 @@ struct fopAc_ac_c { struct e_bi_leaf_class {}; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -51,8 +51,6 @@ static bool daE_BI_LEAF_IsDelete(e_bi_leaf_class*); static void daE_BI_LEAF_Delete(e_bi_leaf_class*); static void useHeapInit(fopAc_ac_c*); static void daE_BI_LEAF_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_BI_LEAF[12]; extern "C" static void daE_BI_LEAF_Draw__FP15e_bi_leaf_class(); extern "C" static void action__FP15e_bi_leaf_class(); @@ -78,11 +76,6 @@ void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void fpcSch_JudgeByID(void*, void*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/e/d_a_e_bi_leaf/executor.cpp b/rel/d/a/e/d_a_e_bi_leaf/executor.cpp index c80aeff9b90..61f33484ae0 100644 --- a/rel/d/a/e/d_a_e_bi_leaf/executor.cpp +++ b/rel/d/a/e/d_a_e_bi_leaf/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8068DFD8[4]; -extern u8 const data_8068DFDC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_bi_leaf/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_bi_leaf/unknown_translation_unit_ctors.cpp index 381a961bdf5..33ca52012fb 100644 --- a/rel/d/a/e/d_a_e_bi_leaf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_bi_leaf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8068DFD8[4]; -extern u8 const data_8068DFD8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8068DFD8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8068DFD8-8068DFDC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8068DFD8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_bi_leaf/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_bi_leaf/unknown_translation_unit_dtors.cpp index ed0ed92dc39..4cb7e57ca96 100644 --- a/rel/d/a/e/d_a_e_bi_leaf/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_bi_leaf/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8068DFDC[4]; -extern u8 const data_8068DFDC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8068DFDC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8068DFDC-8068DFE0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8068DFDC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp b/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp index 538cac39fae..a10fce63b00 100644 --- a/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp +++ b/rel/d/a/e/d_a_e_bs/d_a_e_bs.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -68,14 +68,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; /* 80266B84 */ void operator*(f32) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -246,12 +246,6 @@ static void daE_BS_Delete(e_bs_class*); static void useHeapInit(fopAc_ac_c*); static void daE_BS_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4126; -extern "C" extern u32 const lit_4128; -extern "C" extern u32 const lit_4129; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_BS[12]; extern "C" void __ct__12daE_BS_HIO_cFv(); extern "C" static void wepon_anm_init__FP10e_bs_classi(); @@ -327,22 +321,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_bs/executor.cpp b/rel/d/a/e/d_a_e_bs/executor.cpp index 88e29b1bbe6..65ef28de31e 100644 --- a/rel/d/a/e/d_a_e_bs/executor.cpp +++ b/rel/d/a/e/d_a_e_bs/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80690DC4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_bs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_bs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1d5beeb1c7c..06a4ddaa2f5 100644 --- a/rel/d/a/e/d_a_e_bs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_bs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80690DD0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80690DD0-80690DD8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80690DD0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80691088-80691090 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_bs/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_bs/unknown_translation_unit_ctors.cpp index b555ab01580..cd18bd7e87b 100644 --- a/rel/d/a/e/d_a_e_bs/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_bs/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80690DC4[2]; -extern void* const data_80690DC4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_bs_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80690DC4-80690DCC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80690DC4[2] = { + (void*)__sinit_d_a_e_bs_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp b/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp index 805f70ddafe..9814e4b3e08 100644 --- a/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp +++ b/rel/d/a/e/d_a_e_bu/d_a_e_bu.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -56,14 +56,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -230,16 +230,6 @@ static void daE_BU_Delete(e_bu_class*); static void useHeapInit(fopAc_ac_c*); static void daE_BU_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4451; -extern "C" extern u32 const lit_4452; -extern "C" extern u32 const lit_4453; -extern "C" extern u32 const lit_4454; -extern "C" extern u32 const lit_4455; -extern "C" extern u32 const lit_4456; -extern "C" extern u32 const lit_4546; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_BU[12]; extern "C" void __ct__12daE_BU_HIO_cFv(); extern "C" static void bu_disappear__FP10fopAc_ac_c(); @@ -322,24 +312,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_bu/executor.cpp b/rel/d/a/e/d_a_e_bu/executor.cpp index ab10d2de021..3436fc37574 100644 --- a/rel/d/a/e/d_a_e_bu/executor.cpp +++ b/rel/d/a/e/d_a_e_bu/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8069467C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_bu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_bu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 71250899a5d..eb960334fc6 100644 --- a/rel/d/a/e/d_a_e_bu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_bu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80694688[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80694688-80694690 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80694688[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80694950-80694958 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_bu/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_bu/unknown_translation_unit_ctors.cpp index 32c191c79da..7924bcc900d 100644 --- a/rel/d/a/e/d_a_e_bu/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_bu/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8069467C[2]; -extern void* const data_8069467C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_bu_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8069467C-80694684 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8069467C[2] = { + (void*)__sinit_d_a_e_bu_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp b/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp index 270a1bdc68a..82cc2b29361 100644 --- a/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp +++ b/rel/d/a/e/d_a_e_bug/d_a_e_bug.cpp @@ -131,47 +131,6 @@ static bool daE_Bug_IsDelete(e_bug_class*); static void daE_Bug_Delete(e_bug_class*); static void useHeapInit(fopAc_ac_c*); static void daE_Bug_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_BUG[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80697EB0[4]; -extern "C" extern u8 data_80697EB4[4]; -extern "C" extern u8 data_80697EB8[4]; -extern "C" extern u8 data_80697EBC[4]; -extern "C" extern u8 data_80697EC0[4]; -extern "C" extern u8 data_80697EC4[4]; -extern "C" extern u8 data_80697EC8[4]; -extern "C" extern u8 data_80697ECC[4]; -extern "C" extern u8 data_80697ED0[4]; -extern "C" extern u8 data_80697ED4[4]; -extern "C" extern u8 data_80697ED8[4]; -extern "C" extern u8 data_80697EDC[4]; -extern "C" extern u8 data_80697EE0[4]; -extern "C" extern u8 data_80697EE4[4]; -extern "C" extern u8 data_80697EE8[4]; -extern "C" extern u8 data_80697EEC[4]; -extern "C" extern u8 data_80697EF0[4]; -extern "C" extern u8 data_80697EF4[4]; -extern "C" extern u8 data_80697EF8[4]; -extern "C" extern u8 data_80697EFC[4]; -extern "C" extern u8 data_80697F00[4]; -extern "C" extern u8 data_80697F04[4]; -extern "C" extern u8 data_80697F08[4]; -extern "C" extern u8 data_80697F0C[4]; -extern "C" extern u8 data_80697F10[4]; extern "C" void __ct__13daE_Bug_HIO_cFv(); extern "C" static void daE_Bug_Draw__FP11e_bug_class(); @@ -269,15 +228,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_bug/executor.cpp b/rel/d/a/e/d_a_e_bug/executor.cpp index f25e36d5e5f..54907f8398f 100644 --- a/rel/d/a/e/d_a_e_bug/executor.cpp +++ b/rel/d/a/e/d_a_e_bug/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80697C8C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_bug/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_bug/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4ee11062a41..e13db37d375 100644 --- a/rel/d/a/e/d_a_e_bug/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_bug/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80697C98[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80697C98-80697CA0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80697C98[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80697E28-80697E30 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_bug/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_bug/unknown_translation_unit_ctors.cpp index c14c8fcee3c..c98f2fc730b 100644 --- a/rel/d/a/e/d_a_e_bug/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_bug/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80697C8C[2]; -extern void* const data_80697C8C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_bug_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80697C8C-80697C94 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80697C8C[2] = { + (void*)__sinit_d_a_e_bug_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp b/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp index 68cb0ba76e9..890e34c955a 100644 --- a/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp +++ b/rel/d/a/e/d_a_e_cr/d_a_e_cr.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -51,14 +51,14 @@ struct daE_CR_HIO_c { /* 806997F4 */ ~daE_CR_HIO_c(); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -207,9 +207,6 @@ static void daE_CR_Delete(e_cr_class*); static void useHeapInit(fopAc_ac_c*); static void daE_CR_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_CR[12]; extern "C" void __ct__12daE_CR_HIO_cFv(); extern "C" static void anm_init__FP10e_cr_classifUcf(); @@ -274,22 +271,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_cr/executor.cpp b/rel/d/a/e/d_a_e_cr/executor.cpp index 390572fdb7f..6b6ff3cc025 100644 --- a/rel/d/a/e/d_a_e_cr/executor.cpp +++ b/rel/d/a/e/d_a_e_cr/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80699C9C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_cr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_cr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9766bab33d1..1b238bb1e82 100644 --- a/rel/d/a/e/d_a_e_cr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_cr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80699CA8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80699CA8-80699CB0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80699CA8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80699E80-80699E88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_cr/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_cr/unknown_translation_unit_ctors.cpp index 63d469f4f86..dadbf7dc461 100644 --- a/rel/d/a/e/d_a_e_cr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_cr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80699C9C[2]; -extern void* const data_80699C9C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_cr_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80699C9C-80699CA4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80699C9C[2] = { + (void*)__sinit_d_a_e_cr_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp b/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp index 9fd38aa7d14..8db3d3503fd 100644 --- a/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp +++ b/rel/d/a/e/d_a_e_cr_egg/d_a_e_cr_egg.cpp @@ -24,16 +24,16 @@ struct fopAc_ac_c { struct e_cr_egg_class {}; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -145,8 +145,6 @@ static bool daE_CR_EGG_IsDelete(e_cr_egg_class*); static void daE_CR_EGG_Delete(e_cr_egg_class*); static void useHeapInit(fopAc_ac_c*); static void daE_CR_EGG_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_CR_EGG[12]; extern "C" static void daE_CR_EGG_Draw__FP14e_cr_egg_class(); extern "C" static void e_cr_egg_move__FP14e_cr_egg_class(); @@ -183,19 +181,6 @@ void cM_rndFX(f32); void cLib_addCalc0(f32*, f32, f32); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_cr_egg/executor.cpp b/rel/d/a/e/d_a_e_cr_egg/executor.cpp index 0e2a286af42..dbf5dc96282 100644 --- a/rel/d/a/e/d_a_e_cr_egg/executor.cpp +++ b/rel/d/a/e/d_a_e_cr_egg/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8069A8C4[4]; -extern u8 const data_8069A8C8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_cr_egg/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_cr_egg/unknown_translation_unit_ctors.cpp index be576f64d59..24390ae5419 100644 --- a/rel/d/a/e/d_a_e_cr_egg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_cr_egg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8069A8C4[4]; -extern u8 const data_8069A8C4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8069A8C4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8069A8C4-8069A8C8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8069A8C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_cr_egg/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_cr_egg/unknown_translation_unit_dtors.cpp index f1a4691360e..5fa7d7ba3b6 100644 --- a/rel/d/a/e/d_a_e_cr_egg/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_cr_egg/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8069A8C8[4]; -extern u8 const data_8069A8C8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8069A8C8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8069A8C8-8069A8CC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8069A8C8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_db/d_a_e_db.cpp b/rel/d/a/e/d_a_e_db/d_a_e_db.cpp index 57468021286..79cdcb775c7 100644 --- a/rel/d/a/e/d_a_e_db/d_a_e_db.cpp +++ b/rel/d/a/e/d_a_e_db/d_a_e_db.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -51,11 +51,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -299,16 +299,6 @@ static void daE_DB_Delete(e_db_class*); static void useHeapInit(fopAc_ac_c*); static void daE_DB_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5351; -extern "C" extern u32 const lit_5352; -extern "C" extern u32 const lit_5353; -extern "C" extern u32 const lit_5354; -extern "C" extern u32 const lit_5355; -extern "C" extern u32 const lit_5645; -extern "C" extern u32 const lit_5646; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_DB[12]; extern "C" void __ct__12daE_DB_HIO_cFv(); extern "C" static void anm_init__FP10e_db_classifUcf(); @@ -416,24 +406,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_db/executor.cpp b/rel/d/a/e/d_a_e_db/executor.cpp index 8fae8b61960..cc4c70efa27 100644 --- a/rel/d/a/e/d_a_e_db/executor.cpp +++ b/rel/d/a/e/d_a_e_db/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806A18F8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_db/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_db/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 377a61bb325..fef8a9a0c57 100644 --- a/rel/d/a/e/d_a_e_db/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_db/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806A1904[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806A1904-806A190C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806A1904[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806A1D90-806A1D98 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_db/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_db/unknown_translation_unit_ctors.cpp index a0950e1076b..051d9ca9852 100644 --- a/rel/d/a/e/d_a_e_db/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_db/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806A18F8[2]; -extern void* const data_806A18F8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_db_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806A18F8-806A1900 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806A18F8[2] = { + (void*)__sinit_d_a_e_db_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp index 7fe0aae3444..ae24fc105c7 100644 --- a/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/d_a_e_db_leaf.cpp @@ -35,10 +35,10 @@ struct fopAc_ac_c { struct e_db_leaf_class {}; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -60,8 +60,6 @@ static bool daE_DB_LEAF_IsDelete(e_db_leaf_class*); static void daE_DB_LEAF_Delete(e_db_leaf_class*); static void useHeapInit(fopAc_ac_c*); static void daE_DB_LEAF_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_DB_LEAF[12]; extern "C" static void daE_DB_LEAF_Draw__FP15e_db_leaf_class(); extern "C" static void daE_DB_LEAF_Execute__FP15e_db_leaf_class(); @@ -82,11 +80,6 @@ void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_db_leaf/executor.cpp b/rel/d/a/e/d_a_e_db_leaf/executor.cpp index df475074227..49fc5495bef 100644 --- a/rel/d/a/e/d_a_e_db_leaf/executor.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_806A210C[4]; -extern u8 const data_806A2110[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_db_leaf/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_db_leaf/unknown_translation_unit_ctors.cpp index 2c9cbdb0427..a1cae8c2746 100644 --- a/rel/d/a/e/d_a_e_db_leaf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_806A210C[4]; -extern u8 const data_806A210C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_806A210C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806A210C-806A2110 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_806A210C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_db_leaf/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_db_leaf/unknown_translation_unit_dtors.cpp index cf54bd8c178..252c2b15106 100644 --- a/rel/d/a/e/d_a_e_db_leaf/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_db_leaf/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_806A2110[4]; -extern u8 const data_806A2110[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_806A2110[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 806A2110-806A2114 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_806A2110[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp b/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp index 3b98e846ad8..aed2e1c8c36 100644 --- a/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp +++ b/rel/d/a/e/d_a_e_dd/d_a_e_dd.cpp @@ -32,13 +32,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -69,14 +69,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -279,14 +279,6 @@ static void useHeapInit(fopAc_ac_c*); static void kabe_initial_pos_set(e_dd_class*); static void daE_DD_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4996; -extern "C" extern u32 const lit_4997; -extern "C" extern u32 const lit_4998; -extern "C" extern u32 const lit_4999; -extern "C" extern u32 const lit_5000; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_DD[12]; extern "C" void __ct__12daE_DD_HIO_cFv(); extern "C" static void anm_init__FP10e_dd_classifUcf(); @@ -381,23 +373,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_dd/executor.cpp b/rel/d/a/e/d_a_e_dd/executor.cpp index 504f43265eb..b410c95efca 100644 --- a/rel/d/a/e/d_a_e_dd/executor.cpp +++ b/rel/d/a/e/d_a_e_dd/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806A71B0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_dd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_dd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 82e3f3508c6..840f3865b60 100644 --- a/rel/d/a/e/d_a_e_dd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_dd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806A71BC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806A71BC-806A71C4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806A71BC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806A74B0-806A74B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_dd/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_dd/unknown_translation_unit_ctors.cpp index fbd96b4c42e..886fe9fe05d 100644 --- a/rel/d/a/e/d_a_e_dd/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_dd/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806A71B0[2]; -extern void* const data_806A71B0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_dd_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806A71B0-806A71B8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806A71B0[2] = { + (void*)__sinit_d_a_e_dd_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_df/d_a_e_df.cpp b/rel/d/a/e/d_a_e_df/d_a_e_df.cpp index 7357d32b3c0..0cf4431681e 100644 --- a/rel/d/a/e/d_a_e_df/d_a_e_df.cpp +++ b/rel/d/a/e/d_a_e_df/d_a_e_df.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -28,13 +28,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -57,10 +57,10 @@ struct fopAcM_gc_c { /* 8001DCBC */ void gndCheck(cXyz const*); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_DF_c { /* 806A7710 */ void CreateHeap(); /* 806A7828 */ void initCcCylinder(); @@ -225,9 +225,6 @@ static bool daE_DF_IsDelete(daE_DF_c*); static void daE_DF_Delete(daE_DF_c*); static void daE_DF_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_DF[12]; extern "C" void __ct__12daE_DF_HIO_cFv(); extern "C" void CreateHeap__8daE_DF_cFv(); @@ -303,22 +300,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_df/executor.cpp b/rel/d/a/e/d_a_e_df/executor.cpp index 8209e9708b1..155b0cb5901 100644 --- a/rel/d/a/e/d_a_e_df/executor.cpp +++ b/rel/d/a/e/d_a_e_df/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806A9F1C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_df/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_df/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1d5adf69113..af6cbdb4865 100644 --- a/rel/d/a/e/d_a_e_df/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_df/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806A9F28[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806A9F28-806A9F30 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806A9F28[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806AA0C8-806AA0D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_df/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_df/unknown_translation_unit_ctors.cpp index acba94ffc1d..1f1ef68ff1c 100644 --- a/rel/d/a/e/d_a_e_df/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_df/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806A9F1C[2]; -extern void* const data_806A9F1C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_df_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806A9F1C-806A9F24 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806A9F1C[2] = { + (void*)__sinit_d_a_e_df_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp b/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp index 5bebbd9b0f1..af17ea665ba 100644 --- a/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp +++ b/rel/d/a/e/d_a_e_dk/d_a_e_dk.cpp @@ -45,13 +45,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -67,12 +67,12 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct cBgD_Vtx_t {}; - struct dBgS_SphChk { /* 80078A14 */ dBgS_SphChk(); }; +struct cBgD_Vtx_t {}; + struct cM3dGPla {}; struct daE_DK_c { @@ -113,14 +113,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -281,9 +281,6 @@ static bool daE_DK_IsDelete(daE_DK_c*); static void daE_DK_Delete(daE_DK_c*); static void useHeapInit(fopAc_ac_c*); static void daE_DK_Create(daE_DK_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_DK[12]; extern "C" void __ct__12daE_DK_HIO_cFv(); extern "C" void draw__8daE_DK_cFv(); @@ -365,20 +362,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dZModeTable[96]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void transM__14mDoMtx_stack_cFfff(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/e/d_a_e_dk/executor.cpp b/rel/d/a/e/d_a_e_dk/executor.cpp index a89a31688c5..2d93d5d954f 100644 --- a/rel/d/a/e/d_a_e_dk/executor.cpp +++ b/rel/d/a/e/d_a_e_dk/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806AD524[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_dk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_dk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2c006775dda..3f1477ae033 100644 --- a/rel/d/a/e/d_a_e_dk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_dk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806AD530[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806AD530-806AD538 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806AD530[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806AD7F0-806AD7F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_dk/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_dk/unknown_translation_unit_ctors.cpp index 4f27788b526..60e6217d1b1 100644 --- a/rel/d/a/e/d_a_e_dk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_dk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806AD524[2]; -extern void* const data_806AD524[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_dk_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806AD524-806AD52C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806AD524[2] = { + (void*)__sinit_d_a_e_dk_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp b/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp index f2c0aec1c2b..b18598e1a6d 100644 --- a/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp +++ b/rel/d/a/e/d_a_e_dn/d_a_e_dn.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -105,10 +105,10 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -314,59 +314,6 @@ static void daE_DN_Delete(e_dn_class*); static void useHeapInit(fopAc_ac_c*); static void daE_DN_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4544; -extern "C" extern u32 const lit_4545[1 + 1 /* padding */]; -extern "C" extern u32 const lit_5543; -extern "C" extern u32 const lit_5979; -extern "C" extern u32 const lit_6928; -extern "C" extern u32 const lit_6929; -extern "C" extern u32 const lit_6930; -extern "C" extern u32 const lit_6931; -extern "C" extern u32 const lit_6932; -extern "C" extern u32 const lit_6933; -extern "C" extern u32 const lit_6934; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_DN[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_804EEF98[4]; -extern "C" extern u8 data_804EEF9C[4]; -extern "C" extern u8 data_804EEFA0[4]; -extern "C" extern u8 data_804EEFA4[4]; -extern "C" extern u8 data_804EEFA8[4]; -extern "C" extern u8 data_804EEFAC[4]; -extern "C" extern u8 data_804EEFB0[4]; -extern "C" extern u8 data_804EEFB4[4]; -extern "C" extern u8 data_804EEFB8[4]; -extern "C" extern u8 data_804EEFBC[4]; -extern "C" extern u8 data_804EEFC0[4]; -extern "C" extern u8 data_804EEFC4[4]; -extern "C" extern u8 data_804EEFC8[4]; -extern "C" extern u8 data_804EEFCC[4]; -extern "C" extern u8 data_804EEFD0[4]; -extern "C" extern u8 data_804EEFD4[4]; -extern "C" extern u8 data_804EEFD8[4]; -extern "C" extern u8 data_804EEFDC[4]; -extern "C" extern u8 data_804EEFE0[4]; -extern "C" extern u8 data_804EEFE4[4]; -extern "C" extern u8 data_804EEFE8[4]; -extern "C" extern u8 data_804EEFEC[4]; -extern "C" extern u8 data_804EEFF0[4]; -extern "C" extern u8 data_804EEFF4[4]; -extern "C" extern u8 data_804EEFF8[4]; extern "C" void __ct__12daE_DN_HIO_cFv(); extern "C" static void dn_disappear__FP10e_dn_class(); @@ -540,24 +487,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_dn/executor.cpp b/rel/d/a/e/d_a_e_dn/executor.cpp index c0f108f74c5..ed784cab5c7 100644 --- a/rel/d/a/e/d_a_e_dn/executor.cpp +++ b/rel/d/a/e/d_a_e_dn/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804EE898[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_dn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_dn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 266c0c91f5e..633171770f6 100644 --- a/rel/d/a/e/d_a_e_dn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_dn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804EE8A4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804EE8A4-804EE8AC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804EE8A4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804EEEE8-804EEEF0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_dn/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_dn/unknown_translation_unit_ctors.cpp index ce9e994f574..7e7caf01d4e 100644 --- a/rel/d/a/e/d_a_e_dn/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_dn/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804EE898[2]; -extern void* const data_804EE898[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_dn_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804EE898-804EE8A0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804EE898[2] = { + (void*)__sinit_d_a_e_dn_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp b/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp index 643f4aa0ebe..5abf4aa5d32 100644 --- a/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp +++ b/rel/d/a/e/d_a_e_dt/d_a_e_dt.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 806B5B7C */ csXyz(); - /* 806B5B80 */ ~csXyz(); -}; - struct Vec {}; struct cXyz { @@ -26,6 +21,11 @@ struct cXyz { /* 806AE56C */ ~cXyz(); }; +struct csXyz { + /* 806B5B7C */ csXyz(); + /* 806B5B80 */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -39,13 +39,13 @@ struct mDoGph_gInf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -65,10 +65,10 @@ struct daPy_py_c { /* 8015F914 */ void setPlayerDamage(int, int); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_DT_c { /* 806AD97C */ void ctrlJoint(J3DJoint*, J3DModel*); /* 806ADBA0 */ void JointCallBack(J3DJoint*, int); @@ -350,75 +350,6 @@ static bool daE_DT_IsDelete(daE_DT_c*); static void daE_DT_Delete(daE_DT_c*); static void useHeapInit(fopAc_ac_c*); static void daE_DT_Create(daE_DT_c*); -extern "C" extern u32 const lit_5318; -extern "C" extern u32 const lit_5319; -extern "C" extern u32 const lit_5524; -extern "C" extern u32 const lit_5527; -extern "C" extern u32 const lit_5530; -extern "C" extern u32 const lit_5953; -extern "C" extern u32 const lit_5954; -extern "C" extern u32 const lit_5955; -extern "C" extern u32 const lit_5957; -extern "C" extern u32 const lit_5958; -extern "C" extern u32 const lit_5959; -extern "C" extern u32 const lit_5960; -extern "C" extern u32 const lit_5961; -extern "C" extern u32 const lit_5962; -extern "C" extern u8 const lit_5967[8]; -extern "C" extern u32 const lit_6435; -extern "C" extern u32 const lit_6437; -extern "C" extern u32 const lit_6438; -extern "C" extern u32 const lit_6439; -extern "C" extern u32 const lit_6440; -extern "C" extern u32 const lit_6441; -extern "C" extern u32 const lit_6442; -extern "C" extern u32 const lit_6443; -extern "C" extern u32 const lit_6444; -extern "C" extern u32 const lit_6445; -extern "C" extern u32 const lit_6446; -extern "C" extern u32 const lit_6449; -extern "C" extern u32 const lit_6450; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_DT[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_806B634C[4]; -extern "C" extern u8 data_806B6350[4]; -extern "C" extern u8 data_806B6354[4]; -extern "C" extern u8 data_806B6358[4]; -extern "C" extern u8 data_806B635C[4]; -extern "C" extern u8 data_806B6360[4]; -extern "C" extern u8 data_806B6364[4]; -extern "C" extern u8 data_806B6368[4]; -extern "C" extern u8 data_806B636C[4]; -extern "C" extern u8 data_806B6370[4]; -extern "C" extern u8 data_806B6374[4]; -extern "C" extern u8 data_806B6378[4]; -extern "C" extern u8 data_806B637C[4]; -extern "C" extern u8 data_806B6380[4]; -extern "C" extern u8 data_806B6384[4]; -extern "C" extern u8 data_806B6388[4]; -extern "C" extern u8 data_806B638C[4]; -extern "C" extern u8 data_806B6390[4]; -extern "C" extern u8 data_806B6394[4]; -extern "C" extern u8 data_806B6398[4]; -extern "C" extern u8 data_806B639C[4]; -extern "C" extern u8 data_806B63A0[4]; -extern "C" extern u8 data_806B63A4[4]; -extern "C" extern u8 data_806B63A8[4]; -extern "C" extern u8 data_806B63AC[4]; extern "C" void __ct__12daE_DT_HIO_cFv(); extern "C" void ctrlJoint__8daE_DT_cFP8J3DJointP8J3DModel(); @@ -625,25 +556,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 j3dZModeTable[96]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void onBlure__13mDoGph_gInf_cFv(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_dt/executor.cpp b/rel/d/a/e/d_a_e_dt/executor.cpp index 42a00f63d05..b7246d4da41 100644 --- a/rel/d/a/e/d_a_e_dt/executor.cpp +++ b/rel/d/a/e/d_a_e_dt/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806B5CC0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_dt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_dt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2baa7089a29..fcb1588835b 100644 --- a/rel/d/a/e/d_a_e_dt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_dt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806B5CCC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806B5CCC-806B5CD4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806B5CCC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806B6258-806B6260 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_dt/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_dt/unknown_translation_unit_ctors.cpp index 3b4f2f734c9..20147f2af08 100644 --- a/rel/d/a/e/d_a_e_dt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_dt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806B5CC0[2]; -extern void* const data_806B5CC0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_dt_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806B5CC0-806B5CC8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806B5CC0[2] = { + (void*)__sinit_d_a_e_dt_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp b/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp index b02a232a481..5b23222d105 100644 --- a/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp +++ b/rel/d/a/e/d_a_e_fb/d_a_e_fb.cpp @@ -43,13 +43,13 @@ struct mDoExt_brkAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -244,47 +244,6 @@ static bool daE_FB_IsDelete(daE_FB_c*); static void daE_FB_Delete(daE_FB_c*); static void useHeapInit(fopAc_ac_c*); static void daE_FB_Create(daE_FB_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_FB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_806B9228[4]; -extern "C" extern u8 data_806B922C[4]; -extern "C" extern u8 data_806B9230[4]; -extern "C" extern u8 data_806B9234[4]; -extern "C" extern u8 data_806B9238[4]; -extern "C" extern u8 data_806B923C[4]; -extern "C" extern u8 data_806B9240[4]; -extern "C" extern u8 data_806B9244[4]; -extern "C" extern u8 data_806B9248[4]; -extern "C" extern u8 data_806B924C[4]; -extern "C" extern u8 data_806B9250[4]; -extern "C" extern u8 data_806B9254[4]; -extern "C" extern u8 data_806B9258[4]; -extern "C" extern u8 data_806B925C[4]; -extern "C" extern u8 data_806B9260[4]; -extern "C" extern u8 data_806B9264[4]; -extern "C" extern u8 data_806B9268[4]; -extern "C" extern u8 data_806B926C[4]; -extern "C" extern u8 data_806B9270[4]; -extern "C" extern u8 data_806B9274[4]; -extern "C" extern u8 data_806B9278[4]; -extern "C" extern u8 data_806B927C[4]; -extern "C" extern u8 data_806B9280[4]; -extern "C" extern u8 data_806B9284[4]; -extern "C" extern u8 data_806B9288[4]; extern "C" void __ct__12daE_FB_HIO_cFv(); extern "C" void ctrlJoint__8daE_FB_cFP8J3DJointP8J3DModel(); @@ -397,21 +356,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_fb/executor.cpp b/rel/d/a/e/d_a_e_fb/executor.cpp index 53cf0287246..6adac9efe41 100644 --- a/rel/d/a/e/d_a_e_fb/executor.cpp +++ b/rel/d/a/e/d_a_e_fb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806B8F78[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_fb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_fb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 90eac329dc5..75cc2d8fb41 100644 --- a/rel/d/a/e/d_a_e_fb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_fb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806B8F84[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806B8F84-806B8F8C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806B8F84[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806B91A8-806B91B0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_fb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_fb/unknown_translation_unit_ctors.cpp index e2b6cb324fb..89b1022a2ad 100644 --- a/rel/d/a/e/d_a_e_fb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_fb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806B8F78[2]; -extern void* const data_806B8F78[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_fb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806B8F78-806B8F80 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806B8F78[2] = { + (void*)__sinit_d_a_e_fb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp b/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp index 59d9bbbc6f6..a16a4910348 100644 --- a/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp +++ b/rel/d/a/e/d_a_e_fk/d_a_e_fk.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz { /* 806BB680 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -35,13 +35,13 @@ struct mDoExt_invisibleModel { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -200,53 +200,6 @@ static void daE_FK_Execute(daE_FK_c*); static bool daE_FK_IsDelete(daE_FK_c*); static void daE_FK_Delete(daE_FK_c*); static void daE_FK_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3832; -extern "C" extern u32 const lit_4067; -extern "C" extern u32 const lit_4068; -extern "C" extern u32 const lit_4234; -extern "C" extern u32 const lit_4236; -extern "C" extern u32 const lit_4265; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_FK[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_806BB978[4]; -extern "C" extern u8 data_806BB97C[4]; -extern "C" extern u8 data_806BB980[4]; -extern "C" extern u8 data_806BB984[4]; -extern "C" extern u8 data_806BB988[4]; -extern "C" extern u8 data_806BB98C[4]; -extern "C" extern u8 data_806BB990[4]; -extern "C" extern u8 data_806BB994[4]; -extern "C" extern u8 data_806BB998[4]; -extern "C" extern u8 data_806BB99C[4]; -extern "C" extern u8 data_806BB9A0[4]; -extern "C" extern u8 data_806BB9A4[4]; -extern "C" extern u8 data_806BB9A8[4]; -extern "C" extern u8 data_806BB9AC[4]; -extern "C" extern u8 data_806BB9B0[4]; -extern "C" extern u8 data_806BB9B4[4]; -extern "C" extern u8 data_806BB9B8[4]; -extern "C" extern u8 data_806BB9BC[4]; -extern "C" extern u8 data_806BB9C0[4]; -extern "C" extern u8 data_806BB9C4[4]; -extern "C" extern u8 data_806BB9C8[4]; -extern "C" extern u8 data_806BB9CC[4]; -extern "C" extern u8 data_806BB9D0[4]; -extern "C" extern u8 data_806BB9D4[4]; -extern "C" extern u8 data_806BB9D8[4]; extern "C" void __ct__12daE_FK_HIO_cFv(); extern "C" void CreateHeap__8daE_FK_cFv(); @@ -375,20 +328,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_fk/executor.cpp b/rel/d/a/e/d_a_e_fk/executor.cpp index 9f4e61dca81..00c9abf75e6 100644 --- a/rel/d/a/e/d_a_e_fk/executor.cpp +++ b/rel/d/a/e/d_a_e_fk/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806BB6BC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_fk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_fk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 78d8c682466..a2450ce765a 100644 --- a/rel/d/a/e/d_a_e_fk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_fk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806BB6C8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806BB6C8-806BB6D0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806BB6C8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806BB8C8-806BB8D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_fk/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_fk/unknown_translation_unit_ctors.cpp index 294b3b0f88b..2d1fbded8ed 100644 --- a/rel/d/a/e/d_a_e_fk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_fk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806BB6BC[2]; -extern void* const data_806BB6BC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_fk_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806BB6BC-806BB6C4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806BB6BC[2] = { + (void*)__sinit_d_a_e_fk_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp b/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp index fd88dc4bc74..2d0ae138354 100644 --- a/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp +++ b/rel/d/a/e/d_a_e_fm/d_a_e_fm.cpp @@ -58,10 +58,10 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct J3DAnmTransform {}; - struct J3DModelData {}; +struct J3DAnmTransform {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -364,50 +364,6 @@ static void daE_FM_Delete(e_fm_class*); static void useHeapInit(fopAc_ac_c*); static void daE_FM_Create(fopAc_ac_c*); static void dComIfGp_particle_set(u16, cXyz const*, csXyz const*, cXyz const*); -extern "C" extern u32 const lit_7066; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_804FAD48[64]; -extern "C" extern void* g_profile_E_FM[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_804FAF84[4]; -extern "C" extern u8 data_804FAF88[4]; -extern "C" extern u8 data_804FAF8C[4]; -extern "C" extern u8 data_804FAF90[4]; -extern "C" extern u8 data_804FAF94[4]; -extern "C" extern u8 data_804FAF98[4]; -extern "C" extern u8 data_804FAF9C[4]; -extern "C" extern u8 data_804FAFA0[4]; -extern "C" extern u8 data_804FAFA4[4]; -extern "C" extern u8 data_804FAFA8[4]; -extern "C" extern u8 data_804FAFAC[4]; -extern "C" extern u8 data_804FAFB0[4]; -extern "C" extern u8 data_804FAFB4[4]; -extern "C" extern u8 data_804FAFB8[4]; -extern "C" extern u8 data_804FAFBC[4]; -extern "C" extern u8 data_804FAFC0[4]; -extern "C" extern u8 data_804FAFC4[4]; -extern "C" extern u8 data_804FAFC8[4]; -extern "C" extern u8 data_804FAFCC[4]; -extern "C" extern u8 data_804FAFD0[4]; -extern "C" extern u8 data_804FAFD4[4]; -extern "C" extern u8 data_804FAFD8[4]; -extern "C" extern u8 data_804FAFDC[4]; -extern "C" extern u8 data_804FAFE0[4]; -extern "C" extern u8 data_804FAFE4[4]; extern "C" void __ct__12daE_FM_HIO_cFv(); extern "C" static void s_fmobj_del__FPvPv(); @@ -588,26 +544,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_fm/executor.cpp b/rel/d/a/e/d_a_e_fm/executor.cpp index a15485246b2..1774d34c07a 100644 --- a/rel/d/a/e/d_a_e_fm/executor.cpp +++ b/rel/d/a/e/d_a_e_fm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804FA6A8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_fm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_fm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index dca538f7eb0..75017919c79 100644 --- a/rel/d/a/e/d_a_e_fm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_fm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804FA6B4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804FA6B4-804FA6BC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804FA6B4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804FAE50-804FAE58 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_fm/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_fm/unknown_translation_unit_ctors.cpp index b8a2161025e..954b7de5b40 100644 --- a/rel/d/a/e/d_a_e_fm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_fm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804FA6A8[2]; -extern void* const data_804FA6A8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_fm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804FA6A8-804FA6B0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804FA6A8[2] = { + (void*)__sinit_d_a_e_fm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp b/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp index ebf9829eead..c283169275e 100644 --- a/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp +++ b/rel/d/a/e/d_a_e_fs/d_a_e_fs.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -255,52 +255,6 @@ static void daE_Fs_Delete(e_fs_class*); static void useHeapIe_fst(fopAc_ac_c*); static void daE_Fs_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4448[1 + 1 /* padding */]; -extern "C" extern u8 const lit_4451[8]; -extern "C" extern u32 const lit_4544; -extern "C" extern u32 const lit_4545; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_FS[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_806BE7E8[4]; -extern "C" extern u8 data_806BE7EC[4]; -extern "C" extern u8 data_806BE7F0[4]; -extern "C" extern u8 data_806BE7F4[4]; -extern "C" extern u8 data_806BE7F8[4]; -extern "C" extern u8 data_806BE7FC[4]; -extern "C" extern u8 data_806BE800[4]; -extern "C" extern u8 data_806BE804[4]; -extern "C" extern u8 data_806BE808[4]; -extern "C" extern u8 data_806BE80C[4]; -extern "C" extern u8 data_806BE810[4]; -extern "C" extern u8 data_806BE814[4]; -extern "C" extern u8 data_806BE818[4]; -extern "C" extern u8 data_806BE81C[4]; -extern "C" extern u8 data_806BE820[4]; -extern "C" extern u8 data_806BE824[4]; -extern "C" extern u8 data_806BE828[4]; -extern "C" extern u8 data_806BE82C[4]; -extern "C" extern u8 data_806BE830[4]; -extern "C" extern u8 data_806BE834[4]; -extern "C" extern u8 data_806BE838[4]; -extern "C" extern u8 data_806BE83C[4]; -extern "C" extern u8 data_806BE840[4]; -extern "C" extern u8 data_806BE844[4]; -extern "C" extern u8 data_806BE848[4]; extern "C" void __ct__12daE_Fs_HIO_cFv(); extern "C" static void anm_init__FP10e_fs_classifUcf(); @@ -418,24 +372,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_fs/executor.cpp b/rel/d/a/e/d_a_e_fs/executor.cpp index e2667e47654..8b80df7e56e 100644 --- a/rel/d/a/e/d_a_e_fs/executor.cpp +++ b/rel/d/a/e/d_a_e_fs/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806BE478[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_fs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_fs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index da47568d27b..d68db528322 100644 --- a/rel/d/a/e/d_a_e_fs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_fs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806BE484[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806BE484-806BE48C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806BE484[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806BE758-806BE760 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_fs/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_fs/unknown_translation_unit_ctors.cpp index ab4d9a7c2cf..7a56fef1f62 100644 --- a/rel/d/a/e/d_a_e_fs/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_fs/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806BE478[2]; -extern void* const data_806BE478[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_fs_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806BE478-806BE480 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806BE478[2] = { + (void*)__sinit_d_a_e_fs_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp b/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp index d6ecc4eb9cb..65607364473 100644 --- a/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp +++ b/rel/d/a/e/d_a_e_fz/d_a_e_fz.cpp @@ -245,11 +245,6 @@ static void daE_FZ_Delete(daE_FZ_c*); static void useHeapInit(fopAc_ac_c*); static void daE_FZ_Create(daE_FZ_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4322; -extern "C" extern u32 const lit_4323; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_FZ[12]; extern "C" void __ct__12daE_FZ_HIO_cFv(); extern "C" void draw__8daE_FZ_cFv(); @@ -338,22 +333,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*, JGeometry::TVec3__template0*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/e/d_a_e_fz/executor.cpp b/rel/d/a/e/d_a_e_fz/executor.cpp index b71f8a7ac15..bfe0e798757 100644 --- a/rel/d/a/e/d_a_e_fz/executor.cpp +++ b/rel/d/a/e/d_a_e_fz/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806C1924[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_fz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_fz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 425e8e061b3..1657593bf2b 100644 --- a/rel/d/a/e/d_a_e_fz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_fz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806C1930[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806C1930-806C1938 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806C1930[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806C1B98-806C1BA0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_fz/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_fz/unknown_translation_unit_ctors.cpp index 6875d657c1e..3be7623798c 100644 --- a/rel/d/a/e/d_a_e_fz/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_fz/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806C1924[2]; -extern void* const data_806C1924[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_fz_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806C1924-806C192C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806C1924[2] = { + (void*)__sinit_d_a_e_fz_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp b/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp index 72ce937c76b..41c11285df6 100644 --- a/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp +++ b/rel/d/a/e/d_a_e_ga/d_a_e_ga.cpp @@ -34,14 +34,14 @@ struct daE_Ga_HIO_c { /* 804FBAF8 */ ~daE_Ga_HIO_c(); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); }; @@ -75,9 +75,6 @@ static bool daE_Ga_IsDelete(e_ga_class*); static void daE_Ga_Delete(e_ga_class*); static void useHeapInit(fopAc_ac_c*); static void daE_Ga_Create(fopAc_ac_c*); -extern "C" extern u8 const data_804FBBC0[4]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_GA[12]; extern "C" void __ct__12daE_Ga_HIO_cFv(); extern "C" static void daE_Ga_Draw__FP10e_ga_class(); @@ -114,13 +111,6 @@ void cM_rndFX(f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ga/executor.cpp b/rel/d/a/e/d_a_e_ga/executor.cpp index d3857a314d6..bfa6ac87b74 100644 --- a/rel/d/a/e/d_a_e_ga/executor.cpp +++ b/rel/d/a/e/d_a_e_ga/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_804FBB7C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ga/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ga/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index aeece908216..754c746ad7d 100644 --- a/rel/d/a/e/d_a_e_ga/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ga/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_804FBB88[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 804FBB88-804FBB90 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_804FBB88[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 804FBC40-804FBC48 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ga/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ga/unknown_translation_unit_ctors.cpp index 0039625292a..a5e952c5ec8 100644 --- a/rel/d/a/e/d_a_e_ga/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ga/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_804FBB7C[2]; -extern void* const data_804FBB7C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ga_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804FBB7C-804FBB84 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_804FBB7C[2] = { + (void*)__sinit_d_a_e_ga_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp b/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp index b14ca022535..66e816c638a 100644 --- a/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp +++ b/rel/d/a/e/d_a_e_gb/d_a_e_gb.cpp @@ -34,11 +34,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -304,10 +304,6 @@ static void daE_GB_Delete(e_gb_class*); static void useHeapInit(fopAc_ac_c*); static void daE_GB_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4802; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_GB[12]; extern "C" void __ct__12daE_GB_HIO_cFv(); extern "C" static void head_anm_init__FP10e_gb_classifUcf(); @@ -407,24 +403,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_gb/executor.cpp b/rel/d/a/e/d_a_e_gb/executor.cpp index 6e252f231b3..7cca34a5ec1 100644 --- a/rel/d/a/e/d_a_e_gb/executor.cpp +++ b/rel/d/a/e/d_a_e_gb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806C74D4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_gb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_gb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 40014fbf334..268fddec41c 100644 --- a/rel/d/a/e/d_a_e_gb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_gb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806C74E0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806C74E0-806C74E8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806C74E0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806C7920-806C7928 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_gb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_gb/unknown_translation_unit_ctors.cpp index 57173c8c72c..1c10044f07e 100644 --- a/rel/d/a/e/d_a_e_gb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_gb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806C74D4[2]; -extern void* const data_806C74D4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_gb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806C74D4-806C74DC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806C74D4[2] = { + (void*)__sinit_d_a_e_gb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp b/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp index faba2149480..77f2bedb292 100644 --- a/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp +++ b/rel/d/a/e/d_a_e_ge/d_a_e_ge.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -24,6 +22,8 @@ struct cXyz { /* 8026706C */ bool operator!=(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -31,13 +31,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -269,13 +269,6 @@ static void daE_GE_Delete(daE_GE_c*); static void useHeapInit(fopAc_ac_c*); static void daE_GE_Create(daE_GE_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5067; -extern "C" extern u32 const lit_5068; -extern "C" extern u32 const lit_5069; -extern "C" extern u32 const lit_5070; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_GE[12]; extern "C" void __ct__12daE_GE_HIO_cFv(); extern "C" void bckSet__8daE_GE_cFifUcf(); @@ -378,20 +371,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/e/d_a_e_ge/executor.cpp b/rel/d/a/e/d_a_e_ge/executor.cpp index 04d65fca795..c981b7a35e4 100644 --- a/rel/d/a/e/d_a_e_ge/executor.cpp +++ b/rel/d/a/e/d_a_e_ge/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806CCFEC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ge/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ge/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1eaa5d3ed62..7b9b600e27f 100644 --- a/rel/d/a/e/d_a_e_ge/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ge/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806CCFF8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806CCFF8-806CD000 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806CCFF8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806CD350-806CD358 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ge/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ge/unknown_translation_unit_ctors.cpp index 565413e28dc..14a7e336380 100644 --- a/rel/d/a/e/d_a_e_ge/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ge/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806CCFEC[2]; -extern void* const data_806CCFEC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ge_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806CCFEC-806CCFF4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806CCFEC[2] = { + (void*)__sinit_d_a_e_ge_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp b/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp index 0380ce922c5..70e60f01890 100644 --- a/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp +++ b/rel/d/a/e/d_a_e_gi/d_a_e_gi.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -30,13 +30,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -58,10 +58,10 @@ struct daPy_py_c { /* 806D0E34 */ void checkNowWolf(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_GI_c { /* 806CD4F4 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 806CD594 */ void JointCallBack(J3DJoint*, int); @@ -120,12 +120,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -272,9 +272,6 @@ static void daE_GI_Delete(daE_GI_c*); static void useHeapInit(fopAc_ac_c*); static void daE_GI_Create(daE_GI_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_GI[12]; extern "C" void __ct__12daE_GI_HIO_cFv(); extern "C" void ctrlJoint__8daE_GI_cFP8J3DJointP8J3DModel(); @@ -366,22 +363,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/e/d_a_e_gi/executor.cpp b/rel/d/a/e/d_a_e_gi/executor.cpp index 90212303651..07112cb04f0 100644 --- a/rel/d/a/e/d_a_e_gi/executor.cpp +++ b/rel/d/a/e/d_a_e_gi/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806D0E4C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_gi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_gi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7e6a291be75..a3a2407cc22 100644 --- a/rel/d/a/e/d_a_e_gi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_gi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806D0E58[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806D0E58-806D0E60 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806D0E58[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806D1120-806D1128 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_gi/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_gi/unknown_translation_unit_ctors.cpp index 1ab6a0c2eb9..0c00a5b8f07 100644 --- a/rel/d/a/e/d_a_e_gi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_gi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806D0E4C[2]; -extern void* const data_806D0E4C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_gi_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806D0E4C-806D0E54 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806D0E4C[2] = { + (void*)__sinit_d_a_e_gi_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp b/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp index 6964ce1928b..4d88ae426ef 100644 --- a/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp +++ b/rel/d/a/e/d_a_e_gm/d_a_e_gm.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 806D7914 */ ~csXyz(); -}; - struct Vec {}; struct cXyz { @@ -25,6 +21,10 @@ struct cXyz { /* 806D7950 */ ~cXyz(); }; +struct csXyz { + /* 806D7914 */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -35,13 +35,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -240,50 +240,6 @@ static void daE_GM_Delete(daE_GM_c*); static void useHeapInit(fopAc_ac_c*); static void daE_GM_Create(daE_GM_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u8 const l_rand_base_spd[16]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_GM[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_806D7F20[4]; -extern "C" extern u8 data_806D7F24[4]; -extern "C" extern u8 data_806D7F28[4]; -extern "C" extern u8 data_806D7F2C[4]; -extern "C" extern u8 data_806D7F30[4]; -extern "C" extern u8 data_806D7F34[4]; -extern "C" extern u8 data_806D7F38[4]; -extern "C" extern u8 data_806D7F3C[4]; -extern "C" extern u8 data_806D7F40[4]; -extern "C" extern u8 data_806D7F44[4]; -extern "C" extern u8 data_806D7F48[4]; -extern "C" extern u8 data_806D7F4C[4]; -extern "C" extern u8 data_806D7F50[4]; -extern "C" extern u8 data_806D7F54[4]; -extern "C" extern u8 data_806D7F58[4]; -extern "C" extern u8 data_806D7F5C[4]; -extern "C" extern u8 data_806D7F60[4]; -extern "C" extern u8 data_806D7F64[4]; -extern "C" extern u8 data_806D7F68[4]; -extern "C" extern u8 data_806D7F6C[4]; -extern "C" extern u8 data_806D7F70[4]; -extern "C" extern u8 data_806D7F74[4]; -extern "C" extern u8 data_806D7F78[4]; -extern "C" extern u8 data_806D7F7C[4]; -extern "C" extern u8 data_806D7F80[4]; extern "C" void __ct__12daE_GM_HIO_cFv(); extern "C" void setAction__8daE_GM_cFM8daE_GM_cFPCvPv_v(); @@ -424,22 +380,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_gm/executor.cpp b/rel/d/a/e/d_a_e_gm/executor.cpp index 26716d3e572..8338d795c8c 100644 --- a/rel/d/a/e/d_a_e_gm/executor.cpp +++ b/rel/d/a/e/d_a_e_gm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806D798C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1e57147233e..6b528069167 100644 --- a/rel/d/a/e/d_a_e_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806D7998[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806D7998-806D79A0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806D7998[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806D7E70-806D7E78 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_gm/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_gm/unknown_translation_unit_ctors.cpp index 7825d8448d1..91ab6c18135 100644 --- a/rel/d/a/e/d_a_e_gm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_gm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806D798C[2]; -extern void* const data_806D798C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_gm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806D798C-806D7994 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806D798C[2] = { + (void*)__sinit_d_a_e_gm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp b/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp index 3862f9cf586..fc271989712 100644 --- a/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp +++ b/rel/d/a/e/d_a_e_gob/d_a_e_gob.cpp @@ -26,15 +26,15 @@ struct mDoGph_gInf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -282,61 +282,6 @@ static bool daE_GOB_IsDelete(e_gob_class*); static void daE_GOB_Delete(e_gob_class*); static void useHeapInit(fopAc_ac_c*); static void daE_GOB_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4077; -extern "C" extern u32 const lit_4078; -extern "C" extern u32 const lit_4079; -extern "C" extern u32 const lit_4080; -extern "C" extern u32 const lit_4083; -extern "C" extern u32 const lit_5436; -extern "C" extern u32 const lit_5438; -extern "C" extern u32 const lit_5439; -extern "C" extern u32 const lit_5440; -extern "C" extern u32 const lit_5441; -extern "C" extern u32 const lit_5442; -extern "C" extern u32 const lit_5443; -extern "C" extern u32 const lit_5445; -extern "C" extern u8 const lit_5449[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_GOB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_806DF314[4]; -extern "C" extern u8 data_806DF318[4]; -extern "C" extern u8 data_806DF31C[4]; -extern "C" extern u8 data_806DF320[4]; -extern "C" extern u8 data_806DF324[4]; -extern "C" extern u8 data_806DF328[4]; -extern "C" extern u8 data_806DF32C[4]; -extern "C" extern u8 data_806DF330[4]; -extern "C" extern u8 data_806DF334[4]; -extern "C" extern u8 data_806DF338[4]; -extern "C" extern u8 data_806DF33C[4]; -extern "C" extern u8 data_806DF340[4]; -extern "C" extern u8 data_806DF344[4]; -extern "C" extern u8 data_806DF348[4]; -extern "C" extern u8 data_806DF34C[4]; -extern "C" extern u8 data_806DF350[4]; -extern "C" extern u8 data_806DF354[4]; -extern "C" extern u8 data_806DF358[4]; -extern "C" extern u8 data_806DF35C[4]; -extern "C" extern u8 data_806DF360[4]; -extern "C" extern u8 data_806DF364[4]; -extern "C" extern u8 data_806DF368[4]; -extern "C" extern u8 data_806DF36C[4]; -extern "C" extern u8 data_806DF370[4]; -extern "C" extern u8 data_806DF374[4]; extern "C" void __ct__13daE_GOB_HIO_cFv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -473,29 +418,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__13Z2CreatureGob[12]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_XrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_gob/executor.cpp b/rel/d/a/e/d_a_e_gob/executor.cpp index e59f589c051..20e5ffb560d 100644 --- a/rel/d/a/e/d_a_e_gob/executor.cpp +++ b/rel/d/a/e/d_a_e_gob/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806DEE24[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_gob/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_gob/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fb6f64a689f..625b432abd2 100644 --- a/rel/d/a/e/d_a_e_gob/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_gob/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806DEE30[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806DEE30-806DEE38 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806DEE30[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806DF280-806DF288 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_gob/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_gob/unknown_translation_unit_ctors.cpp index 1d71a02ec22..240864cb483 100644 --- a/rel/d/a/e/d_a_e_gob/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_gob/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806DEE24[2]; -extern void* const data_806DEE24[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_gob_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806DEE24-806DEE2C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806DEE24[2] = { + (void*)__sinit_d_a_e_gob_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp b/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp index 42910c88a35..2d26c2141df 100644 --- a/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp +++ b/rel/d/a/e/d_a_e_gs/d_a_e_gs.cpp @@ -28,13 +28,13 @@ struct mDoExt_invisibleModel { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -94,8 +94,6 @@ static bool daE_GS_IsDelete(e_gs_class*); static void daE_GS_Delete(e_gs_class*); static void useHeapInit(fopAc_ac_c*); static void daE_GS_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_GS[12]; extern "C" void __ct__12daE_GS_HIO_cFv(); extern "C" static void anm_init__FP10e_gs_classifUcf(); @@ -134,12 +132,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxScale(f32, f32, f32, u8); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_gs/executor.cpp b/rel/d/a/e/d_a_e_gs/executor.cpp index 072af197e44..ee2134a68e3 100644 --- a/rel/d/a/e/d_a_e_gs/executor.cpp +++ b/rel/d/a/e/d_a_e_gs/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806DFDE0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_gs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_gs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1aa559a3ce0..c9cddac9fae 100644 --- a/rel/d/a/e/d_a_e_gs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_gs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806DFDEC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806DFDEC-806DFDF4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806DFDEC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806DFE90-806DFE98 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_gs/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_gs/unknown_translation_unit_ctors.cpp index ffde0bc1fda..5c3f084a148 100644 --- a/rel/d/a/e/d_a_e_gs/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_gs/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806DFDE0[2]; -extern void* const data_806DFDE0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_gs_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806DFDE0-806DFDE8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806DFDE0[2] = { + (void*)__sinit_d_a_e_gs_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp b/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp index a1c8453f11c..dc5cb512f5f 100644 --- a/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp +++ b/rel/d/a/e/d_a_e_hb/d_a_e_hb.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -51,11 +51,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -268,15 +268,6 @@ static void daE_HB_Delete(e_hb_class*); static void useHeapInit(fopAc_ac_c*); static void daE_HB_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4821; -extern "C" extern u32 const lit_4823; -extern "C" extern u32 const lit_4824; -extern "C" extern u32 const lit_4963; -extern "C" extern u32 const lit_4965; -extern "C" extern u32 const lit_4966; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_HB[12]; extern "C" void __ct__12daE_HB_HIO_cFv(); extern "C" static void anm_init__FP10e_hb_classifUcf(); @@ -374,25 +365,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_hb/executor.cpp b/rel/d/a/e/d_a_e_hb/executor.cpp index dd222f7daf6..365c80c7f71 100644 --- a/rel/d/a/e/d_a_e_hb/executor.cpp +++ b/rel/d/a/e/d_a_e_hb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80500AF0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_hb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_hb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e670af272a7..6e7d23d7a5f 100644 --- a/rel/d/a/e/d_a_e_hb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_hb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80500AFC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80500AFC-80500B04 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80500AFC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80500E58-80500E60 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_hb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_hb/unknown_translation_unit_ctors.cpp index b3fc6c9a61d..5f2c92d95d2 100644 --- a/rel/d/a/e/d_a_e_hb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_hb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80500AF0[2]; -extern void* const data_80500AF0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_hb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80500AF0-80500AF8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80500AF0[2] = { + (void*)__sinit_d_a_e_hb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp index f2c1a5b75b9..05fbfafe46d 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp +++ b/rel/d/a/e/d_a_e_hb_leaf/d_a_e_hb_leaf.cpp @@ -35,10 +35,10 @@ struct fopAc_ac_c { struct e_hb_leaf_class {}; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -60,8 +60,6 @@ static bool daE_HB_LEAF_IsDelete(e_hb_leaf_class*); static void daE_HB_LEAF_Delete(e_hb_leaf_class*); static void useHeapInit(fopAc_ac_c*); static void daE_HB_LEAF_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_HB_LEAF[12]; extern "C" static void daE_HB_LEAF_Draw__FP15e_hb_leaf_class(); extern "C" static void daE_HB_LEAF_Execute__FP15e_hb_leaf_class(); @@ -84,11 +82,6 @@ void fpcSch_JudgeByID(void*, void*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_hb_leaf/executor.cpp b/rel/d/a/e/d_a_e_hb_leaf/executor.cpp index 6a78777d96c..e89f88c1d41 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/executor.cpp +++ b/rel/d/a/e/d_a_e_hb_leaf/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_806E0288[4]; -extern u8 const data_806E028C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_hb_leaf/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_hb_leaf/unknown_translation_unit_ctors.cpp index c34a7cfae35..133cfc05a04 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_hb_leaf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_806E0288[4]; -extern u8 const data_806E0288[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_806E0288[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806E0288-806E028C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_806E0288[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_hb_leaf/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_hb_leaf/unknown_translation_unit_dtors.cpp index bebb9577afe..6e7496490aa 100644 --- a/rel/d/a/e/d_a_e_hb_leaf/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_hb_leaf/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_806E028C[4]; -extern u8 const data_806E028C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_806E028C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 806E028C-806E0290 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_806E028C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp b/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp index 4d33ed2abb2..5f8295305df 100644 --- a/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp +++ b/rel/d/a/e/d_a_e_hm/d_a_e_hm.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 806E58D0 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF0C */ void ZXYrotS(csXyz const&); @@ -52,13 +52,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -81,10 +81,10 @@ struct fopAcM_gc_c { /* 8001DCBC */ void gndCheck(cXyz const*); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_HM_c { /* 806E043C */ void CreateHeap(); /* 806E06C0 */ void initCcCylinder(); @@ -316,56 +316,6 @@ static bool daE_HM_IsDelete(daE_HM_c*); static void daE_HM_Delete(daE_HM_c*); static void daE_HM_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4017; -extern "C" extern u32 const lit_4018; -extern "C" extern u32 const lit_4019; -extern "C" extern u32 const lit_4020; -extern "C" extern u32 const lit_4021; -extern "C" extern u32 const lit_4022; -extern "C" extern u32 const lit_4023[1 + 1 /* padding */]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_HM[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_806E5C48[4]; -extern "C" extern u8 data_806E5C84[4]; -extern "C" extern u8 data_806E5C88[4]; -extern "C" extern u8 data_806E5C8C[4]; -extern "C" extern u8 data_806E5C90[4]; -extern "C" extern u8 data_806E5C94[4]; -extern "C" extern u8 data_806E5C98[4]; -extern "C" extern u8 data_806E5C9C[4]; -extern "C" extern u8 data_806E5CA0[4]; -extern "C" extern u8 data_806E5CA4[4]; -extern "C" extern u8 data_806E5CA8[4]; -extern "C" extern u8 data_806E5CAC[4]; -extern "C" extern u8 data_806E5CB0[4]; -extern "C" extern u8 data_806E5CB4[4]; -extern "C" extern u8 data_806E5CB8[4]; -extern "C" extern u8 data_806E5CBC[4]; -extern "C" extern u8 data_806E5CC0[4]; -extern "C" extern u8 data_806E5CC4[4]; -extern "C" extern u8 data_806E5CC8[4]; -extern "C" extern u8 data_806E5CCC[4]; -extern "C" extern u8 data_806E5CD0[4]; -extern "C" extern u8 data_806E5CD4[4]; -extern "C" extern u8 data_806E5CD8[4]; -extern "C" extern u8 data_806E5CDC[4]; -extern "C" extern u8 data_806E5CE0[4]; -extern "C" extern u8 data_806E5CE4[4]; extern "C" void __ct__12daE_HM_HIO_cFv(); extern "C" void CreateHeap__8daE_HM_cFv(); @@ -526,23 +476,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_hm/executor.cpp b/rel/d/a/e/d_a_e_hm/executor.cpp index 3a0319bd533..45a92eb5010 100644 --- a/rel/d/a/e/d_a_e_hm/executor.cpp +++ b/rel/d/a/e/d_a_e_hm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806E590C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_hm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_hm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 185ceb4fe01..ad4c647446d 100644 --- a/rel/d/a/e/d_a_e_hm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_hm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806E5918[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806E5918-806E5920 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806E5918[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806E5BD0-806E5BD8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_hm/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_hm/unknown_translation_unit_ctors.cpp index 66bdccf3137..5c56eb4b5d3 100644 --- a/rel/d/a/e/d_a_e_hm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_hm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806E590C[2]; -extern void* const data_806E590C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_hm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806E590C-806E5914 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806E590C[2] = { + (void*)__sinit_d_a_e_hm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp b/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp index 1bdb936ee9a..e1f897289f5 100644 --- a/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp +++ b/rel/d/a/e/d_a_e_hp/d_a_e_hp.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -24,6 +22,8 @@ struct cXyz { /* 80267150 */ void atan2sY_XZ() const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -40,13 +40,13 @@ struct mDoExt_invisibleModel { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -315,11 +315,6 @@ static void daE_HP_Delete(daE_HP_c*); static void useHeapInit(fopAc_ac_c*); static void daE_HP_Create(daE_HP_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5054; -extern "C" extern u32 const lit_5055; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_HP[12]; extern "C" void __ct__12daE_HP_HIO_cFv(); extern "C" void ctrlJoint__8daE_HP_cFP8J3DJointP8J3DModel(); @@ -410,27 +405,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_hp/executor.cpp b/rel/d/a/e/d_a_e_hp/executor.cpp index 18b3d1bfc0d..740ff201392 100644 --- a/rel/d/a/e/d_a_e_hp/executor.cpp +++ b/rel/d/a/e/d_a_e_hp/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806EA1E0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_hp/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_hp/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2a2a0c145e2..21520723d97 100644 --- a/rel/d/a/e/d_a_e_hp/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_hp/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806EA1EC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806EA1EC-806EA1F4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806EA1EC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806EA4E0-806EA4E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_hp/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_hp/unknown_translation_unit_ctors.cpp index 859e17c8a6a..563d51e3697 100644 --- a/rel/d/a/e/d_a_e_hp/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_hp/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806EA1E0[2]; -extern void* const data_806EA1E0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_hp_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806EA1E0-806EA1E8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806EA1E0[2] = { + (void*)__sinit_d_a_e_hp_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp b/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp index 907188963e2..943c200b03e 100644 --- a/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp +++ b/rel/d/a/e/d_a_e_hz/d_a_e_hz.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -24,6 +22,8 @@ struct cXyz { /* 806F0810 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -33,13 +33,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -65,10 +65,10 @@ struct daObjCarry_c { /* 80474448 */ void mode_init_drop(u8); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_HZ_c { /* 806EA690 */ void setBck(int, u8, f32, f32); /* 806EA734 */ void checkBck(int); @@ -139,12 +139,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -318,48 +318,6 @@ static void daE_HZ_Delete(daE_HZ_c*); static void useHeapInit(fopAc_ac_c*); static void daE_HZ_Create(daE_HZ_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_HZ[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_806F0BE0[4]; -extern "C" extern u8 data_806F0BE4[4]; -extern "C" extern u8 data_806F0BE8[4]; -extern "C" extern u8 data_806F0BEC[4]; -extern "C" extern u8 data_806F0BF0[4]; -extern "C" extern u8 data_806F0BF4[4]; -extern "C" extern u8 data_806F0BF8[4]; -extern "C" extern u8 data_806F0BFC[4]; -extern "C" extern u8 data_806F0C00[4]; -extern "C" extern u8 data_806F0C04[4]; -extern "C" extern u8 data_806F0C08[4]; -extern "C" extern u8 data_806F0C0C[4]; -extern "C" extern u8 data_806F0C10[4]; -extern "C" extern u8 data_806F0C14[4]; -extern "C" extern u8 data_806F0C18[4]; -extern "C" extern u8 data_806F0C1C[4]; -extern "C" extern u8 data_806F0C20[4]; -extern "C" extern u8 data_806F0C24[4]; -extern "C" extern u8 data_806F0C28[4]; -extern "C" extern u8 data_806F0C2C[4]; -extern "C" extern u8 data_806F0C30[4]; -extern "C" extern u8 data_806F0C34[4]; -extern "C" extern u8 data_806F0C38[4]; -extern "C" extern u8 data_806F0C3C[4]; -extern "C" extern u8 data_806F0C40[4]; extern "C" void __ct__12daE_HZ_HIO_cFv(); extern "C" void setBck__8daE_HZ_cFiUcff(); @@ -513,23 +471,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_hz/executor.cpp b/rel/d/a/e/d_a_e_hz/executor.cpp index 0d77b8b12d8..06c45e62d6f 100644 --- a/rel/d/a/e/d_a_e_hz/executor.cpp +++ b/rel/d/a/e/d_a_e_hz/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806F084C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_hz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_hz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e8ab80fce8f..db646ddb1dc 100644 --- a/rel/d/a/e/d_a_e_hz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_hz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806F0858[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806F0858-806F0860 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806F0858[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806F0B28-806F0B30 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_hz/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_hz/unknown_translation_unit_ctors.cpp index a10f097a795..8d91c0142a2 100644 --- a/rel/d/a/e/d_a_e_hz/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_hz/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806F084C[2]; -extern void* const data_806F084C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_hz_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806F084C-806F0854 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806F084C[2] = { + (void*)__sinit_d_a_e_hz_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp b/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp index 3afb0799ad2..bf5ccdb6728 100644 --- a/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp +++ b/rel/d/a/e/d_a_e_hzelda/d_a_e_hzelda.cpp @@ -41,13 +41,13 @@ struct mDoExt_brkAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -305,10 +305,6 @@ static bool daE_HZELDA_IsDelete(e_hzelda_class*); static void daE_HZELDA_Delete(e_hzelda_class*); static void useHeapInit(fopAc_ac_c*); static void daE_HZELDA_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4071; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_HZELDA[12]; extern "C" void __ct__16daE_HZELDA_HIO_cFv(); extern "C" static void anm_init__FP14e_hzelda_classifUcf(); @@ -389,25 +385,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_hzelda/executor.cpp b/rel/d/a/e/d_a_e_hzelda/executor.cpp index 4252e1e2db7..8aa922fcdea 100644 --- a/rel/d/a/e/d_a_e_hzelda/executor.cpp +++ b/rel/d/a/e/d_a_e_hzelda/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806F5500[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_hzelda/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_hzelda/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 08b353834dd..a5f29b5feee 100644 --- a/rel/d/a/e/d_a_e_hzelda/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_hzelda/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806F550C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806F550C-806F5514 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806F550C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806F5920-806F5928 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_hzelda/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_hzelda/unknown_translation_unit_ctors.cpp index 6b295213e53..818949d39b7 100644 --- a/rel/d/a/e/d_a_e_hzelda/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_hzelda/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806F5500[2]; -extern void* const data_806F5500[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_hzelda_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806F5500-806F5508 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806F5500[2] = { + (void*)__sinit_d_a_e_hzelda_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_is/d_a_e_is.cpp b/rel/d/a/e/d_a_e_is/d_a_e_is.cpp index 918a7ce062d..ddae56a89ba 100644 --- a/rel/d/a/e/d_a_e_is/d_a_e_is.cpp +++ b/rel/d/a/e/d_a_e_is/d_a_e_is.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -218,11 +218,6 @@ static bool daE_IS_IsDelete(e_is_class*); static void daE_IS_Delete(e_is_class*); static void useHeapInit(fopAc_ac_c*); static void daE_IS_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3967; -extern "C" extern u32 const lit_3969; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_IS[12]; extern "C" void __ct__12daE_IS_HIO_cFv(); extern "C" static void anm_init__FP10e_is_classifUcf(); @@ -294,20 +289,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_is/executor.cpp b/rel/d/a/e/d_a_e_is/executor.cpp index 2f2c2b69c38..8703958c9da 100644 --- a/rel/d/a/e/d_a_e_is/executor.cpp +++ b/rel/d/a/e/d_a_e_is/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806F7B58[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_is/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_is/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8b1a577c4ba..c04feb9f9c5 100644 --- a/rel/d/a/e/d_a_e_is/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_is/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806F7B64[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806F7B64-806F7B6C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806F7B64[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806F7DC8-806F7DD0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_is/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_is/unknown_translation_unit_ctors.cpp index 402b40f1cb8..b58109b4183 100644 --- a/rel/d/a/e/d_a_e_is/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_is/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806F7B58[2]; -extern void* const data_806F7B58[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_is_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806F7B58-806F7B60 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806F7B58[2] = { + (void*)__sinit_d_a_e_is_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp b/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp index 9777a0df2be..3d47d969285 100644 --- a/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp +++ b/rel/d/a/e/d_a_e_kg/d_a_e_kg.cpp @@ -17,10 +17,10 @@ struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -28,13 +28,13 @@ struct mDoExt_btpAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -65,14 +65,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -226,10 +226,6 @@ static void daE_KG_Delete(e_kg_class*); static void useHeapInit(fopAc_ac_c*); static void daE_KG_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u8 const lit_4278[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_KG[12]; extern "C" void __ct__12daE_KG_HIO_cFv(); extern "C" static void anm_init__FP10e_kg_classifUcf(); @@ -297,21 +293,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_kg/executor.cpp b/rel/d/a/e/d_a_e_kg/executor.cpp index 1a19dd3dad4..15b09ba519d 100644 --- a/rel/d/a/e/d_a_e_kg/executor.cpp +++ b/rel/d/a/e/d_a_e_kg/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806FA390[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_kg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_kg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f3be19016e9..4e1945bb383 100644 --- a/rel/d/a/e/d_a_e_kg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_kg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806FA39C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806FA39C-806FA3A4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806FA39C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806FA5E0-806FA5E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_kg/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_kg/unknown_translation_unit_ctors.cpp index cf1695f46d4..52755dcc7d8 100644 --- a/rel/d/a/e/d_a_e_kg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_kg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806FA390[2]; -extern void* const data_806FA390[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_kg_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806FA390-806FA398 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806FA390[2] = { + (void*)__sinit_d_a_e_kg_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp b/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp index 74f268a5cf4..bdc8b9033ad 100644 --- a/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp +++ b/rel/d/a/e/d_a_e_kk/d_a_e_kk.cpp @@ -22,13 +22,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -46,10 +46,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct Vec {}; struct cXyz { @@ -270,10 +270,6 @@ static void daE_KK_Delete(daE_KK_c*); static void useHeapInit(fopAc_ac_c*); static void daE_KK_Create(daE_KK_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5171; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_KK[12]; extern "C" void __ct__12daE_KK_HIO_cFv(); extern "C" void ctrlJoint__8daE_KK_cFP8J3DJointP8J3DModel(); @@ -373,26 +369,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_kk/executor.cpp b/rel/d/a/e/d_a_e_kk/executor.cpp index 21fe561c2b2..4648b932c2b 100644 --- a/rel/d/a/e/d_a_e_kk/executor.cpp +++ b/rel/d/a/e/d_a_e_kk/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_806FF5D4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_kk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_kk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9cb7492c6a7..1d43ae87d06 100644 --- a/rel/d/a/e/d_a_e_kk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_kk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_806FF5E0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 806FF5E0-806FF5E8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_806FF5E0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 806FF878-806FF880 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_kk/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_kk/unknown_translation_unit_ctors.cpp index 25bb2a1aeae..e7211bc9981 100644 --- a/rel/d/a/e/d_a_e_kk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_kk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_806FF5D4[2]; -extern void* const data_806FF5D4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_kk_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 806FF5D4-806FF5DC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_806FF5D4[2] = { + (void*)__sinit_d_a_e_kk_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp b/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp index f77161d222a..134712ff86d 100644 --- a/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp +++ b/rel/d/a/e/d_a_e_kr/d_a_e_kr.cpp @@ -19,13 +19,13 @@ struct mDoHIO_entry_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -69,8 +69,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -81,6 +79,8 @@ struct cXyz { /* 80705AA8 */ ~cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -257,21 +257,6 @@ static void daE_Kr_Delete(e_kr_class*); static void useHeapInit(fopAc_ac_c*); static void daE_Kr_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4271; -extern "C" extern u32 const lit_4422; -extern "C" extern u32 const lit_4426; -extern "C" extern u32 const lit_4831; -extern "C" extern u32 const lit_4832; -extern "C" extern u32 const lit_4833; -extern "C" extern u32 const lit_4834; -extern "C" extern u32 const lit_4836; -extern "C" extern u32 const lit_4837; -extern "C" extern u32 const lit_4838; -extern "C" extern u32 const lit_5112; -extern "C" extern u32 const lit_5113; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_KR[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" static void anm_init__FP10e_kr_classifUcf(); @@ -377,23 +362,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_kr/executor.cpp b/rel/d/a/e/d_a_e_kr/executor.cpp index 17e1b287f91..72f8023dd79 100644 --- a/rel/d/a/e/d_a_e_kr/executor.cpp +++ b/rel/d/a/e/d_a_e_kr/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80705AE4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_kr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_kr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 74f98e7ab46..f51ea7c5493 100644 --- a/rel/d/a/e/d_a_e_kr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_kr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80705AF0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80705AF0-80705AF8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80705AF0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80705FE0-80705FE8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_kr/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_kr/unknown_translation_unit_ctors.cpp index c308fc6cd67..40f5759d172 100644 --- a/rel/d/a/e/d_a_e_kr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_kr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80705AE4[2]; -extern void* const data_80705AE4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_kr_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80705AE4-80705AEC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80705AE4[2] = { + (void*)__sinit_d_a_e_kr_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp b/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp index 17650992923..787bdf283ee 100644 --- a/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp +++ b/rel/d/a/e/d_a_e_mb/d_a_e_mb.cpp @@ -20,10 +20,10 @@ struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -31,13 +31,13 @@ struct mDoExt_btpAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -68,11 +68,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -180,49 +180,6 @@ static bool daE_MB_IsDelete(e_mb_class*); static void daE_MB_Delete(e_mb_class*); static void useHeapInit(fopAc_ac_c*); static void daE_MB_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3880; -extern "C" extern u32 const lit_3882; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_MB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80708D00[4]; -extern "C" extern u8 data_80708D04[4]; -extern "C" extern u8 data_80708D08[4]; -extern "C" extern u8 data_80708D0C[4]; -extern "C" extern u8 data_80708D10[4]; -extern "C" extern u8 data_80708D14[4]; -extern "C" extern u8 data_80708D18[4]; -extern "C" extern u8 data_80708D1C[4]; -extern "C" extern u8 data_80708D20[4]; -extern "C" extern u8 data_80708D24[4]; -extern "C" extern u8 data_80708D28[4]; -extern "C" extern u8 data_80708D2C[4]; -extern "C" extern u8 data_80708D30[4]; -extern "C" extern u8 data_80708D34[4]; -extern "C" extern u8 data_80708D38[4]; -extern "C" extern u8 data_80708D3C[4]; -extern "C" extern u8 data_80708D40[4]; -extern "C" extern u8 data_80708D44[4]; -extern "C" extern u8 data_80708D48[4]; -extern "C" extern u8 data_80708D4C[4]; -extern "C" extern u8 data_80708D50[4]; -extern "C" extern u8 data_80708D54[4]; -extern "C" extern u8 data_80708D58[4]; -extern "C" extern u8 data_80708D5C[4]; -extern "C" extern u8 data_80708D60[4]; extern "C" void __ct__12daE_MB_HIO_cFv(); extern "C" static void anm_init__FP10e_mb_classifUcf(); @@ -317,20 +274,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_mb/executor.cpp b/rel/d/a/e/d_a_e_mb/executor.cpp index 3af9d132de4..9c6437afb74 100644 --- a/rel/d/a/e/d_a_e_mb/executor.cpp +++ b/rel/d/a/e/d_a_e_mb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807089FC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_mb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_mb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 964fcd81755..eb873e0d7c0 100644 --- a/rel/d/a/e/d_a_e_mb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_mb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80708A08[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80708A08-80708A10 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80708A08[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80708BE8-80708BF0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_mb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_mb/unknown_translation_unit_ctors.cpp index 989e14c6344..b138940d4c2 100644 --- a/rel/d/a/e/d_a_e_mb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_mb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807089FC[2]; -extern void* const data_807089FC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_mb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807089FC-80708A04 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807089FC[2] = { + (void*)__sinit_d_a_e_mb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_md/d_a_e_md.cpp b/rel/d/a/e/d_a_e_md/d_a_e_md.cpp index f5554a609ba..88476150222 100644 --- a/rel/d/a/e/d_a_e_md/d_a_e_md.cpp +++ b/rel/d/a/e/d_a_e_md/d_a_e_md.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -26,13 +26,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -197,8 +197,6 @@ static void daE_MD_Delete(daE_MD_c*); static void daE_MD_Draw(daE_MD_c*); static void daE_MD_Execute(daE_MD_c*); static bool daE_MD_IsDelete(daE_MD_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_MD[12]; extern "C" void initCcCylinder__8daE_MD_cFv(); extern "C" void setCcCylinder__8daE_MD_cFf(); @@ -251,21 +249,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseAngleS(s16*, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/e/d_a_e_md/executor.cpp b/rel/d/a/e/d_a_e_md/executor.cpp index 007b5920ebe..9bd0c8e90a4 100644 --- a/rel/d/a/e/d_a_e_md/executor.cpp +++ b/rel/d/a/e/d_a_e_md/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8070A4E4[4]; -extern u8 const data_8070A4E8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_md/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_md/unknown_translation_unit_ctors.cpp index d6693a5f6ed..7e02eb01abd 100644 --- a/rel/d/a/e/d_a_e_md/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_md/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8070A4E4[4]; -extern u8 const data_8070A4E4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8070A4E4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8070A4E4-8070A4E8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8070A4E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_md/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_md/unknown_translation_unit_dtors.cpp index 740e1d8d256..572be3d07b5 100644 --- a/rel/d/a/e/d_a_e_md/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_md/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8070A4E8[4]; -extern u8 const data_8070A4E8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8070A4E8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8070A4E8-8070A4EC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8070A4E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp b/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp index 4b8ad0431eb..b1f5793b8a6 100644 --- a/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp +++ b/rel/d/a/e/d_a_e_mf/d_a_e_mf.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -62,8 +62,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -71,6 +69,8 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -105,10 +105,10 @@ struct dPa_control_c { cXyz const*, f32); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -316,58 +316,6 @@ static void daE_MF_Delete(e_mf_class*); static void useHeapInit(fopAc_ac_c*); static void daE_MF_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4568; -extern "C" extern u32 const lit_6007; -extern "C" extern u32 const lit_6008; -extern "C" extern u32 const lit_6886; -extern "C" extern u32 const lit_6887; -extern "C" extern u32 const lit_6888; -extern "C" extern u32 const lit_6889; -extern "C" extern u32 const lit_6890; -extern "C" extern u32 const lit_6891; -extern "C" extern u32 const lit_6892; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_MF[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80713FC8[4]; -extern "C" extern u8 data_80713FCC[4]; -extern "C" extern u8 data_80713FD0[4]; -extern "C" extern u8 data_80713FD4[4]; -extern "C" extern u8 data_80713FD8[4]; -extern "C" extern u8 data_80713FDC[4]; -extern "C" extern u8 data_80713FE0[4]; -extern "C" extern u8 data_80713FE4[4]; -extern "C" extern u8 data_80713FE8[4]; -extern "C" extern u8 data_80713FEC[4]; -extern "C" extern u8 data_80713FF0[4]; -extern "C" extern u8 data_80713FF4[4]; -extern "C" extern u8 data_80713FF8[4]; -extern "C" extern u8 data_80713FFC[4]; -extern "C" extern u8 data_80714000[4]; -extern "C" extern u8 data_80714004[4]; -extern "C" extern u8 data_80714008[4]; -extern "C" extern u8 data_8071400C[4]; -extern "C" extern u8 data_80714010[4]; -extern "C" extern u8 data_80714014[4]; -extern "C" extern u8 data_80714018[4]; -extern "C" extern u8 data_8071401C[4]; -extern "C" extern u8 data_80714020[4]; -extern "C" extern u8 data_80714024[4]; -extern "C" extern u8 data_80714028[4]; extern "C" void __ct__12daE_MF_HIO_cFv(); extern "C" static void mf_disappear__FP10e_mf_class(); @@ -538,24 +486,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_mf/executor.cpp b/rel/d/a/e/d_a_e_mf/executor.cpp index 7b7c9e7ad39..9a984915b62 100644 --- a/rel/d/a/e/d_a_e_mf/executor.cpp +++ b/rel/d/a/e/d_a_e_mf/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80713960[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_mf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_mf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e1441457ab5..455f942fbb0 100644 --- a/rel/d/a/e/d_a_e_mf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_mf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8071396C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8071396C-80713974 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8071396C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80713F20-80713F28 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_mf/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_mf/unknown_translation_unit_ctors.cpp index d512db1124c..b653d66adf3 100644 --- a/rel/d/a/e/d_a_e_mf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_mf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80713960[2]; -extern void* const data_80713960[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_mf_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80713960-80713968 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80713960[2] = { + (void*)__sinit_d_a_e_mf_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp b/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp index 3fb06128fb7..5d70bf6fb1a 100644 --- a/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp +++ b/rel/d/a/e/d_a_e_mk/d_a_e_mk.cpp @@ -18,10 +18,10 @@ struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -29,13 +29,13 @@ struct mDoExt_btpAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -290,51 +290,6 @@ static bool daE_MK_IsDelete(e_mk_class*); static void daE_MK_Delete(e_mk_class*); static void useHeapInit(fopAc_ac_c*); static void daE_MK_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4435; -extern "C" extern u32 const lit_5004; -extern "C" extern u32 const lit_6175; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_MK[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8071CB94[4]; -extern "C" extern u8 data_8071CB98[4]; -extern "C" extern u8 data_8071CB9C[4]; -extern "C" extern u8 data_8071CBA0[4]; -extern "C" extern u8 data_8071CBA4[4]; -extern "C" extern u8 data_8071CBA8[4]; -extern "C" extern u8 data_8071CBAC[4]; -extern "C" extern u8 data_8071CBB0[4]; -extern "C" extern u8 data_8071CBB4[4]; -extern "C" extern u8 data_8071CBB8[4]; -extern "C" extern u8 data_8071CBBC[4]; -extern "C" extern u8 data_8071CBC0[4]; -extern "C" extern u8 data_8071CBC4[4]; -extern "C" extern u8 data_8071CBC8[4]; -extern "C" extern u8 data_8071CBCC[4]; -extern "C" extern u8 data_8071CBD0[4]; -extern "C" extern u8 data_8071CBD4[4]; -extern "C" extern u8 data_8071CBD8[4]; -extern "C" extern u8 data_8071CBDC[4]; -extern "C" extern u8 data_8071CBE0[4]; -extern "C" extern u8 data_8071CBE4[4]; -extern "C" extern u8 data_8071CBE8[4]; -extern "C" extern u8 data_8071CBEC[4]; -extern "C" extern u8 data_8071CBF0[4]; -extern "C" extern u8 data_8071CBF4[4]; extern "C" void __ct__12daE_MK_HIO_cFv(); extern "C" static void anm_init__FP10e_mk_classifUcf(); @@ -474,23 +429,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_mk/executor.cpp b/rel/d/a/e/d_a_e_mk/executor.cpp index 24843848c0b..2f27a08eef3 100644 --- a/rel/d/a/e/d_a_e_mk/executor.cpp +++ b/rel/d/a/e/d_a_e_mk/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8071C530[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_mk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_mk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b5ca8a8f3cf..23e8c52c7a8 100644 --- a/rel/d/a/e/d_a_e_mk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_mk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8071C53C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8071C53C-8071C544 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8071C53C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8071CA60-8071CA68 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_mk/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_mk/unknown_translation_unit_ctors.cpp index 5817cb16de2..92e6cc3fe87 100644 --- a/rel/d/a/e/d_a_e_mk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_mk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8071C530[2]; -extern void* const data_8071C530[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_mk_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8071C530-8071C538 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8071C530[2] = { + (void*)__sinit_d_a_e_mk_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp b/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp index b589186fe81..a719181dfe7 100644 --- a/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp +++ b/rel/d/a/e/d_a_e_mk_bo/d_a_e_mk_bo.cpp @@ -35,11 +35,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -225,49 +225,6 @@ static bool daE_MK_BO_IsDelete(e_mk_bo_class*); static void daE_MK_BO_Delete(e_mk_bo_class*); static void useHeapInit(fopAc_ac_c*); static void daE_MK_BO_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_MK_BO[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8071F87C[4]; -extern "C" extern u8 data_8071F880[4]; -extern "C" extern u8 data_8071F884[4]; -extern "C" extern u8 data_8071F888[4]; -extern "C" extern u8 data_8071F88C[4]; -extern "C" extern u8 data_8071F890[4]; -extern "C" extern u8 data_8071F894[4]; -extern "C" extern u8 data_8071F898[4]; -extern "C" extern u8 data_8071F89C[4]; -extern "C" extern u8 data_8071F8A0[4]; -extern "C" extern u8 data_8071F8A4[4]; -extern "C" extern u8 data_8071F8A8[4]; -extern "C" extern u8 data_8071F8AC[4]; -extern "C" extern u8 data_8071F8B0[4]; -extern "C" extern u8 data_8071F8B4[4]; -extern "C" extern u8 data_8071F8B8[4]; -extern "C" extern u8 data_8071F8BC[4]; -extern "C" extern u8 data_8071F8C0[4]; -extern "C" extern u8 data_8071F8C4[4]; -extern "C" extern u8 data_8071F8C8[4]; -extern "C" extern u8 data_8071F8CC[4]; -extern "C" extern u8 data_8071F8D0[4]; -extern "C" extern u8 data_8071F8D4[4]; -extern "C" extern u8 data_8071F8D8[4]; -extern "C" extern u8 data_8071F8DC[4]; extern "C" static void daE_MK_BO_Draw__FP13e_mk_bo_class(); extern "C" static void hit_check__FP13e_mk_bo_class(); @@ -368,20 +325,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_mk_bo/executor.cpp b/rel/d/a/e/d_a_e_mk_bo/executor.cpp index b4b0477d9de..61cd4eb8776 100644 --- a/rel/d/a/e/d_a_e_mk_bo/executor.cpp +++ b/rel/d/a/e/d_a_e_mk_bo/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8071F630[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_mk_bo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_mk_bo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b540652bd3d..40ea5f91b4d 100644 --- a/rel/d/a/e/d_a_e_mk_bo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_mk_bo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8071F638[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8071F638-8071F640 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8071F638[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8071F818-8071F820 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_mk_bo/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_mk_bo/unknown_translation_unit_ctors.cpp index 78131ea4189..d3ab7f6c372 100644 --- a/rel/d/a/e/d_a_e_mk_bo/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_mk_bo/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8071F630[4]; -extern u8 const data_8071F630[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8071F630[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8071F630-8071F634 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8071F630[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp b/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp index edb415c49fd..0910710d92a 100644 --- a/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp +++ b/rel/d/a/e/d_a_e_mm/d_a_e_mm.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -55,8 +55,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -64,6 +62,8 @@ struct cXyz { /* 80267128 */ void atan2sX_Z() const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -237,12 +237,6 @@ static void daE_MM_Delete(e_mm_class*); static void useHeapInit(fopAc_ac_c*); static void daE_MM_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4618; -extern "C" extern u32 const lit_4619; -extern "C" extern u32 const lit_4620; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_MM[12]; extern "C" void __ct__12daE_MM_HIO_cFv(); extern "C" static void anm_init__FP10e_mm_classifUcf(); @@ -320,20 +314,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_mm/executor.cpp b/rel/d/a/e/d_a_e_mm/executor.cpp index dffeabf0b47..c7dc20a25df 100644 --- a/rel/d/a/e/d_a_e_mm/executor.cpp +++ b/rel/d/a/e/d_a_e_mm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80722C28[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_mm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_mm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 50bf6d9f844..d683b5e6514 100644 --- a/rel/d/a/e/d_a_e_mm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_mm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80722C34[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80722C34-80722C3C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80722C34[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80722EA8-80722EB0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_mm/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_mm/unknown_translation_unit_ctors.cpp index 9b3a245daa8..f71a074a402 100644 --- a/rel/d/a/e/d_a_e_mm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_mm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80722C28[2]; -extern void* const data_80722C28[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_mm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80722C28-80722C30 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80722C28[2] = { + (void*)__sinit_d_a_e_mm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp b/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp index 8e06fb66688..1f39885678f 100644 --- a/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp +++ b/rel/d/a/e/d_a_e_mm_mt/d_a_e_mm_mt.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,6 +21,8 @@ struct cXyz { /* 80267150 */ void atan2sY_XZ() const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -192,9 +192,6 @@ static void daE_MM_MT_Delete(e_mm_mt_class*); static void useHeapInit(fopAc_ac_c*); static void daE_MM_MT_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_MM_MT[12]; extern "C" static void daE_MM_MT_Draw__FP13e_mm_mt_class(); extern "C" static void e_mm_hookCheck__FP13e_mm_mt_class(); @@ -257,23 +254,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_distanceAngleS(s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_mm_mt/executor.cpp b/rel/d/a/e/d_a_e_mm_mt/executor.cpp index 3d3b8f80898..d9322415bc8 100644 --- a/rel/d/a/e/d_a_e_mm_mt/executor.cpp +++ b/rel/d/a/e/d_a_e_mm_mt/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80725850[4]; -extern u8 const data_80725854[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_mm_mt/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_mm_mt/unknown_translation_unit_ctors.cpp index fd187538d5f..9f9ccc153f2 100644 --- a/rel/d/a/e/d_a_e_mm_mt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_mm_mt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80725850[4]; -extern u8 const data_80725850[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80725850[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80725850-80725854 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80725850[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_mm_mt/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_mm_mt/unknown_translation_unit_dtors.cpp index 147a5e678e4..2679fc10562 100644 --- a/rel/d/a/e/d_a_e_mm_mt/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_mm_mt/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80725854[4]; -extern u8 const data_80725854[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80725854[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80725854-80725858 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80725854[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp b/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp index 802ac4e539e..044ee96b808 100644 --- a/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp +++ b/rel/d/a/e/d_a_e_ms/d_a_e_ms.cpp @@ -20,13 +20,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -239,55 +239,6 @@ static void daE_MS_Delete(e_ms_class*); static void useHeapInit(fopAc_ac_c*); static void daE_MS_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4619; -extern "C" extern u32 const lit_4620; -extern "C" extern u32 const lit_4621; -extern "C" extern u32 const lit_4623; -extern "C" extern u32 const lit_4624; -extern "C" extern u32 const lit_4625; -extern "C" extern u32 const lit_4627; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_MS[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80729898[4]; -extern "C" extern u8 data_8072989C[4]; -extern "C" extern u8 data_807298A0[4]; -extern "C" extern u8 data_807298A4[4]; -extern "C" extern u8 data_807298A8[4]; -extern "C" extern u8 data_807298AC[4]; -extern "C" extern u8 data_807298B0[4]; -extern "C" extern u8 data_807298B4[4]; -extern "C" extern u8 data_807298B8[4]; -extern "C" extern u8 data_807298BC[4]; -extern "C" extern u8 data_807298C0[4]; -extern "C" extern u8 data_807298C4[4]; -extern "C" extern u8 data_807298C8[4]; -extern "C" extern u8 data_807298CC[4]; -extern "C" extern u8 data_807298D0[4]; -extern "C" extern u8 data_807298D4[4]; -extern "C" extern u8 data_807298D8[4]; -extern "C" extern u8 data_807298DC[4]; -extern "C" extern u8 data_807298E0[4]; -extern "C" extern u8 data_807298E4[4]; -extern "C" extern u8 data_807298E8[4]; -extern "C" extern u8 data_807298EC[4]; -extern "C" extern u8 data_807298F0[4]; -extern "C" extern u8 data_807298F4[4]; -extern "C" extern u8 data_807298F8[4]; extern "C" void __ct__12daE_MS_HIO_cFv(); extern "C" static void anm_init__FP10e_ms_classifUcf(); @@ -413,22 +364,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ms/executor.cpp b/rel/d/a/e/d_a_e_ms/executor.cpp index efca41d7986..8fe759dab1c 100644 --- a/rel/d/a/e/d_a_e_ms/executor.cpp +++ b/rel/d/a/e/d_a_e_ms/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807294F0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ms/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ms/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index bbf48138706..16f9ff475aa 100644 --- a/rel/d/a/e/d_a_e_ms/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ms/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807294FC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807294FC-80729504 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807294FC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807297B8-807297C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ms/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ms/unknown_translation_unit_ctors.cpp index 5f89040cc8a..cd350e6e107 100644 --- a/rel/d/a/e/d_a_e_ms/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ms/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807294F0[2]; -extern void* const data_807294F0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ms_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807294F0-807294F8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807294F0[2] = { + (void*)__sinit_d_a_e_ms_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp b/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp index c0ace3ec4b1..27bf85a2fde 100644 --- a/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp +++ b/rel/d/a/e/d_a_e_nest/d_a_e_nest.cpp @@ -261,8 +261,6 @@ static bool daE_Nest_IsDelete(e_nest_class*); static void daE_Nest_Delete(e_nest_class*); static void useHeapInit(fopAc_ac_c*); static void daE_Nest_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_NEST[12]; extern "C" void __ct__14daE_Nest_HIO_cFv(); extern "C" static void hahen_draw__FP12e_nest_class(); @@ -342,25 +340,6 @@ void MtxTrans(f32, f32, f32, u8); void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_nest/executor.cpp b/rel/d/a/e/d_a_e_nest/executor.cpp index af737a17520..2f212743d52 100644 --- a/rel/d/a/e/d_a_e_nest/executor.cpp +++ b/rel/d/a/e/d_a_e_nest/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805046C8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_nest/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_nest/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 0d6b3b741b2..e5cdd7dee55 100644 --- a/rel/d/a/e/d_a_e_nest/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_nest/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805046D4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805046D4-805046DC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805046D4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80504948-80504950 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_nest/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_nest/unknown_translation_unit_ctors.cpp index a6f55e3d7c6..508c8e7344e 100644 --- a/rel/d/a/e/d_a_e_nest/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_nest/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805046C8[2]; -extern void* const data_805046C8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_nest_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805046C8-805046D0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805046C8[2] = { + (void*)__sinit_d_a_e_nest_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp b/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp index 9f11eacbafb..35c151cac37 100644 --- a/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp +++ b/rel/d/a/e/d_a_e_nz/d_a_e_nz.cpp @@ -34,13 +34,13 @@ struct mDoExt_invisibleModel { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -233,48 +233,6 @@ static void daE_NZ_Delete(e_nz_class*); static void useHeapInit(fopAc_ac_c*); static void daE_NZ_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_NZ[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8072C474[4]; -extern "C" extern u8 data_8072C478[4]; -extern "C" extern u8 data_8072C47C[4]; -extern "C" extern u8 data_8072C480[4]; -extern "C" extern u8 data_8072C484[4]; -extern "C" extern u8 data_8072C488[4]; -extern "C" extern u8 data_8072C48C[4]; -extern "C" extern u8 data_8072C490[4]; -extern "C" extern u8 data_8072C494[4]; -extern "C" extern u8 data_8072C498[4]; -extern "C" extern u8 data_8072C49C[4]; -extern "C" extern u8 data_8072C4A0[4]; -extern "C" extern u8 data_8072C4A4[4]; -extern "C" extern u8 data_8072C4A8[4]; -extern "C" extern u8 data_8072C4AC[4]; -extern "C" extern u8 data_8072C4B0[4]; -extern "C" extern u8 data_8072C4B4[4]; -extern "C" extern u8 data_8072C4B8[4]; -extern "C" extern u8 data_8072C4BC[4]; -extern "C" extern u8 data_8072C4C0[4]; -extern "C" extern u8 data_8072C4C4[4]; -extern "C" extern u8 data_8072C4C8[4]; -extern "C" extern u8 data_8072C4CC[4]; -extern "C" extern u8 data_8072C4D0[4]; -extern "C" extern u8 data_8072C4D4[4]; extern "C" void __ct__12daE_NZ_HIO_cFv(); extern "C" static void anm_init__FP10e_nz_classifUcf(); @@ -385,19 +343,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_nz/executor.cpp b/rel/d/a/e/d_a_e_nz/executor.cpp index 1ded0f3c3d8..405a2b38a08 100644 --- a/rel/d/a/e/d_a_e_nz/executor.cpp +++ b/rel/d/a/e/d_a_e_nz/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8072C16C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_nz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_nz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fef49669cfa..2ec3ddcd23c 100644 --- a/rel/d/a/e/d_a_e_nz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_nz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8072C178[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8072C178-8072C180 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8072C178[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8072C3E0-8072C3E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_nz/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_nz/unknown_translation_unit_ctors.cpp index df5817a00c0..1954549c607 100644 --- a/rel/d/a/e/d_a_e_nz/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_nz/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8072C16C[2]; -extern void* const data_8072C16C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_nz_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8072C16C-8072C174 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8072C16C[2] = { + (void*)__sinit_d_a_e_nz_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp b/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp index 2b5dc55beaa..076c6607747 100644 --- a/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp +++ b/rel/d/a/e/d_a_e_oc/d_a_e_oc.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 80735AD8 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -31,13 +31,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -55,10 +55,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_OC_c { /* 8072C630 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 8072C6E8 */ void JointCallBack(J3DJoint*, int); @@ -329,64 +329,6 @@ static void daE_OC_Delete(daE_OC_c*); static void useHeapInit(fopAc_ac_c*); static void daE_OC_Create(daE_OC_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_6501; -extern "C" extern u32 const lit_6502; -extern "C" extern u32 const lit_6503; -extern "C" extern u32 const lit_6504; -extern "C" extern u32 const lit_6505; -extern "C" extern u32 const lit_6506; -extern "C" extern u32 const lit_6507; -extern "C" extern u32 const lit_6508; -extern "C" extern u32 const lit_6509; -extern "C" extern u32 const lit_6510; -extern "C" extern u32 const lit_6511; -extern "C" extern u32 const lit_6512[1 + 1 /* padding */]; -extern "C" extern u32 const lit_6590; -extern "C" extern u32 const lit_6591; -extern "C" extern u32 const lit_6592; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_OC[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_807360A4[4]; -extern "C" extern u8 data_807360A8[4]; -extern "C" extern u8 data_807360AC[4]; -extern "C" extern u8 data_807360B0[4]; -extern "C" extern u8 data_807360B4[4]; -extern "C" extern u8 data_807360B8[4]; -extern "C" extern u8 data_807360BC[4]; -extern "C" extern u8 data_807360C0[4]; -extern "C" extern u8 data_807360C4[4]; -extern "C" extern u8 data_807360C8[4]; -extern "C" extern u8 data_807360CC[4]; -extern "C" extern u8 data_807360D0[4]; -extern "C" extern u8 data_807360D4[4]; -extern "C" extern u8 data_807360D8[4]; -extern "C" extern u8 data_807360DC[4]; -extern "C" extern u8 data_807360E0[4]; -extern "C" extern u8 data_807360E4[4]; -extern "C" extern u8 data_807360E8[4]; -extern "C" extern u8 data_807360EC[4]; -extern "C" extern u8 data_807360F0[4]; -extern "C" extern u8 data_807360F4[4]; -extern "C" extern u8 data_807360F8[4]; -extern "C" extern u8 data_807360FC[4]; -extern "C" extern u8 data_80736100[4]; -extern "C" extern u8 data_80736104[4]; extern "C" void __ct__12daE_OC_HIO_cFv(); extern "C" void ctrlJoint__8daE_OC_cFP8J3DJointP8J3DModel(); @@ -576,23 +518,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/e/d_a_e_oc/executor.cpp b/rel/d/a/e/d_a_e_oc/executor.cpp index 30a330ba18e..585008c817b 100644 --- a/rel/d/a/e/d_a_e_oc/executor.cpp +++ b/rel/d/a/e/d_a_e_oc/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80735B14[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_oc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_oc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6b29afef1a3..6fde030052f 100644 --- a/rel/d/a/e/d_a_e_oc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_oc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80735B20[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80735B20-80735B28 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80735B20[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80735FF8-80736000 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_oc/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_oc/unknown_translation_unit_ctors.cpp index e692ba606d1..92a9f614f66 100644 --- a/rel/d/a/e/d_a_e_oc/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_oc/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80735B14[2]; -extern void* const data_80735B14[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_oc_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80735B14-80735B1C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80735B14[2] = { + (void*)__sinit_d_a_e_oc_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp index c027d6e73c5..865b9d3cb9d 100644 --- a/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/d_a_e_oct_bg.cpp @@ -33,13 +33,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -66,10 +66,10 @@ struct fopAcM_gc_c { /* 8001DCBC */ void gndCheck(cXyz const*); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_OctBg_c { /* 8073626C */ void setAction(void (daE_OctBg_c::*)()); /* 80736310 */ void setSparkEffect(); @@ -242,48 +242,6 @@ static void useHeapInit(fopAc_ac_c*); static void daE_OctBg_Create(daE_OctBg_c*); static void daE_OctBg_Draw(daE_OctBg_c*); static void daE_OctBg_IsDelete(daE_OctBg_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_OctBg[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8073A174[4]; -extern "C" extern u8 data_8073A178[4]; -extern "C" extern u8 data_8073A17C[4]; -extern "C" extern u8 data_8073A180[4]; -extern "C" extern u8 data_8073A184[4]; -extern "C" extern u8 data_8073A188[4]; -extern "C" extern u8 data_8073A18C[4]; -extern "C" extern u8 data_8073A190[4]; -extern "C" extern u8 data_8073A194[4]; -extern "C" extern u8 data_8073A198[4]; -extern "C" extern u8 data_8073A19C[4]; -extern "C" extern u8 data_8073A1A0[4]; -extern "C" extern u8 data_8073A1A4[4]; -extern "C" extern u8 data_8073A1A8[4]; -extern "C" extern u8 data_8073A1AC[4]; -extern "C" extern u8 data_8073A1B0[4]; -extern "C" extern u8 data_8073A1B4[4]; -extern "C" extern u8 data_8073A1B8[4]; -extern "C" extern u8 data_8073A1BC[4]; -extern "C" extern u8 data_8073A1C0[4]; -extern "C" extern u8 data_8073A1C4[4]; -extern "C" extern u8 data_8073A1C8[4]; -extern "C" extern u8 data_8073A1CC[4]; -extern "C" extern u8 data_8073A1D0[4]; -extern "C" extern u8 data_8073A1D4[4]; extern "C" void __ct__15daE_OctBg_HIO_cFv(); extern "C" void setAction__11daE_OctBg_cFM11daE_OctBg_cFPCvPv_v(); @@ -409,23 +367,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_oct_bg/executor.cpp b/rel/d/a/e/d_a_e_oct_bg/executor.cpp index 32497c9fcb7..72ec4a3702e 100644 --- a/rel/d/a/e/d_a_e_oct_bg/executor.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80739D4C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_oct_bg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_oct_bg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 92443033176..9ac3e107081 100644 --- a/rel/d/a/e/d_a_e_oct_bg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80739D58[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80739D58-80739D60 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80739D58[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8073A0F8-8073A100 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_oct_bg/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_oct_bg/unknown_translation_unit_ctors.cpp index 7a802977e13..22fd24e1840 100644 --- a/rel/d/a/e/d_a_e_oct_bg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_oct_bg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80739D4C[2]; -extern void* const data_80739D4C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_oct_bg_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80739D4C-80739D54 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80739D4C[2] = { + (void*)__sinit_d_a_e_oct_bg_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp b/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp index acd316751ca..3af5e10c196 100644 --- a/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp +++ b/rel/d/a/e/d_a_e_ot/d_a_e_ot.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 8073CE58 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CDD4 */ void transM(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -43,13 +43,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -250,52 +250,6 @@ static void daE_OT_Delete(daE_OT_c*); static void useHeapInit(fopAc_ac_c*); static void daE_OT_Create(daE_OT_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4278; -extern "C" extern u32 const lit_4280[1 + 1 /* padding */]; -extern "C" extern u32 const lit_4451; -extern "C" extern u32 const lit_4452; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_OT[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8073D2FC[4]; -extern "C" extern u8 data_8073D300[4]; -extern "C" extern u8 data_8073D304[4]; -extern "C" extern u8 data_8073D308[4]; -extern "C" extern u8 data_8073D30C[4]; -extern "C" extern u8 data_8073D310[4]; -extern "C" extern u8 data_8073D314[4]; -extern "C" extern u8 data_8073D318[4]; -extern "C" extern u8 data_8073D31C[4]; -extern "C" extern u8 data_8073D320[4]; -extern "C" extern u8 data_8073D324[4]; -extern "C" extern u8 data_8073D328[4]; -extern "C" extern u8 data_8073D32C[4]; -extern "C" extern u8 data_8073D330[4]; -extern "C" extern u8 data_8073D334[4]; -extern "C" extern u8 data_8073D338[4]; -extern "C" extern u8 data_8073D33C[4]; -extern "C" extern u8 data_8073D340[4]; -extern "C" extern u8 data_8073D344[4]; -extern "C" extern u8 data_8073D348[4]; -extern "C" extern u8 data_8073D34C[4]; -extern "C" extern u8 data_8073D350[4]; -extern "C" extern u8 data_8073D354[4]; -extern "C" extern u8 data_8073D358[4]; -extern "C" extern u8 data_8073D35C[4]; extern "C" void __ct__12daE_OT_HIO_cFv(); extern "C" void draw__8daE_OT_cFv(); @@ -421,21 +375,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transM__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/e/d_a_e_ot/executor.cpp b/rel/d/a/e/d_a_e_ot/executor.cpp index ef6a8459a60..701363d9641 100644 --- a/rel/d/a/e/d_a_e_ot/executor.cpp +++ b/rel/d/a/e/d_a_e_ot/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8073CE94[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index efd7eb8807d..57bb0dfe91b 100644 --- a/rel/d/a/e/d_a_e_ot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8073CEA0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8073CEA0-8073CEA8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8073CEA0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8073D268-8073D270 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ot/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ot/unknown_translation_unit_ctors.cpp index c08446e18df..1e8a1aefa95 100644 --- a/rel/d/a/e/d_a_e_ot/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ot/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8073CE94[2]; -extern void* const data_8073CE94[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ot_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8073CE94-8073CE9C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8073CE94[2] = { + (void*)__sinit_d_a_e_ot_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp index 2fbf30762b7..1d3c4c3f84b 100644 --- a/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp +++ b/rel/d/a/e/d_a_e_ph/d_a_e_ph.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -24,13 +24,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -47,10 +47,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_PH_c { /* 8073D48C */ void initCcSph(); /* 8073D5C4 */ void SetStopingCam(); @@ -248,8 +248,6 @@ static void daE_PH_Delete(daE_PH_c*); static void daE_PH_Draw(daE_PH_c*); static void daE_PH_Execute(daE_PH_c*); static bool daE_PH_IsDelete(daE_PH_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_PH[12]; extern "C" void __ct__12daE_PH_HIO_cFv(); extern "C" void initCcSph__8daE_PH_cFv(); @@ -344,22 +342,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ph/executor.cpp b/rel/d/a/e/d_a_e_ph/executor.cpp index 5eb65aca0af..1da2fbae67c 100644 --- a/rel/d/a/e/d_a_e_ph/executor.cpp +++ b/rel/d/a/e/d_a_e_ph/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80741BE0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ph/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ph/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a6ffc83f8ca..c32d66a3d48 100644 --- a/rel/d/a/e/d_a_e_ph/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ph/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80741BEC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80741BEC-80741BF4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80741BEC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80741DB8-80741DC0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ph/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ph/unknown_translation_unit_ctors.cpp index 3cff18b5b6a..1ab3c408fe5 100644 --- a/rel/d/a/e/d_a_e_ph/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ph/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80741BE0[2]; -extern void* const data_80741BE0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ph_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80741BE0-80741BE8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80741BE0[2] = { + (void*)__sinit_d_a_e_ph_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp b/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp index 65f029ff521..007ae0944f8 100644 --- a/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp +++ b/rel/d/a/e/d_a_e_pm/d_a_e_pm.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -28,10 +28,10 @@ struct mDoMtx_stack_c { /* 8000CF44 */ void ZXYrotM(csXyz const&); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -39,13 +39,13 @@ struct mDoExt_btpAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -78,10 +78,10 @@ struct fopAcM_gc_c { /* 8001DCBC */ void gndCheck(cXyz const*); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_PM_c { /* 80741FB4 */ void DemoSkip(int); /* 80742004 */ void DemoSkipCallBack(void*, int); @@ -357,60 +357,6 @@ static bool daE_PM_IsDelete(daE_PM_c*); static void daE_PM_Delete(daE_PM_c*); static void daE_PM_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5712; -extern "C" extern u32 const lit_5713; -extern "C" extern u32 const lit_5714; -extern "C" extern u32 const lit_5715; -extern "C" extern u32 const lit_5716; -extern "C" extern u32 const lit_5717; -extern "C" extern u32 const lit_5718; -extern "C" extern u32 const lit_5719; -extern "C" extern u32 const lit_5720; -extern "C" extern u32 const lit_5991; -extern "C" extern u32 const lit_5993; -extern "C" extern u32 const lit_5994; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_PM[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8074C3EC[4]; -extern "C" extern u8 data_8074C3F0[4]; -extern "C" extern u8 data_8074C3F4[4]; -extern "C" extern u8 data_8074C3F8[4]; -extern "C" extern u8 data_8074C3FC[4]; -extern "C" extern u8 data_8074C400[4]; -extern "C" extern u8 data_8074C404[4]; -extern "C" extern u8 data_8074C408[4]; -extern "C" extern u8 data_8074C40C[4]; -extern "C" extern u8 data_8074C410[4]; -extern "C" extern u8 data_8074C414[4]; -extern "C" extern u8 data_8074C418[4]; -extern "C" extern u8 data_8074C41C[4]; -extern "C" extern u8 data_8074C420[4]; -extern "C" extern u8 data_8074C424[4]; -extern "C" extern u8 data_8074C428[4]; -extern "C" extern u8 data_8074C42C[4]; -extern "C" extern u8 data_8074C430[4]; -extern "C" extern u8 data_8074C434[4]; -extern "C" extern u8 data_8074C438[4]; -extern "C" extern u8 data_8074C43C[4]; -extern "C" extern u8 data_8074C440[4]; -extern "C" extern u8 data_8074C444[4]; -extern "C" extern u8 data_8074C448[4]; -extern "C" extern u8 data_8074C44C[4]; extern "C" void __ct__12daE_PM_HIO_cFv(); extern "C" void DemoSkip__8daE_PM_cFi(); @@ -603,26 +549,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_pm/executor.cpp b/rel/d/a/e/d_a_e_pm/executor.cpp index d878878de98..38addef2e19 100644 --- a/rel/d/a/e/d_a_e_pm/executor.cpp +++ b/rel/d/a/e/d_a_e_pm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8074BF28[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_pm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_pm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3c2fd063e23..f0cb5c0ccb7 100644 --- a/rel/d/a/e/d_a_e_pm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_pm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8074BF34[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8074BF34-8074BF3C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8074BF34[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8074C340-8074C348 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_pm/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_pm/unknown_translation_unit_ctors.cpp index 2f46608e626..5404c7a3ccf 100644 --- a/rel/d/a/e/d_a_e_pm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_pm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8074BF28[2]; -extern void* const data_8074BF28[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_pm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8074BF28-8074BF30 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8074BF28[2] = { + (void*)__sinit_d_a_e_pm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_po/d_a_e_po.cpp b/rel/d/a/e/d_a_e_po/d_a_e_po.cpp index 666ee9d834e..ebc7cca81cf 100644 --- a/rel/d/a/e/d_a_e_po/d_a_e_po.cpp +++ b/rel/d/a/e/d_a_e_po/d_a_e_po.cpp @@ -50,13 +50,13 @@ struct mDoExt_invisibleModel { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -395,55 +395,6 @@ static void fopAcM_searchPlayerAngleY(fopAc_ac_c const*); static void dComIfGp_getCamera(int); static void dComIfGp_getPlayerCameraID(int); static void dComIfGp_getPlayer(int); -extern "C" extern u32 const lit_5631; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_80757AE4[14 + 2 /* padding */]; -extern "C" extern u8 data_80757AF4[8]; -extern "C" extern u8 data_80757AFC[4]; -extern "C" extern u8 data_80757B00[4]; -extern "C" extern u8 data_80757B04[4]; -extern "C" extern u8 data_80757C78[4]; -extern "C" extern void* g_profile_E_PO[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8075841C[4]; -extern "C" extern u8 data_80758420[4]; -extern "C" extern u8 data_80758424[4]; -extern "C" extern u8 data_80758428[4]; -extern "C" extern u8 data_8075842C[4]; -extern "C" extern u8 data_80758430[4]; -extern "C" extern u8 data_80758434[4]; -extern "C" extern u8 data_80758438[4]; -extern "C" extern u8 data_8075843C[4]; -extern "C" extern u8 data_80758440[4]; -extern "C" extern u8 data_80758444[4]; -extern "C" extern u8 data_80758448[4]; -extern "C" extern u8 data_8075844C[4]; -extern "C" extern u8 data_80758450[4]; -extern "C" extern u8 data_80758454[4]; -extern "C" extern u8 data_80758458[4]; -extern "C" extern u8 data_8075845C[4]; -extern "C" extern u8 data_80758460[4]; -extern "C" extern u8 data_80758464[4]; -extern "C" extern u8 data_80758468[4]; -extern "C" extern u8 data_8075846C[4]; -extern "C" extern u8 data_80758470[4]; -extern "C" extern u8 data_80758474[4]; -extern "C" extern u8 data_80758478[4]; -extern "C" extern u8 data_8075847C[4]; extern "C" void __ct__12daE_PO_HIO_cFv(); extern "C" static void mArg0Check__FP10e_po_classs(); @@ -622,29 +573,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__22dPa_hermiteEcallBack_c[9]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_po/executor.cpp b/rel/d/a/e/d_a_e_po/executor.cpp index 8c44bf95dce..92992c8a04d 100644 --- a/rel/d/a/e/d_a_e_po/executor.cpp +++ b/rel/d/a/e/d_a_e_po/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807576E8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_po/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_po/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3ac54dec3b6..d1524fd77fd 100644 --- a/rel/d/a/e/d_a_e_po/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_po/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807576F4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807576F4-807576FC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807576F4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80757E08-80757E10 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_po/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_po/unknown_translation_unit_ctors.cpp index 181be5a4a5c..73a14f1d13e 100644 --- a/rel/d/a/e/d_a_e_po/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_po/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807576E8[2]; -extern void* const data_807576E8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_po_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807576E8-807576F0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807576E8[2] = { + (void*)__sinit_d_a_e_po_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp b/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp index c65398f6f77..a95772d2d9a 100644 --- a/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp +++ b/rel/d/a/e/d_a_e_pz/d_a_e_pz.cpp @@ -48,13 +48,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -326,69 +326,6 @@ static void daPy_getPlayerActorClass(); static void dComIfGp_getPlayer(int); static void dComIfGp_getCamera(int); static void dComIfGp_getPlayerCameraID(int); -extern "C" extern u32 const lit_5002; -extern "C" extern u32 const lit_5003; -extern "C" extern u32 const lit_5004; -extern "C" extern u32 const lit_5005; -extern "C" extern u32 const lit_5008; -extern "C" extern u32 const lit_5010; -extern "C" extern u32 const lit_5011; -extern "C" extern u32 const lit_5012; -extern "C" extern u32 const lit_5013; -extern "C" extern u32 const lit_5015; -extern "C" extern u32 const lit_5016; -extern "C" extern u32 const lit_5017[1 + 1 /* padding */]; -extern "C" extern u32 const lit_5977; -extern "C" extern u32 const lit_5978; -extern "C" extern u32 const lit_5980; -extern "C" extern u8 const BIRTH_DT[72]; -extern "C" extern u8 const mDBaBa_birthAngle_dt[24]; -extern "C" extern u8 const mDBaBa_birthHani_dt[48]; -extern "C" extern u32 const lit_6712; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u32 eff_seed_id; -extern "C" extern u32 eff_summonShoot2_id; -extern "C" extern void* g_profile_E_PZ[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8076222C[4]; -extern "C" extern u8 data_80762230[4]; -extern "C" extern u8 data_80762234[4]; -extern "C" extern u8 data_80762238[4]; -extern "C" extern u8 data_8076223C[4]; -extern "C" extern u8 data_80762240[4]; -extern "C" extern u8 data_80762244[4]; -extern "C" extern u8 data_80762248[4]; -extern "C" extern u8 data_8076224C[4]; -extern "C" extern u8 data_80762250[4]; -extern "C" extern u8 data_80762254[4]; -extern "C" extern u8 data_80762258[4]; -extern "C" extern u8 data_8076225C[4]; -extern "C" extern u8 data_80762260[4]; -extern "C" extern u8 data_80762264[4]; -extern "C" extern u8 data_80762268[4]; -extern "C" extern u8 data_8076226C[4]; -extern "C" extern u8 data_80762270[4]; -extern "C" extern u8 data_80762274[4]; -extern "C" extern u8 data_80762278[4]; -extern "C" extern u8 data_8076227C[4]; -extern "C" extern u8 data_80762280[4]; -extern "C" extern u8 data_80762284[4]; -extern "C" extern u8 data_80762288[4]; -extern "C" extern u8 data_8076228C[4]; extern "C" void __ct__12daE_PZ_HIO_cFv(); extern "C" void draw__8daE_PZ_cFv(); @@ -570,25 +507,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_pz/executor.cpp b/rel/d/a/e/d_a_e_pz/executor.cpp index 1acf808e63b..e90f0f06df2 100644 --- a/rel/d/a/e/d_a_e_pz/executor.cpp +++ b/rel/d/a/e/d_a_e_pz/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807614E8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_pz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_pz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 590c2cd522c..7d84233d3ef 100644 --- a/rel/d/a/e/d_a_e_pz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_pz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807614F4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807614F4-807614FC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807614F4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80761DB8-80761DC0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_pz/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_pz/unknown_translation_unit_ctors.cpp index b76fea7d376..1d01c13ca8d 100644 --- a/rel/d/a/e/d_a_e_pz/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_pz/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807614E8[2]; -extern void* const data_807614E8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_pz_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807614E8-807614F0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807614E8[2] = { + (void*)__sinit_d_a_e_pz_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp b/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp index 67f8c0859a5..ab3504c6dad 100644 --- a/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp +++ b/rel/d/a/e/d_a_e_rb/d_a_e_rb.cpp @@ -27,13 +27,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -231,10 +231,6 @@ static void daE_RB_Delete(e_rb_class*); static void useHeapInit(fopAc_ac_c*); static void daE_RB_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4165[1 + 1 /* padding */]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_RB[12]; extern "C" void __ct__12daE_RB_HIO_cFv(); extern "C" static void anm_init__FP10e_rb_classifUcf(); @@ -309,21 +305,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_rb/executor.cpp b/rel/d/a/e/d_a_e_rb/executor.cpp index 41744e24176..aaf4c80d6f3 100644 --- a/rel/d/a/e/d_a_e_rb/executor.cpp +++ b/rel/d/a/e/d_a_e_rb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80764CF8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_rb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_rb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 703221b87bd..03c5eb8a4b5 100644 --- a/rel/d/a/e/d_a_e_rb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_rb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80764D04[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80764D04-80764D0C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80764D04[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80764F78-80764F80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_rb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_rb/unknown_translation_unit_ctors.cpp index 64f7915b794..a0e8bb4b659 100644 --- a/rel/d/a/e/d_a_e_rb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_rb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80764CF8[2]; -extern void* const data_80764CF8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_rb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80764CF8-80764D00 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80764CF8[2] = { + (void*)__sinit_d_a_e_rb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp b/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp index 736afa7a91b..0dca19e0efd 100644 --- a/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp +++ b/rel/d/a/e/d_a_e_rd/d_a_e_rd.cpp @@ -28,13 +28,13 @@ struct mDoGph_gInf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -440,166 +440,6 @@ static void coach_game_actor_set(e_rd_class*); static void useHeapInit(fopAc_ac_c*); static void daE_RD_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_6342; -extern "C" extern u32 const lit_6344; -extern "C" extern u32 const lit_6654; -extern "C" extern u32 const lit_8914; -extern "C" extern u32 const lit_9623; -extern "C" extern u32 const lit_9624; -extern "C" extern u32 const lit_9625; -extern "C" extern u32 const lit_9626; -extern "C" extern u32 const lit_9627; -extern "C" extern u32 const lit_9628; -extern "C" extern u32 const lit_10304; -extern "C" extern u32 const lit_10305; -extern "C" extern u32 const lit_10306; -extern "C" extern u32 const lit_10307; -extern "C" extern u32 const lit_10308; -extern "C" extern u32 const lit_10309; -extern "C" extern u32 const lit_10310; -extern "C" extern u32 const lit_10311; -extern "C" extern u32 const lit_10312; -extern "C" extern u32 const lit_10313; -extern "C" extern u32 const lit_10314; -extern "C" extern u32 const lit_10315; -extern "C" extern u32 const lit_10316; -extern "C" extern u32 const lit_10317; -extern "C" extern u32 const lit_10318; -extern "C" extern u32 const lit_10319; -extern "C" extern u32 const lit_10320; -extern "C" extern u32 const lit_10321; -extern "C" extern u32 const lit_10322; -extern "C" extern u32 const lit_10323; -extern "C" extern u32 const lit_10324; -extern "C" extern u32 const lit_10325; -extern "C" extern u32 const lit_10326; -extern "C" extern u32 const lit_10327; -extern "C" extern u32 const lit_10328; -extern "C" extern u32 const lit_10329; -extern "C" extern u32 const lit_10330; -extern "C" extern u32 const lit_10331; -extern "C" extern u32 const lit_10332; -extern "C" extern u32 const lit_10333; -extern "C" extern u32 const lit_10334; -extern "C" extern u32 const lit_10335; -extern "C" extern u32 const lit_10336; -extern "C" extern u32 const lit_10337; -extern "C" extern u32 const lit_10338; -extern "C" extern u32 const lit_10339; -extern "C" extern u32 const lit_10341; -extern "C" extern u32 const lit_10342; -extern "C" extern u32 const lit_10343; -extern "C" extern u32 const lit_10344; -extern "C" extern u32 const lit_10345; -extern "C" extern u32 const lit_10346; -extern "C" extern u32 const lit_10347; -extern "C" extern u32 const lit_10348; -extern "C" extern u32 const lit_10349; -extern "C" extern u32 const lit_10350; -extern "C" extern u32 const lit_10351; -extern "C" extern u32 const lit_10352; -extern "C" extern u32 const lit_10353; -extern "C" extern u32 const lit_10354; -extern "C" extern u32 const lit_10355; -extern "C" extern u32 const lit_10356; -extern "C" extern u32 const lit_10357; -extern "C" extern u32 const lit_10358; -extern "C" extern u32 const lit_10359; -extern "C" extern u32 const lit_10360; -extern "C" extern u32 const lit_10362; -extern "C" extern u32 const lit_10363; -extern "C" extern u32 const lit_10364; -extern "C" extern u32 const lit_10365; -extern "C" extern u32 const lit_10366; -extern "C" extern u32 const lit_10367; -extern "C" extern u32 const lit_10368; -extern "C" extern u32 const lit_10369; -extern "C" extern u32 const lit_10370; -extern "C" extern u32 const lit_10371; -extern "C" extern u32 const lit_10372; -extern "C" extern u32 const lit_10373; -extern "C" extern u32 const lit_10374; -extern "C" extern u32 const lit_10375; -extern "C" extern u32 const lit_10376; -extern "C" extern u32 const lit_10377; -extern "C" extern u32 const lit_10378; -extern "C" extern u32 const lit_10379; -extern "C" extern u32 const lit_10380; -extern "C" extern u32 const lit_10381; -extern "C" extern u32 const lit_10382; -extern "C" extern u32 const lit_10383; -extern "C" extern u32 const lit_10384; -extern "C" extern u32 const lit_10385; -extern "C" extern u32 const lit_10386; -extern "C" extern u32 const lit_10387; -extern "C" extern u32 const lit_10389; -extern "C" extern u32 const lit_10390; -extern "C" extern u32 const lit_10391; -extern "C" extern u32 const lit_10392; -extern "C" extern u32 const lit_10393; -extern "C" extern u32 const lit_10394; -extern "C" extern u32 const lit_10395; -extern "C" extern u32 const lit_10396; -extern "C" extern u32 const lit_10397; -extern "C" extern u32 const lit_10398; -extern "C" extern u32 const lit_10399; -extern "C" extern u32 const lit_10400; -extern "C" extern u32 const lit_10401; -extern "C" extern u32 const lit_10402; -extern "C" extern u32 const lit_10403; -extern "C" extern u32 const lit_10404; -extern "C" extern u32 const lit_10405; -extern "C" extern u32 const lit_10406; -extern "C" extern u32 const lit_10408; -extern "C" extern u32 const lit_10409; -extern "C" extern u32 const lit_10410; -extern "C" extern u32 const lit_10411; -extern "C" extern u32 const lit_10412; -extern "C" extern u32 const lit_10413; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 jv_offset[12]; -extern "C" extern void* g_profile_E_RD[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80519424[4]; -extern "C" extern u8 data_80519428[4]; -extern "C" extern u8 data_8051942C[4]; -extern "C" extern u8 data_80519430[4]; -extern "C" extern u8 data_80519434[4]; -extern "C" extern u8 data_80519438[4]; -extern "C" extern u8 data_8051943C[4]; -extern "C" extern u8 data_80519440[4]; -extern "C" extern u8 data_80519444[4]; -extern "C" extern u8 data_80519448[4]; -extern "C" extern u8 data_8051944C[4]; -extern "C" extern u8 data_80519450[4]; -extern "C" extern u8 data_80519454[4]; -extern "C" extern u8 data_80519458[4]; -extern "C" extern u8 data_8051945C[4]; -extern "C" extern u8 data_80519460[4]; -extern "C" extern u8 data_80519464[4]; -extern "C" extern u8 data_80519468[4]; -extern "C" extern u8 data_8051946C[4]; -extern "C" extern u8 data_80519470[4]; -extern "C" extern u8 data_80519474[4]; -extern "C" extern u8 data_80519478[4]; -extern "C" extern u8 data_8051947C[4]; -extern "C" extern u8 data_80519480[4]; -extern "C" extern u8 data_80519484[4]; extern "C" void __ct__12daE_RD_HIO_cFv(); extern "C" static void get_pla__FP10fopAc_ac_c(); @@ -952,31 +792,6 @@ void MtxPush(); void MtxPull(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; void checkGroundY(cXyz&); extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); diff --git a/rel/d/a/e/d_a_e_rd/executor.cpp b/rel/d/a/e/d_a_e_rd/executor.cpp index c34c5d20d48..894099008ca 100644 --- a/rel/d/a/e/d_a_e_rd/executor.cpp +++ b/rel/d/a/e/d_a_e_rd/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80518570[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_rd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_rd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b36b2ab0c78..1798bc8c115 100644 --- a/rel/d/a/e/d_a_e_rd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_rd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8051857C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8051857C-80518584 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8051857C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80519138-80519140 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_rd/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_rd/unknown_translation_unit_ctors.cpp index 204e88161d8..4d58e421b8b 100644 --- a/rel/d/a/e/d_a_e_rd/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_rd/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80518570[2]; -extern void* const data_80518570[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_rd_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80518570-80518578 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80518570[2] = { + (void*)__sinit_d_a_e_rd_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp b/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp index 046cc4edbb9..6b084b64856 100644 --- a/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp +++ b/rel/d/a/e/d_a_e_rdb/d_a_e_rdb.cpp @@ -26,13 +26,13 @@ struct mDoGph_gInf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -305,83 +305,6 @@ static void daE_RDB_Delete(e_rdb_class*); static void useHeapInit(fopAc_ac_c*); static void daE_RDB_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4647; -extern "C" extern u32 const lit_4648; -extern "C" extern u32 const lit_4649; -extern "C" extern u32 const lit_4651; -extern "C" extern u32 const lit_4652; -extern "C" extern u32 const lit_4654; -extern "C" extern u32 const lit_4725; -extern "C" extern u32 const lit_4727; -extern "C" extern u32 const lit_4728; -extern "C" extern u32 const lit_5163; -extern "C" extern u32 const lit_5164; -extern "C" extern u32 const lit_5626; -extern "C" extern u32 const lit_5627; -extern "C" extern u32 const lit_5628; -extern "C" extern u32 const lit_5629; -extern "C" extern u32 const lit_5632; -extern "C" extern u32 const lit_5633; -extern "C" extern u32 const lit_5634; -extern "C" extern u32 const lit_5636; -extern "C" extern u32 const lit_5637; -extern "C" extern u32 const lit_5638; -extern "C" extern u32 const lit_5639; -extern "C" extern u32 const lit_5640; -extern "C" extern u32 const lit_5641; -extern "C" extern u32 const lit_5642; -extern "C" extern u32 const lit_5643; -extern "C" extern u32 const lit_5644; -extern "C" extern u32 const lit_5645; -extern "C" extern u32 const lit_5646; -extern "C" extern u32 const lit_5647; -extern "C" extern u32 const lit_5648; -extern "C" extern u32 const lit_5649; -extern "C" extern u32 const lit_5650; -extern "C" extern u32 const lit_5651; -extern "C" extern u32 const lit_5652; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_RDB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8076BC68[4]; -extern "C" extern u8 data_8076BC6C[4]; -extern "C" extern u8 data_8076BC70[4]; -extern "C" extern u8 data_8076BC74[4]; -extern "C" extern u8 data_8076BC78[4]; -extern "C" extern u8 data_8076BC7C[4]; -extern "C" extern u8 data_8076BC80[4]; -extern "C" extern u8 data_8076BC84[4]; -extern "C" extern u8 data_8076BC88[4]; -extern "C" extern u8 data_8076BC8C[4]; -extern "C" extern u8 data_8076BC90[4]; -extern "C" extern u8 data_8076BC94[4]; -extern "C" extern u8 data_8076BC98[4]; -extern "C" extern u8 data_8076BC9C[4]; -extern "C" extern u8 data_8076BCA0[4]; -extern "C" extern u8 data_8076BCA4[4]; -extern "C" extern u8 data_8076BCA8[4]; -extern "C" extern u8 data_8076BCAC[4]; -extern "C" extern u8 data_8076BCB0[4]; -extern "C" extern u8 data_8076BCB4[4]; -extern "C" extern u8 data_8076BCB8[4]; -extern "C" extern u8 data_8076BCBC[4]; -extern "C" extern u8 data_8076BCC0[4]; -extern "C" extern u8 data_8076BCC4[4]; -extern "C" extern u8 data_8076BCC8[4]; extern "C" void __ct__13daE_RDB_HIO_cFv(); extern "C" static void anm_init__FP11e_rdb_classifUcf(); @@ -560,27 +483,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_rdb/executor.cpp b/rel/d/a/e/d_a_e_rdb/executor.cpp index 0f3918d3b9d..86621e3c9df 100644 --- a/rel/d/a/e/d_a_e_rdb/executor.cpp +++ b/rel/d/a/e/d_a_e_rdb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8076B448[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_rdb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_rdb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 39f4abef417..54f6115e4eb 100644 --- a/rel/d/a/e/d_a_e_rdb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_rdb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8076B454[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8076B454-8076B45C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8076B454[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8076B9C0-8076B9C8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_rdb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_rdb/unknown_translation_unit_ctors.cpp index 3e7dd39a76e..8da099c2bfb 100644 --- a/rel/d/a/e/d_a_e_rdb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_rdb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8076B448[2]; -extern void* const data_8076B448[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_rdb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8076B448-8076B450 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8076B448[2] = { + (void*)__sinit_d_a_e_rdb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp b/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp index f58d9cc2ac1..1d53628d0d7 100644 --- a/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp +++ b/rel/d/a/e/d_a_e_rdy/d_a_e_rdy.cpp @@ -27,13 +27,13 @@ struct mDoGph_gInf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -138,10 +138,10 @@ struct dMsgFlow_c { /* 8024A2D8 */ void doFlow(fopAc_ac_c*, fopAc_ac_c**, int); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -387,136 +387,6 @@ static void daE_RDY_Delete(e_rdy_class*); static void useHeapInit(fopAc_ac_c*); static void daE_RDY_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5510; -extern "C" extern u32 const lit_5511; -extern "C" extern u32 const lit_5512; -extern "C" extern u32 const lit_5513; -extern "C" extern u32 const lit_5514; -extern "C" extern u32 const lit_5515; -extern "C" extern u32 const lit_5893; -extern "C" extern u32 const lit_5894; -extern "C" extern u32 const lit_5895; -extern "C" extern u32 const lit_5896; -extern "C" extern u32 const lit_5897; -extern "C" extern u32 const lit_6168; -extern "C" extern u32 const lit_7912; -extern "C" extern u32 const lit_7914; -extern "C" extern u32 const lit_7915; -extern "C" extern u32 const lit_7916; -extern "C" extern u32 const lit_8522; -extern "C" extern u32 const lit_8523; -extern "C" extern u32 const lit_8524; -extern "C" extern u32 const lit_8525; -extern "C" extern u32 const lit_8526; -extern "C" extern u32 const lit_8527; -extern "C" extern u32 const lit_8528; -extern "C" extern u32 const lit_8529; -extern "C" extern u32 const lit_8530; -extern "C" extern u32 const lit_8531; -extern "C" extern u32 const lit_8532; -extern "C" extern u32 const lit_8533; -extern "C" extern u32 const lit_8534; -extern "C" extern u32 const lit_8536; -extern "C" extern u32 const lit_8537; -extern "C" extern u32 const lit_8538; -extern "C" extern u32 const lit_8539; -extern "C" extern u32 const lit_8540; -extern "C" extern u32 const lit_8541; -extern "C" extern u32 const lit_8543; -extern "C" extern u32 const lit_8544; -extern "C" extern u32 const lit_8545; -extern "C" extern u32 const lit_8546; -extern "C" extern u32 const lit_8547; -extern "C" extern u32 const lit_8548; -extern "C" extern u32 const lit_8549; -extern "C" extern u32 const lit_8550; -extern "C" extern u32 const lit_8551; -extern "C" extern u32 const lit_8552; -extern "C" extern u32 const lit_8553; -extern "C" extern u32 const lit_8554; -extern "C" extern u32 const lit_8555; -extern "C" extern u32 const lit_8556; -extern "C" extern u32 const lit_8557; -extern "C" extern u32 const lit_8558; -extern "C" extern u32 const lit_8559; -extern "C" extern u32 const lit_8560; -extern "C" extern u32 const lit_8561; -extern "C" extern u32 const lit_8562; -extern "C" extern u32 const lit_8563; -extern "C" extern u32 const lit_8564; -extern "C" extern u32 const lit_8565; -extern "C" extern u32 const lit_8566; -extern "C" extern u32 const lit_8567; -extern "C" extern u32 const lit_8568; -extern "C" extern u32 const lit_8569; -extern "C" extern u32 const lit_8570; -extern "C" extern u32 const lit_8571; -extern "C" extern u32 const lit_8572; -extern "C" extern u32 const lit_8573; -extern "C" extern u32 const lit_8574; -extern "C" extern u32 const lit_8575; -extern "C" extern u32 const lit_8576; -extern "C" extern u32 const lit_8577; -extern "C" extern u32 const lit_8578; -extern "C" extern u32 const lit_8580; -extern "C" extern u32 const lit_8581; -extern "C" extern u32 const lit_8582; -extern "C" extern u32 const lit_8583; -extern "C" extern u32 const lit_8584; -extern "C" extern u32 const lit_8585; -extern "C" extern u32 const lit_8586; -extern "C" extern u32 const lit_8587; -extern "C" extern u32 const lit_8588; -extern "C" extern u32 const lit_8589; -extern "C" extern u32 const lit_8590; -extern "C" extern u32 const lit_8591; -extern "C" extern u32 const lit_8592; -extern "C" extern u32 const lit_8593; -extern "C" extern u32 const lit_8594; -extern "C" extern u32 const lit_8595; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_RDY[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8077AA24[4]; -extern "C" extern u8 data_8077AA28[4]; -extern "C" extern u8 data_8077AA2C[4]; -extern "C" extern u8 data_8077AA30[4]; -extern "C" extern u8 data_8077AA34[4]; -extern "C" extern u8 data_8077AA38[4]; -extern "C" extern u8 data_8077AA3C[4]; -extern "C" extern u8 data_8077AA40[4]; -extern "C" extern u8 data_8077AA44[4]; -extern "C" extern u8 data_8077AA48[4]; -extern "C" extern u8 data_8077AA4C[4]; -extern "C" extern u8 data_8077AA50[4]; -extern "C" extern u8 data_8077AA54[4]; -extern "C" extern u8 data_8077AA58[4]; -extern "C" extern u8 data_8077AA5C[4]; -extern "C" extern u8 data_8077AA60[4]; -extern "C" extern u8 data_8077AA64[4]; -extern "C" extern u8 data_8077AA68[4]; -extern "C" extern u8 data_8077AA6C[4]; -extern "C" extern u8 data_8077AA70[4]; -extern "C" extern u8 data_8077AA74[4]; -extern "C" extern u8 data_8077AA78[4]; -extern "C" extern u8 data_8077AA7C[4]; -extern "C" extern u8 data_8077AA80[4]; -extern "C" extern u8 data_8077AA84[4]; extern "C" void __ct__13daE_RDY_HIO_cFv(); extern "C" static void anm_init__FP11e_rdy_classifUcf(); @@ -800,29 +670,6 @@ void MtxPush(); void MtxPull(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_rdy/executor.cpp b/rel/d/a/e/d_a_e_rdy/executor.cpp index 0000cd5d9c2..de53b7427a6 100644 --- a/rel/d/a/e/d_a_e_rdy/executor.cpp +++ b/rel/d/a/e/d_a_e_rdy/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80779DE8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_rdy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_rdy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b76ed8cf221..6d557041f6c 100644 --- a/rel/d/a/e/d_a_e_rdy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_rdy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80779DF4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80779DF4-80779DFC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80779DF4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8077A828-8077A830 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_rdy/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_rdy/unknown_translation_unit_ctors.cpp index 3e2e361b5de..5c326164759 100644 --- a/rel/d/a/e/d_a_e_rdy/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_rdy/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80779DE8[2]; -extern void* const data_80779DE8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_rdy_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80779DE8-80779DF0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80779DE8[2] = { + (void*)__sinit_d_a_e_rdy_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp b/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp index c4662fd454c..df6bc3e3270 100644 --- a/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp +++ b/rel/d/a/e/d_a_e_s1/d_a_e_s1.cpp @@ -24,13 +24,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -49,10 +49,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -122,10 +122,10 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -309,73 +309,6 @@ static void daE_S1_Delete(e_s1_class*); static void useHeapInit(fopAc_ac_c*); static void daE_S1_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4985; -extern "C" extern u32 const lit_5373; -extern "C" extern u32 const lit_5375; -extern "C" extern u32 const lit_5595; -extern "C" extern u32 const lit_5596; -extern "C" extern u32 const lit_5597; -extern "C" extern u32 const lit_5598; -extern "C" extern u32 const lit_5599; -extern "C" extern u32 const lit_5600; -extern "C" extern u32 const lit_5601; -extern "C" extern u32 const lit_5602; -extern "C" extern u32 const lit_5603; -extern "C" extern u32 const lit_5604; -extern "C" extern u32 const lit_5605; -extern "C" extern u32 const lit_5606; -extern "C" extern u32 const lit_5607; -extern "C" extern u32 const lit_5608; -extern "C" extern u32 const lit_5609; -extern "C" extern u32 const lit_5610; -extern "C" extern u32 const lit_5611; -extern "C" extern u32 const lit_5612; -extern "C" extern u32 const lit_5613; -extern "C" extern u32 const lit_5614; -extern "C" extern u32 const lit_5615; -extern "C" extern u32 const lit_5616; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_S1[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_807814F4[4]; -extern "C" extern u8 data_807814F8[4]; -extern "C" extern u8 data_807814FC[4]; -extern "C" extern u8 data_80781500[4]; -extern "C" extern u8 data_80781504[4]; -extern "C" extern u8 data_80781508[4]; -extern "C" extern u8 data_8078150C[4]; -extern "C" extern u8 data_80781510[4]; -extern "C" extern u8 data_80781514[4]; -extern "C" extern u8 data_80781518[4]; -extern "C" extern u8 data_8078151C[4]; -extern "C" extern u8 data_80781520[4]; -extern "C" extern u8 data_80781524[4]; -extern "C" extern u8 data_80781528[4]; -extern "C" extern u8 data_8078152C[4]; -extern "C" extern u8 data_80781530[4]; -extern "C" extern u8 data_80781534[4]; -extern "C" extern u8 data_80781538[4]; -extern "C" extern u8 data_8078153C[4]; -extern "C" extern u8 data_80781540[4]; -extern "C" extern u8 data_80781544[4]; -extern "C" extern u8 data_80781548[4]; -extern "C" extern u8 data_8078154C[4]; -extern "C" extern u8 data_80781550[4]; -extern "C" extern u8 data_80781554[4]; extern "C" void __ct__12daE_S1_HIO_cFv(); extern "C" static void anm_init__FP10e_s1_classifUcf(); @@ -546,25 +479,6 @@ void MtxPull(); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_s1/executor.cpp b/rel/d/a/e/d_a_e_s1/executor.cpp index b62ae8cb264..f11f7adc832 100644 --- a/rel/d/a/e/d_a_e_s1/executor.cpp +++ b/rel/d/a/e/d_a_e_s1/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80780DB0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_s1/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_s1/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 203214fb93f..1f1186f6616 100644 --- a/rel/d/a/e/d_a_e_s1/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_s1/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80780DBC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80780DBC-80780DC4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80780DBC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80781338-80781340 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_s1/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_s1/unknown_translation_unit_ctors.cpp index 0b9f120aa91..085c7b9133e 100644 --- a/rel/d/a/e/d_a_e_s1/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_s1/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80780DB0[2]; -extern void* const data_80780DB0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_s1_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80780DB0-80780DB8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80780DB0[2] = { + (void*)__sinit_d_a_e_s1_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp b/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp index 94eb9a09e78..b4820abee0c 100644 --- a/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp +++ b/rel/d/a/e/d_a_e_sb/d_a_e_sb.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -29,13 +29,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -60,10 +60,10 @@ struct daPy_py_c { /* 8015F398 */ void checkMasterSwordEquip(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_SB_c { /* 807816D8 */ void CreateHeap(); /* 807817F0 */ void initCcCylinder(); @@ -260,48 +260,6 @@ static void daE_SB_Execute(daE_SB_c*); static bool daE_SB_IsDelete(daE_SB_c*); static void daE_SB_Delete(daE_SB_c*); static void daE_SB_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4467; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_SB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80784FD0[4]; -extern "C" extern u8 data_80784FD4[4]; -extern "C" extern u8 data_80784FD8[4]; -extern "C" extern u8 data_80784FDC[4]; -extern "C" extern u8 data_80784FE0[4]; -extern "C" extern u8 data_80784FE4[4]; -extern "C" extern u8 data_80784FE8[4]; -extern "C" extern u8 data_80784FEC[4]; -extern "C" extern u8 data_80784FF0[4]; -extern "C" extern u8 data_80784FF4[4]; -extern "C" extern u8 data_80784FF8[4]; -extern "C" extern u8 data_80784FFC[4]; -extern "C" extern u8 data_80785000[4]; -extern "C" extern u8 data_80785004[4]; -extern "C" extern u8 data_80785008[4]; -extern "C" extern u8 data_8078500C[4]; -extern "C" extern u8 data_80785010[4]; -extern "C" extern u8 data_80785014[4]; -extern "C" extern u8 data_80785018[4]; -extern "C" extern u8 data_8078501C[4]; -extern "C" extern u8 data_80785020[4]; -extern "C" extern u8 data_80785024[4]; -extern "C" extern u8 data_80785028[4]; -extern "C" extern u8 data_8078502C[4]; -extern "C" extern u8 data_80785030[4]; extern "C" void __ct__12daE_SB_HIO_cFv(); extern "C" void CreateHeap__8daE_SB_cFv(); @@ -436,24 +394,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_sb/executor.cpp b/rel/d/a/e/d_a_e_sb/executor.cpp index 4bc8ce52207..20961da59a7 100644 --- a/rel/d/a/e/d_a_e_sb/executor.cpp +++ b/rel/d/a/e/d_a_e_sb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80784D54[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_sb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_sb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 84418411822..97b6d6c6f3b 100644 --- a/rel/d/a/e/d_a_e_sb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_sb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80784D60[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80784D60-80784D68 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80784D60[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80784F30-80784F38 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_sb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_sb/unknown_translation_unit_ctors.cpp index 6aaa3835484..48666d0f333 100644 --- a/rel/d/a/e/d_a_e_sb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_sb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80784D54[2]; -extern void* const data_80784D54[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_sb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80784D54-80784D5C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80784D54[2] = { + (void*)__sinit_d_a_e_sb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp b/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp index 838478fedca..4287bcf9026 100644 --- a/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp +++ b/rel/d/a/e/d_a_e_sf/d_a_e_sf.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -56,8 +56,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -66,6 +64,8 @@ struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -277,59 +277,6 @@ static void daE_SF_Delete(e_sf_class*); static void useHeapInit(fopAc_ac_c*); static void daE_SF_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5197; -extern "C" extern u32 const lit_5198; -extern "C" extern u32 const lit_5199; -extern "C" extern u32 const lit_5200; -extern "C" extern u32 const lit_5201; -extern "C" extern u32 const lit_5202; -extern "C" extern u32 const lit_5203; -extern "C" extern u32 const lit_5204[1 + 1 /* padding */]; -extern "C" extern u8 const lit_5207[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_SF[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 target_info[40]; -extern "C" extern u8 target_info_count[4]; -extern "C" extern u8 data_8078A0D4[4]; -extern "C" extern u8 data_8078A0D8[4]; -extern "C" extern u8 data_8078A0DC[4]; -extern "C" extern u8 data_8078A0E0[4]; -extern "C" extern u8 data_8078A0E4[4]; -extern "C" extern u8 data_8078A0E8[4]; -extern "C" extern u8 data_8078A0EC[4]; -extern "C" extern u8 data_8078A0F0[4]; -extern "C" extern u8 data_8078A0F4[4]; -extern "C" extern u8 data_8078A0F8[4]; -extern "C" extern u8 data_8078A0FC[4]; -extern "C" extern u8 data_8078A100[4]; -extern "C" extern u8 data_8078A104[4]; -extern "C" extern u8 data_8078A108[4]; -extern "C" extern u8 data_8078A10C[4]; -extern "C" extern u8 data_8078A110[4]; -extern "C" extern u8 data_8078A114[4]; -extern "C" extern u8 data_8078A118[4]; -extern "C" extern u8 data_8078A11C[4]; -extern "C" extern u8 data_8078A120[4]; -extern "C" extern u8 data_8078A124[4]; -extern "C" extern u8 data_8078A128[4]; -extern "C" extern u8 data_8078A12C[4]; -extern "C" extern u8 data_8078A130[4]; -extern "C" extern u8 data_8078A134[4]; extern "C" void __ct__12daE_SF_HIO_cFv(); extern "C" static void anm_init__FP10e_sf_classifUcf(); @@ -472,24 +419,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_sf/executor.cpp b/rel/d/a/e/d_a_e_sf/executor.cpp index 13d7099e100..989b3e763fc 100644 --- a/rel/d/a/e/d_a_e_sf/executor.cpp +++ b/rel/d/a/e/d_a_e_sf/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80789C24[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_sf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_sf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index bba5b4ddb80..e9eedb2c010 100644 --- a/rel/d/a/e/d_a_e_sf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_sf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80789C30[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80789C30-80789C38 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80789C30[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8078A028-8078A030 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_sf/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_sf/unknown_translation_unit_ctors.cpp index 588529a73d8..4df9e5a2946 100644 --- a/rel/d/a/e/d_a_e_sf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_sf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80789C24[2]; -extern void* const data_80789C24[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_sf_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80789C24-80789C2C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80789C24[2] = { + (void*)__sinit_d_a_e_sf_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp b/rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp index 78b6496b2ff..fd8796dd0f0 100644 --- a/rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp +++ b/rel/d/a/e/d_a_e_sg/d_a_e_sg.cpp @@ -37,10 +37,6 @@ struct dStage_roomControl_c { /* 800244E8 */ void checkRoomDisp(int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -50,6 +46,10 @@ struct cXyz { /* 8078DD7C */ cXyz(); }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -75,10 +75,10 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -205,52 +205,6 @@ static bool daE_SG_IsDelete(e_sg_class*); static void daE_SG_Delete(e_sg_class*); static void useHeapInit(fopAc_ac_c*); static void daE_SG_Create(fopAc_ac_c*); -extern "C" extern u8 const lit_4743[12]; -extern "C" extern u32 const lit_4805; -extern "C" extern u32 const lit_4806; -extern "C" extern u32 const lit_4807; -extern "C" extern u32 const lit_4808; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_SG[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8078E1E0[4]; -extern "C" extern u8 data_8078E1E4[4]; -extern "C" extern u8 data_8078E1E8[4]; -extern "C" extern u8 data_8078E1EC[4]; -extern "C" extern u8 data_8078E1F0[4]; -extern "C" extern u8 data_8078E1F4[4]; -extern "C" extern u8 data_8078E1F8[4]; -extern "C" extern u8 data_8078E1FC[4]; -extern "C" extern u8 data_8078E200[4]; -extern "C" extern u8 data_8078E204[4]; -extern "C" extern u8 data_8078E208[4]; -extern "C" extern u8 data_8078E20C[4]; -extern "C" extern u8 data_8078E210[4]; -extern "C" extern u8 data_8078E214[4]; -extern "C" extern u8 data_8078E218[4]; -extern "C" extern u8 data_8078E21C[4]; -extern "C" extern u8 data_8078E220[4]; -extern "C" extern u8 data_8078E224[4]; -extern "C" extern u8 data_8078E228[4]; -extern "C" extern u8 data_8078E22C[4]; -extern "C" extern u8 data_8078E230[4]; -extern "C" extern u8 data_8078E234[4]; -extern "C" extern u8 data_8078E238[4]; -extern "C" extern u8 data_8078E23C[4]; -extern "C" extern u8 data_8078E240[4]; extern "C" void __ct__12daE_SG_HIO_cFv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -372,23 +326,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_sg/executor.cpp b/rel/d/a/e/d_a_e_sg/executor.cpp index 63f8068066d..e1917c7c0f5 100644 --- a/rel/d/a/e/d_a_e_sg/executor.cpp +++ b/rel/d/a/e/d_a_e_sg/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8078DD90[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_sg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_sg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2e77f27d48b..88b674221cc 100644 --- a/rel/d/a/e/d_a_e_sg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_sg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8078DD9C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8078DD9C-8078DDA4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8078DD9C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8078E098-8078E0A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_sg/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_sg/unknown_translation_unit_ctors.cpp index db6f713ac9a..1e4014d55f1 100644 --- a/rel/d/a/e/d_a_e_sg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_sg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8078DD90[2]; -extern void* const data_8078DD90[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_sg_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8078DD90-8078DD98 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8078DD90[2] = { + (void*)__sinit_d_a_e_sg_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp b/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp index 9531c03792e..eb4ae4a2815 100644 --- a/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp +++ b/rel/d/a/e/d_a_e_sh/d_a_e_sh.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -51,8 +51,6 @@ struct daE_SH_HIO_c { /* 807918B4 */ ~daE_SH_HIO_c(); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -60,6 +58,8 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -228,12 +228,6 @@ static void daE_SH_Delete(e_sh_class*); static void useHeapInit(fopAc_ac_c*); static void daE_SH_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4634; -extern "C" extern u32 const lit_4635; -extern "C" extern u32 const lit_4636; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_SH[12]; extern "C" void __ct__12daE_SH_HIO_cFv(); extern "C" static void anm_init__FP10e_sh_classifUcf(); @@ -315,22 +309,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_sh/executor.cpp b/rel/d/a/e/d_a_e_sh/executor.cpp index c9f05049bc8..84075eafa09 100644 --- a/rel/d/a/e/d_a_e_sh/executor.cpp +++ b/rel/d/a/e/d_a_e_sh/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80791D5C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_sh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_sh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 15e3cbaecdf..888abe500e2 100644 --- a/rel/d/a/e/d_a_e_sh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_sh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80791D68[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80791D68-80791D70 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80791D68[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807920F0-807920F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_sh/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_sh/unknown_translation_unit_ctors.cpp index 0f122ebe4a9..1d33c9fe2da 100644 --- a/rel/d/a/e/d_a_e_sh/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_sh/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80791D5C[2]; -extern void* const data_80791D5C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_sh_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80791D5C-80791D64 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80791D5C[2] = { + (void*)__sinit_d_a_e_sh_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp b/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp index 69ff2b25eb5..e0f51c316d4 100644 --- a/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp +++ b/rel/d/a/e/d_a_e_sm/d_a_e_sm.cpp @@ -27,13 +27,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -284,58 +284,6 @@ static void daE_SM_Execute(daE_SM_c*); static void daE_SM_Create(fopAc_ac_c*); static void useHeapInit(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5011; -extern "C" extern u32 const lit_5012; -extern "C" extern u32 const lit_5013; -extern "C" extern u32 const lit_5014; -extern "C" extern u32 const lit_5015; -extern "C" extern u32 const lit_5016; -extern "C" extern u32 const lit_5017; -extern "C" extern u32 const lit_5018; -extern "C" extern u32 const lit_5681; -extern "C" extern u32 const lit_5682; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_SM[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_807989E8[4]; -extern "C" extern u8 data_807989EC[4]; -extern "C" extern u8 data_807989F0[4]; -extern "C" extern u8 data_807989F4[4]; -extern "C" extern u8 data_807989F8[4]; -extern "C" extern u8 data_807989FC[4]; -extern "C" extern u8 data_80798A00[4]; -extern "C" extern u8 data_80798A04[4]; -extern "C" extern u8 data_80798A08[4]; -extern "C" extern u8 data_80798A0C[4]; -extern "C" extern u8 data_80798A10[4]; -extern "C" extern u8 data_80798A14[4]; -extern "C" extern u8 data_80798A18[4]; -extern "C" extern u8 data_80798A1C[4]; -extern "C" extern u8 data_80798A20[4]; -extern "C" extern u8 data_80798A24[4]; -extern "C" extern u8 data_80798A28[4]; -extern "C" extern u8 data_80798A2C[4]; -extern "C" extern u8 data_80798A30[4]; -extern "C" extern u8 data_80798A34[4]; -extern "C" extern u8 data_80798A38[4]; -extern "C" extern u8 data_80798A3C[4]; -extern "C" extern u8 data_80798A40[4]; -extern "C" extern u8 data_80798A44[4]; -extern "C" extern u8 data_80798A48[4]; extern "C" void __ct__12daE_Sm_HIO_cFv(); extern "C" void SetAnm__8daE_SM_cFiiff(); @@ -503,21 +451,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_sm/executor.cpp b/rel/d/a/e/d_a_e_sm/executor.cpp index 9be09df77d5..5f5014ff565 100644 --- a/rel/d/a/e/d_a_e_sm/executor.cpp +++ b/rel/d/a/e/d_a_e_sm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807985CC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_sm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_sm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 23805be43bc..38b5a9bf978 100644 --- a/rel/d/a/e/d_a_e_sm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_sm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807985D8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807985D8-807985E0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807985D8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80798978-80798980 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_sm/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_sm/unknown_translation_unit_ctors.cpp index 680ae805eb8..7dc8392af11 100644 --- a/rel/d/a/e/d_a_e_sm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_sm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807985CC[2]; -extern void* const data_807985CC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_sm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807985CC-807985D4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807985CC[2] = { + (void*)__sinit_d_a_e_sm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp b/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp index 1a30c684fbe..c805aea5cfe 100644 --- a/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp +++ b/rel/d/a/e/d_a_e_sm2/d_a_e_sm2.cpp @@ -48,13 +48,13 @@ struct mDoExt_btkAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -288,67 +288,6 @@ static void daE_SM2_Delete(e_sm2_class*); static void useHeapInit(fopAc_ac_c*); static void daE_SM2_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4257; -extern "C" extern u32 const lit_5172; -extern "C" extern u32 const lit_5173; -extern "C" extern u32 const lit_5174; -extern "C" extern u32 const lit_5175; -extern "C" extern u32 const lit_5176; -extern "C" extern u32 const lit_5177; -extern "C" extern u32 const lit_5178; -extern "C" extern u32 const lit_5179; -extern "C" extern u32 const lit_5180; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_8079D92C[64]; -extern "C" extern u8 data_8079D96C[32]; -extern "C" extern u8 data_8079D98C[16]; -extern "C" extern u8 data_8079D99C[16]; -extern "C" extern u8 data_8079D9AC[4]; -extern "C" extern u8 data_8079D9B0[20]; -extern "C" extern u8 data_8079D9C4[20]; -extern "C" extern void* g_profile_E_SM2[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 boss[4]; -extern "C" extern u8 data_8079DC90[4]; -extern "C" extern u8 data_8079DC94[4]; -extern "C" extern u8 data_8079DC98[4]; -extern "C" extern u8 data_8079DC9C[4]; -extern "C" extern u8 data_8079DCA0[4]; -extern "C" extern u8 data_8079DCA4[4]; -extern "C" extern u8 data_8079DCA8[4]; -extern "C" extern u8 data_8079DCAC[4]; -extern "C" extern u8 data_8079DCB0[4]; -extern "C" extern u8 data_8079DCB4[4]; -extern "C" extern u8 data_8079DCB8[4]; -extern "C" extern u8 data_8079DCBC[4]; -extern "C" extern u8 data_8079DCC0[4]; -extern "C" extern u8 data_8079DCC4[4]; -extern "C" extern u8 data_8079DCC8[4]; -extern "C" extern u8 data_8079DCCC[4]; -extern "C" extern u8 data_8079DCD0[4]; -extern "C" extern u8 data_8079DCD4[4]; -extern "C" extern u8 data_8079DCD8[4]; -extern "C" extern u8 data_8079DCDC[4]; -extern "C" extern u8 data_8079DCE0[4]; -extern "C" extern u8 data_8079DCE4[4]; -extern "C" extern u8 data_8079DCE8[4]; -extern "C" extern u8 data_8079DCEC[4]; -extern "C" extern u8 data_8079DCF0[4]; extern "C" void __ct__13daE_SM2_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -503,24 +442,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_sm2/executor.cpp b/rel/d/a/e/d_a_e_sm2/executor.cpp index 7134fee8f0b..820f5a0cd21 100644 --- a/rel/d/a/e/d_a_e_sm2/executor.cpp +++ b/rel/d/a/e/d_a_e_sm2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8079D59C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_sm2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_sm2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ffbdfd9624f..e577ecc07cc 100644 --- a/rel/d/a/e/d_a_e_sm2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_sm2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8079D5A8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8079D5A8-8079D5B0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8079D5A8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8079DB80-8079DB88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_sm2/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_sm2/unknown_translation_unit_ctors.cpp index faeb34c2a32..0bfa4fd07aa 100644 --- a/rel/d/a/e/d_a_e_sm2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_sm2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8079D59C[2]; -extern void* const data_8079D59C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_sm2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8079D59C-8079D5A4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8079D59C[2] = { + (void*)__sinit_d_a_e_sm2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_st/d_a_e_st.cpp b/rel/d/a/e/d_a_e_st/d_a_e_st.cpp index f5ba5decce7..3a60167e8e2 100644 --- a/rel/d/a/e/d_a_e_st/d_a_e_st.cpp +++ b/rel/d/a/e/d_a_e_st/d_a_e_st.cpp @@ -24,13 +24,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -50,10 +50,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -322,55 +322,6 @@ static void kabe_initial_pos_set(e_st_class*); static void roof_initial_pos_set(e_st_class*); static void daE_ST_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5038; -extern "C" extern u32 const lit_6480; -extern "C" extern u32 const lit_6484; -extern "C" extern u32 const lit_6485; -extern "C" extern u32 const lit_6486; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 base_j[32]; -extern "C" extern void* g_profile_E_ST[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_807A6E78[4]; -extern "C" extern u8 data_807A6E7C[4]; -extern "C" extern u8 data_807A6E80[4]; -extern "C" extern u8 data_807A6E84[4]; -extern "C" extern u8 data_807A6E88[4]; -extern "C" extern u8 data_807A6E8C[4]; -extern "C" extern u8 data_807A6E90[4]; -extern "C" extern u8 data_807A6E94[4]; -extern "C" extern u8 data_807A6E98[4]; -extern "C" extern u8 data_807A6E9C[4]; -extern "C" extern u8 data_807A6EA0[4]; -extern "C" extern u8 data_807A6EA4[4]; -extern "C" extern u8 data_807A6EA8[4]; -extern "C" extern u8 data_807A6EAC[4]; -extern "C" extern u8 data_807A6EB0[4]; -extern "C" extern u8 data_807A6EB4[4]; -extern "C" extern u8 data_807A6EB8[4]; -extern "C" extern u8 data_807A6EBC[4]; -extern "C" extern u8 data_807A6EC0[4]; -extern "C" extern u8 data_807A6EC4[4]; -extern "C" extern u8 data_807A6EC8[4]; -extern "C" extern u8 data_807A6ECC[4]; -extern "C" extern u8 data_807A6ED0[4]; -extern "C" extern u8 data_807A6ED4[4]; -extern "C" extern u8 data_807A6ED8[4]; extern "C" void __ct__12daE_ST_HIO_cFv(); extern "C" static void anm_init__FP10e_st_classifUcf(); @@ -537,30 +488,6 @@ void MtxPush(); void MtxPull(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_st/executor.cpp b/rel/d/a/e/d_a_e_st/executor.cpp index 97fb079c6e3..c89e8734509 100644 --- a/rel/d/a/e/d_a_e_st/executor.cpp +++ b/rel/d/a/e/d_a_e_st/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807A6810[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_st/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_st/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 605cc3db258..36dc10606cf 100644 --- a/rel/d/a/e/d_a_e_st/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_st/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807A681C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807A681C-807A6824 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807A681C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807A6D98-807A6DA0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_st/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_st/unknown_translation_unit_ctors.cpp index c16dbf7ffaf..8b1bb914abb 100644 --- a/rel/d/a/e/d_a_e_st/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_st/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807A6810[2]; -extern void* const data_807A6810[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_st_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807A6810-807A6818 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807A6810[2] = { + (void*)__sinit_d_a_e_st_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp b/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp index 7b3ad60a32a..c5989f07c1a 100644 --- a/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp +++ b/rel/d/a/e/d_a_e_st_line/d_a_e_st_line.cpp @@ -46,27 +46,6 @@ static bool daE_ST_LINE_IsDelete(e_st_line_class*); static void daE_ST_LINE_Delete(e_st_line_class*); static void useHeapInit(fopAc_ac_c*); static void daE_ST_LINE_Create(fopAc_ac_c*); -extern "C" extern u8 const lit_3705[4]; -extern "C" extern u32 const lit_3706; -extern "C" extern u32 const lit_3735; -extern "C" extern u32 const lit_3759[1 + 1 /* padding */]; -extern "C" extern u8 const lit_3938[8]; -extern "C" extern u8 const lit_3939[8]; -extern "C" extern u8 const lit_3940[8]; -extern "C" extern u32 const lit_3942; -extern "C" extern u32 const lit_3943; -extern "C" extern u32 const lit_3944; -extern "C" extern u32 const lit_3945; -extern "C" extern u32 const lit_3946; -extern "C" extern u32 const lit_3947; -extern "C" extern u32 const lit_4003; -extern "C" extern u32 const lit_4004; -extern "C" extern u32 const lit_4070; -extern "C" extern u32 const lit_4071; -extern "C" extern u32 const lit_4072; -extern "C" extern u32 const lit_4073; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_ST_LINE[12]; extern "C" static bool daE_ST_LINE_Draw__FP15e_st_line_class(); extern "C" void __dt__4cXyzFv(); @@ -108,9 +87,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cM_rndF(f32); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" void init__19mDoExt_3DlineMat0_cFUsUsi(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/e/d_a_e_st_line/executor.cpp b/rel/d/a/e/d_a_e_st_line/executor.cpp index 3f8eceded7e..dff3faa81aa 100644 --- a/rel/d/a/e/d_a_e_st_line/executor.cpp +++ b/rel/d/a/e/d_a_e_st_line/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_807A7224[4]; -extern u8 const data_807A7228[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_st_line/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_st_line/unknown_translation_unit_ctors.cpp index 5b37058d992..661085b870c 100644 --- a/rel/d/a/e/d_a_e_st_line/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_st_line/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807A7224[4]; -extern u8 const data_807A7224[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_807A7224[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807A7224-807A7228 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_807A7224[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_st_line/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_st_line/unknown_translation_unit_dtors.cpp index e36892506ab..d8bbf7ddc71 100644 --- a/rel/d/a/e/d_a_e_st_line/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_st_line/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807A7228[4]; -extern u8 const data_807A7228[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_807A7228[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 807A7228-807A722C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_807A7228[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp b/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp index 2d8c2b2337b..39c0822b044 100644 --- a/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp +++ b/rel/d/a/e/d_a_e_sw/d_a_e_sw.cpp @@ -25,13 +25,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -292,49 +292,6 @@ static void daE_SW_Delete(daE_SW_c*); static void useHeapInit(fopAc_ac_c*); static void daE_SW_Create(daE_SW_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_SW[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_807B0234[4]; -extern "C" extern u8 data_807B0238[4]; -extern "C" extern u8 data_807B023C[4]; -extern "C" extern u8 data_807B0240[4]; -extern "C" extern u8 data_807B0244[4]; -extern "C" extern u8 data_807B0248[4]; -extern "C" extern u8 data_807B024C[4]; -extern "C" extern u8 data_807B0250[4]; -extern "C" extern u8 data_807B0254[4]; -extern "C" extern u8 data_807B0258[4]; -extern "C" extern u8 data_807B025C[4]; -extern "C" extern u8 data_807B0260[4]; -extern "C" extern u8 data_807B0264[4]; -extern "C" extern u8 data_807B0268[4]; -extern "C" extern u8 data_807B026C[4]; -extern "C" extern u8 data_807B0270[4]; -extern "C" extern u8 data_807B0274[4]; -extern "C" extern u8 data_807B0278[4]; -extern "C" extern u8 data_807B027C[4]; -extern "C" extern u8 data_807B0280[4]; -extern "C" extern u8 data_807B0284[4]; -extern "C" extern u8 data_807B0288[4]; -extern "C" extern u8 data_807B028C[4]; -extern "C" extern u8 data_807B0290[4]; -extern "C" extern u8 data_807B0294[4]; extern "C" void __ct__12daE_SW_HIO_cFv(); extern "C" void bckSet__8daE_SW_cFifUcf(); @@ -497,22 +454,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/e/d_a_e_sw/executor.cpp b/rel/d/a/e/d_a_e_sw/executor.cpp index c6e8773b055..e2e3fc5f09c 100644 --- a/rel/d/a/e/d_a_e_sw/executor.cpp +++ b/rel/d/a/e/d_a_e_sw/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807AFD18[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_sw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_sw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 05f7453a95d..d6a4e4e2e19 100644 --- a/rel/d/a/e/d_a_e_sw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_sw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807AFD24[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807AFD24-807AFD2C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807AFD24[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807B01B0-807B01B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_sw/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_sw/unknown_translation_unit_ctors.cpp index 30cb379f348..50be8e97e34 100644 --- a/rel/d/a/e/d_a_e_sw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_sw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807AFD18[2]; -extern void* const data_807AFD18[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_sw_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807AFD18-807AFD20 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807AFD18[2] = { + (void*)__sinit_d_a_e_sw_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_th/d_a_e_th.cpp b/rel/d/a/e/d_a_e_th/d_a_e_th.cpp index 8c4aec653e6..b2fa110b796 100644 --- a/rel/d/a/e/d_a_e_th/d_a_e_th.cpp +++ b/rel/d/a/e/d_a_e_th/d_a_e_th.cpp @@ -25,13 +25,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -50,10 +50,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012874 */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*); @@ -266,45 +266,6 @@ static void daE_TH_Delete(e_th_class*); static void useHeapInit(fopAc_ac_c*); static void daE_TH_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4353; -extern "C" extern u32 const lit_4355; -extern "C" extern u32 const lit_4356; -extern "C" extern u32 const lit_4678; -extern "C" extern u32 const lit_4680; -extern "C" extern u32 const lit_5099; -extern "C" extern u32 const lit_5100; -extern "C" extern u32 const lit_5101; -extern "C" extern u32 const lit_5102; -extern "C" extern u32 const lit_5103; -extern "C" extern u32 const lit_5104; -extern "C" extern u32 const lit_5105; -extern "C" extern u32 const lit_5107; -extern "C" extern u32 const lit_5108; -extern "C" extern u32 const lit_5109; -extern "C" extern u32 const lit_5110; -extern "C" extern u32 const lit_5111; -extern "C" extern u32 const lit_5112; -extern "C" extern u32 const lit_5113; -extern "C" extern u32 const lit_5114; -extern "C" extern u32 const lit_5115; -extern "C" extern u32 const lit_5116; -extern "C" extern u32 const lit_5117; -extern "C" extern u32 const lit_5118; -extern "C" extern u32 const lit_5119; -extern "C" extern u32 const lit_5120; -extern "C" extern u32 const lit_5121; -extern "C" extern u32 const lit_5123; -extern "C" extern u32 const lit_5124; -extern "C" extern u32 const lit_5126; -extern "C" extern u32 const lit_5127; -extern "C" extern u32 const lit_5128; -extern "C" extern u32 const lit_5129; -extern "C" extern u32 const lit_5130; -extern "C" extern u32 const lit_5131; -extern "C" extern u32 const lit_5132; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_TH[12]; extern "C" void __ct__12daE_TH_HIO_cFv(); extern "C" static void s_md_sub1__FPvPv(); @@ -441,25 +402,6 @@ void MtxPush(); void MtxPull(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_th/executor.cpp b/rel/d/a/e/d_a_e_th/executor.cpp index 27b9f61e176..58c6241f50c 100644 --- a/rel/d/a/e/d_a_e_th/executor.cpp +++ b/rel/d/a/e/d_a_e_th/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807B4488[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_th/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_th/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9c216e1db81..0e87fe7fbf7 100644 --- a/rel/d/a/e/d_a_e_th/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_th/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807B4494[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807B4494-807B449C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807B4494[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807B4868-807B4870 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_th/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_th/unknown_translation_unit_ctors.cpp index d1c74c0dead..56bc2763fff 100644 --- a/rel/d/a/e/d_a_e_th/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_th/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807B4488[2]; -extern void* const data_807B4488[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_th_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807B4488-807B4490 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807B4488[2] = { + (void*)__sinit_d_a_e_th_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp b/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp index 6752d42c089..a08ea04764f 100644 --- a/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp +++ b/rel/d/a/e/d_a_e_th_ball/d_a_e_th_ball.cpp @@ -198,8 +198,6 @@ static bool daE_TH_BALL_IsDelete(e_th_ball_class*); static void daE_TH_BALL_Delete(e_th_ball_class*); static void useHeapInit(fopAc_ac_c*); static void daE_TH_BALL_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_TH_BALL[12]; extern "C" static void chain_draw__FP15e_th_ball_class(); extern "C" static void daE_TH_BALL_Draw__FP15e_th_ball_class(); @@ -271,21 +269,6 @@ void MtxTrans(f32, f32, f32, u8); void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_th_ball/executor.cpp b/rel/d/a/e/d_a_e_th_ball/executor.cpp index b09f5706b01..adcd4d5f0b1 100644 --- a/rel/d/a/e/d_a_e_th_ball/executor.cpp +++ b/rel/d/a/e/d_a_e_th_ball/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_807B7EB0[4]; -extern u8 const data_807B7EB4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_th_ball/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_th_ball/unknown_translation_unit_ctors.cpp index 290b29ad14d..16a7837050f 100644 --- a/rel/d/a/e/d_a_e_th_ball/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_th_ball/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807B7EB0[4]; -extern u8 const data_807B7EB0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_807B7EB0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807B7EB0-807B7EB4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_807B7EB0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_th_ball/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_th_ball/unknown_translation_unit_dtors.cpp index 348b90d7d16..28bacd8db9f 100644 --- a/rel/d/a/e/d_a_e_th_ball/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_th_ball/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807B7EB4[4]; -extern u8 const data_807B7EB4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_807B7EB4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 807B7EB4-807B7EB8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_807B7EB4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp b/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp index 2a4a775e48b..5151c025e1f 100644 --- a/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp +++ b/rel/d/a/e/d_a_e_tk/d_a_e_tk.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -55,14 +55,14 @@ struct dStage_nextStage_c { /* 80023E28 */ void set(char const*, s8, s16, s8, s8, u8); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -203,12 +203,6 @@ static bool daE_TK_IsDelete(e_tk_class*); static void daE_TK_Delete(e_tk_class*); static void useHeapInit(fopAc_ac_c*); static void daE_TK_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4018; -extern "C" extern u32 const lit_4020; -extern "C" extern u32 const lit_4021; -extern "C" extern u32 const lit_4184; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_TK[12]; extern "C" void __ct__12daE_TK_HIO_cFv(); extern "C" static void anm_init__FP10e_tk_classifUcf(); @@ -279,17 +273,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_tk/executor.cpp b/rel/d/a/e/d_a_e_tk/executor.cpp index c3b32673572..3cd70bccd9b 100644 --- a/rel/d/a/e/d_a_e_tk/executor.cpp +++ b/rel/d/a/e/d_a_e_tk/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807BA258[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_tk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_tk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a980cc06294..632f118e1c7 100644 --- a/rel/d/a/e/d_a_e_tk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_tk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807BA264[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807BA264-807BA26C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807BA264[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807BA430-807BA438 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_tk/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_tk/unknown_translation_unit_ctors.cpp index 74c8065db93..53d34693d51 100644 --- a/rel/d/a/e/d_a_e_tk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_tk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807BA258[2]; -extern void* const data_807BA258[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_tk_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807BA258-807BA260 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807BA258[2] = { + (void*)__sinit_d_a_e_tk_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp b/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp index 1e826272e45..d3831ad1c07 100644 --- a/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp +++ b/rel/d/a/e/d_a_e_tk2/d_a_e_tk2.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -55,10 +55,10 @@ struct dStage_nextStage_c { /* 80023E28 */ void set(char const*, s8, s16, s8, s8, u8); }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -198,12 +198,6 @@ static bool daE_TK2_IsDelete(e_tk2_class*); static void daE_TK2_Delete(e_tk2_class*); static void useHeapInit(fopAc_ac_c*); static void daE_TK2_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3941; -extern "C" extern u32 const lit_3943; -extern "C" extern u32 const lit_3944; -extern "C" extern u32 const lit_3946; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_TK2[12]; extern "C" void __ct__13daE_TK2_HIO_cFv(); extern "C" static void anm_init__FP11e_tk2_classifUcf(); @@ -265,17 +259,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/e/d_a_e_tk2/executor.cpp b/rel/d/a/e/d_a_e_tk2/executor.cpp index c94d3dd4690..8c4c0b7f07e 100644 --- a/rel/d/a/e/d_a_e_tk2/executor.cpp +++ b/rel/d/a/e/d_a_e_tk2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807BBD94[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_tk2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_tk2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7e02155313b..69231f04469 100644 --- a/rel/d/a/e/d_a_e_tk2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_tk2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807BBDA0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807BBDA0-807BBDA8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807BBDA0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807BBF38-807BBF40 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_tk2/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_tk2/unknown_translation_unit_ctors.cpp index a82e6494163..5aab97a3dce 100644 --- a/rel/d/a/e/d_a_e_tk2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_tk2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807BBD94[2]; -extern void* const data_807BBD94[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_tk2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807BBD94-807BBD9C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807BBD94[2] = { + (void*)__sinit_d_a_e_tk2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp b/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp index df41dc64d21..7f4066d4bf1 100644 --- a/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp +++ b/rel/d/a/e/d_a_e_tk_ball/d_a_e_tk_ball.cpp @@ -23,10 +23,6 @@ struct fopAc_ac_c { struct e_tk_ball_class {}; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -34,6 +30,10 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -144,8 +144,6 @@ static bool daE_TK_BALL_IsDelete(e_tk_ball_class*); static void daE_TK_BALL_Delete(e_tk_ball_class*); static void useHeapInit(fopAc_ac_c*); static void daE_TK_BALL_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_TK_BALL[12]; extern "C" static void daE_TK_BALL_Draw__FP15e_tk_ball_class(); extern "C" static void simple_bg_check__FP15e_tk_ball_class(); @@ -184,20 +182,6 @@ void cM_atan2s(f32, f32); void cM_rndFX(f32); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_tk_ball/executor.cpp b/rel/d/a/e/d_a_e_tk_ball/executor.cpp index 2f694a2acd5..8e5893a8fca 100644 --- a/rel/d/a/e/d_a_e_tk_ball/executor.cpp +++ b/rel/d/a/e/d_a_e_tk_ball/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_807BD564[4]; -extern u8 const data_807BD568[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_tk_ball/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_tk_ball/unknown_translation_unit_ctors.cpp index f94e76e10a0..fc6f205ab53 100644 --- a/rel/d/a/e/d_a_e_tk_ball/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_tk_ball/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807BD564[4]; -extern u8 const data_807BD564[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_807BD564[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807BD564-807BD568 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_807BD564[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_tk_ball/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_tk_ball/unknown_translation_unit_dtors.cpp index d8d8cfd78e8..4e0164c9de9 100644 --- a/rel/d/a/e/d_a_e_tk_ball/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_tk_ball/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807BD568[4]; -extern u8 const data_807BD568[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_807BD568[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 807BD568-807BD56C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_807BD568[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp b/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp index cb60efb3703..06665967c3a 100644 --- a/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp +++ b/rel/d/a/e/d_a_e_tt/d_a_e_tt.cpp @@ -23,13 +23,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -58,10 +58,10 @@ struct fopAcM_wt_c { /* 8001DD84 */ void waterCheck(cXyz const*); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_TT_c { /* 807BD7EC */ void ctrlJoint(J3DJoint*, J3DModel*); /* 807BD8E0 */ void JointCallBack(J3DJoint*, int); @@ -120,12 +120,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -279,53 +279,6 @@ static void daE_TT_Delete(daE_TT_c*); static void useHeapInit(fopAc_ac_c*); static void daE_TT_Create(daE_TT_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4795; -extern "C" extern u32 const lit_4940[1 + 1 /* padding */]; -extern "C" extern u32 const lit_5447; -extern "C" extern u32 const lit_5448; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_807C2140[64]; -extern "C" extern void* g_profile_E_TT[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_807C2494[4]; -extern "C" extern u8 data_807C2498[4]; -extern "C" extern u8 data_807C249C[4]; -extern "C" extern u8 data_807C24A0[4]; -extern "C" extern u8 data_807C24A4[4]; -extern "C" extern u8 data_807C24A8[4]; -extern "C" extern u8 data_807C24AC[4]; -extern "C" extern u8 data_807C24B0[4]; -extern "C" extern u8 data_807C24B4[4]; -extern "C" extern u8 data_807C24B8[4]; -extern "C" extern u8 data_807C24BC[4]; -extern "C" extern u8 data_807C24C0[4]; -extern "C" extern u8 data_807C24C4[4]; -extern "C" extern u8 data_807C24C8[4]; -extern "C" extern u8 data_807C24CC[4]; -extern "C" extern u8 data_807C24D0[4]; -extern "C" extern u8 data_807C24D4[4]; -extern "C" extern u8 data_807C24D8[4]; -extern "C" extern u8 data_807C24DC[4]; -extern "C" extern u8 data_807C24E0[4]; -extern "C" extern u8 data_807C24E4[4]; -extern "C" extern u8 data_807C24E8[4]; -extern "C" extern u8 data_807C24EC[4]; -extern "C" extern u8 data_807C24F0[4]; -extern "C" extern u8 data_807C24F4[4]; extern "C" void __ct__12daE_TT_HIO_cFv(); extern "C" void ctrlJoint__8daE_TT_cFP8J3DJointP8J3DModel(); @@ -463,25 +416,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_ZrotM__FPA4_fs(); extern "C" void mDoMtx_MtxToRot__FPA4_CfP5csXyz(); diff --git a/rel/d/a/e/d_a_e_tt/executor.cpp b/rel/d/a/e/d_a_e_tt/executor.cpp index 6fbe3335cb3..15ea8d1aaf5 100644 --- a/rel/d/a/e/d_a_e_tt/executor.cpp +++ b/rel/d/a/e/d_a_e_tt/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807C1FA4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_tt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_tt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c1cf352acbc..45ed1acf2a2 100644 --- a/rel/d/a/e/d_a_e_tt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_tt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807C1FB0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807C1FB0-807C1FB8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807C1FB0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807C2398-807C23A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_tt/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_tt/unknown_translation_unit_ctors.cpp index 777c5562114..5dfb0260c1e 100644 --- a/rel/d/a/e/d_a_e_tt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_tt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807C1FA4[2]; -extern void* const data_807C1FA4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_tt_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807C1FA4-807C1FAC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807C1FA4[2] = { + (void*)__sinit_d_a_e_tt_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp b/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp index 7ca1713d036..0e2efc05393 100644 --- a/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp +++ b/rel/d/a/e/d_a_e_vt/d_a_e_vt.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 807CE240 */ csXyz(); - /* 807CEC04 */ ~csXyz(); -}; - struct Vec {}; struct cXyz { @@ -30,6 +25,11 @@ struct cXyz { /* 807CEC40 */ ~cXyz(); }; +struct csXyz { + /* 807CE240 */ csXyz(); + /* 807CEC04 */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -60,13 +60,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -84,11 +84,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -393,75 +393,6 @@ static void daE_VA_Delete(daE_VA_c*); static void useHeapInit(fopAc_ac_c*); static void daE_VA_Create(daE_VA_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5085; -extern "C" extern u32 const lit_6350; -extern "C" extern u32 const lit_6351; -extern "C" extern u32 const lit_6352; -extern "C" extern u32 const lit_6353; -extern "C" extern u32 const lit_6354; -extern "C" extern u32 const lit_6355; -extern "C" extern u32 const lit_6356; -extern "C" extern u32 const lit_6357; -extern "C" extern u32 const lit_6358; -extern "C" extern u32 const lit_6359; -extern "C" extern u32 const lit_6361; -extern "C" extern u32 const lit_6363; -extern "C" extern u32 const lit_6366; -extern "C" extern u32 const lit_6367; -extern "C" extern u32 const lit_6368; -extern "C" extern u32 const lit_6369; -extern "C" extern u32 const lit_6370; -extern "C" extern u32 const lit_6999; -extern "C" extern u32 const lit_7000; -extern "C" extern u32 const lit_7001; -extern "C" extern u32 const lit_7003; -extern "C" extern u32 const lit_7240; -extern "C" extern u32 const lit_7241; -extern "C" extern u32 const lit_7242; -extern "C" extern u32 const lit_7424; -extern "C" extern u32 const lit_7923; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_VT[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_807CF6E4[4]; -extern "C" extern u8 data_807CF6E8[4]; -extern "C" extern u8 data_807CF6EC[4]; -extern "C" extern u8 data_807CF6F0[4]; -extern "C" extern u8 data_807CF6F4[4]; -extern "C" extern u8 data_807CF6F8[4]; -extern "C" extern u8 data_807CF6FC[4]; -extern "C" extern u8 data_807CF700[4]; -extern "C" extern u8 data_807CF704[4]; -extern "C" extern u8 data_807CF708[4]; -extern "C" extern u8 data_807CF70C[4]; -extern "C" extern u8 data_807CF710[4]; -extern "C" extern u8 data_807CF714[4]; -extern "C" extern u8 data_807CF718[4]; -extern "C" extern u8 data_807CF71C[4]; -extern "C" extern u8 data_807CF720[4]; -extern "C" extern u8 data_807CF724[4]; -extern "C" extern u8 data_807CF728[4]; -extern "C" extern u8 data_807CF72C[4]; -extern "C" extern u8 data_807CF730[4]; -extern "C" extern u8 data_807CF734[4]; -extern "C" extern u8 data_807CF738[4]; -extern "C" extern u8 data_807CF73C[4]; -extern "C" extern u8 data_807CF740[4]; -extern "C" extern u8 data_807CF744[4]; extern "C" void __ct__12daE_VA_HIO_cFv(); extern "C" void ctrlJoint__8daE_VA_cFP8J3DJointP8J3DModel(); @@ -682,29 +613,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 j3dZModeTable[96]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_vt/executor.cpp b/rel/d/a/e/d_a_e_vt/executor.cpp index 17fcb76ad52..e401fdb5285 100644 --- a/rel/d/a/e/d_a_e_vt/executor.cpp +++ b/rel/d/a/e/d_a_e_vt/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807CEC94[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_vt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_vt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 569ed1202ec..8635bc3b75b 100644 --- a/rel/d/a/e/d_a_e_vt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_vt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807CECA0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807CECA0-807CECA8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807CECA0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807CF470-807CF478 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_vt/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_vt/unknown_translation_unit_ctors.cpp index 4badc3c16dc..800a005a3a0 100644 --- a/rel/d/a/e/d_a_e_vt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_vt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807CEC94[2]; -extern void* const data_807CEC94[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_vt_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807CEC94-807CEC9C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807CEC94[2] = { + (void*)__sinit_d_a_e_vt_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp b/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp index 9b82d35c1b8..10300797907 100644 --- a/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp +++ b/rel/d/a/e/d_a_e_warpappear/d_a_e_warpappear.cpp @@ -84,10 +84,10 @@ struct dPa_levelEcallBack {}; struct csXyz {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -154,100 +154,6 @@ static bool daE_Warpappear_IsDelete(e_warpappear_class*); static void daE_Warpappear_Delete(e_warpappear_class*); static void useHeapInit(fopAc_ac_c*); static void daE_Warpappear_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4804; -extern "C" extern u32 const lit_4805; -extern "C" extern u32 const lit_4806; -extern "C" extern u32 const lit_4807; -extern "C" extern u32 const lit_4808; -extern "C" extern u32 const lit_4809; -extern "C" extern u32 const lit_4810; -extern "C" extern u32 const lit_4811; -extern "C" extern u32 const lit_4812; -extern "C" extern u32 const lit_4813; -extern "C" extern u32 const lit_4814; -extern "C" extern u32 const lit_4815; -extern "C" extern u32 const lit_4816; -extern "C" extern u32 const lit_4817; -extern "C" extern u32 const lit_4818; -extern "C" extern u32 const lit_4819; -extern "C" extern u32 const lit_4820; -extern "C" extern u32 const lit_4821; -extern "C" extern u32 const lit_4822; -extern "C" extern u32 const lit_4823; -extern "C" extern u32 const lit_4824; -extern "C" extern u32 const lit_4825; -extern "C" extern u32 const lit_4826; -extern "C" extern u32 const lit_4827; -extern "C" extern u32 const lit_4828; -extern "C" extern u32 const lit_4829; -extern "C" extern u32 const lit_4830; -extern "C" extern u32 const lit_4831; -extern "C" extern u32 const lit_4832; -extern "C" extern u32 const lit_4833; -extern "C" extern u32 const lit_4834; -extern "C" extern u32 const lit_4835; -extern "C" extern u32 const lit_4836; -extern "C" extern u32 const lit_4837; -extern "C" extern u32 const lit_4838; -extern "C" extern u32 const lit_4839; -extern "C" extern u32 const lit_4840; -extern "C" extern u32 const lit_4841; -extern "C" extern u32 const lit_4842; -extern "C" extern u32 const lit_4843; -extern "C" extern u32 const lit_4844; -extern "C" extern u32 const lit_4845; -extern "C" extern u32 const lit_4846; -extern "C" extern u32 const lit_4847; -extern "C" extern u32 const lit_4848; -extern "C" extern u32 const lit_4849; -extern "C" extern u32 const lit_4850; -extern "C" extern u32 const lit_4851; -extern "C" extern u32 const lit_4852; -extern "C" extern u32 const lit_4853; -extern "C" extern u32 const lit_4854; -extern "C" extern u32 const lit_4855; -extern "C" extern u32 const lit_4856; -extern "C" extern u32 const lit_4857; -extern "C" extern u32 const lit_4858; -extern "C" extern u32 const lit_4859; -extern "C" extern u32 const lit_4860; -extern "C" extern u32 const lit_4861; -extern "C" extern u32 const lit_4862; -extern "C" extern u32 const lit_4863; -extern "C" extern u32 const lit_4864; -extern "C" extern u32 const lit_4865; -extern "C" extern u32 const lit_4866; -extern "C" extern u32 const lit_4867; -extern "C" extern u32 const lit_4868; -extern "C" extern u32 const lit_4869; -extern "C" extern u32 const lit_4870; -extern "C" extern u32 const lit_4871; -extern "C" extern u32 const lit_4872; -extern "C" extern u32 const lit_4873; -extern "C" extern u32 const lit_4874; -extern "C" extern u32 const lit_4875; -extern "C" extern u32 const lit_4876; -extern "C" extern u32 const lit_4877; -extern "C" extern u32 const lit_4878; -extern "C" extern u32 const lit_4879; -extern "C" extern u32 const lit_4880; -extern "C" extern u32 const lit_4881; -extern "C" extern u32 const lit_4882; -extern "C" extern u32 const lit_4883; -extern "C" extern u32 const lit_4884; -extern "C" extern u32 const lit_4885; -extern "C" extern u32 const lit_4886; -extern "C" extern u32 const lit_4887; -extern "C" extern u32 const lit_4888; -extern "C" extern u32 const lit_4889; -extern "C" extern u32 const lit_4890; -extern "C" extern u32 const lit_4891; -extern "C" extern u32 const lit_4892; -extern "C" extern u32 const lit_4893; -extern "C" extern u32 const lit_4894; -extern "C" extern u32 const lit_4895; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_WAP[12]; extern "C" static void daE_Warpappear_Draw__FP18e_warpappear_class(); extern "C" static void s_s1_sub__FPvPv(); @@ -387,16 +293,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalc0(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/e/d_a_e_warpappear/executor.cpp b/rel/d/a/e/d_a_e_warpappear/executor.cpp index 7c9a2b4b26f..a4d23c3feb3 100644 --- a/rel/d/a/e/d_a_e_warpappear/executor.cpp +++ b/rel/d/a/e/d_a_e_warpappear/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_807D2080[4]; -extern u8 const data_807D2084[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_warpappear/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_warpappear/unknown_translation_unit_ctors.cpp index 9764c566c29..e380122d51e 100644 --- a/rel/d/a/e/d_a_e_warpappear/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_warpappear/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807D2080[4]; -extern u8 const data_807D2080[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_807D2080[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807D2080-807D2084 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_807D2080[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_warpappear/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_warpappear/unknown_translation_unit_dtors.cpp index e3e72f30c64..40b0f69adc6 100644 --- a/rel/d/a/e/d_a_e_warpappear/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_warpappear/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807D2084[4]; -extern u8 const data_807D2084[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_807D2084[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 807D2084-807D2088 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_807D2084[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp index 0efd38a4091..13ccebeb424 100644 --- a/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp +++ b/rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp @@ -37,13 +37,13 @@ struct mDoGph_gInf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -62,10 +62,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; - struct dKy_tevstr_c {}; +struct ResTIMG {}; + struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); /* 80013FB0 */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -469,246 +469,6 @@ static void dComIfGp_particle_set(u32, u16, cXyz const*, csXyz const*, cXyz cons static void dComIfGp_getVibration(); static void dComIfGp_getEvent(); static void fpcM_Search(void* (*)(void*, void*), void*); -extern "C" extern u32 const lit_6244; -extern "C" extern u32 const lit_6247; -extern "C" extern u32 const lit_6248; -extern "C" extern u32 const lit_6249; -extern "C" extern u32 const lit_6891; -extern "C" extern u32 const lit_6892; -extern "C" extern u32 const lit_8132; -extern "C" extern u32 const lit_8134; -extern "C" extern u32 const lit_8135; -extern "C" extern u32 const lit_8376; -extern "C" extern u32 const lit_9224; -extern "C" extern u32 const lit_9226; -extern "C" extern u32 const lit_9227; -extern "C" extern u32 const lit_9228; -extern "C" extern u32 const lit_9229; -extern "C" extern u32 const lit_9230; -extern "C" extern u32 const lit_9231; -extern "C" extern u32 const lit_9232; -extern "C" extern u32 const lit_9233; -extern "C" extern u32 const lit_9234; -extern "C" extern u32 const lit_9235; -extern "C" extern u32 const lit_9236; -extern "C" extern u32 const lit_9237; -extern "C" extern u32 const lit_9238; -extern "C" extern u32 const lit_9239; -extern "C" extern u32 const lit_9240; -extern "C" extern u32 const lit_9241; -extern "C" extern u32 const lit_9242; -extern "C" extern u32 const lit_9243; -extern "C" extern u32 const lit_9244; -extern "C" extern u32 const lit_9245; -extern "C" extern u32 const lit_9246; -extern "C" extern u32 const lit_9247; -extern "C" extern u32 const lit_9248; -extern "C" extern u32 const lit_9249; -extern "C" extern u32 const lit_9250; -extern "C" extern u32 const lit_9251; -extern "C" extern u32 const lit_9252; -extern "C" extern u32 const lit_9253; -extern "C" extern u32 const lit_9254; -extern "C" extern u32 const lit_9255; -extern "C" extern u32 const lit_9256; -extern "C" extern u32 const lit_9257; -extern "C" extern u32 const lit_9258; -extern "C" extern u32 const lit_9260; -extern "C" extern u32 const lit_9261; -extern "C" extern u32 const lit_9262; -extern "C" extern u32 const lit_9263; -extern "C" extern u32 const lit_9264; -extern "C" extern u32 const lit_9265; -extern "C" extern u32 const lit_9266; -extern "C" extern u32 const lit_9267; -extern "C" extern u32 const lit_9268; -extern "C" extern u32 const lit_9269; -extern "C" extern u32 const lit_9270; -extern "C" extern u32 const lit_9271; -extern "C" extern u32 const lit_9272; -extern "C" extern u32 const lit_9273; -extern "C" extern u32 const lit_9274; -extern "C" extern u32 const lit_9275; -extern "C" extern u32 const lit_9276; -extern "C" extern u32 const lit_9277; -extern "C" extern u32 const lit_9278; -extern "C" extern u32 const lit_9279; -extern "C" extern u32 const lit_9280; -extern "C" extern u32 const lit_9281; -extern "C" extern u32 const lit_9282; -extern "C" extern u32 const lit_9283; -extern "C" extern u32 const lit_9284; -extern "C" extern u32 const lit_9285; -extern "C" extern u32 const lit_9286; -extern "C" extern u32 const lit_9287; -extern "C" extern u32 const lit_9288; -extern "C" extern u32 const lit_9289; -extern "C" extern u32 const lit_9290; -extern "C" extern u32 const lit_9291; -extern "C" extern u32 const lit_9292; -extern "C" extern u32 const lit_9293; -extern "C" extern u32 const lit_9294; -extern "C" extern u32 const lit_9295; -extern "C" extern u32 const lit_9296; -extern "C" extern u32 const lit_9297; -extern "C" extern u32 const lit_9298; -extern "C" extern u32 const lit_9299; -extern "C" extern u32 const lit_9300; -extern "C" extern u32 const lit_9301; -extern "C" extern u32 const lit_9302; -extern "C" extern u32 const lit_9303; -extern "C" extern u32 const lit_9304; -extern "C" extern u32 const lit_9305; -extern "C" extern u32 const lit_9306; -extern "C" extern u32 const lit_9307; -extern "C" extern u32 const lit_9308; -extern "C" extern u32 const lit_9309; -extern "C" extern u32 const lit_9310; -extern "C" extern u32 const lit_9311; -extern "C" extern u32 const lit_9312; -extern "C" extern u32 const lit_9313; -extern "C" extern u32 const lit_9314; -extern "C" extern u32 const lit_9315; -extern "C" extern u32 const lit_9316; -extern "C" extern u32 const lit_9317; -extern "C" extern u32 const lit_9318; -extern "C" extern u32 const lit_9319; -extern "C" extern u32 const lit_9320; -extern "C" extern u32 const lit_9321; -extern "C" extern u32 const lit_9322; -extern "C" extern u32 const lit_9323; -extern "C" extern u32 const lit_9324; -extern "C" extern u32 const lit_9325; -extern "C" extern u32 const lit_9326; -extern "C" extern u32 const lit_9327; -extern "C" extern u32 const lit_9328; -extern "C" extern u32 const lit_9329; -extern "C" extern u32 const lit_9330; -extern "C" extern u32 const lit_9331; -extern "C" extern u32 const lit_9332; -extern "C" extern u32 const lit_9333; -extern "C" extern u32 const lit_9334; -extern "C" extern u32 const lit_9335; -extern "C" extern u32 const lit_9336; -extern "C" extern u32 const lit_9337; -extern "C" extern u32 const lit_9338; -extern "C" extern u32 const lit_9339; -extern "C" extern u32 const lit_9340; -extern "C" extern u32 const lit_9341; -extern "C" extern u32 const lit_9342; -extern "C" extern u32 const lit_9343; -extern "C" extern u32 const lit_9344; -extern "C" extern u32 const lit_9345; -extern "C" extern u32 const lit_9346; -extern "C" extern u32 const lit_9347; -extern "C" extern u32 const lit_9348; -extern "C" extern u32 const lit_9349; -extern "C" extern u32 const lit_9350; -extern "C" extern u32 const lit_9351; -extern "C" extern u32 const lit_9352; -extern "C" extern u32 const lit_9353; -extern "C" extern u32 const lit_9354; -extern "C" extern u32 const lit_9355; -extern "C" extern u32 const lit_9356; -extern "C" extern u32 const lit_9357; -extern "C" extern u32 const lit_9358; -extern "C" extern u32 const lit_9359; -extern "C" extern u32 const lit_9360; -extern "C" extern u32 const lit_9361; -extern "C" extern u32 const lit_9362; -extern "C" extern u32 const lit_9363; -extern "C" extern u32 const lit_9364; -extern "C" extern u32 const lit_9365; -extern "C" extern u32 const lit_9366; -extern "C" extern u32 const lit_9367; -extern "C" extern u32 const lit_9368; -extern "C" extern u32 const lit_9369; -extern "C" extern u32 const lit_9370; -extern "C" extern u32 const lit_9371; -extern "C" extern u32 const lit_9372; -extern "C" extern u32 const lit_9373; -extern "C" extern u32 const lit_9374; -extern "C" extern u32 const lit_9375; -extern "C" extern u32 const lit_9376; -extern "C" extern u32 const lit_9377; -extern "C" extern u32 const lit_9378; -extern "C" extern u32 const lit_9379; -extern "C" extern u32 const lit_9380; -extern "C" extern u32 const lit_9381; -extern "C" extern u32 const lit_9382; -extern "C" extern u32 const lit_9383; -extern "C" extern u32 const lit_9384; -extern "C" extern u32 const lit_9385; -extern "C" extern u32 const lit_9386; -extern "C" extern u32 const lit_9387; -extern "C" extern u32 const lit_9388; -extern "C" extern u32 const lit_9389; -extern "C" extern u32 const lit_9390; -extern "C" extern u32 const lit_9391; -extern "C" extern u32 const lit_9392; -extern "C" extern u32 const lit_9393; -extern "C" extern u32 const lit_9394; -extern "C" extern u32 const lit_9395; -extern "C" extern u32 const lit_9396; -extern "C" extern u32 const lit_9397; -extern "C" extern u32 const lit_9398; -extern "C" extern u32 const lit_9399; -extern "C" extern u32 const lit_9400; -extern "C" extern u32 const lit_9401; -extern "C" extern u32 const lit_9402; -extern "C" extern u32 const lit_9403; -extern "C" extern u32 const lit_9404; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_WB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_7814[12 + 4 /* padding */]; -extern "C" extern u8 lit_7817[12]; -extern "C" extern u8 lit_7818[12]; -extern "C" extern u8 data_807E382C[36]; -extern "C" extern u8 lit_7820[12 + 4 /* padding */]; -extern "C" extern u8 lit_7823[12]; -extern "C" extern u8 lit_7824[12]; -extern "C" extern u8 data_807E3878[36]; -extern "C" extern u8 data_807E38A0[4]; -extern "C" extern u8 data_807E38A4[4]; -extern "C" extern u8 data_807E38A8[4]; -extern "C" extern u8 data_807E38AC[4]; -extern "C" extern u8 data_807E38B0[4]; -extern "C" extern u8 data_807E38B4[4]; -extern "C" extern u8 data_807E38B8[4]; -extern "C" extern u8 data_807E38BC[4]; -extern "C" extern u8 data_807E38C0[4]; -extern "C" extern u8 data_807E38C4[4]; -extern "C" extern u8 data_807E38C8[4]; -extern "C" extern u8 data_807E38CC[4]; -extern "C" extern u8 data_807E38D0[4]; -extern "C" extern u8 data_807E38D4[4]; -extern "C" extern u8 data_807E38D8[4]; -extern "C" extern u8 data_807E38DC[4]; -extern "C" extern u8 data_807E38E0[4]; -extern "C" extern u8 data_807E38E4[4]; -extern "C" extern u8 data_807E38E8[4]; -extern "C" extern u8 data_807E38EC[4]; -extern "C" extern u8 data_807E38F0[4]; -extern "C" extern u8 data_807E38F4[4]; -extern "C" extern u8 data_807E38F8[4]; -extern "C" extern u8 data_807E38FC[4]; -extern "C" extern u8 data_807E3900[4]; -extern "C" extern u8 data_807E3904[4]; extern "C" void __ct__12daE_WB_HIO_cFv(); extern "C" static void anm_init__FP10e_wb_classifUcf(); @@ -1142,29 +902,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_wb/executor.cpp b/rel/d/a/e/d_a_e_wb/executor.cpp index 7e5f9ffbafb..d6445e84157 100644 --- a/rel/d/a/e/d_a_e_wb/executor.cpp +++ b/rel/d/a/e/d_a_e_wb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807E2978[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_wb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_wb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 0339e9daeb6..fec05c998b9 100644 --- a/rel/d/a/e/d_a_e_wb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_wb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807E2984[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807E2984-807E298C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807E2984[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807E3570-807E3578 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_wb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_wb/unknown_translation_unit_ctors.cpp index 9555fcc22fd..c0f55542a6d 100644 --- a/rel/d/a/e/d_a_e_wb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_wb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807E2978[2]; -extern void* const data_807E2978[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_wb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807E2978-807E2980 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807E2978[2] = { + (void*)__sinit_d_a_e_wb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp b/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp index 9c8e3dc63da..9e9402500e1 100644 --- a/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp +++ b/rel/d/a/e/d_a_e_ws/d_a_e_ws.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -31,13 +31,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -254,12 +254,6 @@ static void daE_WS_Delete(daE_WS_c*); static void useHeapInit(fopAc_ac_c*); static void daE_WS_Create(daE_WS_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4264; -extern "C" extern u32 const lit_4265; -extern "C" extern u32 const lit_4266; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_WS[12]; extern "C" void __ct__12daE_WS_HIO_cFv(); extern "C" void draw__8daE_WS_cFv(); @@ -341,20 +335,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ws/executor.cpp b/rel/d/a/e/d_a_e_ws/executor.cpp index ca93329be6e..c69f91d8a10 100644 --- a/rel/d/a/e/d_a_e_ws/executor.cpp +++ b/rel/d/a/e/d_a_e_ws/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807E72EC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ws/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ws/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b23cda5be6a..5905bd762a9 100644 --- a/rel/d/a/e/d_a_e_ws/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ws/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807E72F8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807E72F8-807E7300 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807E72F8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807E75B0-807E75B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ws/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ws/unknown_translation_unit_ctors.cpp index c57b541e83a..81917f112d4 100644 --- a/rel/d/a/e/d_a_e_ws/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ws/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807E72EC[2]; -extern void* const data_807E72EC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ws_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807E72EC-807E72F4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807E72EC[2] = { + (void*)__sinit_d_a_e_ws_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp b/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp index 0ef780289a8..72599ed4709 100644 --- a/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp +++ b/rel/d/a/e/d_a_e_ww/d_a_e_ww.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -24,6 +20,10 @@ struct cXyz { /* 807EF708 */ ~cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -33,13 +33,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -61,10 +61,10 @@ struct daPy_py_c { /* 807EF744 */ void checkNowWolf(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daE_WW_c { /* 807E7748 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 807E7800 */ void JointCallBack(J3DJoint*, int); @@ -125,12 +125,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -296,51 +296,6 @@ static void daE_WW_Delete(daE_WW_c*); static void useHeapInit(fopAc_ac_c*); static void daE_WW_Create(daE_WW_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5114; -extern "C" extern u32 const lit_6439; -extern "C" extern u32 const lit_6440; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_WW[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_807EFD60[4]; -extern "C" extern u8 data_807EFD64[4]; -extern "C" extern u8 data_807EFD68[4]; -extern "C" extern u8 data_807EFD6C[4]; -extern "C" extern u8 data_807EFD70[4]; -extern "C" extern u8 data_807EFD74[4]; -extern "C" extern u8 data_807EFD78[4]; -extern "C" extern u8 data_807EFD7C[4]; -extern "C" extern u8 data_807EFD80[4]; -extern "C" extern u8 data_807EFD84[4]; -extern "C" extern u8 data_807EFD88[4]; -extern "C" extern u8 data_807EFD8C[4]; -extern "C" extern u8 data_807EFD90[4]; -extern "C" extern u8 data_807EFD94[4]; -extern "C" extern u8 data_807EFD98[4]; -extern "C" extern u8 data_807EFD9C[4]; -extern "C" extern u8 data_807EFDA0[4]; -extern "C" extern u8 data_807EFDA4[4]; -extern "C" extern u8 data_807EFDA8[4]; -extern "C" extern u8 data_807EFDAC[4]; -extern "C" extern u8 data_807EFDB0[4]; -extern "C" extern u8 data_807EFDB4[4]; -extern "C" extern u8 data_807EFDB8[4]; -extern "C" extern u8 data_807EFDBC[4]; -extern "C" extern u8 data_807EFDC0[4]; extern "C" void __ct__12daE_WW_HIO_cFv(); extern "C" void ctrlJoint__8daE_WW_cFP8J3DJointP8J3DModel(); @@ -497,23 +452,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ww/executor.cpp b/rel/d/a/e/d_a_e_ww/executor.cpp index 4045e5d1c30..b25956b231d 100644 --- a/rel/d/a/e/d_a_e_ww/executor.cpp +++ b/rel/d/a/e/d_a_e_ww/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807EF75C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ww/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ww/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index bc4ffc23064..45d9bbd0bf4 100644 --- a/rel/d/a/e/d_a_e_ww/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ww/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807EF768[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807EF768-807EF770 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807EF768[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807EFB78-807EFB80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ww/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ww/unknown_translation_unit_ctors.cpp index b86e6802718..829c1781edf 100644 --- a/rel/d/a/e/d_a_e_ww/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ww/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807EF75C[2]; -extern void* const data_807EF75C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ww_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807EF75C-807EF764 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807EF75C[2] = { + (void*)__sinit_d_a_e_ww_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp index cf6cb5466bb..98b93bb03ec 100644 --- a/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp +++ b/rel/d/a/e/d_a_e_yc/d_a_e_yc.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -198,15 +198,6 @@ static bool daE_YC_IsDelete(e_yc_class*); static void daE_YC_Delete(e_yc_class*); static void useHeapInit(fopAc_ac_c*); static void daE_YC_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3867; -extern "C" extern u32 const lit_3868; -extern "C" extern u32 const lit_3869; -extern "C" extern u32 const lit_3870; -extern "C" extern u32 const lit_3876; -extern "C" extern u32 const lit_4084; -extern "C" extern u32 const lit_4085; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_YC[12]; extern "C" void __ct__12daE_YC_HIO_cFv(); extern "C" static void anm_init__FP10e_yc_classifUcf(); @@ -271,21 +262,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_yc/executor.cpp b/rel/d/a/e/d_a_e_yc/executor.cpp index 5ce356bb0b0..7cf63976d19 100644 --- a/rel/d/a/e/d_a_e_yc/executor.cpp +++ b/rel/d/a/e/d_a_e_yc/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807F2850[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_yc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_yc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 19ad4162557..aaf824981c2 100644 --- a/rel/d/a/e/d_a_e_yc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_yc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807F285C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807F285C-807F2864 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807F285C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807F2B00-807F2B08 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_yc/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_yc/unknown_translation_unit_ctors.cpp index b9f44ec44d0..e995a581370 100644 --- a/rel/d/a/e/d_a_e_yc/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_yc/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807F2850[2]; -extern void* const data_807F2850[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_yc_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807F2850-807F2858 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807F2850[2] = { + (void*)__sinit_d_a_e_yc_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp b/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp index 8aec13b6853..ef314f1ba86 100644 --- a/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp +++ b/rel/d/a/e/d_a_e_yd/d_a_e_yd.cpp @@ -32,13 +32,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -64,11 +64,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -286,15 +286,6 @@ static void daE_YD_Delete(e_yd_class*); static void useHeapInit(fopAc_ac_c*); static void daE_YD_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4861; -extern "C" extern u32 const lit_4863; -extern "C" extern u32 const lit_4864; -extern "C" extern u32 const lit_5003; -extern "C" extern u32 const lit_5005; -extern "C" extern u32 const lit_5006; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_YD[12]; extern "C" void __ct__12daE_YD_HIO_cFv(); extern "C" static void yd_disappear__FP10e_yd_class(); @@ -394,27 +385,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_yd/executor.cpp b/rel/d/a/e/d_a_e_yd/executor.cpp index d305de10650..b618a9c2816 100644 --- a/rel/d/a/e/d_a_e_yd/executor.cpp +++ b/rel/d/a/e/d_a_e_yd/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807F79EC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_yd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_yd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 035551719b6..025c6daef2b 100644 --- a/rel/d/a/e/d_a_e_yd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_yd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807F79F8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807F79F8-807F7A00 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807F79F8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807F7D60-807F7D68 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_yd/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_yd/unknown_translation_unit_ctors.cpp index d7801464099..2416fec875b 100644 --- a/rel/d/a/e/d_a_e_yd/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_yd/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807F79EC[2]; -extern void* const data_807F79EC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_yd_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807F79EC-807F79F4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807F79EC[2] = { + (void*)__sinit_d_a_e_yd_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp index 16b27c738bb..5f22e67ce7f 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp +++ b/rel/d/a/e/d_a_e_yd_leaf/d_a_e_yd_leaf.cpp @@ -39,10 +39,10 @@ struct fopAc_ac_c { struct e_yd_leaf_class {}; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -64,8 +64,6 @@ static bool daE_YD_LEAF_IsDelete(e_yd_leaf_class*); static void daE_YD_LEAF_Delete(e_yd_leaf_class*); static void useHeapInit(fopAc_ac_c*); static void daE_YD_LEAF_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_E_YD_LEAF[12]; extern "C" static void daE_YD_LEAF_Draw__FP15e_yd_leaf_class(); extern "C" static void daE_YD_LEAF_Execute__FP15e_yd_leaf_class(); @@ -90,12 +88,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cLib_addCalc0(f32*, f32, f32); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_yd_leaf/executor.cpp b/rel/d/a/e/d_a_e_yd_leaf/executor.cpp index c4eb0fa3f7e..8242740fd2d 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/executor.cpp +++ b/rel/d/a/e/d_a_e_yd_leaf/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_807F81E0[4]; -extern u8 const data_807F81E4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_yd_leaf/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_yd_leaf/unknown_translation_unit_ctors.cpp index 49d54a1539c..91875cf3ddd 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_yd_leaf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807F81E0[4]; -extern u8 const data_807F81E0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_807F81E0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807F81E0-807F81E4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_807F81E0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_yd_leaf/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_yd_leaf/unknown_translation_unit_dtors.cpp index 391f40bf832..eed86d44a76 100644 --- a/rel/d/a/e/d_a_e_yd_leaf/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_yd_leaf/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_807F81E4[4]; -extern u8 const data_807F81E4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_807F81E4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 807F81E4-807F81E8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_807F81E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp b/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp index 53fe41cb375..e2071fada3a 100644 --- a/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp +++ b/rel/d/a/e/d_a_e_yg/d_a_e_yg.cpp @@ -25,13 +25,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -50,10 +50,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -278,53 +278,6 @@ static void daE_YG_Delete(e_yg_class*); static void useHeapInit(fopAc_ac_c*); static void daE_YG_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4891; -extern "C" extern u32 const lit_4892; -extern "C" extern u32 const lit_4893; -extern "C" extern u32 const lit_4895; -extern "C" extern u32 const lit_4897; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_YG[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_807FD368[4]; -extern "C" extern u8 data_807FD36C[4]; -extern "C" extern u8 data_807FD370[4]; -extern "C" extern u8 data_807FD374[4]; -extern "C" extern u8 data_807FD378[4]; -extern "C" extern u8 data_807FD37C[4]; -extern "C" extern u8 data_807FD380[4]; -extern "C" extern u8 data_807FD384[4]; -extern "C" extern u8 data_807FD388[4]; -extern "C" extern u8 data_807FD38C[4]; -extern "C" extern u8 data_807FD390[4]; -extern "C" extern u8 data_807FD394[4]; -extern "C" extern u8 data_807FD398[4]; -extern "C" extern u8 data_807FD39C[4]; -extern "C" extern u8 data_807FD3A0[4]; -extern "C" extern u8 data_807FD3A4[4]; -extern "C" extern u8 data_807FD3A8[4]; -extern "C" extern u8 data_807FD3AC[4]; -extern "C" extern u8 data_807FD3B0[4]; -extern "C" extern u8 data_807FD3B4[4]; -extern "C" extern u8 data_807FD3B8[4]; -extern "C" extern u8 data_807FD3BC[4]; -extern "C" extern u8 data_807FD3C0[4]; -extern "C" extern u8 data_807FD3C4[4]; -extern "C" extern u8 data_807FD3C8[4]; extern "C" void __ct__12daE_YG_HIO_cFv(); extern "C" static void anm_init__FP10e_yg_classifUcf(); @@ -462,25 +415,6 @@ void MtxPull(); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_yg/executor.cpp b/rel/d/a/e/d_a_e_yg/executor.cpp index 0f6d656936c..ebf4a55aac7 100644 --- a/rel/d/a/e/d_a_e_yg/executor.cpp +++ b/rel/d/a/e/d_a_e_yg/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_807FCCA0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_yg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_yg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 0c450c60fca..da33f9d8467 100644 --- a/rel/d/a/e/d_a_e_yg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_yg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_807FCCAC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 807FCCAC-807FCCB4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_807FCCAC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 807FD018-807FD020 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_yg/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_yg/unknown_translation_unit_ctors.cpp index cb2101e2669..0b77171c30b 100644 --- a/rel/d/a/e/d_a_e_yg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_yg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_807FCCA0[2]; -extern void* const data_807FCCA0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_yg_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 807FCCA0-807FCCA8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_807FCCA0[2] = { + (void*)__sinit_d_a_e_yg_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp b/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp index b7a08096b71..4d23343a5fe 100644 --- a/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp +++ b/rel/d/a/e/d_a_e_yh/d_a_e_yh.cpp @@ -32,13 +32,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -64,11 +64,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -320,15 +320,6 @@ static void daE_YH_Delete(e_yh_class*); static void useHeapInit(fopAc_ac_c*); static void daE_YH_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_5364; -extern "C" extern u32 const lit_5365; -extern "C" extern u32 const lit_5366; -extern "C" extern u32 const lit_5367; -extern "C" extern u32 const lit_5593; -extern "C" extern u32 const lit_5594; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_YH[12]; extern "C" void __ct__12daE_YH_HIO_cFv(); extern "C" static void yh_disappear__FP10e_yh_class(); @@ -437,25 +428,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_yh/executor.cpp b/rel/d/a/e/d_a_e_yh/executor.cpp index 529e2d66de4..d78216bce2b 100644 --- a/rel/d/a/e/d_a_e_yh/executor.cpp +++ b/rel/d/a/e/d_a_e_yh/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80804268[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_yh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_yh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 96e26ede7f2..83dff5dc184 100644 --- a/rel/d/a/e/d_a_e_yh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_yh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80804274[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80804274-8080427C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80804274[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80804710-80804718 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_yh/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_yh/unknown_translation_unit_ctors.cpp index b6947c9de0c..a6a0b6956b4 100644 --- a/rel/d/a/e/d_a_e_yh/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_yh/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80804268[2]; -extern void* const data_80804268[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_yh_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80804268-80804270 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80804268[2] = { + (void*)__sinit_d_a_e_yh_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp index 1a347f362c4..9a208931094 100644 --- a/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp +++ b/rel/d/a/e/d_a_e_yk/d_a_e_yk.cpp @@ -19,13 +19,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -244,10 +244,6 @@ static void daE_YK_Delete(e_yk_class*); static void useHeapInit(fopAc_ac_c*); static void daE_YK_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4725; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_YK[12]; extern "C" void __ct__12daE_YK_HIO_cFv(); extern "C" static void yk_disappear__FP10e_yk_class(); @@ -328,22 +324,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_yk/executor.cpp b/rel/d/a/e/d_a_e_yk/executor.cpp index 1976b47da01..f4379e25825 100644 --- a/rel/d/a/e/d_a_e_yk/executor.cpp +++ b/rel/d/a/e/d_a_e_yk/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80807C88[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_yk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_yk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f5cb6309018..be6198ee2e8 100644 --- a/rel/d/a/e/d_a_e_yk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_yk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80807C94[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80807C94-80807C9C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80807C94[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80807EF0-80807EF8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_yk/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_yk/unknown_translation_unit_ctors.cpp index 49613a946b0..e68791879b1 100644 --- a/rel/d/a/e/d_a_e_yk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_yk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80807C88[2]; -extern void* const data_80807C88[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_yk_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80807C88-80807C90 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80807C88[2] = { + (void*)__sinit_d_a_e_yk_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp index 237ad549ebb..3e6e5410e2b 100644 --- a/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp +++ b/rel/d/a/e/d_a_e_ym/d_a_e_ym.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -26,6 +24,8 @@ struct cXyz { /* 80815900 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CDD4 */ void transM(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -47,13 +47,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -355,16 +355,6 @@ static void daE_YM_Delete(daE_YM_c*); static void useHeapInit(fopAc_ac_c*); static void daE_YM_Create(daE_YM_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_6058; -extern "C" extern u32 const lit_6059; -extern "C" extern u32 const lit_6061; -extern "C" extern u32 const lit_7045; -extern "C" extern u32 const lit_7046; -extern "C" extern u32 const lit_7047; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_80815B7C[8]; -extern "C" extern void* g_profile_E_YM[12]; extern "C" void __ct__12daE_YM_HIO_cFv(); extern "C" void checkBck__8daE_YM_cFPCci(); @@ -517,22 +507,6 @@ void cLib_distanceAngleS(s16, s16); void* operator new(u32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 JPTracePCB4[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ym/executor.cpp b/rel/d/a/e/d_a_e_ym/executor.cpp index 87815a2f995..3255e6919ce 100644 --- a/rel/d/a/e/d_a_e_ym/executor.cpp +++ b/rel/d/a/e/d_a_e_ym/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80815980[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ym/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ym/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1c5487c5086..215750adb1a 100644 --- a/rel/d/a/e/d_a_e_ym/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ym/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8081598C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8081598C-80815994 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8081598C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80815D20-80815D28 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ym/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ym/unknown_translation_unit_ctors.cpp index c9339b82546..cac47ce6135 100644 --- a/rel/d/a/e/d_a_e_ym/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ym/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80815980[2]; -extern void* const data_80815980[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ym_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80815980-80815988 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80815980[2] = { + (void*)__sinit_d_a_e_ym_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp b/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp index 43b36aad9fe..0ec60a8e4c3 100644 --- a/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp +++ b/rel/d/a/e/d_a_e_ym_tag/d_a_e_ym_tag.cpp @@ -34,7 +34,6 @@ static void daE_YM_TAG_Execute(daE_YM_TAG_c*); static bool daE_YM_TAG_IsDelete(daE_YM_TAG_c*); static bool daE_YM_TAG_Delete(daE_YM_TAG_c*); static void daE_YM_TAG_Create(daE_YM_TAG_c*); -extern "C" extern void* g_profile_E_YM_TAG[12]; extern "C" static bool daE_YM_TAG_Draw__FP12daE_YM_TAG_c(); extern "C" static void s_e_ym__FPvPv(); @@ -54,8 +53,6 @@ void fopAc_IsActor(void*); void fopAcM_delete(fopAc_ac_c*); void fpcEx_Search(void* (*)(void*, void*), void*); void fpcM_IsCreating(unsigned int); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAc_IsActor__FPv(); diff --git a/rel/d/a/e/d_a_e_ym_tag/executor.cpp b/rel/d/a/e/d_a_e_ym_tag/executor.cpp index 7e65be9a6c8..0fba3003d3a 100644 --- a/rel/d/a/e/d_a_e_ym_tag/executor.cpp +++ b/rel/d/a/e/d_a_e_ym_tag/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80815FB0[4]; -extern u8 const data_80815FB4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ym_tag/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ym_tag/unknown_translation_unit_ctors.cpp index 288c3828609..c3a5faab821 100644 --- a/rel/d/a/e/d_a_e_ym_tag/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ym_tag/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80815FB0[4]; -extern u8 const data_80815FB0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80815FB0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80815FB0-80815FB4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80815FB0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_ym_tag/unknown_translation_unit_dtors.cpp b/rel/d/a/e/d_a_e_ym_tag/unknown_translation_unit_dtors.cpp index bfd747a4d29..a2de307fd3c 100644 --- a/rel/d/a/e/d_a_e_ym_tag/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/e/d_a_e_ym_tag/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80815FB4[4]; -extern u8 const data_80815FB4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80815FB4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80815FB4-80815FB8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80815FB4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp b/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp index e564eab75d8..aa089440246 100644 --- a/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp +++ b/rel/d/a/e/d_a_e_ymb/d_a_e_ymb.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -24,6 +22,8 @@ struct cXyz { /* 808164B4 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -53,13 +53,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -375,79 +375,6 @@ static bool daE_YMB_IsDelete(daE_YMB_c*); static void daE_YMB_Delete(daE_YMB_c*); static void useHeapInit(fopAc_ac_c*); static void daE_YMB_Create(daE_YMB_c*); -extern "C" extern u32 const lit_5573; -extern "C" extern u32 const lit_6083; -extern "C" extern u32 const lit_6084; -extern "C" extern u32 const lit_6085; -extern "C" extern u32 const lit_6086; -extern "C" extern u32 const lit_6088; -extern "C" extern u8 const lit_7228[6 + 2 /* padding */]; -extern "C" extern u32 const lit_7482; -extern "C" extern u32 const lit_7483; -extern "C" extern u32 const lit_7484; -extern "C" extern u32 const lit_7485; -extern "C" extern u32 const lit_7486; -extern "C" extern u32 const lit_7487; -extern "C" extern u32 const lit_7488; -extern "C" extern u32 const lit_7489; -extern "C" extern u32 const lit_7490; -extern "C" extern u32 const lit_7491; -extern "C" extern u32 const lit_7492; -extern "C" extern u32 const lit_7493; -extern "C" extern u32 const lit_7494; -extern "C" extern u32 const lit_7495; -extern "C" extern u32 const lit_7496; -extern "C" extern u32 const lit_7497; -extern "C" extern u32 const lit_7498; -extern "C" extern u32 const lit_7499; -extern "C" extern u32 const lit_7500; -extern "C" extern u32 const lit_7501; -extern "C" extern u32 const lit_7502; -extern "C" extern u32 const lit_7503; -extern "C" extern u32 const lit_7504; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_80821C48[12]; -extern "C" extern void* g_profile_E_YMB[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_808220B0[4]; -extern "C" extern u8 data_808220B4[4]; -extern "C" extern u8 data_808220B8[4]; -extern "C" extern u8 data_808220BC[4]; -extern "C" extern u8 data_808220C0[4]; -extern "C" extern u8 data_808220C4[4]; -extern "C" extern u8 data_808220C8[4]; -extern "C" extern u8 data_808220CC[4]; -extern "C" extern u8 data_808220D0[4]; -extern "C" extern u8 data_808220D4[4]; -extern "C" extern u8 data_808220D8[4]; -extern "C" extern u8 data_808220DC[4]; -extern "C" extern u8 data_808220E0[4]; -extern "C" extern u8 data_808220E4[4]; -extern "C" extern u8 data_808220E8[4]; -extern "C" extern u8 data_808220EC[4]; -extern "C" extern u8 data_808220F0[4]; -extern "C" extern u8 data_808220F4[4]; -extern "C" extern u8 data_808220F8[4]; -extern "C" extern u8 data_808220FC[4]; -extern "C" extern u8 data_80822100[4]; -extern "C" extern u8 data_80822104[4]; -extern "C" extern u8 data_80822108[4]; -extern "C" extern u8 data_8082210C[4]; -extern "C" extern u8 data_80822110[4]; extern "C" void __ct__13daE_YMB_HIO_cFv(); extern "C" void ctrlJoint__9daE_YMB_cFP8J3DJointP8J3DModel(); @@ -648,25 +575,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 j3dZModeTable[96]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_ymb/executor.cpp b/rel/d/a/e/d_a_e_ymb/executor.cpp index 953dd0709a7..43e809e59f3 100644 --- a/rel/d/a/e/d_a_e_ymb/executor.cpp +++ b/rel/d/a/e/d_a_e_ymb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80821898[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_ymb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_ymb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2f08d741b72..a0bd20e291e 100644 --- a/rel/d/a/e/d_a_e_ymb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_ymb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_808218A4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 808218A4-808218AC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_808218A4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80821E10-80821E18 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_ymb/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_ymb/unknown_translation_unit_ctors.cpp index 133efa00a6a..45e0d710954 100644 --- a/rel/d/a/e/d_a_e_ymb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_ymb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80821898[2]; -extern void* const data_80821898[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_ymb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80821898-808218A0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80821898[2] = { + (void*)__sinit_d_a_e_ymb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp b/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp index 137436aaea7..33545ff85d9 100644 --- a/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp +++ b/rel/d/a/e/d_a_e_yr/d_a_e_yr.cpp @@ -19,13 +19,13 @@ struct mDoHIO_entry_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -61,8 +61,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -72,6 +70,8 @@ struct cXyz { /* 80828800 */ ~cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -263,21 +263,6 @@ static void daE_Yr_Delete(e_yr_class*); static void useHeapInit(fopAc_ac_c*); static void daE_Yr_Create(fopAc_ac_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4546; -extern "C" extern u32 const lit_4549; -extern "C" extern u32 const lit_4936; -extern "C" extern u32 const lit_4937; -extern "C" extern u32 const lit_4938; -extern "C" extern u32 const lit_4939; -extern "C" extern u32 const lit_4942; -extern "C" extern u32 const lit_4943; -extern "C" extern u32 const lit_4944; -extern "C" extern u32 const lit_5217; -extern "C" extern u32 const lit_5371; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_80828B98[16]; -extern "C" extern void* g_profile_E_YR[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" static void yr_disappear__FP10e_yr_class(); @@ -374,24 +359,6 @@ void MtxPosition(cXyz*, cXyz*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_yr/executor.cpp b/rel/d/a/e/d_a_e_yr/executor.cpp index caefa76292f..e12d82c1781 100644 --- a/rel/d/a/e/d_a_e_yr/executor.cpp +++ b/rel/d/a/e/d_a_e_yr/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8082883C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_yr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_yr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 0c094975792..92fc6cad1d1 100644 --- a/rel/d/a/e/d_a_e_yr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_yr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80828848[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80828848-80828850 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80828848[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80828DA8-80828DB0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_yr/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_yr/unknown_translation_unit_ctors.cpp index 995e60fd43a..6de01b0abdf 100644 --- a/rel/d/a/e/d_a_e_yr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_yr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8082883C[2]; -extern void* const data_8082883C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_yr_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8082883C-80828844 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8082883C[2] = { + (void*)__sinit_d_a_e_yr_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp b/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp index 4783b0389f5..f0f3a30ea9d 100644 --- a/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp +++ b/rel/d/a/e/d_a_e_zh/d_a_e_zh.cpp @@ -36,13 +36,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -148,12 +148,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004C218 */ void setHitMark(u16, fopAc_ac_c*, cXyz const*, csXyz const*, cXyz const*, u32); /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, @@ -318,59 +318,6 @@ static bool daE_ZH_IsDelete(daE_ZH_c*); static void daE_ZH_Delete(daE_ZH_c*); static void useHeapInit(fopAc_ac_c*); static void daE_ZH_Create(daE_ZH_c*); -extern "C" extern u32 const lit_4705; -extern "C" extern u32 const lit_4707; -extern "C" extern u32 const lit_4873; -extern "C" extern u32 const lit_4874; -extern "C" extern u32 const lit_4875; -extern "C" extern u32 const lit_4876; -extern "C" extern u32 const lit_4877; -extern "C" extern u32 const lit_4878; -extern "C" extern u32 const lit_4879; -extern "C" extern u32 const lit_4880; -extern "C" extern u32 const lit_4882; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_ZH[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_8082F7E8[4]; -extern "C" extern u8 data_8082F7EC[4]; -extern "C" extern u8 data_8082F7F0[4]; -extern "C" extern u8 data_8082F7F4[4]; -extern "C" extern u8 data_8082F7F8[4]; -extern "C" extern u8 data_8082F7FC[4]; -extern "C" extern u8 data_8082F800[4]; -extern "C" extern u8 data_8082F804[4]; -extern "C" extern u8 data_8082F808[4]; -extern "C" extern u8 data_8082F80C[4]; -extern "C" extern u8 data_8082F810[4]; -extern "C" extern u8 data_8082F814[4]; -extern "C" extern u8 data_8082F818[4]; -extern "C" extern u8 data_8082F81C[4]; -extern "C" extern u8 data_8082F820[4]; -extern "C" extern u8 data_8082F824[4]; -extern "C" extern u8 data_8082F828[4]; -extern "C" extern u8 data_8082F82C[4]; -extern "C" extern u8 data_8082F830[4]; -extern "C" extern u8 data_8082F834[4]; -extern "C" extern u8 data_8082F838[4]; -extern "C" extern u8 data_8082F83C[4]; -extern "C" extern u8 data_8082F840[4]; -extern "C" extern u8 data_8082F844[4]; -extern "C" extern u8 data_8082F848[4]; extern "C" void __ct__12daE_ZH_HIO_cFv(); extern "C" void draw__8daE_ZH_cFv(); @@ -525,24 +472,6 @@ void JPASetRMtxSTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__temp JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mRoofY__11fopAcM_rc_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/e/d_a_e_zh/executor.cpp b/rel/d/a/e/d_a_e_zh/executor.cpp index 24c426c86b2..76c8a68e5f7 100644 --- a/rel/d/a/e/d_a_e_zh/executor.cpp +++ b/rel/d/a/e/d_a_e_zh/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8082F1F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_zh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_zh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c5abda7ab1f..acab1b493ab 100644 --- a/rel/d/a/e/d_a_e_zh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_zh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8082F200[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8082F200-8082F208 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8082F200[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8082F6E0-8082F6E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_zh/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_zh/unknown_translation_unit_ctors.cpp index 05f04712472..29ab95fbed9 100644 --- a/rel/d/a/e/d_a_e_zh/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_zh/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8082F1F4[2]; -extern void* const data_8082F1F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_zh_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8082F1F4-8082F1FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8082F1F4[2] = { + (void*)__sinit_d_a_e_zh_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp b/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp index 58867a72caf..0eec555c66f 100644 --- a/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp +++ b/rel/d/a/e/d_a_e_zm/d_a_e_zm.cpp @@ -23,13 +23,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -79,8 +79,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -91,6 +89,8 @@ struct cXyz { /* 80832CA8 */ ~cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -241,11 +241,6 @@ static void daE_ZM_Delete(daE_ZM_c*); static void useHeapInit(fopAc_ac_c*); static void daE_ZM_Create(daE_ZM_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern u32 const lit_4711; -extern "C" extern u8 const lit_4714[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_ZM[12]; extern "C" void __ct__12daE_ZM_HIO_cFv(); extern "C" void draw__8daE_ZM_cFv(); @@ -329,24 +324,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/e/d_a_e_zm/executor.cpp b/rel/d/a/e/d_a_e_zm/executor.cpp index 56f2ee7a02b..fa4001e3f78 100644 --- a/rel/d/a/e/d_a_e_zm/executor.cpp +++ b/rel/d/a/e/d_a_e_zm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80832CE4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_zm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_zm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 60473d605c2..cba6b47e006 100644 --- a/rel/d/a/e/d_a_e_zm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_zm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80832CF0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80832CF0-80832CF8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80832CF0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80832F78-80832F80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_zm/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_zm/unknown_translation_unit_ctors.cpp index b7cc5361209..d1be6722fd7 100644 --- a/rel/d/a/e/d_a_e_zm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_zm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80832CE4[2]; -extern void* const data_80832CE4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_zm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80832CE4-80832CEC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80832CE4[2] = { + (void*)__sinit_d_a_e_zm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp b/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp index f511c187708..277bd04890a 100644 --- a/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp +++ b/rel/d/a/e/d_a_e_zs/d_a_e_zs.cpp @@ -23,13 +23,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -76,14 +76,14 @@ struct daB_DS_c { /* 808352A0 */ void getHandPosL(); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -204,9 +204,6 @@ static void daE_ZS_Delete(daE_ZS_c*); static void useHeapInit(fopAc_ac_c*); static void daE_ZS_Create(daE_ZS_c*); static void setMidnaBindEffect(fopEn_enemy_c*, Z2CreatureEnemy*, cXyz*, cXyz*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_E_ZS[12]; extern "C" void __ct__12daE_ZS_HIO_cFv(); extern "C" void draw__8daE_ZS_cFv(); @@ -275,20 +272,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void transM__14mDoMtx_stack_cFfff(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/e/d_a_e_zs/executor.cpp b/rel/d/a/e/d_a_e_zs/executor.cpp index 288169142bd..9d1c4e56512 100644 --- a/rel/d/a/e/d_a_e_zs/executor.cpp +++ b/rel/d/a/e/d_a_e_zs/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_808352BC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/e/d_a_e_zs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/e/d_a_e_zs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8bc49199762..88e996c5b27 100644 --- a/rel/d/a/e/d_a_e_zs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/e/d_a_e_zs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_808352C8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 808352C8-808352D0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_808352C8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80835498-808354A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/e/d_a_e_zs/unknown_translation_unit_ctors.cpp b/rel/d/a/e/d_a_e_zs/unknown_translation_unit_ctors.cpp index 8f170189b4a..6bd0acc765c 100644 --- a/rel/d/a/e/d_a_e_zs/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/e/d_a_e_zs/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_808352BC[2]; -extern void* const data_808352BC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_e_zs_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 808352BC-808352C4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_808352BC[2] = { + (void*)__sinit_d_a_e_zs_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp index 1a9fe3ed9e8..c12373ce5cd 100644 --- a/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp +++ b/rel/d/a/kytag/d_a_kytag00/d_a_kytag00.cpp @@ -41,13 +41,6 @@ static void daKytag00_Execute(kytag00_class*); static bool daKytag00_IsDelete(kytag00_class*); static void daKytag00_Delete(kytag00_class*); static void daKytag00_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4101; -extern "C" extern u32 const lit_4102; -extern "C" extern u32 const lit_4103; -extern "C" extern u32 const lit_4104; -extern "C" extern u32 const lit_4105; -extern "C" extern u32 const lit_4106; -extern "C" extern void* g_profile_KYTAG00[12]; extern "C" static void get_check_pos__FP13kytag00_class(); extern "C" static void wether_tag_reset__FP13kytag00_class(); @@ -74,13 +67,6 @@ extern "C" extern void* g_profile_KYTAG00[12]; // void cLib_addCalc(f32*, f32, f32, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void isSwitch__10dSv_info_cCFii(); diff --git a/rel/d/a/kytag/d_a_kytag00/executor.cpp b/rel/d/a/kytag/d_a_kytag00/executor.cpp index 95c6c571f9f..53f12b57657 100644 --- a/rel/d/a/kytag/d_a_kytag00/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag00/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8046C978[4]; -extern u8 const data_8046C97C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag00/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag00/unknown_translation_unit_ctors.cpp index 56948af2468..064c20725eb 100644 --- a/rel/d/a/kytag/d_a_kytag00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046C978[4]; -extern u8 const data_8046C978[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8046C978[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8046C978-8046C97C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8046C978[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag00/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag00/unknown_translation_unit_dtors.cpp index 4f8adb1e58d..26cc2123e22 100644 --- a/rel/d/a/kytag/d_a_kytag00/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag00/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046C97C[4]; -extern u8 const data_8046C97C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8046C97C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8046C97C-8046C980 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8046C97C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp b/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp index fc401eb7993..9ffca7a12c6 100644 --- a/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp +++ b/rel/d/a/kytag/d_a_kytag01/d_a_kytag01.cpp @@ -38,7 +38,6 @@ static void daKytag01_Execute(kytag01_class*); static bool daKytag01_IsDelete(kytag01_class*); static bool daKytag01_Delete(kytag01_class*); static void daKytag01_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_KYTAG01[12]; extern "C" static void get_check_pos__FP13kytag01_class(); extern "C" static void mist_tag_move__FP13kytag01_class(); @@ -59,13 +58,6 @@ void dKy_fog_startendz_set(f32, f32, f32); void dKy_change_colpat(u8); void cM_atan2s(f32, f32); void cLib_addCalc(f32*, f32, f32, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_delete__FP10fopAc_ac_c(); diff --git a/rel/d/a/kytag/d_a_kytag01/executor.cpp b/rel/d/a/kytag/d_a_kytag01/executor.cpp index 42a1b012c40..f5628376408 100644 --- a/rel/d/a/kytag/d_a_kytag01/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag01/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80855984[4]; -extern u8 const data_80855988[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag01/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag01/unknown_translation_unit_ctors.cpp index 402db2b8131..44ed8def38f 100644 --- a/rel/d/a/kytag/d_a_kytag01/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag01/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80855984[4]; -extern u8 const data_80855984[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80855984[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80855984-80855988 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80855984[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag01/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag01/unknown_translation_unit_dtors.cpp index 3ea150f00f9..e065678a56d 100644 --- a/rel/d/a/kytag/d_a_kytag01/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag01/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80855988[4]; -extern u8 const data_80855988[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80855988[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80855988-8085598C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80855988[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp index 29fad8c0393..4e9c8e1f0da 100644 --- a/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp +++ b/rel/d/a/kytag/d_a_kytag02/d_a_kytag02.cpp @@ -38,7 +38,6 @@ static void daKytag02_Execute(kytag02_class*); static bool daKytag02_IsDelete(kytag02_class*); static void daKytag02_Delete(kytag02_class*); static void daKytag02_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_KYTAG02[12]; extern "C" static bool daKytag02_Draw__FP13kytag02_class(); extern "C" static void daKytag02_Execute__FP13kytag02_class(); @@ -55,12 +54,6 @@ void dComIfGp_getReverb(int); void dKyw_get_wind_vec(); void dKyw_evt_wind_set(s16, s16); void dKyw_evt_wind_set_go(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void dComIfGp_getReverb__Fi(); diff --git a/rel/d/a/kytag/d_a_kytag02/executor.cpp b/rel/d/a/kytag/d_a_kytag02/executor.cpp index eef642095aa..8ec2c601a8b 100644 --- a/rel/d/a/kytag/d_a_kytag02/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag02/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80855DF4[4]; -extern u8 const data_80855DF8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag02/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag02/unknown_translation_unit_ctors.cpp index 959069203c7..8ede6a4c273 100644 --- a/rel/d/a/kytag/d_a_kytag02/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag02/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80855DF4[4]; -extern u8 const data_80855DF4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80855DF4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80855DF4-80855DF8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80855DF4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag02/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag02/unknown_translation_unit_dtors.cpp index 9b24dee2278..c1bd94fa652 100644 --- a/rel/d/a/kytag/d_a_kytag02/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag02/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80855DF8[4]; -extern u8 const data_80855DF8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80855DF8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80855DF8-80855DFC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80855DF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp b/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp index 246e9809229..abd5b993736 100644 --- a/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp +++ b/rel/d/a/kytag/d_a_kytag03/d_a_kytag03.cpp @@ -27,14 +27,14 @@ struct dPath {}; struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -76,7 +76,6 @@ static void daKytag03_Execute(kytag03_class*); static bool daKytag03_IsDelete(kytag03_class*); static void daKytag03_Delete(kytag03_class*); static void daKytag03_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_KYTAG03[12]; extern "C" static void dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath(); extern "C" void __dt__8cM3dGLinFv(); @@ -110,15 +109,6 @@ void cM3d_Len3dSqPntAndSegLine(cM3dGLin const*, Vec const*, Vec*, f32*); void cLib_addCalc(f32*, f32, f32, f32, f32); void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fpcLyIt_AllJudge__FPFPvPv_PvPv(); diff --git a/rel/d/a/kytag/d_a_kytag03/executor.cpp b/rel/d/a/kytag/d_a_kytag03/executor.cpp index 566cd133c98..7892fdd4e4c 100644 --- a/rel/d/a/kytag/d_a_kytag03/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag03/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80857648[4]; -extern u8 const data_8085764C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag03/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag03/unknown_translation_unit_ctors.cpp index e88526ec37b..c63c9051cfd 100644 --- a/rel/d/a/kytag/d_a_kytag03/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag03/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80857648[4]; -extern u8 const data_80857648[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80857648[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80857648-8085764C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80857648[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag03/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag03/unknown_translation_unit_dtors.cpp index 7fd4c4304fc..8e2dfb1d237 100644 --- a/rel/d/a/kytag/d_a_kytag03/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag03/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085764C[4]; -extern u8 const data_8085764C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8085764C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8085764C-80857650 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8085764C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp index 0e32b0c35bb..4c9e92fb1b2 100644 --- a/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp +++ b/rel/d/a/kytag/d_a_kytag04/d_a_kytag04.cpp @@ -60,14 +60,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -113,8 +113,6 @@ static bool daKytag04_IsDelete(kytag04_class*); static void daKytag04_Delete(kytag04_class*); static void useHeapInit(fopAc_ac_c*); static void daKytag04_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_KYTAG04[12]; extern "C" static void daKytag04_Draw__FP13kytag04_class(); extern "C" static void daKytag04_Execute__FP13kytag04_class(); @@ -142,13 +140,6 @@ void daNpcF_getPlayerInfoFromPlayerList(int, int, cXyz&, csXyz&); void dKy_darkworld_check(); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); diff --git a/rel/d/a/kytag/d_a_kytag04/executor.cpp b/rel/d/a/kytag/d_a_kytag04/executor.cpp index aac9a45d295..ce9e0a58801 100644 --- a/rel/d/a/kytag/d_a_kytag04/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag04/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8046DA10[4]; -extern u8 const data_8046DA14[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag04/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag04/unknown_translation_unit_ctors.cpp index 88df3624394..d91ebf7e3d0 100644 --- a/rel/d/a/kytag/d_a_kytag04/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag04/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046DA10[4]; -extern u8 const data_8046DA10[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8046DA10[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8046DA10-8046DA14 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8046DA10[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag04/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag04/unknown_translation_unit_dtors.cpp index dc4c15f7cd7..14e076c7990 100644 --- a/rel/d/a/kytag/d_a_kytag04/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag04/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046DA14[4]; -extern u8 const data_8046DA14[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8046DA14[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8046DA14-8046DA18 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8046DA14[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp index fee9b8d4505..7ca899da415 100644 --- a/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp +++ b/rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp @@ -26,7 +26,6 @@ static bool daKytag05_Execute(kytag05_class*); static bool daKytag05_IsDelete(kytag05_class*); static bool daKytag05_Delete(kytag05_class*); static void daKytag05_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_KYTAG05[12]; extern "C" static bool daKytag05_Draw__FP13kytag05_class(); extern "C" static bool daKytag05_Execute__FP13kytag05_class(); @@ -39,9 +38,6 @@ extern "C" extern void* g_profile_KYTAG05[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; diff --git a/rel/d/a/kytag/d_a_kytag05/executor.cpp b/rel/d/a/kytag/d_a_kytag05/executor.cpp index 3161ba54d32..0df18a51760 100644 --- a/rel/d/a/kytag/d_a_kytag05/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag05/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80528B10[4]; -extern u8 const data_80528B14[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag05/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag05/unknown_translation_unit_ctors.cpp index 1dec0a024ed..a8db2d59a35 100644 --- a/rel/d/a/kytag/d_a_kytag05/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag05/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80528B10[4]; -extern u8 const data_80528B10[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80528B10[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80528B10-80528B14 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80528B10[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag05/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag05/unknown_translation_unit_dtors.cpp index a3fb0cb9d01..c5653c31994 100644 --- a/rel/d/a/kytag/d_a_kytag05/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag05/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80528B14[4]; -extern u8 const data_80528B14[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80528B14[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80528B14-80528B18 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80528B14[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index 0a23ad8e5d5..2142a72f5bf 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -28,16 +28,16 @@ struct dSv_event_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz { /* 808589A4 */ ~cXyz(); }; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -84,49 +84,6 @@ static void daKytag06_type06_init(fopAc_ac_c*); static void daKytag06_type02_init(fopAc_ac_c*); static void daKytag06_type03_init(fopAc_ac_c*); static void daKytag06_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_KYTAG06[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8085A18C[4]; -extern "C" extern u8 data_8085A190[4]; -extern "C" extern u8 data_8085A194[4]; -extern "C" extern u8 data_8085A198[4]; -extern "C" extern u8 data_8085A19C[4]; -extern "C" extern u8 data_8085A1A0[4]; -extern "C" extern u8 data_8085A1A4[4]; -extern "C" extern u8 data_8085A1A8[4]; -extern "C" extern u8 data_8085A1AC[4]; -extern "C" extern u8 data_8085A1B0[4]; -extern "C" extern u8 data_8085A1B4[4]; -extern "C" extern u8 data_8085A1B8[4]; -extern "C" extern u8 data_8085A1BC[4]; -extern "C" extern u8 data_8085A1C0[4]; -extern "C" extern u8 data_8085A1C4[4]; -extern "C" extern u8 data_8085A1C8[4]; -extern "C" extern u8 data_8085A1CC[4]; -extern "C" extern u8 data_8085A1D0[4]; -extern "C" extern u8 data_8085A1D4[4]; -extern "C" extern u8 data_8085A1D8[4]; -extern "C" extern u8 data_8085A1DC[4]; -extern "C" extern u8 data_8085A1E0[4]; -extern "C" extern u8 data_8085A1E4[4]; -extern "C" extern u8 data_8085A1E8[4]; -extern "C" extern u8 data_8085A1EC[4]; extern "C" static void dice_wether_init__FUcff(); extern "C" static void dice_wether_execute__FUcff(); @@ -218,14 +175,6 @@ void dKy_darkworld_check(); void cM_rndF(f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void getLayerNo__14dComIfG_play_cFi(); diff --git a/rel/d/a/kytag/d_a_kytag06/executor.cpp b/rel/d/a/kytag/d_a_kytag06/executor.cpp index daaa2c1fc74..d3da0b29542 100644 --- a/rel/d/a/kytag/d_a_kytag06/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag06/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80859E68[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag06/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/kytag/d_a_kytag06/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 588abb8900f..750c4295e98 100644 --- a/rel/d/a/kytag/d_a_kytag06/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/kytag/d_a_kytag06/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80859E70[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80859E70-80859E78 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80859E70[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8085A128-8085A130 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/kytag/d_a_kytag06/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag06/unknown_translation_unit_ctors.cpp index abdd02c2da7..96de22204de 100644 --- a/rel/d/a/kytag/d_a_kytag06/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag06/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80859E68[4]; -extern u8 const data_80859E68[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80859E68[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80859E68-80859E6C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80859E68[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp index 42c9cbbbde7..428c2039d75 100644 --- a/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp +++ b/rel/d/a/kytag/d_a_kytag07/d_a_kytag07.cpp @@ -28,7 +28,6 @@ static void daKytag07_Execute(kytag07_class*); static void daKytag07_IsDelete(kytag07_class*); static void daKytag07_Delete(kytag07_class*); static void daKytag07_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_KYTAG07[12]; extern "C" static bool daKytag07_Draw__FP13kytag07_class(); extern "C" static void daKytag07_Execute__FP13kytag07_class(); @@ -46,9 +45,6 @@ void fopOvlpM_IsDoingReq(); void dKy_plight_priority_set(LIGHT_INFLUENCE*); void dKy_plight_cut(LIGHT_INFLUENCE*); void cLib_addCalc(f32*, f32, f32, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_delete__FP10fopAc_ac_c(); diff --git a/rel/d/a/kytag/d_a_kytag07/executor.cpp b/rel/d/a/kytag/d_a_kytag07/executor.cpp index 62b8006ca89..39cb9b94c9e 100644 --- a/rel/d/a/kytag/d_a_kytag07/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag07/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8085A47C[4]; -extern u8 const data_8085A480[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag07/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag07/unknown_translation_unit_ctors.cpp index 6c53513b97b..6992a916456 100644 --- a/rel/d/a/kytag/d_a_kytag07/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag07/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085A47C[4]; -extern u8 const data_8085A47C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8085A47C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8085A47C-8085A480 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8085A47C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag07/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag07/unknown_translation_unit_dtors.cpp index c70d5b2b5f1..cdc2df03544 100644 --- a/rel/d/a/kytag/d_a_kytag07/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag07/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085A480[4]; -extern u8 const data_8085A480[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8085A480[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8085A480-8085A484 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8085A480[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp index 7a77d38fa7f..f6530049c56 100644 --- a/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp +++ b/rel/d/a/kytag/d_a_kytag08/d_a_kytag08.cpp @@ -27,14 +27,14 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -69,8 +69,6 @@ static bool daKytag08_IsDelete(kytag08_class*); static void daKytag08_Delete(kytag08_class*); static void useHeapInit(fopAc_ac_c*); static void daKytag08_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_KYTAG08[12]; extern "C" static bool daKytag08_Draw__FP13kytag08_class(); extern "C" static void daKytag08_Execute__FP13kytag08_class(); @@ -96,12 +94,6 @@ void dKy_darkworld_check(); void dKy_shadow_mode_check(u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u32 __float_nan; extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/kytag/d_a_kytag08/executor.cpp b/rel/d/a/kytag/d_a_kytag08/executor.cpp index 0399af25e44..0601eaa4e66 100644 --- a/rel/d/a/kytag/d_a_kytag08/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag08/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8085B284[4]; -extern u8 const data_8085B288[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag08/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag08/unknown_translation_unit_ctors.cpp index a920050247e..039c454c89e 100644 --- a/rel/d/a/kytag/d_a_kytag08/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag08/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085B284[4]; -extern u8 const data_8085B284[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8085B284[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8085B284-8085B288 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8085B284[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag08/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag08/unknown_translation_unit_dtors.cpp index c2791889402..50746ed0410 100644 --- a/rel/d/a/kytag/d_a_kytag08/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag08/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085B288[4]; -extern u8 const data_8085B288[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8085B288[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8085B288-8085B28C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8085B288[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp index e24f51de5e4..cd57bb1fd62 100644 --- a/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp +++ b/rel/d/a/kytag/d_a_kytag09/d_a_kytag09.cpp @@ -36,12 +36,12 @@ struct dSv_player_status_b_c { /* 80032BB0 */ void isDarkClearLV(int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -71,8 +71,6 @@ static void daKytag09_Delete(kytag09_class*); static void useHeapInit(fopAc_ac_c*); static void useHeapInit2(fopAc_ac_c*); static void daKytag09_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_KYTAG09[12]; extern "C" static void daKytag09_Draw__FP13kytag09_class(); extern "C" static bool daKytag09_Execute__FP13kytag09_class(); @@ -95,12 +93,6 @@ void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); diff --git a/rel/d/a/kytag/d_a_kytag09/executor.cpp b/rel/d/a/kytag/d_a_kytag09/executor.cpp index 4e62d17bd76..e351a6c965b 100644 --- a/rel/d/a/kytag/d_a_kytag09/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag09/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8085BA3C[4]; -extern u8 const data_8085BA40[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag09/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag09/unknown_translation_unit_ctors.cpp index dc1f3d77660..9b39e51139e 100644 --- a/rel/d/a/kytag/d_a_kytag09/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag09/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085BA3C[4]; -extern u8 const data_8085BA3C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8085BA3C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8085BA3C-8085BA40 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8085BA3C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag09/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag09/unknown_translation_unit_dtors.cpp index 783b17c96a3..927fbb93d02 100644 --- a/rel/d/a/kytag/d_a_kytag09/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag09/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085BA40[4]; -extern u8 const data_8085BA40[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8085BA40[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8085BA40-8085BA44 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8085BA40[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp index 6b6b8b63410..8657fa2d438 100644 --- a/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp +++ b/rel/d/a/kytag/d_a_kytag10/d_a_kytag10.cpp @@ -21,14 +21,14 @@ struct dPath {}; struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -53,8 +53,6 @@ static void daKytag10_Execute(kytag10_class*); static bool daKytag10_IsDelete(kytag10_class*); static void daKytag10_Delete(kytag10_class*); static void daKytag10_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3971; -extern "C" extern void* g_profile_KYTAG10[12]; extern "C" static void get_rail_ratio_pos__FP5dPathifPsPs(); extern "C" static void set_path_info__FP10fopAc_ac_c(); @@ -76,11 +74,6 @@ extern "C" extern void* g_profile_KYTAG10[12]; void dPath_GetRoomPath(int, int); void dKyr_get_vectle_calc(cXyz*, cXyz*, cXyz*); void cM_atan2s(f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void diff --git a/rel/d/a/kytag/d_a_kytag10/executor.cpp b/rel/d/a/kytag/d_a_kytag10/executor.cpp index 7efee954700..4ea11b3e4b3 100644 --- a/rel/d/a/kytag/d_a_kytag10/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag10/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805293F8[4]; -extern u8 const data_805293FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag10/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag10/unknown_translation_unit_ctors.cpp index c3fcd74c0c4..f8444f5c52d 100644 --- a/rel/d/a/kytag/d_a_kytag10/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag10/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805293F8[4]; -extern u8 const data_805293F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805293F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805293F8-805293FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805293F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag10/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag10/unknown_translation_unit_dtors.cpp index 54e410ddb74..83c065eae9f 100644 --- a/rel/d/a/kytag/d_a_kytag10/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag10/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805293FC[4]; -extern u8 const data_805293FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805293FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805293FC-80529400 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805293FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; 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 aa3c2869acc..fe136072899 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 @@ -36,7 +36,6 @@ static bool daKytag11_IsDelete(kytag11_class*); static bool daKytag11_Delete(kytag11_class*); static void daKytag11_Create(fopAc_ac_c*); static void dKankyo_DayProc(); -extern "C" extern void* g_profile_KYTAG11[12]; extern "C" static bool daKytag11_Draw__FP13kytag11_class(); extern "C" static void daKytag11_Execute__FP13kytag11_class(); @@ -51,13 +50,6 @@ extern "C" extern void* g_profile_KYTAG11[12]; // void dKy_getdaytime_hour(); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void offEventBit__11dSv_event_cFUs(); diff --git a/rel/d/a/kytag/d_a_kytag11/executor.cpp b/rel/d/a/kytag/d_a_kytag11/executor.cpp index 368e96b0cc7..fa717cc1af2 100644 --- a/rel/d/a/kytag/d_a_kytag11/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag11/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8052988C[4]; -extern u8 const data_80529890[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag11/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag11/unknown_translation_unit_ctors.cpp index c1d65a1795f..07e240af9a3 100644 --- a/rel/d/a/kytag/d_a_kytag11/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag11/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8052988C[4]; -extern u8 const data_8052988C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8052988C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8052988C-80529890 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8052988C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag11/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag11/unknown_translation_unit_dtors.cpp index 3c0629a9e76..6df9ae16d7d 100644 --- a/rel/d/a/kytag/d_a_kytag11/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag11/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80529890[4]; -extern u8 const data_80529890[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80529890[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80529890-80529894 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80529890[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp b/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp index b97a272572b..abc5f3d1a03 100644 --- a/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp +++ b/rel/d/a/kytag/d_a_kytag12/d_a_kytag12.cpp @@ -47,37 +47,6 @@ static void daKytag12_Execute(kytag12_class*); static bool daKytag12_IsDelete(kytag12_class*); static void daKytag12_Delete(kytag12_class*); static void daKytag12_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4471; -extern "C" extern u32 const lit_4472; -extern "C" extern u32 const lit_4473; -extern "C" extern u32 const lit_4474; -extern "C" extern u32 const lit_4475; -extern "C" extern u32 const lit_4478; -extern "C" extern u32 const lit_4482; -extern "C" extern u32 const lit_4483; -extern "C" extern u32 const lit_4484; -extern "C" extern u32 const lit_4486; -extern "C" extern u32 const lit_4487; -extern "C" extern u32 const lit_4488; -extern "C" extern u32 const lit_4489; -extern "C" extern u32 const lit_4490; -extern "C" extern u32 const lit_4492[1 + 1 /* padding */]; -extern "C" extern u32 const lit_4494; -extern "C" extern u32 const lit_4495; -extern "C" extern u8 const lit_4496[8]; -extern "C" extern u8 const lit_4497[8]; -extern "C" extern u32 const lit_4498; -extern "C" extern u32 const lit_4499; -extern "C" extern u32 const lit_4507; -extern "C" extern u32 const lit_4508; -extern "C" extern u32 const lit_4510; -extern "C" extern u32 const lit_4512; -extern "C" extern u32 const lit_4513; -extern "C" extern u32 const lit_4514[1 + 1 /* padding */]; -extern "C" extern u32 const lit_4520; -extern "C" extern u32 const lit_4525; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_KYTAG12[12]; extern "C" static void d_kytag12_cut_turn_check__Fv(); extern "C" static void d_kytag12_cut_normal_check__Fv(); @@ -135,14 +104,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void dKyw_plight_collision_set__FP4cXyzssfffff(); diff --git a/rel/d/a/kytag/d_a_kytag12/executor.cpp b/rel/d/a/kytag/d_a_kytag12/executor.cpp index df675cc5535..0ddc51f7f03 100644 --- a/rel/d/a/kytag/d_a_kytag12/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag12/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8085EEF8[4]; -extern u8 const data_8085EEFC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag12/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag12/unknown_translation_unit_ctors.cpp index 71096ca07d4..722800cfe6c 100644 --- a/rel/d/a/kytag/d_a_kytag12/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag12/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085EEF8[4]; -extern u8 const data_8085EEF8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8085EEF8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8085EEF8-8085EEFC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8085EEF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag12/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag12/unknown_translation_unit_dtors.cpp index 6816fae194a..7c3c7eeb7a1 100644 --- a/rel/d/a/kytag/d_a_kytag12/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag12/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8085EEFC[4]; -extern u8 const data_8085EEFC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8085EEFC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8085EEFC-8085EF00 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8085EEFC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp b/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp index 6708c208e96..280bfb61ecc 100644 --- a/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp +++ b/rel/d/a/kytag/d_a_kytag13/d_a_kytag13.cpp @@ -61,8 +61,6 @@ static void daKytag13_Execute(kytag13_class*); static bool daKytag13_IsDelete(kytag13_class*); static bool daKytag13_Delete(kytag13_class*); static void daKytag13_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_KYTAG13[12]; extern "C" static bool daKytag13_Draw__FP13kytag13_class(); extern "C" static void vectle_calc__FP10DOUBLE_POSP4cXyz(); @@ -94,15 +92,6 @@ void cM_rndFX(f32); void cM3d_VectorProduct2d(f32, f32, f32, f32, f32, f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/kytag/d_a_kytag13/executor.cpp b/rel/d/a/kytag/d_a_kytag13/executor.cpp index a68f22c473b..f41f0b080b0 100644 --- a/rel/d/a/kytag/d_a_kytag13/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag13/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80860468[4]; -extern u8 const data_8086046C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag13/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag13/unknown_translation_unit_ctors.cpp index e93b2b8abe4..50e6c7c9292 100644 --- a/rel/d/a/kytag/d_a_kytag13/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag13/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80860468[4]; -extern u8 const data_80860468[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80860468[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80860468-8086046C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80860468[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag13/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag13/unknown_translation_unit_dtors.cpp index bb24d3c1ffa..559dd6dc84a 100644 --- a/rel/d/a/kytag/d_a_kytag13/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag13/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8086046C[4]; -extern u8 const data_8086046C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8086046C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8086046C-80860470 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8086046C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp index a0818fa5e08..5344369a835 100644 --- a/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp +++ b/rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp @@ -38,7 +38,6 @@ static void daKytag14_Execute(kytag14_class*); static bool daKytag14_IsDelete(kytag14_class*); static bool daKytag14_Delete(kytag14_class*); static void daKytag14_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_KYTAG14[12]; extern "C" static bool daKytag14_Draw__FP13kytag14_class(); extern "C" static void daKytag14_Execute__FP13kytag14_class(); @@ -51,12 +50,6 @@ extern "C" extern void* g_profile_KYTAG14[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void set__25dSv_player_return_place_cFPCcScUc(); extern "C" void isEventBit__11dSv_event_cCFUs(); diff --git a/rel/d/a/kytag/d_a_kytag14/executor.cpp b/rel/d/a/kytag/d_a_kytag14/executor.cpp index 326432b3f29..983dc7a63b7 100644 --- a/rel/d/a/kytag/d_a_kytag14/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag14/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80529BE0[4]; -extern u8 const data_80529BE4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag14/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag14/unknown_translation_unit_ctors.cpp index 6308c669d5d..6ec0596955c 100644 --- a/rel/d/a/kytag/d_a_kytag14/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag14/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80529BE0[4]; -extern u8 const data_80529BE0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80529BE0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80529BE0-80529BE4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80529BE0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag14/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag14/unknown_translation_unit_dtors.cpp index 1f4ec1ffac3..781b8a25f33 100644 --- a/rel/d/a/kytag/d_a_kytag14/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag14/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80529BE4[4]; -extern u8 const data_80529BE4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80529BE4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80529BE4-80529BE8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80529BE4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp index b2d5219e89f..474e808696f 100644 --- a/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp +++ b/rel/d/a/kytag/d_a_kytag15/d_a_kytag15.cpp @@ -57,8 +57,6 @@ static bool daKytag15_IsDelete(kytag15_class*); static void daKytag15_Delete(kytag15_class*); static void useHeapInit(fopAc_ac_c*); static void daKytag15_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_KYTAG15[12]; extern "C" static void daKytag15_Draw__FP13kytag15_class(); extern "C" static void daKytag15_Execute__FP13kytag15_class(); @@ -82,12 +80,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dKy_daynight_check(); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); diff --git a/rel/d/a/kytag/d_a_kytag15/executor.cpp b/rel/d/a/kytag/d_a_kytag15/executor.cpp index 86a45d734ff..62ec98cba07 100644 --- a/rel/d/a/kytag/d_a_kytag15/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag15/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80860B38[4]; -extern u8 const data_80860B3C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag15/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag15/unknown_translation_unit_ctors.cpp index 0e471bd7986..132e0cbc146 100644 --- a/rel/d/a/kytag/d_a_kytag15/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag15/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80860B38[4]; -extern u8 const data_80860B38[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80860B38[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80860B38-80860B3C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80860B38[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag15/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag15/unknown_translation_unit_dtors.cpp index 8b66ff81173..19e3d1a1409 100644 --- a/rel/d/a/kytag/d_a_kytag15/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag15/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80860B3C[4]; -extern u8 const data_80860B3C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80860B3C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80860B3C-80860B40 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80860B3C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp index c05370a8843..8e3a30f0778 100644 --- a/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp +++ b/rel/d/a/kytag/d_a_kytag16/d_a_kytag16.cpp @@ -34,14 +34,6 @@ static void daKytag16_Execute(kytag16_class*); static bool daKytag16_IsDelete(kytag16_class*); static bool daKytag16_Delete(kytag16_class*); static void daKytag16_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3906; -extern "C" extern u32 const lit_3907; -extern "C" extern u32 const lit_3908; -extern "C" extern u32 const lit_3909; -extern "C" extern u32 const lit_3910; -extern "C" extern u32 const lit_3911[1 + 1 /* padding */]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_KYTAG16[12]; extern "C" static bool daKytag16_Draw__FP13kytag16_class(); extern "C" static void daKytag16_Execute__FP13kytag16_class(); @@ -65,12 +57,6 @@ void dKy_getdaytime_hour(); void dKy_BossSpotLight_set(cXyz*, f32, f32, f32, _GXColor*, f32, u8, u8); void cM_rndFX(f32); void cLib_addCalc(f32*, f32, f32, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void isSwitch__10dSv_info_cCFii(); diff --git a/rel/d/a/kytag/d_a_kytag16/executor.cpp b/rel/d/a/kytag/d_a_kytag16/executor.cpp index d3da00f5185..6c7f71d70b8 100644 --- a/rel/d/a/kytag/d_a_kytag16/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag16/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8086112C[4]; -extern u8 const data_80861130[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag16/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag16/unknown_translation_unit_ctors.cpp index 9acb5469011..acc561c8741 100644 --- a/rel/d/a/kytag/d_a_kytag16/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag16/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8086112C[4]; -extern u8 const data_8086112C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8086112C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8086112C-80861130 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8086112C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag16/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag16/unknown_translation_unit_dtors.cpp index bae2ad0e8d0..a21d1071f2f 100644 --- a/rel/d/a/kytag/d_a_kytag16/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag16/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80861130[4]; -extern u8 const data_80861130[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80861130[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80861130-80861134 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80861130[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp index 1c4c88b3bcd..b2c8a458894 100644 --- a/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp +++ b/rel/d/a/kytag/d_a_kytag17/d_a_kytag17.cpp @@ -26,7 +26,6 @@ static bool daKytag17_Execute(kytag17_class*); static bool daKytag17_IsDelete(kytag17_class*); static bool daKytag17_Delete(kytag17_class*); static void daKytag17_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_KYTAG17[12]; extern "C" static bool daKytag17_Draw__FP13kytag17_class(); extern "C" static bool daKytag17_Execute__FP13kytag17_class(); @@ -39,10 +38,6 @@ extern "C" extern void* g_profile_KYTAG17[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_env_light[4880]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; diff --git a/rel/d/a/kytag/d_a_kytag17/executor.cpp b/rel/d/a/kytag/d_a_kytag17/executor.cpp index 2d5570055ac..ed1ebcd77fa 100644 --- a/rel/d/a/kytag/d_a_kytag17/executor.cpp +++ b/rel/d/a/kytag/d_a_kytag17/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8046DBE0[4]; -extern u8 const data_8046DBE4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/kytag/d_a_kytag17/unknown_translation_unit_ctors.cpp b/rel/d/a/kytag/d_a_kytag17/unknown_translation_unit_ctors.cpp index c192a203aa1..e097eccc972 100644 --- a/rel/d/a/kytag/d_a_kytag17/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/kytag/d_a_kytag17/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046DBE0[4]; -extern u8 const data_8046DBE0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8046DBE0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8046DBE0-8046DBE4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8046DBE0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/kytag/d_a_kytag17/unknown_translation_unit_dtors.cpp b/rel/d/a/kytag/d_a_kytag17/unknown_translation_unit_dtors.cpp index 7d7882e25dd..99c9ddafee0 100644 --- a/rel/d/a/kytag/d_a_kytag17/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/kytag/d_a_kytag17/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046DBE4[4]; -extern u8 const data_8046DBE4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8046DBE4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8046DBE4-8046DBE8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8046DBE4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp b/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp index 51ba7fe841f..aa8c436de60 100644 --- a/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp +++ b/rel/d/a/npc/d_a_npc_aru/d_a_npc_aru.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -134,14 +134,12 @@ struct daNpc_Aru_Param_c { /* 80957604 */ ~daNpc_Aru_Param_c(); }; -struct J3DModel {}; - struct csXyz { /* 80956784 */ ~csXyz(); /* 80956CD8 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); @@ -149,6 +147,8 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -242,14 +242,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80956E24 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -423,49 +423,6 @@ static void daNpc_Aru_Draw(void*); static bool daNpc_Aru_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u16 l_loadResPtrn0[1 + 1 /* padding */]; -extern "C" extern void* g_profile_NPC_ARU[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8095818C[4]; -extern "C" extern u8 data_80958190[4]; -extern "C" extern u8 data_80958194[4]; -extern "C" extern u8 data_80958198[4]; -extern "C" extern u8 data_8095819C[4]; -extern "C" extern u8 data_809581A0[4]; -extern "C" extern u8 data_809581A4[4]; -extern "C" extern u8 data_809581A8[4]; -extern "C" extern u8 data_809581AC[4]; -extern "C" extern u8 data_809581B0[4]; -extern "C" extern u8 data_809581B4[4]; -extern "C" extern u8 data_809581B8[4]; -extern "C" extern u8 data_809581BC[4]; -extern "C" extern u8 data_809581C0[4]; -extern "C" extern u8 data_809581C4[4]; -extern "C" extern u8 data_809581C8[4]; -extern "C" extern u8 data_809581CC[4]; -extern "C" extern u8 data_809581D0[4]; -extern "C" extern u8 data_809581D4[4]; -extern "C" extern u8 data_809581D8[4]; -extern "C" extern u8 data_809581DC[4]; -extern "C" extern u8 data_809581E0[4]; -extern "C" extern u8 data_809581E4[4]; -extern "C" extern u8 data_809581E8[4]; -extern "C" extern u8 data_809581EC[4]; extern "C" void __dt__11daNpc_Aru_cFv(); extern "C" void create__11daNpc_Aru_cFv(); @@ -666,28 +623,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_aru/executor.cpp b/rel/d/a/npc/d_a_npc_aru/executor.cpp index 85155ea0fed..70b895a6c26 100644 --- a/rel/d/a/npc/d_a_npc_aru/executor.cpp +++ b/rel/d/a/npc/d_a_npc_aru/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809576BC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_aru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_aru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5cea849cc92..0de96d0bfd4 100644 --- a/rel/d/a/npc/d_a_npc_aru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_aru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809576C8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809576C8-809576D0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809576C8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80958118-80958120 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_aru/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_aru/unknown_translation_unit_ctors.cpp index 6647bb1bfc6..cc364e093f5 100644 --- a/rel/d/a/npc/d_a_npc_aru/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_aru/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809576BC[2]; -extern void* const data_809576BC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_aru_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809576BC-809576C4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809576BC[2] = { + (void*)__sinit_d_a_npc_aru_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp index 7d8e1cb77ea..40a489047b8 100644 --- a/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp +++ b/rel/d/a/npc/d_a_npc_ash/d_a_npc_ash.cpp @@ -21,10 +21,6 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -33,6 +29,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -57,16 +57,16 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -360,11 +360,6 @@ static void daNpcAsh_Delete(void*); static void daNpcAsh_Execute(void*); static void daNpcAsh_Draw(void*); static bool daNpcAsh_IsDelete(void*); -extern "C" extern u8 const lit_4654[32]; -extern "C" extern u8 const lit_4682[40]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ASH[12]; extern "C" void __ct__10daNpcAsh_cFv(); extern "C" void __dt__8dCcD_CylFv(); @@ -472,26 +467,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/npc/d_a_npc_ash/executor.cpp b/rel/d/a/npc/d_a_npc_ash/executor.cpp index 0527de850eb..c65ab5df795 100644 --- a/rel/d/a/npc/d_a_npc_ash/executor.cpp +++ b/rel/d/a/npc/d_a_npc_ash/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8095D62C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_ash/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_ash/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6101613d6c3..3be7e04b5b4 100644 --- a/rel/d/a/npc/d_a_npc_ash/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_ash/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8095D638[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8095D638-8095D640 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8095D638[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8095DD38-8095DD40 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_ash/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_ash/unknown_translation_unit_ctors.cpp index c919290bcf1..7e537702f47 100644 --- a/rel/d/a/npc/d_a_npc_ash/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_ash/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8095D62C[2]; -extern void* const data_8095D62C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_ash_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8095D62C-8095D634 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8095D62C[2] = { + (void*)__sinit_d_a_npc_ash_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp b/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp index fa327c718ef..311a6d5fbfc 100644 --- a/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp +++ b/rel/d/a/npc/d_a_npc_ashB/d_a_npc_ashB.cpp @@ -21,10 +21,6 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -33,6 +29,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -46,16 +46,16 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -94,17 +94,17 @@ struct daNpcF_MatAnm_c { /* 80150738 */ void initialize(); }; -struct csXyz { - /* 809619E8 */ ~csXyz(); - /* 80961A24 */ csXyz(); -}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80961A28 */ ~cXyz(); /* 80961A64 */ cXyz(); }; +struct csXyz { + /* 809619E8 */ ~csXyz(); + /* 80961A24 */ csXyz(); +}; + struct daNpcF_Lookat_c { /* 80151038 */ void initialize(); /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, @@ -337,11 +337,6 @@ static void daNpcAshB_Delete(void*); static void daNpcAshB_Execute(void*); static void daNpcAshB_Draw(void*); static bool daNpcAshB_IsDelete(void*); -extern "C" extern u8 const lit_4535[28]; -extern "C" extern u8 const lit_4571[48]; -extern "C" extern u32 const lit_5082; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ASHB[12]; extern "C" void __ct__11daNpcAshB_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -440,25 +435,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/npc/d_a_npc_ashB/executor.cpp b/rel/d/a/npc/d_a_npc_ashB/executor.cpp index ff4790aae00..6aa5fb9c06e 100644 --- a/rel/d/a/npc/d_a_npc_ashB/executor.cpp +++ b/rel/d/a/npc/d_a_npc_ashB/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809620D0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_ashB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_ashB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4b53eed24e5..5a642846d40 100644 --- a/rel/d/a/npc/d_a_npc_ashB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_ashB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809620DC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809620DC-809620E4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809620DC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809627B8-809627C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_ashB/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_ashB/unknown_translation_unit_ctors.cpp index b2b3c7563c4..b13194b16fe 100644 --- a/rel/d/a/npc/d_a_npc_ashB/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_ashB/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809620D0[2]; -extern void* const data_809620D0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_ashB_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809620D0-809620D8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809620D0[2] = { + (void*)__sinit_d_a_npc_ashB_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp b/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp index 5526c0468ea..87400b8c2d1 100644 --- a/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp +++ b/rel/d/a/npc/d_a_npc_bans/d_a_npc_bans.cpp @@ -27,16 +27,16 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -134,14 +134,12 @@ struct daNpc_Bans_Param_c { /* 80967C24 */ ~daNpc_Bans_Param_c(); }; -struct J3DModel {}; - struct csXyz { /* 80966ED8 */ ~csXyz(); /* 80967318 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); @@ -149,6 +147,8 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80147FD4 */ void srchActor(void*, void*); @@ -457,8 +457,6 @@ static void daNpc_Bans_Draw(void*); static bool daNpc_Bans_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_calcTimer__template1(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_BANS[12]; extern "C" void __dt__12daNpc_Bans_cFv(); extern "C" void create__12daNpc_Bans_cFv(); @@ -600,30 +598,6 @@ void cM_rndF(f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mSrchName__8daNpcT_c[2 + 2 /* padding */]; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_bans/executor.cpp b/rel/d/a/npc/d_a_npc_bans/executor.cpp index c62a92364ad..920977c129e 100644 --- a/rel/d/a/npc/d_a_npc_bans/executor.cpp +++ b/rel/d/a/npc/d_a_npc_bans/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80967E0C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_bans/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_bans/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e4ddcaa8d40..8dc40ce63f9 100644 --- a/rel/d/a/npc/d_a_npc_bans/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_bans/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80967E18[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80967E18-80967E20 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80967E18[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80968850-80968858 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_bans/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_bans/unknown_translation_unit_ctors.cpp index df5d9a708d7..60065d725f4 100644 --- a/rel/d/a/npc/d_a_npc_bans/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_bans/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80967E0C[2]; -extern void* const data_80967E0C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_bans_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80967E0C-80967E14 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80967E0C[2] = { + (void*)__sinit_d_a_npc_bans_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp b/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp index 0b7ca52020d..aabd49583c8 100644 --- a/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp +++ b/rel/d/a/npc/d_a_npc_besu/d_a_npc_besu.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -136,15 +136,6 @@ struct daNpc_Besu_Param_c { /* 8053E6E8 */ ~daNpc_Besu_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 8053D760 */ ~csXyz(); - /* 8053DCB4 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -152,11 +143,20 @@ struct cXyz { /* 8053DDB4 */ cXyz(); }; +struct csXyz { + /* 8053D760 */ ~csXyz(); + /* 8053DCB4 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -421,9 +421,6 @@ static void daNpc_Besu_Draw(void*); static bool daNpc_Besu_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u8 const lit_6105[8]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_BESU[12]; extern "C" void __dt__12daNpc_Besu_cFv(); extern "C" void create__12daNpc_Besu_cFv(); @@ -578,24 +575,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_besu/executor.cpp b/rel/d/a/npc/d_a_npc_besu/executor.cpp index 86c85f74e52..3e7535664c2 100644 --- a/rel/d/a/npc/d_a_npc_besu/executor.cpp +++ b/rel/d/a/npc/d_a_npc_besu/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8053E740[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_besu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_besu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9467cf848f4..4c8a521ef23 100644 --- a/rel/d/a/npc/d_a_npc_besu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_besu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8053E74C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8053E74C-8053E754 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8053E74C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8053FE68-8053FE70 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_besu/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_besu/unknown_translation_unit_ctors.cpp index a29bbcd48fc..914a1a77e18 100644 --- a/rel/d/a/npc/d_a_npc_besu/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_besu/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8053E740[2]; -extern void* const data_8053E740[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_besu_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8053E740-8053E748 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8053E740[2] = { + (void*)__sinit_d_a_npc_besu_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp b/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp index 8fc704899df..d81de53a856 100644 --- a/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp +++ b/rel/d/a/npc/d_a_npc_blue_ns/d_a_npc_blue_ns.cpp @@ -15,12 +15,6 @@ struct request_of_phase_process_class {}; struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,6 +23,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -74,17 +74,17 @@ struct daNpcF_c { /* 8096C744 */ void drawOtherMdls(); }; -struct csXyz { - /* 8096C0E4 */ ~csXyz(); - /* 8096C120 */ csXyz(); -}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 8096C124 */ ~cXyz(); /* 8096C160 */ cXyz(); }; +struct csXyz { + /* 8096C0E4 */ ~csXyz(); + /* 8096C120 */ csXyz(); +}; + struct daNpcF_Lookat_c { /* 80151038 */ void initialize(); /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, @@ -102,10 +102,10 @@ struct daNpcF_ActorMngr_c { /* 8096BFD8 */ daNpcF_ActorMngr_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daNpcBlueNS_c { /* 8096896C */ daNpcBlueNS_c(); /* 80968B80 */ ~daNpcBlueNS_c(); @@ -323,11 +323,6 @@ static void daNpcBlueNS_Execute(void*); static void daNpcBlueNS_Draw(void*); static bool daNpcBlueNS_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const lit_4926[36]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_5122[3]; -extern "C" extern void* g_profile_NPC_BLUENS[12]; extern "C" void __ct__13daNpcBlueNS_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -452,22 +447,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; extern "C" void __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); diff --git a/rel/d/a/npc/d_a_npc_blue_ns/executor.cpp b/rel/d/a/npc/d_a_npc_blue_ns/executor.cpp index 5aff54f0216..296f36ea4dd 100644 --- a/rel/d/a/npc/d_a_npc_blue_ns/executor.cpp +++ b/rel/d/a/npc/d_a_npc_blue_ns/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8096C90C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_blue_ns/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_blue_ns/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4a9d91ce5e5..76c11f3cefe 100644 --- a/rel/d/a/npc/d_a_npc_blue_ns/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_blue_ns/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8096C918[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8096C918-8096C920 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8096C918[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8096CE80-8096CE88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_blue_ns/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_blue_ns/unknown_translation_unit_ctors.cpp index 84fbfc6fcbc..79e5721a154 100644 --- a/rel/d/a/npc/d_a_npc_blue_ns/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_blue_ns/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8096C90C[2]; -extern void* const data_8096C90C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_blue_ns_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8096C90C-8096C914 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8096C90C[2] = { + (void*)__sinit_d_a_npc_blue_ns_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp b/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp index e07a464bda4..17f14372efa 100644 --- a/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp +++ b/rel/d/a/npc/d_a_npc_bou/d_a_npc_bou.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -116,15 +116,6 @@ struct daNpc_Bou_Param_c { /* 809727F4 */ ~daNpc_Bou_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80971930 */ ~csXyz(); - /* 80971ECC */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -132,12 +123,21 @@ struct cXyz { /* 80971FCC */ cXyz(); }; +struct csXyz { + /* 80971930 */ ~csXyz(); + /* 80971ECC */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -405,9 +405,6 @@ static void daNpc_Bou_Execute(void*); static void daNpc_Bou_Draw(void*); static bool daNpc_Bou_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const m__17daNpc_Bou_Param_c[156]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_BOU[12]; extern "C" void __dt__11daNpc_Bou_cFv(); extern "C" void create__11daNpc_Bou_cFv(); @@ -549,26 +546,6 @@ void cLib_chaseS(s16*, s16, s16); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_bou/executor.cpp b/rel/d/a/npc/d_a_npc_bou/executor.cpp index bae4da3cbb1..7db36b06d94 100644 --- a/rel/d/a/npc/d_a_npc_bou/executor.cpp +++ b/rel/d/a/npc/d_a_npc_bou/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8097284C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_bou/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_bou/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 099b94c9303..4d62ced9c5d 100644 --- a/rel/d/a/npc/d_a_npc_bou/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_bou/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80972858[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80972858-80972860 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80972858[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80973440-80973448 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_bou/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_bou/unknown_translation_unit_ctors.cpp index d064edcf7e8..4a4c393a6d2 100644 --- a/rel/d/a/npc/d_a_npc_bou/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_bou/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8097284C[2]; -extern void* const data_8097284C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_bou_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8097284C-80972854 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8097284C[2] = { + (void*)__sinit_d_a_npc_bou_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp b/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp index b7cc67af1fe..e51384e4fa8 100644 --- a/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp +++ b/rel/d/a/npc/d_a_npc_bouS/d_a_npc_bouS.cpp @@ -37,16 +37,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -63,16 +63,16 @@ struct daNpcWrestler_c { /* 80B301BC */ void checkStartUp(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -357,51 +357,6 @@ static void daNpcBouS_Delete(void*); static void daNpcBouS_Execute(void*); static void daNpcBouS_Draw(void*); static bool daNpcBouS_IsDelete(void*); -extern "C" extern u8 const lit_4742[24]; -extern "C" extern u8 const lit_4781[80]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_BOU_S[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80978BEC[4]; -extern "C" extern u8 data_80978BF0[4]; -extern "C" extern u8 data_80978BF4[4]; -extern "C" extern u8 data_80978BF8[4]; -extern "C" extern u8 data_80978BFC[4]; -extern "C" extern u8 data_80978C00[4]; -extern "C" extern u8 data_80978C04[4]; -extern "C" extern u8 data_80978C08[4]; -extern "C" extern u8 data_80978C0C[4]; -extern "C" extern u8 data_80978C10[4]; -extern "C" extern u8 data_80978C14[4]; -extern "C" extern u8 data_80978C18[4]; -extern "C" extern u8 data_80978C1C[4]; -extern "C" extern u8 data_80978C20[4]; -extern "C" extern u8 data_80978C24[4]; -extern "C" extern u8 data_80978C28[4]; -extern "C" extern u8 data_80978C2C[4]; -extern "C" extern u8 data_80978C30[4]; -extern "C" extern u8 data_80978C34[4]; -extern "C" extern u8 data_80978C38[4]; -extern "C" extern u8 data_80978C3C[4]; -extern "C" extern u8 data_80978C40[4]; -extern "C" extern u8 data_80978C44[4]; -extern "C" extern u8 data_80978C48[4]; -extern "C" extern u8 data_80978C4C[4]; extern "C" void __ct__11daNpcBouS_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -556,25 +511,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern void* __vt__8cM3dGCyl[3]; extern "C" void fadeOut__13mDoGph_gInf_cFf(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/npc/d_a_npc_bouS/executor.cpp b/rel/d/a/npc/d_a_npc_bouS/executor.cpp index 59115559fa3..c851948837a 100644 --- a/rel/d/a/npc/d_a_npc_bouS/executor.cpp +++ b/rel/d/a/npc/d_a_npc_bouS/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809783FC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_bouS/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_bouS/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 62f6b880ec0..0013d27c65a 100644 --- a/rel/d/a/npc/d_a_npc_bouS/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_bouS/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80978408[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80978408-80978410 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80978408[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80978B70-80978B78 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_bouS/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_bouS/unknown_translation_unit_ctors.cpp index 77df3c9d7eb..2263e2b6174 100644 --- a/rel/d/a/npc/d_a_npc_bouS/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_bouS/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809783FC[2]; -extern void* const data_809783FC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_bouS_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809783FC-80978404 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809783FC[2] = { + (void*)__sinit_d_a_npc_bouS_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp b/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp index 37d8c88eb7d..0eb409b8d7f 100644 --- a/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp +++ b/rel/d/a/npc/d_a_npc_cdn3/d_a_npc_cdn3.cpp @@ -153,15 +153,15 @@ struct dScnKy_env_light_c { /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); }; +struct cXyz { + /* 809799F8 */ ~cXyz(); +}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); /* 8097D614 */ ~csXyz(); }; -struct cXyz { - /* 809799F8 */ ~cXyz(); -}; - struct dNpcLib_lookat_c { /* 80251314 */ dNpcLib_lookat_c(); /* 8025140C */ void init(J3DModel*, int*, csXyz*, csXyz*); @@ -308,10 +308,6 @@ static void daNpcCdn3_Delete(void*); static void daNpcCdn3_Execute(void*); static void daNpcCdn3_Draw(void*); static bool daNpcCdn3_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_CD3[12]; -extern "C" extern void* __vt__8cM3dGCyl[3]; extern "C" static void createHeapCallBack__FP10fopAc_ac_c(); extern "C" void setAction__11daNpcCdn3_cFQ211daNpcCdn3_c6Mode_e(); @@ -438,23 +434,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleY(Vec const&, Vec const&); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern u8 const m_cylDat__10daNpcCd2_c[68]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 l_Cd2_HIO[16396]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_cdn3/executor.cpp b/rel/d/a/npc/d_a_npc_cdn3/executor.cpp index 6208b53d71b..400794dfe01 100644 --- a/rel/d/a/npc/d_a_npc_cdn3/executor.cpp +++ b/rel/d/a/npc/d_a_npc_cdn3/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8097F534[2]; -extern u8 const data_8097F53C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_cdn3/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_cdn3/unknown_translation_unit_ctors.cpp index b84df1f4a24..7f09ab8cc88 100644 --- a/rel/d/a/npc/d_a_npc_cdn3/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_cdn3/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8097F534[2]; -extern void* const data_8097F534[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_cdn3_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8097F534-8097F53C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8097F534[2] = { + (void*)__sinit_d_a_npc_cdn3_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_cdn3/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_cdn3/unknown_translation_unit_dtors.cpp index e952d051fe1..2ff352bc114 100644 --- a/rel/d/a/npc/d_a_npc_cdn3/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_cdn3/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8097F53C[4]; -extern u8 const data_8097F53C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8097F53C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8097F53C-8097F540 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8097F53C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp b/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp index 2a749903797..4002ccd0381 100644 --- a/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp +++ b/rel/d/a/npc/d_a_npc_chat/d_a_npc_chat.cpp @@ -13,18 +13,18 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - /* 80985DE4 */ csXyz(); - /* 80985DA8 */ ~csXyz(); -}; - struct cXyz { /* 80266C18 */ void operator/(f32) const; /* 80985DE8 */ ~cXyz(); /* 80985E24 */ cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); + /* 80985DE4 */ csXyz(); + /* 80985DA8 */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -38,10 +38,10 @@ struct mDoExt_morf_c { struct J3DAnmTextureSRTKey {}; -struct J3DAnmTexPattern {}; - struct J3DAnmTevRegKey {}; +struct J3DAnmTexPattern {}; + struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -62,13 +62,13 @@ struct mDoExt_brkAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -334,61 +334,6 @@ static void daNpcChat_Delete(void*); static void daNpcChat_Execute(void*); static void daNpcChat_Draw(void*); static bool daNpcChat_IsDelete(void*); -extern "C" extern u8 const lit_5715[24]; -extern "C" extern u8 const lit_5728[20]; -extern "C" extern u8 const lit_5737[20]; -extern "C" extern u8 const lit_5744[24]; -extern "C" extern u8 const lit_5756[20]; -extern "C" extern u8 const lit_5762[20]; -extern "C" extern u8 const lit_5769[24]; -extern "C" extern u8 const lit_5776[24]; -extern "C" extern u8 const lit_5785[32]; -extern "C" extern u8 const lit_5802[24]; -extern "C" extern u8 const lit_5811[24]; -extern "C" extern u8 const lit_5820[24]; -extern "C" extern u8 const lit_5847[160]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_CHAT[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8098BDA4[4]; -extern "C" extern u8 data_8098BDA8[4]; -extern "C" extern u8 data_8098BDAC[4]; -extern "C" extern u8 data_8098BDB0[4]; -extern "C" extern u8 data_8098BDB4[4]; -extern "C" extern u8 data_8098BDB8[4]; -extern "C" extern u8 data_8098BDBC[4]; -extern "C" extern u8 data_8098BDC0[4]; -extern "C" extern u8 data_8098BDC4[4]; -extern "C" extern u8 data_8098BDC8[4]; -extern "C" extern u8 data_8098BDCC[4]; -extern "C" extern u8 data_8098BDD0[4]; -extern "C" extern u8 data_8098BDD4[4]; -extern "C" extern u8 data_8098BDD8[4]; -extern "C" extern u8 data_8098BDDC[4]; -extern "C" extern u8 data_8098BDE0[4]; -extern "C" extern u8 data_8098BDE4[4]; -extern "C" extern u8 data_8098BDE8[4]; -extern "C" extern u8 data_8098BDEC[4]; -extern "C" extern u8 data_8098BDF0[4]; -extern "C" extern u8 data_8098BDF4[4]; -extern "C" extern u8 data_8098BDF8[4]; -extern "C" extern u8 data_8098BDFC[4]; -extern "C" extern u8 data_8098BE00[4]; -extern "C" extern u8 data_8098BE04[4]; extern "C" void __ct__11daNpcChat_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -547,23 +492,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/npc/d_a_npc_chat/executor.cpp b/rel/d/a/npc/d_a_npc_chat/executor.cpp index 8a9cab81495..2cf64cd18e9 100644 --- a/rel/d/a/npc/d_a_npc_chat/executor.cpp +++ b/rel/d/a/npc/d_a_npc_chat/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80986988[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_chat/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_chat/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e66395203f0..b4c93ace179 100644 --- a/rel/d/a/npc/d_a_npc_chat/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_chat/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80986994[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80986994-8098699C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80986994[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8098BA78-8098BA80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_chat/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_chat/unknown_translation_unit_ctors.cpp index 7213ce98631..ce3ed25eeef 100644 --- a/rel/d/a/npc/d_a_npc_chat/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_chat/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80986988[2]; -extern void* const data_80986988[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_chat_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80986988-80986990 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80986988[2] = { + (void*)__sinit_d_a_npc_chat_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp b/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp index ad011e1467b..32d85e6a833 100644 --- a/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp +++ b/rel/d/a/npc/d_a_npc_chin/d_a_npc_chin.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80991020 */ ~csXyz(); - /* 8099105C */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -26,6 +21,11 @@ struct cXyz { /* 8099109C */ cXyz(); }; +struct csXyz { + /* 80991020 */ ~csXyz(); + /* 8099105C */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -55,16 +55,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -80,12 +80,12 @@ struct fopAc_ac_c { struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -144,10 +144,10 @@ struct daNpcF_ActorMngr_c { /* 80990F14 */ daNpcF_ActorMngr_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct dKy_tevstr_c {}; struct daNpcChin_c { @@ -416,15 +416,6 @@ static void daNpcChin_Delete(void*); static void daNpcChin_Execute(void*); static void daNpcChin_Draw(void*); static bool daNpcChin_IsDelete(void*); -extern "C" extern u32 const lit_4804; -extern "C" extern u32 const lit_4806; -extern "C" extern u32 const lit_4807; -extern "C" extern u32 const lit_4809; -extern "C" extern u32 const lit_4810; -extern "C" extern u8 const lit_4886[60]; -extern "C" extern u8 const lit_4955[72]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_CHIN[12]; extern "C" void loadModel__Q211daNpcChin_c12_SpotLight_cFv(); extern "C" void setMtx__Q211daNpcChin_c12_SpotLight_cFv(); @@ -569,27 +560,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/npc/d_a_npc_chin/executor.cpp b/rel/d/a/npc/d_a_npc_chin/executor.cpp index faf4f06e83c..7704918c342 100644 --- a/rel/d/a/npc/d_a_npc_chin/executor.cpp +++ b/rel/d/a/npc/d_a_npc_chin/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809918E4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_chin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_chin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8bde8622448..70d1893f627 100644 --- a/rel/d/a/npc/d_a_npc_chin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_chin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809918F0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809918F0-809918F8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809918F0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80992410-80992418 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_chin/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_chin/unknown_translation_unit_ctors.cpp index 0a8238c63aa..851fb971a4e 100644 --- a/rel/d/a/npc/d_a_npc_chin/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_chin/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809918E4[2]; -extern void* const data_809918E4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_chin_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809918E4-809918EC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809918E4[2] = { + (void*)__sinit_d_a_npc_chin_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp b/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp index 26a831af35c..b0f0fe3930d 100644 --- a/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp +++ b/rel/d/a/npc/d_a_npc_clerka/d_a_npc_clerka.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -112,13 +112,13 @@ struct daNpc_clerkA_Param_c { struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -393,8 +393,6 @@ static void daNpc_clerkA_Execute(void*); static void daNpc_clerkA_Draw(void*); static bool daNpc_clerkA_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_CLERKA[12]; extern "C" void __dt__14daNpc_clerkA_cFv(); extern "C" void create__14daNpc_clerkA_cFv(); @@ -519,23 +517,6 @@ void cM_rnd(); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_clerka/executor.cpp b/rel/d/a/npc/d_a_npc_clerka/executor.cpp index 7d24b8b9277..8ebb98d6078 100644 --- a/rel/d/a/npc/d_a_npc_clerka/executor.cpp +++ b/rel/d/a/npc/d_a_npc_clerka/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8099585C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_clerka/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_clerka/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8231f8b5c2c..c46505853ca 100644 --- a/rel/d/a/npc/d_a_npc_clerka/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_clerka/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80995868[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80995868-80995870 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80995868[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80995E18-80995E20 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_clerka/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_clerka/unknown_translation_unit_ctors.cpp index f192284bc57..5b5a01415ab 100644 --- a/rel/d/a/npc/d_a_npc_clerka/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_clerka/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8099585C[2]; -extern void* const data_8099585C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_clerka_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8099585C-80995864 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8099585C[2] = { + (void*)__sinit_d_a_npc_clerka_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp b/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp index c5706df1f9c..02249092dde 100644 --- a/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp +++ b/rel/d/a/npc/d_a_npc_clerkb/d_a_npc_clerkb.cpp @@ -41,16 +41,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -64,19 +64,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct J3DJoint {}; - -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_motionAnmData_c {}; -struct dMsgFlow_c { - /* 80249F00 */ dMsgFlow_c(); - /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); -}; - struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -84,6 +75,15 @@ struct daNpcT_MotionSeqMngr_c { /* 8099907C */ ~daNpcT_MotionSeqMngr_c(); }; +struct J3DJoint {}; + +struct dMsgFlow_c { + /* 80249F00 */ dMsgFlow_c(); + /* 80249F90 */ void init(fopAc_ac_c*, int, int, fopAc_ac_c**); +}; + +struct daNpcT_evtData_c {}; + struct daNpc_clerkB_c { /* 80995F2C */ ~daNpc_clerkB_c(); /* 80996090 */ void create(); @@ -137,13 +137,13 @@ struct daNpc_clerkB_Param_c { struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -419,8 +419,6 @@ static void daNpc_clerkB_Execute(void*); static void daNpc_clerkB_Draw(void*); static bool daNpc_clerkB_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_CLERKB[12]; extern "C" void __dt__14daNpc_clerkB_cFv(); extern "C" void create__14daNpc_clerkB_cFv(); @@ -547,25 +545,6 @@ void cM_rndF(f32); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_clerkb/executor.cpp b/rel/d/a/npc/d_a_npc_clerkb/executor.cpp index c47eb206bbe..41a397830cc 100644 --- a/rel/d/a/npc/d_a_npc_clerkb/executor.cpp +++ b/rel/d/a/npc/d_a_npc_clerkb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80999964[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_clerkb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_clerkb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 88e3bfb30a2..b29f81dbddf 100644 --- a/rel/d/a/npc/d_a_npc_clerkb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_clerkb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80999970[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80999970-80999978 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80999970[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8099A040-8099A048 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_clerkb/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_clerkb/unknown_translation_unit_ctors.cpp index 164fb28c418..7d5d6d35178 100644 --- a/rel/d/a/npc/d_a_npc_clerkb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_clerkb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80999964[2]; -extern void* const data_80999964[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_clerkb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80999964-8099996C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80999964[2] = { + (void*)__sinit_d_a_npc_clerkb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp b/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp index 683608d5b69..9647d65139d 100644 --- a/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp +++ b/rel/d/a/npc/d_a_npc_clerkt/d_a_npc_clerkt.cpp @@ -25,16 +25,16 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -53,10 +53,6 @@ struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -66,11 +62,15 @@ struct daNpcT_MotionSeqMngr_c { struct J3DJoint {}; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -388,8 +388,6 @@ static void daNpcClerkt_Delete(void*); static void daNpcClerkt_Execute(void*); static void daNpcClerkt_Draw(void*); static bool daNpcClerkt_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_CLERKT[12]; extern "C" void __dt__13daNpcClerkT_cFv(); extern "C" void create__13daNpcClerkT_cFv(); @@ -510,23 +508,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_clerkt/executor.cpp b/rel/d/a/npc/d_a_npc_clerkt/executor.cpp index 462c14d8c63..bbe6cef3d1a 100644 --- a/rel/d/a/npc/d_a_npc_clerkt/executor.cpp +++ b/rel/d/a/npc/d_a_npc_clerkt/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8099D230[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_clerkt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_clerkt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index aeac6ed8263..7f3230069e0 100644 --- a/rel/d/a/npc/d_a_npc_clerkt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_clerkt/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8099D23C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8099D23C-8099D244 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8099D23C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8099D648-8099D650 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_clerkt/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_clerkt/unknown_translation_unit_ctors.cpp index 343c7c0eeb4..4944c615208 100644 --- a/rel/d/a/npc/d_a_npc_clerkt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_clerkt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8099D230[2]; -extern void* const data_8099D230[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_clerkt_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8099D230-8099D238 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8099D230[2] = { + (void*)__sinit_d_a_npc_clerkt_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp b/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp index 9f8732435cc..1f72c3e8250 100644 --- a/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp +++ b/rel/d/a/npc/d_a_npc_coach/d_a_npc_coach.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -27,6 +25,8 @@ struct cXyz { /* 809A4D78 */ cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -57,16 +57,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -95,11 +95,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -120,12 +120,12 @@ struct daNpcTheB_c { /* 80AFD5F0 */ void getHandPos2(int); }; +struct J3DJoint {}; + struct J3DModel {}; struct SVec {}; -struct J3DJoint {}; - struct daNpcCoach_c { /* 8099DA60 */ void hitFireArrow(cXyz); /* 8099DBA4 */ void deleteFireArrow(unsigned int); @@ -380,8 +380,6 @@ static void daNpcCoach_Draw(daNpcCoach_c*); static bool daNpcCoach_IsDelete(daNpcCoach_c*); static void daNpcCoach_Delete(daNpcCoach_c*); static void daNpcCoach_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_COACH[12]; extern "C" static void jointHorseCallBack__FP8J3DJointi(); extern "C" static void jointFrontWheelCallBack__FP8J3DJointi(); @@ -490,29 +488,6 @@ void cLib_distanceAngleS(s16, s16); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__15Z2SoundObjCoach[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_coach/executor.cpp b/rel/d/a/npc/d_a_npc_coach/executor.cpp index a7e0f5953e0..44cfda16e60 100644 --- a/rel/d/a/npc/d_a_npc_coach/executor.cpp +++ b/rel/d/a/npc/d_a_npc_coach/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_809A4EC8[4]; -extern u8 const data_809A4ECC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_coach/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_coach/unknown_translation_unit_ctors.cpp index 034a39912ea..77b12f6465f 100644 --- a/rel/d/a/npc/d_a_npc_coach/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_coach/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_809A4EC8[4]; -extern u8 const data_809A4EC8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_809A4EC8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809A4EC8-809A4ECC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_809A4EC8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_coach/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_coach/unknown_translation_unit_dtors.cpp index 1e237b877e6..c0dc88783fa 100644 --- a/rel/d/a/npc/d_a_npc_coach/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_coach/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_809A4ECC[4]; -extern u8 const data_809A4ECC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_809A4ECC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 809A4ECC-809A4ED0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_809A4ECC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp b/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp index 138fc8bfaac..b386b8434af 100644 --- a/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp +++ b/rel/d/a/npc/d_a_npc_df/d_a_npc_df.cpp @@ -99,48 +99,6 @@ static bool daNpc_Df_IsDelete(npc_df_class*); static void daNpc_Df_Delete(npc_df_class*); static void useHeapInit(fopAc_ac_c*); static void daNpc_Df_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_DF[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809A6B30[4]; -extern "C" extern u8 data_809A6B34[4]; -extern "C" extern u8 data_809A6B38[4]; -extern "C" extern u8 data_809A6B3C[4]; -extern "C" extern u8 data_809A6B40[4]; -extern "C" extern u8 data_809A6B44[4]; -extern "C" extern u8 data_809A6B48[4]; -extern "C" extern u8 data_809A6B4C[4]; -extern "C" extern u8 data_809A6B50[4]; -extern "C" extern u8 data_809A6B54[4]; -extern "C" extern u8 data_809A6B58[4]; -extern "C" extern u8 data_809A6B5C[4]; -extern "C" extern u8 data_809A6B60[4]; -extern "C" extern u8 data_809A6B64[4]; -extern "C" extern u8 data_809A6B68[4]; -extern "C" extern u8 data_809A6B6C[4]; -extern "C" extern u8 data_809A6B70[4]; -extern "C" extern u8 data_809A6B74[4]; -extern "C" extern u8 data_809A6B78[4]; -extern "C" extern u8 data_809A6B7C[4]; -extern "C" extern u8 data_809A6B80[4]; -extern "C" extern u8 data_809A6B84[4]; -extern "C" extern u8 data_809A6B88[4]; -extern "C" extern u8 data_809A6B8C[4]; -extern "C" extern u8 data_809A6B90[4]; extern "C" static void daNpc_Df_Draw__FP12npc_df_class(); extern "C" static void df_fly__FP12npc_df_classP4df_s(); @@ -226,13 +184,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_df/executor.cpp b/rel/d/a/npc/d_a_npc_df/executor.cpp index 9685263dbea..ed74b78be2f 100644 --- a/rel/d/a/npc/d_a_npc_df/executor.cpp +++ b/rel/d/a/npc/d_a_npc_df/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809A6890[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_df/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_df/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e32a47eda7f..95ad48a2be2 100644 --- a/rel/d/a/npc/d_a_npc_df/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_df/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809A689C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809A689C-809A68A4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809A689C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809A6A08-809A6A10 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_df/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_df/unknown_translation_unit_ctors.cpp index 9728026f0fb..62d3a6509ec 100644 --- a/rel/d/a/npc/d_a_npc_df/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_df/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809A6890[2]; -extern void* const data_809A6890[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_df_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809A6890-809A6898 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809A6890[2] = { + (void*)__sinit_d_a_npc_df_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp b/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp index 2c7e91d2542..3214aa5ab3f 100644 --- a/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp +++ b/rel/d/a/npc/d_a_npc_doc/d_a_npc_doc.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -104,15 +104,6 @@ struct daNpc_Doc_Param_c { /* 809AA2B0 */ ~daNpc_Doc_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 809A9510 */ ~csXyz(); - /* 809A9A28 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -120,12 +111,21 @@ struct cXyz { /* 809A9B28 */ cXyz(); }; +struct csXyz { + /* 809A9510 */ ~csXyz(); + /* 809A9A28 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -221,14 +221,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 809A9BBC */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -371,48 +371,6 @@ static void daNpc_Doc_Delete(void*); static void daNpc_Doc_Execute(void*); static void daNpc_Doc_Draw(void*); static bool daNpc_Doc_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_DOC[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809AAB3C[4]; -extern "C" extern u8 data_809AAB40[4]; -extern "C" extern u8 data_809AAB44[4]; -extern "C" extern u8 data_809AAB48[4]; -extern "C" extern u8 data_809AAB4C[4]; -extern "C" extern u8 data_809AAB50[4]; -extern "C" extern u8 data_809AAB54[4]; -extern "C" extern u8 data_809AAB58[4]; -extern "C" extern u8 data_809AAB5C[4]; -extern "C" extern u8 data_809AAB60[4]; -extern "C" extern u8 data_809AAB64[4]; -extern "C" extern u8 data_809AAB68[4]; -extern "C" extern u8 data_809AAB6C[4]; -extern "C" extern u8 data_809AAB70[4]; -extern "C" extern u8 data_809AAB74[4]; -extern "C" extern u8 data_809AAB78[4]; -extern "C" extern u8 data_809AAB7C[4]; -extern "C" extern u8 data_809AAB80[4]; -extern "C" extern u8 data_809AAB84[4]; -extern "C" extern u8 data_809AAB88[4]; -extern "C" extern u8 data_809AAB8C[4]; -extern "C" extern u8 data_809AAB90[4]; -extern "C" extern u8 data_809AAB94[4]; -extern "C" extern u8 data_809AAB98[4]; -extern "C" extern u8 data_809AAB9C[4]; extern "C" void __dt__11daNpc_Doc_cFv(); extern "C" void create__11daNpc_Doc_cFv(); @@ -573,23 +531,6 @@ void cM_rndF(f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_doc/executor.cpp b/rel/d/a/npc/d_a_npc_doc/executor.cpp index b824086c81f..c97e0f4ed64 100644 --- a/rel/d/a/npc/d_a_npc_doc/executor.cpp +++ b/rel/d/a/npc/d_a_npc_doc/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809AA308[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_doc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_doc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ce21ff478dc..4af73fca8e1 100644 --- a/rel/d/a/npc/d_a_npc_doc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_doc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809AA314[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809AA314-809AA31C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809AA314[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809AAAC8-809AAAD0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_doc/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_doc/unknown_translation_unit_ctors.cpp index 9804ffa5f78..9c8d357ae42 100644 --- a/rel/d/a/npc/d_a_npc_doc/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_doc/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809AA308[2]; -extern void* const data_809AA308[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_doc_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809AA308-809AA310 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809AA308[2] = { + (void*)__sinit_d_a_npc_doc_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp b/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp index b8961a5d1f5..5483f86193c 100644 --- a/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp +++ b/rel/d/a/npc/d_a_npc_doorboy/d_a_npc_doorboy.cpp @@ -15,13 +15,13 @@ struct request_of_phase_process_class {}; struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -35,12 +35,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; struct J3DAnmTexPattern {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -75,16 +75,16 @@ struct daNpcF_c { /* 809AD884 */ void drawOtherMdls(); }; -struct csXyz { - /* 809AD224 */ ~csXyz(); - /* 809AD260 */ csXyz(); -}; - struct cXyz { /* 809AD264 */ ~cXyz(); /* 809AD2A0 */ cXyz(); }; +struct csXyz { + /* 809AD224 */ ~csXyz(); + /* 809AD260 */ csXyz(); +}; + struct daNpcF_Lookat_c { /* 80151038 */ void initialize(); /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, @@ -286,11 +286,6 @@ static void daNpcDoorBoy_Delete(void*); static void daNpcDoorBoy_Execute(void*); static void daNpcDoorBoy_Draw(void*); static bool daNpcDoorBoy_IsDelete(void*); -extern "C" extern u8 const lit_4490[48]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_btpGetParamList[12]; -extern "C" extern void* g_profile_NPC_DOORBOY[12]; extern "C" void __ct__14daNpcDoorBoy_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -375,22 +370,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; extern "C" void __ct__16mDoExt_McaMorfSOFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiP10Z2CreatureUlUl(); diff --git a/rel/d/a/npc/d_a_npc_doorboy/executor.cpp b/rel/d/a/npc/d_a_npc_doorboy/executor.cpp index d029f7672e4..bccc2d8fa5b 100644 --- a/rel/d/a/npc/d_a_npc_doorboy/executor.cpp +++ b/rel/d/a/npc/d_a_npc_doorboy/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809AD994[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_doorboy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_doorboy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7fa424fbf45..b6f7fceb8c8 100644 --- a/rel/d/a/npc/d_a_npc_doorboy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_doorboy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809AD9A0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809AD9A0-809AD9A8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809AD9A0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809ADD50-809ADD58 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_doorboy/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_doorboy/unknown_translation_unit_ctors.cpp index eb500fd189e..8772dfa48ec 100644 --- a/rel/d/a/npc/d_a_npc_doorboy/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_doorboy/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809AD994[2]; -extern void* const data_809AD994[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_doorboy_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809AD994-809AD99C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809AD994[2] = { + (void*)__sinit_d_a_npc_doorboy_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp b/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp index f8c1d9d5918..4e23538a163 100644 --- a/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp +++ b/rel/d/a/npc/d_a_npc_drainSol/d_a_npc_drainSol.cpp @@ -15,12 +15,6 @@ struct request_of_phase_process_class {}; struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -29,6 +23,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -45,10 +45,10 @@ struct daPy_py_c { /* 8015F424 */ void checkNowWolfEyeUp(); }; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -259,8 +259,6 @@ static void daNpcDrSol_Delete(void*); static void daNpcDrSol_Execute(void*); static void daNpcDrSol_Draw(void*); static bool daNpcDrSol_IsDelete(void*); -extern "C" extern u8 const lit_4282[20]; -extern "C" extern void* g_profile_NPC_DRSOL[12]; extern "C" void __ct__12daNpcDrSol_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -329,19 +327,6 @@ void dComIfGs_wolfeye_effect_check(); void dKy_darkworld_check(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_drainSol/executor.cpp b/rel/d/a/npc/d_a_npc_drainSol/executor.cpp index 0921f9c30c5..a4efe83a2bd 100644 --- a/rel/d/a/npc/d_a_npc_drainSol/executor.cpp +++ b/rel/d/a/npc/d_a_npc_drainSol/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809AF990[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_drainSol/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_drainSol/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 674c5119f2a..b194da17b12 100644 --- a/rel/d/a/npc/d_a_npc_drainSol/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_drainSol/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809AF99C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809AF99C-809AF9A4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809AF99C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809AFC38-809AFC40 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_drainSol/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_drainSol/unknown_translation_unit_ctors.cpp index 697d8edb0e9..f5203aa438d 100644 --- a/rel/d/a/npc/d_a_npc_drainSol/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_drainSol/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809AF990[2]; -extern void* const data_809AF990[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_drainSol_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809AF990-809AF998 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809AF990[2] = { + (void*)__sinit_d_a_npc_drainSol_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp b/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp index bf1c47376d5..acda2f6e57a 100644 --- a/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp +++ b/rel/d/a/npc/d_a_npc_du/d_a_npc_du.cpp @@ -19,10 +19,10 @@ struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -32,11 +32,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -57,12 +57,12 @@ struct daNpc_Du_HIO_c { /* 809B17A0 */ ~daNpc_Du_HIO_c(); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -201,8 +201,6 @@ static bool daNpc_Du_IsDelete(npc_du_class*); static void daNpc_Du_Delete(npc_du_class*); static void useHeapInit(fopAc_ac_c*); static void daNpc_Du_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_DU[12]; extern "C" void __ct__14daNpc_Du_HIO_cFv(); extern "C" static void anm_init__FP12npc_du_classifUcf(); @@ -258,21 +256,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_du/executor.cpp b/rel/d/a/npc/d_a_npc_du/executor.cpp index e1392cbc268..048baa4ca78 100644 --- a/rel/d/a/npc/d_a_npc_du/executor.cpp +++ b/rel/d/a/npc/d_a_npc_du/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809B1834[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_du/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_du/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ff2c7142810..372d4fe6369 100644 --- a/rel/d/a/npc/d_a_npc_du/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_du/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809B1840[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809B1840-809B1848 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809B1840[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809B19E0-809B19E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_du/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_du/unknown_translation_unit_ctors.cpp index ababceeb51a..9bbf234c68a 100644 --- a/rel/d/a/npc/d_a_npc_du/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_du/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809B1834[2]; -extern void* const data_809B1834[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_du_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809B1834-809B183C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809B1834[2] = { + (void*)__sinit_d_a_npc_du_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp b/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp index 9e27141ab1c..a624795ce76 100644 --- a/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp +++ b/rel/d/a/npc/d_a_npc_fairy/d_a_npc_fairy.cpp @@ -36,12 +36,6 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -50,6 +44,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -188,10 +188,6 @@ struct daNpc_Fairy_Param_c { /* 809B9278 */ ~daNpc_Fairy_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 809B2250 */ ~cXyz(); @@ -200,12 +196,16 @@ struct cXyz { struct J3DAnmColor {}; +struct J3DModel {}; + +struct J3DAnmTransformKey {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -328,14 +328,14 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 809B8930 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -507,15 +507,6 @@ static void daNpc_Fairy_Delete(void*); static void daNpc_Fairy_Execute(void*); static void daNpc_Fairy_Draw(void*); static bool daNpc_Fairy_IsDelete(void*); -extern "C" extern u32 const lit_5974; -extern "C" extern u32 const lit_5975; -extern "C" extern u32 const lit_5976; -extern "C" extern u32 const lit_5977; -extern "C" extern u32 const lit_5978; -extern "C" extern u32 const lit_6037; -extern "C" extern u8 const lit_6226[8]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_FAIRY[12]; extern "C" void create__16_Fairy_Feather_cFv(); extern "C" void loadModel__16_Fairy_Feather_cFv(); @@ -709,24 +700,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_fairy/executor.cpp b/rel/d/a/npc/d_a_npc_fairy/executor.cpp index 1339554e375..7049fce1191 100644 --- a/rel/d/a/npc/d_a_npc_fairy/executor.cpp +++ b/rel/d/a/npc/d_a_npc_fairy/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809B92D0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_fairy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_fairy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fd0b0f89432..7985a274a95 100644 --- a/rel/d/a/npc/d_a_npc_fairy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_fairy/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809B92DC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809B92DC-809B92E4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809B92DC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809BA410-809BA418 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_fairy/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_fairy/unknown_translation_unit_ctors.cpp index 1f0c28dbdb7..616ad558747 100644 --- a/rel/d/a/npc/d_a_npc_fairy/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_fairy/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809B92D0[2]; -extern void* const data_809B92D0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_fairy_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809B92D0-809B92D8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809B92D0[2] = { + (void*)__sinit_d_a_npc_fairy_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp b/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp index d4c4747898b..f96f2e358a0 100644 --- a/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp +++ b/rel/d/a/npc/d_a_npc_fairy_seirei/d_a_npc_fairy_seirei.cpp @@ -20,12 +20,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; -struct daNpcT_motionAnmData_c {}; - struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -33,6 +29,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80541898 */ ~daNpcT_MotionSeqMngr_c(); }; +struct daNpcT_evtData_c {}; + +struct daNpcT_motionAnmData_c {}; + struct daNpc_FairySeirei_c { /* 8053FF6C */ ~daNpc_FairySeirei_c(); /* 8054006C */ void create(); @@ -67,8 +67,6 @@ struct daNpc_FairySeirei_Param_c { /* 80541D20 */ ~daNpc_FairySeirei_Param_c(); }; -struct J3DModel {}; - struct cXyz { /* 805412D0 */ ~cXyz(); /* 8054184C */ cXyz(); @@ -76,6 +74,8 @@ struct cXyz { struct J3DJoint {}; +struct J3DModel {}; + struct daNpcT_c { /* 8014852C */ void execute(); /* 80148C70 */ void setEnvTevColor(); @@ -150,10 +150,10 @@ struct csXyz { /* 8054174C */ csXyz(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -291,10 +291,6 @@ static void daNpc_FairySeirei_Delete(void*); static void daNpc_FairySeirei_Execute(void*); static void daNpc_FairySeirei_Draw(void*); static bool daNpc_FairySeirei_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* l_loadResPtrnList[4]; -extern "C" extern void* g_profile_NPC_FAIRY_SEIREI[12]; extern "C" void __dt__19daNpc_FairySeirei_cFv(); extern "C" void create__19daNpc_FairySeirei_cFv(); @@ -395,18 +391,6 @@ void daNpcT_chkTmpBit(u32); void daNpcF_offTmpBit(u32); void cM_rndF(f32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; SECTION_INIT void memset(); extern "C" void stopZelAnime__16mDoExt_McaMorfSOFv(); diff --git a/rel/d/a/npc/d_a_npc_fairy_seirei/executor.cpp b/rel/d/a/npc/d_a_npc_fairy_seirei/executor.cpp index 1b0049cd876..969bedff59a 100644 --- a/rel/d/a/npc/d_a_npc_fairy_seirei/executor.cpp +++ b/rel/d/a/npc/d_a_npc_fairy_seirei/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80541D78[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_fairy_seirei/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_fairy_seirei/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7b43331341b..bb5ef5ddb52 100644 --- a/rel/d/a/npc/d_a_npc_fairy_seirei/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_fairy_seirei/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80541D84[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80541D84-80541D8C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80541D84[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805420E0-805420E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_fairy_seirei/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_fairy_seirei/unknown_translation_unit_ctors.cpp index 0097e7709c3..b3f9fb3dcac 100644 --- a/rel/d/a/npc/d_a_npc_fairy_seirei/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_fairy_seirei/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80541D78[2]; -extern void* const data_80541D78[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_fairy_seirei_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80541D78-80541D80 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80541D78[2] = { + (void*)__sinit_d_a_npc_fairy_seirei_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp b/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp index 020c3a85365..d49993bab3e 100644 --- a/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp +++ b/rel/d/a/npc/d_a_npc_fguard/d_a_npc_fguard.cpp @@ -95,16 +95,16 @@ struct dBgS_AcchCir { /* 809BB31C */ ~dBgS_AcchCir(); }; +struct cXyz { + /* 809BB2E0 */ ~cXyz(); +}; + struct csXyz { /* 809BB0D0 */ ~csXyz(); }; struct dBgS {}; -struct cXyz { - /* 809BB2E0 */ ~cXyz(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -164,7 +164,6 @@ static void daNpcFgd_Delete(void*); static void daNpcFgd_Execute(void*); static void daNpcFgd_Draw(void*); static bool daNpcFgd_IsDelete(void*); -extern "C" extern void* g_profile_NPC_FGUARD[12]; extern "C" static void createHeapCallBack__FP10fopAc_ac_c(); extern "C" void initPosAngle__10daNpcFgd_cFR3Vecs(); @@ -203,17 +202,6 @@ void dKy_darkworld_check(); void cM_rndF(f32); void cLib_addCalc2(f32*, f32, f32, f32); void operator delete(void*); -extern "C" extern u8 const m_cylDat__10daNpcCd2_c[68]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 l_Cd2_HIO[16396]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void setMorf__13mDoExt_morf_cFf(); diff --git a/rel/d/a/npc/d_a_npc_fguard/executor.cpp b/rel/d/a/npc/d_a_npc_fguard/executor.cpp index 968ad05664c..4744572fafd 100644 --- a/rel/d/a/npc/d_a_npc_fguard/executor.cpp +++ b/rel/d/a/npc/d_a_npc_fguard/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_809BB3FC[4]; -extern u8 const data_809BB400[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_fguard/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_fguard/unknown_translation_unit_ctors.cpp index b9a2a33a462..2fcf0de0de1 100644 --- a/rel/d/a/npc/d_a_npc_fguard/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_fguard/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_809BB3FC[4]; -extern u8 const data_809BB3FC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_809BB3FC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809BB3FC-809BB400 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_809BB3FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_fguard/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_fguard/unknown_translation_unit_dtors.cpp index bbbce2d509d..cfc9eb72972 100644 --- a/rel/d/a/npc/d_a_npc_fguard/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_fguard/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_809BB400[4]; -extern u8 const data_809BB400[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_809BB400[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 809BB400-809BB404 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_809BB400[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp b/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp index c0627c39244..ffa5ca243c6 100644 --- a/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp +++ b/rel/d/a/npc/d_a_npc_fish/d_a_npc_fish.cpp @@ -39,9 +39,6 @@ static bool daNpc_Fish_IsDelete(npc_fish_class*); static bool daNpc_Fish_Delete(npc_fish_class*); static void fish_set(fopAc_ac_c*, fish_data_s*); static void daNpc_Fish_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_FISH[12]; extern "C" static bool daNpc_Fish_Draw__FP14npc_fish_class(); extern "C" static bool daNpc_Fish_Execute__FP14npc_fish_class(); @@ -59,11 +56,6 @@ extern "C" extern void* g_profile_NPC_FISH[12]; void fopAcM_create(s16, u32, cXyz const*, int, csXyz const*, cXyz const*, s8); void cM_rndFX(f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(); diff --git a/rel/d/a/npc/d_a_npc_fish/executor.cpp b/rel/d/a/npc/d_a_npc_fish/executor.cpp index ba74fe9ca2b..d0e4b476ced 100644 --- a/rel/d/a/npc/d_a_npc_fish/executor.cpp +++ b/rel/d/a/npc/d_a_npc_fish/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805424B8[4]; -extern u8 const data_805424BC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_fish/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_fish/unknown_translation_unit_ctors.cpp index 08dfe82a345..63b80e8195d 100644 --- a/rel/d/a/npc/d_a_npc_fish/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_fish/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805424B8[4]; -extern u8 const data_805424B8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805424B8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805424B8-805424BC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805424B8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_fish/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_fish/unknown_translation_unit_dtors.cpp index 0e1775dbb8d..80dbbfc4869 100644 --- a/rel/d/a/npc/d_a_npc_fish/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_fish/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805424BC[4]; -extern u8 const data_805424BC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805424BC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805424BC-805424C0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805424BC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp b/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp index 112c30811ef..443fbf683d1 100644 --- a/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp +++ b/rel/d/a/npc/d_a_npc_gnd/d_a_npc_gnd.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -100,10 +100,6 @@ struct daNpc_Gnd_Param_c { /* 809BE434 */ ~daNpc_Gnd_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 809BD6D0 */ ~cXyz(); @@ -112,6 +108,8 @@ struct cXyz { struct J3DAnmColor {}; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -119,6 +117,8 @@ struct dCcD_GObjInf { struct J3DAnmTevRegKey {}; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -359,8 +359,6 @@ static void daNpc_Gnd_Delete(void*); static void daNpc_Gnd_Execute(void*); static void daNpc_Gnd_Draw(void*); static bool daNpc_Gnd_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GND[12]; extern "C" void __dt__11daNpc_Gnd_cFv(); extern "C" void create__11daNpc_Gnd_cFv(); @@ -476,23 +474,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_gnd/executor.cpp b/rel/d/a/npc/d_a_npc_gnd/executor.cpp index 1ecc2846a5f..29ab957d2db 100644 --- a/rel/d/a/npc/d_a_npc_gnd/executor.cpp +++ b/rel/d/a/npc/d_a_npc_gnd/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809BE48C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_gnd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_gnd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 24e17af11aa..f96c10b3882 100644 --- a/rel/d/a/npc/d_a_npc_gnd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_gnd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809BE498[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809BE498-809BE4A0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809BE498[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809BE840-809BE848 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_gnd/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_gnd/unknown_translation_unit_ctors.cpp index ff7d7ae7697..c18c0cbd8f7 100644 --- a/rel/d/a/npc/d_a_npc_gnd/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_gnd/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809BE48C[2]; -extern void* const data_809BE48C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_gnd_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809BE48C-809BE494 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809BE48C[2] = { + (void*)__sinit_d_a_npc_gnd_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp b/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp index d1980599f29..5cc7d1c8b9b 100644 --- a/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp +++ b/rel/d/a/npc/d_a_npc_gra/d_a_npc_gra.cpp @@ -13,12 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 809C9478 */ csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); - /* 809C943C */ ~csXyz(); -}; - struct Vec {}; struct cXyz { @@ -27,6 +21,12 @@ struct cXyz { /* 809C94B8 */ cXyz(); }; +struct csXyz { + /* 809C9478 */ csXyz(); + /* 802673F4 */ csXyz(s16, s16, s16); + /* 809C943C */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -41,16 +41,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -169,13 +169,9 @@ struct daNpcT_ActorMngr_c { /* 80145708 */ void getActorP(); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern {}; - struct J3DAnmTextureSRTKey {}; -struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; struct dCcD_SrcCyl {}; @@ -183,6 +179,10 @@ struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct J3DAnmTexPattern {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -276,12 +276,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -295,8 +295,6 @@ struct dPa_control_c { cXyz const*); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -304,6 +302,8 @@ struct dBgS_AcchCir { /* 809C98F8 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -446,66 +446,6 @@ static bool daNpc_grA_IsDelete(void*); static void cLib_calcTimer__template0(s16*); static void cLib_calcTimer__template1(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u8 const lit_5801[96]; -extern "C" extern u8 const lit_5914[116]; -extern "C" extern u32 const lit_7374; -extern "C" extern u32 const lit_7376; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_5976[3]; -extern "C" extern void* lit_5978[3]; -extern "C" extern void* lit_5980[3]; -extern "C" extern void* lit_5984[3]; -extern "C" extern void* lit_5986[3]; -extern "C" extern void* lit_5988[3]; -extern "C" extern void* lit_5990[3]; -extern "C" extern void* lit_5992[3]; -extern "C" extern void* lit_5996[3]; -extern "C" extern void* lit_5998[3]; -extern "C" extern void* lit_6000[3]; -extern "C" extern void* lit_6002[3]; -extern "C" extern void* lit_6006[3]; -extern "C" extern void* lit_6008[3]; -extern "C" extern void* g_profile_NPC_GRA[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809CB364[4]; -extern "C" extern u8 data_809CB368[4]; -extern "C" extern u8 data_809CB36C[4]; -extern "C" extern u8 data_809CB370[4]; -extern "C" extern u8 data_809CB374[4]; -extern "C" extern u8 data_809CB378[4]; -extern "C" extern u8 data_809CB37C[4]; -extern "C" extern u8 data_809CB380[4]; -extern "C" extern u8 data_809CB384[4]; -extern "C" extern u8 data_809CB388[4]; -extern "C" extern u8 data_809CB38C[4]; -extern "C" extern u8 data_809CB390[4]; -extern "C" extern u8 data_809CB394[4]; -extern "C" extern u8 data_809CB398[4]; -extern "C" extern u8 data_809CB39C[4]; -extern "C" extern u8 data_809CB3A0[4]; -extern "C" extern u8 data_809CB3A4[4]; -extern "C" extern u8 data_809CB3A8[4]; -extern "C" extern u8 data_809CB3AC[4]; -extern "C" extern u8 data_809CB3B0[4]; -extern "C" extern u8 data_809CB3B4[4]; -extern "C" extern u8 data_809CB3B8[4]; -extern "C" extern u8 data_809CB3BC[4]; -extern "C" extern u8 data_809CB3C0[4]; -extern "C" extern u8 data_809CB3C4[4]; extern "C" void __ct__11daNpc_grA_cFv(); extern "C" void __dt__Q211daNpc_grA_c21daNpc_GrA_prtclMngr_cFv(); @@ -730,26 +670,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_gra/executor.cpp b/rel/d/a/npc/d_a_npc_gra/executor.cpp index b2d0cdc0374..3f07158b28f 100644 --- a/rel/d/a/npc/d_a_npc_gra/executor.cpp +++ b/rel/d/a/npc/d_a_npc_gra/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809C9D84[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_gra/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_gra/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8355c2e7af3..cfaf39efaa8 100644 --- a/rel/d/a/npc/d_a_npc_gra/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_gra/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809C9D90[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809C9D90-809C9D98 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809C9D90[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809CB2F0-809CB2F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_gra/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_gra/unknown_translation_unit_ctors.cpp index 239d9eb91be..4c3fda50020 100644 --- a/rel/d/a/npc/d_a_npc_gra/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_gra/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809C9D84[2]; -extern void* const data_809C9D84[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_gra_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809C9D84-809C9D8C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809C9D84[2] = { + (void*)__sinit_d_a_npc_gra_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp b/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp index 67c02e367c4..a7e017de2c5 100644 --- a/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp +++ b/rel/d/a/npc/d_a_npc_grc/d_a_npc_grc.cpp @@ -21,10 +21,6 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -33,6 +29,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -99,18 +99,9 @@ struct daNpc_grC_Param_c { /* 809CF4B0 */ ~daNpc_grC_Param_c(); }; -struct _GXColorS10 {}; - -struct J3DAnmTexPattern {}; - struct J3DAnmTextureSRTKey {}; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; +struct J3DAnmTexPattern {}; struct dCcD_SrcCyl {}; @@ -118,6 +109,15 @@ struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -156,17 +156,17 @@ struct daNpcF_c { /* 809CF3F8 */ void setCollisions(); }; -struct csXyz { - /* 809CEDB8 */ ~csXyz(); - /* 809CEDF4 */ csXyz(); -}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 809CEDF8 */ ~cXyz(); /* 809CEE34 */ cXyz(); }; +struct csXyz { + /* 809CEDB8 */ ~csXyz(); + /* 809CEDF4 */ csXyz(); +}; + struct daNpcF_Lookat_c { /* 80151038 */ void initialize(); /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, @@ -190,8 +190,6 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -199,6 +197,8 @@ struct dBgS_AcchCir { /* 809CF274 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -310,51 +310,6 @@ static void daNpc_grC_Delete(void*); static void daNpc_grC_Execute(void*); static void daNpc_grC_Draw(void*); static bool daNpc_grC_IsDelete(void*); -extern "C" extern u8 const lit_5069[60]; -extern "C" extern u8 const lit_5114[36]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GRC[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809CFBD4[4]; -extern "C" extern u8 data_809CFBD8[4]; -extern "C" extern u8 data_809CFBDC[4]; -extern "C" extern u8 data_809CFBE0[4]; -extern "C" extern u8 data_809CFBE4[4]; -extern "C" extern u8 data_809CFBE8[4]; -extern "C" extern u8 data_809CFBEC[4]; -extern "C" extern u8 data_809CFBF0[4]; -extern "C" extern u8 data_809CFBF4[4]; -extern "C" extern u8 data_809CFBF8[4]; -extern "C" extern u8 data_809CFBFC[4]; -extern "C" extern u8 data_809CFC00[4]; -extern "C" extern u8 data_809CFC04[4]; -extern "C" extern u8 data_809CFC08[4]; -extern "C" extern u8 data_809CFC0C[4]; -extern "C" extern u8 data_809CFC10[4]; -extern "C" extern u8 data_809CFC14[4]; -extern "C" extern u8 data_809CFC18[4]; -extern "C" extern u8 data_809CFC1C[4]; -extern "C" extern u8 data_809CFC20[4]; -extern "C" extern u8 data_809CFC24[4]; -extern "C" extern u8 data_809CFC28[4]; -extern "C" extern u8 data_809CFC2C[4]; -extern "C" extern u8 data_809CFC30[4]; -extern "C" extern u8 data_809CFC34[4]; extern "C" void __ct__11daNpc_grC_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -496,22 +451,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_grc/executor.cpp b/rel/d/a/npc/d_a_npc_grc/executor.cpp index 40a9d29ed47..1830accea13 100644 --- a/rel/d/a/npc/d_a_npc_grc/executor.cpp +++ b/rel/d/a/npc/d_a_npc_grc/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809CF508[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_grc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_grc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a9b8f0ca5d0..7919af3884c 100644 --- a/rel/d/a/npc/d_a_npc_grc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_grc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809CF514[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809CF514-809CF51C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809CF514[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809CFB60-809CFB68 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_grc/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_grc/unknown_translation_unit_ctors.cpp index 7b688876f13..4281d693bf7 100644 --- a/rel/d/a/npc/d_a_npc_grc/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_grc/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809CF508[2]; -extern void* const data_809CF508[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_grc_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809CF508-809CF510 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809CF508[2] = { + (void*)__sinit_d_a_npc_grc_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp b/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp index 481f85fdeaf..fe56f0be338 100644 --- a/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp +++ b/rel/d/a/npc/d_a_npc_grd/d_a_npc_grd.cpp @@ -33,16 +33,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -105,27 +105,27 @@ struct daNpc_Grd_Param_c { /* 809D3998 */ ~daNpc_Grd_Param_c(); }; -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -340,50 +340,6 @@ static void daNpc_Grd_Execute(void*); static void daNpc_Grd_Draw(void*); static bool daNpc_Grd_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const lit_5071[24]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GRD[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809D3F1C[4]; -extern "C" extern u8 data_809D3F20[4]; -extern "C" extern u8 data_809D3F24[4]; -extern "C" extern u8 data_809D3F28[4]; -extern "C" extern u8 data_809D3F2C[4]; -extern "C" extern u8 data_809D3F30[4]; -extern "C" extern u8 data_809D3F34[4]; -extern "C" extern u8 data_809D3F38[4]; -extern "C" extern u8 data_809D3F3C[4]; -extern "C" extern u8 data_809D3F40[4]; -extern "C" extern u8 data_809D3F44[4]; -extern "C" extern u8 data_809D3F48[4]; -extern "C" extern u8 data_809D3F4C[4]; -extern "C" extern u8 data_809D3F50[4]; -extern "C" extern u8 data_809D3F54[4]; -extern "C" extern u8 data_809D3F58[4]; -extern "C" extern u8 data_809D3F5C[4]; -extern "C" extern u8 data_809D3F60[4]; -extern "C" extern u8 data_809D3F64[4]; -extern "C" extern u8 data_809D3F68[4]; -extern "C" extern u8 data_809D3F6C[4]; -extern "C" extern u8 data_809D3F70[4]; -extern "C" extern u8 data_809D3F74[4]; -extern "C" extern u8 data_809D3F78[4]; -extern "C" extern u8 data_809D3F7C[4]; extern "C" void __ct__11daNpc_Grd_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -533,24 +489,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_grd/executor.cpp b/rel/d/a/npc/d_a_npc_grd/executor.cpp index 69850c7a820..ba49558c7f4 100644 --- a/rel/d/a/npc/d_a_npc_grd/executor.cpp +++ b/rel/d/a/npc/d_a_npc_grd/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809D39F0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_grd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_grd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5cab7c4928a..84c33a1f833 100644 --- a/rel/d/a/npc/d_a_npc_grd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_grd/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809D39FC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809D39FC-809D3A04 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809D39FC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809D3EA8-809D3EB0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_grd/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_grd/unknown_translation_unit_ctors.cpp index b28f1b34911..6ec674955bc 100644 --- a/rel/d/a/npc/d_a_npc_grd/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_grd/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809D39F0[2]; -extern void* const data_809D39F0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_grd_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809D39F0-809D39F8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809D39F0[2] = { + (void*)__sinit_d_a_npc_grd_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp b/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp index 402784792f1..1103e16c776 100644 --- a/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp +++ b/rel/d/a/npc/d_a_npc_grm/d_a_npc_grm.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -26,6 +20,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -102,21 +102,21 @@ struct daNpc_grM_Param_c { /* 809D5FD8 */ ~daNpc_grM_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 809D5F5C */ ~cXyz(); /* 809D66A0 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -354,8 +354,6 @@ static void daNpc_grM_Execute(void*); static void daNpc_grM_Draw(void*); static bool daNpc_grM_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GRM[12]; extern "C" void __dt__11daNpc_grM_cFv(); extern "C" void create__11daNpc_grM_cFv(); @@ -469,21 +467,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_grm/executor.cpp b/rel/d/a/npc/d_a_npc_grm/executor.cpp index 987cceedb02..712c8dc596d 100644 --- a/rel/d/a/npc/d_a_npc_grm/executor.cpp +++ b/rel/d/a/npc/d_a_npc_grm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809D6D5C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_grm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_grm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7015bc6421b..c8e71757bca 100644 --- a/rel/d/a/npc/d_a_npc_grm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_grm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809D6D68[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809D6D68-809D6D70 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809D6D68[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809D72F0-809D72F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_grm/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_grm/unknown_translation_unit_ctors.cpp index d05b499f403..8b34cd544b3 100644 --- a/rel/d/a/npc/d_a_npc_grm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_grm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809D6D5C[2]; -extern void* const data_809D6D5C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_grm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809D6D5C-809D6D64 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809D6D5C[2] = { + (void*)__sinit_d_a_npc_grm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp b/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp index 2704a4d8d55..c2645332196 100644 --- a/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp +++ b/rel/d/a/npc/d_a_npc_grmc/d_a_npc_grmc.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -26,6 +20,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -100,21 +100,21 @@ struct daNpc_grMC_Param_c { /* 809D9014 */ ~daNpc_grMC_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 809D8F98 */ ~cXyz(); /* 809D96DC */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -341,8 +341,6 @@ static void daNpc_grMC_Delete(void*); static void daNpc_grMC_Execute(void*); static void daNpc_grMC_Draw(void*); static bool daNpc_grMC_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GRMC[12]; extern "C" void __dt__12daNpc_grMC_cFv(); extern "C" void create__12daNpc_grMC_cFv(); @@ -453,21 +451,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_grmc/executor.cpp b/rel/d/a/npc/d_a_npc_grmc/executor.cpp index b799d1a534b..3ca6e97bc03 100644 --- a/rel/d/a/npc/d_a_npc_grmc/executor.cpp +++ b/rel/d/a/npc/d_a_npc_grmc/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809D9D5C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_grmc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_grmc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 52561a4c814..1ca6b83e7ad 100644 --- a/rel/d/a/npc/d_a_npc_grmc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_grmc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809D9D68[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809D9D68-809D9D70 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809D9D68[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809DA458-809DA460 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_grmc/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_grmc/unknown_translation_unit_ctors.cpp index 2ff6dfb2a6e..72a525f87ab 100644 --- a/rel/d/a/npc/d_a_npc_grmc/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_grmc/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809D9D5C[2]; -extern void* const data_809D9D5C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_grmc_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809D9D5C-809D9D64 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809D9D5C[2] = { + (void*)__sinit_d_a_npc_grmc_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp b/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp index ec218cf47c4..355ee584f43 100644 --- a/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp +++ b/rel/d/a/npc/d_a_npc_gro/d_a_npc_gro.cpp @@ -34,16 +34,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -113,27 +113,27 @@ struct daNpc_Maro_c { /* 80562CA4 */ void choccai(void*); }; -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -361,52 +361,6 @@ static void daNpc_grO_Delete(void*); static void daNpc_grO_Execute(void*); static void daNpc_grO_Draw(void*); static bool daNpc_grO_IsDelete(void*); -extern "C" extern u8 const lit_5194[52]; -extern "C" extern u8 const lit_5244[36]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_4083[3]; -extern "C" extern void* g_profile_NPC_GRO[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809DF76C[4]; -extern "C" extern u8 data_809DF770[4]; -extern "C" extern u8 data_809DF774[4]; -extern "C" extern u8 data_809DF778[4]; -extern "C" extern u8 data_809DF77C[4]; -extern "C" extern u8 data_809DF780[4]; -extern "C" extern u8 data_809DF784[4]; -extern "C" extern u8 data_809DF788[4]; -extern "C" extern u8 data_809DF78C[4]; -extern "C" extern u8 data_809DF790[4]; -extern "C" extern u8 data_809DF794[4]; -extern "C" extern u8 data_809DF798[4]; -extern "C" extern u8 data_809DF79C[4]; -extern "C" extern u8 data_809DF7A0[4]; -extern "C" extern u8 data_809DF7A4[4]; -extern "C" extern u8 data_809DF7A8[4]; -extern "C" extern u8 data_809DF7AC[4]; -extern "C" extern u8 data_809DF7B0[4]; -extern "C" extern u8 data_809DF7B4[4]; -extern "C" extern u8 data_809DF7B8[4]; -extern "C" extern u8 data_809DF7BC[4]; -extern "C" extern u8 data_809DF7C0[4]; -extern "C" extern u8 data_809DF7C4[4]; -extern "C" extern u8 data_809DF7C8[4]; -extern "C" extern u8 data_809DF7CC[4]; extern "C" void __ct__11daNpc_grO_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -566,25 +520,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_gro/executor.cpp b/rel/d/a/npc/d_a_npc_gro/executor.cpp index 8aa4f445c61..e0c2905a802 100644 --- a/rel/d/a/npc/d_a_npc_gro/executor.cpp +++ b/rel/d/a/npc/d_a_npc_gro/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809DEF68[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_gro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_gro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 49e31de11ef..715a8661b27 100644 --- a/rel/d/a/npc/d_a_npc_gro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_gro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809DEF74[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809DEF74-809DEF7C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809DEF74[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809DF6F8-809DF700 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_gro/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_gro/unknown_translation_unit_ctors.cpp index 96dee08a1d5..c16d510e9db 100644 --- a/rel/d/a/npc/d_a_npc_gro/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_gro/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809DEF68[2]; -extern void* const data_809DEF68[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_gro_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809DEF68-809DEF70 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809DEF68[2] = { + (void*)__sinit_d_a_npc_gro_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp b/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp index 69a907f01a8..7fc80426f29 100644 --- a/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp +++ b/rel/d/a/npc/d_a_npc_grr/d_a_npc_grr.cpp @@ -33,16 +33,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -105,27 +105,27 @@ struct daNpc_grR_Param_c { /* 809E386C */ ~daNpc_grR_Param_c(); }; -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -335,51 +335,6 @@ static void daNpc_grR_Delete(void*); static void daNpc_grR_Execute(void*); static void daNpc_grR_Draw(void*); static bool daNpc_grR_IsDelete(void*); -extern "C" extern u8 const lit_5062[32]; -extern "C" extern u8 const lit_5108[44]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GRR[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809E3F64[4]; -extern "C" extern u8 data_809E3F68[4]; -extern "C" extern u8 data_809E3F6C[4]; -extern "C" extern u8 data_809E3F70[4]; -extern "C" extern u8 data_809E3F74[4]; -extern "C" extern u8 data_809E3F78[4]; -extern "C" extern u8 data_809E3F7C[4]; -extern "C" extern u8 data_809E3F80[4]; -extern "C" extern u8 data_809E3F84[4]; -extern "C" extern u8 data_809E3F88[4]; -extern "C" extern u8 data_809E3F8C[4]; -extern "C" extern u8 data_809E3F90[4]; -extern "C" extern u8 data_809E3F94[4]; -extern "C" extern u8 data_809E3F98[4]; -extern "C" extern u8 data_809E3F9C[4]; -extern "C" extern u8 data_809E3FA0[4]; -extern "C" extern u8 data_809E3FA4[4]; -extern "C" extern u8 data_809E3FA8[4]; -extern "C" extern u8 data_809E3FAC[4]; -extern "C" extern u8 data_809E3FB0[4]; -extern "C" extern u8 data_809E3FB4[4]; -extern "C" extern u8 data_809E3FB8[4]; -extern "C" extern u8 data_809E3FBC[4]; -extern "C" extern u8 data_809E3FC0[4]; -extern "C" extern u8 data_809E3FC4[4]; extern "C" void __ct__11daNpc_grR_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -529,24 +484,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_grr/executor.cpp b/rel/d/a/npc/d_a_npc_grr/executor.cpp index 12df4da8a4d..37be14fed40 100644 --- a/rel/d/a/npc/d_a_npc_grr/executor.cpp +++ b/rel/d/a/npc/d_a_npc_grr/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809E38C4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_grr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_grr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fa6f8c149d2..089616e97bc 100644 --- a/rel/d/a/npc/d_a_npc_grr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_grr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809E38D0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809E38D0-809E38D8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809E38D0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809E3EF0-809E3EF8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_grr/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_grr/unknown_translation_unit_ctors.cpp index f452bfbcbbf..84165ce9711 100644 --- a/rel/d/a/npc/d_a_npc_grr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_grr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809E38C4[2]; -extern void* const data_809E38C4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_grr_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809E38C4-809E38CC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809E38C4[2] = { + (void*)__sinit_d_a_npc_grr_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp b/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp index 2dceb868329..e433aa4d158 100644 --- a/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp +++ b/rel/d/a/npc/d_a_npc_grs/d_a_npc_grs.cpp @@ -33,16 +33,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -106,27 +106,27 @@ struct daNpc_grS_Param_c { /* 809E7D60 */ ~daNpc_grS_Param_c(); }; -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -373,49 +373,6 @@ static void daNpc_grS_Delete(void*); static void daNpc_grS_Execute(void*); static void daNpc_grS_Draw(void*); static bool daNpc_grS_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GRS[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809E82A4[4]; -extern "C" extern u8 data_809E82A8[4]; -extern "C" extern u8 data_809E82AC[4]; -extern "C" extern u8 data_809E82B0[4]; -extern "C" extern u8 data_809E82B4[4]; -extern "C" extern u8 data_809E82B8[4]; -extern "C" extern u8 data_809E82BC[4]; -extern "C" extern u8 data_809E82C0[4]; -extern "C" extern u8 data_809E82C4[4]; -extern "C" extern u8 data_809E82C8[4]; -extern "C" extern u8 data_809E82CC[4]; -extern "C" extern u8 data_809E82D0[4]; -extern "C" extern u8 data_809E82D4[4]; -extern "C" extern u8 data_809E82D8[4]; -extern "C" extern u8 data_809E82DC[4]; -extern "C" extern u8 data_809E82E0[4]; -extern "C" extern u8 data_809E82E4[4]; -extern "C" extern u8 data_809E82E8[4]; -extern "C" extern u8 data_809E82EC[4]; -extern "C" extern u8 data_809E82F0[4]; -extern "C" extern u8 data_809E82F4[4]; -extern "C" extern u8 data_809E82F8[4]; -extern "C" extern u8 data_809E82FC[4]; -extern "C" extern u8 data_809E8300[4]; -extern "C" extern u8 data_809E8304[4]; extern "C" void __ct__11daNpc_grS_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -567,25 +524,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_grs/executor.cpp b/rel/d/a/npc/d_a_npc_grs/executor.cpp index 5e4bb7cfa34..afcb9a634fc 100644 --- a/rel/d/a/npc/d_a_npc_grs/executor.cpp +++ b/rel/d/a/npc/d_a_npc_grs/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809E7DB8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_grs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_grs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c92e8a17a11..f3734b4e564 100644 --- a/rel/d/a/npc/d_a_npc_grs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_grs/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809E7DC4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809E7DC4-809E7DCC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809E7DC4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809E8230-809E8238 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_grs/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_grs/unknown_translation_unit_ctors.cpp index d48d62309a1..b3a9bcef6c9 100644 --- a/rel/d/a/npc/d_a_npc_grs/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_grs/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809E7DB8[2]; -extern void* const data_809E7DB8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_grs_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809E7DB8-809E7DC0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809E7DB8[2] = { + (void*)__sinit_d_a_npc_grs_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp b/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp index 8952112a4ca..e6832b021b0 100644 --- a/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp +++ b/rel/d/a/npc/d_a_npc_grz/d_a_npc_grz.cpp @@ -29,12 +29,12 @@ struct mDoMtx_stack_c { struct J3DAnmTextureSRTKey {}; +struct J3DAnmTevRegKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTevRegKey {}; - struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -61,16 +61,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -155,19 +155,19 @@ struct daNpc_Grz_Param_c { /* 809EF188 */ ~daNpc_Grz_Param_c(); }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -272,12 +272,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -291,8 +291,6 @@ struct dPa_control_c { cXyz const*); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -300,6 +298,8 @@ struct dBgS_AcchCir { /* 809EEE94 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -464,50 +464,6 @@ static void daNpc_Grz_Execute(void*); static void daNpc_Grz_Draw(void*); static bool daNpc_Grz_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const lit_5332[44]; -extern "C" extern u8 const lit_5394[60]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GRZ[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809EFC74[4]; -extern "C" extern u8 data_809EFC78[4]; -extern "C" extern u8 data_809EFC7C[4]; -extern "C" extern u8 data_809EFC80[4]; -extern "C" extern u8 data_809EFC84[4]; -extern "C" extern u8 data_809EFC88[4]; -extern "C" extern u8 data_809EFC8C[4]; -extern "C" extern u8 data_809EFC90[4]; -extern "C" extern u8 data_809EFC94[4]; -extern "C" extern u8 data_809EFC98[4]; -extern "C" extern u8 data_809EFC9C[4]; -extern "C" extern u8 data_809EFCA0[4]; -extern "C" extern u8 data_809EFCA4[4]; -extern "C" extern u8 data_809EFCA8[4]; -extern "C" extern u8 data_809EFCAC[4]; -extern "C" extern u8 data_809EFCB0[4]; -extern "C" extern u8 data_809EFCB4[4]; -extern "C" extern u8 data_809EFCB8[4]; -extern "C" extern u8 data_809EFCBC[4]; -extern "C" extern u8 data_809EFCC0[4]; -extern "C" extern u8 data_809EFCC4[4]; -extern "C" extern u8 data_809EFCC8[4]; -extern "C" extern u8 data_809EFCCC[4]; -extern "C" extern u8 data_809EFCD0[4]; -extern "C" extern u8 data_809EFCD4[4]; extern "C" void __ct__11daNpc_Grz_cFv(); extern "C" void __dt__Q211daNpc_Grz_c21daNpc_GrZ_prtclMngr_cFv(); @@ -681,31 +637,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern u8 mCcDSph__8daNpcF_c[64]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_grz/executor.cpp b/rel/d/a/npc/d_a_npc_grz/executor.cpp index 08887e09a6c..12a25696c82 100644 --- a/rel/d/a/npc/d_a_npc_grz/executor.cpp +++ b/rel/d/a/npc/d_a_npc_grz/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809EF1E0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_grz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_grz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ec40a633855..8c95b7bb25b 100644 --- a/rel/d/a/npc/d_a_npc_grz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_grz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809EF1EC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809EF1EC-809EF1F4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809EF1EC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809EFC00-809EFC08 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_grz/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_grz/unknown_translation_unit_ctors.cpp index 387d99843b1..2a4a6af5e96 100644 --- a/rel/d/a/npc/d_a_npc_grz/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_grz/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809EF1E0[2]; -extern void* const data_809EF1E0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_grz_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809EF1E0-809EF1E8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809EF1E0[2] = { + (void*)__sinit_d_a_npc_grz_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp b/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp index e33cb8f02a4..8ed7011084f 100644 --- a/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp +++ b/rel/d/a/npc/d_a_npc_guard/d_a_npc_guard.cpp @@ -102,15 +102,15 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct cXyz { + /* 809F0148 */ ~cXyz(); +}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); /* 809F1D6C */ ~csXyz(); }; -struct cXyz { - /* 809F0148 */ ~cXyz(); -}; - struct dNpcLib_lookat_c { /* 80251314 */ dNpcLib_lookat_c(); /* 8025140C */ void init(J3DModel*, int*, csXyz*, csXyz*); @@ -246,10 +246,6 @@ static bool daNpcGuard_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); static void cLib_getRndValue__template1(int, int); -extern "C" extern u8 const lit_4351[64]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_GUARD[12]; extern "C" static void createHeapCallBack__FP10fopAc_ac_c(); extern "C" void setAction__12daNpcGuard_cFQ212daNpcGuard_c6Mode_e(); @@ -333,23 +329,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern u8 const m_cylDat__10daNpcCd2_c[68]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 l_Cd2_HIO[16396]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/npc/d_a_npc_guard/executor.cpp b/rel/d/a/npc/d_a_npc_guard/executor.cpp index b04e033c9a0..71381bf36c1 100644 --- a/rel/d/a/npc/d_a_npc_guard/executor.cpp +++ b/rel/d/a/npc/d_a_npc_guard/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809F2C44[2]; -extern u8 const data_809F2C4C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_guard/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_guard/unknown_translation_unit_ctors.cpp index cb36daf393a..85b0704a4de 100644 --- a/rel/d/a/npc/d_a_npc_guard/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_guard/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809F2C44[2]; -extern void* const data_809F2C44[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_guard_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809F2C44-809F2C4C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809F2C44[2] = { + (void*)__sinit_d_a_npc_guard_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_guard/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_guard/unknown_translation_unit_dtors.cpp index 8505a3ee186..f2d116c5ad4 100644 --- a/rel/d/a/npc/d_a_npc_guard/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_guard/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_809F2C4C[4]; -extern u8 const data_809F2C4C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_809F2C4C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 809F2C4C-809F2C50 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_809F2C4C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp b/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp index 8ae3f37e0dd..0050d394cc3 100644 --- a/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp +++ b/rel/d/a/npc/d_a_npc_gwolf/d_a_npc_gwolf.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 809F7D04 */ ~csXyz(); - /* 809F7D40 */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -26,6 +21,11 @@ struct cXyz { /* 809F7D80 */ cXyz(); }; +struct csXyz { + /* 809F7D04 */ ~csXyz(); + /* 809F7D40 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -34,12 +34,12 @@ struct mDoMtx_stack_c { struct J3DAnmTextureSRTKey {}; +struct J3DAnmTevRegKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTevRegKey {}; - struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -66,16 +66,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -155,19 +155,19 @@ struct daNpc_GWolf_Param_c { /* 809F8488 */ ~daNpc_GWolf_Param_c(); }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -404,55 +404,6 @@ static void daNpc_GWolf_Execute(void*); static void daNpc_GWolf_Draw(void*); static bool daNpc_GWolf_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const lit_5176[36]; -extern "C" extern u32 const lit_5638; -extern "C" extern u32 const lit_5640; -extern "C" extern u32 const lit_5814; -extern "C" extern u32 const lit_5815; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_brkGetParamList[8]; -extern "C" extern void* g_profile_NPC_GWOLF[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_809F8F34[4]; -extern "C" extern u8 data_809F8F38[4]; -extern "C" extern u8 data_809F8F3C[4]; -extern "C" extern u8 data_809F8F40[4]; -extern "C" extern u8 data_809F8F44[4]; -extern "C" extern u8 data_809F8F48[4]; -extern "C" extern u8 data_809F8F4C[4]; -extern "C" extern u8 data_809F8F50[4]; -extern "C" extern u8 data_809F8F54[4]; -extern "C" extern u8 data_809F8F58[4]; -extern "C" extern u8 data_809F8F5C[4]; -extern "C" extern u8 data_809F8F60[4]; -extern "C" extern u8 data_809F8F64[4]; -extern "C" extern u8 data_809F8F68[4]; -extern "C" extern u8 data_809F8F6C[4]; -extern "C" extern u8 data_809F8F70[4]; -extern "C" extern u8 data_809F8F74[4]; -extern "C" extern u8 data_809F8F78[4]; -extern "C" extern u8 data_809F8F7C[4]; -extern "C" extern u8 data_809F8F80[4]; -extern "C" extern u8 data_809F8F84[4]; -extern "C" extern u8 data_809F8F88[4]; -extern "C" extern u8 data_809F8F8C[4]; -extern "C" extern u8 data_809F8F90[4]; -extern "C" extern u8 data_809F8F94[4]; extern "C" void __ct__13daNpc_GWolf_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -625,29 +576,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_gwolf/executor.cpp b/rel/d/a/npc/d_a_npc_gwolf/executor.cpp index b26a207d860..196af0b6d60 100644 --- a/rel/d/a/npc/d_a_npc_gwolf/executor.cpp +++ b/rel/d/a/npc/d_a_npc_gwolf/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_809F84E0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_gwolf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_gwolf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 648bb685f8a..041b5130f21 100644 --- a/rel/d/a/npc/d_a_npc_gwolf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_gwolf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_809F84EC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 809F84EC-809F84F4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_809F84EC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 809F8EC0-809F8EC8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_gwolf/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_gwolf/unknown_translation_unit_ctors.cpp index 0294c15b9a6..2005efa534b 100644 --- a/rel/d/a/npc/d_a_npc_gwolf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_gwolf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_809F84E0[2]; -extern void* const data_809F84E0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_gwolf_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 809F84E0-809F84E8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_809F84E0[2] = { + (void*)__sinit_d_a_npc_gwolf_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp b/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp index 9bd55f882d7..280bafb1dfd 100644 --- a/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp +++ b/rel/d/a/npc/d_a_npc_hanjo/d_a_npc_hanjo.cpp @@ -11,11 +11,6 @@ // Types: // -struct csXyz { - /* 809FF21C */ ~csXyz(); - /* 809FF7B8 */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -25,6 +20,11 @@ struct cXyz { /* 809FF8B8 */ cXyz(); }; +struct csXyz { + /* 809FF21C */ ~csXyz(); + /* 809FF7B8 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -34,18 +34,18 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -65,6 +65,8 @@ struct daTag_EvtArea_c { struct daNpcT_faceMotionAnmData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -73,8 +75,6 @@ struct daNpcT_MotionSeqMngr_c { /* 809FF8BC */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - struct J3DJoint {}; struct daNpcT_evtData_c {}; @@ -153,8 +153,6 @@ struct daNpc_HanjoStone_c { struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -163,6 +161,8 @@ struct dCcD_GObjInf { /* 800846F0 */ void GetCoHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -289,14 +289,14 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 809FF904 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -484,48 +484,6 @@ static void daNpc_Hanjo_Draw(void*); static bool daNpc_Hanjo_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_HANJO[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80A012F4[4]; -extern "C" extern u8 data_80A012F8[4]; -extern "C" extern u8 data_80A012FC[4]; -extern "C" extern u8 data_80A01300[4]; -extern "C" extern u8 data_80A01304[4]; -extern "C" extern u8 data_80A01308[4]; -extern "C" extern u8 data_80A0130C[4]; -extern "C" extern u8 data_80A01310[4]; -extern "C" extern u8 data_80A01314[4]; -extern "C" extern u8 data_80A01318[4]; -extern "C" extern u8 data_80A0131C[4]; -extern "C" extern u8 data_80A01320[4]; -extern "C" extern u8 data_80A01324[4]; -extern "C" extern u8 data_80A01328[4]; -extern "C" extern u8 data_80A0132C[4]; -extern "C" extern u8 data_80A01330[4]; -extern "C" extern u8 data_80A01334[4]; -extern "C" extern u8 data_80A01338[4]; -extern "C" extern u8 data_80A0133C[4]; -extern "C" extern u8 data_80A01340[4]; -extern "C" extern u8 data_80A01344[4]; -extern "C" extern u8 data_80A01348[4]; -extern "C" extern u8 data_80A0134C[4]; -extern "C" extern u8 data_80A01350[4]; -extern "C" extern u8 data_80A01354[4]; extern "C" void __dt__13daNpc_Hanjo_cFv(); extern "C" void create__13daNpc_Hanjo_cFv(); @@ -724,29 +682,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); diff --git a/rel/d/a/npc/d_a_npc_hanjo/executor.cpp b/rel/d/a/npc/d_a_npc_hanjo/executor.cpp index 1b4e579e88d..508780ca7d0 100644 --- a/rel/d/a/npc/d_a_npc_hanjo/executor.cpp +++ b/rel/d/a/npc/d_a_npc_hanjo/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A005EC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_hanjo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_hanjo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e1d977150d1..30e8d913836 100644 --- a/rel/d/a/npc/d_a_npc_hanjo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_hanjo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A005F8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A005F8-80A00600 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A005F8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A01280-80A01288 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_hanjo/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_hanjo/unknown_translation_unit_ctors.cpp index e024f226ded..63e9ceaf04f 100644 --- a/rel/d/a/npc/d_a_npc_hanjo/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_hanjo/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A005EC[2]; -extern void* const data_80A005EC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_hanjo_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A005EC-80A005F4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A005EC[2] = { + (void*)__sinit_d_a_npc_hanjo_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp index 3cd6b4a49ff..92cae3bbf9b 100644 --- a/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp +++ b/rel/d/a/npc/d_a_npc_henna/d_a_npc_henna.cpp @@ -31,10 +31,10 @@ struct mDoGph_gInf_c { /* 8054A4CC */ void fadeIn(f32, _GXColor&); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -263,104 +263,6 @@ static void dComIfGp_getPlayer(int); static void dMsgObject_getSelectCursorPos(); static void fopAcM_GetRoomNo(fopAc_ac_c const*); static void dComIfGs_onEventBit(u16); -extern "C" extern u32 const lit_4114; -extern "C" extern u32 const lit_4191; -extern "C" extern u32 const lit_4192; -extern "C" extern u32 const lit_4193; -extern "C" extern u32 const lit_4432; -extern "C" extern u32 const lit_4434; -extern "C" extern u32 const lit_4435; -extern "C" extern u32 const lit_4436; -extern "C" extern u32 const lit_4744; -extern "C" extern u32 const lit_4745; -extern "C" extern u32 const lit_4746; -extern "C" extern u32 const lit_4748; -extern "C" extern u32 const lit_4752; -extern "C" extern u8 const lit_5533[32]; -extern "C" extern u32 const lit_5678; -extern "C" extern u32 const lit_5772; -extern "C" extern u32 const lit_5774; -extern "C" extern u32 const lit_5775; -extern "C" extern u32 const lit_5777; -extern "C" extern u32 const lit_5778; -extern "C" extern u32 const lit_5779; -extern "C" extern u32 const lit_5780; -extern "C" extern u32 const lit_5782; -extern "C" extern u32 const lit_5783; -extern "C" extern u32 const lit_5784; -extern "C" extern u32 const lit_5786; -extern "C" extern u32 const lit_5787; -extern "C" extern u32 const lit_5788; -extern "C" extern u32 const lit_5790; -extern "C" extern u32 const lit_5792; -extern "C" extern u32 const lit_5793; -extern "C" extern u32 const lit_5794; -extern "C" extern u32 const lit_5795; -extern "C" extern u32 const lit_5797; -extern "C" extern u32 const lit_5798; -extern "C" extern u32 const lit_5799; -extern "C" extern u32 const lit_5800; -extern "C" extern u32 const lit_5801; -extern "C" extern u32 const lit_5803; -extern "C" extern u32 const lit_5804; -extern "C" extern u32 const lit_5805; -extern "C" extern u32 const lit_5807; -extern "C" extern u32 const lit_5808; -extern "C" extern u32 const lit_5810; -extern "C" extern u32 const lit_5811; -extern "C" extern u32 const lit_5812; -extern "C" extern u32 const lit_5815; -extern "C" extern u32 const lit_5816; -extern "C" extern u32 const lit_5817; -extern "C" extern u32 const lit_5818; -extern "C" extern u32 const lit_5819; -extern "C" extern u32 const lit_5820; -extern "C" extern u32 const lit_5821; -extern "C" extern u32 const lit_5822; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_HENNA[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 koro2_reset[4 + 4 /* padding */]; -extern "C" extern u8 data_8054B1F4[4 + 4 /* padding */]; -extern "C" extern u8 data_8054B204[4]; -extern "C" extern u8 data_8054B208[4]; -extern "C" extern u8 data_8054B20C[4]; -extern "C" extern u8 data_8054B210[4]; -extern "C" extern u8 data_8054B214[4]; -extern "C" extern u8 data_8054B218[4]; -extern "C" extern u8 data_8054B21C[4]; -extern "C" extern u8 data_8054B220[4]; -extern "C" extern u8 data_8054B224[4]; -extern "C" extern u8 data_8054B228[4]; -extern "C" extern u8 data_8054B22C[4]; -extern "C" extern u8 data_8054B230[4]; -extern "C" extern u8 data_8054B234[4]; -extern "C" extern u8 data_8054B238[4]; -extern "C" extern u8 data_8054B23C[4]; -extern "C" extern u8 data_8054B240[4]; -extern "C" extern u8 data_8054B244[4]; -extern "C" extern u8 data_8054B248[4]; -extern "C" extern u8 data_8054B24C[4]; -extern "C" extern u8 data_8054B250[4]; -extern "C" extern u8 data_8054B254[4]; -extern "C" extern u8 data_8054B258[4]; -extern "C" extern u8 data_8054B25C[4]; -extern "C" extern u8 data_8054B260[4]; -extern "C" extern u8 data_8054B264[4]; extern "C" void __ct__17daNpc_Henna_HIO_cFv(); extern "C" static void anm_init__FP15npc_henna_classifUcf(); @@ -576,24 +478,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_blackColor; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450C9C[4]; -extern "C" extern u8 data_80450CA0[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_henna/executor.cpp b/rel/d/a/npc/d_a_npc_henna/executor.cpp index b5b5d8fd14b..b3541b5c005 100644 --- a/rel/d/a/npc/d_a_npc_henna/executor.cpp +++ b/rel/d/a/npc/d_a_npc_henna/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8054A950[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_henna/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_henna/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f613c7eb0b4..4bfec176637 100644 --- a/rel/d/a/npc/d_a_npc_henna/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_henna/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8054A95C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8054A95C-8054A964 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8054A95C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8054AF78-8054AF80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_henna/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_henna/unknown_translation_unit_ctors.cpp index a5953be9497..168a7280d5a 100644 --- a/rel/d/a/npc/d_a_npc_henna/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_henna/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8054A950[2]; -extern void* const data_8054A950[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_henna_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8054A950-8054A958 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8054A950[2] = { + (void*)__sinit_d_a_npc_henna_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_henna0/d_a_npc_henna0.cpp b/rel/d/a/npc/d_a_npc_henna0/d_a_npc_henna0.cpp index 35d38787995..756c35fb245 100644 --- a/rel/d/a/npc/d_a_npc_henna0/d_a_npc_henna0.cpp +++ b/rel/d/a/npc/d_a_npc_henna0/d_a_npc_henna0.cpp @@ -13,8 +13,6 @@ extern "C" extern void* g_profile_NPC_HENNA0[12]; -extern "C" extern void* g_profile_NPC_HENNA0[12]; - // // External References: // @@ -22,9 +20,6 @@ extern "C" extern void* g_profile_NPC_HENNA0[12]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/rel/d/a/npc/d_a_npc_henna0/executor.cpp b/rel/d/a/npc/d_a_npc_henna0/executor.cpp index aef5babc322..255c7181536 100644 --- a/rel/d/a/npc/d_a_npc_henna0/executor.cpp +++ b/rel/d/a/npc/d_a_npc_henna0/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80A013D8[4]; -extern u8 const data_80A013DC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_henna0/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_henna0/unknown_translation_unit_ctors.cpp index b9ed0ad4d8f..bfc89dcfa7f 100644 --- a/rel/d/a/npc/d_a_npc_henna0/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_henna0/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A013D8[4]; -extern u8 const data_80A013D8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80A013D8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A013D8-80A013DC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80A013D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_henna0/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_henna0/unknown_translation_unit_dtors.cpp index 83c6ec001fd..bcd923aa6a2 100644 --- a/rel/d/a/npc/d_a_npc_henna0/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_henna0/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A013DC[4]; -extern u8 const data_80A013DC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80A013DC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80A013DC-80A013E0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80A013DC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp b/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp index 73c6555d45f..29b1244d177 100644 --- a/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp +++ b/rel/d/a/npc/d_a_npc_hoz/d_a_npc_hoz.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -124,21 +124,21 @@ struct daNpc_Hoz_Param_c { /* 80A065E4 */ ~daNpc_Hoz_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80A05798 */ ~cXyz(); /* 80A05DEC */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -397,8 +397,6 @@ static void daNpc_Hoz_Execute(void*); static void daNpc_Hoz_Draw(void*); static bool daNpc_Hoz_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_HOZ[12]; extern "C" void __dt__11daNpc_Hoz_cFv(); extern "C" void create__11daNpc_Hoz_cFv(); @@ -539,23 +537,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_hoz/executor.cpp b/rel/d/a/npc/d_a_npc_hoz/executor.cpp index 10ba2be2d99..e6d67a73848 100644 --- a/rel/d/a/npc/d_a_npc_hoz/executor.cpp +++ b/rel/d/a/npc/d_a_npc_hoz/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A0663C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_hoz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_hoz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6531e0d1d18..e7fffe169e9 100644 --- a/rel/d/a/npc/d_a_npc_hoz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_hoz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A06648[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A06648-80A06650 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A06648[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A078E0-80A078E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_hoz/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_hoz/unknown_translation_unit_ctors.cpp index eef46672142..41a61b082aa 100644 --- a/rel/d/a/npc/d_a_npc_hoz/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_hoz/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A0663C[2]; -extern void* const data_80A0663C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_hoz_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A0663C-80A06644 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A0663C[2] = { + (void*)__sinit_d_a_npc_hoz_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp b/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp index 2d3fe498f03..d6c3166a201 100644 --- a/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp +++ b/rel/d/a/npc/d_a_npc_impal/d_a_npc_impal.cpp @@ -33,16 +33,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -100,16 +100,16 @@ struct daNpcImpal_Param_c { /* 80A0C204 */ ~daNpcImpal_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -358,10 +358,6 @@ static void daNpcImpal_Delete(void*); static void daNpcImpal_Execute(void*); static void daNpcImpal_Draw(void*); static bool daNpcImpal_IsDelete(void*); -extern "C" extern u8 const lit_4554[32]; -extern "C" extern u8 const lit_4575[28]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_IMPAL[12]; extern "C" void __ct__12daNpcImpal_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -461,26 +457,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/npc/d_a_npc_impal/executor.cpp b/rel/d/a/npc/d_a_npc_impal/executor.cpp index 744faba4da3..76ee635d14c 100644 --- a/rel/d/a/npc/d_a_npc_impal/executor.cpp +++ b/rel/d/a/npc/d_a_npc_impal/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A0C25C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_impal/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_impal/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 27455ea28d3..8ae9a2ec70a 100644 --- a/rel/d/a/npc/d_a_npc_impal/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_impal/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A0C268[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A0C268-80A0C270 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A0C268[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A0C8F0-80A0C8F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_impal/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_impal/unknown_translation_unit_ctors.cpp index ff8372f4490..65c59a5b481 100644 --- a/rel/d/a/npc/d_a_npc_impal/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_impal/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A0C25C[2]; -extern void* const data_80A0C25C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_impal_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A0C25C-80A0C264 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A0C25C[2] = { + (void*)__sinit_d_a_npc_impal_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp index ce2e8fde928..6902e2ffd8f 100644 --- a/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp +++ b/rel/d/a/npc/d_a_npc_inko/d_a_npc_inko.cpp @@ -23,11 +23,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -96,8 +96,6 @@ static bool daNpc_Inko_IsDelete(npc_inko_class*); static void daNpc_Inko_Delete(npc_inko_class*); static void useHeapInit(fopAc_ac_c*); static void daNpc_Inko_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_INKO[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" static void daNpc_Inko_Draw__FP14npc_inko_class(); @@ -133,18 +131,6 @@ void cM_rndFX(f32); void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C9C[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_inko/executor.cpp b/rel/d/a/npc/d_a_npc_inko/executor.cpp index 8236726fd64..46001a844bd 100644 --- a/rel/d/a/npc/d_a_npc_inko/executor.cpp +++ b/rel/d/a/npc/d_a_npc_inko/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80A0E00C[4]; -extern u8 const data_80A0E010[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_inko/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_inko/unknown_translation_unit_ctors.cpp index e7fa9887dd4..a87f56ede41 100644 --- a/rel/d/a/npc/d_a_npc_inko/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_inko/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A0E00C[4]; -extern u8 const data_80A0E00C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80A0E00C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A0E00C-80A0E010 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80A0E00C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_inko/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_inko/unknown_translation_unit_dtors.cpp index 0ea50814d95..b01816b4083 100644 --- a/rel/d/a/npc/d_a_npc_inko/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_inko/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A0E010[4]; -extern u8 const data_80A0E010[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80A0E010[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80A0E010-80A0E014 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80A0E010[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp b/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp index 8affd44242d..a0153a727a6 100644 --- a/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp +++ b/rel/d/a/npc/d_a_npc_ins/d_a_npc_ins.cpp @@ -30,10 +30,6 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -42,6 +38,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,14 +55,14 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; +struct J3DJoint {}; struct cXyz { /* 80A136EC */ ~cXyz(); /* 80A13728 */ cXyz(); }; -struct J3DJoint {}; +struct J3DModel {}; struct daNpcIns_c { /* 80A0E24C */ daNpcIns_c(); @@ -110,16 +110,16 @@ struct daNpcIns_Param_c { /* 80A13D40 */ ~daNpcIns_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -368,11 +368,6 @@ static void daNpcIns_Execute(void*); static void daNpcIns_Draw(void*); static bool daNpcIns_IsDelete(void*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u8 const lit_4766[40]; -extern "C" extern u8 const lit_4800[52]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_INS[12]; extern "C" void __ct__10daNpcIns_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -491,27 +486,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); extern "C" void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(); diff --git a/rel/d/a/npc/d_a_npc_ins/executor.cpp b/rel/d/a/npc/d_a_npc_ins/executor.cpp index 966f6d3f1ba..6480a2f6456 100644 --- a/rel/d/a/npc/d_a_npc_ins/executor.cpp +++ b/rel/d/a/npc/d_a_npc_ins/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A13D98[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_ins/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_ins/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a3547712cc8..46cf7e36377 100644 --- a/rel/d/a/npc/d_a_npc_ins/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_ins/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A13DA4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A13DA4-80A13DAC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A13DA4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A145F0-80A145F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_ins/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_ins/unknown_translation_unit_ctors.cpp index 28f591c5dab..c249b20efaf 100644 --- a/rel/d/a/npc/d_a_npc_ins/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_ins/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A13D98[2]; -extern void* const data_80A13D98[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_ins_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A13D98-80A13DA0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A13D98[2] = { + (void*)__sinit_d_a_npc_ins_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp b/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp index 6c0a58fd9ba..29fb1225ef0 100644 --- a/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp +++ b/rel/d/a/npc/d_a_npc_jagar/d_a_npc_jagar.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -117,15 +117,6 @@ struct daNpc_Bou_c { /* 8096DA78 */ void getType(); }; -struct J3DModel {}; - -struct csXyz { - /* 80A193EC */ ~csXyz(); - /* 80A19988 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -133,12 +124,21 @@ struct cXyz { /* 80A19A88 */ cXyz(); }; +struct csXyz { + /* 80A193EC */ ~csXyz(); + /* 80A19988 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -244,14 +244,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80A19AD4 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -399,49 +399,6 @@ static void daNpc_Jagar_Draw(void*); static bool daNpc_Jagar_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); -extern "C" extern u8 const m__19daNpc_Jagar_Param_c[160]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_JAGAR[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80A1AE4C[4]; -extern "C" extern u8 data_80A1AE50[4]; -extern "C" extern u8 data_80A1AE54[4]; -extern "C" extern u8 data_80A1AE58[4]; -extern "C" extern u8 data_80A1AE5C[4]; -extern "C" extern u8 data_80A1AE60[4]; -extern "C" extern u8 data_80A1AE64[4]; -extern "C" extern u8 data_80A1AE68[4]; -extern "C" extern u8 data_80A1AE6C[4]; -extern "C" extern u8 data_80A1AE70[4]; -extern "C" extern u8 data_80A1AE74[4]; -extern "C" extern u8 data_80A1AE78[4]; -extern "C" extern u8 data_80A1AE7C[4]; -extern "C" extern u8 data_80A1AE80[4]; -extern "C" extern u8 data_80A1AE84[4]; -extern "C" extern u8 data_80A1AE88[4]; -extern "C" extern u8 data_80A1AE8C[4]; -extern "C" extern u8 data_80A1AE90[4]; -extern "C" extern u8 data_80A1AE94[4]; -extern "C" extern u8 data_80A1AE98[4]; -extern "C" extern u8 data_80A1AE9C[4]; -extern "C" extern u8 data_80A1AEA0[4]; -extern "C" extern u8 data_80A1AEA4[4]; -extern "C" extern u8 data_80A1AEA8[4]; -extern "C" extern u8 data_80A1AEAC[4]; extern "C" void __dt__13daNpc_Jagar_cFv(); extern "C" void create__13daNpc_Jagar_cFv(); @@ -622,24 +579,6 @@ void cLib_chaseS(s16*, s16, s16); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 const m__17daNpc_Bou_Param_c[156]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_jagar/executor.cpp b/rel/d/a/npc/d_a_npc_jagar/executor.cpp index 9560694eccf..357f998b842 100644 --- a/rel/d/a/npc/d_a_npc_jagar/executor.cpp +++ b/rel/d/a/npc/d_a_npc_jagar/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A1A31C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_jagar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_jagar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1fc5be10500..0c6859304fd 100644 --- a/rel/d/a/npc/d_a_npc_jagar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_jagar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A1A328[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A1A328-80A1A330 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A1A328[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A1ADD8-80A1ADE0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_jagar/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_jagar/unknown_translation_unit_ctors.cpp index eddaeb817c4..f5c56bf1bae 100644 --- a/rel/d/a/npc/d_a_npc_jagar/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_jagar/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A1A31C[2]; -extern void* const data_80A1A31C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_jagar_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A1A31C-80A1A324 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A1A31C[2] = { + (void*)__sinit_d_a_npc_jagar_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp b/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp index f08a8ca83fa..d5f2c1b2393 100644 --- a/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp +++ b/rel/d/a/npc/d_a_npc_kakashi/d_a_npc_kakashi.cpp @@ -17,16 +17,16 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0420 */ ~Z2Creature(); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0420 */ ~Z2Creature(); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -40,16 +40,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; - -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_motionAnmData_c {}; -struct J3DJoint {}; - struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -57,6 +51,12 @@ struct daNpcT_MotionSeqMngr_c { /* 8054E460 */ ~daNpcT_MotionSeqMngr_c(); }; +struct J3DJoint {}; + +struct J3DModel {}; + +struct daNpcT_evtData_c {}; + struct daNpc_Kakashi_c { /* 8054B36C */ ~daNpc_Kakashi_c(); /* 8054B4E8 */ void create(); @@ -104,18 +104,16 @@ struct daNpc_Kakashi_Param_c { /* 8054EA58 */ ~daNpc_Kakashi_Param_c(); }; -struct csXyz { - /* 8054DED8 */ ~csXyz(); - /* 8054E8F8 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 8054DDD0 */ ~cXyz(); /* 8054E414 */ cXyz(); }; +struct csXyz { + /* 8054DED8 */ ~csXyz(); + /* 8054E8F8 */ csXyz(); +}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -124,6 +122,8 @@ struct dCcD_GObjInf { /* 800845B0 */ void getHitSeID(u8, int); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -212,10 +212,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -374,48 +374,6 @@ static void daNpc_Kakashi_Execute(void*); static void daNpc_Kakashi_Draw(void*); static bool daNpc_Kakashi_IsDelete(void*); static void cLib_calcTimer__template0(s16*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_KAKASHI[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8054F244[4]; -extern "C" extern u8 data_8054F248[4]; -extern "C" extern u8 data_8054F24C[4]; -extern "C" extern u8 data_8054F250[4]; -extern "C" extern u8 data_8054F254[4]; -extern "C" extern u8 data_8054F258[4]; -extern "C" extern u8 data_8054F25C[4]; -extern "C" extern u8 data_8054F260[4]; -extern "C" extern u8 data_8054F264[4]; -extern "C" extern u8 data_8054F268[4]; -extern "C" extern u8 data_8054F26C[4]; -extern "C" extern u8 data_8054F270[4]; -extern "C" extern u8 data_8054F274[4]; -extern "C" extern u8 data_8054F278[4]; -extern "C" extern u8 data_8054F27C[4]; -extern "C" extern u8 data_8054F280[4]; -extern "C" extern u8 data_8054F284[4]; -extern "C" extern u8 data_8054F288[4]; -extern "C" extern u8 data_8054F28C[4]; -extern "C" extern u8 data_8054F290[4]; -extern "C" extern u8 data_8054F294[4]; -extern "C" extern u8 data_8054F298[4]; -extern "C" extern u8 data_8054F29C[4]; -extern "C" extern u8 data_8054F2A0[4]; -extern "C" extern u8 data_8054F2A4[4]; extern "C" void __dt__15daNpc_Kakashi_cFv(); extern "C" void create__15daNpc_Kakashi_cFv(); @@ -582,26 +540,6 @@ void cM_rndF(f32); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern u8 mCcDSph__8daNpcT_c[64]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80451124[4]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_kakashi/executor.cpp b/rel/d/a/npc/d_a_npc_kakashi/executor.cpp index c0cc5693e62..1e4da1068d5 100644 --- a/rel/d/a/npc/d_a_npc_kakashi/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kakashi/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8054EAB0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kakashi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kakashi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 74335bb657d..d7eb474c21b 100644 --- a/rel/d/a/npc/d_a_npc_kakashi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kakashi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8054EABC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8054EABC-8054EAC4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8054EABC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8054F198-8054F1A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kakashi/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kakashi/unknown_translation_unit_ctors.cpp index 70ff6e68d63..75b8d4102a3 100644 --- a/rel/d/a/npc/d_a_npc_kakashi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kakashi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8054EAB0[2]; -extern void* const data_8054EAB0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kakashi_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8054EAB0-8054EAB8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8054EAB0[2] = { + (void*)__sinit_d_a_npc_kakashi_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp b/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp index 66b2719e87e..9afc685b528 100644 --- a/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_hana/d_a_npc_kasi_hana.cpp @@ -29,13 +29,13 @@ struct mDoExt_morf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -85,12 +85,12 @@ struct daNpcKasi_Mng_c { struct J3DJoint {}; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; struct J3DAnmTexPattern {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -371,52 +371,6 @@ static void daNpcKasiHana_Execute(void*); static void daNpcKasiHana_Draw(void*); static bool daNpcKasiHana_IsDelete(void*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u8 const lit_5148[24]; -extern "C" extern u8 const lit_5149[48]; -extern "C" extern u32 const lit_5635; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_btpGetParamList[12]; -extern "C" extern void* g_profile_NPC_KASIHANA[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80A21864[4]; -extern "C" extern u8 data_80A21868[4]; -extern "C" extern u8 data_80A2186C[4]; -extern "C" extern u8 data_80A21870[4]; -extern "C" extern u8 data_80A21874[4]; -extern "C" extern u8 data_80A21878[4]; -extern "C" extern u8 data_80A2187C[4]; -extern "C" extern u8 data_80A21880[4]; -extern "C" extern u8 data_80A21884[4]; -extern "C" extern u8 data_80A21888[4]; -extern "C" extern u8 data_80A2188C[4]; -extern "C" extern u8 data_80A21890[4]; -extern "C" extern u8 data_80A21894[4]; -extern "C" extern u8 data_80A21898[4]; -extern "C" extern u8 data_80A2189C[4]; -extern "C" extern u8 data_80A218A0[4]; -extern "C" extern u8 data_80A218A4[4]; -extern "C" extern u8 data_80A218A8[4]; -extern "C" extern u8 data_80A218AC[4]; -extern "C" extern u8 data_80A218B0[4]; -extern "C" extern u8 data_80A218B4[4]; -extern "C" extern u8 data_80A218B8[4]; -extern "C" extern u8 data_80A218BC[4]; -extern "C" extern u8 data_80A218C0[4]; -extern "C" extern u8 data_80A218C4[4]; extern "C" void calcEscapeForm__15daNpcKasi_Mng_cFv(); extern "C" void __dt__4cXyzFv(); @@ -608,22 +562,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); extern "C" void setMorf__13mDoExt_morf_cFf(); diff --git a/rel/d/a/npc/d_a_npc_kasi_hana/executor.cpp b/rel/d/a/npc/d_a_npc_kasi_hana/executor.cpp index 86cf5f4f0dd..783b8bd57c9 100644 --- a/rel/d/a/npc/d_a_npc_kasi_hana/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_hana/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A2106C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kasi_hana/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kasi_hana/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 54722cfa464..67e964651fa 100644 --- a/rel/d/a/npc/d_a_npc_kasi_hana/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_hana/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A21078[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A21078-80A21080 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A21078[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A21800-80A21808 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kasi_hana/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kasi_hana/unknown_translation_unit_ctors.cpp index ebd538ff9ca..713154a8549 100644 --- a/rel/d/a/npc/d_a_npc_kasi_hana/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_hana/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A2106C[2]; -extern void* const data_80A2106C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kasi_hana_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A2106C-80A21074 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A2106C[2] = { + (void*)__sinit_d_a_npc_kasi_hana_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp b/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp index 053a4ed84f0..e20b67fd5f5 100644 --- a/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_kyu/d_a_npc_kasi_kyu.cpp @@ -28,13 +28,13 @@ struct mDoExt_morf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -50,12 +50,12 @@ struct fopAc_ac_c { struct J3DJoint {}; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; struct J3DAnmTexPattern {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -87,8 +87,6 @@ struct daNpcF_c { /* 80A25794 */ void drawOtherMdls(); }; -struct J3DModel {}; - struct Vec {}; struct cXyz { @@ -97,6 +95,8 @@ struct cXyz { /* 80A251B0 */ cXyz(); }; +struct J3DModel {}; + struct daNpcKasiKyu_c { /* 80A219CC */ daNpcKasiKyu_c(); /* 80A21C14 */ ~daNpcKasiKyu_c(); @@ -315,56 +315,6 @@ static void daNpcKasiKyu_Delete(void*); static void daNpcKasiKyu_Execute(void*); static void daNpcKasiKyu_Draw(void*); static bool daNpcKasiKyu_IsDelete(void*); -extern "C" extern u8 const lit_4562[24]; -extern "C" extern u8 const lit_4566[52]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_btpGetParamList[12]; -extern "C" extern void* l_myName; -extern "C" extern void* lit_4960[3]; -extern "C" extern void* lit_4968[3]; -extern "C" extern void* lit_5003[3]; -extern "C" extern void* lit_5106[3]; -extern "C" extern void* g_profile_NPC_KASIKYU[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80A2606C[4]; -extern "C" extern u8 data_80A26070[4]; -extern "C" extern u8 data_80A26074[4]; -extern "C" extern u8 data_80A26078[4]; -extern "C" extern u8 data_80A2607C[4]; -extern "C" extern u8 data_80A26080[4]; -extern "C" extern u8 data_80A26084[4]; -extern "C" extern u8 data_80A26088[4]; -extern "C" extern u8 data_80A2608C[4]; -extern "C" extern u8 data_80A26090[4]; -extern "C" extern u8 data_80A26094[4]; -extern "C" extern u8 data_80A26098[4]; -extern "C" extern u8 data_80A2609C[4]; -extern "C" extern u8 data_80A260A0[4]; -extern "C" extern u8 data_80A260A4[4]; -extern "C" extern u8 data_80A260A8[4]; -extern "C" extern u8 data_80A260AC[4]; -extern "C" extern u8 data_80A260B0[4]; -extern "C" extern u8 data_80A260B4[4]; -extern "C" extern u8 data_80A260B8[4]; -extern "C" extern u8 data_80A260BC[4]; -extern "C" extern u8 data_80A260C0[4]; -extern "C" extern u8 data_80A260C4[4]; -extern "C" extern u8 data_80A260C8[4]; -extern "C" extern u8 data_80A260CC[4]; extern "C" void __ct__14daNpcKasiKyu_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -521,20 +471,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); extern "C" void setMorf__13mDoExt_morf_cFf(); diff --git a/rel/d/a/npc/d_a_npc_kasi_kyu/executor.cpp b/rel/d/a/npc/d_a_npc_kasi_kyu/executor.cpp index 2c8c25d111a..c5e46197dc1 100644 --- a/rel/d/a/npc/d_a_npc_kasi_kyu/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_kyu/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A258A4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kasi_kyu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kasi_kyu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c5e65720c22..d963e2d285f 100644 --- a/rel/d/a/npc/d_a_npc_kasi_kyu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_kyu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A258B0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A258B0-80A258B8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A258B0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A26008-80A26010 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kasi_kyu/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kasi_kyu/unknown_translation_unit_ctors.cpp index c7baa0b0349..4e1c51f4bd7 100644 --- a/rel/d/a/npc/d_a_npc_kasi_kyu/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_kyu/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A258A4[2]; -extern void* const data_80A258A4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kasi_kyu_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A258A4-80A258AC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A258A4[2] = { + (void*)__sinit_d_a_npc_kasi_kyu_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp b/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp index 2a77ab76f09..799a957522d 100644 --- a/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_mich/d_a_npc_kasi_mich.cpp @@ -28,13 +28,13 @@ struct mDoExt_morf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -50,12 +50,12 @@ struct fopAc_ac_c { struct J3DJoint {}; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; struct J3DAnmTexPattern {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -87,8 +87,6 @@ struct daNpcF_c { /* 80A29F28 */ void drawOtherMdls(); }; -struct J3DModel {}; - struct Vec {}; struct cXyz { @@ -97,6 +95,8 @@ struct cXyz { /* 80A29944 */ cXyz(); }; +struct J3DModel {}; + struct daNpcKasiMich_c { /* 80A261CC */ daNpcKasiMich_c(); /* 80A26414 */ ~daNpcKasiMich_c(); @@ -315,56 +315,6 @@ static void daNpcKasiMich_Delete(void*); static void daNpcKasiMich_Execute(void*); static void daNpcKasiMich_Draw(void*); static bool daNpcKasiMich_IsDelete(void*); -extern "C" extern u8 const lit_4562[24]; -extern "C" extern u8 const lit_4566[52]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_btpGetParamList[12]; -extern "C" extern void* l_myName; -extern "C" extern void* lit_4960[3]; -extern "C" extern void* lit_4968[3]; -extern "C" extern void* lit_5003[3]; -extern "C" extern void* lit_5106[3]; -extern "C" extern void* g_profile_NPC_KASIMICH[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80A2A7FC[4]; -extern "C" extern u8 data_80A2A800[4]; -extern "C" extern u8 data_80A2A804[4]; -extern "C" extern u8 data_80A2A808[4]; -extern "C" extern u8 data_80A2A80C[4]; -extern "C" extern u8 data_80A2A810[4]; -extern "C" extern u8 data_80A2A814[4]; -extern "C" extern u8 data_80A2A818[4]; -extern "C" extern u8 data_80A2A81C[4]; -extern "C" extern u8 data_80A2A820[4]; -extern "C" extern u8 data_80A2A824[4]; -extern "C" extern u8 data_80A2A828[4]; -extern "C" extern u8 data_80A2A82C[4]; -extern "C" extern u8 data_80A2A830[4]; -extern "C" extern u8 data_80A2A834[4]; -extern "C" extern u8 data_80A2A838[4]; -extern "C" extern u8 data_80A2A83C[4]; -extern "C" extern u8 data_80A2A840[4]; -extern "C" extern u8 data_80A2A844[4]; -extern "C" extern u8 data_80A2A848[4]; -extern "C" extern u8 data_80A2A84C[4]; -extern "C" extern u8 data_80A2A850[4]; -extern "C" extern u8 data_80A2A854[4]; -extern "C" extern u8 data_80A2A858[4]; -extern "C" extern u8 data_80A2A85C[4]; extern "C" void __ct__15daNpcKasiMich_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -521,20 +471,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); extern "C" void setMorf__13mDoExt_morf_cFf(); diff --git a/rel/d/a/npc/d_a_npc_kasi_mich/executor.cpp b/rel/d/a/npc/d_a_npc_kasi_mich/executor.cpp index 956c0bd6adb..9eaae354610 100644 --- a/rel/d/a/npc/d_a_npc_kasi_mich/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_mich/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A2A038[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kasi_mich/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kasi_mich/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3e60fc73498..a43be345c2f 100644 --- a/rel/d/a/npc/d_a_npc_kasi_mich/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_mich/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A2A044[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A2A044-80A2A04C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A2A044[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A2A798-80A2A7A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kasi_mich/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kasi_mich/unknown_translation_unit_ctors.cpp index b12782fcad5..ebffe0988d2 100644 --- a/rel/d/a/npc/d_a_npc_kasi_mich/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kasi_mich/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A2A038[2]; -extern void* const data_80A2A038[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kasi_mich_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A2A038-80A2A040 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A2A038[2] = { + (void*)__sinit_d_a_npc_kasi_mich_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kdk/d_a_npc_kdk.cpp b/rel/d/a/npc/d_a_npc_kdk/d_a_npc_kdk.cpp index cadbab1b7b4..45966dad851 100644 --- a/rel/d/a/npc/d_a_npc_kdk/d_a_npc_kdk.cpp +++ b/rel/d/a/npc/d_a_npc_kdk/d_a_npc_kdk.cpp @@ -13,8 +13,6 @@ extern "C" extern void* g_profile_NPC_KDK[12]; -extern "C" extern void* g_profile_NPC_KDK[12]; - // // External References: // @@ -22,9 +20,6 @@ extern "C" extern void* g_profile_NPC_KDK[12]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/rel/d/a/npc/d_a_npc_kdk/executor.cpp b/rel/d/a/npc/d_a_npc_kdk/executor.cpp index a420c0535ec..c8e1e54f1ab 100644 --- a/rel/d/a/npc/d_a_npc_kdk/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kdk/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80A2A8D8[4]; -extern u8 const data_80A2A8DC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kdk/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kdk/unknown_translation_unit_ctors.cpp index c53456b74e2..64e328d72a8 100644 --- a/rel/d/a/npc/d_a_npc_kdk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kdk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A2A8D8[4]; -extern u8 const data_80A2A8D8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80A2A8D8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A2A8D8-80A2A8DC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80A2A8D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_kdk/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_kdk/unknown_translation_unit_dtors.cpp index 74221a1babf..83249bebff4 100644 --- a/rel/d/a/npc/d_a_npc_kdk/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_kdk/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A2A8DC[4]; -extern u8 const data_80A2A8DC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80A2A8DC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80A2A8DC-80A2A8E0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80A2A8DC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp b/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp index 0aceeee37bf..fa54f69a015 100644 --- a/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp +++ b/rel/d/a/npc/d_a_npc_kkri/d_a_npc_kkri.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -105,15 +105,6 @@ struct daNpc_Kkri_Param_c { /* 80553424 */ ~daNpc_Kkri_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80552564 */ ~csXyz(); - /* 80552B00 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -121,11 +112,20 @@ struct cXyz { /* 80552C00 */ cXyz(); }; +struct csXyz { + /* 80552564 */ ~csXyz(); + /* 80552B00 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -376,8 +376,6 @@ static void daNpc_Kkri_Draw(void*); static bool daNpc_Kkri_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_KKRI[12]; extern "C" void __dt__12daNpc_Kkri_cFv(); extern "C" void create__12daNpc_Kkri_cFv(); @@ -509,24 +507,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_kkri/executor.cpp b/rel/d/a/npc/d_a_npc_kkri/executor.cpp index 897bfc310ab..6c153386487 100644 --- a/rel/d/a/npc/d_a_npc_kkri/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kkri/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8055347C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kkri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kkri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e90d089763a..ade0173d749 100644 --- a/rel/d/a/npc/d_a_npc_kkri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kkri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80553488[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80553488-80553490 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80553488[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80553ED8-80553EE0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kkri/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kkri/unknown_translation_unit_ctors.cpp index 71f9d23ff87..c767d02a294 100644 --- a/rel/d/a/npc/d_a_npc_kkri/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kkri/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8055347C[2]; -extern void* const data_8055347C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kkri_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8055347C-80553484 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8055347C[2] = { + (void*)__sinit_d_a_npc_kkri_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp b/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp index 0dd7bdae485..aff612bb870 100644 --- a/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp +++ b/rel/d/a/npc/d_a_npc_kn/d_a_npc_kn.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80A3B724 */ ~csXyz(); - /* 80A3C35C */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -29,6 +24,11 @@ struct cXyz { /* 80A3C45C */ cXyz(); }; +struct csXyz { + /* 80A3B724 */ ~csXyz(); + /* 80A3C35C */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -46,13 +46,13 @@ struct mDoExt_invisibleModel { /* 8000E7C0 */ void entryDL(cXyz*); }; -struct J3DAnmTexPattern {}; - struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; + struct J3DAnmTevRegKey {}; -struct J3DAnmColor {}; +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -95,14 +95,14 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -127,8 +127,6 @@ struct daPy_py_c { /* 8015F3FC */ void getAttentionOffsetY(); }; -struct _GXColorS10 {}; - struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -137,20 +135,16 @@ struct daNpcT_MotionSeqMngr_c { /* 80A3C4A8 */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_evtData_c {}; +struct _GXColorS10 {}; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); - /* 800842C0 */ void ChkAtHit(); - /* 80084460 */ void ChkTgHit(); - /* 800844F8 */ void GetTgHitObj(); -}; +struct daNpcT_evtData_c {}; struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_motionAnmData_c {}; +struct J3DJoint {}; + struct J3DFrameCtrl { /* 803283FC */ void init(s16); /* 80A3C62C */ ~J3DFrameCtrl(); @@ -158,7 +152,13 @@ struct J3DFrameCtrl { struct J3DAnmTransformKey {}; -struct J3DJoint {}; +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); + /* 800842C0 */ void ChkAtHit(); + /* 80084460 */ void ChkTgHit(); + /* 800844F8 */ void GetTgHitObj(); +}; struct daNpc_Kn_c { struct daNpc_Kn_prtclMngr_c { @@ -405,6 +405,12 @@ struct dPa_control_c { _GXColor const*, cXyz const*, f32); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F40 */ void SetWallR(f32); + /* 80A3C4F0 */ ~dBgS_AcchCir(); +}; + struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; @@ -415,12 +421,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80A3C4F0 */ ~dBgS_AcchCir(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -631,70 +631,6 @@ static void cLib_calcTimer__template0(s16*); static void cLib_calcTimer__template1(int*); static void cLib_getRndValue__template0(s16, s16); static void cLib_getRndValue__template1(int, int); -extern "C" extern u32 const lit_5690; -extern "C" extern u32 const lit_5787; -extern "C" extern u32 const lit_9980; -extern "C" extern u32 const lit_9981; -extern "C" extern u32 const lit_9982; -extern "C" extern u32 const lit_9983; -extern "C" extern u32 const lit_10161; -extern "C" extern u32 const lit_10494; -extern "C" extern u32 const lit_11020; -extern "C" extern u32 const lit_11021; -extern "C" extern u32 const lit_11516; -extern "C" extern u8 const lit_11976[8]; -extern "C" extern u32 const lit_12826; -extern "C" extern u32 const lit_12827; -extern "C" extern u32 const lit_14385; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_7413[3]; -extern "C" extern void* lit_7421[3]; -extern "C" extern void* lit_7429[3]; -extern "C" extern void* lit_7437[3]; -extern "C" extern void* g_profile_NPC_KN[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 struct_80A432FC[4]; -extern "C" extern u8 mFindActorPtrs__10daNpc_Kn_c[200]; -extern "C" extern u8 mFindCount__10daNpc_Kn_c[4]; -extern "C" extern u8 data_80A43414[4]; -extern "C" extern u8 data_80A43418[4]; -extern "C" extern u8 data_80A4341C[4]; -extern "C" extern u8 data_80A43420[4]; -extern "C" extern u8 data_80A43424[4]; -extern "C" extern u8 data_80A43428[4]; -extern "C" extern u8 data_80A4342C[4]; -extern "C" extern u8 data_80A43430[4]; -extern "C" extern u8 data_80A43434[4]; -extern "C" extern u8 data_80A43438[4]; -extern "C" extern u8 data_80A4343C[4]; -extern "C" extern u8 data_80A43440[4]; -extern "C" extern u8 data_80A43444[4]; -extern "C" extern u8 data_80A43448[4]; -extern "C" extern u8 data_80A4344C[4]; -extern "C" extern u8 data_80A43450[4]; -extern "C" extern u8 data_80A43454[4]; -extern "C" extern u8 data_80A43458[4]; -extern "C" extern u8 data_80A4345C[4]; -extern "C" extern u8 data_80A43460[4]; -extern "C" extern u8 data_80A43464[4]; -extern "C" extern u8 data_80A43468[4]; -extern "C" extern u8 data_80A4346C[4]; -extern "C" extern u8 data_80A43470[4]; -extern "C" extern u8 data_80A43474[4]; extern "C" void __dt__10daNpc_Kn_cFv(); extern "C" void __dt__8dCcD_SphFv(); @@ -1035,32 +971,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80A408C0[2]; SECTION_INIT void memset(); extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); diff --git a/rel/d/a/npc/d_a_npc_kn/executor.cpp b/rel/d/a/npc/d_a_npc_kn/executor.cpp index 28d47606416..8534978668e 100644 --- a/rel/d/a/npc/d_a_npc_kn/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kn/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A408B4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e57f89931b1..7519aafe37e 100644 --- a/rel/d/a/npc/d_a_npc_kn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kn/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A408C0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A408C0-80A408C8 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80A408C0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A432B8-80A432C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kn/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kn/unknown_translation_unit_ctors.cpp index 03bdb55909d..98939129049 100644 --- a/rel/d/a/npc/d_a_npc_kn/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kn/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A408B4[2]; -extern void* const data_80A408B4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kn_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A408B4-80A408BC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A408B4[2] = { + (void*)__sinit_d_a_npc_kn_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp b/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp index 04dd8910595..80d265d3111 100644 --- a/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp +++ b/rel/d/a/npc/d_a_npc_knj/d_a_npc_knj.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -90,20 +90,20 @@ struct daNpc_Knj_Param_c { /* 80A454A4 */ ~daNpc_Knj_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80A44B54 */ ~cXyz(); /* 80A450D0 */ cXyz(); }; -struct J3DAnmTexPattern {}; +struct _GXColorS10 {}; + +struct J3DJoint {}; + +struct J3DModel {}; struct J3DAnmTevRegKey {}; -struct J3DJoint {}; +struct J3DAnmTexPattern {}; struct daNpcT_c { /* 801480D0 */ void getTexPtrnAnmP(char const*, int); @@ -291,8 +291,6 @@ static void daNpc_Knj_Delete(void*); static void daNpc_Knj_Execute(void*); static void daNpc_Knj_Draw(void*); static bool daNpc_Knj_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_KNJ[12]; extern "C" void __dt__11daNpc_Knj_cFv(); extern "C" void create__11daNpc_Knj_cFv(); @@ -387,14 +385,6 @@ void daNpcT_getDistTableIdx(int, int); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; SECTION_INIT void memset(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_knj/executor.cpp b/rel/d/a/npc/d_a_npc_knj/executor.cpp index 7e3263716b5..389c63328a9 100644 --- a/rel/d/a/npc/d_a_npc_knj/executor.cpp +++ b/rel/d/a/npc/d_a_npc_knj/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A454FC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_knj/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_knj/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f7c960f44c2..f0dc39a50e8 100644 --- a/rel/d/a/npc/d_a_npc_knj/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_knj/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A45508[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A45508-80A45510 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A45508[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A45888-80A45890 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_knj/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_knj/unknown_translation_unit_ctors.cpp index 81410a5101d..3e9b129ea48 100644 --- a/rel/d/a/npc/d_a_npc_knj/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_knj/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A454FC[2]; -extern void* const data_80A454FC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_knj_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A454FC-80A45504 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A454FC[2] = { + (void*)__sinit_d_a_npc_knj_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp b/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp index e806f72b051..15c6518ba2e 100644 --- a/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp +++ b/rel/d/a/npc/d_a_npc_kolin/d_a_npc_kolin.cpp @@ -26,18 +26,18 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -141,14 +141,12 @@ struct daNpc_Kolin_Param_c { /* 8055A4E8 */ ~daNpc_Kolin_Param_c(); }; -struct J3DModel {}; - struct csXyz { /* 80559578 */ ~csXyz(); /* 80559B14 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); @@ -156,6 +154,8 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -268,14 +268,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80559C60 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -439,52 +439,6 @@ static void daNpc_Kolin_Draw(void*); static bool daNpc_Kolin_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 const lit_5839; -extern "C" extern u32 const lit_5840; -extern "C" extern u8 const lit_5929[8]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_loadResPtrn2[3 + 1 /* padding */]; -extern "C" extern void* g_profile_NPC_KOLIN[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8055B43C[4]; -extern "C" extern u8 data_8055B440[4]; -extern "C" extern u8 data_8055B444[4]; -extern "C" extern u8 data_8055B448[4]; -extern "C" extern u8 data_8055B44C[4]; -extern "C" extern u8 data_8055B450[4]; -extern "C" extern u8 data_8055B454[4]; -extern "C" extern u8 data_8055B458[4]; -extern "C" extern u8 data_8055B45C[4]; -extern "C" extern u8 data_8055B460[4]; -extern "C" extern u8 data_8055B464[4]; -extern "C" extern u8 data_8055B468[4]; -extern "C" extern u8 data_8055B46C[4]; -extern "C" extern u8 data_8055B470[4]; -extern "C" extern u8 data_8055B474[4]; -extern "C" extern u8 data_8055B478[4]; -extern "C" extern u8 data_8055B47C[4]; -extern "C" extern u8 data_8055B480[4]; -extern "C" extern u8 data_8055B484[4]; -extern "C" extern u8 data_8055B488[4]; -extern "C" extern u8 data_8055B48C[4]; -extern "C" extern u8 data_8055B490[4]; -extern "C" extern u8 data_8055B494[4]; -extern "C" extern u8 data_8055B498[4]; -extern "C" extern u8 data_8055B49C[4]; extern "C" void __dt__13daNpc_Kolin_cFv(); extern "C" void create__13daNpc_Kolin_cFv(); @@ -679,25 +633,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_kolin/executor.cpp b/rel/d/a/npc/d_a_npc_kolin/executor.cpp index 8711eaab770..a7f698fccf1 100644 --- a/rel/d/a/npc/d_a_npc_kolin/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kolin/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8055A5A0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kolin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kolin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9e2c5f08727..ea744231278 100644 --- a/rel/d/a/npc/d_a_npc_kolin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kolin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8055A5AC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8055A5AC-8055A5B4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8055A5AC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8055B3C8-8055B3D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kolin/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kolin/unknown_translation_unit_ctors.cpp index 601a5cd654d..a11bc1175e5 100644 --- a/rel/d/a/npc/d_a_npc_kolin/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kolin/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8055A5A0[2]; -extern void* const data_8055A5A0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kolin_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8055A5A0-8055A5A8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8055A5A0[2] = { + (void*)__sinit_d_a_npc_kolin_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp b/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp index 116482ef944..70ceb417ea8 100644 --- a/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp +++ b/rel/d/a/npc/d_a_npc_kolinb/d_a_npc_kolinb.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -103,26 +103,26 @@ struct daNpc_Kolinb_Param_c { /* 80A486A4 */ ~daNpc_Kolinb_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80A47B20 */ ~csXyz(); - /* 80A48038 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80A47AE4 */ ~cXyz(); /* 80A48138 */ cXyz(); }; +struct csXyz { + /* 80A47B20 */ ~csXyz(); + /* 80A48038 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -326,8 +326,6 @@ static void daNpc_Kolinb_Execute(void*); static void daNpc_Kolinb_Draw(void*); static bool daNpc_Kolinb_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_KOLINB[12]; extern "C" void __dt__14daNpc_Kolinb_cFv(); extern "C" void create__14daNpc_Kolinb_cFv(); @@ -435,19 +433,6 @@ void daNpcT_chkEvtBit(u32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_kolinb/executor.cpp b/rel/d/a/npc/d_a_npc_kolinb/executor.cpp index 857235972a4..00e3c6ed8c5 100644 --- a/rel/d/a/npc/d_a_npc_kolinb/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kolinb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A486FC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kolinb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kolinb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5286e6b91c7..2d9a527b07f 100644 --- a/rel/d/a/npc/d_a_npc_kolinb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kolinb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A48708[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A48708-80A48710 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A48708[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A48E80-80A48E88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kolinb/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kolinb/unknown_translation_unit_ctors.cpp index fac29b7d7d2..1da189d7739 100644 --- a/rel/d/a/npc/d_a_npc_kolinb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kolinb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A486FC[2]; -extern void* const data_80A486FC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kolinb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A486FC-80A48704 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A486FC[2] = { + (void*)__sinit_d_a_npc_kolinb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp b/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp index 5e0f65a07e3..2a5fcf477c5 100644 --- a/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp +++ b/rel/d/a/npc/d_a_npc_ks/d_a_npc_ks.cpp @@ -24,10 +24,10 @@ struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -39,12 +39,6 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -52,6 +46,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -404,86 +404,6 @@ static void dComIfGs_getOil(); static void dComIfGs_setItem(int, u8); static void mDoAud_seStart(u32, Vec const*, u32, s8); static void dComIfGs_onEventBit(u16); -extern "C" extern u32 const lit_4799; -extern "C" extern u32 const lit_4802; -extern "C" extern u32 const lit_4805; -extern "C" extern u32 const lit_5565; -extern "C" extern u32 const lit_5568; -extern "C" extern u32 const lit_5569; -extern "C" extern u32 const lit_5571; -extern "C" extern u8 const lit_5679[8]; -extern "C" extern u32 const lit_5769; -extern "C" extern u32 const lit_5770; -extern "C" extern u32 const lit_5771; -extern "C" extern u32 const lit_6631; -extern "C" extern u32 const lit_7651; -extern "C" extern u32 const lit_7652; -extern "C" extern u32 const lit_7654; -extern "C" extern u32 const lit_7655; -extern "C" extern u32 const lit_7656; -extern "C" extern u32 const lit_7657; -extern "C" extern u32 const lit_8132; -extern "C" extern u32 const lit_8133; -extern "C" extern u32 const lit_9867; -extern "C" extern u32 const lit_9868; -extern "C" extern u32 const lit_9869; -extern "C" extern u32 const lit_9870; -extern "C" extern u32 const lit_11371; -extern "C" extern u32 const lit_11372; -extern "C" extern u32 const lit_11373; -extern "C" extern u32 const lit_11374; -extern "C" extern u32 const lit_11375; -extern "C" extern u32 const lit_11376; -extern "C" extern u32 const lit_11377; -extern "C" extern u32 const lit_11378; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_80A5FCB0[12]; -extern "C" extern u8 data_80A5FCBC[12]; -extern "C" extern u8 data_80A5FCC8[12]; -extern "C" extern void* g_profile_NPC_KS[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 lit_7870[12 + 4 /* padding */]; -extern "C" extern u8 data_80A5FF58[12]; -extern "C" extern u8 data_80A5FF68[4]; -extern "C" extern u8 data_80A5FF6C[4]; -extern "C" extern u8 data_80A5FF70[4]; -extern "C" extern u8 data_80A5FF74[4]; -extern "C" extern u8 data_80A5FF78[4]; -extern "C" extern u8 data_80A5FF7C[4]; -extern "C" extern u8 data_80A5FF80[4]; -extern "C" extern u8 data_80A5FF84[4]; -extern "C" extern u8 data_80A5FF88[4]; -extern "C" extern u8 data_80A5FF8C[4]; -extern "C" extern u8 data_80A5FF90[4]; -extern "C" extern u8 data_80A5FF94[4]; -extern "C" extern u8 data_80A5FF98[4]; -extern "C" extern u8 data_80A5FF9C[4]; -extern "C" extern u8 data_80A5FFA0[4]; -extern "C" extern u8 data_80A5FFA4[4]; -extern "C" extern u8 data_80A5FFA8[4]; -extern "C" extern u8 data_80A5FFAC[4]; -extern "C" extern u8 data_80A5FFB0[4]; -extern "C" extern u8 data_80A5FFB4[4]; -extern "C" extern u8 data_80A5FFB8[4]; -extern "C" extern u8 data_80A5FFBC[4]; -extern "C" extern u8 data_80A5FFC0[4]; -extern "C" extern u8 data_80A5FFC4[4]; -extern "C" extern u8 data_80A5FFC8[4]; extern "C" void __ct__14daNpc_Ks_HIO_cFv(); extern "C" static void setPlayerPosAndAngle__FP4cXyzs(); @@ -738,29 +658,6 @@ void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); void JUTReport(int, int, char const*, ...); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_ks/executor.cpp b/rel/d/a/npc/d_a_npc_ks/executor.cpp index 3293128f926..dcbed893c3c 100644 --- a/rel/d/a/npc/d_a_npc_ks/executor.cpp +++ b/rel/d/a/npc/d_a_npc_ks/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A5DEE8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_ks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_ks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 39373eb6a18..bb7df4b36aa 100644 --- a/rel/d/a/npc/d_a_npc_ks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_ks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A5DEF4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A5DEF4-80A5DEFC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A5DEF4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A5FE40-80A5FE48 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_ks/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_ks/unknown_translation_unit_ctors.cpp index 73c5fa1c7ea..04fca795832 100644 --- a/rel/d/a/npc/d_a_npc_ks/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_ks/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A5DEE8[2]; -extern void* const data_80A5DEE8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_ks_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A5DEE8-80A5DEF0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A5DEE8[2] = { + (void*)__sinit_d_a_npc_ks_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp b/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp index 4f35476ddca..53b7bbc4064 100644 --- a/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp +++ b/rel/d/a/npc/d_a_npc_kyury/d_a_npc_kyury.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -101,10 +101,6 @@ struct daNpc_Kyury_Param_c { /* 80A63840 */ ~daNpc_Kyury_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -112,11 +108,15 @@ struct cXyz { /* 80A630D0 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -373,9 +373,6 @@ static void daNpc_Kyury_Delete(void*); static void daNpc_Kyury_Execute(void*); static void daNpc_Kyury_Draw(void*); static bool daNpc_Kyury_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u16 l_loadResPtrn0[1 + 1 /* padding */]; -extern "C" extern void* g_profile_NPC_KYURY[12]; extern "C" void __dt__13daNpc_Kyury_cFv(); extern "C" void create__13daNpc_Kyury_cFv(); @@ -497,23 +494,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_kyury/executor.cpp b/rel/d/a/npc/d_a_npc_kyury/executor.cpp index b019307d367..64ccb4d1637 100644 --- a/rel/d/a/npc/d_a_npc_kyury/executor.cpp +++ b/rel/d/a/npc/d_a_npc_kyury/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A63898[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_kyury/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_kyury/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e818207fedb..764ed308dd1 100644 --- a/rel/d/a/npc/d_a_npc_kyury/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_kyury/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A638A4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A638A4-80A638AC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A638A4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A64218-80A64220 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_kyury/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_kyury/unknown_translation_unit_ctors.cpp index ef7407fa1e7..3464c62e00e 100644 --- a/rel/d/a/npc/d_a_npc_kyury/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_kyury/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A63898[2]; -extern void* const data_80A63898[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_kyury_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A63898-80A638A0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A63898[2] = { + (void*)__sinit_d_a_npc_kyury_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp b/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp index 5a40a4fe27e..50da96793e4 100644 --- a/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp +++ b/rel/d/a/npc/d_a_npc_len/d_a_npc_len.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -111,15 +111,6 @@ struct daNpc_Len_Param_c { /* 80A68E38 */ ~daNpc_Len_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80A67F64 */ ~csXyz(); - /* 80A68500 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -127,12 +118,21 @@ struct cXyz { /* 80A68600 */ cXyz(); }; +struct csXyz { + /* 80A67F64 */ ~csXyz(); + /* 80A68500 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -233,14 +233,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80A6864C */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -388,8 +388,6 @@ static void daNpc_Len_Draw(void*); static bool daNpc_Len_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_LEN[12]; extern "C" void __dt__11daNpc_Len_cFv(); extern "C" void create__11daNpc_Len_cFv(); @@ -526,23 +524,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_len/executor.cpp b/rel/d/a/npc/d_a_npc_len/executor.cpp index f9cfe44cc3e..a88f81ac71f 100644 --- a/rel/d/a/npc/d_a_npc_len/executor.cpp +++ b/rel/d/a/npc/d_a_npc_len/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A68E90[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_len/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_len/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 382b1e1baf6..f7d6df9b781 100644 --- a/rel/d/a/npc/d_a_npc_len/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_len/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A68E9C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A68E9C-80A68EA4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A68E9C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A69A50-80A69A58 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_len/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_len/unknown_translation_unit_ctors.cpp index 9aa6d7b7ca7..01cbc87d549 100644 --- a/rel/d/a/npc/d_a_npc_len/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_len/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A68E90[2]; -extern void* const data_80A68E90[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_len_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A68E90-80A68E98 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A68E90[2] = { + (void*)__sinit_d_a_npc_len_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp b/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp index 6eff5b4895c..906f26eed19 100644 --- a/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp +++ b/rel/d/a/npc/d_a_npc_lf/d_a_npc_lf.cpp @@ -33,16 +33,16 @@ struct daNPC_LF_HIO_c { /* 80A6A8E4 */ ~daNPC_LF_HIO_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -71,8 +71,6 @@ static bool daNPC_LF_IsDelete(npc_lf_class*); static void daNPC_LF_Delete(npc_lf_class*); static void useHeapInit(fopAc_ac_c*); static void daNPC_LF_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_LF[12]; extern "C" void __ct__14daNPC_LF_HIO_cFv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -111,16 +109,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_lf/executor.cpp b/rel/d/a/npc/d_a_npc_lf/executor.cpp index 6006686147c..6ad74c276c2 100644 --- a/rel/d/a/npc/d_a_npc_lf/executor.cpp +++ b/rel/d/a/npc/d_a_npc_lf/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A6A968[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_lf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_lf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 22665a0e349..084e9a87a1d 100644 --- a/rel/d/a/npc/d_a_npc_lf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_lf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A6A974[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A6A974-80A6A97C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A6A974[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A6AA88-80A6AA90 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_lf/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_lf/unknown_translation_unit_ctors.cpp index 45604519e1a..30f5115579d 100644 --- a/rel/d/a/npc/d_a_npc_lf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_lf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A6A968[2]; -extern void* const data_80A6A968[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_lf_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A6A968-80A6A970 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A6A968[2] = { + (void*)__sinit_d_a_npc_lf_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp b/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp index b76d7db6494..6d82e264a48 100644 --- a/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp +++ b/rel/d/a/npc/d_a_npc_lud/d_a_npc_lud.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -121,15 +121,6 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; -struct J3DModel {}; - -struct csXyz { - /* 80A6EEC0 */ ~csXyz(); - /* 80A6F414 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -137,12 +128,21 @@ struct cXyz { /* 80A6F514 */ cXyz(); }; +struct csXyz { + /* 80A6EEC0 */ ~csXyz(); + /* 80A6F414 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -402,8 +402,6 @@ static void daNpc_Lud_Execute(void*); static void daNpc_Lud_Draw(void*); static bool daNpc_Lud_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_LUD[12]; extern "C" void __dt__11daNpc_Lud_cFv(); extern "C" void create__11daNpc_Lud_cFv(); @@ -535,23 +533,6 @@ void cM_rndF(f32); void cLib_chaseS(s16*, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_lud/executor.cpp b/rel/d/a/npc/d_a_npc_lud/executor.cpp index aaa191cc500..2f2f9201597 100644 --- a/rel/d/a/npc/d_a_npc_lud/executor.cpp +++ b/rel/d/a/npc/d_a_npc_lud/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A6FD68[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_lud/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_lud/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c8a310a8c51..c5bc08c9f58 100644 --- a/rel/d/a/npc/d_a_npc_lud/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_lud/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A6FD74[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A6FD74-80A6FD7C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A6FD74[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A70B50-80A70B58 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_lud/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_lud/unknown_translation_unit_ctors.cpp index 02f64469e05..f4d3975705d 100644 --- a/rel/d/a/npc/d_a_npc_lud/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_lud/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A6FD68[2]; -extern void* const data_80A6FD68[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_lud_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A6FD68-80A6FD70 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A6FD68[2] = { + (void*)__sinit_d_a_npc_lud_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp b/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp index d048d913750..1a9fbb2a59f 100644 --- a/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp +++ b/rel/d/a/npc/d_a_npc_maro/d_a_npc_maro.cpp @@ -27,16 +27,16 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -152,20 +152,20 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; -struct J3DModel {}; - struct csXyz { /* 805639D0 */ ~csXyz(); /* 80563E10 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -472,11 +472,6 @@ static void daNpc_Maro_Execute(void*); static void daNpc_Maro_Draw(void*); static bool daNpc_Maro_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 const lit_6226; -extern "C" extern u8 const lit_6272[8]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_4085[3]; -extern "C" extern void* g_profile_NPC_MARO[12]; extern "C" void __dt__12daNpc_Maro_cFv(); extern "C" void create__12daNpc_Maro_cFv(); @@ -652,27 +647,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_maro/executor.cpp b/rel/d/a/npc/d_a_npc_maro/executor.cpp index fb418cfbf8f..632c3aecb52 100644 --- a/rel/d/a/npc/d_a_npc_maro/executor.cpp +++ b/rel/d/a/npc/d_a_npc_maro/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80564B98[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_maro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_maro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2660abb4149..5209691a1dd 100644 --- a/rel/d/a/npc/d_a_npc_maro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_maro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80564BA4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80564BA4-80564BAC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80564BA4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80565D80-80565D88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_maro/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_maro/unknown_translation_unit_ctors.cpp index f20b8a69182..67ef6dee0fb 100644 --- a/rel/d/a/npc/d_a_npc_maro/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_maro/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80564B98[2]; -extern void* const data_80564B98[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_maro_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80564B98-80564BA0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80564B98[2] = { + (void*)__sinit_d_a_npc_maro_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp b/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp index badd8586a38..811558433e0 100644 --- a/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp +++ b/rel/d/a/npc/d_a_npc_midp/d_a_npc_midp.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -102,21 +102,21 @@ struct daNpc_midP_Param_c { /* 80A73954 */ ~daNpc_midP_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80A72BDC */ ~cXyz(); /* 80A73158 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -358,8 +358,6 @@ static void daNpc_midP_Delete(void*); static void daNpc_midP_Execute(void*); static void daNpc_midP_Draw(void*); static bool daNpc_midP_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_MIDP[12]; extern "C" void __dt__12daNpc_midP_cFv(); extern "C" void create__12daNpc_midP_cFv(); @@ -474,24 +472,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_midp/executor.cpp b/rel/d/a/npc/d_a_npc_midp/executor.cpp index 4ffcc2eb394..7a3f18553e7 100644 --- a/rel/d/a/npc/d_a_npc_midp/executor.cpp +++ b/rel/d/a/npc/d_a_npc_midp/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A739AC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_midp/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_midp/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1e793163608..24af4fa7d18 100644 --- a/rel/d/a/npc/d_a_npc_midp/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_midp/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A739B8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A739B8-80A739C0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A739B8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A73D48-80A73D50 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_midp/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_midp/unknown_translation_unit_ctors.cpp index 96ec487da25..4fec4fc28fe 100644 --- a/rel/d/a/npc/d_a_npc_midp/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_midp/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A739AC[2]; -extern void* const data_80A739AC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_midp_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A739AC-80A739B4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A739AC[2] = { + (void*)__sinit_d_a_npc_midp_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_mk/d_a_npc_mk.cpp b/rel/d/a/npc/d_a_npc_mk/d_a_npc_mk.cpp index 7abfb3c1097..dbe6caa33f1 100644 --- a/rel/d/a/npc/d_a_npc_mk/d_a_npc_mk.cpp +++ b/rel/d/a/npc/d_a_npc_mk/d_a_npc_mk.cpp @@ -16,7 +16,6 @@ static bool daNpc_Mk_Delete(void*); static bool daNpc_Mk_Execute(void*); static bool daNpc_Mk_Draw(void*); static bool daNpc_Mk_IsDelete(void*); -extern "C" extern void* g_profile_NPC_MK[12]; extern "C" static bool daNpc_Mk_Create__FPv(); extern "C" static bool daNpc_Mk_Delete__FPv(); @@ -32,9 +31,6 @@ extern "C" extern void* g_profile_NPC_MK[12]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/rel/d/a/npc/d_a_npc_mk/executor.cpp b/rel/d/a/npc/d_a_npc_mk/executor.cpp index b79f893821a..5a3edb36446 100644 --- a/rel/d/a/npc/d_a_npc_mk/executor.cpp +++ b/rel/d/a/npc/d_a_npc_mk/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80A73E00[4]; -extern u8 const data_80A73E04[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_mk/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_mk/unknown_translation_unit_ctors.cpp index b735c78f78d..041fb1438a0 100644 --- a/rel/d/a/npc/d_a_npc_mk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_mk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A73E00[4]; -extern u8 const data_80A73E00[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80A73E00[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A73E00-80A73E04 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80A73E00[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_mk/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_mk/unknown_translation_unit_dtors.cpp index 153d60881d8..457c15b6bdd 100644 --- a/rel/d/a/npc/d_a_npc_mk/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_mk/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A73E04[4]; -extern u8 const data_80A73E04[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80A73E04[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80A73E04-80A73E08 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80A73E04[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp b/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp index 38ee639721d..bb482ce303c 100644 --- a/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp +++ b/rel/d/a/npc/d_a_npc_moi/d_a_npc_moi.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,14 +39,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; -struct daNpcT_motionAnmData_c {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -54,6 +48,8 @@ struct cXyz { /* 80A7A5C4 */ cXyz(); }; +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -62,6 +58,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80A7A5C8 */ ~daNpcT_MotionSeqMngr_c(); }; +struct J3DJoint {}; + +struct daNpcT_evtData_c {}; + struct daNpc_Moi_c { /* 80A73F4C */ ~daNpc_Moi_c(); /* 80A74150 */ void create(); @@ -135,14 +135,12 @@ struct daNpc_Moi_Param_c { /* 80A7AE84 */ ~daNpc_Moi_Param_c(); }; -struct J3DModel {}; - struct csXyz { /* 80A79EA8 */ ~csXyz(); /* 80A7AE08 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); @@ -151,6 +149,8 @@ struct dCcD_GObjInf { /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148058 */ void getTrnsfrmAnmP(char const*, int); @@ -268,14 +268,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80A7A610 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -454,48 +454,6 @@ static void daNpc_Moi_Draw(void*); static bool daNpc_Moi_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_MOI[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80A7C014[4]; -extern "C" extern u8 data_80A7C018[4]; -extern "C" extern u8 data_80A7C01C[4]; -extern "C" extern u8 data_80A7C020[4]; -extern "C" extern u8 data_80A7C024[4]; -extern "C" extern u8 data_80A7C028[4]; -extern "C" extern u8 data_80A7C02C[4]; -extern "C" extern u8 data_80A7C030[4]; -extern "C" extern u8 data_80A7C034[4]; -extern "C" extern u8 data_80A7C038[4]; -extern "C" extern u8 data_80A7C03C[4]; -extern "C" extern u8 data_80A7C040[4]; -extern "C" extern u8 data_80A7C044[4]; -extern "C" extern u8 data_80A7C048[4]; -extern "C" extern u8 data_80A7C04C[4]; -extern "C" extern u8 data_80A7C050[4]; -extern "C" extern u8 data_80A7C054[4]; -extern "C" extern u8 data_80A7C058[4]; -extern "C" extern u8 data_80A7C05C[4]; -extern "C" extern u8 data_80A7C060[4]; -extern "C" extern u8 data_80A7C064[4]; -extern "C" extern u8 data_80A7C068[4]; -extern "C" extern u8 data_80A7C06C[4]; -extern "C" extern u8 data_80A7C070[4]; -extern "C" extern u8 data_80A7C074[4]; extern "C" void __dt__11daNpc_Moi_cFv(); extern "C" void create__11daNpc_Moi_cFv(); @@ -695,30 +653,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern u8 mCcDSph__8daNpcT_c[64]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_moi/executor.cpp b/rel/d/a/npc/d_a_npc_moi/executor.cpp index 9e46a119400..2828254a132 100644 --- a/rel/d/a/npc/d_a_npc_moi/executor.cpp +++ b/rel/d/a/npc/d_a_npc_moi/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A7AEDC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_moi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_moi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b6c32846203..620d521a4c6 100644 --- a/rel/d/a/npc/d_a_npc_moi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_moi/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A7AEE8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A7AEE8-80A7AEF0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A7AEE8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A7BFA0-80A7BFA8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_moi/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_moi/unknown_translation_unit_ctors.cpp index f9d23af5ec8..8e6e07de5dd 100644 --- a/rel/d/a/npc/d_a_npc_moi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_moi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A7AEDC[2]; -extern void* const data_80A7AEDC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_moi_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A7AEDC-80A7AEE4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A7AEDC[2] = { + (void*)__sinit_d_a_npc_moi_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp b/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp index e739328da0e..8e1b301c581 100644 --- a/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp +++ b/rel/d/a/npc/d_a_npc_moir/d_a_npc_moir.cpp @@ -21,10 +21,6 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -33,6 +29,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -46,10 +46,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daNpcMoiR_c { /* 80A7C16C */ daNpcMoiR_c(); /* 80A7C380 */ ~daNpcMoiR_c(); @@ -94,16 +94,16 @@ struct daNpcMoiR_Param_c { /* 80A83240 */ ~daNpcMoiR_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -144,17 +144,17 @@ struct daNpcF_MatAnm_c { /* 80150738 */ void initialize(); }; -struct csXyz { - /* 80A82A5C */ ~csXyz(); - /* 80A82A98 */ csXyz(); -}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80A82A9C */ ~cXyz(); /* 80A82AD8 */ cXyz(); }; +struct csXyz { + /* 80A82A5C */ ~csXyz(); + /* 80A82A98 */ csXyz(); +}; + struct daNpcF_Lookat_c { /* 80151038 */ void initialize(); /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, @@ -356,12 +356,6 @@ static void daNpcMoiR_Draw(void*); static bool daNpcMoiR_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u8 const lit_4626[76]; -extern "C" extern u8 const lit_4699[172]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_4854[3]; -extern "C" extern void* lit_5013[3]; -extern "C" extern void* g_profile_NPC_MOIR[12]; extern "C" void __ct__11daNpcMoiR_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -477,26 +471,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/npc/d_a_npc_moir/executor.cpp b/rel/d/a/npc/d_a_npc_moir/executor.cpp index 1e4bcd48613..2d0c41b2cce 100644 --- a/rel/d/a/npc/d_a_npc_moir/executor.cpp +++ b/rel/d/a/npc/d_a_npc_moir/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A83298[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_moir/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_moir/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 98e9fbd12c1..19df9cbdb50 100644 --- a/rel/d/a/npc/d_a_npc_moir/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_moir/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A832A4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A832A4-80A832AC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A832A4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A83D70-80A83D78 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_moir/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_moir/unknown_translation_unit_ctors.cpp index bf19d01b1f5..11ac4a215ae 100644 --- a/rel/d/a/npc/d_a_npc_moir/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_moir/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A83298[2]; -extern void* const data_80A83298[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_moir_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A83298-80A832A0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A83298[2] = { + (void*)__sinit_d_a_npc_moir_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp b/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp index ff54d92b1bc..e293e01b352 100644 --- a/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp +++ b/rel/d/a/npc/d_a_npc_myna2/d_a_npc_myna2.cpp @@ -28,16 +28,16 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C0420 */ ~Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C0420 */ ~Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -97,7 +97,13 @@ struct daNpc_myna2_Param_c { struct _GXColorS10 {}; -struct J3DAnmTexPattern {}; +struct dCcD_SrcCyl {}; + +struct dCcD_Cyl { + /* 800848B4 */ void Set(dCcD_SrcCyl const&); +}; + +struct J3DAnmTransformKey {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); @@ -105,13 +111,7 @@ struct dCcD_GObjInf { /* 80084658 */ void ChkCoHit(); }; -struct J3DAnmTransformKey {}; - -struct dCcD_SrcCyl {}; - -struct dCcD_Cyl { - /* 800848B4 */ void Set(dCcD_SrcCyl const&); -}; +struct J3DAnmTexPattern {}; struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -294,49 +294,6 @@ static bool daNpc_myna2_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); static void cLib_getRndValue__template1(int, int); -extern "C" extern u8 const lit_4831[32]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_MYNA2[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80A88B64[4]; -extern "C" extern u8 data_80A88B68[4]; -extern "C" extern u8 data_80A88B6C[4]; -extern "C" extern u8 data_80A88B70[4]; -extern "C" extern u8 data_80A88B74[4]; -extern "C" extern u8 data_80A88B78[4]; -extern "C" extern u8 data_80A88B7C[4]; -extern "C" extern u8 data_80A88B80[4]; -extern "C" extern u8 data_80A88B84[4]; -extern "C" extern u8 data_80A88B88[4]; -extern "C" extern u8 data_80A88B8C[4]; -extern "C" extern u8 data_80A88B90[4]; -extern "C" extern u8 data_80A88B94[4]; -extern "C" extern u8 data_80A88B98[4]; -extern "C" extern u8 data_80A88B9C[4]; -extern "C" extern u8 data_80A88BA0[4]; -extern "C" extern u8 data_80A88BA4[4]; -extern "C" extern u8 data_80A88BA8[4]; -extern "C" extern u8 data_80A88BAC[4]; -extern "C" extern u8 data_80A88BB0[4]; -extern "C" extern u8 data_80A88BB4[4]; -extern "C" extern u8 data_80A88BB8[4]; -extern "C" extern u8 data_80A88BBC[4]; -extern "C" extern u8 data_80A88BC0[4]; -extern "C" extern u8 data_80A88BC4[4]; extern "C" void __ct__13daNpc_myna2_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -484,21 +441,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2CreatureSumomo[12]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/npc/d_a_npc_myna2/executor.cpp b/rel/d/a/npc/d_a_npc_myna2/executor.cpp index 7d4928644ea..077c39dfe12 100644 --- a/rel/d/a/npc/d_a_npc_myna2/executor.cpp +++ b/rel/d/a/npc/d_a_npc_myna2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A88420[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_myna2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_myna2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a473ee91926..9bb528a4f76 100644 --- a/rel/d/a/npc/d_a_npc_myna2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_myna2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A8842C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A8842C-80A88434 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A8842C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A88AF0-80A88AF8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_myna2/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_myna2/unknown_translation_unit_ctors.cpp index f3266ad51e7..283b7b9adb2 100644 --- a/rel/d/a/npc/d_a_npc_myna2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_myna2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A88420[2]; -extern void* const data_80A88420[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_myna2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A88420-80A88428 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A88420[2] = { + (void*)__sinit_d_a_npc_myna2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp b/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp index 853b99ad96d..23f680d4946 100644 --- a/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp +++ b/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.cpp @@ -24,10 +24,10 @@ struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -44,11 +44,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -91,14 +91,14 @@ struct dStage_roomControl_c { /* 8002490C */ void setArcBank(int, char const*); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80A89160 */ ~cXyz(); /* 80A8DD54 */ cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -314,59 +314,6 @@ static bool daNpc_Ne_IsDelete(npc_ne_class*); static void daNpc_Ne_Delete(npc_ne_class*); static void useHeapInit(fopAc_ac_c*); static void daNpc_Ne_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4377; -extern "C" extern u32 const lit_5007; -extern "C" extern u32 const lit_5008; -extern "C" extern u32 const lit_5009; -extern "C" extern u32 const lit_5213; -extern "C" extern u32 const lit_5214; -extern "C" extern u32 const lit_6813; -extern "C" extern u32 const lit_6814; -extern "C" extern u32 const lit_6818; -extern "C" extern u32 const lit_6819; -extern "C" extern u32 const lit_6820; -extern "C" extern u32 const lit_6822; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_NE[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80A92B1C[4]; -extern "C" extern u8 data_80A92B20[4]; -extern "C" extern u8 data_80A92B24[4]; -extern "C" extern u8 data_80A92B28[4]; -extern "C" extern u8 data_80A92B2C[4]; -extern "C" extern u8 data_80A92B30[4]; -extern "C" extern u8 data_80A92B34[4]; -extern "C" extern u8 data_80A92B38[4]; -extern "C" extern u8 data_80A92B3C[4]; -extern "C" extern u8 data_80A92B40[4]; -extern "C" extern u8 data_80A92B44[4]; -extern "C" extern u8 data_80A92B48[4]; -extern "C" extern u8 data_80A92B4C[4]; -extern "C" extern u8 data_80A92B50[4]; -extern "C" extern u8 data_80A92B54[4]; -extern "C" extern u8 data_80A92B58[4]; -extern "C" extern u8 data_80A92B5C[4]; -extern "C" extern u8 data_80A92B60[4]; -extern "C" extern u8 data_80A92B64[4]; -extern "C" extern u8 data_80A92B68[4]; -extern "C" extern u8 data_80A92B6C[4]; -extern "C" extern u8 data_80A92B70[4]; -extern "C" extern u8 data_80A92B74[4]; -extern "C" extern u8 data_80A92B78[4]; -extern "C" extern u8 data_80A92B7C[4]; extern "C" void __ct__14daNpc_Ne_HIO_cFv(); extern "C" static void anm_init__FP12npc_ne_classifUcf(); @@ -528,25 +475,6 @@ void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); void JUTReport(int, int, char const*, ...); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_ne/executor.cpp b/rel/d/a/npc/d_a_npc_ne/executor.cpp index 3d5c241f890..f4598c29b54 100644 --- a/rel/d/a/npc/d_a_npc_ne/executor.cpp +++ b/rel/d/a/npc/d_a_npc_ne/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A92408[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_ne/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_ne/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c01945ff316..880514592d9 100644 --- a/rel/d/a/npc/d_a_npc_ne/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_ne/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A92414[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A92414-80A9241C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A92414[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A92A80-80A92A88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_ne/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_ne/unknown_translation_unit_ctors.cpp index e0239d726f3..1fca08d7bd1 100644 --- a/rel/d/a/npc/d_a_npc_ne/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_ne/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A92408[2]; -extern void* const data_80A92408[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_ne_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A92408-80A92410 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A92408[2] = { + (void*)__sinit_d_a_npc_ne_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_p2/d_a_npc_p2.cpp b/rel/d/a/npc/d_a_npc_p2/d_a_npc_p2.cpp index ccde689dee0..0d74900e056 100644 --- a/rel/d/a/npc/d_a_npc_p2/d_a_npc_p2.cpp +++ b/rel/d/a/npc/d_a_npc_p2/d_a_npc_p2.cpp @@ -16,7 +16,6 @@ static bool daNpc_P2Delete(void*); static bool daNpc_P2Execute(void*); static bool daNpc_P2Draw(void*); static bool daNpc_P2IsDelete(void*); -extern "C" extern void* g_profile_NPC_P2[12]; extern "C" static bool daNpc_P2Create__FPv(); extern "C" static bool daNpc_P2Delete__FPv(); @@ -32,9 +31,6 @@ extern "C" extern void* g_profile_NPC_P2[12]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/rel/d/a/npc/d_a_npc_p2/executor.cpp b/rel/d/a/npc/d_a_npc_p2/executor.cpp index 1b67d38196e..6a57c701518 100644 --- a/rel/d/a/npc/d_a_npc_p2/executor.cpp +++ b/rel/d/a/npc/d_a_npc_p2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80A92C20[4]; -extern u8 const data_80A92C24[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_p2/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_p2/unknown_translation_unit_ctors.cpp index 8e4144123ae..a35f296d7e0 100644 --- a/rel/d/a/npc/d_a_npc_p2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_p2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A92C20[4]; -extern u8 const data_80A92C20[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80A92C20[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A92C20-80A92C24 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80A92C20[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_p2/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_p2/unknown_translation_unit_dtors.cpp index 6a9970f40e2..69a075eab9b 100644 --- a/rel/d/a/npc/d_a_npc_p2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_p2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80A92C24[4]; -extern u8 const data_80A92C24[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80A92C24[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80A92C24-80A92C28 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80A92C24[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp b/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp index 801cd1e7f1b..e6ba32207d9 100644 --- a/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_besu/d_a_npc_pachi_besu.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,20 +39,16 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; -struct daNpcT_motionAnmData_c {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80A95B40 */ ~cXyz(); /* 80A961D0 */ cXyz(); }; +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -61,6 +57,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80A961D4 */ ~daNpcT_MotionSeqMngr_c(); }; +struct J3DJoint {}; + +struct daNpcT_evtData_c {}; + struct daNpc_Pachi_Besu_c { /* 80A92D6C */ ~daNpc_Pachi_Besu_c(); /* 80A92EA4 */ void create(); @@ -143,13 +143,13 @@ struct daNpc_Pachi_Besu_Param_c { struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -390,51 +390,6 @@ static void daNpc_Pachi_Besu_Delete(void*); static void daNpc_Pachi_Besu_Execute(void*); static void daNpc_Pachi_Besu_Draw(void*); static bool daNpc_Pachi_Besu_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_loadResPtrn1[3 + 1 /* padding */]; -extern "C" extern u8 l_loadResPtrn2[3 + 1 /* padding */]; -extern "C" extern u8 l_loadResPtrn3[3 + 1 /* padding */]; -extern "C" extern void* g_profile_NPC_PACHI_BESU[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80A97B34[4]; -extern "C" extern u8 data_80A97B38[4]; -extern "C" extern u8 data_80A97B3C[4]; -extern "C" extern u8 data_80A97B40[4]; -extern "C" extern u8 data_80A97B44[4]; -extern "C" extern u8 data_80A97B48[4]; -extern "C" extern u8 data_80A97B4C[4]; -extern "C" extern u8 data_80A97B50[4]; -extern "C" extern u8 data_80A97B54[4]; -extern "C" extern u8 data_80A97B58[4]; -extern "C" extern u8 data_80A97B5C[4]; -extern "C" extern u8 data_80A97B60[4]; -extern "C" extern u8 data_80A97B64[4]; -extern "C" extern u8 data_80A97B68[4]; -extern "C" extern u8 data_80A97B6C[4]; -extern "C" extern u8 data_80A97B70[4]; -extern "C" extern u8 data_80A97B74[4]; -extern "C" extern u8 data_80A97B78[4]; -extern "C" extern u8 data_80A97B7C[4]; -extern "C" extern u8 data_80A97B80[4]; -extern "C" extern u8 data_80A97B84[4]; -extern "C" extern u8 data_80A97B88[4]; -extern "C" extern u8 data_80A97B8C[4]; -extern "C" extern u8 data_80A97B90[4]; -extern "C" extern u8 data_80A97B94[4]; extern "C" void __dt__18daNpc_Pachi_Besu_cFv(); extern "C" void create__18daNpc_Pachi_Besu_cFv(); @@ -628,22 +583,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_pachi_besu/executor.cpp b/rel/d/a/npc/d_a_npc_pachi_besu/executor.cpp index 0b84f87d8b9..4aede5b7a80 100644 --- a/rel/d/a/npc/d_a_npc_pachi_besu/executor.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_besu/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A96A58[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_pachi_besu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_pachi_besu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 837247b75c7..2410ee4b68b 100644 --- a/rel/d/a/npc/d_a_npc_pachi_besu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_besu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A96A64[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A96A64-80A96A6C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A96A64[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A97AC0-80A97AC8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_pachi_besu/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_pachi_besu/unknown_translation_unit_ctors.cpp index bc56f9f290e..371bd35ff14 100644 --- a/rel/d/a/npc/d_a_npc_pachi_besu/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_besu/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A96A58[2]; -extern void* const data_80A96A58[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_pachi_besu_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A96A58-80A96A60 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A96A58[2] = { + (void*)__sinit_d_a_npc_pachi_besu_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp b/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp index d1256fb31a2..f37b079fea5 100644 --- a/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_maro/d_a_npc_pachi_maro.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,10 +39,6 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_motionAnmData_c {}; @@ -60,6 +56,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80A9B054 */ ~daNpcT_MotionSeqMngr_c(); }; +struct J3DJoint {}; + +struct daNpcT_evtData_c {}; + struct daNpc_Pachi_Maro_c { /* 80A97C8C */ ~daNpc_Pachi_Maro_c(); /* 80A97DC4 */ void create(); @@ -144,13 +144,13 @@ struct daNpc_Pachi_Maro_Param_c { struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -389,10 +389,6 @@ static void daNpc_Pachi_Maro_Delete(void*); static void daNpc_Pachi_Maro_Execute(void*); static void daNpc_Pachi_Maro_Draw(void*); static bool daNpc_Pachi_Maro_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_loadResPtrn0[3 + 1 /* padding */]; -extern "C" extern u8 l_loadResPtrn1[3 + 1 /* padding */]; -extern "C" extern void* g_profile_NPC_PACHI_MARO[12]; extern "C" void __dt__18daNpc_Pachi_Maro_cFv(); extern "C" void create__18daNpc_Pachi_Maro_cFv(); @@ -544,22 +540,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_pachi_maro/executor.cpp b/rel/d/a/npc/d_a_npc_pachi_maro/executor.cpp index 9adfd75bbd7..b5f4780ed09 100644 --- a/rel/d/a/npc/d_a_npc_pachi_maro/executor.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_maro/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80A9B878[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_pachi_maro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_pachi_maro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 85c14a3a871..c21b3b60177 100644 --- a/rel/d/a/npc/d_a_npc_pachi_maro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_maro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80A9B884[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80A9B884-80A9B88C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80A9B884[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80A9C178-80A9C180 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_pachi_maro/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_pachi_maro/unknown_translation_unit_ctors.cpp index ddbff327149..c135103854c 100644 --- a/rel/d/a/npc/d_a_npc_pachi_maro/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_maro/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80A9B878[2]; -extern void* const data_80A9B878[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_pachi_maro_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80A9B878-80A9B880 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80A9B878[2] = { + (void*)__sinit_d_a_npc_pachi_maro_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp b/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp index 78b41e28e45..fab23be5f2e 100644 --- a/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_taro/d_a_npc_pachi_taro.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,20 +39,16 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; -struct daNpcT_motionAnmData_c {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80AA06E0 */ ~cXyz(); /* 80AA0D70 */ cXyz(); }; +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -61,6 +57,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80AA0D74 */ ~daNpcT_MotionSeqMngr_c(); }; +struct J3DJoint {}; + +struct daNpcT_evtData_c {}; + struct daNpc_Pachi_Taro_c { /* 80A9C28C */ ~daNpc_Pachi_Taro_c(); /* 80A9C3C4 */ void create(); @@ -161,13 +161,13 @@ struct daNpc_Pachi_Taro_Param_c { struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -432,8 +432,6 @@ static void daNpc_Pachi_Taro_Delete(void*); static void daNpc_Pachi_Taro_Execute(void*); static void daNpc_Pachi_Taro_Draw(void*); static bool daNpc_Pachi_Taro_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_PACHI_TARO[12]; extern "C" void __dt__18daNpc_Pachi_Taro_cFv(); extern "C" void create__18daNpc_Pachi_Taro_cFv(); @@ -607,23 +605,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_pachi_taro/executor.cpp b/rel/d/a/npc/d_a_npc_pachi_taro/executor.cpp index 300a1823365..6346b4de241 100644 --- a/rel/d/a/npc/d_a_npc_pachi_taro/executor.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_taro/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AA15F0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_pachi_taro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_pachi_taro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a059263478a..76f82e50522 100644 --- a/rel/d/a/npc/d_a_npc_pachi_taro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_taro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AA15FC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AA15FC-80AA1604 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AA15FC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AA2B80-80AA2B88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_pachi_taro/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_pachi_taro/unknown_translation_unit_ctors.cpp index baa4f846cd0..14135b6784b 100644 --- a/rel/d/a/npc/d_a_npc_pachi_taro/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_pachi_taro/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AA15F0[2]; -extern void* const data_80AA15F0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_pachi_taro_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AA15F0-80AA15F8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AA15F0[2] = { + (void*)__sinit_d_a_npc_pachi_taro_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp b/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp index a99b03a731c..f9bc0dbcf86 100644 --- a/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp +++ b/rel/d/a/npc/d_a_npc_passer/d_a_npc_passer.cpp @@ -149,16 +149,16 @@ struct dBgS_AcchCir { /* 80AA68A0 */ ~dBgS_AcchCir(); }; +struct cXyz { + /* 80AA6654 */ ~cXyz(); +}; + struct csXyz { /* 80AA6690 */ ~csXyz(); }; struct dBgS {}; -struct cXyz { - /* 80AA6654 */ ~cXyz(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -236,8 +236,6 @@ static void daNpcPasser_Draw(void*); static bool daNpcPasser_IsDelete(void*); static void cLib_getRndValue__template0(f32, f32); static void cLib_getRndValue__template1(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_PASSER[12]; extern "C" void __dt__13daNpcPasser_cFv(); extern "C" void createHeap__13daNpcPasser_cFv(); @@ -342,20 +340,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern u8 const m_cylDat__10daNpcCd2_c[68]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 l_Cd2_HIO[16396]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void setMorf__13mDoExt_morf_cFf(); diff --git a/rel/d/a/npc/d_a_npc_passer/executor.cpp b/rel/d/a/npc/d_a_npc_passer/executor.cpp index e64893f03c3..fc2003360ee 100644 --- a/rel/d/a/npc/d_a_npc_passer/executor.cpp +++ b/rel/d/a/npc/d_a_npc_passer/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AA6980[2]; -extern u8 const data_80AA6988[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_passer/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_passer/unknown_translation_unit_ctors.cpp index e9d20dc5dc1..c549d544673 100644 --- a/rel/d/a/npc/d_a_npc_passer/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_passer/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AA6980[2]; -extern void* const data_80AA6980[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_passer_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AA6980-80AA6988 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AA6980[2] = { + (void*)__sinit_d_a_npc_passer_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_passer/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_passer/unknown_translation_unit_dtors.cpp index f4f7f5f02b6..9da2bd30fad 100644 --- a/rel/d/a/npc/d_a_npc_passer/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_passer/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80AA6988[4]; -extern u8 const data_80AA6988[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80AA6988[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80AA6988-80AA698C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80AA6988[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp b/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp index 3a5e5d6d21f..c3858a243e3 100644 --- a/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp +++ b/rel/d/a/npc/d_a_npc_passer2/d_a_npc_passer2.cpp @@ -95,12 +95,12 @@ struct dBgS_AcchCir { /* 80AA892C */ ~dBgS_AcchCir(); }; +struct cXyz {}; + struct csXyz {}; struct dBgS {}; -struct cXyz {}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -171,8 +171,6 @@ static void daNpcPasser2_Execute(void*); static void daNpcPasser2_Draw(void*); static bool daNpcPasser2_IsDelete(void*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_PASSER2[12]; extern "C" static void createHeapCallBack__FP10fopAc_ac_c(); extern "C" void setAction__14daNpcPasser2_cFQ214daNpcPasser2_c6Mode_e(); @@ -229,18 +227,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern u8 const m_cylDat__9daNpcCd_c[68]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 l_Cd_HIO[10684]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void setMorf__13mDoExt_morf_cFf(); diff --git a/rel/d/a/npc/d_a_npc_passer2/executor.cpp b/rel/d/a/npc/d_a_npc_passer2/executor.cpp index edeff1f6fc9..02a7c370901 100644 --- a/rel/d/a/npc/d_a_npc_passer2/executor.cpp +++ b/rel/d/a/npc/d_a_npc_passer2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AA8A0C[2]; -extern u8 const data_80AA8A14[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_passer2/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_passer2/unknown_translation_unit_ctors.cpp index addfc094795..3abed8b1840 100644 --- a/rel/d/a/npc/d_a_npc_passer2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_passer2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AA8A0C[2]; -extern void* const data_80AA8A0C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_passer2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AA8A0C-80AA8A14 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AA8A0C[2] = { + (void*)__sinit_d_a_npc_passer2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_passer2/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_passer2/unknown_translation_unit_dtors.cpp index 33a0b4f059a..1d0936dad81 100644 --- a/rel/d/a/npc/d_a_npc_passer2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_passer2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80AA8A14[4]; -extern u8 const data_80AA8A14[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80AA8A14[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80AA8A14-80AA8A18 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80AA8A14[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp b/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp index 4763a215aa2..953dfd66c72 100644 --- a/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp +++ b/rel/d/a/npc/d_a_npc_post/d_a_npc_post.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -126,20 +126,20 @@ struct daNpc_Post_Param_c { /* 80AAD120 */ ~daNpc_Post_Param_c(); }; -struct J3DModel {}; - struct csXyz { /* 80AAC2C8 */ ~csXyz(); /* 80AAC864 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148058 */ void getTrnsfrmAnmP(char const*, int); @@ -241,14 +241,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80AAC9B0 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -416,53 +416,6 @@ static void daNpc_Post_Draw(void*); static bool daNpc_Post_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); -extern "C" extern u8 const lit_5155[8]; -extern "C" extern u32 const lit_5411; -extern "C" extern u32 const lit_5412; -extern "C" extern u32 const lit_5413; -extern "C" extern u8 const lit_5417[8]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_POST[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80AADC5C[4]; -extern "C" extern u8 data_80AADC60[4]; -extern "C" extern u8 data_80AADC64[4]; -extern "C" extern u8 data_80AADC68[4]; -extern "C" extern u8 data_80AADC6C[4]; -extern "C" extern u8 data_80AADC70[4]; -extern "C" extern u8 data_80AADC74[4]; -extern "C" extern u8 data_80AADC78[4]; -extern "C" extern u8 data_80AADC7C[4]; -extern "C" extern u8 data_80AADC80[4]; -extern "C" extern u8 data_80AADC84[4]; -extern "C" extern u8 data_80AADC88[4]; -extern "C" extern u8 data_80AADC8C[4]; -extern "C" extern u8 data_80AADC90[4]; -extern "C" extern u8 data_80AADC94[4]; -extern "C" extern u8 data_80AADC98[4]; -extern "C" extern u8 data_80AADC9C[4]; -extern "C" extern u8 data_80AADCA0[4]; -extern "C" extern u8 data_80AADCA4[4]; -extern "C" extern u8 data_80AADCA8[4]; -extern "C" extern u8 data_80AADCAC[4]; -extern "C" extern u8 data_80AADCB0[4]; -extern "C" extern u8 data_80AADCB4[4]; -extern "C" extern u8 data_80AADCB8[4]; -extern "C" extern u8 data_80AADCBC[4]; extern "C" void __dt__12daNpc_Post_cFv(); extern "C" void create__12daNpc_Post_cFv(); @@ -641,24 +594,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_post/executor.cpp b/rel/d/a/npc/d_a_npc_post/executor.cpp index e0a45c76629..c0cebe83336 100644 --- a/rel/d/a/npc/d_a_npc_post/executor.cpp +++ b/rel/d/a/npc/d_a_npc_post/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AAD1D8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_post/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_post/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 332b11b613b..47812687e85 100644 --- a/rel/d/a/npc/d_a_npc_post/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_post/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AAD1E4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AAD1E4-80AAD1EC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AAD1E4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AADBE8-80AADBF0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_post/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_post/unknown_translation_unit_ctors.cpp index 60a89310e3c..0ed063f9c02 100644 --- a/rel/d/a/npc/d_a_npc_post/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_post/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AAD1D8[2]; -extern void* const data_80AAD1D8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_post_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AAD1D8-80AAD1E0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AAD1D8[2] = { + (void*)__sinit_d_a_npc_post_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp b/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp index 527b311c353..899bccae99d 100644 --- a/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp +++ b/rel/d/a/npc/d_a_npc_pouya/d_a_npc_pouya.cpp @@ -19,12 +19,6 @@ struct mDoGph_gInf_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -33,6 +27,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -110,15 +110,6 @@ struct daNpc_Pouya_Param_c { /* 80AB1F94 */ ~daNpc_Pouya_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80AB11C0 */ ~csXyz(); - /* 80AB16D8 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -126,6 +117,13 @@ struct cXyz { /* 80AB17D8 */ cXyz(); }; +struct csXyz { + /* 80AB11C0 */ ~csXyz(); + /* 80AB16D8 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -134,6 +132,8 @@ struct dCcD_GObjInf { struct J3DAnmTevRegKey {}; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148148 */ void getTevRegKeyAnmP(char const*, int); @@ -414,9 +414,6 @@ static void daNpc_Pouya_Execute(void*); static void daNpc_Pouya_Draw(void*); static bool daNpc_Pouya_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 const lit_5332; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_POUYA[12]; extern "C" void __dt__13daNpc_Pouya_cFv(); extern "C" void create__13daNpc_Pouya_cFv(); @@ -544,27 +541,6 @@ void cM_rndF(f32); void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_saftyWhiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mFadeRate__13mDoGph_gInf_c; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void fadeOut_f__13mDoGph_gInf_cFfR8_GXColor(); diff --git a/rel/d/a/npc/d_a_npc_pouya/executor.cpp b/rel/d/a/npc/d_a_npc_pouya/executor.cpp index 109f9491aed..9467fb9cd75 100644 --- a/rel/d/a/npc/d_a_npc_pouya/executor.cpp +++ b/rel/d/a/npc/d_a_npc_pouya/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AB1FEC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_pouya/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_pouya/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6b138a5a86d..11bbaa5d81c 100644 --- a/rel/d/a/npc/d_a_npc_pouya/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_pouya/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AB1FF8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AB1FF8-80AB2000 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AB1FF8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AB2CE8-80AB2CF0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_pouya/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_pouya/unknown_translation_unit_ctors.cpp index 5aa00774866..457a2ba7ceb 100644 --- a/rel/d/a/npc/d_a_npc_pouya/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_pouya/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AB1FEC[2]; -extern void* const data_80AB1FEC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_pouya_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AB1FEC-80AB1FF4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AB1FEC[2] = { + (void*)__sinit_d_a_npc_pouya_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp b/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp index 9ba00570325..acf8085351c 100644 --- a/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp +++ b/rel/d/a/npc/d_a_npc_prayer/d_a_npc_prayer.cpp @@ -25,13 +25,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -88,10 +88,10 @@ struct daNpcPray_Param_c { /* 80AB579C */ ~daNpcPray_Param_c(); }; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -288,8 +288,6 @@ static void daNpcPray_Delete(void*); static void daNpcPray_Execute(void*); static void daNpcPray_Draw(void*); static bool daNpcPray_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_PRAYER[12]; extern "C" void __ct__11daNpcPray_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -376,20 +374,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_prayer/executor.cpp b/rel/d/a/npc/d_a_npc_prayer/executor.cpp index f44f86ada1f..ad1e0faa89e 100644 --- a/rel/d/a/npc/d_a_npc_prayer/executor.cpp +++ b/rel/d/a/npc/d_a_npc_prayer/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AB57F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_prayer/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_prayer/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6e6950a985d..a62d0f1a6bc 100644 --- a/rel/d/a/npc/d_a_npc_prayer/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_prayer/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AB5800[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AB5800-80AB5808 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AB5800[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AB5BA0-80AB5BA8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_prayer/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_prayer/unknown_translation_unit_ctors.cpp index a9625711c38..12869f9af6f 100644 --- a/rel/d/a/npc/d_a_npc_prayer/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_prayer/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AB57F4[2]; -extern void* const data_80AB57F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_prayer_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AB57F4-80AB57FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AB57F4[2] = { + (void*)__sinit_d_a_npc_prayer_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp b/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp index 8b7ae102378..3c3c16c0146 100644 --- a/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp +++ b/rel/d/a/npc/d_a_npc_raca/d_a_npc_raca.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -116,13 +116,13 @@ struct daNpc_Raca_Param_c { struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -221,6 +221,12 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F40 */ void SetWallR(f32); + /* 80AB86EC */ ~dBgS_AcchCir(); +}; + struct csXyz { /* 80AB8004 */ ~csXyz(); /* 80AB85A0 */ csXyz(); @@ -228,12 +234,6 @@ struct csXyz { struct dBgS {}; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80AB86EC */ ~dBgS_AcchCir(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -376,8 +376,6 @@ static void daNpc_Raca_Delete(void*); static void daNpc_Raca_Execute(void*); static void daNpc_Raca_Draw(void*); static bool daNpc_Raca_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_RACA[12]; extern "C" void __dt__12daNpc_Raca_cFv(); extern "C" void create__12daNpc_Raca_cFv(); @@ -502,25 +500,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_raca/executor.cpp b/rel/d/a/npc/d_a_npc_raca/executor.cpp index f8efb81dff8..08d6abc1ba3 100644 --- a/rel/d/a/npc/d_a_npc_raca/executor.cpp +++ b/rel/d/a/npc/d_a_npc_raca/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AB8EB4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_raca/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_raca/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1f7526371cb..ddece9d2007 100644 --- a/rel/d/a/npc/d_a_npc_raca/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_raca/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AB8EC0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AB8EC0-80AB8EC8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AB8EC0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AB9528-80AB9530 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_raca/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_raca/unknown_translation_unit_ctors.cpp index bfa75e14a3b..be9fd3529df 100644 --- a/rel/d/a/npc/d_a_npc_raca/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_raca/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AB8EB4[2]; -extern void* const data_80AB8EB4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_raca_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AB8EB4-80AB8EBC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AB8EB4[2] = { + (void*)__sinit_d_a_npc_raca_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp b/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp index 23eabeb62bd..a1a7aa43a14 100644 --- a/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp +++ b/rel/d/a/npc/d_a_npc_rafrel/d_a_npc_rafrel.cpp @@ -21,10 +21,6 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -33,6 +29,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -46,10 +46,10 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daNpcRafrel_c { /* 80AB962C */ daNpcRafrel_c(); /* 80AB9840 */ ~daNpcRafrel_c(); @@ -92,16 +92,16 @@ struct daNpcRafrel_Param_c { /* 80ABF974 */ ~daNpcRafrel_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -143,17 +143,17 @@ struct daNpcF_MatAnm_c { /* 80150738 */ void initialize(); }; -struct csXyz { - /* 80ABF2E0 */ ~csXyz(); - /* 80ABF31C */ csXyz(); -}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80ABF320 */ ~cXyz(); /* 80ABF35C */ cXyz(); }; +struct csXyz { + /* 80ABF2E0 */ ~csXyz(); + /* 80ABF31C */ csXyz(); +}; + struct daNpcF_Lookat_c { /* 80151038 */ void initialize(); /* 801510B8 */ void setParam(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s16, @@ -374,10 +374,6 @@ static void daNpcRafrel_Delete(void*); static void daNpcRafrel_Execute(void*); static void daNpcRafrel_Draw(void*); static bool daNpcRafrel_IsDelete(void*); -extern "C" extern u8 const lit_4700[32]; -extern "C" extern u8 const lit_4750[76]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_RAFREL[12]; extern "C" void __ct__13daNpcRafrel_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -487,25 +483,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/npc/d_a_npc_rafrel/executor.cpp b/rel/d/a/npc/d_a_npc_rafrel/executor.cpp index 6a26d8da759..358d69aeda2 100644 --- a/rel/d/a/npc/d_a_npc_rafrel/executor.cpp +++ b/rel/d/a/npc/d_a_npc_rafrel/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80ABF9CC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_rafrel/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_rafrel/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5b58df5a0fd..a4ea97a7c85 100644 --- a/rel/d/a/npc/d_a_npc_rafrel/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_rafrel/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80ABF9D8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80ABF9D8-80ABF9E0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80ABF9D8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AC0310-80AC0318 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_rafrel/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_rafrel/unknown_translation_unit_ctors.cpp index 6fa5171a697..dc6b0cc03da 100644 --- a/rel/d/a/npc/d_a_npc_rafrel/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_rafrel/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80ABF9CC[2]; -extern void* const data_80ABF9CC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_rafrel_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80ABF9CC-80ABF9D4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80ABF9CC[2] = { + (void*)__sinit_d_a_npc_rafrel_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp b/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp index f46701a0552..b98b5580ffd 100644 --- a/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp +++ b/rel/d/a/npc/d_a_npc_saru/d_a_npc_saru.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -103,15 +103,6 @@ struct daNpc_Saru_Param_c { /* 80AC448C */ ~daNpc_Saru_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80AC3648 */ ~csXyz(); - /* 80AC3BE4 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -119,11 +110,20 @@ struct cXyz { /* 80AC3CE4 */ cXyz(); }; +struct csXyz { + /* 80AC3648 */ ~csXyz(); + /* 80AC3BE4 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -352,8 +352,6 @@ static void daNpc_Saru_Execute(void*); static void daNpc_Saru_Draw(void*); static bool daNpc_Saru_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SARU[12]; extern "C" void __dt__12daNpc_Saru_cFv(); extern "C" void create__12daNpc_Saru_cFv(); @@ -476,24 +474,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_saru/executor.cpp b/rel/d/a/npc/d_a_npc_saru/executor.cpp index 70c3f208c63..2583cbf47be 100644 --- a/rel/d/a/npc/d_a_npc_saru/executor.cpp +++ b/rel/d/a/npc/d_a_npc_saru/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AC44E4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_saru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_saru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fcb55052cd7..89875d984b6 100644 --- a/rel/d/a/npc/d_a_npc_saru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_saru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AC44F0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AC44F0-80AC44F8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AC44F0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AC4FE0-80AC4FE8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_saru/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_saru/unknown_translation_unit_ctors.cpp index eb3a93435fd..b718f8eec5d 100644 --- a/rel/d/a/npc/d_a_npc_saru/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_saru/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AC44E4[2]; -extern void* const data_80AC44E4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_saru_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AC44E4-80AC44EC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AC44E4[2] = { + (void*)__sinit_d_a_npc_saru_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp b/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp index ee476cc6021..9fc7b6ebec1 100644 --- a/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp +++ b/rel/d/a/npc/d_a_npc_seib/d_a_npc_seib.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -90,20 +90,20 @@ struct daNpc_seiB_Param_c { /* 80AC6FB8 */ ~daNpc_seiB_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct cXyz { /* 80AC6664 */ ~cXyz(); /* 80AC6BE0 */ cXyz(); }; -struct J3DAnmTextureSRTKey {}; +struct J3DJoint {}; + +struct J3DModel {}; struct J3DAnmTevRegKey {}; -struct J3DJoint {}; +struct _GXColorS10 {}; struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); @@ -285,8 +285,6 @@ static void daNpc_seiB_Delete(void*); static void daNpc_seiB_Execute(void*); static void daNpc_seiB_Draw(void*); static bool daNpc_seiB_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SEIB[12]; extern "C" void __dt__12daNpc_seiB_cFv(); extern "C" void create__12daNpc_seiB_cFv(); @@ -381,14 +379,6 @@ void dComIfGs_wolfeye_effect_check(); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; SECTION_INIT void memset(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_seib/executor.cpp b/rel/d/a/npc/d_a_npc_seib/executor.cpp index bf59f8f9652..e28f8d7defa 100644 --- a/rel/d/a/npc/d_a_npc_seib/executor.cpp +++ b/rel/d/a/npc/d_a_npc_seib/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AC7010[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_seib/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_seib/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index bb70f5b0477..39b6f676c12 100644 --- a/rel/d/a/npc/d_a_npc_seib/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_seib/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AC701C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AC701C-80AC7024 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AC701C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AC7438-80AC7440 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_seib/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_seib/unknown_translation_unit_ctors.cpp index a500eef3d4d..0e96582f2de 100644 --- a/rel/d/a/npc/d_a_npc_seib/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_seib/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AC7010[2]; -extern void* const data_80AC7010[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_seib_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AC7010-80AC7018 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AC7010[2] = { + (void*)__sinit_d_a_npc_seib_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp b/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp index 2e2ff7391d4..5abc5e81aaa 100644 --- a/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp +++ b/rel/d/a/npc/d_a_npc_seic/d_a_npc_seic.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -89,20 +89,20 @@ struct daNpc_seiC_Param_c { /* 80AC91B0 */ ~daNpc_seiC_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct cXyz { /* 80AC885C */ ~cXyz(); /* 80AC8DD8 */ cXyz(); }; -struct J3DAnmTextureSRTKey {}; +struct J3DJoint {}; + +struct J3DModel {}; struct J3DAnmTevRegKey {}; -struct J3DJoint {}; +struct _GXColorS10 {}; struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); @@ -284,8 +284,6 @@ static void daNpc_seiC_Delete(void*); static void daNpc_seiC_Execute(void*); static void daNpc_seiC_Draw(void*); static bool daNpc_seiC_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SEIC[12]; extern "C" void __dt__12daNpc_seiC_cFv(); extern "C" void create__12daNpc_seiC_cFv(); @@ -380,14 +378,6 @@ void dComIfGs_wolfeye_effect_check(); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; SECTION_INIT void memset(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_seic/executor.cpp b/rel/d/a/npc/d_a_npc_seic/executor.cpp index 9e6bf4dc308..feb0adf1304 100644 --- a/rel/d/a/npc/d_a_npc_seic/executor.cpp +++ b/rel/d/a/npc/d_a_npc_seic/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AC9208[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_seic/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_seic/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1eefb875fff..926f0bfe63d 100644 --- a/rel/d/a/npc/d_a_npc_seic/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_seic/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AC9214[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AC9214-80AC921C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AC9214[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AC9578-80AC9580 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_seic/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_seic/unknown_translation_unit_ctors.cpp index 53d11fc521e..6dba6f7c875 100644 --- a/rel/d/a/npc/d_a_npc_seic/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_seic/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AC9208[2]; -extern void* const data_80AC9208[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_seic_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AC9208-80AC9210 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AC9208[2] = { + (void*)__sinit_d_a_npc_seic_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp b/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp index 7c0952e25f1..1ab0698602e 100644 --- a/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp +++ b/rel/d/a/npc/d_a_npc_seid/d_a_npc_seid.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -89,20 +89,20 @@ struct daNpc_seiD_Param_c { /* 80ACB2F0 */ ~daNpc_seiD_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct cXyz { /* 80ACA99C */ ~cXyz(); /* 80ACAF18 */ cXyz(); }; -struct J3DAnmTextureSRTKey {}; +struct J3DJoint {}; + +struct J3DModel {}; struct J3DAnmTevRegKey {}; -struct J3DJoint {}; +struct _GXColorS10 {}; struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); @@ -284,8 +284,6 @@ static void daNpc_seiD_Delete(void*); static void daNpc_seiD_Execute(void*); static void daNpc_seiD_Draw(void*); static bool daNpc_seiD_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SEID[12]; extern "C" void __dt__12daNpc_seiD_cFv(); extern "C" void create__12daNpc_seiD_cFv(); @@ -380,14 +378,6 @@ void dComIfGs_wolfeye_effect_check(); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; SECTION_INIT void memset(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_seid/executor.cpp b/rel/d/a/npc/d_a_npc_seid/executor.cpp index a5ee354589d..2f14364ee80 100644 --- a/rel/d/a/npc/d_a_npc_seid/executor.cpp +++ b/rel/d/a/npc/d_a_npc_seid/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80ACB348[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_seid/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_seid/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a1dfe30665b..ee50df0e32c 100644 --- a/rel/d/a/npc/d_a_npc_seid/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_seid/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80ACB354[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80ACB354-80ACB35C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80ACB354[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80ACB6B8-80ACB6C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_seid/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_seid/unknown_translation_unit_ctors.cpp index b6dee66b27b..2bf7b31c057 100644 --- a/rel/d/a/npc/d_a_npc_seid/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_seid/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80ACB348[2]; -extern void* const data_80ACB348[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_seid_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80ACB348-80ACB350 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80ACB348[2] = { + (void*)__sinit_d_a_npc_seid_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp b/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp index 9092a5380d7..8973b44fa68 100644 --- a/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp +++ b/rel/d/a/npc/d_a_npc_seira/d_a_npc_seira.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -26,6 +20,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -123,22 +123,22 @@ struct daNpc_Seira_Param_c { /* 80ACFC54 */ ~daNpc_Seira_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80ACEEFC */ ~cXyz(); /* 80ACF478 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -424,8 +424,6 @@ static void daNpc_Seira_Draw(void*); static bool daNpc_Seira_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SEIRA[12]; extern "C" void __dt__13daNpc_Seira_cFv(); extern "C" void create__13daNpc_Seira_cFv(); @@ -566,25 +564,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_seira/executor.cpp b/rel/d/a/npc/d_a_npc_seira/executor.cpp index 733d5bf34bb..e52907cbd13 100644 --- a/rel/d/a/npc/d_a_npc_seira/executor.cpp +++ b/rel/d/a/npc/d_a_npc_seira/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80ACFDDC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_seira/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_seira/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a1aeec06694..aff7219ed07 100644 --- a/rel/d/a/npc/d_a_npc_seira/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_seira/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80ACFDE8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80ACFDE8-80ACFDF0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80ACFDE8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AD0AF0-80AD0AF8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_seira/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_seira/unknown_translation_unit_ctors.cpp index cadff08a16f..ac46fe72706 100644 --- a/rel/d/a/npc/d_a_npc_seira/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_seira/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80ACFDDC[2]; -extern void* const data_80ACFDDC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_seira_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80ACFDDC-80ACFDE4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80ACFDDC[2] = { + (void*)__sinit_d_a_npc_seira_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp b/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp index 29821b56c95..5eff48376ab 100644 --- a/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp +++ b/rel/d/a/npc/d_a_npc_seira2/d_a_npc_seira2.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -26,6 +20,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -115,21 +115,21 @@ struct daNpc_Seira2_Param_c { /* 80AD48C4 */ ~daNpc_Seira2_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80AD3B74 */ ~cXyz(); /* 80AD40F0 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -418,8 +418,6 @@ static void daNpc_Seira2_Draw(void*); static bool daNpc_Seira2_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SERA2[12]; extern "C" void __dt__14daNpc_Seira2_cFv(); extern "C" void create__14daNpc_Seira2_cFv(); @@ -556,24 +554,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_seira2/executor.cpp b/rel/d/a/npc/d_a_npc_seira2/executor.cpp index 2a7745294ea..a1cc2bc1cb3 100644 --- a/rel/d/a/npc/d_a_npc_seira2/executor.cpp +++ b/rel/d/a/npc/d_a_npc_seira2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AD4A4C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_seira2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_seira2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2ffd1981c7b..0e51a98f409 100644 --- a/rel/d/a/npc/d_a_npc_seira2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_seira2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AD4A58[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AD4A58-80AD4A60 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AD4A58[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AD5610-80AD5618 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_seira2/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_seira2/unknown_translation_unit_ctors.cpp index d463bfe7f67..71e31e39252 100644 --- a/rel/d/a/npc/d_a_npc_seira2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_seira2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AD4A4C[2]; -extern void* const data_80AD4A4C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_seira2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AD4A4C-80AD4A54 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AD4A4C[2] = { + (void*)__sinit_d_a_npc_seira2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp b/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp index d056731b279..d348a7c77cc 100644 --- a/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp +++ b/rel/d/a/npc/d_a_npc_seirei/d_a_npc_seirei.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -93,20 +93,20 @@ struct daNpc_Seirei_Param_c { /* 80AD7C3C */ ~daNpc_Seirei_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct cXyz { /* 80AD72B4 */ ~cXyz(); /* 80AD7830 */ cXyz(); }; -struct J3DAnmTextureSRTKey {}; +struct J3DJoint {}; + +struct J3DModel {}; struct J3DAnmTevRegKey {}; -struct J3DJoint {}; +struct _GXColorS10 {}; struct daNpcT_c { /* 8014810C */ void getTexSRTKeyAnmP(char const*, int); @@ -200,10 +200,10 @@ struct csXyz { /* 80AD7730 */ csXyz(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -317,8 +317,6 @@ static void daNpc_Seirei_Execute(void*); static void daNpc_Seirei_Draw(void*); static bool daNpc_Seirei_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SEIREI[12]; extern "C" void __dt__14daNpc_Seirei_cFv(); extern "C" void create__14daNpc_Seirei_cFv(); @@ -422,17 +420,6 @@ void daNpcT_onTmpBit(u32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_seirei/executor.cpp b/rel/d/a/npc/d_a_npc_seirei/executor.cpp index eac349050ba..09e4e2f86b7 100644 --- a/rel/d/a/npc/d_a_npc_seirei/executor.cpp +++ b/rel/d/a/npc/d_a_npc_seirei/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AD7C94[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_seirei/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_seirei/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e2c63d695f6..40816443407 100644 --- a/rel/d/a/npc/d_a_npc_seirei/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_seirei/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AD7CA0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AD7CA0-80AD7CA8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AD7CA0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AD80F0-80AD80F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_seirei/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_seirei/unknown_translation_unit_ctors.cpp index daca6014b4a..749e19c2d1f 100644 --- a/rel/d/a/npc/d_a_npc_seirei/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_seirei/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AD7C94[2]; -extern void* const data_80AD7C94[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_seirei_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AD7C94-80AD7C9C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AD7C94[2] = { + (void*)__sinit_d_a_npc_seirei_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp b/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp index 12c3fbb471d..d2efd55804f 100644 --- a/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp +++ b/rel/d/a/npc/d_a_npc_shad/d_a_npc_shad.cpp @@ -33,16 +33,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -61,10 +61,10 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daNpcShad_c { /* 80AD820C */ daNpcShad_c(); /* 80AD8420 */ ~daNpcShad_c(); @@ -117,16 +117,16 @@ struct daNpcShad_Param_c { /* 80AE1F70 */ ~daNpcShad_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -403,12 +403,6 @@ static void daNpcShad_Delete(void*); static void daNpcShad_Execute(void*); static void daNpcShad_Draw(void*); static bool daNpcShad_IsDelete(void*); -extern "C" extern u8 const lit_4854[52]; -extern "C" extern u8 const lit_4913[92]; -extern "C" extern u32 const lit_6549; -extern "C" extern u32 const lit_7144; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SHAD[12]; extern "C" void __ct__11daNpcShad_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -537,26 +531,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/npc/d_a_npc_shad/executor.cpp b/rel/d/a/npc/d_a_npc_shad/executor.cpp index aa650df5089..6242448620b 100644 --- a/rel/d/a/npc/d_a_npc_shad/executor.cpp +++ b/rel/d/a/npc/d_a_npc_shad/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AE1FC8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_shad/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_shad/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 579a618966b..b2c843463fb 100644 --- a/rel/d/a/npc/d_a_npc_shad/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_shad/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AE1FD4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AE1FD4-80AE1FDC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AE1FD4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AE2CB0-80AE2CB8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_shad/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_shad/unknown_translation_unit_ctors.cpp index dabe09832fa..de0e49aab52 100644 --- a/rel/d/a/npc/d_a_npc_shad/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_shad/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AE1FC8[2]; -extern void* const data_80AE1FC8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_shad_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AE1FC8-80AE1FD0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AE1FC8[2] = { + (void*)__sinit_d_a_npc_shad_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp b/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp index 9c218ab215a..5d1d03c0618 100644 --- a/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp +++ b/rel/d/a/npc/d_a_npc_shaman/d_a_npc_shaman.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -113,15 +113,6 @@ struct daNpc_Sha_Param_c { /* 80AE6B5C */ ~daNpc_Sha_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80AE58E4 */ ~csXyz(); - /* 80AE5D24 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -129,12 +120,21 @@ struct cXyz { /* 80AE5E24 */ cXyz(); }; +struct csXyz { + /* 80AE58E4 */ ~csXyz(); + /* 80AE5D24 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -388,8 +388,6 @@ static void daNpc_Sha_Draw(void*); static bool daNpc_Sha_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SHAMAN[12]; extern "C" void __dt__11daNpc_Sha_cFv(); extern "C" void create__11daNpc_Sha_cFv(); @@ -524,25 +522,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_shaman/executor.cpp b/rel/d/a/npc/d_a_npc_shaman/executor.cpp index e183b8bbe32..e33273c5818 100644 --- a/rel/d/a/npc/d_a_npc_shaman/executor.cpp +++ b/rel/d/a/npc/d_a_npc_shaman/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AE6BB4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_shaman/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_shaman/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 35e6c5eb6ed..87c3e3ff0f3 100644 --- a/rel/d/a/npc/d_a_npc_shaman/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_shaman/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AE6BC0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AE6BC0-80AE6BC8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AE6BC0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AE7830-80AE7838 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_shaman/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_shaman/unknown_translation_unit_ctors.cpp index 5605106d015..12c42ab8676 100644 --- a/rel/d/a/npc/d_a_npc_shaman/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_shaman/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AE6BB4[2]; -extern void* const data_80AE6BB4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_shaman_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AE6BB4-80AE6BBC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AE6BB4[2] = { + (void*)__sinit_d_a_npc_shaman_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp b/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp index 597d86c3d43..73e9d66d235 100644 --- a/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp +++ b/rel/d/a/npc/d_a_npc_shoe/d_a_npc_shoe.cpp @@ -13,16 +13,16 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80AE9C2C */ ~csXyz(); - /* 80AE9C68 */ csXyz(); -}; - struct cXyz { /* 80AE9C6C */ ~cXyz(); /* 80AE9CA8 */ cXyz(); }; +struct csXyz { + /* 80AE9C2C */ ~csXyz(); + /* 80AE9C68 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -30,13 +30,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -85,12 +85,12 @@ struct daNpcShoe_Param_c { /* 80AEA344 */ ~daNpcShoe_Param_c(); }; -struct _GXColorS10 {}; - struct J3DAnmTransformKey {}; struct J3DAnmTexPattern {}; +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -285,10 +285,6 @@ static void daNpcShoe_Delete(void*); static void daNpcShoe_Execute(void*); static void daNpcShoe_Draw(void*); static bool daNpcShoe_IsDelete(void*); -extern "C" extern u8 const lit_4494[20]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_btpGetParamList[12]; -extern "C" extern void* g_profile_NPC_SHOE[12]; extern "C" void __ct__11daNpcShoe_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -371,22 +367,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/npc/d_a_npc_shoe/executor.cpp b/rel/d/a/npc/d_a_npc_shoe/executor.cpp index 92e01676bce..9d11d425ee1 100644 --- a/rel/d/a/npc/d_a_npc_shoe/executor.cpp +++ b/rel/d/a/npc/d_a_npc_shoe/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AEA39C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_shoe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_shoe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 851c4f57166..c8f249b2beb 100644 --- a/rel/d/a/npc/d_a_npc_shoe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_shoe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AEA3A8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AEA3A8-80AEA3B0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AEA3A8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AEA730-80AEA738 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_shoe/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_shoe/unknown_translation_unit_ctors.cpp index f67cf06d0ee..3d0de42b901 100644 --- a/rel/d/a/npc/d_a_npc_shoe/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_shoe/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AEA39C[2]; -extern void* const data_80AEA39C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_shoe_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AEA39C-80AEA3A4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AEA39C[2] = { + (void*)__sinit_d_a_npc_shoe_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp b/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp index e48d337496f..d436a6a2699 100644 --- a/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp +++ b/rel/d/a/npc/d_a_npc_shop0/d_a_npc_shop0.cpp @@ -86,14 +86,14 @@ struct dEvent_manager_c { /* 800487F0 */ void ChkPresentEnd(); }; -struct _GXTexObj {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct _GXTexObj {}; + struct dDlst_shadowControl_c { /* 80055F84 */ void setSimple(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); }; @@ -214,8 +214,6 @@ static void daNpc_Shop0_Delete(void*); static void daNpc_Shop0_Execute(void*); static void daNpc_Shop0_Draw(void*); static bool daNpc_Shop0_IsDelete(void*); -extern "C" extern u8 const mParam__19daNpc_Shop0_Param_c[12]; -extern "C" extern void* g_profile_NPC_SHOP0[12]; extern "C" static void createHeapCallBack__FP10fopAc_ac_c(); extern "C" void __dt__13daNpc_Shop0_cFv(); @@ -275,17 +273,6 @@ void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/npc/d_a_npc_shop0/executor.cpp b/rel/d/a/npc/d_a_npc_shop0/executor.cpp index 89b46b00497..ea10ea54a70 100644 --- a/rel/d/a/npc/d_a_npc_shop0/executor.cpp +++ b/rel/d/a/npc/d_a_npc_shop0/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80AEBBCC[4]; -extern u8 const data_80AEBBD0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_shop0/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_shop0/unknown_translation_unit_ctors.cpp index f04f4eb2dbb..84f03188662 100644 --- a/rel/d/a/npc/d_a_npc_shop0/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_shop0/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80AEBBCC[4]; -extern u8 const data_80AEBBCC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80AEBBCC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AEBBCC-80AEBBD0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80AEBBCC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_shop0/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_shop0/unknown_translation_unit_dtors.cpp index 1efcf57592b..3f07dda016a 100644 --- a/rel/d/a/npc/d_a_npc_shop0/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_shop0/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80AEBBD0[4]; -extern u8 const data_80AEBBD0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80AEBBD0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80AEBBD0-80AEBBD4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80AEBBD0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp b/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp index 9a81de7ac6e..6865377c8b8 100644 --- a/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp +++ b/rel/d/a/npc/d_a_npc_shop_maro/d_a_npc_shop_maro.cpp @@ -27,8 +27,6 @@ struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_evtData_c {}; -struct J3DModel {}; - struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -43,6 +41,8 @@ struct cXyz { struct J3DJoint {}; +struct J3DModel {}; + struct daNpcT_c { /* 801490D4 */ void ctrlBtk(); /* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*); @@ -183,7 +183,6 @@ static void daNpc_shopMaro_Delete(void*); static bool daNpc_shopMaro_Execute(void*); static bool daNpc_shopMaro_Draw(void*); static bool daNpc_shopMaro_IsDelete(void*); -extern "C" extern void* g_profile_NPC_SMARO[12]; extern "C" static void daNpc_shopMaro_Create__FPv(); extern "C" static void daNpc_shopMaro_Delete__FPv(); @@ -255,13 +254,6 @@ extern "C" extern void* g_profile_NPC_SMARO[12]; void cM_rndF(f32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; -extern "C" extern void* __vt__9cCcD_Stts[8]; SECTION_INIT void memset(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/npc/d_a_npc_shop_maro/executor.cpp b/rel/d/a/npc/d_a_npc_shop_maro/executor.cpp index 5a735e9aa2b..e4aada44b2e 100644 --- a/rel/d/a/npc/d_a_npc_shop_maro/executor.cpp +++ b/rel/d/a/npc/d_a_npc_shop_maro/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80AEC910[4]; -extern u8 const data_80AEC914[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_shop_maro/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_shop_maro/unknown_translation_unit_ctors.cpp index ecc3c571cda..ca5e3874edf 100644 --- a/rel/d/a/npc/d_a_npc_shop_maro/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_shop_maro/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80AEC910[4]; -extern u8 const data_80AEC910[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80AEC910[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AEC910-80AEC914 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80AEC910[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_shop_maro/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_shop_maro/unknown_translation_unit_dtors.cpp index 72e7319d83f..d7da5898e87 100644 --- a/rel/d/a/npc/d_a_npc_shop_maro/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_shop_maro/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80AEC914[4]; -extern u8 const data_80AEC914[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80AEC914[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80AEC914-80AEC918 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80AEC914[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp b/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp index 7b9317f3d33..b7197580073 100644 --- a/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp +++ b/rel/d/a/npc/d_a_npc_sola/d_a_npc_sola.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -96,21 +96,21 @@ struct daNpc_solA_Param_c { /* 80AEF094 */ ~daNpc_solA_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80AEE328 */ ~cXyz(); /* 80AEE8A4 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -311,8 +311,6 @@ static void daNpc_solA_Delete(void*); static void daNpc_solA_Execute(void*); static void daNpc_solA_Draw(void*); static bool daNpc_solA_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SOLA[12]; extern "C" void __dt__12daNpc_solA_cFv(); extern "C" void create__12daNpc_solA_cFv(); @@ -414,20 +412,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_sola/executor.cpp b/rel/d/a/npc/d_a_npc_sola/executor.cpp index e25e7b3345f..bc506cbd9ff 100644 --- a/rel/d/a/npc/d_a_npc_sola/executor.cpp +++ b/rel/d/a/npc/d_a_npc_sola/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AEF0EC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_sola/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_sola/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4f4a757e67d..5664e0909c9 100644 --- a/rel/d/a/npc/d_a_npc_sola/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_sola/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AEF0F8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AEF0F8-80AEF100 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AEF0F8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AEF478-80AEF480 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_sola/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_sola/unknown_translation_unit_ctors.cpp index e91fcb736a1..5631008b48a 100644 --- a/rel/d/a/npc/d_a_npc_sola/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_sola/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AEF0EC[2]; -extern void* const data_80AEF0EC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_sola_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AEF0EC-80AEF0F4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AEF0EC[2] = { + (void*)__sinit_d_a_npc_sola_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp b/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp index 38b512ffa8a..4488d0b78ee 100644 --- a/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp +++ b/rel/d/a/npc/d_a_npc_soldierA/d_a_npc_soldierA.cpp @@ -28,18 +28,18 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -99,13 +99,13 @@ struct daNpc_SoldierA_Param_c { struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { @@ -295,49 +295,6 @@ static void daNpc_SoldierA_Delete(void*); static void daNpc_SoldierA_Execute(void*); static void daNpc_SoldierA_Draw(void*); static bool daNpc_SoldierA_IsDelete(void*); -extern "C" extern u8 const lit_4929[24]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SOLDIERa[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80AF2B5C[4]; -extern "C" extern u8 data_80AF2B60[4]; -extern "C" extern u8 data_80AF2B64[4]; -extern "C" extern u8 data_80AF2B68[4]; -extern "C" extern u8 data_80AF2B6C[4]; -extern "C" extern u8 data_80AF2B70[4]; -extern "C" extern u8 data_80AF2B74[4]; -extern "C" extern u8 data_80AF2B78[4]; -extern "C" extern u8 data_80AF2B7C[4]; -extern "C" extern u8 data_80AF2B80[4]; -extern "C" extern u8 data_80AF2B84[4]; -extern "C" extern u8 data_80AF2B88[4]; -extern "C" extern u8 data_80AF2B8C[4]; -extern "C" extern u8 data_80AF2B90[4]; -extern "C" extern u8 data_80AF2B94[4]; -extern "C" extern u8 data_80AF2B98[4]; -extern "C" extern u8 data_80AF2B9C[4]; -extern "C" extern u8 data_80AF2BA0[4]; -extern "C" extern u8 data_80AF2BA4[4]; -extern "C" extern u8 data_80AF2BA8[4]; -extern "C" extern u8 data_80AF2BAC[4]; -extern "C" extern u8 data_80AF2BB0[4]; -extern "C" extern u8 data_80AF2BB4[4]; -extern "C" extern u8 data_80AF2BB8[4]; -extern "C" extern u8 data_80AF2BBC[4]; extern "C" void __ct__16daNpc_SoldierA_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -472,23 +429,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_soldierA/executor.cpp b/rel/d/a/npc/d_a_npc_soldierA/executor.cpp index 044685d49da..bea022206a3 100644 --- a/rel/d/a/npc/d_a_npc_soldierA/executor.cpp +++ b/rel/d/a/npc/d_a_npc_soldierA/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AF26D4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_soldierA/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_soldierA/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3f9285c6db6..d872b8f7e28 100644 --- a/rel/d/a/npc/d_a_npc_soldierA/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_soldierA/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AF26E0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AF26E0-80AF26E8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AF26E0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AF2AE8-80AF2AF0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_soldierA/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_soldierA/unknown_translation_unit_ctors.cpp index b37aaf54404..9d92efb4f39 100644 --- a/rel/d/a/npc/d_a_npc_soldierA/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_soldierA/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AF26D4[2]; -extern void* const data_80AF26D4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_soldierA_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AF26D4-80AF26DC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AF26D4[2] = { + (void*)__sinit_d_a_npc_soldierA_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp b/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp index 4492d580cb5..88b9c0a9e35 100644 --- a/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp +++ b/rel/d/a/npc/d_a_npc_soldierB/d_a_npc_soldierB.cpp @@ -28,18 +28,18 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -98,13 +98,13 @@ struct daNpc_SoldierB_Param_c { struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { @@ -291,49 +291,6 @@ static void daNpc_SoldierB_Delete(void*); static void daNpc_SoldierB_Execute(void*); static void daNpc_SoldierB_Draw(void*); static bool daNpc_SoldierB_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_SOLDIERb[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80AF5E9C[4]; -extern "C" extern u8 data_80AF5EA0[4]; -extern "C" extern u8 data_80AF5EA4[4]; -extern "C" extern u8 data_80AF5EA8[4]; -extern "C" extern u8 data_80AF5EAC[4]; -extern "C" extern u8 data_80AF5EB0[4]; -extern "C" extern u8 data_80AF5EB4[4]; -extern "C" extern u8 data_80AF5EB8[4]; -extern "C" extern u8 data_80AF5EBC[4]; -extern "C" extern u8 data_80AF5EC0[4]; -extern "C" extern u8 data_80AF5EC4[4]; -extern "C" extern u8 data_80AF5EC8[4]; -extern "C" extern u8 data_80AF5ECC[4]; -extern "C" extern u8 data_80AF5ED0[4]; -extern "C" extern u8 data_80AF5ED4[4]; -extern "C" extern u8 data_80AF5ED8[4]; -extern "C" extern u8 data_80AF5EDC[4]; -extern "C" extern u8 data_80AF5EE0[4]; -extern "C" extern u8 data_80AF5EE4[4]; -extern "C" extern u8 data_80AF5EE8[4]; -extern "C" extern u8 data_80AF5EEC[4]; -extern "C" extern u8 data_80AF5EF0[4]; -extern "C" extern u8 data_80AF5EF4[4]; -extern "C" extern u8 data_80AF5EF8[4]; -extern "C" extern u8 data_80AF5EFC[4]; extern "C" void __ct__16daNpc_SoldierB_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -470,23 +427,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_soldierB/executor.cpp b/rel/d/a/npc/d_a_npc_soldierB/executor.cpp index d01e2638eb7..fb2d8a60abc 100644 --- a/rel/d/a/npc/d_a_npc_soldierB/executor.cpp +++ b/rel/d/a/npc/d_a_npc_soldierB/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AF5AC0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_soldierB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_soldierB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d14569c60e3..f144c9b400c 100644 --- a/rel/d/a/npc/d_a_npc_soldierB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_soldierB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AF5ACC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AF5ACC-80AF5AD4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AF5ACC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AF5E28-80AF5E30 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_soldierB/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_soldierB/unknown_translation_unit_ctors.cpp index 42e5ce01f10..9936495cfab 100644 --- a/rel/d/a/npc/d_a_npc_soldierB/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_soldierB/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AF5AC0[2]; -extern void* const data_80AF5AC0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_soldierB_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AF5AC0-80AF5AC8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AF5AC0[2] = { + (void*)__sinit_d_a_npc_soldierB_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp b/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp index b49657c8623..51adaa8bb50 100644 --- a/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp +++ b/rel/d/a/npc/d_a_npc_sq/d_a_npc_sq.cpp @@ -32,11 +32,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -61,10 +61,10 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -178,15 +178,6 @@ static bool daNpc_Sq_IsDelete(npc_sq_class*); static void daNpc_Sq_Delete(npc_sq_class*); static void useHeapInit(fopAc_ac_c*); static void daNpc_Sq_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4044; -extern "C" extern u32 const lit_4045; -extern "C" extern u32 const lit_4046; -extern "C" extern u32 const lit_4047; -extern "C" extern u32 const lit_4049; -extern "C" extern u32 const lit_4050; -extern "C" extern u32 const lit_4051[1 + 1 /* padding */]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_SQ[12]; extern "C" void __ct__14daNpc_Sq_HIO_cFv(); extern "C" static void anm_init__FP12npc_sq_classifUcf(); @@ -240,20 +231,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_sq/executor.cpp b/rel/d/a/npc/d_a_npc_sq/executor.cpp index 914cb98e304..c2915738217 100644 --- a/rel/d/a/npc/d_a_npc_sq/executor.cpp +++ b/rel/d/a/npc/d_a_npc_sq/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AF73F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_sq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_sq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 94a67d39587..29a17651575 100644 --- a/rel/d/a/npc/d_a_npc_sq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_sq/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AF7400[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AF7400-80AF7408 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AF7400[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AF75B8-80AF75C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_sq/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_sq/unknown_translation_unit_ctors.cpp index 8e94612adec..f9a37213d7a 100644 --- a/rel/d/a/npc/d_a_npc_sq/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_sq/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AF73F4[2]; -extern void* const data_80AF73F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_sq_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AF73F4-80AF73FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AF73F4[2] = { + (void*)__sinit_d_a_npc_sq_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp b/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp index cd65b1e48a2..d5144bcb173 100644 --- a/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp +++ b/rel/d/a/npc/d_a_npc_taro/d_a_npc_taro.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -149,20 +149,20 @@ struct daNpc_Len_c { /* 80A660D8 */ void checkStartDemo13StbEvt(fopAc_ac_c*, f32, f32, f32, f32, f32, f32, f32); }; -struct J3DModel {}; - struct csXyz { /* 80570634 */ ~csXyz(); /* 80570B88 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148058 */ void getTrnsfrmAnmP(char const*, int); @@ -273,14 +273,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80570CD4 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -450,64 +450,6 @@ static void daNpc_Taro_Draw(void*); static bool daNpc_Taro_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u32 const lit_6197; -extern "C" extern u32 const lit_6198; -extern "C" extern u32 const lit_6432; -extern "C" extern u32 const lit_6433; -extern "C" extern u32 const lit_6874; -extern "C" extern u32 const lit_6875; -extern "C" extern u32 const lit_6876; -extern "C" extern u32 const lit_7053; -extern "C" extern u32 const lit_7054; -extern "C" extern u32 const lit_7055; -extern "C" extern u32 const lit_7056; -extern "C" extern u32 const lit_7057; -extern "C" extern u32 const lit_7058; -extern "C" extern u32 const lit_7366; -extern "C" extern u32 const lit_7367; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_3931[3]; -extern "C" extern void* g_profile_NPC_TARO[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_805735CC[4]; -extern "C" extern u8 data_805735D0[4]; -extern "C" extern u8 data_805735D4[4]; -extern "C" extern u8 data_805735D8[4]; -extern "C" extern u8 data_805735DC[4]; -extern "C" extern u8 data_805735E0[4]; -extern "C" extern u8 data_805735E4[4]; -extern "C" extern u8 data_805735E8[4]; -extern "C" extern u8 data_805735EC[4]; -extern "C" extern u8 data_805735F0[4]; -extern "C" extern u8 data_805735F4[4]; -extern "C" extern u8 data_805735F8[4]; -extern "C" extern u8 data_805735FC[4]; -extern "C" extern u8 data_80573600[4]; -extern "C" extern u8 data_80573604[4]; -extern "C" extern u8 data_80573608[4]; -extern "C" extern u8 data_8057360C[4]; -extern "C" extern u8 data_80573610[4]; -extern "C" extern u8 data_80573614[4]; -extern "C" extern u8 data_80573618[4]; -extern "C" extern u8 data_8057361C[4]; -extern "C" extern u8 data_80573620[4]; -extern "C" extern u8 data_80573624[4]; -extern "C" extern u8 data_80573628[4]; -extern "C" extern u8 data_8057362C[4]; extern "C" void __dt__12daNpc_Taro_cFv(); extern "C" void create__12daNpc_Taro_cFv(); @@ -732,27 +674,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_taro/executor.cpp b/rel/d/a/npc/d_a_npc_taro/executor.cpp index c2ded8227b2..7e38f5a0752 100644 --- a/rel/d/a/npc/d_a_npc_taro/executor.cpp +++ b/rel/d/a/npc/d_a_npc_taro/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805716B4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_taro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_taro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 23e5eb2ff4c..193158f27c2 100644 --- a/rel/d/a/npc/d_a_npc_taro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_taro/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805716C0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805716C0-805716C8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805716C0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80573558-80573560 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_taro/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_taro/unknown_translation_unit_ctors.cpp index 97f0a65777a..809f2c55384 100644 --- a/rel/d/a/npc/d_a_npc_taro/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_taro/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805716B4[2]; -extern void* const data_805716B4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_taro_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805716B4-805716BC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805716B4[2] = { + (void*)__sinit_d_a_npc_taro_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp b/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp index 14372c0b653..6bed0b5134a 100644 --- a/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp +++ b/rel/d/a/npc/d_a_npc_the/d_a_npc_the.cpp @@ -21,10 +21,6 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -33,6 +29,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -56,10 +56,10 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daNpcThe_c { /* 80AF76CC */ daNpcThe_c(); /* 80AF78E0 */ ~daNpcThe_c(); @@ -95,16 +95,16 @@ struct daNpcThe_Param_c { /* 80AFBDA0 */ ~daNpcThe_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -347,11 +347,6 @@ static void daNpcThe_Delete(void*); static void daNpcThe_Execute(void*); static void daNpcThe_Draw(void*); static bool daNpcThe_IsDelete(void*); -extern "C" extern u8 const lit_4535[56]; -extern "C" extern u8 const lit_4567[44]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_THE[12]; extern "C" void __ct__10daNpcThe_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -450,25 +445,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void changeBckOnly__13mDoExt_bckAnmFP15J3DAnmTransform(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_the/executor.cpp b/rel/d/a/npc/d_a_npc_the/executor.cpp index f9362e3c380..6734d5aa171 100644 --- a/rel/d/a/npc/d_a_npc_the/executor.cpp +++ b/rel/d/a/npc/d_a_npc_the/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80AFBDF8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_the/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_the/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5136541067b..6722ec7afe3 100644 --- a/rel/d/a/npc/d_a_npc_the/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_the/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80AFBE04[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80AFBE04-80AFBE0C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80AFBE04[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80AFC668-80AFC670 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_the/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_the/unknown_translation_unit_ctors.cpp index 8f82ab1234d..22d2043edcb 100644 --- a/rel/d/a/npc/d_a_npc_the/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_the/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80AFBDF8[2]; -extern void* const data_80AFBDF8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_the_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80AFBDF8-80AFBE00 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80AFBDF8[2] = { + (void*)__sinit_d_a_npc_the_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp b/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp index 4966342c8e5..2f9005c26bf 100644 --- a/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp +++ b/rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.cpp @@ -34,16 +34,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -68,10 +68,10 @@ struct daStartAndGoal_c { /* 80D4DBAC */ void isStartCheck(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daNpcTheB_c { /* 80AFC76C */ daNpcTheB_c(); /* 80AFC980 */ ~daNpcTheB_c(); @@ -116,16 +116,16 @@ struct daNpcTheB_Param_c { /* 80B00D00 */ ~daNpcTheB_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -372,10 +372,6 @@ static void daNpcTheB_Delete(void*); static void daNpcTheB_Execute(void*); static void daNpcTheB_Draw(void*); static bool daNpcTheB_IsDelete(void*); -extern "C" extern u8 const lit_4829[24]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u32 l_bmdGetParamList; -extern "C" extern void* g_profile_NPC_THEB[12]; extern "C" void __ct__11daNpcTheB_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -487,26 +483,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_theB/executor.cpp b/rel/d/a/npc/d_a_npc_theB/executor.cpp index 8704702ddbe..084b5c5d203 100644 --- a/rel/d/a/npc/d_a_npc_theB/executor.cpp +++ b/rel/d/a/npc/d_a_npc_theB/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B00D58[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_theB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_theB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f300376f80e..2d8b4e66a83 100644 --- a/rel/d/a/npc/d_a_npc_theB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_theB/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B00D64[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B00D64-80B00D6C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B00D64[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B01308-80B01310 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_theB/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_theB/unknown_translation_unit_ctors.cpp index 47a09fc8a6c..039a17a6b2f 100644 --- a/rel/d/a/npc/d_a_npc_theB/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_theB/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B00D58[2]; -extern void* const data_80B00D58[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_theB_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B00D58-80B00D60 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B00D58[2] = { + (void*)__sinit_d_a_npc_theB_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp b/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp index 4661fde8e40..8519ab11881 100644 --- a/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp +++ b/rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -28,6 +26,8 @@ struct cXyz { /* 80B0C0E0 */ cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -37,16 +37,16 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -339,58 +339,6 @@ static bool daNPC_TK_IsDelete(daNPC_TK_c*); static void daNPC_TK_Delete(daNPC_TK_c*); static void useHeapInit(fopAc_ac_c*); static void daNPC_TK_Create(daNPC_TK_c*); -extern "C" extern u32 const lit_7265; -extern "C" extern u32 const lit_7267; -extern "C" extern u32 const lit_7268; -extern "C" extern u32 const lit_7269; -extern "C" extern u32 const lit_7447; -extern "C" extern u32 const lit_7448; -extern "C" extern u32 const lit_7449; -extern "C" extern u32 const lit_7450; -extern "C" extern u32 const lit_7451; -extern "C" extern u32 const lit_7452; -extern "C" extern u32 const lit_7453; -extern "C" extern u32 const lit_7454; -extern "C" extern void* g_profile_NPC_TK[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80B0C668[4]; -extern "C" extern u8 data_80B0C66C[4]; -extern "C" extern u8 data_80B0C670[4]; -extern "C" extern u8 data_80B0C674[4]; -extern "C" extern u8 data_80B0C678[4]; -extern "C" extern u8 data_80B0C67C[4]; -extern "C" extern u8 data_80B0C680[4]; -extern "C" extern u8 data_80B0C684[4]; -extern "C" extern u8 data_80B0C688[4]; -extern "C" extern u8 data_80B0C68C[4]; -extern "C" extern u8 data_80B0C690[4]; -extern "C" extern u8 data_80B0C694[4]; -extern "C" extern u8 data_80B0C698[4]; -extern "C" extern u8 data_80B0C69C[4]; -extern "C" extern u8 data_80B0C6A0[4]; -extern "C" extern u8 data_80B0C6A4[4]; -extern "C" extern u8 data_80B0C6A8[4]; -extern "C" extern u8 data_80B0C6AC[4]; -extern "C" extern u8 data_80B0C6B0[4]; -extern "C" extern u8 data_80B0C6B4[4]; -extern "C" extern u8 data_80B0C6B8[4]; -extern "C" extern u8 data_80B0C6BC[4]; -extern "C" extern u8 data_80B0C6C0[4]; -extern "C" extern u8 data_80B0C6C4[4]; -extern "C" extern u8 data_80B0C6C8[4]; extern "C" void __ct__14daNPC_TK_HIO_cFv(); extern "C" void setBck__10daNPC_TK_cFiUcff(); @@ -562,24 +510,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_tk/executor.cpp b/rel/d/a/npc/d_a_npc_tk/executor.cpp index 898161850ab..3cf37fcb02e 100644 --- a/rel/d/a/npc/d_a_npc_tk/executor.cpp +++ b/rel/d/a/npc/d_a_npc_tk/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B0C1B0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_tk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_tk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1a330911c1d..26bc35b4065 100644 --- a/rel/d/a/npc/d_a_npc_tk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_tk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B0C1BC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B0C1BC-80B0C1C4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B0C1BC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B0C5B0-80B0C5B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_tk/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_tk/unknown_translation_unit_ctors.cpp index 379ca40fdce..a4c04d6fc64 100644 --- a/rel/d/a/npc/d_a_npc_tk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_tk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B0C1B0[2]; -extern void* const data_80B0C1B0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_tk_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B0C1B0-80B0C1B8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B0C1B0[2] = { + (void*)__sinit_d_a_npc_tk_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp b/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp index d184876d5bf..353e68ff4a1 100644 --- a/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp +++ b/rel/d/a/npc/d_a_npc_tkc/d_a_npc_tkc.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80B102AC */ ~csXyz(); - /* 80B104D8 */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -27,6 +22,11 @@ struct cXyz { /* 80B104DC */ cXyz(); }; +struct csXyz { + /* 80B102AC */ ~csXyz(); + /* 80B104D8 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -42,16 +42,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -114,16 +114,16 @@ struct daNpcTkc_Param_c { /* 80B10848 */ ~daNpcTkc_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -339,8 +339,6 @@ static bool daNpcTkc_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); static void cLib_getRndValue__template1(int, int); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_TKC[12]; extern "C" void __ct__10daNpcTkc_cFv(); extern "C" void __dt__8cM3dGSphFv(); @@ -451,23 +449,6 @@ void cLib_chasePos(cXyz*, cXyz const&, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDSph__8daNpcF_c[64]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_tkc/executor.cpp b/rel/d/a/npc/d_a_npc_tkc/executor.cpp index b0525c3afd2..cb34d76f1ba 100644 --- a/rel/d/a/npc/d_a_npc_tkc/executor.cpp +++ b/rel/d/a/npc/d_a_npc_tkc/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B108A0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_tkc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_tkc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 55c3c15c4ba..07d6957205e 100644 --- a/rel/d/a/npc/d_a_npc_tkc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_tkc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B108AC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B108AC-80B108B4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B108AC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B10CE8-80B10CF0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_tkc/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_tkc/unknown_translation_unit_ctors.cpp index 31fcbc56280..80ded151ede 100644 --- a/rel/d/a/npc/d_a_npc_tkc/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_tkc/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B108A0[2]; -extern void* const data_80B108A0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_tkc_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B108A0-80B108A8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B108A0[2] = { + (void*)__sinit_d_a_npc_tkc_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp b/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp index c48ee096646..1bab4f1bcdc 100644 --- a/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp +++ b/rel/d/a/npc/d_a_npc_tkj/d_a_npc_tkj.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -99,21 +99,21 @@ struct daNpcTkj_c { /* 8057651C */ void checkRemoveJoint(int); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 8057578C */ ~cXyz(); /* 80575D08 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -354,8 +354,6 @@ static void daNpc_Tkj_Delete(void*); static void daNpc_Tkj_Execute(void*); static void daNpc_Tkj_Draw(void*); static bool daNpc_Tkj_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_TKJ[12]; extern "C" void __dt__10daNpcTkj_cFv(); extern "C" void create__10daNpcTkj_cFv(); @@ -474,22 +472,6 @@ void cM_rndF(f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_tkj/executor.cpp b/rel/d/a/npc/d_a_npc_tkj/executor.cpp index b91077cfb4e..76c49bd1750 100644 --- a/rel/d/a/npc/d_a_npc_tkj/executor.cpp +++ b/rel/d/a/npc/d_a_npc_tkj/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80576584[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_tkj/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_tkj/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a008bec7291..6497835c1c1 100644 --- a/rel/d/a/npc/d_a_npc_tkj/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_tkj/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80576590[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80576590-80576598 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80576590[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805769C0-805769C8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_tkj/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_tkj/unknown_translation_unit_ctors.cpp index 5c77712f014..f9e8f0fbd0d 100644 --- a/rel/d/a/npc/d_a_npc_tkj/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_tkj/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80576584[2]; -extern void* const data_80576584[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_tkj_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80576584-8057658C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80576584[2] = { + (void*)__sinit_d_a_npc_tkj_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp b/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp index 88cc2279f7d..985f32747fe 100644 --- a/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp +++ b/rel/d/a/npc/d_a_npc_tkj2/d_a_npc_tkj2.cpp @@ -15,14 +15,14 @@ struct request_of_phase_process_class {}; struct npc_tkj2_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -30,10 +30,10 @@ struct mDoMtx_stack_c { /* 8000CF44 */ void ZXYrotM(csXyz const&); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -48,13 +48,13 @@ struct mDoExt_btkAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -240,14 +240,6 @@ static bool daNpc_Tkj2_IsDelete(npc_tkj2_class*); static void daNpc_Tkj2_Delete(npc_tkj2_class*); static void useHeapInit(fopAc_ac_c*); static void daNpc_Tkj2_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4756; -extern "C" extern u32 const lit_4757; -extern "C" extern u32 const lit_4758; -extern "C" extern u32 const lit_4759; -extern "C" extern u32 const lit_4760; -extern "C" extern u8 const lit_4763[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_TKJ2[12]; extern "C" void __ct__16daNpc_Tkj2_HIO_cFv(); extern "C" static void anm_init__FP14npc_tkj2_classifUcf(); @@ -325,21 +317,6 @@ void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_tkj2/executor.cpp b/rel/d/a/npc/d_a_npc_tkj2/executor.cpp index a039639d03a..38d8cea068f 100644 --- a/rel/d/a/npc/d_a_npc_tkj2/executor.cpp +++ b/rel/d/a/npc/d_a_npc_tkj2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B142C8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_tkj2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_tkj2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1f41fb12e41..9c83ef89516 100644 --- a/rel/d/a/npc/d_a_npc_tkj2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_tkj2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B142D4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B142D4-80B142DC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B142D4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B144F8-80B14500 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_tkj2/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_tkj2/unknown_translation_unit_ctors.cpp index 2c0c77c45ae..6909b6c7cb8 100644 --- a/rel/d/a/npc/d_a_npc_tkj2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_tkj2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B142C8[2]; -extern void* const data_80B142C8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_tkj2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B142C8-80B142D0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B142C8[2] = { + (void*)__sinit_d_a_npc_tkj2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp b/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp index 2cdb2443c4d..b3627fd8a57 100644 --- a/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp +++ b/rel/d/a/npc/d_a_npc_tks/d_a_npc_tks.cpp @@ -13,12 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); - /* 80B1D594 */ csXyz(); - /* 80B1D59C */ ~csXyz(); -}; - struct Vec {}; struct cXyz { @@ -27,6 +21,12 @@ struct cXyz { /* 80B1D668 */ ~cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); + /* 80B1D594 */ csXyz(); + /* 80B1D59C */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -41,16 +41,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -135,16 +135,16 @@ struct daNpcTkc_c { /* 80B0D37C */ void setActionFollow(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -427,12 +427,6 @@ static bool daNpcTks_IsDelete(void*); static void cLib_checkBit__template0(u32, u32); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u8 const lit_5040[32]; -extern "C" extern u32 const lit_7420; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* l_evtNames[2]; -extern "C" extern void* g_profile_NPC_TKS[12]; extern "C" void __ct__10daNpcTks_cFv(); extern "C" void __dt__10daNpcTks_cFv(); @@ -571,29 +565,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/npc/d_a_npc_tks/executor.cpp b/rel/d/a/npc/d_a_npc_tks/executor.cpp index cba8713bb7c..ce9b32166e9 100644 --- a/rel/d/a/npc/d_a_npc_tks/executor.cpp +++ b/rel/d/a/npc/d_a_npc_tks/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B1DD44[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_tks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_tks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a64ac497460..7de8843d5e6 100644 --- a/rel/d/a/npc/d_a_npc_tks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_tks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B1DD50[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B1DD50-80B1DD58 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B1DD50[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B1E540-80B1E548 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_tks/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_tks/unknown_translation_unit_ctors.cpp index dea37ad2c50..f38792f8e22 100644 --- a/rel/d/a/npc/d_a_npc_tks/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_tks/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B1DD44[2]; -extern void* const data_80B1DD44[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_tks_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B1DD44-80B1DD4C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B1DD44[2] = { + (void*)__sinit_d_a_npc_tks_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp b/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp index 224a7001ac6..ac62c4cf21b 100644 --- a/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp +++ b/rel/d/a/npc/d_a_npc_toby/d_a_npc_toby.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -125,15 +125,6 @@ struct daNpc_Toby_Param_c { /* 80B24978 */ ~daNpc_Toby_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80B23AEC */ ~csXyz(); - /* 80B24088 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -141,12 +132,21 @@ struct cXyz { /* 80B24188 */ cXyz(); }; +struct csXyz { + /* 80B23AEC */ ~csXyz(); + /* 80B24088 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 800844F8 */ void GetTgHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -259,14 +259,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80B241D4 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -446,51 +446,6 @@ static void daNpc_Toby_Execute(void*); static void daNpc_Toby_Draw(void*); static bool daNpc_Toby_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const lit_5499[8]; -extern "C" extern u8 const lit_5658[8]; -extern "C" extern u32 const lit_6038; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_TOBY[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80B258AC[4]; -extern "C" extern u8 data_80B258B0[4]; -extern "C" extern u8 data_80B258B4[4]; -extern "C" extern u8 data_80B258B8[4]; -extern "C" extern u8 data_80B258BC[4]; -extern "C" extern u8 data_80B258C0[4]; -extern "C" extern u8 data_80B258C4[4]; -extern "C" extern u8 data_80B258C8[4]; -extern "C" extern u8 data_80B258CC[4]; -extern "C" extern u8 data_80B258D0[4]; -extern "C" extern u8 data_80B258D4[4]; -extern "C" extern u8 data_80B258D8[4]; -extern "C" extern u8 data_80B258DC[4]; -extern "C" extern u8 data_80B258E0[4]; -extern "C" extern u8 data_80B258E4[4]; -extern "C" extern u8 data_80B258E8[4]; -extern "C" extern u8 data_80B258EC[4]; -extern "C" extern u8 data_80B258F0[4]; -extern "C" extern u8 data_80B258F4[4]; -extern "C" extern u8 data_80B258F8[4]; -extern "C" extern u8 data_80B258FC[4]; -extern "C" extern u8 data_80B25900[4]; -extern "C" extern u8 data_80B25904[4]; -extern "C" extern u8 data_80B25908[4]; -extern "C" extern u8 data_80B2590C[4]; extern "C" void __dt__12daNpc_Toby_cFv(); extern "C" void create__12daNpc_Toby_cFv(); @@ -680,27 +635,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_toby/executor.cpp b/rel/d/a/npc/d_a_npc_toby/executor.cpp index 569788509c9..e4362cfa003 100644 --- a/rel/d/a/npc/d_a_npc_toby/executor.cpp +++ b/rel/d/a/npc/d_a_npc_toby/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B249D0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_toby/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_toby/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c7a2db573e0..2f45b6ab4fa 100644 --- a/rel/d/a/npc/d_a_npc_toby/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_toby/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B249DC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B249DC-80B249E4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B249DC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B25838-80B25840 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_toby/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_toby/unknown_translation_unit_ctors.cpp index eadc99b4e0c..996a8ebaa56 100644 --- a/rel/d/a/npc/d_a_npc_toby/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_toby/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B249D0[2]; -extern void* const data_80B249D0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_toby_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B249D0-80B249D8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B249D0[2] = { + (void*)__sinit_d_a_npc_toby_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp index 98a39849040..08599c2b07c 100644 --- a/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp +++ b/rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp @@ -28,16 +28,16 @@ struct daNPC_TR_HIO_c { /* 80B264E4 */ ~daNPC_TR_HIO_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -66,9 +66,6 @@ static bool daNPC_TR_IsDelete(npc_tr_class*); static void daNPC_TR_Delete(npc_tr_class*); static void useHeapInit(fopAc_ac_c*); static void daNPC_TR_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3849; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_TR[12]; extern "C" void __ct__14daNPC_TR_HIO_cFv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -106,16 +103,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_tr/executor.cpp b/rel/d/a/npc/d_a_npc_tr/executor.cpp index 520a521bb85..4bbe693bee1 100644 --- a/rel/d/a/npc/d_a_npc_tr/executor.cpp +++ b/rel/d/a/npc/d_a_npc_tr/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B26568[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_tr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_tr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 017f0fc2b7b..bb9b578459b 100644 --- a/rel/d/a/npc/d_a_npc_tr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_tr/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B26574[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B26574-80B2657C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B26574[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B26670-80B26678 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_tr/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_tr/unknown_translation_unit_ctors.cpp index e042d9ddce2..0dabcf77200 100644 --- a/rel/d/a/npc/d_a_npc_tr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_tr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B26568[2]; -extern void* const data_80B26568[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_tr_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B26568-80B26570 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B26568[2] = { + (void*)__sinit_d_a_npc_tr_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp b/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp index 3f017f81b85..1de2277a52c 100644 --- a/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp +++ b/rel/d/a/npc/d_a_npc_uri/d_a_npc_uri.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -39,14 +39,8 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct J3DJoint {}; - -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; -struct daNpcT_motionAnmData_c {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -54,6 +48,8 @@ struct cXyz { /* 80B2C568 */ cXyz(); }; +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -62,6 +58,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80B2C56C */ ~daNpcT_MotionSeqMngr_c(); }; +struct J3DJoint {}; + +struct daNpcT_evtData_c {}; + struct daNpc_Uri_c { /* 80B267AC */ ~daNpc_Uri_c(); /* 80B268F8 */ void create(); @@ -125,20 +125,20 @@ struct daNpc_Uri_Param_c { /* 80B2CD94 */ ~daNpc_Uri_Param_c(); }; -struct J3DModel {}; - struct csXyz { /* 80B2BECC */ ~csXyz(); /* 80B2C468 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148058 */ void getTrnsfrmAnmP(char const*, int); @@ -252,14 +252,14 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80B2C5B4 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -423,48 +423,6 @@ static void daNpc_Uri_Draw(void*); static bool daNpc_Uri_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_URI[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80B2DD84[4]; -extern "C" extern u8 data_80B2DD88[4]; -extern "C" extern u8 data_80B2DD8C[4]; -extern "C" extern u8 data_80B2DD90[4]; -extern "C" extern u8 data_80B2DD94[4]; -extern "C" extern u8 data_80B2DD98[4]; -extern "C" extern u8 data_80B2DD9C[4]; -extern "C" extern u8 data_80B2DDA0[4]; -extern "C" extern u8 data_80B2DDA4[4]; -extern "C" extern u8 data_80B2DDA8[4]; -extern "C" extern u8 data_80B2DDAC[4]; -extern "C" extern u8 data_80B2DDB0[4]; -extern "C" extern u8 data_80B2DDB4[4]; -extern "C" extern u8 data_80B2DDB8[4]; -extern "C" extern u8 data_80B2DDBC[4]; -extern "C" extern u8 data_80B2DDC0[4]; -extern "C" extern u8 data_80B2DDC4[4]; -extern "C" extern u8 data_80B2DDC8[4]; -extern "C" extern u8 data_80B2DDCC[4]; -extern "C" extern u8 data_80B2DDD0[4]; -extern "C" extern u8 data_80B2DDD4[4]; -extern "C" extern u8 data_80B2DDD8[4]; -extern "C" extern u8 data_80B2DDDC[4]; -extern "C" extern u8 data_80B2DDE0[4]; -extern "C" extern u8 data_80B2DDE4[4]; extern "C" void __dt__11daNpc_Uri_cFv(); extern "C" void create__11daNpc_Uri_cFv(); @@ -650,26 +608,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_uri/executor.cpp b/rel/d/a/npc/d_a_npc_uri/executor.cpp index 919a28481e2..f878fb28479 100644 --- a/rel/d/a/npc/d_a_npc_uri/executor.cpp +++ b/rel/d/a/npc/d_a_npc_uri/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B2CE00[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_uri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_uri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 198956f6b93..aab051e6be5 100644 --- a/rel/d/a/npc/d_a_npc_uri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_uri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B2CE0C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B2CE0C-80B2CE14 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B2CE0C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B2DD10-80B2DD18 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_uri/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_uri/unknown_translation_unit_ctors.cpp index dcb2f4c826c..2407e2b4c04 100644 --- a/rel/d/a/npc/d_a_npc_uri/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_uri/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B2CE00[2]; -extern void* const data_80B2CE00[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_uri_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B2CE00-80B2CE08 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B2CE00[2] = { + (void*)__sinit_d_a_npc_uri_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp b/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp index 8c29d340642..2d39cd6c2fb 100644 --- a/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp +++ b/rel/d/a/npc/d_a_npc_worm/d_a_npc_worm.cpp @@ -99,8 +99,6 @@ static bool daNPC_WORM_IsDelete(npc_worm_class*); static void daNPC_WORM_Delete(npc_worm_class*); static void useHeapInit(fopAc_ac_c*); static void daNPC_WORM_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_NPC_WORM[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" static void daNPC_WORM_Draw__FP14npc_worm_class(); @@ -142,16 +140,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_worm/executor.cpp b/rel/d/a/npc/d_a_npc_worm/executor.cpp index 5993d123769..b57f8ab22c0 100644 --- a/rel/d/a/npc/d_a_npc_worm/executor.cpp +++ b/rel/d/a/npc/d_a_npc_worm/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80B2F078[4]; -extern u8 const data_80B2F07C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_worm/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_worm/unknown_translation_unit_ctors.cpp index 960608d480b..a5a1c2747f2 100644 --- a/rel/d/a/npc/d_a_npc_worm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_worm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80B2F078[4]; -extern u8 const data_80B2F078[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80B2F078[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B2F078-80B2F07C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80B2F078[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_worm/unknown_translation_unit_dtors.cpp b/rel/d/a/npc/d_a_npc_worm/unknown_translation_unit_dtors.cpp index 8846362401d..0f8a14850a9 100644 --- a/rel/d/a/npc/d_a_npc_worm/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/npc/d_a_npc_worm/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80B2F07C[4]; -extern u8 const data_80B2F07C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80B2F07C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80B2F07C-80B2F080 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80B2F07C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp b/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp index 3f646e06167..a7f64ba018d 100644 --- a/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp +++ b/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.cpp @@ -41,16 +41,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -161,16 +161,16 @@ struct daNpcWrestler_Param_c { /* 80B41670 */ ~daNpcWrestler_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -248,10 +248,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -465,17 +465,6 @@ static void daNpcWrestler_Delete(void*); static void daNpcWrestler_Execute(void*); static void daNpcWrestler_Draw(void*); static bool daNpcWrestler_IsDelete(void*); -extern "C" extern u8 const lit_4818[24]; -extern "C" extern u8 const lit_4890[120]; -extern "C" extern u32 const lit_9268; -extern "C" extern u32 const lit_9269; -extern "C" extern u32 const lit_9270; -extern "C" extern u32 const lit_9271; -extern "C" extern u32 const lit_9272; -extern "C" extern u32 const lit_10142; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_WRESTLER[12]; extern "C" void __ct__15daNpcWrestler_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -653,26 +642,6 @@ void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFf(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/npc/d_a_npc_wrestler/executor.cpp b/rel/d/a/npc/d_a_npc_wrestler/executor.cpp index 8f16db9b4ec..32062793d1f 100644 --- a/rel/d/a/npc/d_a_npc_wrestler/executor.cpp +++ b/rel/d/a/npc/d_a_npc_wrestler/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B416C8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_wrestler/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_wrestler/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 75df0d15d23..ea5ba34386b 100644 --- a/rel/d/a/npc/d_a_npc_wrestler/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_wrestler/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B416D4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B416D4-80B416DC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B416D4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B42E10-80B42E18 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_wrestler/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_wrestler/unknown_translation_unit_ctors.cpp index 5c356da1980..e1c23b58cea 100644 --- a/rel/d/a/npc/d_a_npc_wrestler/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_wrestler/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B416C8[2]; -extern void* const data_80B416C8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_wrestler_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B416C8-80B416D0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B416C8[2] = { + (void*)__sinit_d_a_npc_wrestler_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp b/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp index b92a0e46853..7a43a126cde 100644 --- a/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp +++ b/rel/d/a/npc/d_a_npc_yamid/d_a_npc_yamid.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -105,21 +105,21 @@ struct daNpc_yamiD_Param_c { /* 80B45FE0 */ ~daNpc_yamiD_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80B45188 */ ~cXyz(); /* 80B457DC */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -380,8 +380,6 @@ static void daNpc_yamiD_Delete(void*); static void daNpc_yamiD_Execute(void*); static void daNpc_yamiD_Draw(void*); static bool daNpc_yamiD_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_YAMID[12]; extern "C" void __dt__13daNpc_yamiD_cFv(); extern "C" void create__13daNpc_yamiD_cFv(); @@ -503,24 +501,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_yamid/executor.cpp b/rel/d/a/npc/d_a_npc_yamid/executor.cpp index d7c7ab2a02f..fc0c62debc8 100644 --- a/rel/d/a/npc/d_a_npc_yamid/executor.cpp +++ b/rel/d/a/npc/d_a_npc_yamid/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B46038[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_yamid/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_yamid/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8e59bc4f6b1..eee5b8aee10 100644 --- a/rel/d/a/npc/d_a_npc_yamid/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_yamid/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B46044[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B46044-80B4604C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B46044[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B46468-80B46470 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_yamid/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_yamid/unknown_translation_unit_ctors.cpp index 55ba964ecc6..bd711f07487 100644 --- a/rel/d/a/npc/d_a_npc_yamid/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_yamid/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B46038[2]; -extern void* const data_80B46038[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_yamid_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B46038-80B46040 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B46038[2] = { + (void*)__sinit_d_a_npc_yamid_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp b/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp index 58623423498..a38bc9acbf9 100644 --- a/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp +++ b/rel/d/a/npc/d_a_npc_yamis/d_a_npc_yamis.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -105,21 +105,21 @@ struct daNpc_yamiS_Param_c { /* 80B49644 */ ~daNpc_yamiS_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80B487EC */ ~cXyz(); /* 80B48E40 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -380,8 +380,6 @@ static void daNpc_yamiS_Delete(void*); static void daNpc_yamiS_Execute(void*); static void daNpc_yamiS_Draw(void*); static bool daNpc_yamiS_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_YAMIS[12]; extern "C" void __dt__13daNpc_yamiS_cFv(); extern "C" void create__13daNpc_yamiS_cFv(); @@ -503,24 +501,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_yamis/executor.cpp b/rel/d/a/npc/d_a_npc_yamis/executor.cpp index 38ed13c5650..74c6f5ddd75 100644 --- a/rel/d/a/npc/d_a_npc_yamis/executor.cpp +++ b/rel/d/a/npc/d_a_npc_yamis/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B4969C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_yamis/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_yamis/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4a1970cfef6..e147d3d6495 100644 --- a/rel/d/a/npc/d_a_npc_yamis/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_yamis/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B496A8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B496A8-80B496B0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B496A8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B49AD0-80B49AD8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_yamis/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_yamis/unknown_translation_unit_ctors.cpp index 72824a2febb..4e61e0f9dfc 100644 --- a/rel/d/a/npc/d_a_npc_yamis/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_yamis/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B4969C[2]; -extern void* const data_80B4969C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_yamis_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B4969C-80B496A4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B4969C[2] = { + (void*)__sinit_d_a_npc_yamis_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp b/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp index 16281a92968..1519bd07728 100644 --- a/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp +++ b/rel/d/a/npc/d_a_npc_yamit/d_a_npc_yamit.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -111,21 +111,21 @@ struct daNpc_yamiT_Param_c { /* 80B4CD38 */ ~daNpc_yamiT_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80B4BF4C */ ~cXyz(); /* 80B4C5A0 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -385,8 +385,6 @@ static void daNpc_yamiT_Delete(void*); static void daNpc_yamiT_Execute(void*); static void daNpc_yamiT_Draw(void*); static bool daNpc_yamiT_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_YAMIT[12]; extern "C" void __dt__13daNpc_yamiT_cFv(); extern "C" void create__13daNpc_yamiT_cFv(); @@ -509,24 +507,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_yamit/executor.cpp b/rel/d/a/npc/d_a_npc_yamit/executor.cpp index ce8377eed75..3a6b2fe1880 100644 --- a/rel/d/a/npc/d_a_npc_yamit/executor.cpp +++ b/rel/d/a/npc/d_a_npc_yamit/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B4CD90[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_yamit/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_yamit/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3acecbd72cb..f31552115bb 100644 --- a/rel/d/a/npc/d_a_npc_yamit/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_yamit/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B4CD9C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B4CD9C-80B4CDA4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B4CD9C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B4D1F0-80B4D1F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_yamit/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_yamit/unknown_translation_unit_ctors.cpp index 0c70b0a3b33..b942e6ccfce 100644 --- a/rel/d/a/npc/d_a_npc_yamit/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_yamit/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B4CD90[2]; -extern void* const data_80B4CD90[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_yamit_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B4CD90-80B4CD98 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B4CD90[2] = { + (void*)__sinit_d_a_npc_yamit_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp b/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp index 185f45d83fc..141442a3bc5 100644 --- a/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp +++ b/rel/d/a/npc/d_a_npc_yelia/d_a_npc_yelia.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -108,10 +108,6 @@ struct daNpc_Yelia_Param_c { /* 80B5222C */ ~daNpc_Yelia_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -119,11 +115,15 @@ struct cXyz { /* 80B51A40 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -397,8 +397,6 @@ static void daNpc_Yelia_Execute(void*); static void daNpc_Yelia_Draw(void*); static bool daNpc_Yelia_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_YELIA[12]; extern "C" void __dt__13daNpc_Yelia_cFv(); extern "C" void create__13daNpc_Yelia_cFv(); @@ -535,23 +533,6 @@ void cM_rndF(f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_yelia/executor.cpp b/rel/d/a/npc/d_a_npc_yelia/executor.cpp index 04aafe3a353..76b61eba1e4 100644 --- a/rel/d/a/npc/d_a_npc_yelia/executor.cpp +++ b/rel/d/a/npc/d_a_npc_yelia/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B522A0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_yelia/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_yelia/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 264e95f9a39..70e1f1825ed 100644 --- a/rel/d/a/npc/d_a_npc_yelia/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_yelia/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B522AC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B522AC-80B522B4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B522AC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B533E8-80B533F0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_yelia/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_yelia/unknown_translation_unit_ctors.cpp index 93f51eb29ca..a6231e1ddc4 100644 --- a/rel/d/a/npc/d_a_npc_yelia/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_yelia/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B522A0[2]; -extern void* const data_80B522A0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_yelia_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B522A0-80B522A8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B522A0[2] = { + (void*)__sinit_d_a_npc_yelia_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp b/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp index 85460a3d487..9c3f15f8f7b 100644 --- a/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp +++ b/rel/d/a/npc/d_a_npc_ykm/d_a_npc_ykm.cpp @@ -11,11 +11,6 @@ // Types: // -struct csXyz { - /* 80B5C588 */ ~csXyz(); - /* 80B5CCBC */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -25,6 +20,11 @@ struct cXyz { /* 80B5CDBC */ cXyz(); }; +struct csXyz { + /* 80B5C588 */ ~csXyz(); + /* 80B5CCBC */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -33,18 +33,18 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -162,14 +162,14 @@ struct daNpcT_pntData_c {}; struct J3DModel {}; -struct _GXColorS10 {}; - struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 80084658 */ void ChkCoHit(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80148094 */ void getTrnsfrmKeyAnmP(char const*, int); @@ -524,63 +524,6 @@ static void daNpc_ykM_Draw(void*); static bool daNpc_ykM_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(int, int); -extern "C" extern u8 const lit_5955[8]; -extern "C" extern u32 const lit_6136; -extern "C" extern u32 const lit_6137; -extern "C" extern u32 const lit_6138; -extern "C" extern u32 const lit_6139; -extern "C" extern u32 const lit_6140; -extern "C" extern u32 const lit_6141; -extern "C" extern u32 const lit_6142; -extern "C" extern u32 const lit_6143; -extern "C" extern u8 const lit_6165[8]; -extern "C" extern u32 const lit_6552; -extern "C" extern u32 const lit_6553; -extern "C" extern u8 const lit_6889[8]; -extern "C" extern u8 const lit_7190[8]; -extern "C" extern u8 const lit_7385[8]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_YKM[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80B5EDA4[4]; -extern "C" extern u8 data_80B5EDA8[4]; -extern "C" extern u8 data_80B5EDAC[4]; -extern "C" extern u8 data_80B5EDB0[4]; -extern "C" extern u8 data_80B5EDB4[4]; -extern "C" extern u8 data_80B5EDB8[4]; -extern "C" extern u8 data_80B5EDBC[4]; -extern "C" extern u8 data_80B5EDC0[4]; -extern "C" extern u8 data_80B5EDC4[4]; -extern "C" extern u8 data_80B5EDC8[4]; -extern "C" extern u8 data_80B5EDCC[4]; -extern "C" extern u8 data_80B5EDD0[4]; -extern "C" extern u8 data_80B5EDD4[4]; -extern "C" extern u8 data_80B5EDD8[4]; -extern "C" extern u8 data_80B5EDDC[4]; -extern "C" extern u8 data_80B5EDE0[4]; -extern "C" extern u8 data_80B5EDE4[4]; -extern "C" extern u8 data_80B5EDE8[4]; -extern "C" extern u8 data_80B5EDEC[4]; -extern "C" extern u8 data_80B5EDF0[4]; -extern "C" extern u8 data_80B5EDF4[4]; -extern "C" extern u8 data_80B5EDF8[4]; -extern "C" extern u8 data_80B5EDFC[4]; -extern "C" extern u8 data_80B5EE00[4]; -extern "C" extern u8 data_80B5EE04[4]; extern "C" void __dt__11daNpc_ykM_cFv(); extern "C" void create__11daNpc_ykM_cFv(); @@ -808,34 +751,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern u8 mCcDSph__8daNpcT_c[64]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_ykm/executor.cpp b/rel/d/a/npc/d_a_npc_ykm/executor.cpp index 9e341ba1aab..131ea7fd28f 100644 --- a/rel/d/a/npc/d_a_npc_ykm/executor.cpp +++ b/rel/d/a/npc/d_a_npc_ykm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B5D780[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_ykm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_ykm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 15d051214a2..128423151f8 100644 --- a/rel/d/a/npc/d_a_npc_ykm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_ykm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B5D78C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B5D78C-80B5D794 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B5D78C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B5ED20-80B5ED28 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_ykm/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_ykm/unknown_translation_unit_ctors.cpp index 34a7ba0b1a3..e6518c983b7 100644 --- a/rel/d/a/npc/d_a_npc_ykm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_ykm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B5D780[2]; -extern void* const data_80B5D780[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_ykm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B5D780-80B5D788 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B5D780[2] = { + (void*)__sinit_d_a_npc_ykm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp b/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp index dcf98821c2c..db88bc5b9e4 100644 --- a/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp +++ b/rel/d/a/npc/d_a_npc_ykw/d_a_npc_ykw.cpp @@ -26,18 +26,18 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -55,10 +55,6 @@ struct daTag_EvtArea_c { /* 8048C94C */ void chkPointInArea(cXyz, cXyz); }; -struct J3DJoint {}; - -struct daNpcT_evtData_c {}; - struct daNpcT_faceMotionAnmData_c {}; struct daNpcT_motionAnmData_c {}; @@ -71,6 +67,10 @@ struct daNpcT_MotionSeqMngr_c { /* 80B672D8 */ ~daNpcT_MotionSeqMngr_c(); }; +struct J3DJoint {}; + +struct daNpcT_evtData_c {}; + struct daNpc_ykW_c { /* 80B5EF0C */ ~daNpc_ykW_c(); /* 80B5F084 */ void create(); @@ -145,20 +145,20 @@ struct daNpc_ykM_c { struct daNpcT_pntData_c {}; -struct J3DModel {}; - struct csXyz { /* 80B66C38 */ ~csXyz(); /* 80B671D4 */ csXyz(); }; -struct _GXColorS10 {}; +struct J3DModel {}; struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -291,12 +291,12 @@ struct dPath {}; struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -307,16 +307,16 @@ struct dPa_control_c { cXyz const*); }; -struct dBgS { - /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); -}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); /* 80B67320 */ ~dBgS_AcchCir(); }; +struct dBgS { + /* 80074E50 */ void GetPolyAtt0(cBgS_PolyInfo const&); +}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -498,59 +498,6 @@ static void daNpc_ykW_Draw(void*); static bool daNpc_ykW_IsDelete(void*); static void cLib_calcTimer__template0(int*); static void cLib_getRndValue__template0(f32, f32); -extern "C" extern u32 const lit_6511; -extern "C" extern u32 const lit_6512; -extern "C" extern u32 const lit_6513; -extern "C" extern u32 const lit_6514; -extern "C" extern u32 const lit_6515; -extern "C" extern u32 const lit_6516; -extern "C" extern u32 const lit_6517; -extern "C" extern u32 const lit_6518; -extern "C" extern u32 const lit_6521; -extern "C" extern u32 const lit_6522; -extern "C" extern u32 const lit_6523; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_YKW[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80B68DD4[4]; -extern "C" extern u8 data_80B68DD8[4]; -extern "C" extern u8 data_80B68DDC[4]; -extern "C" extern u8 data_80B68DE0[4]; -extern "C" extern u8 data_80B68DE4[4]; -extern "C" extern u8 data_80B68DE8[4]; -extern "C" extern u8 data_80B68DEC[4]; -extern "C" extern u8 data_80B68DF0[4]; -extern "C" extern u8 data_80B68DF4[4]; -extern "C" extern u8 data_80B68DF8[4]; -extern "C" extern u8 data_80B68DFC[4]; -extern "C" extern u8 data_80B68E00[4]; -extern "C" extern u8 data_80B68E04[4]; -extern "C" extern u8 data_80B68E08[4]; -extern "C" extern u8 data_80B68E0C[4]; -extern "C" extern u8 data_80B68E10[4]; -extern "C" extern u8 data_80B68E14[4]; -extern "C" extern u8 data_80B68E18[4]; -extern "C" extern u8 data_80B68E1C[4]; -extern "C" extern u8 data_80B68E20[4]; -extern "C" extern u8 data_80B68E24[4]; -extern "C" extern u8 data_80B68E28[4]; -extern "C" extern u8 data_80B68E2C[4]; -extern "C" extern u8 data_80B68E30[4]; -extern "C" extern u8 data_80B68E34[4]; extern "C" void __dt__11daNpc_ykW_cFv(); extern "C" void create__11daNpc_ykW_cFv(); @@ -777,28 +724,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_ykw/executor.cpp b/rel/d/a/npc/d_a_npc_ykw/executor.cpp index 4c183ed47e3..fc714f75264 100644 --- a/rel/d/a/npc/d_a_npc_ykw/executor.cpp +++ b/rel/d/a/npc/d_a_npc_ykw/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B67C24[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_ykw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_ykw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 310dfd3a58c..50d779098ee 100644 --- a/rel/d/a/npc/d_a_npc_ykw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_ykw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B67C30[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B67C30-80B67C38 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B67C30[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B68D60-80B68D68 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_ykw/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_ykw/unknown_translation_unit_ctors.cpp index 3ce522690b6..c3804a1c044 100644 --- a/rel/d/a/npc/d_a_npc_ykw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_ykw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B67C24[2]; -extern void* const data_80B67C24[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_ykw_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B67C24-80B67C2C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B67C24[2] = { + (void*)__sinit_d_a_npc_ykw_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp b/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp index cc152b6afc7..cad657a6cf5 100644 --- a/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp +++ b/rel/d/a/npc/d_a_npc_zanb/d_a_npc_zanb.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -101,15 +101,6 @@ struct daNpc_zanB_Param_c { /* 80B6BC58 */ ~daNpc_zanB_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80B6AF24 */ ~csXyz(); - /* 80B6B364 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -117,11 +108,20 @@ struct cXyz { /* 80B6B464 */ cXyz(); }; +struct csXyz { + /* 80B6AF24 */ ~csXyz(); + /* 80B6B364 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -361,8 +361,6 @@ static void daNpc_zanB_Delete(void*); static void daNpc_zanB_Execute(void*); static void daNpc_zanB_Draw(void*); static bool daNpc_zanB_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ZANB[12]; extern "C" void __dt__12daNpc_zanB_cFv(); extern "C" void create__12daNpc_zanB_cFv(); @@ -476,23 +474,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_zanb/executor.cpp b/rel/d/a/npc/d_a_npc_zanb/executor.cpp index f29cbdd07bd..9b76adf8d18 100644 --- a/rel/d/a/npc/d_a_npc_zanb/executor.cpp +++ b/rel/d/a/npc/d_a_npc_zanb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B6BCB0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_zanb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_zanb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index cc3fe2f333d..5373a077803 100644 --- a/rel/d/a/npc/d_a_npc_zanb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_zanb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B6BCBC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B6BCBC-80B6BCC4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B6BCBC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B6C0A0-80B6C0A8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_zanb/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_zanb/unknown_translation_unit_ctors.cpp index eeb77eb4a63..7edbdb8204d 100644 --- a/rel/d/a/npc/d_a_npc_zanb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_zanb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B6BCB0[2]; -extern void* const data_80B6BCB0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_zanb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B6BCB0-80B6BCB8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B6BCB0[2] = { + (void*)__sinit_d_a_npc_zanb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp b/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp index ce2554c8148..18e3a4f0577 100644 --- a/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp +++ b/rel/d/a/npc/d_a_npc_zant/d_a_npc_zant.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -95,21 +95,21 @@ struct daNpc_Zant_Param_c { /* 80B6E93C */ ~daNpc_Zant_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80B6DBD4 */ ~cXyz(); /* 80B6E150 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -325,8 +325,6 @@ static void daNpc_Zant_Delete(void*); static void daNpc_Zant_Execute(void*); static void daNpc_Zant_Draw(void*); static bool daNpc_Zant_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ZANT[12]; extern "C" void __dt__12daNpc_Zant_cFv(); extern "C" void create__12daNpc_Zant_cFv(); @@ -428,20 +426,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void diff --git a/rel/d/a/npc/d_a_npc_zant/executor.cpp b/rel/d/a/npc/d_a_npc_zant/executor.cpp index b129e0f728f..b2f97378257 100644 --- a/rel/d/a/npc/d_a_npc_zant/executor.cpp +++ b/rel/d/a/npc/d_a_npc_zant/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B6E994[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_zant/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_zant/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3288a47d375..4725a84068e 100644 --- a/rel/d/a/npc/d_a_npc_zant/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_zant/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B6E9A0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B6E9A0-80B6E9A8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B6E9A0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B6ED20-80B6ED28 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_zant/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_zant/unknown_translation_unit_ctors.cpp index 627634415a5..9954a81c2ae 100644 --- a/rel/d/a/npc/d_a_npc_zant/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_zant/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B6E994[2]; -extern void* const data_80B6E994[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_zant_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B6E994-80B6E99C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B6E994[2] = { + (void*)__sinit_d_a_npc_zant_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp b/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp index 3211e1a6ed9..db0de3d27e1 100644 --- a/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp +++ b/rel/d/a/npc/d_a_npc_zelR/d_a_npc_zelR.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -41,6 +41,8 @@ struct fopAc_ac_c { struct daNpcT_faceMotionAnmData_c {}; +struct daNpcT_motionAnmData_c {}; + struct daNpcT_MotionSeqMngr_c { struct sequenceStepData_c {}; @@ -48,8 +50,6 @@ struct daNpcT_MotionSeqMngr_c { /* 80B7133C */ ~daNpcT_MotionSeqMngr_c(); }; -struct daNpcT_motionAnmData_c {}; - struct J3DJoint {}; struct daNpcT_evtData_c {}; @@ -101,21 +101,21 @@ struct daNpc_ZelR_Param_c { /* 80B71A74 */ ~daNpc_ZelR_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80B70C9C */ ~cXyz(); /* 80B712F0 */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -359,8 +359,6 @@ static void daNpc_ZelR_Delete(void*); static void daNpc_ZelR_Execute(void*); static void daNpc_ZelR_Draw(void*); static bool daNpc_ZelR_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ZELR[12]; extern "C" void __dt__12daNpc_ZelR_cFv(); extern "C" void create__12daNpc_ZelR_cFv(); @@ -479,23 +477,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_zelR/executor.cpp b/rel/d/a/npc/d_a_npc_zelR/executor.cpp index 1bc631e3a66..db3754e06bb 100644 --- a/rel/d/a/npc/d_a_npc_zelR/executor.cpp +++ b/rel/d/a/npc/d_a_npc_zelR/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B71ACC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_zelR/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_zelR/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a1c994d5d35..8c24dd09030 100644 --- a/rel/d/a/npc/d_a_npc_zelR/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_zelR/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B71AD8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B71AD8-80B71AE0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B71AD8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B71EA8-80B71EB0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_zelR/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_zelR/unknown_translation_unit_ctors.cpp index ecc5040f2e3..d577d1cab06 100644 --- a/rel/d/a/npc/d_a_npc_zelR/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_zelR/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B71ACC[2]; -extern void* const data_80B71ACC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_zelR_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B71ACC-80B71AD4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B71ACC[2] = { + (void*)__sinit_d_a_npc_zelR_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp b/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp index 2053f269e96..0f3a53743d9 100644 --- a/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp +++ b/rel/d/a/npc/d_a_npc_zelRo/d_a_npc_zelRo.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -102,21 +102,21 @@ struct daNpc_ZelRo_Param_c { /* 80B74BF0 */ ~daNpc_ZelRo_Param_c(); }; -struct J3DModel {}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; /* 80B73E18 */ ~cXyz(); /* 80B7446C */ cXyz(); }; +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -359,8 +359,6 @@ static void daNpc_ZelRo_Delete(void*); static void daNpc_ZelRo_Execute(void*); static void daNpc_ZelRo_Draw(void*); static bool daNpc_ZelRo_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ZELRO[12]; extern "C" void __dt__13daNpc_ZelRo_cFv(); extern "C" void create__13daNpc_ZelRo_cFv(); @@ -479,23 +477,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_zelRo/executor.cpp b/rel/d/a/npc/d_a_npc_zelRo/executor.cpp index 085c1a03a8e..6c8870c3124 100644 --- a/rel/d/a/npc/d_a_npc_zelRo/executor.cpp +++ b/rel/d/a/npc/d_a_npc_zelRo/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B74C48[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_zelRo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_zelRo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index deb2ad0dbc1..bb7e1c2dc10 100644 --- a/rel/d/a/npc/d_a_npc_zelRo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_zelRo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B74C54[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B74C54-80B74C5C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B74C54[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B75028-80B75030 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_zelRo/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_zelRo/unknown_translation_unit_ctors.cpp index 276cb0a01bf..5961311ef3b 100644 --- a/rel/d/a/npc/d_a_npc_zelRo/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_zelRo/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B74C48[2]; -extern void* const data_80B74C48[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_zelRo_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B74C48-80B74C50 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B74C48[2] = { + (void*)__sinit_d_a_npc_zelRo_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp b/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp index f4c1975ae53..0d22f63390d 100644 --- a/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp +++ b/rel/d/a/npc/d_a_npc_zelda/d_a_npc_zelda.cpp @@ -13,12 +13,6 @@ struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -27,6 +21,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -101,15 +101,6 @@ struct daNpc_Zelda_Param_c { /* 80B77F5C */ ~daNpc_Zelda_Param_c(); }; -struct J3DModel {}; - -struct csXyz { - /* 80B77224 */ ~csXyz(); - /* 80B77664 */ csXyz(); -}; - -struct _GXColorS10 {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80266B34 */ void operator-(Vec const&) const; @@ -117,11 +108,20 @@ struct cXyz { /* 80B77764 */ cXyz(); }; +struct csXyz { + /* 80B77224 */ ~csXyz(); + /* 80B77664 */ csXyz(); +}; + +struct J3DModel {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 801483F8 */ void loadRes(s8 const*, char const**); @@ -353,8 +353,6 @@ static void daNpc_Zelda_Delete(void*); static void daNpc_Zelda_Execute(void*); static void daNpc_Zelda_Draw(void*); static bool daNpc_Zelda_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ZELDA[12]; extern "C" void __dt__13daNpc_Zelda_cFv(); extern "C" void create__13daNpc_Zelda_cFv(); @@ -469,23 +467,6 @@ void cM_atan2s(f32, f32); void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_zelda/executor.cpp b/rel/d/a/npc/d_a_npc_zelda/executor.cpp index 7506bd92fcb..dda96d54e26 100644 --- a/rel/d/a/npc/d_a_npc_zelda/executor.cpp +++ b/rel/d/a/npc/d_a_npc_zelda/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B77FB4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_zelda/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_zelda/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b4127d2f18f..0006b8c10af 100644 --- a/rel/d/a/npc/d_a_npc_zelda/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_zelda/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B77FC0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B77FC0-80B77FC8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B77FC0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B78400-80B78408 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_zelda/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_zelda/unknown_translation_unit_ctors.cpp index 443a90fd2b4..c64f41df39b 100644 --- a/rel/d/a/npc/d_a_npc_zelda/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_zelda/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B77FB4[2]; -extern void* const data_80B77FB4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_zelda_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B77FB4-80B77FBC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B77FB4[2] = { + (void*)__sinit_d_a_npc_zelda_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp b/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp index feb3cf9c3cc..dd654988ebb 100644 --- a/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp +++ b/rel/d/a/npc/d_a_npc_zra/d_a_npc_zra.cpp @@ -13,12 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80B7EF80 */ csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); - /* 80B7EF44 */ ~csXyz(); -}; - struct Vec {}; struct cXyz { @@ -28,6 +22,12 @@ struct cXyz { /* 80B7EF84 */ cXyz(); }; +struct csXyz { + /* 80B7EF80 */ csXyz(); + /* 802673F4 */ csXyz(s16, s16, s16); + /* 80B7EF44 */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CCC8 */ void push(); /* 8000CD14 */ void pop(); @@ -44,13 +44,13 @@ struct mDoExt_morf_c { struct J3DAnmTextureSRTKey {}; -struct J3DAnmTexPattern { - /* 8032AF50 */ void getTexNo(u16, u16*) const; -}; +struct J3DAnmColor {}; struct J3DAnmTevRegKey {}; -struct J3DAnmColor {}; +struct J3DAnmTexPattern { + /* 8032AF50 */ void getTexNo(u16, u16*) const; +}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -89,16 +89,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -243,14 +243,14 @@ struct daNpc_Hoz_c { /* 80A01F54 */ void getType(); }; +struct J3DAnmTransformKey {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); /* 80084460 */ void ChkTgHit(); }; -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -357,8 +357,6 @@ struct dRes_control_c { struct dPnt {}; -struct dBgS {}; - struct dBgS_AcchCir { /* 80075EAC */ dBgS_AcchCir(); /* 80075F40 */ void SetWallR(f32); @@ -366,6 +364,8 @@ struct dBgS_AcchCir { /* 80B7F524 */ ~dBgS_AcchCir(); }; +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -544,73 +544,6 @@ static void s_subHoz(void*, void*); static void s_sub(void*, void*); static void s_subMark(void*, void*); static void s_subSP(void*, void*); -extern "C" extern u8 const lit_6334[84]; -extern "C" extern u8 const lit_6460[144]; -extern "C" extern u32 const lit_9936; -extern "C" extern u32 const lit_9937; -extern "C" extern u32 const lit_9938; -extern "C" extern u32 lit_1787[1 + 5 /* padding */]; -extern "C" extern void* lit_6535[3]; -extern "C" extern void* lit_6537[3]; -extern "C" extern void* lit_6539[3]; -extern "C" extern void* lit_6543[3]; -extern "C" extern void* lit_6545[3]; -extern "C" extern void* lit_6547[3]; -extern "C" extern void* lit_6549[3]; -extern "C" extern void* lit_6551[3]; -extern "C" extern void* lit_6553[3]; -extern "C" extern void* lit_6557[3]; -extern "C" extern void* lit_6559[3]; -extern "C" extern void* lit_6561[3]; -extern "C" extern void* lit_6563[3]; -extern "C" extern void* lit_6565[3]; -extern "C" extern void* lit_6567[3]; -extern "C" extern void* lit_6569[3]; -extern "C" extern void* lit_6573[3]; -extern "C" extern void* lit_6575[3]; -extern "C" extern void* lit_6579[3]; -extern "C" extern void* lit_6581[3]; -extern "C" extern void* g_profile_NPC_ZRA[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80B8DAB4[4]; -extern "C" extern u8 data_80B8DAB8[4]; -extern "C" extern u8 data_80B8DABC[4]; -extern "C" extern u8 data_80B8DAC0[4]; -extern "C" extern u8 data_80B8DAC4[4]; -extern "C" extern u8 data_80B8DAC8[4]; -extern "C" extern u8 data_80B8DACC[4]; -extern "C" extern u8 data_80B8DAD0[4]; -extern "C" extern u8 data_80B8DAD4[4]; -extern "C" extern u8 data_80B8DAD8[4]; -extern "C" extern u8 data_80B8DADC[4]; -extern "C" extern u8 data_80B8DAE0[4]; -extern "C" extern u8 data_80B8DAE4[4]; -extern "C" extern u8 data_80B8DAE8[4]; -extern "C" extern u8 data_80B8DAEC[4]; -extern "C" extern u8 data_80B8DAF0[4]; -extern "C" extern u8 data_80B8DAF4[4]; -extern "C" extern u8 data_80B8DAF8[4]; -extern "C" extern u8 data_80B8DAFC[4]; -extern "C" extern u8 data_80B8DB00[4]; -extern "C" extern u8 data_80B8DB04[4]; -extern "C" extern u8 data_80B8DB08[4]; -extern "C" extern u8 data_80B8DB0C[4]; -extern "C" extern u8 data_80B8DB10[4]; -extern "C" extern u8 data_80B8DB14[4]; extern "C" void getDstPosDst2__16daNpc_zrA_Path_cF4cXyzR4cXyz(); extern "C" void __dt__4cXyzFv(); @@ -891,29 +824,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoAud_setFadeInStart__FUc(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/npc/d_a_npc_zra/executor.cpp b/rel/d/a/npc/d_a_npc_zra/executor.cpp index b9880240252..838f55f0cd9 100644 --- a/rel/d/a/npc/d_a_npc_zra/executor.cpp +++ b/rel/d/a/npc/d_a_npc_zra/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B8C444[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_zra/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_zra/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ab82a29988d..890f8553d41 100644 --- a/rel/d/a/npc/d_a_npc_zra/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_zra/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B8C450[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B8C450-80B8C458 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B8C450[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B8DA40-80B8DA48 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_zra/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_zra/unknown_translation_unit_ctors.cpp index 18f14dd9c27..ef776904a9f 100644 --- a/rel/d/a/npc/d_a_npc_zra/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_zra/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B8C444[2]; -extern void* const data_80B8C444[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_zra_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B8C444-80B8C44C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B8C444[2] = { + (void*)__sinit_d_a_npc_zra_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp b/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp index 2180dfdb6fe..530f6b9ca21 100644 --- a/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp +++ b/rel/d/a/npc/d_a_npc_zrc/d_a_npc_zrc.cpp @@ -25,10 +25,6 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -37,6 +33,10 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -69,27 +69,27 @@ struct daPy_py_c { struct J3DJoint {}; -struct _GXColorS10 {}; +struct J3DAnmTextureSRTKey {}; struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + +struct _GXColorS10 {}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -362,51 +362,6 @@ static void daNpc_zrC_Delete(void*); static void daNpc_zrC_Execute(void*); static void daNpc_zrC_Draw(void*); static bool daNpc_zrC_IsDelete(void*); -extern "C" extern u8 const lit_5185[72]; -extern "C" extern u8 const lit_5257[56]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ZRC[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80B93C7C[4]; -extern "C" extern u8 data_80B93C80[4]; -extern "C" extern u8 data_80B93C84[4]; -extern "C" extern u8 data_80B93C88[4]; -extern "C" extern u8 data_80B93C8C[4]; -extern "C" extern u8 data_80B93C90[4]; -extern "C" extern u8 data_80B93C94[4]; -extern "C" extern u8 data_80B93C98[4]; -extern "C" extern u8 data_80B93C9C[4]; -extern "C" extern u8 data_80B93CA0[4]; -extern "C" extern u8 data_80B93CA4[4]; -extern "C" extern u8 data_80B93CA8[4]; -extern "C" extern u8 data_80B93CAC[4]; -extern "C" extern u8 data_80B93CB0[4]; -extern "C" extern u8 data_80B93CB4[4]; -extern "C" extern u8 data_80B93CB8[4]; -extern "C" extern u8 data_80B93CBC[4]; -extern "C" extern u8 data_80B93CC0[4]; -extern "C" extern u8 data_80B93CC4[4]; -extern "C" extern u8 data_80B93CC8[4]; -extern "C" extern u8 data_80B93CCC[4]; -extern "C" extern u8 data_80B93CD0[4]; -extern "C" extern u8 data_80B93CD4[4]; -extern "C" extern u8 data_80B93CD8[4]; -extern "C" extern u8 data_80B93CDC[4]; extern "C" void __ct__11daNpc_zrC_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -559,26 +514,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_zrc/executor.cpp b/rel/d/a/npc/d_a_npc_zrc/executor.cpp index 7b21438aed7..a3f03197116 100644 --- a/rel/d/a/npc/d_a_npc_zrc/executor.cpp +++ b/rel/d/a/npc/d_a_npc_zrc/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B931E8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_zrc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_zrc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c7aff18932d..c5c194cdcf8 100644 --- a/rel/d/a/npc/d_a_npc_zrc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_zrc/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B931F4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B931F4-80B931FC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B931F4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B93C08-80B93C10 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_zrc/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_zrc/unknown_translation_unit_ctors.cpp index ead00186f8f..a67e2bfceab 100644 --- a/rel/d/a/npc/d_a_npc_zrc/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_zrc/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B931E8[2]; -extern void* const data_80B931E8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_zrc_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B931E8-80B931F0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B931E8[2] = { + (void*)__sinit_d_a_npc_zrc_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp b/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp index 35ca0f525e8..981431f1061 100644 --- a/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp +++ b/rel/d/a/npc/d_a_npc_zrz/d_a_npc_zrz.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80B9A7B8 */ ~csXyz(); - /* 80B9A7F4 */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -29,6 +24,11 @@ struct cXyz { /* 80B9A834 */ cXyz(); }; +struct csXyz { + /* 80B9A7B8 */ ~csXyz(); + /* 80B9A7F4 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CCC8 */ void push(); /* 8000CD14 */ void pop(); @@ -47,12 +47,12 @@ struct mDoExt_invisibleModel { struct J3DAnmTextureSRTKey {}; +struct J3DAnmTevRegKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTevRegKey {}; - struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -79,16 +79,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -173,19 +173,19 @@ struct daNpc_zrZ_Param_c { /* 80B9AF80 */ ~daNpc_zrZ_Param_c(); }; -struct dCcD_GObjInf { - /* 80083A28 */ dCcD_GObjInf(); - /* 800840E4 */ ~dCcD_GObjInf(); -}; - -struct J3DAnmTransformKey {}; - struct dCcD_SrcCyl {}; struct dCcD_Cyl { /* 800848B4 */ void Set(dCcD_SrcCyl const&); }; +struct J3DAnmTransformKey {}; + +struct dCcD_GObjInf { + /* 80083A28 */ dCcD_GObjInf(); + /* 800840E4 */ ~dCcD_GObjInf(); +}; + struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -450,58 +450,6 @@ static void daNpc_zrZ_Execute(void*); static void daNpc_zrZ_Draw(void*); static bool daNpc_zrZ_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const lit_5782[8]; -extern "C" extern u32 const lit_5904; -extern "C" extern u32 const lit_5905[1 + 1 /* padding */]; -extern "C" extern u32 const lit_6066; -extern "C" extern u32 const lit_6099; -extern "C" extern u32 const lit_6100; -extern "C" extern u32 const lit_6102; -extern "C" extern u32 const lit_6103; -extern "C" extern u32 const lit_6104; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_NPC_ZRZ[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80B9B8D4[4]; -extern "C" extern u8 data_80B9B8D8[4]; -extern "C" extern u8 data_80B9B8DC[4]; -extern "C" extern u8 data_80B9B8E0[4]; -extern "C" extern u8 data_80B9B8E4[4]; -extern "C" extern u8 data_80B9B8E8[4]; -extern "C" extern u8 data_80B9B8EC[4]; -extern "C" extern u8 data_80B9B8F0[4]; -extern "C" extern u8 data_80B9B8F4[4]; -extern "C" extern u8 data_80B9B8F8[4]; -extern "C" extern u8 data_80B9B8FC[4]; -extern "C" extern u8 data_80B9B900[4]; -extern "C" extern u8 data_80B9B904[4]; -extern "C" extern u8 data_80B9B908[4]; -extern "C" extern u8 data_80B9B90C[4]; -extern "C" extern u8 data_80B9B910[4]; -extern "C" extern u8 data_80B9B914[4]; -extern "C" extern u8 data_80B9B918[4]; -extern "C" extern u8 data_80B9B91C[4]; -extern "C" extern u8 data_80B9B920[4]; -extern "C" extern u8 data_80B9B924[4]; -extern "C" extern u8 data_80B9B928[4]; -extern "C" extern u8 data_80B9B92C[4]; -extern "C" extern u8 data_80B9B930[4]; -extern "C" extern u8 data_80B9B934[4]; extern "C" void __ct__11daNpc_zrZ_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -692,28 +640,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/npc/d_a_npc_zrz/executor.cpp b/rel/d/a/npc/d_a_npc_zrz/executor.cpp index 41768fd3db3..2d17f69d758 100644 --- a/rel/d/a/npc/d_a_npc_zrz/executor.cpp +++ b/rel/d/a/npc/d_a_npc_zrz/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B9AFD8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/npc/d_a_npc_zrz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/npc/d_a_npc_zrz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4d1a3edbb1c..e7da68136d4 100644 --- a/rel/d/a/npc/d_a_npc_zrz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/npc/d_a_npc_zrz/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B9AFE4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B9AFE4-80B9AFEC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B9AFE4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B9B860-80B9B868 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/npc/d_a_npc_zrz/unknown_translation_unit_ctors.cpp b/rel/d/a/npc/d_a_npc_zrz/unknown_translation_unit_ctors.cpp index 12fe4448f7b..8500ca201fb 100644 --- a/rel/d/a/npc/d_a_npc_zrz/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/npc/d_a_npc_zrz/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B9AFD8[2]; -extern void* const data_80B9AFD8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_npc_zrz_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B9AFD8-80B9AFE0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B9AFD8[2] = { + (void*)__sinit_d_a_npc_zrz_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp index a3d2701e8b3..d5cb3d91a21 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 8026745C */ void operator+=(csXyz&); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -156,8 +156,6 @@ static void daObjLv5Key_Draw(daObjLv5Key_c*); static void daObjLv5Key_Execute(daObjLv5Key_c*); static void useHeapInit(fopAc_ac_c*); static bool daObjLv5Key_IsDelete(daObjLv5Key_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv5Key[12]; extern "C" void CreateHeap__13daObjLv5Key_cFv(); extern "C" void Init__13daObjLv5Key_cFv(); @@ -205,18 +203,6 @@ void fopAcM_posMove(fopAc_ac_c*, cXyz const*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/executor.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/executor.cpp index 8cec5356092..00e5cd6b1c7 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/executor.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80B9C918[4]; -extern u8 const data_80B9C91C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/unknown_translation_unit_ctors.cpp index 73e52452e9f..de62e0f4fea 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80B9C918[4]; -extern u8 const data_80B9C918[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80B9C918[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B9C918-80B9C91C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80B9C918[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_Lv5Key/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_Lv5Key/unknown_translation_unit_dtors.cpp index d5ae0c6e851..10a1c7a9de0 100644 --- a/rel/d/a/obj/d_a_obj_Lv5Key/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_Lv5Key/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80B9C91C[4]; -extern u8 const data_80B9C91C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80B9C91C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80B9C91C-80B9C920 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80B9C91C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp b/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp index 41c9571ae8b..edc54fcb7ac 100644 --- a/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp +++ b/rel/d/a/obj/d_a_obj_Turara/d_a_obj_Turara.cpp @@ -237,9 +237,6 @@ static void daTurara_Draw(daTurara_c*); static void daTurara_Execute(daTurara_c*); static void daTurara_Delete(daTurara_c*); static void daTurara_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Turara[12]; extern "C" void __ct__14daTurara_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -312,20 +309,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc0(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_Turara/executor.cpp b/rel/d/a/obj/d_a_obj_Turara/executor.cpp index bf4d2291c1e..ebc4d021f79 100644 --- a/rel/d/a/obj/d_a_obj_Turara/executor.cpp +++ b/rel/d/a/obj/d_a_obj_Turara/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B9E8E0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_Turara/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_Turara/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 36554e93902..0c0ec3a6250 100644 --- a/rel/d/a/obj/d_a_obj_Turara/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_Turara/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B9E8EC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B9E8EC-80B9E8F4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80B9E8EC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B9EB90-80B9EB98 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_Turara/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_Turara/unknown_translation_unit_ctors.cpp index 18b9ddabb73..83270380471 100644 --- a/rel/d/a/obj/d_a_obj_Turara/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_Turara/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B9E8E0[2]; -extern void* const data_80B9E8E0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_Turara_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B9E8E0-80B9E8E8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B9E8E0[2] = { + (void*)__sinit_d_a_obj_Turara_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp b/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp index 2893edfd667..72a44fa6f17 100644 --- a/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp +++ b/rel/d/a/obj/d_a_obj_TvCdlst/d_a_obj_TvCdlst.cpp @@ -44,12 +44,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -137,8 +137,6 @@ static void daTvCdlst_Draw(daTvCdlst_c*); static void daTvCdlst_Execute(daTvCdlst_c*); static void daTvCdlst_Delete(daTvCdlst_c*); static void daTvCdlst_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_TvCdlst[12]; extern "C" void __ct__15daTvCdlst_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -181,20 +179,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80B9F888[2]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_TvCdlst/executor.cpp b/rel/d/a/obj/d_a_obj_TvCdlst/executor.cpp index 0e57adcf9c9..50f7c95f4a3 100644 --- a/rel/d/a/obj/d_a_obj_TvCdlst/executor.cpp +++ b/rel/d/a/obj/d_a_obj_TvCdlst/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80B9F87C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_TvCdlst/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_TvCdlst/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ce4cba658cf..ebc98fbca5f 100644 --- a/rel/d/a/obj/d_a_obj_TvCdlst/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_TvCdlst/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80B9F888[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80B9F888-80B9F890 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80B9F888[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80B9F9C8-80B9F9D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_TvCdlst/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_TvCdlst/unknown_translation_unit_ctors.cpp index 71f70b74e68..dd4c4e742e5 100644 --- a/rel/d/a/obj/d_a_obj_TvCdlst/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_TvCdlst/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80B9F87C[2]; -extern void* const data_80B9F87C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_TvCdlst_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80B9F87C-80B9F884 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80B9F87C[2] = { + (void*)__sinit_d_a_obj_TvCdlst_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp b/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp index 5c7717802b6..e7a9cc58f64 100644 --- a/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp +++ b/rel/d/a/obj/d_a_obj_Y_taihou/d_a_obj_Y_taihou.cpp @@ -179,48 +179,6 @@ static void daObjYtaihou_MoveBGDelete(daObjYtaihou_c*); static void daObjYtaihou_MoveBGExecute(daObjYtaihou_c*); static void daObjYtaihou_MoveBGDraw(daObjYtaihou_c*); static void cLib_calcTimer__template0(s16*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Ytaihou[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80BA137C[4]; -extern "C" extern u8 data_80BA1380[4]; -extern "C" extern u8 data_80BA1384[4]; -extern "C" extern u8 data_80BA1388[4]; -extern "C" extern u8 data_80BA138C[4]; -extern "C" extern u8 data_80BA1390[4]; -extern "C" extern u8 data_80BA1394[4]; -extern "C" extern u8 data_80BA1398[4]; -extern "C" extern u8 data_80BA139C[4]; -extern "C" extern u8 data_80BA13A0[4]; -extern "C" extern u8 data_80BA13A4[4]; -extern "C" extern u8 data_80BA13A8[4]; -extern "C" extern u8 data_80BA13AC[4]; -extern "C" extern u8 data_80BA13B0[4]; -extern "C" extern u8 data_80BA13B4[4]; -extern "C" extern u8 data_80BA13B8[4]; -extern "C" extern u8 data_80BA13BC[4]; -extern "C" extern u8 data_80BA13C0[4]; -extern "C" extern u8 data_80BA13C4[4]; -extern "C" extern u8 data_80BA13C8[4]; -extern "C" extern u8 data_80BA13CC[4]; -extern "C" extern u8 data_80BA13D0[4]; -extern "C" extern u8 data_80BA13D4[4]; -extern "C" extern u8 data_80BA13D8[4]; -extern "C" extern u8 data_80BA13DC[4]; extern "C" static void ccHitCallback__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(); extern "C" static void pushPullcallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); @@ -322,20 +280,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_chaseAngleS(s16*, s16, s16); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_Y_taihou/executor.cpp b/rel/d/a/obj/d_a_obj_Y_taihou/executor.cpp index 80b355fc885..3dd81913ca2 100644 --- a/rel/d/a/obj/d_a_obj_Y_taihou/executor.cpp +++ b/rel/d/a/obj/d_a_obj_Y_taihou/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BA1144[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_Y_taihou/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_Y_taihou/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 92c711763d4..f9c97f7d00c 100644 --- a/rel/d/a/obj/d_a_obj_Y_taihou/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_Y_taihou/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BA114C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BA114C-80BA1154 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BA114C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BA1310-80BA1318 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_Y_taihou/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_Y_taihou/unknown_translation_unit_ctors.cpp index e542e0a6722..5a55f99f98e 100644 --- a/rel/d/a/obj/d_a_obj_Y_taihou/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_Y_taihou/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BA1144[4]; -extern u8 const data_80BA1144[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BA1144[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BA1144-80BA1148 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BA1144[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp b/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp index 3e69c893ef2..aaab301ab4a 100644 --- a/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp +++ b/rel/d/a/obj/d_a_obj_amiShutter/d_a_obj_amiShutter.cpp @@ -55,16 +55,16 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -121,9 +121,6 @@ static void daAmiShutter_Draw(daAmiShutter_c*); static void daAmiShutter_Execute(daAmiShutter_c*); static void daAmiShutter_Delete(daAmiShutter_c*); static void daAmiShutter_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_AmiShutter[12]; extern "C" void __ct__18daAmiShutter_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -179,16 +176,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_amiShutter/executor.cpp b/rel/d/a/obj/d_a_obj_amiShutter/executor.cpp index d636a8cfd3b..9c14068a74c 100644 --- a/rel/d/a/obj/d_a_obj_amiShutter/executor.cpp +++ b/rel/d/a/obj/d_a_obj_amiShutter/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BA237C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_amiShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_amiShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3512bc16795..ccd6ccbd260 100644 --- a/rel/d/a/obj/d_a_obj_amiShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_amiShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BA2388[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BA2388-80BA2390 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BA2388[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BA2558-80BA2560 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_amiShutter/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_amiShutter/unknown_translation_unit_ctors.cpp index 4a29c8376a5..06af7263dd5 100644 --- a/rel/d/a/obj/d_a_obj_amiShutter/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_amiShutter/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BA237C[2]; -extern void* const data_80BA237C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_amiShutter_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BA237C-80BA2384 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BA237C[2] = { + (void*)__sinit_d_a_obj_amiShutter_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp b/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp index 3ceca92d249..83801f73731 100644 --- a/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp +++ b/rel/d/a/obj/d_a_obj_ari/d_a_obj_ari.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -49,16 +49,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -83,10 +83,10 @@ struct daObj_AriHIO_c { /* 80BA5360 */ ~daObj_AriHIO_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daObjARI_c { /* 80BA26BC */ void InitCcSph(); /* 80BA2728 */ void SetCcSph(); @@ -253,11 +253,6 @@ static void daObjARI_Delete(daObjARI_c*); static void daObjARI_Draw(daObjARI_c*); static void daObjARI_Execute(daObjARI_c*); static bool daObjARI_IsDelete(daObjARI_c*); -extern "C" extern u32 const lit_3968; -extern "C" extern u32 const lit_3970; -extern "C" extern u32 const lit_3972; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Ari[12]; extern "C" void __ct__14daObj_AriHIO_cFv(); extern "C" void InitCcSph__10daObjARI_cFv(); @@ -327,21 +322,6 @@ void cLib_chasePos(cXyz*, cXyz const&, f32); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_ari/executor.cpp b/rel/d/a/obj/d_a_obj_ari/executor.cpp index b53e139fcb3..33e70eae130 100644 --- a/rel/d/a/obj/d_a_obj_ari/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ari/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BA53F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ari/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_ari/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e1bb3c1e9ae..23ad5fc6bde 100644 --- a/rel/d/a/obj/d_a_obj_ari/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_ari/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BA5400[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BA5400-80BA5408 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BA5400[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BA55D8-80BA55E0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_ari/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ari/unknown_translation_unit_ctors.cpp index 50d2a5ab023..927d2adfa8f 100644 --- a/rel/d/a/obj/d_a_obj_ari/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ari/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BA53F4[2]; -extern void* const data_80BA53F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ari_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BA53F4-80BA53FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BA53F4[2] = { + (void*)__sinit_d_a_obj_ari_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp index 3e2ab4270e3..0856bca557d 100644 --- a/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp +++ b/rel/d/a/obj/d_a_obj_automata/d_a_obj_automata.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -39,12 +39,6 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -53,6 +47,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -219,8 +219,6 @@ static void daObj_AutoMata_Delete(void*); static void daObj_AutoMata_Execute(void*); static void daObj_AutoMata_Draw(void*); static bool daObj_AutoMata_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_AUTOMATA[12]; extern "C" void __dt__16daObj_AutoMata_cFv(); extern "C" void create__16daObj_AutoMata_cFv(); @@ -270,22 +268,6 @@ void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_Poly dKy_tevstr_c*, s16, f32, _GXTexObj*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_automata/executor.cpp b/rel/d/a/obj/d_a_obj_automata/executor.cpp index 9231b661d52..49636eb8e93 100644 --- a/rel/d/a/obj/d_a_obj_automata/executor.cpp +++ b/rel/d/a/obj/d_a_obj_automata/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BA6BFC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_automata/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_automata/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ced94dc5ec1..8b2896b8db6 100644 --- a/rel/d/a/obj/d_a_obj_automata/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_automata/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BA6C08[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BA6C08-80BA6C10 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BA6C08[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BA6E48-80BA6E50 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_automata/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_automata/unknown_translation_unit_ctors.cpp index 4eed6e4114b..1f6ef5f108f 100644 --- a/rel/d/a/obj/d_a_obj_automata/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_automata/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BA6BFC[2]; -extern void* const data_80BA6BFC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_automata_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BA6BFC-80BA6C04 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BA6BFC[2] = { + (void*)__sinit_d_a_obj_automata_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp index fa42efbd3ec..76b2844bfaf 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/d_a_obj_avalanche.cpp @@ -53,14 +53,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -162,8 +162,6 @@ static void daObjAvalanche_MoveBGDelete(daObjAvalanche_c*); static void daObjAvalanche_MoveBGExecute(daObjAvalanche_c*); static void daObjAvalanche_MoveBGDraw(daObjAvalanche_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Avalanche[12]; extern "C" void initBaseMtx__16daObjAvalanche_cFv(); extern "C" void setBaseMtx__16daObjAvalanche_cFv(); @@ -207,14 +205,6 @@ void dBgS_MoveBGProc_Trans(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXy void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80BA7EA0[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_avalanche/executor.cpp b/rel/d/a/obj/d_a_obj_avalanche/executor.cpp index 5bf90fc4d97..9acc6796583 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/executor.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BA7CF4[4]; -extern u8 const data_80BA7CF8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.cpp index a0ebd68e990..4c5339479b5 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80BA7EA0[4]; -extern "C" extern u8 data_80BA7EA0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_ctors.cpp index 4bb3884426a..92f385ca183 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BA7CF4[4]; -extern u8 const data_80BA7CF4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BA7CF4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BA7CF4-80BA7CF8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BA7CF4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_dtors.cpp index d35d972c2a9..f099530b9e1 100644 --- a/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_avalanche/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BA7CF8[4]; -extern u8 const data_80BA7CF8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BA7CF8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BA7CF8-80BA7CFC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BA7CF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp b/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp index 6f5a40ddf21..00ff7e27231 100644 --- a/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp +++ b/rel/d/a/obj/d_a_obj_balloon/d_a_obj_balloon.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 80266C18 */ void operator/(f32) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -173,49 +173,6 @@ static bool daObj_Balloon_IsDelete(daObj_Balloon_c*); static void daObj_Balloon_Delete(daObj_Balloon_c*); static void useHeapInit(fopAc_ac_c*); static void daObj_Balloon_Create(daObj_Balloon_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_BALLOON[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80BA902C[4]; -extern "C" extern u8 data_80BA9030[4]; -extern "C" extern u8 data_80BA9034[4]; -extern "C" extern u8 data_80BA9038[4]; -extern "C" extern u8 data_80BA903C[4]; -extern "C" extern u8 data_80BA9040[4]; -extern "C" extern u8 data_80BA9044[4]; -extern "C" extern u8 data_80BA9048[4]; -extern "C" extern u8 data_80BA904C[4]; -extern "C" extern u8 data_80BA9050[4]; -extern "C" extern u8 data_80BA9054[4]; -extern "C" extern u8 data_80BA9058[4]; -extern "C" extern u8 data_80BA905C[4]; -extern "C" extern u8 data_80BA9060[4]; -extern "C" extern u8 data_80BA9064[4]; -extern "C" extern u8 data_80BA9068[4]; -extern "C" extern u8 data_80BA906C[4]; -extern "C" extern u8 data_80BA9070[4]; -extern "C" extern u8 data_80BA9074[4]; -extern "C" extern u8 data_80BA9078[4]; -extern "C" extern u8 data_80BA907C[4]; -extern "C" extern u8 data_80BA9080[4]; -extern "C" extern u8 data_80BA9084[4]; -extern "C" extern u8 data_80BA9088[4]; -extern "C" extern u8 data_80BA908C[4]; extern "C" void __ct__19daObj_Balloon_HIO_cFv(); extern "C" void draw__15daObj_Balloon_cFv(); @@ -309,18 +266,6 @@ void cM_rndF(f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_balloon/executor.cpp b/rel/d/a/obj/d_a_obj_balloon/executor.cpp index b1fe63ee936..98ba7c61353 100644 --- a/rel/d/a/obj/d_a_obj_balloon/executor.cpp +++ b/rel/d/a/obj/d_a_obj_balloon/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BA8DF8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_balloon/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_balloon/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ec51e82b696..206d64e7559 100644 --- a/rel/d/a/obj/d_a_obj_balloon/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_balloon/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BA8E04[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BA8E04-80BA8E0C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BA8E04[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BA8FA8-80BA8FB0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_balloon/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_balloon/unknown_translation_unit_ctors.cpp index 876b9dcfaa9..5c94c5a785b 100644 --- a/rel/d/a/obj/d_a_obj_balloon/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_balloon/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BA8DF8[2]; -extern void* const data_80BA8DF8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_balloon_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BA8DF8-80BA8E00 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BA8DF8[2] = { + (void*)__sinit_d_a_obj_balloon_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp b/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp index 407af2269ff..e0eef7b2582 100644 --- a/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp +++ b/rel/d/a/obj/d_a_obj_barDesk/d_a_obj_barDesk.cpp @@ -160,9 +160,6 @@ static void daBarDesk_Draw(daBarDesk_c*); static void daBarDesk_Execute(daBarDesk_c*); static void daBarDesk_Delete(daBarDesk_c*); static void daBarDesk_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_BarDesk[12]; extern "C" void __ct__15daBarDesk_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -206,19 +203,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80BA9B68[2]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_barDesk/executor.cpp b/rel/d/a/obj/d_a_obj_barDesk/executor.cpp index 6dba1a9dccc..cf30b74daa3 100644 --- a/rel/d/a/obj/d_a_obj_barDesk/executor.cpp +++ b/rel/d/a/obj/d_a_obj_barDesk/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BA9B5C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_barDesk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_barDesk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9ff585d1d2e..a2ce38d4ade 100644 --- a/rel/d/a/obj/d_a_obj_barDesk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_barDesk/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BA9B68[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BA9B68-80BA9B70 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80BA9B68[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BA9D10-80BA9D18 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_barDesk/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_barDesk/unknown_translation_unit_ctors.cpp index ad740b73df5..b6903b3b7de 100644 --- a/rel/d/a/obj/d_a_obj_barDesk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_barDesk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BA9B5C[2]; -extern void* const data_80BA9B5C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_barDesk_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BA9B5C-80BA9B64 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BA9B5C[2] = { + (void*)__sinit_d_a_obj_barDesk_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp b/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp index bf0f3b423f0..2d45e2f510c 100644 --- a/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp +++ b/rel/d/a/obj/d_a_obj_batta/d_a_obj_batta.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -44,12 +44,6 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -57,6 +51,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -234,10 +234,6 @@ static void daObjBATTA_Delete(daObjBATTA_c*); static void daObjBATTA_Draw(daObjBATTA_c*); static void daObjBATTA_Execute(daObjBATTA_c*); static bool daObjBATTA_IsDelete(daObjBATTA_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Batta[12]; -extern "C" extern void* __vt__9dInsect_c[3]; extern "C" void __ct__16daObj_BattaHIO_cFv(); extern "C" void setAction__12daObjBATTA_cFM12daObjBATTA_cFPCvPv_v(); @@ -302,19 +298,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_batta/executor.cpp b/rel/d/a/obj/d_a_obj_batta/executor.cpp index 04e441a2710..e5f2e733e8f 100644 --- a/rel/d/a/obj/d_a_obj_batta/executor.cpp +++ b/rel/d/a/obj/d_a_obj_batta/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BAC95C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_batta/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_batta/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d2beeaea2aa..01fb38e67e8 100644 --- a/rel/d/a/obj/d_a_obj_batta/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_batta/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BAC968[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BAC968-80BAC970 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BAC968[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BACC80-80BACC88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_batta/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_batta/unknown_translation_unit_ctors.cpp index 301ba7e9366..a1d060785db 100644 --- a/rel/d/a/obj/d_a_obj_batta/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_batta/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BAC95C[2]; -extern void* const data_80BAC95C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_batta_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BAC95C-80BAC964 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BAC95C[2] = { + (void*)__sinit_d_a_obj_batta_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp index 1fc41e8ed33..04a24f81126 100644 --- a/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp +++ b/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.cpp @@ -134,8 +134,6 @@ static void daObjBBox_create1st(daObjBBox_c*); static void daObjBBox_MoveBGDelete(daObjBBox_c*); static void daObjBBox_MoveBGExecute(daObjBBox_c*); static void daObjBBox_MoveBGDraw(daObjBBox_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_BBox[12]; extern "C" void initBaseMtx__11daObjBBox_cFv(); extern "C" void setBaseMtx__11daObjBBox_cFv(); @@ -167,18 +165,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_bbox/executor.cpp b/rel/d/a/obj/d_a_obj_bbox/executor.cpp index 099bd1f50ee..c925093e820 100644 --- a/rel/d/a/obj/d_a_obj_bbox/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bbox/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BAD46C[4]; -extern u8 const data_80BAD470[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bbox/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bbox/unknown_translation_unit_ctors.cpp index d92c60db82f..426e4ff8560 100644 --- a/rel/d/a/obj/d_a_obj_bbox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bbox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BAD46C[4]; -extern u8 const data_80BAD46C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BAD46C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BAD46C-80BAD470 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BAD46C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bbox/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bbox/unknown_translation_unit_dtors.cpp index aba82547184..c63a4171b92 100644 --- a/rel/d/a/obj/d_a_obj_bbox/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bbox/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BAD470[4]; -extern u8 const data_80BAD470[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BAD470[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BAD470-80BAD474 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BAD470[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp index e9405966ec1..fd3db7464b3 100644 --- a/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp +++ b/rel/d/a/obj/d_a_obj_bed/d_a_obj_bed.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -139,8 +139,6 @@ static void daObj_Bed_Delete(void*); static void daObj_Bed_Execute(void*); static void daObj_Bed_Draw(void*); static bool daObj_Bed_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_BED[12]; extern "C" void __dt__11daObj_Bed_cFv(); extern "C" void create__11daObj_Bed_cFv(); @@ -187,12 +185,6 @@ void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs void daNpcT_chkEvtBit(u32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_bed/executor.cpp b/rel/d/a/obj/d_a_obj_bed/executor.cpp index 2d762cc6e99..87689cc3526 100644 --- a/rel/d/a/obj/d_a_obj_bed/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bed/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BAE154[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bed/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_bed/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c7f39504d01..2d3ce474821 100644 --- a/rel/d/a/obj/d_a_obj_bed/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_bed/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BAE160[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BAE160-80BAE168 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BAE160[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BAE250-80BAE258 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_bed/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bed/unknown_translation_unit_ctors.cpp index 975f2da967b..22296cf3122 100644 --- a/rel/d/a/obj/d_a_obj_bed/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bed/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BAE154[2]; -extern void* const data_80BAE154[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_bed_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BAE154-80BAE15C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BAE154[2] = { + (void*)__sinit_d_a_obj_bed_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp b/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp index e6add4e217a..28810c2f4e3 100644 --- a/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp +++ b/rel/d/a/obj/d_a_obj_bemos/d_a_obj_bemos.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -29,6 +25,10 @@ struct cXyz { /* 80BB0ED0 */ cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -361,52 +361,6 @@ static void daObjBm_MoveBGExecute(daObjBm_c*); static void daObjBm_MoveBGDraw(daObjBm_c*); static void cLib_calcTimer__template0(u16*); static void cLib_calcTimer__template1(u8*); -extern "C" extern u8 const M_lin20__Q29daObjBm_c5Bgc_c[368]; -extern "C" extern u32 const lit_5157; -extern "C" extern u32 const lit_5299; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Bemos[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_5249[12 + 4 /* padding */]; -extern "C" extern u8 data_80BB51B4[112]; -extern "C" extern u8 data_80BB5224[4]; -extern "C" extern u8 data_80BB5228[4]; -extern "C" extern u8 data_80BB522C[4]; -extern "C" extern u8 data_80BB5230[4]; -extern "C" extern u8 data_80BB5234[4]; -extern "C" extern u8 data_80BB5238[4]; -extern "C" extern u8 data_80BB523C[4]; -extern "C" extern u8 data_80BB5240[4]; -extern "C" extern u8 data_80BB5244[4]; -extern "C" extern u8 data_80BB5248[4]; -extern "C" extern u8 data_80BB524C[4]; -extern "C" extern u8 data_80BB5250[4]; -extern "C" extern u8 data_80BB5254[4]; -extern "C" extern u8 data_80BB5258[4]; -extern "C" extern u8 data_80BB525C[4]; -extern "C" extern u8 data_80BB5260[4]; -extern "C" extern u8 data_80BB5264[4]; -extern "C" extern u8 data_80BB5268[4]; -extern "C" extern u8 data_80BB526C[4]; -extern "C" extern u8 data_80BB5270[4]; -extern "C" extern u8 data_80BB5274[4]; -extern "C" extern u8 data_80BB5278[4]; -extern "C" extern u8 data_80BB527C[4]; -extern "C" extern u8 data_80BB5280[4]; -extern "C" extern u8 data_80BB5284[4]; extern "C" void PPCallBack__9daObjBm_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -572,28 +526,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_bemos/executor.cpp b/rel/d/a/obj/d_a_obj_bemos/executor.cpp index 9a63c5aaf9c..eef712bc580 100644 --- a/rel/d/a/obj/d_a_obj_bemos/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bemos/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BB37A4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bemos/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_bemos/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c645aaa7325..b3d8e0b566c 100644 --- a/rel/d/a/obj/d_a_obj_bemos/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_bemos/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BB37B0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BB37B0-80BB37B8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BB37B0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BB3EE0-80BB3EE8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_bemos/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bemos/unknown_translation_unit_ctors.cpp index 6f16cda2b08..b71afaff0ce 100644 --- a/rel/d/a/obj/d_a_obj_bemos/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bemos/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BB37A4[2]; -extern void* const data_80BB37A4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_bemos_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BB37A4-80BB37AC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BB37A4[2] = { + (void*)__sinit_d_a_obj_bemos_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp b/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp index 9c14017a3ce..c8cc935a318 100644 --- a/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp +++ b/rel/d/a/obj/d_a_obj_bhashi/d_a_obj_bhashi.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -194,8 +194,6 @@ static void daObjBHASHI_Delete(daObjBHASHI_c*); static void daObjBHASHI_Draw(daObjBHASHI_c*); static void daObjBHASHI_Execute(daObjBHASHI_c*); static bool daObjBHASHI_IsDelete(daObjBHASHI_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_BHASHI[12]; extern "C" void initCcCylinder__13daObjBHASHI_cFv(); extern "C" void setCcCylinder__13daObjBHASHI_cFv(); @@ -245,21 +243,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_targetAngleY(Vec const*, Vec const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_bhashi/executor.cpp b/rel/d/a/obj/d_a_obj_bhashi/executor.cpp index b60958a3e68..d9c494490ef 100644 --- a/rel/d/a/obj/d_a_obj_bhashi/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bhashi/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80578A80[4]; -extern u8 const data_80578A84[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bhashi/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bhashi/unknown_translation_unit_ctors.cpp index 8d74ef6c644..9be1c25f4a2 100644 --- a/rel/d/a/obj/d_a_obj_bhashi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bhashi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80578A80[4]; -extern u8 const data_80578A80[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80578A80[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80578A80-80578A84 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80578A80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bhashi/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bhashi/unknown_translation_unit_dtors.cpp index 935249eebf3..f81a070f1c2 100644 --- a/rel/d/a/obj/d_a_obj_bhashi/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bhashi/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80578A84[4]; -extern u8 const data_80578A84[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80578A84[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80578A84-80578A88 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80578A84[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp b/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp index 65daab39e23..6c827de3116 100644 --- a/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp +++ b/rel/d/a/obj/d_a_obj_bhbridge/d_a_obj_bhbridge.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -128,8 +128,6 @@ static void daObjBhbridge_Execute(daObjBhbridge_c*); static bool daObjBhbridge_IsDelete(daObjBhbridge_c*); static void daObjBhbridge_Delete(daObjBhbridge_c*); static void daObjBhbridge_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Bhbridge[12]; extern "C" void RideOn_Angle__15daObjBhbridge_cFRsfsf(); extern "C" void Check_RideOn__15daObjBhbridge_cFv(); @@ -166,16 +164,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_bhbridge/executor.cpp b/rel/d/a/obj/d_a_obj_bhbridge/executor.cpp index bf91ca0c4c0..b63ef7aa0fe 100644 --- a/rel/d/a/obj/d_a_obj_bhbridge/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bhbridge/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BB5EF8[4]; -extern u8 const data_80BB5EFC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bhbridge/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bhbridge/unknown_translation_unit_ctors.cpp index c9633cc4d3f..4a67e20a184 100644 --- a/rel/d/a/obj/d_a_obj_bhbridge/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bhbridge/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BB5EF8[4]; -extern u8 const data_80BB5EF8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BB5EF8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BB5EF8-80BB5EFC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BB5EF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bhbridge/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bhbridge/unknown_translation_unit_dtors.cpp index c04e11ddeea..49903c06a76 100644 --- a/rel/d/a/obj/d_a_obj_bhbridge/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bhbridge/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BB5EFC[4]; -extern u8 const data_80BB5EFC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BB5EFC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BB5EFC-80BB5F00 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BB5EFC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp b/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp index f625adf0840..8dcb89e4fbd 100644 --- a/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp +++ b/rel/d/a/obj/d_a_obj_bk_leaf/d_a_obj_bk_leaf.cpp @@ -75,9 +75,6 @@ static void daBkLeaf_Draw(daBkLeaf_c*); static void daBkLeaf_Execute(daBkLeaf_c*); static void daBkLeaf_Delete(daBkLeaf_c*); static void daBkLeaf_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_BkLeaf[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void setBokkuri__10daBkLeaf_cFv(); @@ -115,11 +112,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_bk_leaf/executor.cpp b/rel/d/a/obj/d_a_obj_bk_leaf/executor.cpp index 541bd86fe35..a9492056874 100644 --- a/rel/d/a/obj/d_a_obj_bk_leaf/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bk_leaf/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BB6708[4]; -extern u8 const data_80BB670C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bk_leaf/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bk_leaf/unknown_translation_unit_ctors.cpp index 363832dde87..61169b2d0d4 100644 --- a/rel/d/a/obj/d_a_obj_bk_leaf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bk_leaf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BB6708[4]; -extern u8 const data_80BB6708[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BB6708[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BB6708-80BB670C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BB6708[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bk_leaf/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bk_leaf/unknown_translation_unit_dtors.cpp index ff00abf677b..70c9d93e65f 100644 --- a/rel/d/a/obj/d_a_obj_bk_leaf/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bk_leaf/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BB670C[4]; -extern u8 const data_80BB670C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BB670C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BB670C-80BB6710 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BB670C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp index de75336d007..c872f0f3d64 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp +++ b/rel/d/a/obj/d_a_obj_bkdoor/d_a_obj_bkdoor.cpp @@ -31,12 +31,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -86,9 +86,6 @@ static void daObjBkDoor_create1st(daObjBkDoor_c*); static void daObjBkDoor_MoveBGDelete(daObjBkDoor_c*); static void daObjBkDoor_MoveBGExecute(daObjBkDoor_c*); static void daObjBkDoor_MoveBGDraw(daObjBkDoor_c*); -extern "C" extern u8 const l_col_offsetX[20]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_BkDoor[12]; extern "C" static void search_door__FPvPv(); extern "C" void initBaseMtx__13daObjBkDoor_cFv(); @@ -124,15 +121,6 @@ void dComIfGp_getReverb(int); void dLib_checkActorInRectangle(fopAc_ac_c*, fopAc_ac_c*, cXyz const*, cXyz const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc0(f32*, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_bkdoor/executor.cpp b/rel/d/a/obj/d_a_obj_bkdoor/executor.cpp index 0e891701bc2..ade340968cd 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bkdoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80579488[4]; -extern u8 const data_8057948C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bkdoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bkdoor/unknown_translation_unit_ctors.cpp index b274c5c3d54..779596c6ca3 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bkdoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80579488[4]; -extern u8 const data_80579488[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80579488[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80579488-8057948C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80579488[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bkdoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bkdoor/unknown_translation_unit_dtors.cpp index d2492d928f6..2b2720f67fa 100644 --- a/rel/d/a/obj/d_a_obj_bkdoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bkdoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057948C[4]; -extern u8 const data_8057948C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8057948C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8057948C-80579490 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8057948C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp b/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp index 17c6e97bb79..5c240c23031 100644 --- a/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp +++ b/rel/d/a/obj/d_a_obj_bky_rock/d_a_obj_bky_rock.cpp @@ -192,9 +192,6 @@ static void daBkyRock_create(daBkyRock_c*); static void daBkyRock_Delete(daBkyRock_c*); static void daBkyRock_execute(daBkyRock_c*); static void daBkyRock_draw(daBkyRock_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_BkyRock[12]; extern "C" static void daBkyRock_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__11daBkyRock_cFv(); @@ -250,18 +247,6 @@ void cM_rndF(f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_bky_rock/executor.cpp b/rel/d/a/obj/d_a_obj_bky_rock/executor.cpp index fcb1a517958..5f58d830625 100644 --- a/rel/d/a/obj/d_a_obj_bky_rock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bky_rock/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BB7EA4[2]; -extern u8 const data_80BB7EAC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bky_rock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bky_rock/unknown_translation_unit_ctors.cpp index 99c1990fcd9..cd04000feb0 100644 --- a/rel/d/a/obj/d_a_obj_bky_rock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bky_rock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BB7EA4[2]; -extern void* const data_80BB7EA4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_bky_rock_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BB7EA4-80BB7EAC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BB7EA4[2] = { + (void*)__sinit_d_a_obj_bky_rock_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_bky_rock/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bky_rock/unknown_translation_unit_dtors.cpp index 75ca59e9c36..e63fbfcf063 100644 --- a/rel/d/a/obj/d_a_obj_bky_rock/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bky_rock/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BB7EAC[4]; -extern u8 const data_80BB7EAC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BB7EAC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BB7EAC-80BB7EB0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BB7EAC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp b/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp index cc109c98b12..cee5a4a17c9 100644 --- a/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp +++ b/rel/d/a/obj/d_a_obj_bmWindow/d_a_obj_bmWindow.cpp @@ -177,9 +177,6 @@ static void daBmWindow_Draw(daBmWindow_c*); static void daBmWindow_Execute(daBmWindow_c*); static void daBmWindow_Delete(daBmWindow_c*); static void daBmWindow_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_BmWindow[12]; extern "C" void __ct__16daBmWindow_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -234,19 +231,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cM_rndF(f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_bmWindow/executor.cpp b/rel/d/a/obj/d_a_obj_bmWindow/executor.cpp index b1c5923ee30..8342644d252 100644 --- a/rel/d/a/obj/d_a_obj_bmWindow/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bmWindow/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BB9728[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bmWindow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_bmWindow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4164d6bf43f..35e72fa7dcc 100644 --- a/rel/d/a/obj/d_a_obj_bmWindow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_bmWindow/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BB9734[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BB9734-80BB973C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BB9734[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BB9988-80BB9990 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_bmWindow/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bmWindow/unknown_translation_unit_ctors.cpp index 8bd5199894c..3f8eae40560 100644 --- a/rel/d/a/obj/d_a_obj_bmWindow/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bmWindow/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BB9728[2]; -extern void* const data_80BB9728[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_bmWindow_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BB9728-80BB9730 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BB9728[2] = { + (void*)__sinit_d_a_obj_bmWindow_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp b/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp index 8dbfb04a75f..e5d8b781742 100644 --- a/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp +++ b/rel/d/a/obj/d_a_obj_bmshutter/d_a_obj_bmshutter.cpp @@ -47,12 +47,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -110,9 +110,6 @@ static void daObjBmSh_Draw(daObjBmSh_c*); static void daObjBmSh_Execute(daObjBmSh_c*); static void daObjBmSh_Delete(daObjBmSh_c*); static void daObjBmSh_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_BoomShutter[12]; extern "C" void initBaseMtx__11daObjBmSh_cFv(); extern "C" void setBaseMtx__11daObjBmSh_cFv(); @@ -159,15 +156,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80BBA970[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_bmshutter/executor.cpp b/rel/d/a/obj/d_a_obj_bmshutter/executor.cpp index 9ee5fdd96ec..36f92ae02f0 100644 --- a/rel/d/a/obj/d_a_obj_bmshutter/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bmshutter/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BBA7A8[4]; -extern u8 const data_80BBA7AC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_bss.cpp index 2c161f9b4db..9d24f088e36 100644 --- a/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80BBA970[4]; -extern "C" extern u8 struct_80BBA970[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_ctors.cpp index 48e130dc029..6dea9384b03 100644 --- a/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BBA7A8[4]; -extern u8 const data_80BBA7A8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BBA7A8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BBA7A8-80BBA7AC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BBA7A8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_dtors.cpp index dd0956cd73f..63a468cefe4 100644 --- a/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bmshutter/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BBA7AC[4]; -extern u8 const data_80BBA7AC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BBA7AC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BBA7AC-80BBA7B0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BBA7AC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp index 7f973675da2..4166216689b 100644 --- a/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/d_a_obj_bombf.cpp @@ -27,12 +27,12 @@ struct daObjBombf_c { /* 80BBADF8 */ void draw(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -61,7 +61,6 @@ static void daObjBombf_Create(fopAc_ac_c*); static void daObjBombf_Delete(daObjBombf_c*); static void daObjBombf_Execute(daObjBombf_c*); static void daObjBombf_Draw(daObjBombf_c*); -extern "C" extern void* g_profile_Obj_Bombf[12]; extern "C" void createHeap__12daObjBombf_cFv(); extern "C" static void daObjBombf_createHeap__FP10fopAc_ac_c(); @@ -93,11 +92,6 @@ void fpcSch_JudgeByID(void*, void*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_bombf/executor.cpp b/rel/d/a/obj/d_a_obj_bombf/executor.cpp index cd14371f899..e557c6264ad 100644 --- a/rel/d/a/obj/d_a_obj_bombf/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BBAE7C[4]; -extern u8 const data_80BBAE80[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bombf/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bombf/unknown_translation_unit_ctors.cpp index 3f7a51a1938..7e30e361e81 100644 --- a/rel/d/a/obj/d_a_obj_bombf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BBAE7C[4]; -extern u8 const data_80BBAE7C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BBAE7C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BBAE7C-80BBAE80 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BBAE7C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bombf/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bombf/unknown_translation_unit_dtors.cpp index e81987bf8e5..5abee8bc2de 100644 --- a/rel/d/a/obj/d_a_obj_bombf/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bombf/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BBAE80[4]; -extern u8 const data_80BBAE80[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BBAE80[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BBAE80-80BBAE84 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BBAE80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp index 649271d78de..c549a925881 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/d_a_obj_bosswarp.cpp @@ -181,20 +181,6 @@ static void daObjBossWarp_Execute(daObjBossWarp_c*); static void daObjBossWarp_Delete(daObjBossWarp_c*); static void daObjBossWarp_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const data_8057B490[36]; -extern "C" extern u32 const lit_4491; -extern "C" extern u32 const lit_4492; -extern "C" extern u32 const lit_4493; -extern "C" extern u32 const lit_4494; -extern "C" extern u32 const lit_4495; -extern "C" extern u32 const lit_4496; -extern "C" extern u32 const lit_4497; -extern "C" extern u32 const lit_4498; -extern "C" extern u32 const lit_4499; -extern "C" extern u32 const lit_4500; -extern "C" extern u32 const lit_4501; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_BossWarp[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" static void getNowLevel__Fv(); @@ -267,16 +253,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_8057B8D0[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_bosswarp/executor.cpp b/rel/d/a/obj/d_a_obj_bosswarp/executor.cpp index 6c4c9e16105..bb7dcebba15 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8057B358[4]; -extern u8 const data_8057B35C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp index 762769a9672..2cd6c57afaa 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_8057B8D0[4]; -extern "C" extern u8 data_8057B8D0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_ctors.cpp index 1912033f1dc..8f51362cbbc 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057B358[4]; -extern u8 const data_8057B358[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8057B358[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8057B358-8057B35C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8057B358[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_dtors.cpp index f2835905e4d..9c5dee2ffe8 100644 --- a/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_bosswarp/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057B35C[4]; -extern u8 const data_8057B35C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8057B35C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8057B35C-8057B360 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8057B35C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp b/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp index a22efc844ed..071e507cd0a 100644 --- a/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp +++ b/rel/d/a/obj/d_a_obj_boumato/d_a_obj_boumato.cpp @@ -13,13 +13,13 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 80BBB1F4 */ ~csXyz(); /* 80BBB558 */ csXyz(); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -79,10 +79,10 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; -struct dJntColData_c {}; - struct J3DModel {}; +struct dJntColData_c {}; + struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -205,7 +205,6 @@ static void daObj_BouMato_Delete(void*); static void daObj_BouMato_Execute(void*); static void daObj_BouMato_Draw(void*); static bool daObj_BouMato_IsDelete(void*); -extern "C" extern void* g_profile_OBJ_BOUMATO[12]; extern "C" void __dt__15daObj_BouMato_cFv(); extern "C" void __dt__5csXyzFv(); @@ -270,19 +269,6 @@ void daNpcT_offTmpBit(u32); void daNpcT_chkTmpBit(u32); void cLib_addCalc2(f32*, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_boumato/executor.cpp b/rel/d/a/obj/d_a_obj_boumato/executor.cpp index 4d53701b7aa..ef94e7c0786 100644 --- a/rel/d/a/obj/d_a_obj_boumato/executor.cpp +++ b/rel/d/a/obj/d_a_obj_boumato/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BBC45C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_boumato/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_boumato/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index eec6bc9188e..52aa03efcbc 100644 --- a/rel/d/a/obj/d_a_obj_boumato/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_boumato/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BBC468[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BBC468-80BBC470 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BBC468[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BBC670-80BBC678 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_boumato/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_boumato/unknown_translation_unit_ctors.cpp index 81c8ed5909c..a86784f4637 100644 --- a/rel/d/a/obj/d_a_obj_boumato/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_boumato/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BBC45C[2]; -extern void* const data_80BBC45C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_boumato_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BBC45C-80BBC464 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BBC45C[2] = { + (void*)__sinit_d_a_obj_boumato_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp b/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp index 22298755f53..3c4d7708810 100644 --- a/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp +++ b/rel/d/a/obj/d_a_obj_brakeeff/d_a_obj_brakeeff.cpp @@ -32,16 +32,16 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -147,8 +147,6 @@ static bool daObj_Brakeeff_IsDelete(obj_brakeeff_class*); static void daObj_Brakeeff_Delete(obj_brakeeff_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Brakeeff_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_BEF[12]; extern "C" static void daObj_Brakeeff_Draw__FP18obj_brakeeff_class(); extern "C" static void obj_brakeeff_1__FP18obj_brakeeff_class(); @@ -182,16 +180,6 @@ void at_power_check(dCcU_AtInfo*); void cM_atan2s(f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_brakeeff/executor.cpp b/rel/d/a/obj/d_a_obj_brakeeff/executor.cpp index b9ee345fac9..5d1ce349f53 100644 --- a/rel/d/a/obj/d_a_obj_brakeeff/executor.cpp +++ b/rel/d/a/obj/d_a_obj_brakeeff/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8046E520[4]; -extern u8 const data_8046E524[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_brakeeff/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_brakeeff/unknown_translation_unit_ctors.cpp index 56eaee63a79..c6bc2bd94d5 100644 --- a/rel/d/a/obj/d_a_obj_brakeeff/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_brakeeff/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046E520[4]; -extern u8 const data_8046E520[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8046E520[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8046E520-8046E524 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8046E520[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_brakeeff/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_brakeeff/unknown_translation_unit_dtors.cpp index 60b5491e1f3..cf3e2bb90d0 100644 --- a/rel/d/a/obj/d_a_obj_brakeeff/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_brakeeff/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046E524[4]; -extern u8 const data_8046E524[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8046E524[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8046E524-8046E528 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8046E524[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp b/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp index f98d9a5634e..69940479645 100644 --- a/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp +++ b/rel/d/a/obj/d_a_obj_brg/d_a_obj_brg.cpp @@ -21,11 +21,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -181,47 +181,6 @@ static void daObj_Brg_Delete(obj_brg_class*); static void CreateInit(fopAc_ac_c*); static void CallbackCreateHeap(fopAc_ac_c*); static void daObj_Brg_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_BRG[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80BC273C[4]; -extern "C" extern u8 data_80BC2740[4]; -extern "C" extern u8 data_80BC2744[4]; -extern "C" extern u8 data_80BC2748[4]; -extern "C" extern u8 data_80BC274C[4]; -extern "C" extern u8 data_80BC2750[4]; -extern "C" extern u8 data_80BC2754[4]; -extern "C" extern u8 data_80BC2758[4]; -extern "C" extern u8 data_80BC275C[4]; -extern "C" extern u8 data_80BC2760[4]; -extern "C" extern u8 data_80BC2764[4]; -extern "C" extern u8 data_80BC2768[4]; -extern "C" extern u8 data_80BC276C[4]; -extern "C" extern u8 data_80BC2770[4]; -extern "C" extern u8 data_80BC2774[4]; -extern "C" extern u8 data_80BC2778[4]; -extern "C" extern u8 data_80BC277C[4]; -extern "C" extern u8 data_80BC2780[4]; -extern "C" extern u8 data_80BC2784[4]; -extern "C" extern u8 data_80BC2788[4]; -extern "C" extern u8 data_80BC278C[4]; -extern "C" extern u8 data_80BC2790[4]; -extern "C" extern u8 data_80BC2794[4]; -extern "C" extern u8 data_80BC2798[4]; -extern "C" extern u8 data_80BC279C[4]; extern "C" static void ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" void __dt__4cXyzFv(); @@ -319,24 +278,6 @@ void MtxPull(); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_brg/executor.cpp b/rel/d/a/obj/d_a_obj_brg/executor.cpp index eca52cf42e6..f549eeaf4ba 100644 --- a/rel/d/a/obj/d_a_obj_brg/executor.cpp +++ b/rel/d/a/obj/d_a_obj_brg/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BC2138[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_brg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_brg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 55ad7b97a46..9693bd4159d 100644 --- a/rel/d/a/obj/d_a_obj_brg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_brg/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BC2140[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BC2140-80BC2148 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BC2140[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BC24E0-80BC24E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_brg/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_brg/unknown_translation_unit_ctors.cpp index 7f47bbba5d2..8b3be1cfe4a 100644 --- a/rel/d/a/obj/d_a_obj_brg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_brg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BC2138[4]; -extern u8 const data_80BC2138[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BC2138[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC2138-80BC213C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BC2138[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp b/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp index 94f0b4ca280..2ca332fe771 100644 --- a/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp +++ b/rel/d/a/obj/d_a_obj_bsGate/d_a_obj_bsGate.cpp @@ -108,9 +108,6 @@ static void daBsGate_Draw(daBsGate_c*); static void daBsGate_Execute(daBsGate_c*); static void daBsGate_Delete(daBsGate_c*); static void daBsGate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_BsGate[12]; extern "C" void __ct__14daBsGate_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -151,13 +148,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_bsGate/executor.cpp b/rel/d/a/obj/d_a_obj_bsGate/executor.cpp index 069b3520d82..90ec7e1cd49 100644 --- a/rel/d/a/obj/d_a_obj_bsGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bsGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BC318C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bsGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_bsGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fe9e8acd516..3f89b15ddf0 100644 --- a/rel/d/a/obj/d_a_obj_bsGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_bsGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BC3198[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BC3198-80BC31A0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BC3198[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BC32C8-80BC32D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_bsGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bsGate/unknown_translation_unit_ctors.cpp index c5b47061898..a7d336e674d 100644 --- a/rel/d/a/obj/d_a_obj_bsGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bsGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BC318C[2]; -extern void* const data_80BC318C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_bsGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC318C-80BC3194 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BC318C[2] = { + (void*)__sinit_d_a_obj_bsGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp b/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp index b1806ddc724..e428f919223 100644 --- a/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp +++ b/rel/d/a/obj/d_a_obj_bubblePilar/d_a_obj_bubblePilar.cpp @@ -46,12 +46,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -163,9 +163,6 @@ static void daBubbPilar_Draw(daBubbPilar_c*); static void daBubbPilar_Execute(daBubbPilar_c*); static void daBubbPilar_Delete(daBubbPilar_c*); static void daBubbPilar_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_awaPlar[12]; extern "C" void __ct__17daBubbPilar_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -208,19 +205,6 @@ void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs void dKy_camera_water_in_status_check(); void dKy_bg_MAxx_proc(void*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80BC4068[2]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_bubblePilar/executor.cpp b/rel/d/a/obj/d_a_obj_bubblePilar/executor.cpp index d7d83731e26..13521b1d78e 100644 --- a/rel/d/a/obj/d_a_obj_bubblePilar/executor.cpp +++ b/rel/d/a/obj/d_a_obj_bubblePilar/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BC405C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_bubblePilar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_bubblePilar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index aed229b915d..134b787480b 100644 --- a/rel/d/a/obj/d_a_obj_bubblePilar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_bubblePilar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BC4068[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BC4068-80BC4070 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80BC4068[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BC4210-80BC4218 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_bubblePilar/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_bubblePilar/unknown_translation_unit_ctors.cpp index 9c498c35a8d..92b8e5aa0d9 100644 --- a/rel/d/a/obj/d_a_obj_bubblePilar/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_bubblePilar/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BC405C[2]; -extern void* const data_80BC405C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_bubblePilar_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC405C-80BC4064 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BC405C[2] = { + (void*)__sinit_d_a_obj_bubblePilar_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp b/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp index 78038004df2..798aef2d0a3 100644 --- a/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp +++ b/rel/d/a/obj/d_a_obj_burnbox/d_a_obj_burnbox.cpp @@ -119,7 +119,6 @@ static void daObjBurnBox_create1st(daObjBurnBox_c*); static void daObjBurnBox_MoveBGDelete(daObjBurnBox_c*); static void daObjBurnBox_MoveBGExecute(daObjBurnBox_c*); static void daObjBurnBox_MoveBGDraw(daObjBurnBox_c*); -extern "C" extern void* g_profile_Obj_BurnBox[12]; extern "C" void initBaseMtx__14daObjBurnBox_cFv(); extern "C" void setBaseMtx__14daObjBurnBox_cFv(); @@ -150,17 +149,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_burnbox/executor.cpp b/rel/d/a/obj/d_a_obj_burnbox/executor.cpp index a1657c14845..cdecf744dda 100644 --- a/rel/d/a/obj/d_a_obj_burnbox/executor.cpp +++ b/rel/d/a/obj/d_a_obj_burnbox/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8046EE40[4]; -extern u8 const data_8046EE44[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_burnbox/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_burnbox/unknown_translation_unit_ctors.cpp index b5d5eeb5773..47115825923 100644 --- a/rel/d/a/obj/d_a_obj_burnbox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_burnbox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046EE40[4]; -extern u8 const data_8046EE40[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8046EE40[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8046EE40-8046EE44 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8046EE40[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_burnbox/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_burnbox/unknown_translation_unit_dtors.cpp index df605913638..0ccec957712 100644 --- a/rel/d/a/obj/d_a_obj_burnbox/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_burnbox/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8046EE44[4]; -extern u8 const data_8046EE44[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8046EE44[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8046EE44-8046EE48 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8046EE44[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp index 523651be99d..37d21c0bdf3 100644 --- a/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp +++ b/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct Quaternion {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct Quaternion {}; - struct mDoMtx_stack_c { /* 8000CD9C */ void transM(f32, f32, f32); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -465,10 +465,6 @@ static void daObjCarry_Execute(daObjCarry_c*); static void daObjCarry_Delete(daObjCarry_c*); static void daObjCarry_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(s8*); -extern "C" extern u32 const l_light_color; -extern "C" extern u32 const lit_8553; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Carry[12]; extern "C" static void bound__FP4cXyzRC13cBgS_PolyInfof(); extern "C" void __dt__8cM3dGPlaFv(); @@ -694,32 +690,6 @@ void cLib_chaseUC(u8*, u8, u8); void cLib_chaseS(s16*, s16, s16); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 ZeroQuat[16]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mTsubo__13dPa_control_c[64]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport_Error(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_carry/executor.cpp b/rel/d/a/obj/d_a_obj_carry/executor.cpp index eb289b00816..42f98d2403d 100644 --- a/rel/d/a/obj/d_a_obj_carry/executor.cpp +++ b/rel/d/a/obj/d_a_obj_carry/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80479904[4]; -extern u8 const data_80479908[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_carry/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_carry/unknown_translation_unit_ctors.cpp index c2500a9795d..9b86746ed65 100644 --- a/rel/d/a/obj/d_a_obj_carry/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_carry/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80479904[4]; -extern u8 const data_80479904[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80479904[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80479904-80479908 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80479904[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_carry/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_carry/unknown_translation_unit_dtors.cpp index cc7144ac422..8267be85337 100644 --- a/rel/d/a/obj/d_a_obj_carry/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_carry/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80479908[4]; -extern u8 const data_80479908[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80479908[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80479908-8047990C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80479908[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp index 7b6906a17df..67635da12f6 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp +++ b/rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp @@ -92,8 +92,6 @@ static void daObjCatDoor_Execute(daObjCatDoor_c*); static bool daObjCatDoor_IsDelete(daObjCatDoor_c*); static void daObjCatDoor_Delete(daObjCatDoor_c*); static void daObjCatDoor_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_CatDoor[12]; extern "C" void attr__14daObjCatDoor_cCFv(); extern "C" static void createSolidHeap__FP10fopAc_ac_c(); @@ -120,13 +118,6 @@ void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cLib_chaseS(s16*, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__4dBgW[65]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void push__14mDoMtx_stack_cFv(); diff --git a/rel/d/a/obj/d_a_obj_catdoor/executor.cpp b/rel/d/a/obj/d_a_obj_catdoor/executor.cpp index 0f19235c444..8b3f5d34a14 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_catdoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BC49AC[4]; -extern u8 const data_80BC49B0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_catdoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_catdoor/unknown_translation_unit_ctors.cpp index 7d62e350fc3..a0336a96bde 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_catdoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BC49AC[4]; -extern u8 const data_80BC49AC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BC49AC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC49AC-80BC49B0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BC49AC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_catdoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_catdoor/unknown_translation_unit_dtors.cpp index 8fae878c42e..c56b19f5b6d 100644 --- a/rel/d/a/obj/d_a_obj_catdoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_catdoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BC49B0[4]; -extern u8 const data_80BC49B0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BC49B0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BC49B0-80BC49B4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BC49B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp b/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp index 7b363c3c262..3a92b4dd6e5 100644 --- a/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp +++ b/rel/d/a/obj/d_a_obj_cb/d_a_obj_cb.cpp @@ -28,16 +28,16 @@ struct daObj_Cb_HIO_c { /* 80BC573C */ ~daObj_Cb_HIO_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -138,8 +138,6 @@ static bool daObj_Cb_IsDelete(obj_cb_class*); static void daObj_Cb_Delete(obj_cb_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Cb_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_CB[12]; extern "C" void __ct__14daObj_Cb_HIO_cFv(); extern "C" static void daObj_Cb_Draw__FP12obj_cb_class(); @@ -185,19 +183,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_cb/executor.cpp b/rel/d/a/obj/d_a_obj_cb/executor.cpp index 6337a0fa239..bc59fc1c389 100644 --- a/rel/d/a/obj/d_a_obj_cb/executor.cpp +++ b/rel/d/a/obj/d_a_obj_cb/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BC57D0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_cb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_cb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 15ef7e8acba..2ee8549d641 100644 --- a/rel/d/a/obj/d_a_obj_cb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_cb/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BC57DC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BC57DC-80BC57E4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BC57DC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BC58F0-80BC58F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_cb/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_cb/unknown_translation_unit_ctors.cpp index 811564f8737..d6fdbfb823b 100644 --- a/rel/d/a/obj/d_a_obj_cb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_cb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BC57D0[2]; -extern void* const data_80BC57D0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_cb_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC57D0-80BC57D8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BC57D0[2] = { + (void*)__sinit_d_a_obj_cb_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp b/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp index 30a8862ea27..b0db78137a0 100644 --- a/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp +++ b/rel/d/a/obj/d_a_obj_cblock/d_a_obj_cblock.cpp @@ -138,64 +138,6 @@ static void daObjCBlk_Execute(daObjCBlk_c*); static void daObjCBlk_Delete(daObjCBlk_c*); static void daObjCBlk_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(s16*); -extern "C" extern u32 const lit_4103; -extern "C" extern u32 const lit_4104; -extern "C" extern u32 const lit_4105; -extern "C" extern u32 const lit_4106; -extern "C" extern u32 const lit_4107[1 + 1 /* padding */]; -extern "C" extern u8 const lit_4310[8]; -extern "C" extern u8 const lit_4311[8]; -extern "C" extern u8 const lit_4312[8]; -extern "C" extern u32 const lit_4313; -extern "C" extern u32 const lit_4314; -extern "C" extern char const* const stringBase0; -extern "C" extern u8 cNullVec__6Z2Calc[12]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_side_co_offset[48]; -extern "C" extern void* lit_3921[3]; -extern "C" extern void* lit_3922[3]; -extern "C" extern u8 data_80BC6B84[24]; -extern "C" extern void* g_profile_Obj_ChainBlock[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80BC6CC4[4]; -extern "C" extern u8 data_80BC6CC8[4]; -extern "C" extern u8 data_80BC6CCC[4]; -extern "C" extern u8 data_80BC6CD0[4]; -extern "C" extern u8 data_80BC6CD4[4]; -extern "C" extern u8 data_80BC6CD8[4]; -extern "C" extern u8 data_80BC6CDC[4]; -extern "C" extern u8 data_80BC6CE0[4]; -extern "C" extern u8 data_80BC6CE4[4]; -extern "C" extern u8 data_80BC6CE8[4]; -extern "C" extern u8 data_80BC6CEC[4]; -extern "C" extern u8 data_80BC6CF0[4]; -extern "C" extern u8 data_80BC6CF4[4]; -extern "C" extern u8 data_80BC6CF8[4]; -extern "C" extern u8 data_80BC6CFC[4]; -extern "C" extern u8 data_80BC6D00[4]; -extern "C" extern u8 data_80BC6D04[4]; -extern "C" extern u8 data_80BC6D08[4]; -extern "C" extern u8 data_80BC6D0C[4]; -extern "C" extern u8 data_80BC6D10[4]; -extern "C" extern u8 data_80BC6D14[4]; -extern "C" extern u8 data_80BC6D18[4]; -extern "C" extern u8 data_80BC6D1C[4]; -extern "C" extern u8 data_80BC6D20[4]; -extern "C" extern u8 data_80BC6D24[4]; extern "C" void initBaseMtx__11daObjCBlk_cFv(); extern "C" void setBaseMtx__11daObjCBlk_cFv(); @@ -304,17 +246,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cM_atan2s(f32, f32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_cblock/executor.cpp b/rel/d/a/obj/d_a_obj_cblock/executor.cpp index 7f0163468d1..765704b8493 100644 --- a/rel/d/a/obj/d_a_obj_cblock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_cblock/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BC6A24[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_cblock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_cblock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 0d47e95eb67..15ff61142c1 100644 --- a/rel/d/a/obj/d_a_obj_cblock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_cblock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BC6A30[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BC6A30-80BC6A38 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BC6A30[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BC6C48-80BC6C50 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_cblock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_cblock/unknown_translation_unit_ctors.cpp index 9f8cacbb9d7..c6045d0c2ba 100644 --- a/rel/d/a/obj/d_a_obj_cblock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_cblock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BC6A24[2]; -extern void* const data_80BC6A24[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_cblock_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC6A24-80BC6A2C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BC6A24[2] = { + (void*)__sinit_d_a_obj_cblock_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp index 04e4ca87c84..06e8448d70b 100644 --- a/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp +++ b/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -83,7 +83,6 @@ static void daObjBoard_create1st(daObjBoard_c*); static void daObjBoard_MoveBGDelete(daObjBoard_c*); static void daObjBoard_MoveBGExecute(daObjBoard_c*); static void daObjBoard_MoveBGDraw(daObjBoard_c*); -extern "C" extern void* g_profile_Obj_Cboard[12]; extern "C" void initBaseMtx__12daObjBoard_cFv(); extern "C" void setBaseMtx__12daObjBoard_cFv(); @@ -106,10 +105,6 @@ extern "C" extern void* g_profile_Obj_Cboard[12]; void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_cboard/executor.cpp b/rel/d/a/obj/d_a_obj_cboard/executor.cpp index 2c2aef0601d..1c6e7fac802 100644 --- a/rel/d/a/obj/d_a_obj_cboard/executor.cpp +++ b/rel/d/a/obj/d_a_obj_cboard/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8057BDC8[4]; -extern u8 const data_8057BDCC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_cboard/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_cboard/unknown_translation_unit_ctors.cpp index 0f9d26b4d17..6c26f4e7eef 100644 --- a/rel/d/a/obj/d_a_obj_cboard/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_cboard/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057BDC8[4]; -extern u8 const data_8057BDC8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8057BDC8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8057BDC8-8057BDCC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8057BDC8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_cboard/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_cboard/unknown_translation_unit_dtors.cpp index 1b1d93fc910..268b1f06138 100644 --- a/rel/d/a/obj/d_a_obj_cboard/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_cboard/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057BDCC[4]; -extern u8 const data_8057BDCC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8057BDCC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8057BDCC-8057BDD0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8057BDCC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp index 83ca5734959..5cbb0eeecb4 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/d_a_obj_cdoor.cpp @@ -58,10 +58,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -137,8 +137,6 @@ static void daObjCdoor_Create(fopAc_ac_c*); static void daObjCdoor_Delete(daObjCdoor_c*); static void daObjCdoor_Execute(daObjCdoor_c*); static void daObjCdoor_Draw(daObjCdoor_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Cdoor[12]; extern "C" void CreateHeap__12daObjCdoor_cFv(); extern "C" static void daObjCdoor_searchChain__FP10fopAc_ac_cPv(); @@ -186,17 +184,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dCam_getBody(); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80BC7EB8[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_cdoor/executor.cpp b/rel/d/a/obj/d_a_obj_cdoor/executor.cpp index 2315b62acee..9cbe2d255de 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BC7D10[4]; -extern u8 const data_80BC7D14[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_bss.cpp index 4af369164d3..7dc1a3f7dcb 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80BC7EB8[4]; -extern "C" extern u8 struct_80BC7EB8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_ctors.cpp index 308f561f796..e1193ae163a 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BC7D10[4]; -extern u8 const data_80BC7D10[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BC7D10[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC7D10-80BC7D14 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BC7D10[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_dtors.cpp index 641e84c8b69..52c0a671ffd 100644 --- a/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_cdoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BC7D14[4]; -extern u8 const data_80BC7D14[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BC7D14[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BC7D14-80BC7D18 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BC7D14[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp b/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp index 8386d92be52..9ef2afdc212 100644 --- a/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp +++ b/rel/d/a/obj/d_a_obj_chandelier/d_a_obj_chandelier.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -105,9 +105,6 @@ static void daObjChandelier_create1st(daObjChandelier_c*); static void daObjChandelier_MoveBGDelete(daObjChandelier_c*); static void daObjChandelier_MoveBGExecute(daObjChandelier_c*); static void daObjChandelier_MoveBGDraw(daObjChandelier_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Chandelier[12]; extern "C" void __ct__17daObjChandelier_cFv(); extern "C" void __dt__17daObjChandelier_cFv(); @@ -152,15 +149,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_chandelier/executor.cpp b/rel/d/a/obj/d_a_obj_chandelier/executor.cpp index 763a046cd7e..be54d8344b6 100644 --- a/rel/d/a/obj/d_a_obj_chandelier/executor.cpp +++ b/rel/d/a/obj/d_a_obj_chandelier/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BC8CD0[2]; -extern u8 const data_80BC8CD8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_chandelier/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_chandelier/unknown_translation_unit_ctors.cpp index 8fc97fe9b1a..d07b856fd74 100644 --- a/rel/d/a/obj/d_a_obj_chandelier/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_chandelier/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BC8CD0[2]; -extern void* const data_80BC8CD0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_chandelier_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC8CD0-80BC8CD8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BC8CD0[2] = { + (void*)__sinit_d_a_obj_chandelier_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_chandelier/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_chandelier/unknown_translation_unit_dtors.cpp index a349e8b8efc..6409ff02818 100644 --- a/rel/d/a/obj/d_a_obj_chandelier/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_chandelier/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BC8CD8[4]; -extern u8 const data_80BC8CD8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BC8CD8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BC8CD8-80BC8CDC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BC8CD8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp b/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp index e2988252565..9afb4044b0e 100644 --- a/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp +++ b/rel/d/a/obj/d_a_obj_chest/d_a_obj_chest.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 8026745C */ void operator+=(csXyz&); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -167,9 +167,6 @@ static void daObjChest_Delete(daObjChest_c*); static void daObjChest_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); static void cLib_calcTimer__template1(u16*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Chest[12]; extern "C" void initBaseMtx__12daObjChest_cFv(); extern "C" void setBaseMtx__12daObjChest_cFv(); @@ -221,21 +218,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cM_rndF(f32); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80BCA200[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_chest/executor.cpp b/rel/d/a/obj/d_a_obj_chest/executor.cpp index ac82b871859..4304bf55549 100644 --- a/rel/d/a/obj/d_a_obj_chest/executor.cpp +++ b/rel/d/a/obj/d_a_obj_chest/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BC9FF4[4]; -extern u8 const data_80BC9FF8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp index d4456720651..73f713110a1 100644 --- a/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80BCA200[4]; -extern "C" extern u8 data_80BCA200[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_ctors.cpp index 90193f796c7..0a2db8802d8 100644 --- a/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BC9FF4[4]; -extern u8 const data_80BC9FF4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BC9FF4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BC9FF4-80BC9FF8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BC9FF4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_dtors.cpp index 4971bbcce8c..c41dfcde0da 100644 --- a/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_chest/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BC9FF8[4]; -extern u8 const data_80BC9FF8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BC9FF8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BC9FF8-80BC9FFC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BC9FF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp index 16b3fadf58e..bac3de51e09 100644 --- a/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp +++ b/rel/d/a/obj/d_a_obj_cho/d_a_obj_cho.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -49,16 +49,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -255,10 +255,6 @@ static void daObjCHO_Delete(daObjCHO_c*); static void daObjCHO_Draw(daObjCHO_c*); static void daObjCHO_Execute(daObjCHO_c*); static bool daObjCHO_IsDelete(daObjCHO_c*); -extern "C" extern u32 const lit_4226; -extern "C" extern u8 const lit_4229[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Cho[12]; extern "C" void __ct__14daObj_ChoHIO_cFv(); extern "C" void InitCcSph__10daObjCHO_cFv(); @@ -327,20 +323,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_cho/executor.cpp b/rel/d/a/obj/d_a_obj_cho/executor.cpp index 490b2af30c0..38367d29c97 100644 --- a/rel/d/a/obj/d_a_obj_cho/executor.cpp +++ b/rel/d/a/obj/d_a_obj_cho/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BCC564[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_cho/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_cho/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 06c142375a4..60c76b4866b 100644 --- a/rel/d/a/obj/d_a_obj_cho/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_cho/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BCC570[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BCC570-80BCC578 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BCC570[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BCC748-80BCC750 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_cho/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_cho/unknown_translation_unit_ctors.cpp index b26229b1f45..e7be9eba29b 100644 --- a/rel/d/a/obj/d_a_obj_cho/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_cho/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BCC564[2]; -extern void* const data_80BCC564[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_cho_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BCC564-80BCC56C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BCC564[2] = { + (void*)__sinit_d_a_obj_cho_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp index 6ed8434fddf..965f493b152 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/d_a_obj_cowdoor.cpp @@ -25,12 +25,12 @@ struct daCowdoor_c { /* 80BCCAEC */ void Delete(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -72,7 +72,6 @@ static void daCowdoor_Draw(daCowdoor_c*); static void daCowdoor_Execute(daCowdoor_c*); static void daCowdoor_Delete(daCowdoor_c*); static void daCowdoor_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_Cowdoor[12]; extern "C" void setBaseMtx__11daCowdoor_cFv(); extern "C" void Create__11daCowdoor_cFv(); @@ -98,12 +97,6 @@ void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_cowdoor/executor.cpp b/rel/d/a/obj/d_a_obj_cowdoor/executor.cpp index dad99a0822a..5bfdaf11c3d 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BCCBAC[4]; -extern u8 const data_80BCCBB0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_cowdoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_cowdoor/unknown_translation_unit_ctors.cpp index bbaa160e16d..581a8c1f239 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BCCBAC[4]; -extern u8 const data_80BCCBAC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BCCBAC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BCCBAC-80BCCBB0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BCCBAC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_cowdoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_cowdoor/unknown_translation_unit_dtors.cpp index 5d49c34bfdf..0ecdcbd60c3 100644 --- a/rel/d/a/obj/d_a_obj_cowdoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_cowdoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BCCBB0[4]; -extern u8 const data_80BCCBB0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BCCBB0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BCCBB0-80BCCBB4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BCCBB0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp b/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp index b80a9d53522..0c25ac6bb75 100644 --- a/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp +++ b/rel/d/a/obj/d_a_obj_crope/d_a_obj_crope.cpp @@ -19,11 +19,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -121,7 +121,6 @@ static void daObjCrope_Create(fopAc_ac_c*); static void daObjCrope_Delete(daObjCrope_c*); static void daObjCrope_Execute(daObjCrope_c*); static void daObjCrope_Draw(daObjCrope_c*); -extern "C" extern void* g_profile_Obj_Crope[12]; extern "C" void createHeap__12daObjCrope_cFv(); extern "C" static void daObjCrope_createHeap__FP10fopAc_ac_c(); @@ -159,17 +158,6 @@ void dKyw_get_AllWind_vec(cXyz*, cXyz*, f32*); void cM_rnd(); void cM3d_Len2dSqPntAndSegLine(f32, f32, f32, f32, f32, f32, f32*, f32*, f32*); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi(); diff --git a/rel/d/a/obj/d_a_obj_crope/executor.cpp b/rel/d/a/obj/d_a_obj_crope/executor.cpp index 59bb896a2f6..077b162462f 100644 --- a/rel/d/a/obj/d_a_obj_crope/executor.cpp +++ b/rel/d/a/obj/d_a_obj_crope/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BCEAC4[4]; -extern u8 const data_80BCEAC8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_crope/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_crope/unknown_translation_unit_ctors.cpp index 602d4a92b5e..5c0f04bb43c 100644 --- a/rel/d/a/obj/d_a_obj_crope/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_crope/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BCEAC4[4]; -extern u8 const data_80BCEAC4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BCEAC4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BCEAC4-80BCEAC8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BCEAC4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crope/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_crope/unknown_translation_unit_dtors.cpp index a93dd362562..63d096dc854 100644 --- a/rel/d/a/obj/d_a_obj_crope/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_crope/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BCEAC8[4]; -extern u8 const data_80BCEAC8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BCEAC8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BCEAC8-80BCEACC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BCEAC8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp b/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp index 4bb182aeafc..b5902c33af9 100644 --- a/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp +++ b/rel/d/a/obj/d_a_obj_crvfence/d_a_obj_crvfence.cpp @@ -13,15 +13,15 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct cXyz { /* 80BCED24 */ ~cXyz(); /* 80BCFFBC */ cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -184,8 +184,6 @@ static void s_obj_sub(void*, void*); static void daObjCRVFENCE_Draw(daObjCRVFENCE_c*); static void daObjCRVFENCE_Execute(daObjCRVFENCE_c*); static bool daObjCRVFENCE_IsDelete(daObjCRVFENCE_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_CRVFENCE[12]; extern "C" void CheckVec__15daObjCRVFENCE_cFv(); extern "C" void __dt__4cXyzFv(); @@ -241,19 +239,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_crvfence/executor.cpp b/rel/d/a/obj/d_a_obj_crvfence/executor.cpp index 8b5f24fc1f7..74cda8b4207 100644 --- a/rel/d/a/obj/d_a_obj_crvfence/executor.cpp +++ b/rel/d/a/obj/d_a_obj_crvfence/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BD0180[4]; -extern u8 const data_80BD0184[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_crvfence/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_crvfence/unknown_translation_unit_ctors.cpp index ffcb8349747..c488ae6a1f1 100644 --- a/rel/d/a/obj/d_a_obj_crvfence/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_crvfence/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD0180[4]; -extern u8 const data_80BD0180[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BD0180[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BD0180-80BD0184 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BD0180[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvfence/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_crvfence/unknown_translation_unit_dtors.cpp index e836e98ebf9..578bbe6d08d 100644 --- a/rel/d/a/obj/d_a_obj_crvfence/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_crvfence/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD0184[4]; -extern u8 const data_80BD0184[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BD0184[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BD0184-80BD0188 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BD0184[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp b/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp index 25799a86277..a134cf4ff44 100644 --- a/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp +++ b/rel/d/a/obj/d_a_obj_crvgate/d_a_obj_crvgate.cpp @@ -13,15 +13,15 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct cXyz { /* 80BD0844 */ ~cXyz(); /* 80BD2E7C */ cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -202,10 +202,6 @@ static void daObjCRVGATE_Delete(daObjCRVGATE_c*); static void daObjCRVGATE_Draw(daObjCRVGATE_c*); static void daObjCRVGATE_Execute(daObjCRVGATE_c*); static bool daObjCRVGATE_IsDelete(daObjCRVGATE_c*); -extern "C" extern u32 const lit_4671; -extern "C" extern u32 const lit_4672; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_CRVGATE[12]; extern "C" void initCcCylinder__14daObjCRVGATE_cFv(); extern "C" void setCcCylinder__14daObjCRVGATE_cFv(); @@ -280,23 +276,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_crvgate/executor.cpp b/rel/d/a/obj/d_a_obj_crvgate/executor.cpp index efcdcf731e1..5c356c5e15d 100644 --- a/rel/d/a/obj/d_a_obj_crvgate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_crvgate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BD30B8[4]; -extern u8 const data_80BD30BC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_crvgate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_crvgate/unknown_translation_unit_ctors.cpp index 04443b77a59..609ece58248 100644 --- a/rel/d/a/obj/d_a_obj_crvgate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_crvgate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD30B8[4]; -extern u8 const data_80BD30B8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BD30B8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BD30B8-80BD30BC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BD30B8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvgate/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_crvgate/unknown_translation_unit_dtors.cpp index 663e5ee9bd8..bd9a9467402 100644 --- a/rel/d/a/obj/d_a_obj_crvgate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_crvgate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD30BC[4]; -extern u8 const data_80BD30BC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BD30BC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BD30BC-80BD30C0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BD30BC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp b/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp index 0e7342a0325..647abd91132 100644 --- a/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp +++ b/rel/d/a/obj/d_a_obj_crvhahen/d_a_obj_crvhahen.cpp @@ -13,16 +13,16 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80BD3F9C */ ~csXyz(); - /* 80BD3FD8 */ csXyz(); -}; - struct cXyz { /* 80BD36E4 */ ~cXyz(); /* 80BD3FDC */ cXyz(); }; +struct csXyz { + /* 80BD3F9C */ ~csXyz(); + /* 80BD3FD8 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -93,8 +93,6 @@ static void daObjCRVHAHEN_Delete(daObjCRVHAHEN_c*); static void daObjCRVHAHEN_Draw(daObjCRVHAHEN_c*); static void daObjCRVHAHEN_Execute(daObjCRVHAHEN_c*); static bool daObjCRVHAHEN_IsDelete(daObjCRVHAHEN_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_CRVHAHEN[12]; extern "C" static void useHeapInit__FP10fopAc_ac_c(); extern "C" static void daObjCRVHAHEN_Create__FP10fopAc_ac_c(); @@ -132,13 +130,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cM_rndF(f32); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_crvhahen/executor.cpp b/rel/d/a/obj/d_a_obj_crvhahen/executor.cpp index f021b0a718b..2f4d09b9d80 100644 --- a/rel/d/a/obj/d_a_obj_crvhahen/executor.cpp +++ b/rel/d/a/obj/d_a_obj_crvhahen/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BD3FE8[4]; -extern u8 const data_80BD3FEC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_crvhahen/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_crvhahen/unknown_translation_unit_ctors.cpp index dcc567eb045..e69f66d225c 100644 --- a/rel/d/a/obj/d_a_obj_crvhahen/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_crvhahen/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD3FE8[4]; -extern u8 const data_80BD3FE8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BD3FE8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BD3FE8-80BD3FEC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BD3FE8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvhahen/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_crvhahen/unknown_translation_unit_dtors.cpp index d02c9d6d6fe..e42edc24ea4 100644 --- a/rel/d/a/obj/d_a_obj_crvhahen/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_crvhahen/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD3FEC[4]; -extern u8 const data_80BD3FEC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BD3FEC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BD3FEC-80BD3FF0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BD3FEC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp b/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp index f2a4b9b709d..13e80697600 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_down/d_a_obj_crvlh_down.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -174,8 +174,6 @@ static void daObjCRVLH_DW_Delete(daObjCRVLH_DW_c*); static void daObjCRVLH_DW_Draw(daObjCRVLH_DW_c*); static void daObjCRVLH_DW_Execute(daObjCRVLH_DW_c*); static bool daObjCRVLH_DW_IsDelete(daObjCRVLH_DW_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_CRVLH_DW[12]; extern "C" void initCcCylinder__15daObjCRVLH_DW_cFv(); extern "C" void SetCcSyl__15daObjCRVLH_DW_cFv(); @@ -216,19 +214,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_crvlh_down/executor.cpp b/rel/d/a/obj/d_a_obj_crvlh_down/executor.cpp index c9a817dfc1f..b37affaddc1 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_down/executor.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_down/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BD4CFC[4]; -extern u8 const data_80BD4D00[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_crvlh_down/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_crvlh_down/unknown_translation_unit_ctors.cpp index 30dda765dd8..c7218d4683a 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_down/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_down/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD4CFC[4]; -extern u8 const data_80BD4CFC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BD4CFC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BD4CFC-80BD4D00 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BD4CFC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvlh_down/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_crvlh_down/unknown_translation_unit_dtors.cpp index 59b3df27c1a..47ddea69790 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_down/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_down/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD4D00[4]; -extern u8 const data_80BD4D00[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BD4D00[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BD4D00-80BD4D04 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BD4D00[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp b/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp index 780327f30c1..c1d22555981 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_up/d_a_obj_crvlh_up.cpp @@ -13,15 +13,15 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct cXyz { /* 80BD56A4 */ ~cXyz(); /* 80BD56E0 */ cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -135,8 +135,6 @@ static void daObjCRVLH_UP_Delete(daObjCRVLH_UP_c*); static void daObjCRVLH_UP_Draw(daObjCRVLH_UP_c*); static void daObjCRVLH_UP_Execute(daObjCRVLH_UP_c*); static bool daObjCRVLH_UP_IsDelete(daObjCRVLH_UP_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_CRVLH_UP[12]; extern "C" static void daObjCRVLH_UP_Create__FP10fopAc_ac_c(); extern "C" static void daObjCRVLH_UP_Delete__FP15daObjCRVLH_UP_c(); @@ -178,18 +176,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cM_rndFX(f32); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_crvlh_up/executor.cpp b/rel/d/a/obj/d_a_obj_crvlh_up/executor.cpp index 08f77c7e0b6..04dd8b7ea24 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_up/executor.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_up/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BD59F4[4]; -extern u8 const data_80BD59F8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_crvlh_up/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_crvlh_up/unknown_translation_unit_ctors.cpp index 48dfcfdd7b0..de42422aea4 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_up/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_up/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD59F4[4]; -extern u8 const data_80BD59F4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BD59F4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BD59F4-80BD59F8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BD59F4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvlh_up/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_crvlh_up/unknown_translation_unit_dtors.cpp index 4bbed525345..7f6e3b1451f 100644 --- a/rel/d/a/obj/d_a_obj_crvlh_up/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_crvlh_up/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD59F8[4]; -extern u8 const data_80BD59F8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BD59F8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BD59F8-80BD59FC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BD59F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp b/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp index 2cf4cd64e42..76f963b4576 100644 --- a/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp +++ b/rel/d/a/obj/d_a_obj_crvsteel/d_a_obj_crvsteel.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -109,8 +109,6 @@ static void daObjCRVSTEEL_Delete(daObjCRVSTEEL_c*); static void daObjCRVSTEEL_Draw(daObjCRVSTEEL_c*); static void daObjCRVSTEEL_Execute(daObjCRVSTEEL_c*); static bool daObjCRVSTEEL_IsDelete(daObjCRVSTEEL_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_CRVSTEEL[12]; extern "C" static void daObjCRVSTEEL_Create__FP10fopAc_ac_c(); extern "C" static void daObjCRVSTEEL_Delete__FP15daObjCRVSTEEL_c(); @@ -147,15 +145,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_crvsteel/executor.cpp b/rel/d/a/obj/d_a_obj_crvsteel/executor.cpp index 7c3c58671f9..9d9fd3a6036 100644 --- a/rel/d/a/obj/d_a_obj_crvsteel/executor.cpp +++ b/rel/d/a/obj/d_a_obj_crvsteel/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BD6200[4]; -extern u8 const data_80BD6204[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_crvsteel/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_crvsteel/unknown_translation_unit_ctors.cpp index 6c288be5aa5..68e59eb56ba 100644 --- a/rel/d/a/obj/d_a_obj_crvsteel/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_crvsteel/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD6200[4]; -extern u8 const data_80BD6200[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BD6200[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BD6200-80BD6204 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BD6200[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crvsteel/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_crvsteel/unknown_translation_unit_dtors.cpp index 6d18a7e213e..4f4d8d18ece 100644 --- a/rel/d/a/obj/d_a_obj_crvsteel/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_crvsteel/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD6204[4]; -extern u8 const data_80BD6204[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BD6204[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BD6204-80BD6208 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BD6204[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp index bbbf7a343f6..fb5cc4d6f16 100644 --- a/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp +++ b/rel/d/a/obj/d_a_obj_crystal/d_a_obj_crystal.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -84,8 +84,6 @@ static void daObjCrystal_Draw(daObjCrystal_c*); static void daObjCrystal_Execute(daObjCrystal_c*); static void daObjCrystal_Delete(daObjCrystal_c*); static void daObjCrystal_Create(daObjCrystal_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Crystal[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void initBaseMtx__14daObjCrystal_cFv(); @@ -113,11 +111,6 @@ void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_crystal/executor.cpp b/rel/d/a/obj/d_a_obj_crystal/executor.cpp index 15e74daa3d1..7526283bb35 100644 --- a/rel/d/a/obj/d_a_obj_crystal/executor.cpp +++ b/rel/d/a/obj/d_a_obj_crystal/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BD68B4[4]; -extern u8 const data_80BD68B8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_crystal/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_crystal/unknown_translation_unit_ctors.cpp index cb2f5f2adae..52ea9eae3e2 100644 --- a/rel/d/a/obj/d_a_obj_crystal/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_crystal/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD68B4[4]; -extern u8 const data_80BD68B4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BD68B4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BD68B4-80BD68B8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BD68B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_crystal/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_crystal/unknown_translation_unit_dtors.cpp index 58a8d4d2346..faa25185dd0 100644 --- a/rel/d/a/obj/d_a_obj_crystal/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_crystal/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BD68B8[4]; -extern u8 const data_80BD68B8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BD68B8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BD68B8-80BD68BC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BD68B8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp b/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp index e13ef8a7dfe..e1498387072 100644 --- a/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp +++ b/rel/d/a/obj/d_a_obj_cwall/d_a_obj_cwall.cpp @@ -191,49 +191,6 @@ static void daObjCwall_MoveBGExecute(daObjCwall_c*); static void daObjCwall_MoveBGDraw(daObjCwall_c*); static void cLib_calcTimer__template0(s16*); static void cLib_calcTimer__template1(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_ChainWall[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80BDA374[4]; -extern "C" extern u8 data_80BDA378[4]; -extern "C" extern u8 data_80BDA37C[4]; -extern "C" extern u8 data_80BDA380[4]; -extern "C" extern u8 data_80BDA384[4]; -extern "C" extern u8 data_80BDA388[4]; -extern "C" extern u8 data_80BDA38C[4]; -extern "C" extern u8 data_80BDA390[4]; -extern "C" extern u8 data_80BDA394[4]; -extern "C" extern u8 data_80BDA398[4]; -extern "C" extern u8 data_80BDA39C[4]; -extern "C" extern u8 data_80BDA3A0[4]; -extern "C" extern u8 data_80BDA3A4[4]; -extern "C" extern u8 data_80BDA3A8[4]; -extern "C" extern u8 data_80BDA3AC[4]; -extern "C" extern u8 data_80BDA3B0[4]; -extern "C" extern u8 data_80BDA3B4[4]; -extern "C" extern u8 data_80BDA3B8[4]; -extern "C" extern u8 data_80BDA3BC[4]; -extern "C" extern u8 data_80BDA3C0[4]; -extern "C" extern u8 data_80BDA3C4[4]; -extern "C" extern u8 data_80BDA3C8[4]; -extern "C" extern u8 data_80BDA3CC[4]; -extern "C" extern u8 data_80BDA3D0[4]; -extern "C" extern u8 data_80BDA3D4[4]; extern "C" void initBaseMtx__12daObjCwall_cFv(); extern "C" void setBaseMtx__12daObjCwall_cFv(); @@ -342,24 +299,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chasePos(cXyz*, cXyz const&, f32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_cwall/executor.cpp b/rel/d/a/obj/d_a_obj_cwall/executor.cpp index 129bdafe66d..9fea59172a0 100644 --- a/rel/d/a/obj/d_a_obj_cwall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_cwall/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BD9F90[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_cwall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_cwall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ed8593a4b5c..f123d08efd9 100644 --- a/rel/d/a/obj/d_a_obj_cwall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_cwall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BD9F9C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BD9F9C-80BD9FA4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BD9F9C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BDA2F8-80BDA300 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_cwall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_cwall/unknown_translation_unit_ctors.cpp index 882600f16ba..35f05d8b1f8 100644 --- a/rel/d/a/obj/d_a_obj_cwall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_cwall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BD9F90[2]; -extern void* const data_80BD9F90[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_cwall_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BD9F90-80BD9F98 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BD9F90[2] = { + (void*)__sinit_d_a_obj_cwall_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp b/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp index e4d31a4d537..8ec875ad8a2 100644 --- a/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp +++ b/rel/d/a/obj/d_a_obj_damCps/d_a_obj_damCps.cpp @@ -13,8 +13,6 @@ extern "C" extern void* g_profile_Obj_DamCps[12]; -extern "C" extern void* g_profile_Obj_DamCps[12]; - // // External References: // @@ -22,9 +20,6 @@ extern "C" extern void* g_profile_Obj_DamCps[12]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/rel/d/a/obj/d_a_obj_damCps/executor.cpp b/rel/d/a/obj/d_a_obj_damCps/executor.cpp index 3ace413639b..beeaacded09 100644 --- a/rel/d/a/obj/d_a_obj_damCps/executor.cpp +++ b/rel/d/a/obj/d_a_obj_damCps/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BDA458[4]; -extern u8 const data_80BDA45C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_damCps/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_damCps/unknown_translation_unit_ctors.cpp index eb7cbf66e71..41af8bc87c2 100644 --- a/rel/d/a/obj/d_a_obj_damCps/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_damCps/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BDA458[4]; -extern u8 const data_80BDA458[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BDA458[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BDA458-80BDA45C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BDA458[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_damCps/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_damCps/unknown_translation_unit_dtors.cpp index 9f0110205da..1916ffdfd8d 100644 --- a/rel/d/a/obj/d_a_obj_damCps/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_damCps/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BDA45C[4]; -extern u8 const data_80BDA45C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BDA45C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BDA45C-80BDA460 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BDA45C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp index e2a1307c352..9d3698db3c7 100644 --- a/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp +++ b/rel/d/a/obj/d_a_obj_dan/d_a_obj_dan.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -49,16 +49,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -246,8 +246,6 @@ static void daObjDAN_Delete(daObjDAN_c*); static void daObjDAN_Draw(daObjDAN_c*); static void daObjDAN_Execute(daObjDAN_c*); static bool daObjDAN_IsDelete(daObjDAN_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Dan[12]; extern "C" void __ct__14daObj_DanHIO_cFv(); extern "C" void InitCcSph__10daObjDAN_cFv(); @@ -313,18 +311,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseAngleS(s16*, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_dan/executor.cpp b/rel/d/a/obj/d_a_obj_dan/executor.cpp index 2ea9b540803..059464e2b23 100644 --- a/rel/d/a/obj/d_a_obj_dan/executor.cpp +++ b/rel/d/a/obj/d_a_obj_dan/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BDC39C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_dan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_dan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4b5a2f0dbfb..9bbeb962e11 100644 --- a/rel/d/a/obj/d_a_obj_dan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_dan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BDC3A8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BDC3A8-80BDC3B0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BDC3A8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BDC560-80BDC568 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_dan/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_dan/unknown_translation_unit_ctors.cpp index 92dcdb71448..45c073f91dd 100644 --- a/rel/d/a/obj/d_a_obj_dan/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_dan/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BDC39C[2]; -extern void* const data_80BDC39C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_dan_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BDC39C-80BDC3A4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BDC39C[2] = { + (void*)__sinit_d_a_obj_dan_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp index be4cdb6a099..32ce2bd0b8a 100644 --- a/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/d_a_obj_digholl.cpp @@ -34,10 +34,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&, int, f32); @@ -51,7 +51,6 @@ static void daObjDigholl_Create(fopAc_ac_c*); static void daObjDigholl_Delete(daObjDigholl_c*); static void daObjDigholl_Execute(daObjDigholl_c*); static void daObjDigholl_Draw(daObjDigholl_c*); -extern "C" extern void* g_profile_Obj_Digholl[12]; extern "C" void create__14daObjDigholl_cFv(); extern "C" static void daObjDigholl_Create__FP10fopAc_ac_c(); @@ -71,11 +70,6 @@ void fopAcM_SetMin(fopAc_ac_c*, f32, f32, f32); void fopAcM_SetMax(fopAc_ac_c*, f32, f32, f32); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_digholl/executor.cpp b/rel/d/a/obj/d_a_obj_digholl/executor.cpp index 6bac5d07388..b711f6d04d4 100644 --- a/rel/d/a/obj/d_a_obj_digholl/executor.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BDCB34[4]; -extern u8 const data_80BDCB38[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_digholl/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_digholl/unknown_translation_unit_ctors.cpp index 3fa0a0ef927..fb23bd0711b 100644 --- a/rel/d/a/obj/d_a_obj_digholl/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BDCB34[4]; -extern u8 const data_80BDCB34[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BDCB34[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BDCB34-80BDCB38 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BDCB34[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_digholl/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_digholl/unknown_translation_unit_dtors.cpp index 59ffbdf7f9f..d7254d32109 100644 --- a/rel/d/a/obj/d_a_obj_digholl/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_digholl/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BDCB38[4]; -extern u8 const data_80BDCB38[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BDCB38[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BDCB38-80BDCB3C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BDCB38[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp index 767b76f7982..f5868078d4d 100644 --- a/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/d_a_obj_digplace.cpp @@ -33,10 +33,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&, int, f32); @@ -52,7 +52,6 @@ static void daObjDigpl_Create(fopAc_ac_c*); static void daObjDigpl_Delete(daObjDigpl_c*); static void daObjDigpl_Execute(daObjDigpl_c*); static bool daObjDigpl_Draw(daObjDigpl_c*); -extern "C" extern void* g_profile_Obj_Digpl[12]; extern "C" void create__12daObjDigpl_cFv(); extern "C" static void daObjDigpl_Create__FP10fopAc_ac_c(); @@ -78,14 +77,6 @@ void fopAcM_createItemFromTable(cXyz const*, int, int, int, csXyz const*, int, c void fopAcM_createItem(cXyz const*, int, int, int, csXyz const*, cXyz const*, int); void dPath_GetRoomPath(int, int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_digplace/executor.cpp b/rel/d/a/obj/d_a_obj_digplace/executor.cpp index 0b5e38680f6..e07e8790dde 100644 --- a/rel/d/a/obj/d_a_obj_digplace/executor.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8057C8A8[4]; -extern u8 const data_8057C8AC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_digplace/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_digplace/unknown_translation_unit_ctors.cpp index 0fb18befce5..a9793c48e29 100644 --- a/rel/d/a/obj/d_a_obj_digplace/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057C8A8[4]; -extern u8 const data_8057C8A8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8057C8A8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8057C8A8-8057C8AC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8057C8A8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_digplace/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_digplace/unknown_translation_unit_dtors.cpp index 19db2e0e060..6bc8c79730e 100644 --- a/rel/d/a/obj/d_a_obj_digplace/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_digplace/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057C8AC[4]; -extern u8 const data_8057C8AC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8057C8AC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8057C8AC-8057C8B0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8057C8AC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp b/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp index 889ca0b9d23..3a3ad9a8b12 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp +++ b/rel/d/a/obj/d_a_obj_digsnow/d_a_obj_digsnow.cpp @@ -38,12 +38,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -146,9 +146,6 @@ static void daObjDigSnow_create1st(daObjDigSnow_c*); static void daObjDigSnow_MoveBGDelete(daObjDigSnow_c*); static void daObjDigSnow_MoveBGExecute(daObjDigSnow_c*); static void daObjDigSnow_MoveBGDraw(daObjDigSnow_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_DigSnow[12]; extern "C" void initBaseMtx__14daObjDigSnow_cFv(); extern "C" void setBaseMtx__14daObjDigSnow_cFv(); @@ -199,18 +196,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 data_80BDD860[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_digsnow/executor.cpp b/rel/d/a/obj/d_a_obj_digsnow/executor.cpp index 64efbc81980..ceeec299da0 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/executor.cpp +++ b/rel/d/a/obj/d_a_obj_digsnow/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BDD6C0[4]; -extern u8 const data_80BDD6C4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp index 04b865cc2f1..4847a42884e 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80BDD860[4]; -extern "C" extern u8 data_80BDD860[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_ctors.cpp index 951256e18c1..f17b4659e09 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BDD6C0[4]; -extern u8 const data_80BDD6C0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BDD6C0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BDD6C0-80BDD6C4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BDD6C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_dtors.cpp index aabce8cdca9..03d10b70e4d 100644 --- a/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_digsnow/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BDD6C4[4]; -extern u8 const data_80BDD6C4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BDD6C4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BDD6C4-80BDD6C8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BDD6C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp b/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp index f35e5952cb9..2b477128fe1 100644 --- a/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp +++ b/rel/d/a/obj/d_a_obj_dmelevator/d_a_obj_dmelevator.cpp @@ -175,48 +175,6 @@ static void daObjDmElevator_MoveBGDelete(daObjDmElevator_c*); static void daObjDmElevator_MoveBGExecute(daObjDmElevator_c*); static void daObjDmElevator_MoveBGDraw(daObjDmElevator_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Elevator[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80BDFBE0[4]; -extern "C" extern u8 data_80BDFBE4[4]; -extern "C" extern u8 data_80BDFBE8[4]; -extern "C" extern u8 data_80BDFBEC[4]; -extern "C" extern u8 data_80BDFBF0[4]; -extern "C" extern u8 data_80BDFBF4[4]; -extern "C" extern u8 data_80BDFBF8[4]; -extern "C" extern u8 data_80BDFBFC[4]; -extern "C" extern u8 data_80BDFC00[4]; -extern "C" extern u8 data_80BDFC04[4]; -extern "C" extern u8 data_80BDFC08[4]; -extern "C" extern u8 data_80BDFC0C[4]; -extern "C" extern u8 data_80BDFC10[4]; -extern "C" extern u8 data_80BDFC14[4]; -extern "C" extern u8 data_80BDFC18[4]; -extern "C" extern u8 data_80BDFC1C[4]; -extern "C" extern u8 data_80BDFC20[4]; -extern "C" extern u8 data_80BDFC24[4]; -extern "C" extern u8 data_80BDFC28[4]; -extern "C" extern u8 data_80BDFC2C[4]; -extern "C" extern u8 data_80BDFC30[4]; -extern "C" extern u8 data_80BDFC34[4]; -extern "C" extern u8 data_80BDFC38[4]; -extern "C" extern u8 data_80BDFC3C[4]; -extern "C" extern u8 data_80BDFC40[4]; extern "C" static void rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" void __dt__4cXyzFv(); @@ -331,15 +289,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_chasePos(cXyz*, cXyz const&, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_dmelevator/executor.cpp b/rel/d/a/obj/d_a_obj_dmelevator/executor.cpp index a630dba0ce4..baa1bf61c9e 100644 --- a/rel/d/a/obj/d_a_obj_dmelevator/executor.cpp +++ b/rel/d/a/obj/d_a_obj_dmelevator/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BDF860[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_dmelevator/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_dmelevator/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 607484de06f..3890d39ea30 100644 --- a/rel/d/a/obj/d_a_obj_dmelevator/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_dmelevator/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BDF868[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BDF868-80BDF870 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BDF868[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BDFB30-80BDFB38 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_dmelevator/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_dmelevator/unknown_translation_unit_ctors.cpp index 86b8746c6e7..e1865be4eb3 100644 --- a/rel/d/a/obj/d_a_obj_dmelevator/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_dmelevator/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BDF860[4]; -extern u8 const data_80BDF860[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BDF860[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BDF860-80BDF864 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BDF860[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp b/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp index 27781c1850e..eb46beac3db 100644 --- a/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp +++ b/rel/d/a/obj/d_a_obj_drop/d_a_obj_drop.cpp @@ -83,17 +83,17 @@ struct dPa_followEcallBack { /* 80BE02B0 */ void __defctor(); }; -struct csXyz { - /* 80BE02D8 */ ~csXyz(); - /* 80BE0314 */ csXyz(); -}; - struct cXyz { /* 802670AC */ void isZero() const; /* 80BE0318 */ ~cXyz(); /* 80BE0354 */ cXyz(); }; +struct csXyz { + /* 80BE02D8 */ ~csXyz(); + /* 80BE0314 */ csXyz(); +}; + struct dKy_tevstr_c {}; struct dPa_control_c { @@ -215,10 +215,6 @@ static void daObjDrop_Delete(daObjDrop_c*); static void daObjDrop_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); static void cLib_calcTimer__template1(s8*); -extern "C" extern u32 const lit_4037; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Drop[12]; extern "C" static void searchParentSub__FPvPv(); extern "C" void Create__11daObjDrop_cFv(); @@ -293,24 +289,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_chasePos(cXyz*, cXyz const&, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__19dPa_followEcallBack[10]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_saftyWhiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u8 Zero__5csXyz[4]; -extern "C" extern u8 data_80451164[4]; -extern "C" extern u8 struct_80BE2238[4]; extern "C" void fadeOut_f__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_drop/executor.cpp b/rel/d/a/obj/d_a_obj_drop/executor.cpp index 5e6ec844cf1..5526d75f3aa 100644 --- a/rel/d/a/obj/d_a_obj_drop/executor.cpp +++ b/rel/d/a/obj/d_a_obj_drop/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BE1F80[4]; -extern u8 const data_80BE1F84[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_bss.cpp index a221f0adbdb..52c94bcd270 100644 --- a/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80BE2238[4]; -extern "C" extern u8 struct_80BE2238[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_ctors.cpp index 0d62ce5f12b..c7b1541e05e 100644 --- a/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE1F80[4]; -extern u8 const data_80BE1F80[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BE1F80[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE1F80-80BE1F84 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BE1F80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_dtors.cpp index 147ad79b1da..13231ac9c95 100644 --- a/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_drop/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE1F84[4]; -extern u8 const data_80BE1F84[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BE1F84[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BE1F84-80BE1F88 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BE1F84[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp b/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp index e63d2539707..6cb1dba42e0 100644 --- a/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp +++ b/rel/d/a/obj/d_a_obj_dust/d_a_obj_dust.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -130,8 +130,6 @@ static void daObjDust_Execute(daObjDust_c*); static bool daObjDust_IsDelete(daObjDust_c*); static void daObjDust_Delete(daObjDust_c*); static void daObjDust_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_DUST[12]; extern "C" void Search_Ymb__11daObjDust_cFv(); extern "C" void RideOn_Angle__11daObjDust_cFRsfsf(); @@ -174,17 +172,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_dust/executor.cpp b/rel/d/a/obj/d_a_obj_dust/executor.cpp index 8efc1ab91ef..66c9165cd58 100644 --- a/rel/d/a/obj/d_a_obj_dust/executor.cpp +++ b/rel/d/a/obj/d_a_obj_dust/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BE2F90[4]; -extern u8 const data_80BE2F94[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_dust/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_dust/unknown_translation_unit_ctors.cpp index c38820fc3e3..bba41ec01aa 100644 --- a/rel/d/a/obj/d_a_obj_dust/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_dust/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE2F90[4]; -extern u8 const data_80BE2F90[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BE2F90[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE2F90-80BE2F94 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BE2F90[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_dust/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_dust/unknown_translation_unit_dtors.cpp index 7cdecbe69c1..880b47b5f6d 100644 --- a/rel/d/a/obj/d_a_obj_dust/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_dust/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE2F94[4]; -extern u8 const data_80BE2F94[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BE2F94[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BE2F94-80BE2F98 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BE2F94[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp index bcd268569db..9cd7f6108c8 100644 --- a/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp +++ b/rel/d/a/obj/d_a_obj_eff/d_a_obj_eff.cpp @@ -33,14 +33,14 @@ struct daObj { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -51,8 +51,6 @@ struct dPa_control_c { // Forward References: // -extern "C" extern void* g_profile_Obj_Eff[12]; - extern "C" void _create__Q28daObjEff5Act_cFv(); extern "C" static void func_8057CA94(); extern "C" static bool func_8057CAB4(); @@ -66,10 +64,6 @@ extern "C" extern void* g_profile_Obj_Eff[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); diff --git a/rel/d/a/obj/d_a_obj_eff/executor.cpp b/rel/d/a/obj/d_a_obj_eff/executor.cpp index 2629879644b..ba8631f31b4 100644 --- a/rel/d/a/obj/d_a_obj_eff/executor.cpp +++ b/rel/d/a/obj/d_a_obj_eff/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8057CAF0[4]; -extern u8 const data_8057CAF4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_eff/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_eff/unknown_translation_unit_ctors.cpp index 6683ac0056f..06f565930e4 100644 --- a/rel/d/a/obj/d_a_obj_eff/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_eff/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057CAF0[4]; -extern u8 const data_8057CAF0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8057CAF0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8057CAF0-8057CAF4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8057CAF0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_eff/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_eff/unknown_translation_unit_dtors.cpp index 9ab1a9276a3..b7c04118ae4 100644 --- a/rel/d/a/obj/d_a_obj_eff/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_eff/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057CAF4[4]; -extern u8 const data_8057CAF4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8057CAF4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8057CAF4-8057CAF8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8057CAF4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp b/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp index 62bf31d52f4..92c6a6438f1 100644 --- a/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp +++ b/rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp @@ -44,7 +44,6 @@ static void daObjE_CREATE_Delete(daObjE_CREATE_c*); static bool daObjE_CREATE_Draw(daObjE_CREATE_c*); static void daObjE_CREATE_Execute(daObjE_CREATE_c*); static bool daObjE_CREATE_IsDelete(daObjE_CREATE_c*); -extern "C" extern void* g_profile_Obj_E_CREATE[12]; extern "C" static void daObjE_CREATE_Create__FP10fopAc_ac_c(); extern "C" static void daObjE_CREATE_Delete__FP15daObjE_CREATE_c(); @@ -72,9 +71,6 @@ void fpcSch_JudgeByID(void*, void*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new[](u32); void operator delete[](void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); diff --git a/rel/d/a/obj/d_a_obj_enemy_create/executor.cpp b/rel/d/a/obj/d_a_obj_enemy_create/executor.cpp index 8eec67ce05c..50229c503d9 100644 --- a/rel/d/a/obj/d_a_obj_enemy_create/executor.cpp +++ b/rel/d/a/obj/d_a_obj_enemy_create/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BE3880[4]; -extern u8 const data_80BE3884[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_enemy_create/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_enemy_create/unknown_translation_unit_ctors.cpp index 4754606c427..d30f949e8ea 100644 --- a/rel/d/a/obj/d_a_obj_enemy_create/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_enemy_create/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE3880[4]; -extern u8 const data_80BE3880[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BE3880[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE3880-80BE3884 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BE3880[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_enemy_create/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_enemy_create/unknown_translation_unit_dtors.cpp index 201ab6e1c12..8c48f45aea2 100644 --- a/rel/d/a/obj/d_a_obj_enemy_create/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_enemy_create/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE3884[4]; -extern u8 const data_80BE3884[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BE3884[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BE3884-80BE3888 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BE3884[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp b/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp index b2db8dab444..a46a4519902 100644 --- a/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp +++ b/rel/d/a/obj/d_a_obj_fallobj/d_a_obj_fallobj.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -118,8 +118,6 @@ static void daObjFallObj_MoveBGExecute(daObjFallObj_c*); static void daObjFallObj_MoveBGDraw(daObjFallObj_c*); static void cLib_calcTimer__template0(s16*); static void cLib_calcTimer__template1(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_FallObj[12]; extern "C" void initBaseMtx__14daObjFallObj_cFv(); extern "C" void setBaseMtx__14daObjFallObj_cFv(); @@ -170,14 +168,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_chaseS(s16*, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_fallobj/executor.cpp b/rel/d/a/obj/d_a_obj_fallobj/executor.cpp index 2b6b8032d09..fbf0f5ec8eb 100644 --- a/rel/d/a/obj/d_a_obj_fallobj/executor.cpp +++ b/rel/d/a/obj/d_a_obj_fallobj/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BE4AA8[4]; -extern u8 const data_80BE4AAC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_fallobj/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_fallobj/unknown_translation_unit_ctors.cpp index 4da88a3eed4..6fa871f26b0 100644 --- a/rel/d/a/obj/d_a_obj_fallobj/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_fallobj/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE4AA8[4]; -extern u8 const data_80BE4AA8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BE4AA8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE4AA8-80BE4AAC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BE4AA8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fallobj/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_fallobj/unknown_translation_unit_dtors.cpp index a2098a62bfa..8cb77025883 100644 --- a/rel/d/a/obj/d_a_obj_fallobj/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_fallobj/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE4AAC[4]; -extern u8 const data_80BE4AAC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BE4AAC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BE4AAC-80BE4AB0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BE4AAC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp b/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp index c6af8c404ac..9e8cc9dc8f5 100644 --- a/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp +++ b/rel/d/a/obj/d_a_obj_fan/d_a_obj_fan.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF0C */ void ZXYrotS(csXyz const&); @@ -150,7 +150,6 @@ static void daObjFan_create1st(daObjFan_c*); static void daObjFan_MoveBGDelete(daObjFan_c*); static void daObjFan_MoveBGExecute(daObjFan_c*); static void daObjFan_MoveBGDraw(daObjFan_c*); -extern "C" extern void* g_profile_Obj_Fan[12]; extern "C" static void searchTornado2__FPvPv(); extern "C" void search_tornado__10daObjFan_cFv(); @@ -192,19 +191,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_fan/executor.cpp b/rel/d/a/obj/d_a_obj_fan/executor.cpp index cb8a5a4da9c..8eae9992dce 100644 --- a/rel/d/a/obj/d_a_obj_fan/executor.cpp +++ b/rel/d/a/obj/d_a_obj_fan/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BE5D78[4]; -extern u8 const data_80BE5D7C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_fan/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_fan/unknown_translation_unit_ctors.cpp index 269f633f33d..7f7a8695d58 100644 --- a/rel/d/a/obj/d_a_obj_fan/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_fan/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE5D78[4]; -extern u8 const data_80BE5D78[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BE5D78[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE5D78-80BE5D7C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BE5D78[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fan/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_fan/unknown_translation_unit_dtors.cpp index 48c2b2a0eee..9c0a6800aee 100644 --- a/rel/d/a/obj/d_a_obj_fan/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_fan/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE5D7C[4]; -extern u8 const data_80BE5D7C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BE5D7C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BE5D7C-80BE5D80 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BE5D7C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp b/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp index e7a3995aa5d..f6d502a354d 100644 --- a/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp +++ b/rel/d/a/obj/d_a_obj_fchain/d_a_obj_fchain.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80BE6328 */ ~csXyz(); - /* 80BE6364 */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -31,6 +26,11 @@ struct cXyz { /* 80BE63A4 */ cXyz(); }; +struct csXyz { + /* 80BE6328 */ ~csXyz(); + /* 80BE6364 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -102,8 +102,6 @@ static void daObjFchain_Create(fopAc_ac_c*); static void daObjFchain_Delete(daObjFchain_c*); static void daObjFchain_Execute(daObjFchain_c*); static void daObjFchain_Draw(daObjFchain_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Fchain[12]; extern "C" void createHeap__13daObjFchain_cFv(); extern "C" static void daObjFchain_createHeap__FP10fopAc_ac_c(); @@ -141,18 +139,6 @@ void cM_rnd(); void cM_rndF(f32); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_fchain/executor.cpp b/rel/d/a/obj/d_a_obj_fchain/executor.cpp index 90acf16d9a2..e4baeff195d 100644 --- a/rel/d/a/obj/d_a_obj_fchain/executor.cpp +++ b/rel/d/a/obj/d_a_obj_fchain/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BE7430[4]; -extern u8 const data_80BE7434[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_fchain/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_fchain/unknown_translation_unit_ctors.cpp index 1cd2041b950..0758ef95d5f 100644 --- a/rel/d/a/obj/d_a_obj_fchain/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_fchain/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE7430[4]; -extern u8 const data_80BE7430[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BE7430[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE7430-80BE7434 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BE7430[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fchain/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_fchain/unknown_translation_unit_dtors.cpp index 48e924ae78f..9b12f52d2e0 100644 --- a/rel/d/a/obj/d_a_obj_fchain/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_fchain/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE7434[4]; -extern u8 const data_80BE7434[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BE7434[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BE7434-80BE7438 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BE7434[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp b/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp index 310c6954365..4b4ef277082 100644 --- a/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood/d_a_obj_fireWood.cpp @@ -41,14 +41,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -111,7 +111,6 @@ static void daFireWood_Draw(daFireWood_c*); static void daFireWood_Execute(daFireWood_c*); static void daFireWood_Delete(daFireWood_c*); static void daFireWood_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_FireWood[12]; extern "C" void __ct__16daFireWood_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -142,16 +141,6 @@ void dComIfGp_getReverb(int); void dKy_plight_set(LIGHT_INFLUENCE*); void dKy_plight_cut(LIGHT_INFLUENCE*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_fireWood/executor.cpp b/rel/d/a/obj/d_a_obj_fireWood/executor.cpp index bb11c44eb0f..00c156034cd 100644 --- a/rel/d/a/obj/d_a_obj_fireWood/executor.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BE7FF0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_fireWood/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_fireWood/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6b30524188b..07d0e4574c0 100644 --- a/rel/d/a/obj/d_a_obj_fireWood/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BE7FFC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BE7FFC-80BE8004 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BE7FFC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BE8130-80BE8138 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_fireWood/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_fireWood/unknown_translation_unit_ctors.cpp index b8b90faef53..22fccc70d96 100644 --- a/rel/d/a/obj/d_a_obj_fireWood/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BE7FF0[2]; -extern void* const data_80BE7FF0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_fireWood_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE7FF0-80BE7FF8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BE7FF0[2] = { + (void*)__sinit_d_a_obj_fireWood_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp b/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp index e57f2e76c10..a87a6b2f5ad 100644 --- a/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood2/d_a_obj_fireWood2.cpp @@ -44,14 +44,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -114,7 +114,6 @@ static void daFireWood2_Draw(daFireWood2_c*); static void daFireWood2_Execute(daFireWood2_c*); static void daFireWood2_Delete(daFireWood2_c*); static void daFireWood2_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_FireWood2[12]; extern "C" void __ct__17daFireWood2_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -149,16 +148,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_fireWood2/executor.cpp b/rel/d/a/obj/d_a_obj_fireWood2/executor.cpp index 161c110faf4..bc0707c0276 100644 --- a/rel/d/a/obj/d_a_obj_fireWood2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BE8F20[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_fireWood2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_fireWood2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7fbd48d232b..585de539abc 100644 --- a/rel/d/a/obj/d_a_obj_fireWood2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BE8F2C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BE8F2C-80BE8F34 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BE8F2C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BE9078-80BE9080 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_fireWood2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_fireWood2/unknown_translation_unit_ctors.cpp index 662befb88a3..58f2ab4a10b 100644 --- a/rel/d/a/obj/d_a_obj_fireWood2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_fireWood2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BE8F20[2]; -extern void* const data_80BE8F20[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_fireWood2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE8F20-80BE8F28 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BE8F20[2] = { + (void*)__sinit_d_a_obj_fireWood2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp b/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp index 887e2b2b365..b70fae7d6eb 100644 --- a/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar/d_a_obj_firepillar.cpp @@ -119,9 +119,6 @@ static void daObjFPillar_Draw(daObjFPillar_c*); static void daObjFPillar_Execute(daObjFPillar_c*); static void daObjFPillar_Delete(daObjFPillar_c*); static void daObjFPillar_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3895; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_FirePillar[12]; extern "C" void initBaseMtx__14daObjFPillar_cFv(); extern "C" void setBaseMtx__14daObjFPillar_cFv(); @@ -162,16 +159,6 @@ void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80BE9C30[4]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_firepillar/executor.cpp b/rel/d/a/obj/d_a_obj_firepillar/executor.cpp index ac44e0c4655..a21de4cfe0d 100644 --- a/rel/d/a/obj/d_a_obj_firepillar/executor.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BE9A98[4]; -extern u8 const data_80BE9A9C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_bss.cpp index aa56a910dbb..2b657e62172 100644 --- a/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80BE9C30[4]; -extern "C" extern u8 data_80BE9C30[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_ctors.cpp index fa138ac489c..b8e7590ca4c 100644 --- a/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE9A98[4]; -extern u8 const data_80BE9A98[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BE9A98[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BE9A98-80BE9A9C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BE9A98[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_dtors.cpp index 12e918ab922..bd970e57948 100644 --- a/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BE9A9C[4]; -extern u8 const data_80BE9A9C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BE9A9C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BE9A9C-80BE9AA0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BE9A9C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp b/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp index e887882d4b1..66d6ac47e89 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar2/d_a_obj_firepillar2.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -201,9 +201,6 @@ static void daObjFPillar2_Execute(daObjFPillar2_c*); static void daObjFPillar2_Delete(daObjFPillar2_c*); static void daObjFPillar2_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_FirePillar2[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void initBaseMtx__15daObjFPillar2_cFv(); @@ -257,20 +254,6 @@ void cLib_chasePos(cXyz*, cXyz const&, f32); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 BaseZ__4cXyz[12]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80BEB6E0[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_firepillar2/executor.cpp b/rel/d/a/obj/d_a_obj_firepillar2/executor.cpp index 46a37afe3ac..94ad08e5f87 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BEB4BC[4]; -extern u8 const data_80BEB4C0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_bss.cpp index 66d930596d4..8e1f8f6e267 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80BEB6E0[4]; -extern "C" extern u8 data_80BEB6E0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_ctors.cpp index 861badab404..bdf273939e9 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BEB4BC[4]; -extern u8 const data_80BEB4BC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BEB4BC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BEB4BC-80BEB4C0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BEB4BC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_dtors.cpp index 0ead9720ad4..82eb6977cf4 100644 --- a/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_firepillar2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BEB4C0[4]; -extern u8 const data_80BEB4C0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BEB4C0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BEB4C0-80BEB4C4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BEB4C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp b/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp index 413b7c44bed..c409f30cf4d 100644 --- a/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp +++ b/rel/d/a/obj/d_a_obj_flag/d_a_obj_flag.cpp @@ -87,8 +87,6 @@ static void daObjFlag_Execute(daObjFlag_c*); static bool daObjFlag_IsDelete(daObjFlag_c*); static void daObjFlag_Delete(daObjFlag_c*); static void daObjFlag_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Flag[12]; extern "C" void create_init__11daObjFlag_cFv(); extern "C" void initBaseMtx__11daObjFlag_cFv(); @@ -127,15 +125,6 @@ void cM_rnd(); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_flag/executor.cpp b/rel/d/a/obj/d_a_obj_flag/executor.cpp index 8c6a8815c92..2bf2f6054fd 100644 --- a/rel/d/a/obj/d_a_obj_flag/executor.cpp +++ b/rel/d/a/obj/d_a_obj_flag/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BEC4E4[4]; -extern u8 const data_80BEC4E8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_flag/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_flag/unknown_translation_unit_ctors.cpp index 9913ef98d92..8123841024d 100644 --- a/rel/d/a/obj/d_a_obj_flag/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_flag/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BEC4E4[4]; -extern u8 const data_80BEC4E4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BEC4E4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BEC4E4-80BEC4E8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BEC4E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_flag/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_flag/unknown_translation_unit_dtors.cpp index 217d7d61959..40290a603bb 100644 --- a/rel/d/a/obj/d_a_obj_flag/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_flag/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BEC4E8[4]; -extern u8 const data_80BEC4E8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BEC4E8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BEC4E8-80BEC4EC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BEC4E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp b/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp index 311583f800f..8bfac403e4f 100644 --- a/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp +++ b/rel/d/a/obj/d_a_obj_flag2/d_a_obj_flag2.cpp @@ -172,8 +172,6 @@ static void daObjFlag2_Execute(daObjFlag2_c*); static bool daObjFlag2_IsDelete(daObjFlag2_c*); static void daObjFlag2_Delete(daObjFlag2_c*); static void daObjFlag2_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Flag2[12]; extern "C" void initFlagPos__11FlagCloth_cFP4cXyzP10fopAc_ac_c(); extern "C" void __dt__4cXyzFv(); @@ -230,25 +228,6 @@ void dKy_setLight_mine(dKy_tevstr_c*); void dKy_tevstr_init(dKy_tevstr_c*, s8, u8); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_flag2/executor.cpp b/rel/d/a/obj/d_a_obj_flag2/executor.cpp index c5323e7b88b..09aca834950 100644 --- a/rel/d/a/obj/d_a_obj_flag2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_flag2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BEE0D4[4]; -extern u8 const data_80BEE0D8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_flag2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_flag2/unknown_translation_unit_ctors.cpp index 8ac6b0a05bd..e0203720454 100644 --- a/rel/d/a/obj/d_a_obj_flag2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_flag2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BEE0D4[4]; -extern u8 const data_80BEE0D4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BEE0D4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BEE0D4-80BEE0D8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BEE0D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_flag2/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_flag2/unknown_translation_unit_dtors.cpp index 97f256bfc0c..5fe96ec779e 100644 --- a/rel/d/a/obj/d_a_obj_flag2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_flag2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BEE0D8[4]; -extern u8 const data_80BEE0D8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BEE0D8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BEE0D8-80BEE0DC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BEE0D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp b/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp index f13510aee30..6acc50b3832 100644 --- a/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp +++ b/rel/d/a/obj/d_a_obj_flag3/d_a_obj_flag3.cpp @@ -126,10 +126,6 @@ static void daObjFlag3_Execute(daObjFlag3_c*); static bool daObjFlag3_IsDelete(daObjFlag3_c*); static void daObjFlag3_Delete(daObjFlag3_c*); static void daObjFlag3_Create(fopAc_ac_c*); -extern "C" extern u8 const lit_3637[32]; -extern "C" extern u8 const data_80BF04B0[64]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Flag3[12]; extern "C" void createHeap__12daObjFlag3_cFv(); extern "C" static void createSolidHeap__FP10fopAc_ac_c(); @@ -178,22 +174,6 @@ void dKy_GxFog_tevstr_set(dKy_tevstr_c*); void dKy_setLight_mine(dKy_tevstr_c*); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_flag3/executor.cpp b/rel/d/a/obj/d_a_obj_flag3/executor.cpp index 1f4c9b07a39..552af664a24 100644 --- a/rel/d/a/obj/d_a_obj_flag3/executor.cpp +++ b/rel/d/a/obj/d_a_obj_flag3/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BF0450[4]; -extern u8 const data_80BF0454[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_flag3/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_flag3/unknown_translation_unit_ctors.cpp index ac9d877956c..acb00c97f37 100644 --- a/rel/d/a/obj/d_a_obj_flag3/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_flag3/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF0450[4]; -extern u8 const data_80BF0450[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BF0450[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BF0450-80BF0454 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BF0450[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_flag3/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_flag3/unknown_translation_unit_dtors.cpp index 5f7ec2a4724..82bdc409090 100644 --- a/rel/d/a/obj/d_a_obj_flag3/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_flag3/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF0454[4]; -extern u8 const data_80BF0454[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BF0454[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BF0454-80BF0458 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BF0454[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp index 7152792728b..e1227524c9a 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp +++ b/rel/d/a/obj/d_a_obj_fmobj/d_a_obj_fmobj.cpp @@ -27,12 +27,12 @@ struct dSv_memBit_c { /* 80034934 */ void isDungeonItem(int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -81,8 +81,6 @@ static bool daObj_Fmobj_IsDelete(obj_fmobj_class*); static void daObj_Fmobj_Delete(obj_fmobj_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Fmobj_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_FMOBJ[12]; extern "C" static void daObj_Fmobj_Draw__FP15obj_fmobj_class(); extern "C" static void daObj_Fmobj_Execute__FP15obj_fmobj_class(); @@ -106,11 +104,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cM_rndF(f32); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_fmobj/executor.cpp b/rel/d/a/obj/d_a_obj_fmobj/executor.cpp index 3c94484fc09..b43c7437ddf 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/executor.cpp +++ b/rel/d/a/obj/d_a_obj_fmobj/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8057CF60[4]; -extern u8 const data_8057CF64[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_fmobj/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_fmobj/unknown_translation_unit_ctors.cpp index 071fa8b1150..22697d3c476 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_fmobj/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057CF60[4]; -extern u8 const data_8057CF60[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8057CF60[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8057CF60-8057CF64 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8057CF60[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_fmobj/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_fmobj/unknown_translation_unit_dtors.cpp index 547d6774360..a8680411ebf 100644 --- a/rel/d/a/obj/d_a_obj_fmobj/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_fmobj/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8057CF64[4]; -extern u8 const data_8057CF64[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8057CF64[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8057CF64-8057CF68 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8057CF64[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp b/rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp index d186cba1c1b..ba32c196744 100644 --- a/rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp +++ b/rel/d/a/obj/d_a_obj_food/d_a_obj_food.cpp @@ -33,10 +33,6 @@ struct daObj_Food_HIO_c { /* 80BF1CE8 */ ~daObj_Food_HIO_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -44,6 +40,10 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -187,8 +187,6 @@ static bool daObj_Food_IsDelete(obj_food_class*); static void daObj_Food_Delete(obj_food_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Food_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_FOOD[12]; extern "C" void __ct__16daObj_Food_HIO_cFv(); extern "C" static void daObj_Food_Draw__FP14obj_food_class(); @@ -239,20 +237,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_food/executor.cpp b/rel/d/a/obj/d_a_obj_food/executor.cpp index 8100fffce71..5f36dfc8e44 100644 --- a/rel/d/a/obj/d_a_obj_food/executor.cpp +++ b/rel/d/a/obj/d_a_obj_food/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BF1D7C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_food/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_food/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e7844fb7777..7b2f966a5d2 100644 --- a/rel/d/a/obj/d_a_obj_food/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_food/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BF1D88[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BF1D88-80BF1D90 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BF1D88[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BF1F38-80BF1F40 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_food/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_food/unknown_translation_unit_ctors.cpp index 6b1fc57f64c..bd84007e406 100644 --- a/rel/d/a/obj/d_a_obj_food/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_food/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BF1D7C[2]; -extern void* const data_80BF1D7C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_food_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BF1D7C-80BF1D84 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BF1D7C[2] = { + (void*)__sinit_d_a_obj_food_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp b/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp index 1bb3ea32e46..75a97555543 100644 --- a/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp +++ b/rel/d/a/obj/d_a_obj_fw/d_a_obj_fw.cpp @@ -32,12 +32,12 @@ struct dSv_memBit_c { /* 80034934 */ void isDungeonItem(int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -110,8 +110,6 @@ static bool daObj_Fw_IsDelete(obj_fw_class*); static void daObj_Fw_Delete(obj_fw_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Fw_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_FW[12]; extern "C" void __ct__14daObj_Fw_HIO_cFv(); extern "C" static void ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); @@ -153,12 +151,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_fw/executor.cpp b/rel/d/a/obj/d_a_obj_fw/executor.cpp index 77ded5152b7..efc17137739 100644 --- a/rel/d/a/obj/d_a_obj_fw/executor.cpp +++ b/rel/d/a/obj/d_a_obj_fw/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BF2B34[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_fw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_fw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8c98e254170..9a2af6841af 100644 --- a/rel/d/a/obj/d_a_obj_fw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_fw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BF2B40[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BF2B40-80BF2B48 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BF2B40[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BF2C18-80BF2C20 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_fw/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_fw/unknown_translation_unit_ctors.cpp index 321db8c1702..738a5759af4 100644 --- a/rel/d/a/obj/d_a_obj_fw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_fw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BF2B34[2]; -extern void* const data_80BF2B34[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_fw_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BF2B34-80BF2B3C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BF2B34[2] = { + (void*)__sinit_d_a_obj_fw_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp b/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp index c4608703a60..47d0980b52a 100644 --- a/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp +++ b/rel/d/a/obj/d_a_obj_gadget/d_a_obj_gadget.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,6 +21,8 @@ struct cXyz { /* 80BF33CC */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -204,48 +204,6 @@ static void daObj_Gadget_Execute(void*); static void daObj_Gadget_Draw(void*); static bool daObj_Gadget_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_GADGET[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80BF4C04[4]; -extern "C" extern u8 data_80BF4C08[4]; -extern "C" extern u8 data_80BF4C0C[4]; -extern "C" extern u8 data_80BF4C10[4]; -extern "C" extern u8 data_80BF4C14[4]; -extern "C" extern u8 data_80BF4C18[4]; -extern "C" extern u8 data_80BF4C1C[4]; -extern "C" extern u8 data_80BF4C20[4]; -extern "C" extern u8 data_80BF4C24[4]; -extern "C" extern u8 data_80BF4C28[4]; -extern "C" extern u8 data_80BF4C2C[4]; -extern "C" extern u8 data_80BF4C30[4]; -extern "C" extern u8 data_80BF4C34[4]; -extern "C" extern u8 data_80BF4C38[4]; -extern "C" extern u8 data_80BF4C3C[4]; -extern "C" extern u8 data_80BF4C40[4]; -extern "C" extern u8 data_80BF4C44[4]; -extern "C" extern u8 data_80BF4C48[4]; -extern "C" extern u8 data_80BF4C4C[4]; -extern "C" extern u8 data_80BF4C50[4]; -extern "C" extern u8 data_80BF4C54[4]; -extern "C" extern u8 data_80BF4C58[4]; -extern "C" extern u8 data_80BF4C5C[4]; -extern "C" extern u8 data_80BF4C60[4]; -extern "C" extern u8 data_80BF4C64[4]; extern "C" void __dt__14daObj_Gadget_cFv(); extern "C" void create__14daObj_Gadget_cFv(); @@ -356,19 +314,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_gadget/executor.cpp b/rel/d/a/obj/d_a_obj_gadget/executor.cpp index d4292c34661..2c14401685c 100644 --- a/rel/d/a/obj/d_a_obj_gadget/executor.cpp +++ b/rel/d/a/obj/d_a_obj_gadget/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BF4930[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_gadget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_gadget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3bb83e556ba..222ca73032b 100644 --- a/rel/d/a/obj/d_a_obj_gadget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_gadget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BF493C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BF493C-80BF4944 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BF493C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BF4B90-80BF4B98 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_gadget/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_gadget/unknown_translation_unit_ctors.cpp index 792df3a5dde..40975c4d65c 100644 --- a/rel/d/a/obj/d_a_obj_gadget/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_gadget/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BF4930[2]; -extern void* const data_80BF4930[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_gadget_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BF4930-80BF4938 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BF4930[2] = { + (void*)__sinit_d_a_obj_gadget_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp b/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp index f6f1d724ed8..90ce9eefa24 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall/d_a_obj_ganonwall.cpp @@ -87,8 +87,6 @@ static void daObjGWall_Draw(daObjGWall_c*); static void daObjGWall_Execute(daObjGWall_c*); static void daObjGWall_Delete(daObjGWall_c*); static void daObjGWall_Create(daObjGWall_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_GanonWall[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void initBaseMtx__12daObjGWall_cFv(); @@ -123,12 +121,6 @@ void dKy_getdaytime_hour(); void dKy_getdaytime_minute(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_ganonwall/executor.cpp b/rel/d/a/obj/d_a_obj_ganonwall/executor.cpp index 48c546326c7..9bb5e42cca8 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BF55E4[4]; -extern u8 const data_80BF55E8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ganonwall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ganonwall/unknown_translation_unit_ctors.cpp index 5396913dde8..1d427c6c8e9 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF55E4[4]; -extern u8 const data_80BF55E4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BF55E4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BF55E4-80BF55E8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BF55E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ganonwall/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ganonwall/unknown_translation_unit_dtors.cpp index 16455d74adf..88bd7153d8d 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF55E8[4]; -extern u8 const data_80BF55E8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BF55E8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BF55E8-80BF55EC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BF55E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp b/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp index 9c551302dbc..2036d039da6 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall2/d_a_obj_ganonwall2.cpp @@ -110,7 +110,6 @@ static void daObjGWall2_create1st(daObjGWall2_c*); static void daObjGWall2_MoveBGDelete(daObjGWall2_c*); static void daObjGWall2_MoveBGExecute(daObjGWall2_c*); static void daObjGWall2_MoveBGDraw(daObjGWall2_c*); -extern "C" extern void* g_profile_Obj_GanonWall2[12]; extern "C" void initBaseMtx__13daObjGWall2_cFv(); extern "C" void setBaseMtx__13daObjGWall2_cFv(); @@ -142,14 +141,6 @@ void dKy_getdaytime_hour(); void dKy_getdaytime_minute(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_ganonwall2/executor.cpp b/rel/d/a/obj/d_a_obj_ganonwall2/executor.cpp index 356a6aabed3..5aa11f6d4e0 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BF6104[4]; -extern u8 const data_80BF6108[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ganonwall2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ganonwall2/unknown_translation_unit_ctors.cpp index 04e5d8877d7..cb8b3dcc1cd 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF6104[4]; -extern u8 const data_80BF6104[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BF6104[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BF6104-80BF6108 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BF6104[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ganonwall2/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ganonwall2/unknown_translation_unit_dtors.cpp index 5763fbeb206..590ba928869 100644 --- a/rel/d/a/obj/d_a_obj_ganonwall2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ganonwall2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF6108[4]; -extern u8 const data_80BF6108[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BF6108[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BF6108-80BF610C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BF6108[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp b/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp index 1226d044446..4931294e0aa 100644 --- a/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp +++ b/rel/d/a/obj/d_a_obj_gb/d_a_obj_gb.cpp @@ -48,15 +48,15 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct cXyz { /* 80BF678C */ ~cXyz(); /* 80BF6DB0 */ cXyz(); }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -115,9 +115,6 @@ static bool daObj_Gb_IsDelete(obj_gb_class*); static void daObj_Gb_Delete(obj_gb_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Gb_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_GB[12]; extern "C" static void daObj_Gb_Draw__FP12obj_gb_class(); extern "C" static void daObj_Gb_Execute__FP12obj_gb_class(); @@ -149,13 +146,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_gb/executor.cpp b/rel/d/a/obj/d_a_obj_gb/executor.cpp index c18137fada0..6890cbc3598 100644 --- a/rel/d/a/obj/d_a_obj_gb/executor.cpp +++ b/rel/d/a/obj/d_a_obj_gb/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BF6DB4[4]; -extern u8 const data_80BF6DB8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_gb/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_gb/unknown_translation_unit_ctors.cpp index 11d40771142..ad402db3b5b 100644 --- a/rel/d/a/obj/d_a_obj_gb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_gb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF6DB4[4]; -extern u8 const data_80BF6DB4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BF6DB4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BF6DB4-80BF6DB8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BF6DB4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_gb/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_gb/unknown_translation_unit_dtors.cpp index 28f075d117f..81d7f38cd56 100644 --- a/rel/d/a/obj/d_a_obj_gb/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_gb/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF6DB8[4]; -extern u8 const data_80BF6DB8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BF6DB8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BF6DB8-80BF6DBC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BF6DB8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp b/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp index 18e3d9ecb4d..03c098f696f 100644 --- a/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp +++ b/rel/d/a/obj/d_a_obj_geyser/d_a_obj_geyser.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -178,9 +178,6 @@ static void daObjGeyser_create1st(daObjGeyser_c*); static void daObjGeyser_MoveBGDelete(daObjGeyser_c*); static void daObjGeyser_MoveBGExecute(daObjGeyser_c*); static void daObjGeyser_MoveBGDraw(daObjGeyser_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Geyser[12]; extern "C" void initBaseMtx__13daObjGeyser_cFv(); extern "C" void setBaseMtx__13daObjGeyser_cFv(); @@ -254,20 +251,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseUC(u8*, u8, u8); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80BF9240[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_geyser/executor.cpp b/rel/d/a/obj/d_a_obj_geyser/executor.cpp index dd127a394a1..114dffb71d8 100644 --- a/rel/d/a/obj/d_a_obj_geyser/executor.cpp +++ b/rel/d/a/obj/d_a_obj_geyser/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80BF8FE0[4]; -extern u8 const data_80BF8FE4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_bss.cpp index 5bd33ed7d06..3b60530caf5 100644 --- a/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80BF9240[4]; -extern "C" extern u8 struct_80BF9240[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_ctors.cpp index afa7a993644..e4800ae8329 100644 --- a/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF8FE0[4]; -extern u8 const data_80BF8FE0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80BF8FE0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BF8FE0-80BF8FE4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80BF8FE0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_dtors.cpp index 23a1841a5ff..51821bfe0e3 100644 --- a/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_geyser/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80BF8FE4[4]; -extern u8 const data_80BF8FE4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80BF8FE4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80BF8FE4-80BF8FE8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80BF8FE4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp b/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp index 904e0a1b284..f5e9d10152a 100644 --- a/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp +++ b/rel/d/a/obj/d_a_obj_glowSphere/d_a_obj_glowSphere.cpp @@ -241,49 +241,6 @@ static void daGlwSph_Draw(daGlwSph_c*); static void daGlwSph_Execute(daGlwSph_c*); static void daGlwSph_Delete(daGlwSph_c*); static void daGlwSph_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_glowSphere[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80BFAFEC[4]; -extern "C" extern u8 data_80BFAFF0[4]; -extern "C" extern u8 data_80BFAFF4[4]; -extern "C" extern u8 data_80BFAFF8[4]; -extern "C" extern u8 data_80BFAFFC[4]; -extern "C" extern u8 data_80BFB000[4]; -extern "C" extern u8 data_80BFB004[4]; -extern "C" extern u8 data_80BFB008[4]; -extern "C" extern u8 data_80BFB00C[4]; -extern "C" extern u8 data_80BFB010[4]; -extern "C" extern u8 data_80BFB014[4]; -extern "C" extern u8 data_80BFB018[4]; -extern "C" extern u8 data_80BFB01C[4]; -extern "C" extern u8 data_80BFB020[4]; -extern "C" extern u8 data_80BFB024[4]; -extern "C" extern u8 data_80BFB028[4]; -extern "C" extern u8 data_80BFB02C[4]; -extern "C" extern u8 data_80BFB030[4]; -extern "C" extern u8 data_80BFB034[4]; -extern "C" extern u8 data_80BFB038[4]; -extern "C" extern u8 data_80BFB03C[4]; -extern "C" extern u8 data_80BFB040[4]; -extern "C" extern u8 data_80BFB044[4]; -extern "C" extern u8 data_80BFB048[4]; -extern "C" extern u8 data_80BFB04C[4]; extern "C" void __ct__14daGlwSph_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -391,18 +348,6 @@ void dKy_mock_light_every_set(LIGHT_INFLUENCE*); void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcPos(cXyz*, cXyz const&, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); diff --git a/rel/d/a/obj/d_a_obj_glowSphere/executor.cpp b/rel/d/a/obj/d_a_obj_glowSphere/executor.cpp index d1c2c62ce28..64969c38b7a 100644 --- a/rel/d/a/obj/d_a_obj_glowSphere/executor.cpp +++ b/rel/d/a/obj/d_a_obj_glowSphere/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BFA95C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_glowSphere/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_glowSphere/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ef240e2e9ca..e70a1f105ee 100644 --- a/rel/d/a/obj/d_a_obj_glowSphere/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_glowSphere/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BFA968[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BFA968-80BFA970 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BFA968[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BFABA0-80BFABA8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_glowSphere/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_glowSphere/unknown_translation_unit_ctors.cpp index 3edd512d677..fedfeaedcf0 100644 --- a/rel/d/a/obj/d_a_obj_glowSphere/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_glowSphere/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BFA95C[2]; -extern void* const data_80BFA95C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_glowSphere_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BFA95C-80BFA964 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BFA95C[2] = { + (void*)__sinit_d_a_obj_glowSphere_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp b/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp index 844bdfe7924..d780b4f3f3d 100644 --- a/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp +++ b/rel/d/a/obj/d_a_obj_gm/d_a_obj_gm.cpp @@ -178,9 +178,6 @@ static bool daObj_Gm_IsDelete(obj_gm_class*); static void daObj_Gm_Delete(obj_gm_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Gm_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_GM[12]; extern "C" void __ct__14daObj_Gm_HIO_cFv(); extern "C" static void daObj_Gm_Draw__FP12obj_gm_class(); @@ -255,19 +252,6 @@ void MtxPosition(cXyz*, cXyz*); void MtxPush(); void MtxPull(); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_gm/executor.cpp b/rel/d/a/obj/d_a_obj_gm/executor.cpp index 6288070183f..e38464a7b60 100644 --- a/rel/d/a/obj/d_a_obj_gm/executor.cpp +++ b/rel/d/a/obj/d_a_obj_gm/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BFD318[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 33c8a360900..5d7e7ee5543 100644 --- a/rel/d/a/obj/d_a_obj_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_gm/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BFD324[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BFD324-80BFD32C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BFD324[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BFD590-80BFD598 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_gm/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_gm/unknown_translation_unit_ctors.cpp index 7accb891f4c..d046ac3c661 100644 --- a/rel/d/a/obj/d_a_obj_gm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_gm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BFD318[2]; -extern void* const data_80BFD318[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_gm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BFD318-80BFD320 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BFD318[2] = { + (void*)__sinit_d_a_obj_gm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp b/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp index 9ab1aefaa1c..650d65d501f 100644 --- a/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp +++ b/rel/d/a/obj/d_a_obj_goGate/d_a_obj_goGate.cpp @@ -109,9 +109,6 @@ static void daGoGate_Draw(daGoGate_c*); static void daGoGate_Execute(daGoGate_c*); static void daGoGate_Delete(daGoGate_c*); static void daGoGate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_GoGate[12]; extern "C" void __ct__14daGoGate_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -154,13 +151,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_goGate/executor.cpp b/rel/d/a/obj/d_a_obj_goGate/executor.cpp index f1b1a927bae..56e0bd33762 100644 --- a/rel/d/a/obj/d_a_obj_goGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_goGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BFDFD4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_goGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_goGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9d8bd825906..4847690e60f 100644 --- a/rel/d/a/obj/d_a_obj_goGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_goGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BFDFE0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BFDFE0-80BFDFE8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BFDFE0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BFE108-80BFE110 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_goGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_goGate/unknown_translation_unit_ctors.cpp index b5f4470e59f..bd4ebdd7b3e 100644 --- a/rel/d/a/obj/d_a_obj_goGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_goGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BFDFD4[2]; -extern void* const data_80BFDFD4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_goGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BFDFD4-80BFDFDC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BFDFD4[2] = { + (void*)__sinit_d_a_obj_goGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp b/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp index c052c6b25f0..aaa63129d3a 100644 --- a/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp +++ b/rel/d/a/obj/d_a_obj_gomikabe/d_a_obj_gomikabe.cpp @@ -13,6 +13,11 @@ struct request_of_phase_process_class {}; +struct cXyz { + /* 80BFE3FC */ ~cXyz(); + /* 80BFF8CC */ cXyz(); +}; + struct csXyz { /* 80BFF8C8 */ csXyz(); /* 802673F4 */ csXyz(s16, s16, s16); @@ -20,11 +25,6 @@ struct csXyz { /* 80BFEA24 */ ~csXyz(); }; -struct cXyz { - /* 80BFE3FC */ ~cXyz(); - /* 80BFF8CC */ cXyz(); -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -206,13 +206,6 @@ static void daObjGOMIKABE_Delete(daObjGOMIKABE_c*); static void daObjGOMIKABE_Draw(daObjGOMIKABE_c*); static void daObjGOMIKABE_Execute(daObjGOMIKABE_c*); static bool daObjGOMIKABE_IsDelete(daObjGOMIKABE_c*); -extern "C" extern u8 const lit_4156[8]; -extern "C" extern u8 const lit_4157[8]; -extern "C" extern u8 const lit_4158[8]; -extern "C" extern u32 const lit_4159; -extern "C" extern u32 const lit_4160; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_GOMIKABE[12]; extern "C" void __ct__19daObjGOMIKABE_HIO_cFv(); extern "C" void initCcCylinder__15daObjGOMIKABE_cFv(); @@ -283,19 +276,6 @@ void cM_rndFX(f32); void cLib_addCalc2(f32*, f32, f32, f32); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_gomikabe/executor.cpp b/rel/d/a/obj/d_a_obj_gomikabe/executor.cpp index 6290dd2ecf1..4b2b0407f1a 100644 --- a/rel/d/a/obj/d_a_obj_gomikabe/executor.cpp +++ b/rel/d/a/obj/d_a_obj_gomikabe/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80BFFC08[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_gomikabe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_gomikabe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 48024ceb00a..b9c08de9ffc 100644 --- a/rel/d/a/obj/d_a_obj_gomikabe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_gomikabe/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80BFFC14[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80BFFC14-80BFFC1C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80BFFC14[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80BFFE00-80BFFE08 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_gomikabe/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_gomikabe/unknown_translation_unit_ctors.cpp index 35d40b910dd..887ef540e93 100644 --- a/rel/d/a/obj/d_a_obj_gomikabe/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_gomikabe/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80BFFC08[2]; -extern void* const data_80BFFC08[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_gomikabe_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80BFFC08-80BFFC10 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80BFFC08[2] = { + (void*)__sinit_d_a_obj_gomikabe_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp b/rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp index a4a465f1d55..3e51856980c 100644 --- a/rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp +++ b/rel/d/a/obj/d_a_obj_gptaru/d_a_obj_gpTaru.cpp @@ -243,9 +243,6 @@ static void daGpTaru_Draw(daGpTaru_c*); static void daGpTaru_Execute(daGpTaru_c*); static void daGpTaru_Delete(daGpTaru_c*); static void daGpTaru_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_GpTaru[12]; extern "C" void __ct__14daGpTaru_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -322,22 +319,6 @@ void dKyw_pntwind_cut(WIND_INFLUENCE*); void cM_atan2s(f32, f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_gptaru/executor.cpp b/rel/d/a/obj/d_a_obj_gptaru/executor.cpp index aa61a4ce14d..b387e0c73ad 100644 --- a/rel/d/a/obj/d_a_obj_gptaru/executor.cpp +++ b/rel/d/a/obj/d_a_obj_gptaru/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8057F55C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_gptaru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_gptaru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fac07d37918..a7b4b2aadb7 100644 --- a/rel/d/a/obj/d_a_obj_gptaru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_gptaru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8057F568[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8057F568-8057F570 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8057F568[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8057F8D0-8057F8D8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_gptaru/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_gptaru/unknown_translation_unit_ctors.cpp index f0c80b1be85..8ccc7ad37c1 100644 --- a/rel/d/a/obj/d_a_obj_gptaru/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_gptaru/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8057F55C[2]; -extern void* const data_8057F55C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_gpTaru_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8057F55C-8057F564 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8057F55C[2] = { + (void*)__sinit_d_a_obj_gpTaru_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp b/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp index 24e3a4ab856..52ac7487b04 100644 --- a/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp +++ b/rel/d/a/obj/d_a_obj_gra2/d_a_obj_gra2.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -25,6 +23,8 @@ struct cXyz { /* 80C04C40 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -46,14 +46,14 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -76,10 +76,10 @@ struct daPy_py_c { /* 8015F3FC */ void getAttentionOffsetY(); }; -struct J3DModel {}; - struct dBgW {}; +struct J3DModel {}; + struct J3DJoint {}; struct daObj_GrA_c { @@ -264,10 +264,10 @@ struct daBaseNpc_lookat_c { /* 8014E6AC */ void getRot(int); }; -struct J3DAnmTexPattern {}; - struct J3DAnmTransformKey {}; +struct J3DAnmTexPattern {}; + struct daBaseNpc_c { /* 8014E89C */ ~daBaseNpc_c(); /* 8014EAD0 */ void execute(); @@ -327,10 +327,10 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -344,16 +344,16 @@ struct dPa_control_c { cXyz const*); }; +struct dBgS_AcchCir { + /* 80075F58 */ void SetWall(f32, f32); +}; + struct dBgW_Base {}; struct dBgS { /* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*); }; -struct dBgS_AcchCir { - /* 80075F58 */ void SetWall(f32, f32); -}; - struct dBgS_Acch { /* 80076248 */ void Set(cXyz*, cXyz*, fopAc_ac_c*, int, dBgS_AcchCir*, cXyz*, csXyz*, csXyz*); /* 80076AAC */ void CrrPos(dBgS&); @@ -521,70 +521,6 @@ static void cLib_calcTimer__template0(int*); static void cLib_calcTimer__template1(s16*); static void s_sub2(void*, void*); static void skipCallBack(void*, int); -extern "C" extern u8 const l_bgcParam[80]; -extern "C" extern u8 const l_dirToAngleTBL[8]; -extern "C" extern u32 const lit_5582; -extern "C" extern u32 const lit_5583; -extern "C" extern u32 const lit_5725; -extern "C" extern u8 const lit_5756[12]; -extern "C" extern u32 const lit_10251; -extern "C" extern u32 const lit_10252; -extern "C" extern u32 const lit_10253; -extern "C" extern u32 const lit_10255; -extern "C" extern u32 const lit_10256; -extern "C" extern u32 const lit_10257; -extern "C" extern u32 const lit_10258; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* lit_8025[3]; -extern "C" extern void* lit_8037[3]; -extern "C" extern void* lit_8042[3]; -extern "C" extern void* g_profile_OBJ_GRA[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 lit_5648[12 + 4 /* padding */]; -extern "C" extern u8 lit_5651[12]; -extern "C" extern u8 lit_5652[12]; -extern "C" extern u8 lit_5653[12]; -extern "C" extern u8 data_80C10AE0[48]; -extern "C" extern u8 data_80C10B10[4]; -extern "C" extern u8 data_80C10B14[4]; -extern "C" extern u8 data_80C10B18[4]; -extern "C" extern u8 data_80C10B1C[4]; -extern "C" extern u8 data_80C10B20[4]; -extern "C" extern u8 data_80C10B24[4]; -extern "C" extern u8 data_80C10B28[4]; -extern "C" extern u8 data_80C10B2C[4]; -extern "C" extern u8 data_80C10B30[4]; -extern "C" extern u8 data_80C10B34[4]; -extern "C" extern u8 data_80C10B38[4]; -extern "C" extern u8 data_80C10B3C[4]; -extern "C" extern u8 data_80C10B40[4]; -extern "C" extern u8 data_80C10B44[4]; -extern "C" extern u8 data_80C10B48[4]; -extern "C" extern u8 data_80C10B4C[4]; -extern "C" extern u8 data_80C10B50[4]; -extern "C" extern u8 data_80C10B54[4]; -extern "C" extern u8 data_80C10B58[4]; -extern "C" extern u8 data_80C10B5C[4]; -extern "C" extern u8 data_80C10B60[4]; -extern "C" extern u8 data_80C10B64[4]; -extern "C" extern u8 data_80C10B68[4]; -extern "C" extern u8 data_80C10B6C[4]; -extern "C" extern u8 data_80C10B70[4]; extern "C" static void jointCtrlCallBack__FP8J3DJointi(); extern "C" void rideCallBack__11daObj_GrA_cFP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); @@ -851,25 +787,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern u8 mCcDCyl__11daBaseNpc_c[68]; -extern "C" extern u8 mCcDSph__11daBaseNpc_c[64]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_gra2/executor.cpp b/rel/d/a/obj/d_a_obj_gra2/executor.cpp index f392fbdad33..0afd6702e90 100644 --- a/rel/d/a/obj/d_a_obj_gra2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_gra2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C0FA68[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_gra2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_gra2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6d52b2574be..2c25c52c835 100644 --- a/rel/d/a/obj/d_a_obj_gra2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_gra2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C0FA74[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C0FA74-80C0FA7C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C0FA74[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C10898-80C108A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_gra2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_gra2/unknown_translation_unit_ctors.cpp index e7696d5f8ba..68fb6d0c127 100644 --- a/rel/d/a/obj/d_a_obj_gra2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_gra2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C0FA68[2]; -extern void* const data_80C0FA68[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_gra2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C0FA68-80C0FA70 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C0FA68[2] = { + (void*)__sinit_d_a_obj_gra2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp b/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp index 822084bfd43..7ab0b0d29d7 100644 --- a/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp +++ b/rel/d/a/obj/d_a_obj_graWall/d_a_obj_graWall.cpp @@ -76,7 +76,6 @@ static void daObjGraWall_Execute(daObjGraWall_c*); static bool daObjGraWall_IsDelete(daObjGraWall_c*); static void daObjGraWall_Delete(daObjGraWall_c*); static void daObjGraWall_create(fopAc_ac_c*); -extern "C" extern void* g_profile_GRA_WALL[12]; extern "C" void Create__14daObjGraWall_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -97,15 +96,6 @@ extern "C" extern void* g_profile_GRA_WALL[12]; void fopAcM_delete(fopAc_ac_c*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_delete__FP10fopAc_ac_c(); diff --git a/rel/d/a/obj/d_a_obj_graWall/executor.cpp b/rel/d/a/obj/d_a_obj_graWall/executor.cpp index 8b5654e9836..c8226f59169 100644 --- a/rel/d/a/obj/d_a_obj_graWall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_graWall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C10FA8[4]; -extern u8 const data_80C10FAC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_graWall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_graWall/unknown_translation_unit_ctors.cpp index 56fd02d0c16..59a7d0296b8 100644 --- a/rel/d/a/obj/d_a_obj_graWall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_graWall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C10FA8[4]; -extern u8 const data_80C10FA8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C10FA8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C10FA8-80C10FAC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C10FA8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_graWall/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_graWall/unknown_translation_unit_dtors.cpp index d92cb2c5ae1..3c6f7823b18 100644 --- a/rel/d/a/obj/d_a_obj_graWall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_graWall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C10FAC[4]; -extern u8 const data_80C10FAC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C10FAC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C10FAC-80C10FB0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C10FAC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp b/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp index 9ad7b409e1a..864e97ca2bb 100644 --- a/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp +++ b/rel/d/a/obj/d_a_obj_gra_rock/d_a_obj_gra_rock.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -51,12 +51,12 @@ struct dSv_info_c { /* 80035200 */ void onSwitch(int, int); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -207,7 +207,6 @@ static void daObjGraRock_create(fopAc_ac_c*); static void cLib_calcTimer__template0(s16*); static void cLib_calcTimer__template1(u8*); static void cLib_getRndValue__template0(int, int); -extern "C" extern void* g_profile_Obj_GraRock[12]; extern "C" void setAttnPos__14daObjGraRock_cFv(); extern "C" void setBaseMtx__14daObjGraRock_cFv(); @@ -258,19 +257,6 @@ void daNpcF_onEvtBit(u32); void daNpcF_getDistTableIdx(int, int); void cM_rndF(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_gra_rock/executor.cpp b/rel/d/a/obj/d_a_obj_gra_rock/executor.cpp index 72a48d5f597..7f8b662c22c 100644 --- a/rel/d/a/obj/d_a_obj_gra_rock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_gra_rock/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C123B4[4]; -extern u8 const data_80C123B8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_gra_rock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_gra_rock/unknown_translation_unit_ctors.cpp index 6d47bf3232c..32c3b7909b8 100644 --- a/rel/d/a/obj/d_a_obj_gra_rock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_gra_rock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C123B4[4]; -extern u8 const data_80C123B4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C123B4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C123B4-80C123B8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C123B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_gra_rock/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_gra_rock/unknown_translation_unit_dtors.cpp index 240c1f47a2a..e9092f542f3 100644 --- a/rel/d/a/obj/d_a_obj_gra_rock/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_gra_rock/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C123B8[4]; -extern u8 const data_80C123B8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C123B8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C123B8-80C123BC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C123B8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp index 2e38bb36c0a..fd507458031 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp +++ b/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.cpp @@ -39,12 +39,12 @@ struct daGraveStone_c { /* 80C1311C */ void Delete(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -63,6 +63,11 @@ struct dPa_control_c { }; }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F58 */ void SetWall(f32, f32); +}; + struct csXyz {}; struct cBgS_PolyInfo {}; @@ -72,11 +77,6 @@ struct dBgS { /* 80075100 */ void GetRoomId(cBgS_PolyInfo const&); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F58 */ void SetWall(f32, f32); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -173,8 +173,6 @@ static bool daGraveStone_IsDelete(daGraveStone_c*); static void daGraveStone_Delete(daGraveStone_c*); static void daGraveStone_create(fopAc_ac_c*); static void cLib_calcTimer__template0(s16*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_GraveStone[12]; extern "C" void setBaseMtx__14daGraveStone_cFv(); extern "C" void moveCalc__14daGraveStone_cFv(); @@ -216,18 +214,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void push__14mDoMtx_stack_cFv(); diff --git a/rel/d/a/obj/d_a_obj_grave_stone/executor.cpp b/rel/d/a/obj/d_a_obj_grave_stone/executor.cpp index ec89020489e..4f53d89291d 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/executor.cpp +++ b/rel/d/a/obj/d_a_obj_grave_stone/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C13248[4]; -extern u8 const data_80C1324C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_grave_stone/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_grave_stone/unknown_translation_unit_ctors.cpp index d5c9ce346d0..b4b5f549024 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_grave_stone/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C13248[4]; -extern u8 const data_80C13248[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C13248[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C13248-80C1324C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C13248[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_grave_stone/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_grave_stone/unknown_translation_unit_dtors.cpp index abd3cc316ac..d59cc3ecd44 100644 --- a/rel/d/a/obj/d_a_obj_grave_stone/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_grave_stone/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C1324C[4]; -extern u8 const data_80C1324C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C1324C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C1324C-80C13250 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C1324C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp b/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp index a2700f86382..8681f6a974b 100644 --- a/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp +++ b/rel/d/a/obj/d_a_obj_groundwater/d_a_obj_groundwater.cpp @@ -83,10 +83,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -139,9 +139,6 @@ static void daGrdWater_Draw(daGrdWater_c*); static void daGrdWater_Execute(daGrdWater_c*); static void daGrdWater_Delete(daGrdWater_c*); static void daGrdWater_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_GRDWATER[12]; extern "C" void __ct__16daGrdWater_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -185,13 +182,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void dKy_bg_MAxx_proc(void*); void operator delete(void*); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_groundwater/executor.cpp b/rel/d/a/obj/d_a_obj_groundwater/executor.cpp index e818db3afbe..04320ec1a23 100644 --- a/rel/d/a/obj/d_a_obj_groundwater/executor.cpp +++ b/rel/d/a/obj/d_a_obj_groundwater/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C149CC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_groundwater/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_groundwater/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index bd6dbe9bb77..7f6fd09c0fe 100644 --- a/rel/d/a/obj/d_a_obj_groundwater/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_groundwater/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C149D8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C149D8-80C149E0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C149D8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C14B30-80C14B38 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_groundwater/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_groundwater/unknown_translation_unit_ctors.cpp index 71ea1a7ca8c..34b6daa19ef 100644 --- a/rel/d/a/obj/d_a_obj_groundwater/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_groundwater/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C149CC[2]; -extern void* const data_80C149CC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_groundwater_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C149CC-80C149D4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C149CC[2] = { + (void*)__sinit_d_a_obj_groundwater_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp b/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp index c524b64d95f..390017a0b45 100644 --- a/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp +++ b/rel/d/a/obj/d_a_obj_grz_rock/d_a_obj_grz_rock.cpp @@ -32,12 +32,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -129,8 +129,6 @@ static void daObjGrzRock_Execute(daObjGrzRock_c*); static bool daObjGrzRock_IsDelete(daObjGrzRock_c*); static void daObjGrzRock_Delete(daObjGrzRock_c*); static void daObjGrzRock_create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_GrzRock[12]; extern "C" void setBaseMtx__14daObjGrzRock_cFv(); extern "C" void setEnvTevColor__14daObjGrzRock_cFv(); @@ -166,12 +164,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_grz_rock/executor.cpp b/rel/d/a/obj/d_a_obj_grz_rock/executor.cpp index 19f180b79f7..04a9125fa7f 100644 --- a/rel/d/a/obj/d_a_obj_grz_rock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_grz_rock/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C15358[4]; -extern u8 const data_80C1535C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_grz_rock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_grz_rock/unknown_translation_unit_ctors.cpp index 718175e3125..05d1492d14d 100644 --- a/rel/d/a/obj/d_a_obj_grz_rock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_grz_rock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C15358[4]; -extern u8 const data_80C15358[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C15358[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C15358-80C1535C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C15358[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_grz_rock/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_grz_rock/unknown_translation_unit_dtors.cpp index 165844c01d2..7baf2b78709 100644 --- a/rel/d/a/obj/d_a_obj_grz_rock/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_grz_rock/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C1535C[4]; -extern u8 const data_80C1535C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C1535C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C1535C-80C15360 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C1535C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp b/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp index 2706ada007d..824d29b7eed 100644 --- a/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp +++ b/rel/d/a/obj/d_a_obj_h_saku/d_a_obj_h_saku.cpp @@ -13,15 +13,15 @@ struct request_of_phase_process_class {}; +struct cXyz { + /* 80C157D4 */ ~cXyz(); +}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); /* 8026745C */ void operator+=(csXyz&); }; -struct cXyz { - /* 80C157D4 */ ~cXyz(); -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -146,48 +146,6 @@ static void daObjH_Saku_Execute(daObjH_Saku_c*); static bool daObjH_Saku_IsDelete(daObjH_Saku_c*); static void daObjH_Saku_Delete(daObjH_Saku_c*); static void daObjH_Saku_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_H_Saku[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80C16658[4]; -extern "C" extern u8 data_80C1665C[4]; -extern "C" extern u8 data_80C16660[4]; -extern "C" extern u8 data_80C16664[4]; -extern "C" extern u8 data_80C16668[4]; -extern "C" extern u8 data_80C1666C[4]; -extern "C" extern u8 data_80C16670[4]; -extern "C" extern u8 data_80C16674[4]; -extern "C" extern u8 data_80C16678[4]; -extern "C" extern u8 data_80C1667C[4]; -extern "C" extern u8 data_80C16680[4]; -extern "C" extern u8 data_80C16684[4]; -extern "C" extern u8 data_80C16688[4]; -extern "C" extern u8 data_80C1668C[4]; -extern "C" extern u8 data_80C16690[4]; -extern "C" extern u8 data_80C16694[4]; -extern "C" extern u8 data_80C16698[4]; -extern "C" extern u8 data_80C1669C[4]; -extern "C" extern u8 data_80C166A0[4]; -extern "C" extern u8 data_80C166A4[4]; -extern "C" extern u8 data_80C166A8[4]; -extern "C" extern u8 data_80C166AC[4]; -extern "C" extern u8 data_80C166B0[4]; -extern "C" extern u8 data_80C166B4[4]; -extern "C" extern u8 data_80C166B8[4]; extern "C" void BreakSet__13daObjH_Saku_cFv(); extern "C" void __dt__4cXyzFv(); @@ -269,15 +227,6 @@ void cM_rndF(f32); void cLib_chaseAngleS(s16*, s16, s16); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_h_saku/executor.cpp b/rel/d/a/obj/d_a_obj_h_saku/executor.cpp index e70e1610e3e..76565075ebf 100644 --- a/rel/d/a/obj/d_a_obj_h_saku/executor.cpp +++ b/rel/d/a/obj/d_a_obj_h_saku/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C164B4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_h_saku/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_h_saku/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1c5cd3e5be5..dcf23668e32 100644 --- a/rel/d/a/obj/d_a_obj_h_saku/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_h_saku/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C164C0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C164C0-80C164C8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C164C0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C165E0-80C165E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_h_saku/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_h_saku/unknown_translation_unit_ctors.cpp index 8c1c2457b41..bad0d95fc69 100644 --- a/rel/d/a/obj/d_a_obj_h_saku/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_h_saku/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C164B4[2]; -extern void* const data_80C164B4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_h_saku_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C164B4-80C164BC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C164B4[2] = { + (void*)__sinit_d_a_obj_h_saku_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp b/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp index e92ace0de65..b0cdc7e1002 100644 --- a/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_brl/d_a_obj_hakai_brl.cpp @@ -32,12 +32,12 @@ struct daObjHBarrel_c { /* 80C17090 */ void callEmt(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -144,8 +144,6 @@ static void daObjHBarrel_create(daObjHBarrel_c*); static void daObjHBarrel_Delete(daObjHBarrel_c*); static void daObjHBarrel_execute(daObjHBarrel_c*); static void daObjHBarrel_draw(daObjHBarrel_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_HBarrel[12]; extern "C" static void daObjHBarrel_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__14daObjHBarrel_cFv(); @@ -186,19 +184,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdate__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_hakai_brl/executor.cpp b/rel/d/a/obj/d_a_obj_hakai_brl/executor.cpp index fb7aee07486..bb0d3f7f1dd 100644 --- a/rel/d/a/obj/d_a_obj_hakai_brl/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_brl/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C172F4[4]; -extern u8 const data_80C172F8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hakai_brl/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hakai_brl/unknown_translation_unit_ctors.cpp index 707e1ec4fd0..9c2465b548d 100644 --- a/rel/d/a/obj/d_a_obj_hakai_brl/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_brl/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C172F4[4]; -extern u8 const data_80C172F4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C172F4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C172F4-80C172F8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C172F4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hakai_brl/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_hakai_brl/unknown_translation_unit_dtors.cpp index e3d54d788c7..1f1bcb5c871 100644 --- a/rel/d/a/obj/d_a_obj_hakai_brl/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_brl/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C172F8[4]; -extern u8 const data_80C172F8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C172F8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C172F8-80C172FC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C172F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp b/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp index 8e0a27ca5a5..32cd784fc47 100644 --- a/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_ftr/d_a_obj_hakai_ftr.cpp @@ -32,12 +32,12 @@ struct daObjHFtr_c { /* 80C17EDC */ void callEmt(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -148,7 +148,6 @@ static void daObjHFtr_create(daObjHFtr_c*); static void daObjHFtr_Delete(daObjHFtr_c*); static void daObjHFtr_execute(daObjHFtr_c*); static void daObjHFtr_draw(daObjHFtr_c*); -extern "C" extern void* g_profile_Obj_HFtr[12]; extern "C" static void daObjHFtr_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__11daObjHFtr_cFv(); @@ -189,18 +188,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_hakai_ftr/executor.cpp b/rel/d/a/obj/d_a_obj_hakai_ftr/executor.cpp index 469f1b1289e..3585f87b588 100644 --- a/rel/d/a/obj/d_a_obj_hakai_ftr/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_ftr/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C180B0[4]; -extern u8 const data_80C180B4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hakai_ftr/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hakai_ftr/unknown_translation_unit_ctors.cpp index 4afd328f1c3..feb6718c12c 100644 --- a/rel/d/a/obj/d_a_obj_hakai_ftr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_ftr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C180B0[4]; -extern u8 const data_80C180B0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C180B0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C180B0-80C180B4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C180B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hakai_ftr/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_hakai_ftr/unknown_translation_unit_dtors.cpp index 2c5c6ba54a7..a722a7f6cf3 100644 --- a/rel/d/a/obj/d_a_obj_hakai_ftr/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_hakai_ftr/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C180B4[4]; -extern u8 const data_80C180B4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C180B4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C180B4-80C180B8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C180B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp b/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp index 79351f29b2f..85ace7f5ed2 100644 --- a/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp +++ b/rel/d/a/obj/d_a_obj_hasu2/d_a_obj_hasu2.cpp @@ -34,12 +34,12 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -89,8 +89,6 @@ static void daObjMHasu_create1st(nObjMHasu::daObjMHasu_c*); static void daObjMHasu_MoveBGDelete(nObjMHasu::daObjMHasu_c*); static void daObjMHasu_MoveBGExecute(nObjMHasu::daObjMHasu_c*); static void daObjMHasu_MoveBGDraw(nObjMHasu::daObjMHasu_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_MHasu[12]; extern "C" static void rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" void __ct__Q29nObjMHasu12daObjMHasu_cFv(); @@ -127,14 +125,6 @@ void cM_rnd(); void cM_rndF(f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_hasu2/executor.cpp b/rel/d/a/obj/d_a_obj_hasu2/executor.cpp index 6a6606ee66d..ea56b7c573c 100644 --- a/rel/d/a/obj/d_a_obj_hasu2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hasu2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C18A50[4]; -extern u8 const data_80C18A54[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hasu2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hasu2/unknown_translation_unit_ctors.cpp index 8a9030ba767..ea349a52d65 100644 --- a/rel/d/a/obj/d_a_obj_hasu2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hasu2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C18A50[4]; -extern u8 const data_80C18A50[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C18A50[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C18A50-80C18A54 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C18A50[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hasu2/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_hasu2/unknown_translation_unit_dtors.cpp index 26b2f8a670f..b92081b3688 100644 --- a/rel/d/a/obj/d_a_obj_hasu2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_hasu2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C18A54[4]; -extern u8 const data_80C18A54[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C18A54[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C18A54-80C18A58 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C18A54[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp b/rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp index a2e010903b1..be959b6c8c0 100644 --- a/rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp +++ b/rel/d/a/obj/d_a_obj_hata/d_a_obj_hata.cpp @@ -40,12 +40,12 @@ struct daObjHata_c { /* 80C1919C */ void moveSwing(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -71,8 +71,6 @@ static void daObjHata_create(daObjHata_c*); static void daObjHata_Delete(daObjHata_c*); static void daObjHata_execute(daObjHata_c*); static void daObjHata_draw(daObjHata_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Hata[12]; extern "C" static void daObjHata_c_createHeap__FP10fopAc_ac_c(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -110,13 +108,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_hata/executor.cpp b/rel/d/a/obj/d_a_obj_hata/executor.cpp index 6c09d0b0d64..74824aeef10 100644 --- a/rel/d/a/obj/d_a_obj_hata/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hata/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C19470[4]; -extern u8 const data_80C19474[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hata/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hata/unknown_translation_unit_ctors.cpp index f0c20f7d6e0..11d167206da 100644 --- a/rel/d/a/obj/d_a_obj_hata/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hata/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C19470[4]; -extern u8 const data_80C19470[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C19470[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C19470-80C19474 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C19470[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hata/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_hata/unknown_translation_unit_dtors.cpp index 258ad2375c1..d976ec0ea7a 100644 --- a/rel/d/a/obj/d_a_obj_hata/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_hata/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C19474[4]; -extern u8 const data_80C19474[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C19474[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C19474-80C19478 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C19474[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp b/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp index fa65a6bf97a..ac2746f42e0 100644 --- a/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp +++ b/rel/d/a/obj/d_a_obj_hb/d_a_obj_hb.cpp @@ -32,14 +32,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -188,8 +188,6 @@ static bool daOBJ_HB_IsDelete(obj_hb_class*); static void daOBJ_HB_Delete(obj_hb_class*); static void useHeapInit(fopAc_ac_c*); static void daOBJ_HB_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_HB[12]; extern "C" static void daOBJ_HB_Draw__FP12obj_hb_class(); extern "C" static void obj_hb_carry__FP12obj_hb_class(); @@ -250,21 +248,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80C1B7E0[4]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_hb/executor.cpp b/rel/d/a/obj/d_a_obj_hb/executor.cpp index ca7a6c3749c..7b9eaebc9b7 100644 --- a/rel/d/a/obj/d_a_obj_hb/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hb/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C1B5F8[4]; -extern u8 const data_80C1B5FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_bss.cpp index c64fbc1b8a5..f49a65adc1b 100644 --- a/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C1B7E0[4]; -extern "C" extern u8 data_80C1B7E0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_ctors.cpp index a33be7ebc4a..9860fa170c2 100644 --- a/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C1B5F8[4]; -extern u8 const data_80C1B5F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C1B5F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C1B5F8-80C1B5FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C1B5F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_dtors.cpp index c791a3cc946..6b06e8de746 100644 --- a/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_hb/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C1B5FC[4]; -extern u8 const data_80C1B5FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C1B5FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C1B5FC-80C1B600 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C1B5FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp b/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp index b4745a1cd8a..e241994ed1f 100644 --- a/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp +++ b/rel/d/a/obj/d_a_obj_hbombkoya/d_a_obj_hbombkoya.cpp @@ -39,12 +39,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -153,10 +153,6 @@ static void daObjHBombkoya_create1st(daObjHBombkoya_c*); static void daObjHBombkoya_MoveBGDelete(daObjHBombkoya_c*); static void daObjHBombkoya_MoveBGExecute(daObjHBombkoya_c*); static void daObjHBombkoya_MoveBGDraw(daObjHBombkoya_c*); -extern "C" extern u8 const lit_3759[160]; -extern "C" extern u8 const lit_3763[100]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_HBombkoya[12]; extern "C" void create1st__16daObjHBombkoya_cFv(); extern "C" void CreateHeap__16daObjHBombkoya_cFv(); @@ -196,19 +192,6 @@ void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_hbombkoya/executor.cpp b/rel/d/a/obj/d_a_obj_hbombkoya/executor.cpp index 61b2e7848cc..56a0f6d0112 100644 --- a/rel/d/a/obj/d_a_obj_hbombkoya/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hbombkoya/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C1C5F0[4]; -extern u8 const data_80C1C5F4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hbombkoya/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hbombkoya/unknown_translation_unit_ctors.cpp index 089d4ee8666..96db32726b2 100644 --- a/rel/d/a/obj/d_a_obj_hbombkoya/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hbombkoya/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C1C5F0[4]; -extern u8 const data_80C1C5F0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C1C5F0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C1C5F0-80C1C5F4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C1C5F0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hbombkoya/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_hbombkoya/unknown_translation_unit_dtors.cpp index e8f2e00c712..4da6df40307 100644 --- a/rel/d/a/obj/d_a_obj_hbombkoya/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_hbombkoya/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C1C5F4[4]; -extern u8 const data_80C1C5F4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C1C5F4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C1C5F4-80C1C5F8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C1C5F4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp b/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp index deaa0d3eb84..f4b2aadeb10 100644 --- a/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp +++ b/rel/d/a/obj/d_a_obj_heavySw/d_a_obj_heavySw.cpp @@ -142,9 +142,6 @@ static void daHeavySw_Draw(daHeavySw_c*); static void daHeavySw_Execute(daHeavySw_c*); static void daHeavySw_Delete(daHeavySw_c*); static void daHeavySw_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_HeavySw[12]; extern "C" void __ct__15daHeavySw_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -198,15 +195,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalc0(f32*, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_heavySw/executor.cpp b/rel/d/a/obj/d_a_obj_heavySw/executor.cpp index d9107325dc6..9b6a1f07063 100644 --- a/rel/d/a/obj/d_a_obj_heavySw/executor.cpp +++ b/rel/d/a/obj/d_a_obj_heavySw/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C1DA80[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_heavySw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_heavySw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b34624fa0b9..d545a3bc694 100644 --- a/rel/d/a/obj/d_a_obj_heavySw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_heavySw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C1DA8C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C1DA8C-80C1DA94 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C1DA8C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C1DC40-80C1DC48 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_heavySw/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_heavySw/unknown_translation_unit_ctors.cpp index cf7c2fad6d6..9b4e6a8d217 100644 --- a/rel/d/a/obj/d_a_obj_heavySw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_heavySw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C1DA80[2]; -extern void* const data_80C1DA80[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_heavySw_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C1DA80-80C1DA88 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C1DA80[2] = { + (void*)__sinit_d_a_obj_heavySw_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp b/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp index cdb6dc58977..13c720de3bd 100644 --- a/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp +++ b/rel/d/a/obj/d_a_obj_hfuta/d_a_obj_hfuta.cpp @@ -38,12 +38,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -87,49 +87,6 @@ static void daObjFuta_create1st(daObjFuta_c*); static void daObjFuta_MoveBGDelete(daObjFuta_c*); static void daObjFuta_MoveBGExecute(daObjFuta_c*); static void daObjFuta_MoveBGDraw(daObjFuta_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Hfuta[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80C1F2DC[4]; -extern "C" extern u8 data_80C1F2E0[4]; -extern "C" extern u8 data_80C1F2E4[4]; -extern "C" extern u8 data_80C1F2E8[4]; -extern "C" extern u8 data_80C1F2EC[4]; -extern "C" extern u8 data_80C1F2F0[4]; -extern "C" extern u8 data_80C1F2F4[4]; -extern "C" extern u8 data_80C1F2F8[4]; -extern "C" extern u8 data_80C1F2FC[4]; -extern "C" extern u8 data_80C1F300[4]; -extern "C" extern u8 data_80C1F304[4]; -extern "C" extern u8 data_80C1F308[4]; -extern "C" extern u8 data_80C1F30C[4]; -extern "C" extern u8 data_80C1F310[4]; -extern "C" extern u8 data_80C1F314[4]; -extern "C" extern u8 data_80C1F318[4]; -extern "C" extern u8 data_80C1F31C[4]; -extern "C" extern u8 data_80C1F320[4]; -extern "C" extern u8 data_80C1F324[4]; -extern "C" extern u8 data_80C1F328[4]; -extern "C" extern u8 data_80C1F32C[4]; -extern "C" extern u8 data_80C1F330[4]; -extern "C" extern u8 data_80C1F334[4]; -extern "C" extern u8 data_80C1F338[4]; -extern "C" extern u8 data_80C1F33C[4]; extern "C" void initBaseMtx__11daObjFuta_cFv(); extern "C" void setBaseMtx__11daObjFuta_cFv(); @@ -206,16 +163,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 Zero__5csXyz[4]; -extern "C" extern u8 data_80451164[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_hfuta/executor.cpp b/rel/d/a/obj/d_a_obj_hfuta/executor.cpp index f03f7b33f8d..55ddb730a58 100644 --- a/rel/d/a/obj/d_a_obj_hfuta/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hfuta/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C1EE68[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hfuta/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_hfuta/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a36b2876dc7..246f3ad157f 100644 --- a/rel/d/a/obj/d_a_obj_hfuta/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_hfuta/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C1EE70[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C1EE70-80C1EE78 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C1EE70[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C1EF88-80C1EF90 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_hfuta/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hfuta/unknown_translation_unit_ctors.cpp index 1691e17195a..48685e978d1 100644 --- a/rel/d/a/obj/d_a_obj_hfuta/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hfuta/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C1EE68[4]; -extern u8 const data_80C1EE68[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C1EE68[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C1EE68-80C1EE6C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C1EE68[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp b/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp index 2ec3e2f3e23..669fb279415 100644 --- a/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp +++ b/rel/d/a/obj/d_a_obj_hhashi/d_a_obj_hhashi.cpp @@ -13,17 +13,17 @@ struct request_of_phase_process_class {}; +struct cXyz { + /* 8057FD30 */ ~cXyz(); + /* 805811C0 */ cXyz(); +}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); /* 805811BC */ csXyz(); /* 8057FD6C */ ~csXyz(); }; -struct cXyz { - /* 8057FD30 */ ~cXyz(); - /* 805811C0 */ cXyz(); -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -191,8 +191,6 @@ static void daObjHHASHI_Delete(daObjHHASHI_c*); static void daObjHHASHI_Draw(daObjHHASHI_c*); static void daObjHHASHI_Execute(daObjHHASHI_c*); static bool daObjHHASHI_IsDelete(daObjHHASHI_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_HHASHI[12]; extern "C" void initCcCylinder__13daObjHHASHI_cFv(); extern "C" void setCcCylinder__13daObjHHASHI_cFv(); @@ -246,20 +244,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_targetAngleY(Vec const*, Vec const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_hhashi/executor.cpp b/rel/d/a/obj/d_a_obj_hhashi/executor.cpp index 16d3a15a468..d0354d00819 100644 --- a/rel/d/a/obj/d_a_obj_hhashi/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hhashi/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805814A4[4]; -extern u8 const data_805814A8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hhashi/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hhashi/unknown_translation_unit_ctors.cpp index f66ab81563c..38f7c8e6822 100644 --- a/rel/d/a/obj/d_a_obj_hhashi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hhashi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805814A4[4]; -extern u8 const data_805814A4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805814A4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805814A4-805814A8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805814A4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hhashi/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_hhashi/unknown_translation_unit_dtors.cpp index b62c542edfc..dc2193a5e9a 100644 --- a/rel/d/a/obj/d_a_obj_hhashi/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_hhashi/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805814A8[4]; -extern u8 const data_805814A8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805814A8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805814A8-805814AC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805814A8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp index dfc70728a73..29e830da495 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.cpp @@ -33,12 +33,12 @@ struct daHsTarget_HIO_c { /* 80C1F7F4 */ ~daHsTarget_HIO_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -80,7 +80,6 @@ static void daHsTarget_Draw(daHsTarget_c*); static void daHsTarget_Execute(daHsTarget_c*); static void daHsTarget_Delete(daHsTarget_c*); static void daHsTarget_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_HsTarget[12]; extern "C" void __ct__16daHsTarget_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -110,11 +109,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_hsTarget/executor.cpp b/rel/d/a/obj/d_a_obj_hsTarget/executor.cpp index 15689e36194..0aa58452f7c 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/executor.cpp +++ b/rel/d/a/obj/d_a_obj_hsTarget/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C1F88C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_hsTarget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_hsTarget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a5ac2a05c62..c886f60dcdf 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_hsTarget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C1F898[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C1F898-80C1F8A0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C1F898[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C1F958-80C1F960 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_hsTarget/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_hsTarget/unknown_translation_unit_ctors.cpp index ab794a3281a..bae8e21818d 100644 --- a/rel/d/a/obj/d_a_obj_hsTarget/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_hsTarget/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C1F88C[2]; -extern void* const data_80C1F88C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_hsTarget_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C1F88C-80C1F894 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C1F88C[2] = { + (void*)__sinit_d_a_obj_hsTarget_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp b/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp index c56f1ab1e47..330afca5b0b 100644 --- a/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp +++ b/rel/d/a/obj/d_a_obj_ice_l/d_a_obj_ice_l.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -98,8 +98,6 @@ static void daObjIce_l_Execute(daObjIce_l_c*); static bool daObjIce_l_IsDelete(daObjIce_l_c*); static void daObjIce_l_Delete(daObjIce_l_c*); static void daObjIce_l_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Ice_l[12]; extern "C" void RideOn_Angle__12daObjIce_l_cFRsfsf(); extern "C" void Check_RideOn__12daObjIce_l_cF4cXyz(); @@ -136,16 +134,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_ice_l/executor.cpp b/rel/d/a/obj/d_a_obj_ice_l/executor.cpp index 6d2cf6c3756..f9a153d6ca0 100644 --- a/rel/d/a/obj/d_a_obj_ice_l/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ice_l/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C20784[4]; -extern u8 const data_80C20788[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ice_l/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ice_l/unknown_translation_unit_ctors.cpp index 06d71bc4c0c..6fc0bee3df7 100644 --- a/rel/d/a/obj/d_a_obj_ice_l/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ice_l/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C20784[4]; -extern u8 const data_80C20784[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C20784[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C20784-80C20788 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C20784[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ice_l/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ice_l/unknown_translation_unit_dtors.cpp index c4580bd4c8c..b568d6fb848 100644 --- a/rel/d/a/obj/d_a_obj_ice_l/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ice_l/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C20788[4]; -extern u8 const data_80C20788[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C20788[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C20788-80C2078C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C20788[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp b/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp index 5bd5e2a6ef9..12efd3a829f 100644 --- a/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp +++ b/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -103,8 +103,6 @@ static void daObjIce_s_Execute(daObjIce_s_c*); static bool daObjIce_s_IsDelete(daObjIce_s_c*); static void daObjIce_s_Delete(daObjIce_s_c*); static void daObjIce_s_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Ice_s[12]; extern "C" void __ct__17daOBJ_ICE_S_HIO_cFv(); extern "C" void RideOn_Angle__12daObjIce_s_cFRsfsf(); @@ -149,16 +147,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_ice_s/executor.cpp b/rel/d/a/obj/d_a_obj_ice_s/executor.cpp index 6a766a64e6a..b4eda785b31 100644 --- a/rel/d/a/obj/d_a_obj_ice_s/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ice_s/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C21AE4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ice_s/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_ice_s/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5c66a9cbe32..9771de04f19 100644 --- a/rel/d/a/obj/d_a_obj_ice_s/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_ice_s/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C21AF0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C21AF0-80C21AF8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C21AF0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C21C30-80C21C38 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_ice_s/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ice_s/unknown_translation_unit_ctors.cpp index 52001c09160..0e6c738a1c5 100644 --- a/rel/d/a/obj/d_a_obj_ice_s/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ice_s/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C21AE4[2]; -extern void* const data_80C21AE4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ice_s_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C21AE4-80C21AEC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C21AE4[2] = { + (void*)__sinit_d_a_obj_ice_s_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp index 62837a85da9..0a9130ab64c 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp @@ -274,9 +274,6 @@ static void daObjIceBlk_create1st(daObjIceBlk_c*); static void daObjIceBlk_MoveBGDelete(daObjIceBlk_c*); static void daObjIceBlk_MoveBGExecute(daObjIceBlk_c*); static void daObjIceBlk_MoveBGDraw(daObjIceBlk_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_IceBlock[12]; extern "C" void PPCallBack__13daObjIceBlk_cFP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); @@ -357,21 +354,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 BaseZ__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80C24698[4]; extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_iceblock/executor.cpp b/rel/d/a/obj/d_a_obj_iceblock/executor.cpp index 8adb957c382..6b1863daf8b 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C242EC[4]; -extern u8 const data_80C242F0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp index b39fd2ee39f..4fc7d970aed 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80C24698[4]; -extern "C" extern u8 struct_80C24698[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_ctors.cpp index ded358e7718..dd3b1e54ddb 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C242EC[4]; -extern u8 const data_80C242EC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C242EC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C242EC-80C242F0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C242EC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_dtors.cpp index 07babe8dceb..f604cc50b84 100644 --- a/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C242F0[4]; -extern u8 const data_80C242F0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C242F0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C242F0-80C242F4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C242F0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp b/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp index ed8058d94a2..c7f09899c7b 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp +++ b/rel/d/a/obj/d_a_obj_iceleaf/d_a_obj_iceleaf.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -90,12 +90,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct _GXColor {}; - struct cBgS_PolyInfo { /* 802680B0 */ ~cBgS_PolyInfo(); }; +struct _GXColor {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -203,9 +203,6 @@ static void daObjIceLeaf_Draw(daObjIceLeaf_c*); static void daObjIceLeaf_Execute(daObjIceLeaf_c*); static void daObjIceLeaf_Delete(daObjIceLeaf_c*); static void daObjIceLeaf_Create(daObjIceLeaf_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_IceLeaf[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void initBaseMtx__14daObjIceLeaf_cFv(); @@ -262,21 +259,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cM_atan2s(f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80C25F98[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_iceleaf/executor.cpp b/rel/d/a/obj/d_a_obj_iceleaf/executor.cpp index 2690de0d1c7..311e200a203 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/executor.cpp +++ b/rel/d/a/obj/d_a_obj_iceleaf/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C25D5C[4]; -extern u8 const data_80C25D60[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_bss.cpp index 817b1ad5430..10a9c41aa7d 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80C25F98[4]; -extern "C" extern u8 struct_80C25F98[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_ctors.cpp index ca2bd8f1c82..48a3cdea259 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C25D5C[4]; -extern u8 const data_80C25D5C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C25D5C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C25D5C-80C25D60 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C25D5C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_dtors.cpp index 146b2df9e03..90a60ffc594 100644 --- a/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_iceleaf/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C25D60[4]; -extern u8 const data_80C25D60[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C25D60[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C25D60-80C25D64 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C25D60[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp b/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp index e1b5023436d..6588617ee2b 100644 --- a/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp +++ b/rel/d/a/obj/d_a_obj_ihasi/d_a_obj_ihasi.cpp @@ -41,12 +41,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -103,8 +103,6 @@ static bool daObj_Ihasi_IsDelete(obj_ihasi_class*); static void daObj_Ihasi_Delete(obj_ihasi_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Ihasi_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_IHASI[12]; extern "C" static void daObj_Ihasi_Draw__FP15obj_ihasi_class(); extern "C" static void ih_normal__FP15obj_ihasi_class(); @@ -133,13 +131,6 @@ void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs void cM_rndF(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void transM__14mDoMtx_stack_cFfff(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_ihasi/executor.cpp b/rel/d/a/obj/d_a_obj_ihasi/executor.cpp index af3d8eae8e5..a90ffcfeed4 100644 --- a/rel/d/a/obj/d_a_obj_ihasi/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ihasi/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C26880[4]; -extern u8 const data_80C26884[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ihasi/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ihasi/unknown_translation_unit_ctors.cpp index 59093fc3a95..f80e55ae350 100644 --- a/rel/d/a/obj/d_a_obj_ihasi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ihasi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C26880[4]; -extern u8 const data_80C26880[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C26880[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C26880-80C26884 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C26880[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ihasi/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ihasi/unknown_translation_unit_dtors.cpp index d8706f774ba..11f5dbd41cd 100644 --- a/rel/d/a/obj/d_a_obj_ihasi/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ihasi/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C26884[4]; -extern u8 const data_80C26884[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C26884[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C26884-80C26888 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C26884[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp b/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp index 157075e38ce..a0016fcd9be 100644 --- a/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp +++ b/rel/d/a/obj/d_a_obj_ikada/d_a_obj_ikada.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -113,8 +113,6 @@ static void daObjIkada_Execute(daObjIkada_c*); static bool daObjIkada_IsDelete(daObjIkada_c*); static void daObjIkada_Delete(daObjIkada_c*); static void daObjIkada_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Ikada[12]; extern "C" void RideOn_Angle__12daObjIkada_cFRsfsf(); extern "C" void Check_RideOn__12daObjIkada_cFv(); @@ -153,17 +151,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_ikada/executor.cpp b/rel/d/a/obj/d_a_obj_ikada/executor.cpp index ed4b8c390df..f70f701f853 100644 --- a/rel/d/a/obj/d_a_obj_ikada/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ikada/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C274E8[4]; -extern u8 const data_80C274EC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ikada/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ikada/unknown_translation_unit_ctors.cpp index 5021452607c..fdb17823276 100644 --- a/rel/d/a/obj/d_a_obj_ikada/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ikada/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C274E8[4]; -extern u8 const data_80C274E8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C274E8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C274E8-80C274EC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C274E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ikada/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ikada/unknown_translation_unit_dtors.cpp index fc8c6b6c5b6..9e4a6c78612 100644 --- a/rel/d/a/obj/d_a_obj_ikada/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ikada/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C274EC[4]; -extern u8 const data_80C274EC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C274EC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C274EC-80C274F0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C274EC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp b/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp index efa0a20720b..22749277511 100644 --- a/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp +++ b/rel/d/a/obj/d_a_obj_inobone/d_a_obj_inobone.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -141,7 +141,6 @@ static void daObjIBone_Draw(daObjIBone_c*); static void daObjIBone_Execute(daObjIBone_c*); static void daObjIBone_Delete(daObjIBone_c*); static void daObjIBone_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_InoBone[12]; extern "C" static void bornTgCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(); extern "C" static void bornCoCallBack__FP10fopAc_ac_cP12dCcD_GObjInfP10fopAc_ac_cP12dCcD_GObjInf(); @@ -182,18 +181,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_inobone/executor.cpp b/rel/d/a/obj/d_a_obj_inobone/executor.cpp index 46007b7fe0f..30df8751915 100644 --- a/rel/d/a/obj/d_a_obj_inobone/executor.cpp +++ b/rel/d/a/obj/d_a_obj_inobone/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C28118[4]; -extern u8 const data_80C2811C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_inobone/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_inobone/unknown_translation_unit_ctors.cpp index 558506baf7b..93cf11e6653 100644 --- a/rel/d/a/obj/d_a_obj_inobone/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_inobone/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C28118[4]; -extern u8 const data_80C28118[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C28118[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C28118-80C2811C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C28118[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_inobone/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_inobone/unknown_translation_unit_dtors.cpp index e3c645493ef..55703c8bd0d 100644 --- a/rel/d/a/obj/d_a_obj_inobone/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_inobone/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C2811C[4]; -extern u8 const data_80C2811C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C2811C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C2811C-80C28120 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C2811C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp b/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp index f8abf6ad344..b051e31e3f3 100644 --- a/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp +++ b/rel/d/a/obj/d_a_obj_ita/d_a_obj_ita.cpp @@ -147,8 +147,6 @@ static void daObjIta_Execute(daObjIta_c*); static bool daObjIta_IsDelete(daObjIta_c*); static void daObjIta_Delete(daObjIta_c*); static void daObjIta_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_ITA[12]; extern "C" void __ct__15daObj_ITA_HIO_cFv(); extern "C" void Search_Ymb__10daObjIta_cFv(); @@ -197,17 +195,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_ita/executor.cpp b/rel/d/a/obj/d_a_obj_ita/executor.cpp index b0599e55513..f57c179204b 100644 --- a/rel/d/a/obj/d_a_obj_ita/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ita/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C29224[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ita/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_ita/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8a3b8430404..812896be4d9 100644 --- a/rel/d/a/obj/d_a_obj_ita/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_ita/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C29230[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C29230-80C29238 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C29230[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C293C8-80C293D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_ita/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ita/unknown_translation_unit_ctors.cpp index 7924d17634e..a5f8e88a82b 100644 --- a/rel/d/a/obj/d_a_obj_ita/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ita/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C29224[2]; -extern void* const data_80C29224[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ita_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C29224-80C2922C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C29224[2] = { + (void*)__sinit_d_a_obj_ita_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp b/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp index 88f03b359d0..3eb38307ff4 100644 --- a/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp +++ b/rel/d/a/obj/d_a_obj_itamato/d_a_obj_itamato.cpp @@ -13,13 +13,13 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 80C296E0 */ ~csXyz(); /* 80C29AC0 */ csXyz(); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -214,8 +214,6 @@ static void daObj_ItaMato_Delete(void*); static void daObj_ItaMato_Execute(void*); static void daObj_ItaMato_Draw(void*); static bool daObj_ItaMato_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_ITAMATO[12]; extern "C" void __dt__15daObj_ItaMato_cFv(); extern "C" void __dt__5csXyzFv(); @@ -275,20 +273,6 @@ void daNpcT_offTmpBit(u32); void daNpcT_chkTmpBit(u32); void cLib_addCalc2(f32*, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_itamato/executor.cpp b/rel/d/a/obj/d_a_obj_itamato/executor.cpp index 826d71ab140..24827eb2d56 100644 --- a/rel/d/a/obj/d_a_obj_itamato/executor.cpp +++ b/rel/d/a/obj/d_a_obj_itamato/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C2AB5C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_itamato/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_itamato/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 868eaa6d7e4..abf6a34d654 100644 --- a/rel/d/a/obj/d_a_obj_itamato/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_itamato/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C2AB68[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C2AB68-80C2AB70 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C2AB68[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C2AD50-80C2AD58 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_itamato/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_itamato/unknown_translation_unit_ctors.cpp index 5fd123cb2eb..350f04cceec 100644 --- a/rel/d/a/obj/d_a_obj_itamato/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_itamato/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C2AB5C[2]; -extern void* const data_80C2AB5C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_itamato_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C2AB5C-80C2AB64 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C2AB5C[2] = { + (void*)__sinit_d_a_obj_itamato_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp b/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp index 82b5b6696b6..428b273ffa6 100644 --- a/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp +++ b/rel/d/a/obj/d_a_obj_ito/d_a_obj_ito.cpp @@ -27,10 +27,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -51,8 +51,6 @@ struct daObj_Ito_HIO_c { /* 8047D778 */ ~daObj_Ito_HIO_c(); }; -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -63,6 +61,8 @@ struct cXyz { /* 8047D594 */ cXyz(); }; +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -180,8 +180,6 @@ static bool daObj_Ito_IsDelete(obj_ito_class*); static void daObj_Ito_Delete(obj_ito_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Ito_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_ITO[12]; extern "C" void __ct__15daObj_Ito_HIO_cFv(); extern "C" static void daObj_Ito_Draw__FP13obj_ito_class(); @@ -236,21 +234,6 @@ void MtxPosition(cXyz*, cXyz*); void MtxPush(); void MtxPull(); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_ito/executor.cpp b/rel/d/a/obj/d_a_obj_ito/executor.cpp index 8b61c726a71..c4be164e8ff 100644 --- a/rel/d/a/obj/d_a_obj_ito/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ito/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8047D7FC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ito/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_ito/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 798e10864ec..1398d2be1eb 100644 --- a/rel/d/a/obj/d_a_obj_ito/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_ito/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8047D808[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8047D808-8047D810 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8047D808[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8047D9C0-8047D9C8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_ito/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ito/unknown_translation_unit_ctors.cpp index f67b0e87aaa..84cbe2f0ad1 100644 --- a/rel/d/a/obj/d_a_obj_ito/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ito/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8047D7FC[2]; -extern void* const data_8047D7FC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ito_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8047D7FC-8047D804 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8047D7FC[2] = { + (void*)__sinit_d_a_obj_ito_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp index 9f935e34b78..f89af1f35d0 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp +++ b/rel/d/a/obj/d_a_obj_kabuto/d_a_obj_kabuto.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -50,16 +50,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -247,11 +247,6 @@ static void daObjKABUTO_Delete(daObjKABUTO_c*); static void daObjKABUTO_Draw(daObjKABUTO_c*); static void daObjKABUTO_Execute(daObjKABUTO_c*); static bool daObjKABUTO_IsDelete(daObjKABUTO_c*); -extern "C" extern u32 const lit_4473; -extern "C" extern u32 const lit_4474; -extern "C" extern u32 const lit_4496; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Kabuto[12]; extern "C" void __ct__14daObj_KabHIO_cFv(); extern "C" void InitCcSph__13daObjKABUTO_cFv(); @@ -322,19 +317,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_kabuto/executor.cpp b/rel/d/a/obj/d_a_obj_kabuto/executor.cpp index 36b91d6260b..f704a13b914 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kabuto/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C2E0FC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kabuto/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kabuto/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d7af43df73b..5188acc4807 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kabuto/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C2E108[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C2E108-80C2E110 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C2E108[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C2E2E8-80C2E2F0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kabuto/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kabuto/unknown_translation_unit_ctors.cpp index 17afe039954..b8aaea39367 100644 --- a/rel/d/a/obj/d_a_obj_kabuto/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kabuto/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C2E0FC[2]; -extern void* const data_80C2E0FC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kabuto_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C2E0FC-80C2E104 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C2E0FC[2] = { + (void*)__sinit_d_a_obj_kabuto_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp b/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp index 13f5d2c4ca4..5f3110025e3 100644 --- a/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp +++ b/rel/d/a/obj/d_a_obj_kag/d_a_obj_kag.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF0C */ void ZXYrotS(csXyz const&); @@ -45,12 +45,6 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Vec {}; struct Z2Creature { @@ -58,6 +52,12 @@ struct Z2Creature { /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -236,10 +236,6 @@ static void daObjKAG_Delete(daObjKAG_c*); static void daObjKAG_Draw(daObjKAG_c*); static void daObjKAG_Execute(daObjKAG_c*); static bool daObjKAG_IsDelete(daObjKAG_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Kag[12]; -extern "C" extern void* __vt__9dInsect_c[3]; extern "C" void __ct__14daObj_KagHIO_cFv(); extern "C" void setAction__10daObjKAG_cFM10daObjKAG_cFPCvPv_v(); @@ -303,20 +299,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_kag/executor.cpp b/rel/d/a/obj/d_a_obj_kag/executor.cpp index 43fd0050dfe..28496fbc10e 100644 --- a/rel/d/a/obj/d_a_obj_kag/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kag/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C31138[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2006ac24e3d..fe27cffa29c 100644 --- a/rel/d/a/obj/d_a_obj_kag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C31144[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C31144-80C3114C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C31144[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C31428-80C31430 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kag/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kag/unknown_translation_unit_ctors.cpp index ea32548c935..4770705429f 100644 --- a/rel/d/a/obj/d_a_obj_kag/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kag/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C31138[2]; -extern void* const data_80C31138[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kag_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C31138-80C31140 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C31138[2] = { + (void*)__sinit_d_a_obj_kag_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp b/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp index 5541bbc7667..12d596889c5 100644 --- a/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp +++ b/rel/d/a/obj/d_a_obj_kage/d_a_obj_kage.cpp @@ -23,12 +23,12 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -58,8 +58,6 @@ static bool daObj_Kage_IsDelete(obj_kage_class*); static void daObj_Kage_Delete(obj_kage_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Kage_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_KAGE[12]; extern "C" static void daObj_Kage_Draw__FP14obj_kage_class(); extern "C" static void daObj_Kage_Execute__FP14obj_kage_class(); @@ -89,12 +87,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cM_rndF(f32); void cLib_addCalc2(f32*, f32, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kage/executor.cpp b/rel/d/a/obj/d_a_obj_kage/executor.cpp index dee5d5cc8fe..ff36a84d501 100644 --- a/rel/d/a/obj/d_a_obj_kage/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kage/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C31954[4]; -extern u8 const data_80C31958[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kage/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kage/unknown_translation_unit_ctors.cpp index 68beaca2fd9..ffdcc77e710 100644 --- a/rel/d/a/obj/d_a_obj_kage/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kage/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C31954[4]; -extern u8 const data_80C31954[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C31954[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C31954-80C31958 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C31954[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kage/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kage/unknown_translation_unit_dtors.cpp index f2b2d146acc..207d4d514ec 100644 --- a/rel/d/a/obj/d_a_obj_kage/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kage/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C31958[4]; -extern u8 const data_80C31958[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C31958[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C31958-80C3195C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C31958[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp b/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp index f43e161e304..b2ef30b5752 100644 --- a/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp +++ b/rel/d/a/obj/d_a_obj_kago/d_a_obj_kago.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,6 +21,8 @@ struct cXyz { /* 80C32324 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -203,49 +203,6 @@ static void daObj_Kago_Execute(void*); static void daObj_Kago_Draw(void*); static bool daObj_Kago_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u8 const l_ccDObjData[48]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_KAGO[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80C33F70[4]; -extern "C" extern u8 data_80C33F74[4]; -extern "C" extern u8 data_80C33F78[4]; -extern "C" extern u8 data_80C33F7C[4]; -extern "C" extern u8 data_80C33F80[4]; -extern "C" extern u8 data_80C33F84[4]; -extern "C" extern u8 data_80C33F88[4]; -extern "C" extern u8 data_80C33F8C[4]; -extern "C" extern u8 data_80C33F90[4]; -extern "C" extern u8 data_80C33F94[4]; -extern "C" extern u8 data_80C33F98[4]; -extern "C" extern u8 data_80C33F9C[4]; -extern "C" extern u8 data_80C33FA0[4]; -extern "C" extern u8 data_80C33FA4[4]; -extern "C" extern u8 data_80C33FA8[4]; -extern "C" extern u8 data_80C33FAC[4]; -extern "C" extern u8 data_80C33FB0[4]; -extern "C" extern u8 data_80C33FB4[4]; -extern "C" extern u8 data_80C33FB8[4]; -extern "C" extern u8 data_80C33FBC[4]; -extern "C" extern u8 data_80C33FC0[4]; -extern "C" extern u8 data_80C33FC4[4]; -extern "C" extern u8 data_80C33FC8[4]; -extern "C" extern u8 data_80C33FCC[4]; -extern "C" extern u8 data_80C33FD0[4]; extern "C" void __dt__12daObj_Kago_cFv(); extern "C" void __dt__8dCcD_CylFv(); @@ -363,20 +320,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kago/executor.cpp b/rel/d/a/obj/d_a_obj_kago/executor.cpp index c96036db45b..6b19f9bd9c5 100644 --- a/rel/d/a/obj/d_a_obj_kago/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kago/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C33C6C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kago/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kago/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 33a90baa8ec..baa219f5d3c 100644 --- a/rel/d/a/obj/d_a_obj_kago/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kago/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C33C78[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C33C78-80C33C80 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C33C78[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C33EF8-80C33F00 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kago/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kago/unknown_translation_unit_ctors.cpp index 93ab6f1a499..5897442213b 100644 --- a/rel/d/a/obj/d_a_obj_kago/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kago/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C33C6C[2]; -extern void* const data_80C33C6C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kago_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C33C6C-80C33C74 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C33C6C[2] = { + (void*)__sinit_d_a_obj_kago_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp b/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp index 1d2655e17c7..afe42a2cc55 100644 --- a/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp +++ b/rel/d/a/obj/d_a_obj_kaisou/d_a_obj_kaisou.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -31,10 +31,10 @@ struct fopAcM_gc_c { /* 8001DCBC */ void gndCheck(cXyz const*); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daObjKaisou_c { /* 80C34058 */ void ctrlJoint(J3DJoint*, J3DModel*); /* 80C34390 */ void initCcCylinder(); @@ -120,8 +120,6 @@ static void daObjKaisou_Delete(daObjKaisou_c*); static void daObjKaisou_Draw(daObjKaisou_c*); static void daObjKaisou_Execute(daObjKaisou_c*); static bool daObjKaisou_IsDelete(daObjKaisou_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Kaisou[12]; extern "C" void ctrlJoint__13daObjKaisou_cFP8J3DJointP8J3DModel(); extern "C" static void JointCallBack__FP8J3DJointi(); @@ -159,21 +157,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kaisou/executor.cpp b/rel/d/a/obj/d_a_obj_kaisou/executor.cpp index 782e4c49766..8f93032b8da 100644 --- a/rel/d/a/obj/d_a_obj_kaisou/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kaisou/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C34EE4[4]; -extern u8 const data_80C34EE8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kaisou/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kaisou/unknown_translation_unit_ctors.cpp index e3d50c58a48..3eef9f0b048 100644 --- a/rel/d/a/obj/d_a_obj_kaisou/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kaisou/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C34EE4[4]; -extern u8 const data_80C34EE4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C34EE4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C34EE4-80C34EE8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C34EE4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kaisou/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kaisou/unknown_translation_unit_dtors.cpp index bb9f637da4f..dfce206e785 100644 --- a/rel/d/a/obj/d_a_obj_kaisou/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kaisou/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C34EE8[4]; -extern u8 const data_80C34EE8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C34EE8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C34EE8-80C34EEC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C34EE8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp b/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp index ef6fe9e46e3..bd299f75f0b 100644 --- a/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp +++ b/rel/d/a/obj/d_a_obj_kamakiri/d_a_obj_kamakiri.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -50,16 +50,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -252,9 +252,6 @@ static void daObjKAM_Delete(daObjKAM_c*); static void daObjKAM_Draw(daObjKAM_c*); static void daObjKAM_Execute(daObjKAM_c*); static bool daObjKAM_IsDelete(daObjKAM_c*); -extern "C" extern u32 const lit_4437; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Kam[12]; extern "C" void __ct__14daObj_KamHIO_cFv(); extern "C" void InitCcSph__10daObjKAM_cFv(); @@ -323,19 +320,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_kamakiri/executor.cpp b/rel/d/a/obj/d_a_obj_kamakiri/executor.cpp index 52732f2b419..58e4ad640c5 100644 --- a/rel/d/a/obj/d_a_obj_kamakiri/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kamakiri/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C383F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kamakiri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kamakiri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index cae8ded3397..c46c07df165 100644 --- a/rel/d/a/obj/d_a_obj_kamakiri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kamakiri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C38400[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C38400-80C38408 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C38400[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C385C8-80C385D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kamakiri/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kamakiri/unknown_translation_unit_ctors.cpp index d99f3a32e24..d922fe4ced5 100644 --- a/rel/d/a/obj/d_a_obj_kamakiri/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kamakiri/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C383F4[2]; -extern void* const data_80C383F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kamakiri_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C383F4-80C383FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C383F4[2] = { + (void*)__sinit_d_a_obj_kamakiri_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp b/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp index eaff7222ecb..9b96fd79d6f 100644 --- a/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp +++ b/rel/d/a/obj/d_a_obj_kanban2/d_a_obj_kanban2.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -24,6 +20,10 @@ struct cXyz { /* 805818DC */ ~cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -242,55 +242,6 @@ static bool daObj_Kanban2_IsDelete(daObj_Kanban2_c*); static void daObj_Kanban2_Delete(daObj_Kanban2_c*); static void useHeapInit(fopAc_ac_c*); static void daObj_Kanban2_Create(daObj_Kanban2_c*); -extern "C" extern u32 const lit_4285; -extern "C" extern u32 const lit_4330; -extern "C" extern u32 const lit_4331; -extern "C" extern u32 const lit_4924; -extern "C" extern u32 const lit_4926; -extern "C" extern u32 const lit_4927; -extern "C" extern u32 const lit_4928; -extern "C" extern u32 const lit_4930; -extern "C" extern u32 const lit_4931; -extern "C" extern void* g_profile_OBJ_KANBAN2[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80585CEC[4]; -extern "C" extern u8 data_80585CF0[4]; -extern "C" extern u8 data_80585CF4[4]; -extern "C" extern u8 data_80585CF8[4]; -extern "C" extern u8 data_80585CFC[4]; -extern "C" extern u8 data_80585D00[4]; -extern "C" extern u8 data_80585D04[4]; -extern "C" extern u8 data_80585D08[4]; -extern "C" extern u8 data_80585D0C[4]; -extern "C" extern u8 data_80585D10[4]; -extern "C" extern u8 data_80585D14[4]; -extern "C" extern u8 data_80585D18[4]; -extern "C" extern u8 data_80585D1C[4]; -extern "C" extern u8 data_80585D20[4]; -extern "C" extern u8 data_80585D24[4]; -extern "C" extern u8 data_80585D28[4]; -extern "C" extern u8 data_80585D2C[4]; -extern "C" extern u8 data_80585D30[4]; -extern "C" extern u8 data_80585D34[4]; -extern "C" extern u8 data_80585D38[4]; -extern "C" extern u8 data_80585D3C[4]; -extern "C" extern u8 data_80585D40[4]; -extern "C" extern u8 data_80585D44[4]; -extern "C" extern u8 data_80585D48[4]; -extern "C" extern u8 data_80585D4C[4]; extern "C" void __ct__19daObj_Kanban2_HIO_cFv(); extern "C" void draw__15daObj_Kanban2_cFv(); @@ -424,21 +375,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_kanban2/executor.cpp b/rel/d/a/obj/d_a_obj_kanban2/executor.cpp index 72589315751..409fa934029 100644 --- a/rel/d/a/obj/d_a_obj_kanban2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kanban2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8058560C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kanban2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kanban2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c5bc9ed1cdc..c6505e81deb 100644 --- a/rel/d/a/obj/d_a_obj_kanban2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kanban2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80585618[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80585618-80585620 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80585618[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80585C70-80585C78 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kanban2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kanban2/unknown_translation_unit_ctors.cpp index fe101af9eba..af76bcb9173 100644 --- a/rel/d/a/obj/d_a_obj_kanban2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kanban2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8058560C[2]; -extern void* const data_8058560C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kanban2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8058560C-80585614 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8058560C[2] = { + (void*)__sinit_d_a_obj_kanban2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp index a9f17b209d6..98fcc9bcf95 100644 --- a/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/d_a_obj_kantera.cpp @@ -98,14 +98,14 @@ struct dBgS_AcchCir { /* 80C38E98 */ ~dBgS_AcchCir(); }; -struct csXyz {}; - -struct dBgS {}; - struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct csXyz {}; + +struct dBgS {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -152,9 +152,6 @@ static void daItemKantera_Draw(daItemKantera_c*); static void daItemKantera_Execute(daItemKantera_c*); static void daItemKantera_Delete(daItemKantera_c*); static void daItemKantera_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Kantera[12]; extern "C" static void Reflect__FP4cXyzRC13cBgS_PolyInfof(); extern "C" void __dt__8cM3dGPlaFv(); @@ -205,20 +202,6 @@ void CheckFieldItemCreateHeap(fopAc_ac_c*); void checkItemGet(u8, int); void cM_atan2s(f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80C39860[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_kantera/executor.cpp b/rel/d/a/obj/d_a_obj_kantera/executor.cpp index 54025684c79..262df8fbac1 100644 --- a/rel/d/a/obj/d_a_obj_kantera/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C39640[4]; -extern u8 const data_80C39644[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_bss.cpp index ca86087c96e..a191bdc02b9 100644 --- a/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C39860[4]; -extern "C" extern u8 data_80C39860[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_ctors.cpp index e9c238ea5ff..d38921f8eeb 100644 --- a/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C39640[4]; -extern u8 const data_80C39640[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C39640[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C39640-80C39644 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C39640[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_dtors.cpp index f8c3bc4ddfd..cce3028dfda 100644 --- a/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kantera/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C39644[4]; -extern u8 const data_80C39644[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C39644[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C39644-80C39648 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C39644[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp b/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp index 626443893af..cc6a97f1c3e 100644 --- a/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp +++ b/rel/d/a/obj/d_a_obj_katatsumuri/d_a_obj_katatsumuri.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -49,16 +49,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -83,10 +83,10 @@ struct daObj_KatHIO_c { /* 80C3C5CC */ ~daObj_KatHIO_c(); }; -struct J3DModel {}; - struct J3DJoint {}; +struct J3DModel {}; + struct daObjKAT_c { /* 80C39994 */ void InitCcSph(); /* 80C39A00 */ void SetCcSph(); @@ -254,10 +254,6 @@ static void daObjKAT_Delete(daObjKAT_c*); static void daObjKAT_Draw(daObjKAT_c*); static void daObjKAT_Execute(daObjKAT_c*); static bool daObjKAT_IsDelete(daObjKAT_c*); -extern "C" extern u32 const lit_3960; -extern "C" extern u32 const lit_3962; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Kat[12]; extern "C" void __ct__14daObj_KatHIO_cFv(); extern "C" void InitCcSph__10daObjKAT_cFv(); @@ -327,21 +323,6 @@ void cLib_chasePos(cXyz*, cXyz const&, f32); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_katatsumuri/executor.cpp b/rel/d/a/obj/d_a_obj_katatsumuri/executor.cpp index 4ca81469965..18c8517abff 100644 --- a/rel/d/a/obj/d_a_obj_katatsumuri/executor.cpp +++ b/rel/d/a/obj/d_a_obj_katatsumuri/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C3C660[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_katatsumuri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_katatsumuri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a8a991ea569..467a3415dc2 100644 --- a/rel/d/a/obj/d_a_obj_katatsumuri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_katatsumuri/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C3C66C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C3C66C-80C3C674 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C3C66C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C3C830-80C3C838 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_katatsumuri/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_katatsumuri/unknown_translation_unit_ctors.cpp index 26817d5f7cb..59baa7fb162 100644 --- a/rel/d/a/obj/d_a_obj_katatsumuri/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_katatsumuri/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C3C660[2]; -extern void* const data_80C3C660[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_katatsumuri_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C3C660-80C3C668 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C3C660[2] = { + (void*)__sinit_d_a_obj_katatsumuri_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp b/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp index d8cb817b85b..5dad43f3b23 100644 --- a/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp +++ b/rel/d/a/obj/d_a_obj_kazeneko/d_a_obj_kazeneko.cpp @@ -120,8 +120,6 @@ static void daObjKazeNeko_Execute(daObjKazeNeko_c*); static bool daObjKazeNeko_IsDelete(daObjKazeNeko_c*); static void daObjKazeNeko_Delete(daObjKazeNeko_c*); static void daObjKazeNeko_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_KazeNeko[12]; extern "C" void create_init__15daObjKazeNeko_cFv(); extern "C" void initBaseMtx__15daObjKazeNeko_cFv(); @@ -161,19 +159,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dKyw_get_wind_pow(); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kazeneko/executor.cpp b/rel/d/a/obj/d_a_obj_kazeneko/executor.cpp index bfd4fa05808..5ee33c56e33 100644 --- a/rel/d/a/obj/d_a_obj_kazeneko/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kazeneko/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C3D3D4[4]; -extern u8 const data_80C3D3D8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kazeneko/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kazeneko/unknown_translation_unit_ctors.cpp index da140014165..bd2beaed36e 100644 --- a/rel/d/a/obj/d_a_obj_kazeneko/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kazeneko/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C3D3D4[4]; -extern u8 const data_80C3D3D4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C3D3D4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C3D3D4-80C3D3D8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C3D3D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kazeneko/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kazeneko/unknown_translation_unit_dtors.cpp index a9881a77c1b..ce846cae796 100644 --- a/rel/d/a/obj/d_a_obj_kazeneko/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kazeneko/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C3D3D8[4]; -extern u8 const data_80C3D3D8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C3D3D8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C3D3D8-80C3D3DC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C3D3D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp b/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp index b729f33b86a..4582b993adb 100644 --- a/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp +++ b/rel/d/a/obj/d_a_obj_kbacket/d_a_obj_kbacket.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 80266F48 */ void normalizeZP(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -209,9 +209,6 @@ static void daObj_KBacket_Execute(void*); static void daObj_KBacket_Draw(void*); static bool daObj_KBacket_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_KBACKET[12]; extern "C" void __dt__15daObj_KBacket_cFv(); extern "C" void create__15daObj_KBacket_cFv(); @@ -283,21 +280,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kbacket/executor.cpp b/rel/d/a/obj/d_a_obj_kbacket/executor.cpp index d4ce063d7ca..2a3718acda8 100644 --- a/rel/d/a/obj/d_a_obj_kbacket/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kbacket/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80587D70[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kbacket/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kbacket/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4fca8f1a04c..e49aa014952 100644 --- a/rel/d/a/obj/d_a_obj_kbacket/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kbacket/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80587D7C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80587D7C-80587D84 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80587D7C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80587FD8-80587FE0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kbacket/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kbacket/unknown_translation_unit_ctors.cpp index 21c955d16ef..d4bd973fae8 100644 --- a/rel/d/a/obj/d_a_obj_kbacket/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kbacket/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80587D70[2]; -extern void* const data_80587D70[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kbacket_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80587D70-80587D78 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80587D70[2] = { + (void*)__sinit_d_a_obj_kbacket_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp b/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp index cbf7c71f4aa..ab467931a51 100644 --- a/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp +++ b/rel/d/a/obj/d_a_obj_kbox/d_a_obj_kbox.cpp @@ -29,15 +29,15 @@ struct daObj_Kbox_HIO_c { /* 80C3EF98 */ ~daObj_Kbox_HIO_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct cXyz { /* 80266B84 */ void operator*(f32) const; /* 80C3D8BC */ ~cXyz(); }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -219,47 +219,6 @@ static bool daObj_Kbox_IsDelete(obj_kbox_class*); static void daObj_Kbox_Delete(obj_kbox_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Kbox_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_KBOX[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80C3F2BC[4]; -extern "C" extern u8 data_80C3F2C0[4]; -extern "C" extern u8 data_80C3F2C4[4]; -extern "C" extern u8 data_80C3F2C8[4]; -extern "C" extern u8 data_80C3F2CC[4]; -extern "C" extern u8 data_80C3F2D0[4]; -extern "C" extern u8 data_80C3F2D4[4]; -extern "C" extern u8 data_80C3F2D8[4]; -extern "C" extern u8 data_80C3F2DC[4]; -extern "C" extern u8 data_80C3F2E0[4]; -extern "C" extern u8 data_80C3F2E4[4]; -extern "C" extern u8 data_80C3F2E8[4]; -extern "C" extern u8 data_80C3F2EC[4]; -extern "C" extern u8 data_80C3F2F0[4]; -extern "C" extern u8 data_80C3F2F4[4]; -extern "C" extern u8 data_80C3F2F8[4]; -extern "C" extern u8 data_80C3F2FC[4]; -extern "C" extern u8 data_80C3F300[4]; -extern "C" extern u8 data_80C3F304[4]; -extern "C" extern u8 data_80C3F308[4]; -extern "C" extern u8 data_80C3F30C[4]; -extern "C" extern u8 data_80C3F310[4]; -extern "C" extern u8 data_80C3F314[4]; -extern "C" extern u8 data_80C3F318[4]; -extern "C" extern u8 data_80C3F31C[4]; extern "C" void __ct__16daObj_Kbox_HIO_cFv(); extern "C" static void ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); @@ -361,22 +320,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 struct_80451124[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kbox/executor.cpp b/rel/d/a/obj/d_a_obj_kbox/executor.cpp index 2b896724ed2..f8705330af4 100644 --- a/rel/d/a/obj/d_a_obj_kbox/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kbox/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C3F044[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index edb517721ab..adefbb0c29e 100644 --- a/rel/d/a/obj/d_a_obj_kbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C3F050[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C3F050-80C3F058 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C3F050[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C3F240-80C3F248 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kbox/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kbox/unknown_translation_unit_ctors.cpp index 74e04a7482e..d07714d5195 100644 --- a/rel/d/a/obj/d_a_obj_kbox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kbox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C3F044[2]; -extern void* const data_80C3F044[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kbox_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C3F044-80C3F04C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C3F044[2] = { + (void*)__sinit_d_a_obj_kbox_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp b/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp index 8dca543abb7..29173237939 100644 --- a/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp +++ b/rel/d/a/obj/d_a_obj_key/d_a_obj_key.cpp @@ -174,8 +174,6 @@ static bool daObj_Key_IsDelete(obj_key_class*); static void daObj_Key_Delete(obj_key_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Key_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_KEY[12]; extern "C" void __ct__15daObj_Key_HIO_cFv(); extern "C" static void daObj_Key_Draw__FP13obj_key_class(); @@ -243,21 +241,6 @@ void MtxTrans(f32, f32, f32, u8); void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_key/executor.cpp b/rel/d/a/obj/d_a_obj_key/executor.cpp index c247fd36547..307eb17b998 100644 --- a/rel/d/a/obj/d_a_obj_key/executor.cpp +++ b/rel/d/a/obj/d_a_obj_key/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C40FD8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_key/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_key/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index dbe79f65a7c..55f0b7a336e 100644 --- a/rel/d/a/obj/d_a_obj_key/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_key/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C40FE4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C40FE4-80C40FEC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C40FE4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C41130-80C41138 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_key/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_key/unknown_translation_unit_ctors.cpp index 0b621833432..4f6be05cffe 100644 --- a/rel/d/a/obj/d_a_obj_key/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_key/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C40FD8[2]; -extern void* const data_80C40FD8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_key_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C40FD8-80C40FE0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C40FD8[2] = { + (void*)__sinit_d_a_obj_key_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp index b9e613454c2..0af018005ee 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp +++ b/rel/d/a/obj/d_a_obj_keyhole/d_a_obj_keyhole.cpp @@ -24,11 +24,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -177,47 +177,6 @@ static bool daObj_Keyhole_IsDelete(obj_keyhole_class*); static void daObj_Keyhole_Delete(obj_keyhole_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Keyhole_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_KEYHOLE[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80C43D94[4]; -extern "C" extern u8 data_80C43D98[4]; -extern "C" extern u8 data_80C43D9C[4]; -extern "C" extern u8 data_80C43DA0[4]; -extern "C" extern u8 data_80C43DA4[4]; -extern "C" extern u8 data_80C43DA8[4]; -extern "C" extern u8 data_80C43DAC[4]; -extern "C" extern u8 data_80C43DB0[4]; -extern "C" extern u8 data_80C43DB4[4]; -extern "C" extern u8 data_80C43DB8[4]; -extern "C" extern u8 data_80C43DBC[4]; -extern "C" extern u8 data_80C43DC0[4]; -extern "C" extern u8 data_80C43DC4[4]; -extern "C" extern u8 data_80C43DC8[4]; -extern "C" extern u8 data_80C43DCC[4]; -extern "C" extern u8 data_80C43DD0[4]; -extern "C" extern u8 data_80C43DD4[4]; -extern "C" extern u8 data_80C43DD8[4]; -extern "C" extern u8 data_80C43DDC[4]; -extern "C" extern u8 data_80C43DE0[4]; -extern "C" extern u8 data_80C43DE4[4]; -extern "C" extern u8 data_80C43DE8[4]; -extern "C" extern u8 data_80C43DEC[4]; -extern "C" extern u8 data_80C43DF0[4]; -extern "C" extern u8 data_80C43DF4[4]; extern "C" void __ct__19daObj_Keyhole_HIO_cFv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -321,21 +280,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_keyhole/executor.cpp b/rel/d/a/obj/d_a_obj_keyhole/executor.cpp index 9a80d30b42a..9650fbb3b76 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/executor.cpp +++ b/rel/d/a/obj/d_a_obj_keyhole/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C439D0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_keyhole/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_keyhole/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7128cf45401..0ba8f0842b3 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_keyhole/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C439DC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C439DC-80C439E4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C439DC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C43CA0-80C43CA8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_keyhole/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_keyhole/unknown_translation_unit_ctors.cpp index 76e80018a31..02880b5a75b 100644 --- a/rel/d/a/obj/d_a_obj_keyhole/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_keyhole/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C439D0[2]; -extern void* const data_80C439D0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_keyhole_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C439D0-80C439D8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C439D0[2] = { + (void*)__sinit_d_a_obj_keyhole_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp b/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp index d35345b0538..d49a4c1c39f 100644 --- a/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp +++ b/rel/d/a/obj/d_a_obj_kgate/d_a_obj_kgate.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -196,8 +196,6 @@ static void daObjKGate_MoveBGDelete(daObjKGate_c*); static void daObjKGate_MoveBGExecute(daObjKGate_c*); static void daObjKGate_MoveBGDraw(daObjKGate_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_KkrGate[12]; extern "C" static void search_coach__FPvPv(); extern "C" void initBaseMtx__12daObjKGate_cFv(); @@ -263,21 +261,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_8058AEA8[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kgate/executor.cpp b/rel/d/a/obj/d_a_obj_kgate/executor.cpp index 7a7d7c0dc0f..2c97d6a369d 100644 --- a/rel/d/a/obj/d_a_obj_kgate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kgate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8058AB28[4]; -extern u8 const data_8058AB2C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_bss.cpp index 14e23f3a525..710b510ac42 100644 --- a/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_8058AEA8[4]; -extern "C" extern u8 struct_8058AEA8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_ctors.cpp index 6a54cb52b4e..3e6e30d58a6 100644 --- a/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8058AB28[4]; -extern u8 const data_8058AB28[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8058AB28[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8058AB28-8058AB2C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8058AB28[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_dtors.cpp index b73e58ffdd7..ff0e6836d8b 100644 --- a/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kgate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8058AB2C[4]; -extern u8 const data_8058AB2C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8058AB2C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8058AB2C-8058AB30 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8058AB2C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp b/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp index aedd8c5861e..a713db05b9c 100644 --- a/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp +++ b/rel/d/a/obj/d_a_obj_ki/d_a_obj_ki.cpp @@ -49,13 +49,13 @@ struct daObj_Ki_HIO_c { /* 80C44AA8 */ ~daObj_Ki_HIO_c(); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80C4408C */ ~cXyz(); /* 80C44AA0 */ cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -109,8 +109,6 @@ static bool daObj_Ki_IsDelete(obj_ki_class*); static void daObj_Ki_Delete(obj_ki_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Ki_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_KI[12]; extern "C" void __ct__14daObj_Ki_HIO_cFv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -149,15 +147,6 @@ void MtxScale(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_ki/executor.cpp b/rel/d/a/obj/d_a_obj_ki/executor.cpp index a626f5c6a8a..9111b7f500f 100644 --- a/rel/d/a/obj/d_a_obj_ki/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ki/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C44B2C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ki/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_ki/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index dd1840803c8..4a7651fcf0f 100644 --- a/rel/d/a/obj/d_a_obj_ki/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_ki/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C44B38[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C44B38-80C44B40 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C44B38[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C44C00-80C44C08 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_ki/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ki/unknown_translation_unit_ctors.cpp index ae9f66c512e..3325c1fb9ef 100644 --- a/rel/d/a/obj/d_a_obj_ki/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ki/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C44B2C[2]; -extern void* const data_80C44B2C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ki_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C44B2C-80C44B34 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C44B2C[2] = { + (void*)__sinit_d_a_obj_ki_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp b/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp index 973fb3484b0..4bd15457017 100644 --- a/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp +++ b/rel/d/a/obj/d_a_obj_kiPot/d_a_obj_kiPot.cpp @@ -48,7 +48,6 @@ static void daKiPot_Draw(daKiPot_c*); static void daKiPot_Execute(daKiPot_c*); static void daKiPot_Delete(daKiPot_c*); static void daKiPot_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_KiPot[12]; extern "C" void __ct__13daKiPot_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -76,10 +75,6 @@ extern "C" extern void* g_profile_Obj_KiPot[12]; void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_kiPot/executor.cpp b/rel/d/a/obj/d_a_obj_kiPot/executor.cpp index 9ac85131bae..42ef4605885 100644 --- a/rel/d/a/obj/d_a_obj_kiPot/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kiPot/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C45180[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kiPot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kiPot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f363b6bf92b..fc78d7bd7fc 100644 --- a/rel/d/a/obj/d_a_obj_kiPot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kiPot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C4518C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C4518C-80C45194 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C4518C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C45240-80C45248 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kiPot/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kiPot/unknown_translation_unit_ctors.cpp index 814b7fe7873..4ac7f2aacdc 100644 --- a/rel/d/a/obj/d_a_obj_kiPot/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kiPot/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C45180[2]; -extern void* const data_80C45180[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kiPot_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C45180-80C45188 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C45180[2] = { + (void*)__sinit_d_a_obj_kiPot_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp b/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp index 0159881c84a..468e94060c3 100644 --- a/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp +++ b/rel/d/a/obj/d_a_obj_kita/d_a_obj_kita.cpp @@ -34,16 +34,16 @@ struct daObj_Kita_HIO_c { /* 80C45E84 */ ~daObj_Kita_HIO_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -101,8 +101,6 @@ static bool daObj_Kita_IsDelete(obj_kita_class*); static void daObj_Kita_Delete(obj_kita_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Kita_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_KITA[12]; extern "C" void __ct__16daObj_Kita_HIO_cFv(); extern "C" static void daObj_Kita_Draw__FP14obj_kita_class(); @@ -145,14 +143,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kita/executor.cpp b/rel/d/a/obj/d_a_obj_kita/executor.cpp index 6940cceb483..1c31d3d2467 100644 --- a/rel/d/a/obj/d_a_obj_kita/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kita/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C45F08[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kita/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kita/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2b39160e85f..b68c9e1d732 100644 --- a/rel/d/a/obj/d_a_obj_kita/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kita/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C45F14[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C45F14-80C45F1C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C45F14[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C45FE8-80C45FF0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kita/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kita/unknown_translation_unit_ctors.cpp index 3f10b8a0679..2e8c9e5a043 100644 --- a/rel/d/a/obj/d_a_obj_kita/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kita/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C45F08[2]; -extern void* const data_80C45F08[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kita_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C45F08-80C45F10 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C45F08[2] = { + (void*)__sinit_d_a_obj_kita_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp index 7a53f2dfef8..56bc72cc133 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/d_a_obj_kjgjs.cpp @@ -28,12 +28,12 @@ struct daObjKJgjs_c { /* 80C464CC */ ~daObjKJgjs_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -74,8 +74,6 @@ static void daObjKJgjs_create1st(daObjKJgjs_c*); static void daObjKJgjs_MoveBGDelete(daObjKJgjs_c*); static void daObjKJgjs_MoveBGExecute(daObjKJgjs_c*); static void daObjKJgjs_MoveBGDraw(daObjKJgjs_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_KJgjs[12]; extern "C" void create1st__12daObjKJgjs_cFv(); extern "C" void setMtx__12daObjKJgjs_cFv(); @@ -104,13 +102,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_kjgjs/executor.cpp b/rel/d/a/obj/d_a_obj_kjgjs/executor.cpp index 383535cc853..3d4d0a5bb2a 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C4653C[4]; -extern u8 const data_80C46540[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kjgjs/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kjgjs/unknown_translation_unit_ctors.cpp index e6db57aacd1..22c39143b75 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C4653C[4]; -extern u8 const data_80C4653C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C4653C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C4653C-80C46540 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C4653C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kjgjs/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kjgjs/unknown_translation_unit_dtors.cpp index df3e48d3ad1..761f0ee4d7e 100644 --- a/rel/d/a/obj/d_a_obj_kjgjs/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kjgjs/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C46540[4]; -extern u8 const data_80C46540[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C46540[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C46540-80C46544 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C46540[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp b/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp index 48ad882ecb8..b71f21c89e2 100644 --- a/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp +++ b/rel/d/a/obj/d_a_obj_kkanban/d_a_obj_kkanban.cpp @@ -27,12 +27,12 @@ struct daObjKKanban_c { /* 80C46CC0 */ void Delete(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -120,8 +120,6 @@ static void daObjKKanban_create1st(daObjKKanban_c*); static void daObjKKanban_MoveBGDelete(daObjKKanban_c*); static void daObjKKanban_MoveBGExecute(daObjKKanban_c*); static void daObjKKanban_MoveBGDraw(daObjKKanban_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_KKanban[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" void initBaseMtx__14daObjKKanban_cFv(); @@ -158,19 +156,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Tri[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_TriAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kkanban/executor.cpp b/rel/d/a/obj/d_a_obj_kkanban/executor.cpp index beaa34c73ed..8ca2b9dd8b0 100644 --- a/rel/d/a/obj/d_a_obj_kkanban/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kkanban/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C46F4C[4]; -extern u8 const data_80C46F50[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kkanban/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kkanban/unknown_translation_unit_ctors.cpp index beb75abe9fd..8c90fd59158 100644 --- a/rel/d/a/obj/d_a_obj_kkanban/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kkanban/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C46F4C[4]; -extern u8 const data_80C46F4C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C46F4C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C46F4C-80C46F50 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C46F4C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kkanban/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kkanban/unknown_translation_unit_dtors.cpp index ee4c48ac42b..4e47e285fcb 100644 --- a/rel/d/a/obj/d_a_obj_kkanban/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kkanban/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C46F50[4]; -extern u8 const data_80C46F50[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C46F50[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C46F50-80C46F54 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C46F50[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp b/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp index 526ee7ef8a0..db7980fdb62 100644 --- a/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp +++ b/rel/d/a/obj/d_a_obj_klift00/d_a_obj_klift00.cpp @@ -160,8 +160,6 @@ static void daObjKLift00_create1st(daObjKLift00_c*); static void daObjKLift00_MoveBGDelete(daObjKLift00_c*); static void daObjKLift00_MoveBGExecute(daObjKLift00_c*); static void daObjKLift00_MoveBGDraw(daObjKLift00_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_KLift00[12]; extern "C" static void rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" void __dt__8dCcD_SphFv(); @@ -204,23 +202,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseZ__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_klift00/executor.cpp b/rel/d/a/obj/d_a_obj_klift00/executor.cpp index e5b15964429..a942ea22df7 100644 --- a/rel/d/a/obj/d_a_obj_klift00/executor.cpp +++ b/rel/d/a/obj/d_a_obj_klift00/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8058C378[4]; -extern u8 const data_8058C37C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_klift00/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_klift00/unknown_translation_unit_ctors.cpp index cb9d975dcc1..a7bf1620ed3 100644 --- a/rel/d/a/obj/d_a_obj_klift00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_klift00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8058C378[4]; -extern u8 const data_8058C378[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8058C378[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8058C378-8058C37C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8058C378[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_klift00/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_klift00/unknown_translation_unit_dtors.cpp index 37364f35479..6d5fcf04afa 100644 --- a/rel/d/a/obj/d_a_obj_klift00/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_klift00/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8058C37C[4]; -extern u8 const data_8058C37C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8058C37C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8058C37C-8058C380 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8058C37C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp b/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp index 72e3237cab1..1b2c5982f90 100644 --- a/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp +++ b/rel/d/a/obj/d_a_obj_knBullet/d_a_obj_knBullet.cpp @@ -41,10 +41,10 @@ struct cXyz { /* 80266F48 */ void normalizeZP(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -113,7 +113,6 @@ static bool daObjKnBullet_IsDelete(daObjKnBullet_c*); static void daObjKnBullet_Delete(daObjKnBullet_c*); static void daObjKnBullet_create(fopAc_ac_c*); static void cLib_calcTimer__template0(s16*); -extern "C" extern void* g_profile_KN_BULLET[12]; extern "C" void Create__15daObjKnBullet_cFv(); extern "C" void __dt__8cM3dGSphFv(); @@ -144,16 +143,6 @@ void fopAcM_posMove(fopAc_ac_c*, cXyz const*); void fpcEx_SearchByID(unsigned int); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void XYZrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_knBullet/executor.cpp b/rel/d/a/obj/d_a_obj_knBullet/executor.cpp index 9d5a42c5641..051572216b5 100644 --- a/rel/d/a/obj/d_a_obj_knBullet/executor.cpp +++ b/rel/d/a/obj/d_a_obj_knBullet/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C47948[4]; -extern u8 const data_80C4794C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_knBullet/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_knBullet/unknown_translation_unit_ctors.cpp index 39cad522d18..b88f130f863 100644 --- a/rel/d/a/obj/d_a_obj_knBullet/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_knBullet/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C47948[4]; -extern u8 const data_80C47948[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C47948[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C47948-80C4794C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C47948[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_knBullet/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_knBullet/unknown_translation_unit_dtors.cpp index cf5aef07105..8ab05388b9e 100644 --- a/rel/d/a/obj/d_a_obj_knBullet/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_knBullet/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C4794C[4]; -extern u8 const data_80C4794C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C4794C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C4794C-80C47950 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C4794C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp b/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp index 42f419f50c5..afb4b37a134 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp +++ b/rel/d/a/obj/d_a_obj_kshutter/d_a_obj_kshutter.cpp @@ -187,8 +187,6 @@ static void daObjKshtr_MoveBGDelete(daObjKshtr_c*); static void daObjKshtr_MoveBGExecute(daObjKshtr_c*); static void daObjKshtr_MoveBGDraw(daObjKshtr_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Kshutter[12]; extern "C" void initBaseMtx__12daObjKshtr_cFv(); extern "C" void setBaseMtx__12daObjKshtr_cFv(); @@ -260,17 +258,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80C4A0E8[4]; -extern "C" extern u8 data_80C4A0EC[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_kshutter/executor.cpp b/rel/d/a/obj/d_a_obj_kshutter/executor.cpp index 4491aebbfe0..5456c62bbaf 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kshutter/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C49CA0[4]; -extern u8 const data_80C49CA4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_bss.cpp index d545a162827..27e8a14226a 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_bss.cpp @@ -14,9 +14,6 @@ extern "C" extern u8 struct_80C4A0E8[4]; extern "C" extern u8 data_80C4A0EC[4]; -extern "C" extern u8 struct_80C4A0E8[4]; -extern "C" extern u8 data_80C4A0EC[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_ctors.cpp index 436c5f23435..98f2a9dde25 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C49CA0[4]; -extern u8 const data_80C49CA0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C49CA0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C49CA0-80C49CA4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C49CA0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_dtors.cpp index 9f63055d99f..3025183f320 100644 --- a/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kshutter/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C49CA4[4]; -extern u8 const data_80C49CA4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C49CA4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C49CA4-80C49CA8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C49CA4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp b/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp index 69f7c0ac822..75c2685d391 100644 --- a/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp +++ b/rel/d/a/obj/d_a_obj_ktonfire/d_a_obj_ktOnFire.cpp @@ -43,14 +43,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -113,7 +113,6 @@ static void daKtOnFire_Draw(daKtOnFire_c*); static void daKtOnFire_Execute(daKtOnFire_c*); static void daKtOnFire_Delete(daKtOnFire_c*); static void daKtOnFire_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_KtOnFire[12]; extern "C" void __ct__16daKtOnFire_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -145,17 +144,6 @@ void dComIfGp_getReverb(int); void dKy_plight_set(LIGHT_INFLUENCE*); void dKy_plight_cut(LIGHT_INFLUENCE*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_8058CF80[2]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_ktonfire/executor.cpp b/rel/d/a/obj/d_a_obj_ktonfire/executor.cpp index 7202b7467d0..b67eac14bcb 100644 --- a/rel/d/a/obj/d_a_obj_ktonfire/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ktonfire/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8058CF74[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ktonfire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_ktonfire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 77f6d83fdfd..5698cae42ea 100644 --- a/rel/d/a/obj/d_a_obj_ktonfire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_ktonfire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8058CF80[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8058CF80-8058CF88 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_8058CF80[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8058D0B8-8058D0C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_ktonfire/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ktonfire/unknown_translation_unit_ctors.cpp index 849bbca7d50..f690b3d049c 100644 --- a/rel/d/a/obj/d_a_obj_ktonfire/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ktonfire/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8058CF74[2]; -extern void* const data_8058CF74[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ktOnFire_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8058CF74-8058CF7C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8058CF74[2] = { + (void*)__sinit_d_a_obj_ktOnFire_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp b/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp index 53bbe5d3453..3d7949ee9e3 100644 --- a/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp +++ b/rel/d/a/obj/d_a_obj_kuwagata/d_a_obj_kuwagata.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -50,16 +50,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -252,9 +252,6 @@ static void daObjKUW_Delete(daObjKUW_c*); static void daObjKUW_Draw(daObjKUW_c*); static void daObjKUW_Execute(daObjKUW_c*); static bool daObjKUW_IsDelete(daObjKUW_c*); -extern "C" extern u32 const lit_4438; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Kuw[12]; extern "C" void __ct__14daObj_KuwHIO_cFv(); extern "C" void InitCcSph__10daObjKUW_cFv(); @@ -323,19 +320,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_kuwagata/executor.cpp b/rel/d/a/obj/d_a_obj_kuwagata/executor.cpp index 82a710d4aab..c2749c099e3 100644 --- a/rel/d/a/obj/d_a_obj_kuwagata/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kuwagata/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C4D47C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kuwagata/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_kuwagata/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c3d79f6c3ef..e12d31cf637 100644 --- a/rel/d/a/obj/d_a_obj_kuwagata/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_kuwagata/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C4D488[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C4D488-80C4D490 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C4D488[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C4D658-80C4D660 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_kuwagata/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kuwagata/unknown_translation_unit_ctors.cpp index 2bd5279559a..d8788935e05 100644 --- a/rel/d/a/obj/d_a_obj_kuwagata/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kuwagata/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C4D47C[2]; -extern void* const data_80C4D47C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kuwagata_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C4D47C-80C4D484 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C4D47C[2] = { + (void*)__sinit_d_a_obj_kuwagata_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp b/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp index 91a86f70a73..35c7134089e 100644 --- a/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel00/d_a_obj_kwheel00.cpp @@ -37,12 +37,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -154,7 +154,6 @@ static void daObjKWheel00_create1st(daObjKWheel00_c*); static void daObjKWheel00_MoveBGDelete(daObjKWheel00_c*); static void daObjKWheel00_MoveBGExecute(daObjKWheel00_c*); static void daObjKWheel00_MoveBGDraw(daObjKWheel00_c*); -extern "C" extern void* g_profile_Obj_KWheel00[12]; extern "C" void create1st__15daObjKWheel00_cFv(); extern "C" static void searchLv3Water__FPvPv(); @@ -199,19 +198,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kwheel00/executor.cpp b/rel/d/a/obj/d_a_obj_kwheel00/executor.cpp index e809bf15a54..0a8abb21fb7 100644 --- a/rel/d/a/obj/d_a_obj_kwheel00/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel00/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C4E7F8[4]; -extern u8 const data_80C4E7FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kwheel00/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kwheel00/unknown_translation_unit_ctors.cpp index 83cae992680..dc2d1618846 100644 --- a/rel/d/a/obj/d_a_obj_kwheel00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C4E7F8[4]; -extern u8 const data_80C4E7F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C4E7F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C4E7F8-80C4E7FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C4E7F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kwheel00/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kwheel00/unknown_translation_unit_dtors.cpp index 512a96ee46f..fb572a1fbd6 100644 --- a/rel/d/a/obj/d_a_obj_kwheel00/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel00/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C4E7FC[4]; -extern u8 const data_80C4E7FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C4E7FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C4E7FC-80C4E800 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C4E7FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp b/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp index 45bf8953617..abb9765422c 100644 --- a/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel01/d_a_obj_kwheel01.cpp @@ -37,12 +37,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -128,8 +128,6 @@ static void daObjKWheel01_create1st(daObjKWheel01_c*); static void daObjKWheel01_MoveBGDelete(daObjKWheel01_c*); static void daObjKWheel01_MoveBGExecute(daObjKWheel01_c*); static void daObjKWheel01_MoveBGDraw(daObjKWheel01_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_KWheel01[12]; extern "C" void create1st__15daObjKWheel01_cFv(); extern "C" void setMtx__15daObjKWheel01_cFv(); @@ -172,14 +170,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cM_rndFX(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_kwheel01/executor.cpp b/rel/d/a/obj/d_a_obj_kwheel01/executor.cpp index dcfd3ed7ec5..62a6e2ba371 100644 --- a/rel/d/a/obj/d_a_obj_kwheel01/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel01/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C4F6B0[4]; -extern u8 const data_80C4F6B4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kwheel01/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kwheel01/unknown_translation_unit_ctors.cpp index 6f8f8ad7f51..8ff8fd97cf6 100644 --- a/rel/d/a/obj/d_a_obj_kwheel01/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel01/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C4F6B0[4]; -extern u8 const data_80C4F6B0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C4F6B0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C4F6B0-80C4F6B4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C4F6B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kwheel01/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kwheel01/unknown_translation_unit_dtors.cpp index df333040611..7d7d64d443b 100644 --- a/rel/d/a/obj/d_a_obj_kwheel01/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kwheel01/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C4F6B4[4]; -extern u8 const data_80C4F6B4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C4F6B4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C4F6B4-80C4F6B8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C4F6B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp b/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp index 672142d456c..9b857037dbd 100644 --- a/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp +++ b/rel/d/a/obj/d_a_obj_kznkarm/d_a_obj_kznkarm.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -138,9 +138,6 @@ static void daObjKznkarm_Execute(daObjKznkarm_c*); static bool daObjKznkarm_IsDelete(daObjKznkarm_c*); static void daObjKznkarm_Delete(daObjKznkarm_c*); static void daObjKznkarm_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_KznkArm[12]; extern "C" void setAction__14daObjKznkarm_cFQ214daObjKznkarm_c6Mode_e(); extern "C" void callInit__14daObjKznkarm_cFv(); @@ -194,16 +191,6 @@ void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_Poly dKy_tevstr_c*, s16, f32, _GXTexObj*); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_kznkarm/executor.cpp b/rel/d/a/obj/d_a_obj_kznkarm/executor.cpp index 4aaf26ddc9c..acc01c24470 100644 --- a/rel/d/a/obj/d_a_obj_kznkarm/executor.cpp +++ b/rel/d/a/obj/d_a_obj_kznkarm/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C50CFC[2]; -extern u8 const data_80C50D04[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_kznkarm/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_kznkarm/unknown_translation_unit_ctors.cpp index d9b2a43f952..51364bab40c 100644 --- a/rel/d/a/obj/d_a_obj_kznkarm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_kznkarm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C50CFC[2]; -extern void* const data_80C50CFC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_kznkarm_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C50CFC-80C50D04 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C50CFC[2] = { + (void*)__sinit_d_a_obj_kznkarm_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_kznkarm/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_kznkarm/unknown_translation_unit_dtors.cpp index e7456861e10..041d564c95f 100644 --- a/rel/d/a/obj/d_a_obj_kznkarm/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_kznkarm/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C50D04[4]; -extern u8 const data_80C50D04[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C50D04[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C50D04-80C50D08 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C50D04[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp b/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp index b11a9522da6..363bc492bfb 100644 --- a/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp +++ b/rel/d/a/obj/d_a_obj_ladder/d_a_obj_ladder.cpp @@ -148,9 +148,6 @@ struct J3DModel {}; // Forward References: // -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Ladder[12]; - extern "C" void CreateHeap__Q211daObjLadder5Act_cFv(); extern "C" void Create__Q211daObjLadder5Act_cFv(); extern "C" void Mthd_Create__Q211daObjLadder5Act_cFv(); @@ -200,15 +197,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_Trans(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void dKy_pol_sound_get(cBgS_PolyInfo const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_ladder/executor.cpp b/rel/d/a/obj/d_a_obj_ladder/executor.cpp index fd34be665fb..12626d1e6c6 100644 --- a/rel/d/a/obj/d_a_obj_ladder/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ladder/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8058DD48[4]; -extern u8 const data_8058DD4C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ladder/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ladder/unknown_translation_unit_ctors.cpp index 1b5d20ba5fb..61e136c6f98 100644 --- a/rel/d/a/obj/d_a_obj_ladder/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ladder/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8058DD48[4]; -extern u8 const data_8058DD48[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8058DD48[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8058DD48-8058DD4C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8058DD48[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ladder/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ladder/unknown_translation_unit_dtors.cpp index 270a6066523..238d0dc198a 100644 --- a/rel/d/a/obj/d_a_obj_ladder/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ladder/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8058DD4C[4]; -extern u8 const data_8058DD4C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8058DD4C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8058DD4C-8058DD50 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8058DD4C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp b/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp index 2edda47adde..65006899ac0 100644 --- a/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp +++ b/rel/d/a/obj/d_a_obj_laundry/d_a_obj_laundry.cpp @@ -125,10 +125,6 @@ static void daObjLdy_Execute(daObjLdy_c*); static bool daObjLdy_IsDelete(daObjLdy_c*); static void daObjLdy_Delete(daObjLdy_c*); static void daObjLdy_Create(fopAc_ac_c*); -extern "C" extern u8 const data_80C52054[68]; -extern "C" extern u32 const lit_3858; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Laundry[12]; extern "C" void create_init__10daObjLdy_cFv(); extern "C" void initBaseMtx__10daObjLdy_cFv(); @@ -174,20 +170,6 @@ void cM_atan2s(f32, f32); void cM_rnd(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_laundry/executor.cpp b/rel/d/a/obj/d_a_obj_laundry/executor.cpp index 4c36e27243d..6098f923d95 100644 --- a/rel/d/a/obj/d_a_obj_laundry/executor.cpp +++ b/rel/d/a/obj/d_a_obj_laundry/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C51FF8[4]; -extern u8 const data_80C51FFC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_laundry/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_laundry/unknown_translation_unit_ctors.cpp index 3988b5f1192..b7c1b71e9f6 100644 --- a/rel/d/a/obj/d_a_obj_laundry/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_laundry/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C51FF8[4]; -extern u8 const data_80C51FF8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C51FF8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C51FF8-80C51FFC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C51FF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_laundry/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_laundry/unknown_translation_unit_dtors.cpp index 04c8a922b16..36ed3b1b408 100644 --- a/rel/d/a/obj/d_a_obj_laundry/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_laundry/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C51FFC[4]; -extern u8 const data_80C51FFC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C51FFC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C51FFC-80C52000 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C51FFC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp b/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp index e53ac4e5a68..d54b677b2ff 100644 --- a/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp +++ b/rel/d/a/obj/d_a_obj_laundry_rope/d_a_obj_laundry_rope.cpp @@ -19,11 +19,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -104,9 +104,6 @@ static void daObjLndRope_Execute(daObjLndRope_c*); static bool daObjLndRope_IsDelete(daObjLndRope_c*); static void daObjLndRope_Delete(daObjLndRope_c*); static void daObjLndRope_Create(fopAc_ac_c*); -extern "C" extern u8 const data_80C53364[64]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_LndRope[12]; extern "C" void create_init__14daObjLndRope_cFv(); extern "C" void __dt__4cXyzFv(); @@ -149,17 +146,6 @@ void cM_rnd(); void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi(); diff --git a/rel/d/a/obj/d_a_obj_laundry_rope/executor.cpp b/rel/d/a/obj/d_a_obj_laundry_rope/executor.cpp index 14ae96e9d31..87220552120 100644 --- a/rel/d/a/obj/d_a_obj_laundry_rope/executor.cpp +++ b/rel/d/a/obj/d_a_obj_laundry_rope/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C532FC[4]; -extern u8 const data_80C53300[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_laundry_rope/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_laundry_rope/unknown_translation_unit_ctors.cpp index b7958f27a0c..42f27b73ca1 100644 --- a/rel/d/a/obj/d_a_obj_laundry_rope/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_laundry_rope/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C532FC[4]; -extern u8 const data_80C532FC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C532FC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C532FC-80C53300 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C532FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_laundry_rope/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_laundry_rope/unknown_translation_unit_dtors.cpp index 0461c7a5d06..4cd57575369 100644 --- a/rel/d/a/obj/d_a_obj_laundry_rope/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_laundry_rope/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C53300[4]; -extern u8 const data_80C53300[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C53300[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C53300-80C53304 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C53300[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp b/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp index 9371e7073ba..c534de18ee7 100644 --- a/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp +++ b/rel/d/a/obj/d_a_obj_lbox/d_a_obj_lbox.cpp @@ -150,10 +150,6 @@ static bool daObj_Lbox_IsDelete(obj_lbox_class*); static void daObj_Lbox_Delete(obj_lbox_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Lbox_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3886; -extern "C" extern u32 const lit_3887; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_LBOX[12]; extern "C" void __ct__16daObj_Lbox_HIO_cFv(); extern "C" static void daObj_Lbox_Draw__FP14obj_lbox_class(); @@ -193,18 +189,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lbox/executor.cpp b/rel/d/a/obj/d_a_obj_lbox/executor.cpp index 3b4aa9bb524..27aa0eec290 100644 --- a/rel/d/a/obj/d_a_obj_lbox/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lbox/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C53FA8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ce06662ff95..02cc9907be9 100644 --- a/rel/d/a/obj/d_a_obj_lbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C53FB4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C53FB4-80C53FBC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C53FB4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C540E0-80C540E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lbox/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lbox/unknown_translation_unit_ctors.cpp index 5dd046077ba..2bef8cce812 100644 --- a/rel/d/a/obj/d_a_obj_lbox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lbox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C53FA8[2]; -extern void* const data_80C53FA8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lbox_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C53FA8-80C53FB0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C53FA8[2] = { + (void*)__sinit_d_a_obj_lbox_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp b/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp index b5c3cf99beb..c92592dc4f3 100644 --- a/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp +++ b/rel/d/a/obj/d_a_obj_life_container/d_a_obj_life_container.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -103,10 +103,10 @@ struct dPa_followEcallBack { /* 80049580 */ dPa_followEcallBack(u8, u8); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -247,9 +247,6 @@ static void daObjLife_Execute(daObjLife_c*); static void daObjLife_Delete(daObjLife_c*); static void daObjLife_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_LifeContainer[12]; extern "C" static void Reflect__FP4cXyzRC13cBgS_PolyInfof(); extern "C" void __dt__8cM3dGPlaFv(); @@ -325,23 +322,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_804CE6A0[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_life_container/executor.cpp b/rel/d/a/obj/d_a_obj_life_container/executor.cpp index 7bd7112da1b..af9b00b7668 100644 --- a/rel/d/a/obj/d_a_obj_life_container/executor.cpp +++ b/rel/d/a/obj/d_a_obj_life_container/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804CE3EC[4]; -extern u8 const data_804CE3F0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_bss.cpp index b2456f6bd27..2fe4f0bf341 100644 --- a/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_804CE6A0[4]; -extern "C" extern u8 data_804CE6A0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_ctors.cpp index 86d3f4a3b7f..3b4e8dc633e 100644 --- a/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804CE3EC[4]; -extern u8 const data_804CE3EC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804CE3EC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804CE3EC-804CE3F0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804CE3EC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_dtors.cpp index 8196bca25d7..6666d26bb08 100644 --- a/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_life_container/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804CE3F0[4]; -extern u8 const data_804CE3F0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804CE3F0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804CE3F0-804CE3F4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804CE3F0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp b/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp index ed9bac95aa2..e17f7e5022b 100644 --- a/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp +++ b/rel/d/a/obj/d_a_obj_lp/d_a_obj_lp.cpp @@ -31,10 +31,10 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct mDoExt_3DlineMat0_c { /* 800125E0 */ void init(u16, u16, int); /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*); @@ -105,48 +105,6 @@ static void daObj_Lp_Delete(obj_lp_class*); static void useHeapInit(fopAc_ac_c*); static void set_pos_check(obj_lp_class*, int); static void daObj_Lp_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_LP[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80C55BB4[4]; -extern "C" extern u8 data_80C55BB8[4]; -extern "C" extern u8 data_80C55BBC[4]; -extern "C" extern u8 data_80C55BC0[4]; -extern "C" extern u8 data_80C55BC4[4]; -extern "C" extern u8 data_80C55BC8[4]; -extern "C" extern u8 data_80C55BCC[4]; -extern "C" extern u8 data_80C55BD0[4]; -extern "C" extern u8 data_80C55BD4[4]; -extern "C" extern u8 data_80C55BD8[4]; -extern "C" extern u8 data_80C55BDC[4]; -extern "C" extern u8 data_80C55BE0[4]; -extern "C" extern u8 data_80C55BE4[4]; -extern "C" extern u8 data_80C55BE8[4]; -extern "C" extern u8 data_80C55BEC[4]; -extern "C" extern u8 data_80C55BF0[4]; -extern "C" extern u8 data_80C55BF4[4]; -extern "C" extern u8 data_80C55BF8[4]; -extern "C" extern u8 data_80C55BFC[4]; -extern "C" extern u8 data_80C55C00[4]; -extern "C" extern u8 data_80C55C04[4]; -extern "C" extern u8 data_80C55C08[4]; -extern "C" extern u8 data_80C55C0C[4]; -extern "C" extern u8 data_80C55C10[4]; -extern "C" extern u8 data_80C55C14[4]; extern "C" static void daObj_Lp_Draw__FP12obj_lp_class(); extern "C" static void s_ks_sub__FPvPv(); @@ -234,15 +192,6 @@ void MtxPosition(cXyz*, cXyz*); void MtxPush(); void MtxPull(); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lp/executor.cpp b/rel/d/a/obj/d_a_obj_lp/executor.cpp index 36fca3a4711..c66fb640eee 100644 --- a/rel/d/a/obj/d_a_obj_lp/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lp/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C55A08[4]; -extern u8 const data_80C55A0C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lp/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lp/unknown_translation_unit_ctors.cpp index b86e09c366a..7d17fc00c25 100644 --- a/rel/d/a/obj/d_a_obj_lp/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lp/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C55A08[4]; -extern u8 const data_80C55A08[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C55A08[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C55A08-80C55A0C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C55A08[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lp/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lp/unknown_translation_unit_dtors.cpp index 5b7c51bd31e..96c6ed2739d 100644 --- a/rel/d/a/obj/d_a_obj_lp/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lp/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C55A0C[4]; -extern u8 const data_80C55A0C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C55A0C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C55A0C-80C55A10 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C55A0C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp b/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp index 1c40e1298a4..cf630e9f62b 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle00/d_a_obj_lv1Candle00.cpp @@ -46,12 +46,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -142,8 +142,6 @@ static void daLv1Cdl00_Draw(daLv1Cdl00_c*); static void daLv1Cdl00_Execute(daLv1Cdl00_c*); static void daLv1Cdl00_Delete(daLv1Cdl00_c*); static void daLv1Cdl00_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv1Cdl00[12]; extern "C" void __ct__16daLv1Cdl00_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -186,20 +184,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80C56A48[2]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv1Candle00/executor.cpp b/rel/d/a/obj/d_a_obj_lv1Candle00/executor.cpp index 70ea52f8340..4d6f2fee859 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle00/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle00/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C56A3C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv1Candle00/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv1Candle00/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3ca88d77916..2a8bbb2ce27 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle00/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle00/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C56A48[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C56A48-80C56A50 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80C56A48[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C56B88-80C56B90 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv1Candle00/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv1Candle00/unknown_translation_unit_ctors.cpp index 728fc405d5a..85c22dbf652 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C56A3C[2]; -extern void* const data_80C56A3C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv1Candle00_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C56A3C-80C56A44 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C56A3C[2] = { + (void*)__sinit_d_a_obj_lv1Candle00_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp b/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp index a2d6bda33b9..c5b88db1bd8 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle01/d_a_obj_lv1Candle01.cpp @@ -37,12 +37,12 @@ struct daLv1Cdl01_HIO_c { /* 80C5777C */ ~daLv1Cdl01_HIO_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -153,8 +153,6 @@ static void daLv1Cdl01_Draw(daLv1Cdl01_c*); static void daLv1Cdl01_Execute(daLv1Cdl01_c*); static void daLv1Cdl01_Delete(daLv1Cdl01_c*); static void daLv1Cdl01_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv1Cdl01[12]; extern "C" void __ct__16daLv1Cdl01_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -195,20 +193,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80C57854[2]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv1Candle01/executor.cpp b/rel/d/a/obj/d_a_obj_lv1Candle01/executor.cpp index 5769ddca314..354be3736e2 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle01/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle01/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C57848[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv1Candle01/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv1Candle01/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4e1d93dedf8..6aa77431f2c 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle01/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle01/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C57854[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C57854-80C5785C 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80C57854[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C579B8-80C579C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv1Candle01/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv1Candle01/unknown_translation_unit_ctors.cpp index c0138b17036..411ae277f83 100644 --- a/rel/d/a/obj/d_a_obj_lv1Candle01/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv1Candle01/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C57848[2]; -extern void* const data_80C57848[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv1Candle01_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C57848-80C57850 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C57848[2] = { + (void*)__sinit_d_a_obj_lv1Candle01_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp b/rel/d/a/obj/d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp index e66f2866183..5a832ffc916 100644 --- a/rel/d/a/obj/d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp +++ b/rel/d/a/obj/d_a_obj_lv2candle/d_a_obj_lv2Candle.cpp @@ -48,12 +48,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -144,8 +144,6 @@ static void daLv2Candle_Draw(daLv2Candle_c*); static void daLv2Candle_Execute(daLv2Candle_c*); static void daLv2Candle_Delete(daLv2Candle_c*); static void daLv2Candle_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv2Candle[12]; extern "C" void __ct__17daLv2Candle_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -192,19 +190,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv2candle/executor.cpp b/rel/d/a/obj/d_a_obj_lv2candle/executor.cpp index 492eee2b8c5..c501b8134c3 100644 --- a/rel/d/a/obj/d_a_obj_lv2candle/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv2candle/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8058F11C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv2candle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv2candle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 0c92393d3ec..ac7b324931e 100644 --- a/rel/d/a/obj/d_a_obj_lv2candle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv2candle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8058F128[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8058F128-8058F130 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8058F128[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8058F298-8058F2A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv2candle/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv2candle/unknown_translation_unit_ctors.cpp index 2b3fbdeb10a..7f6e6ab8358 100644 --- a/rel/d/a/obj/d_a_obj_lv2candle/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv2candle/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8058F11C[2]; -extern void* const data_8058F11C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv2Candle_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8058F11C-8058F124 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8058F11C[2] = { + (void*)__sinit_d_a_obj_lv2Candle_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp b/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp index 73e00662a23..b2becbf2956 100644 --- a/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Candle/d_a_obj_lv3Candle.cpp @@ -38,12 +38,12 @@ struct daLv3Candle_HIO_c { /* 80C58484 */ ~daLv3Candle_HIO_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -132,8 +132,6 @@ static void daLv3Candle_Draw(daLv3Candle_c*); static void daLv3Candle_Execute(daLv3Candle_c*); static void daLv3Candle_Delete(daLv3Candle_c*); static void daLv3Candle_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv3Candle[12]; extern "C" void __ct__17daLv3Candle_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -174,20 +172,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80C5855C[2]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv3Candle/executor.cpp b/rel/d/a/obj/d_a_obj_lv3Candle/executor.cpp index 50d155a83cd..00978a01d34 100644 --- a/rel/d/a/obj/d_a_obj_lv3Candle/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Candle/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C58550[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv3Candle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv3Candle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 83bf350338a..f38da765842 100644 --- a/rel/d/a/obj/d_a_obj_lv3Candle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Candle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C5855C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C5855C-80C58564 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80C5855C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C586B8-80C586C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv3Candle/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv3Candle/unknown_translation_unit_ctors.cpp index 3f1f0fc2a1c..d3cc45d3bf4 100644 --- a/rel/d/a/obj/d_a_obj_lv3Candle/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Candle/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C58550[2]; -extern void* const data_80C58550[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv3Candle_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C58550-80C58558 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C58550[2] = { + (void*)__sinit_d_a_obj_lv3Candle_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp b/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp index 58de371a512..fd542d4e66e 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water/d_a_obj_lv3Water.cpp @@ -58,14 +58,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -153,8 +153,6 @@ static void daLv3Water_Draw(daLv3Water_c*); static void daLv3Water_Execute(daLv3Water_c*); static void daLv3Water_Delete(daLv3Water_c*); static void daLv3Water_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv3Water[12]; extern "C" void __ct__16daLv3Water_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -198,15 +196,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_lv3Water/executor.cpp b/rel/d/a/obj/d_a_obj_lv3Water/executor.cpp index 1a91995f432..2c09d93a778 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C59E5C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv3Water/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv3Water/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ab87636fa93..b0bcb2c51f4 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C59E68[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C59E68-80C59E70 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C59E68[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C5A300-80C5A308 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv3Water/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv3Water/unknown_translation_unit_ctors.cpp index 38e39809fee..23db5711d0f 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C59E5C[2]; -extern void* const data_80C59E5C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv3Water_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C59E5C-80C59E64 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C59E5C[2] = { + (void*)__sinit_d_a_obj_lv3Water_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp b/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp index 52163a722a7..fdc7e0cb2aa 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water2/d_a_obj_lv3Water2.cpp @@ -57,14 +57,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -142,9 +142,6 @@ static void daLv3Water2_Draw(daLv3Water2_c*); static void daLv3Water2_Execute(daLv3Water2_c*); static void daLv3Water2_Delete(daLv3Water2_c*); static void daLv3Water2_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv3Water2[12]; extern "C" void __ct__17daLv3Water2_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -188,15 +185,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_lv3Water2/executor.cpp b/rel/d/a/obj/d_a_obj_lv3Water2/executor.cpp index 0f2086c5628..513dc38aeba 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water2/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C5B350[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv3Water2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv3Water2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index bc98133a3cb..0ff2f99c650 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water2/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C5B35C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C5B35C-80C5B364 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C5B35C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C5B4D0-80C5B4D8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv3Water2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv3Water2/unknown_translation_unit_ctors.cpp index cca7f4d36a0..021066c773e 100644 --- a/rel/d/a/obj/d_a_obj_lv3Water2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3Water2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C5B350[2]; -extern void* const data_80C5B350[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv3Water2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5B350-80C5B358 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C5B350[2] = { + (void*)__sinit_d_a_obj_lv3Water2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp b/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp index d2bdd7a084f..77d20b83bbd 100644 --- a/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp +++ b/rel/d/a/obj/d_a_obj_lv3WaterB/d_a_obj_lv3WaterB.cpp @@ -36,14 +36,14 @@ struct dSv_memBit_c { /* 80034934 */ void isDungeonItem(int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -98,8 +98,6 @@ static bool daObj_Lv3waterB_IsDelete(obj_lv3WaterB_class*); static void daObj_Lv3waterB_Delete(obj_lv3WaterB_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Lv3waterB_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_LV3WATERB[12]; extern "C" static void daObj_Lv3waterB_Draw__FP19obj_lv3WaterB_class(); extern "C" static void action__FP19obj_lv3WaterB_class(); @@ -125,13 +123,6 @@ void dKy_custom_colset(u8, u8, f32); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); diff --git a/rel/d/a/obj/d_a_obj_lv3WaterB/executor.cpp b/rel/d/a/obj/d_a_obj_lv3WaterB/executor.cpp index 5ebfb39468d..a25239fd0ce 100644 --- a/rel/d/a/obj/d_a_obj_lv3WaterB/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv3WaterB/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C5BD48[4]; -extern u8 const data_80C5BD4C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv3WaterB/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv3WaterB/unknown_translation_unit_ctors.cpp index c7317f7e95b..a5150de7d3e 100644 --- a/rel/d/a/obj/d_a_obj_lv3WaterB/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3WaterB/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C5BD48[4]; -extern u8 const data_80C5BD48[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C5BD48[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5BD48-80C5BD4C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C5BD48[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3WaterB/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv3WaterB/unknown_translation_unit_dtors.cpp index b3952e80acf..1282baafffd 100644 --- a/rel/d/a/obj/d_a_obj_lv3WaterB/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3WaterB/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C5BD4C[4]; -extern u8 const data_80C5BD4C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C5BD4C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C5BD4C-80C5BD50 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C5BD4C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp index b73a201c7f1..efc2fcf78d9 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp +++ b/rel/d/a/obj/d_a_obj_lv3saka00/d_a_obj_lv3saka00.cpp @@ -45,12 +45,12 @@ struct dBgW { /* 8007B9C0 */ void Move(); }; +struct cXyz {}; + struct csXyz {}; struct cBgS_PolyInfo {}; -struct cXyz {}; - struct dBgS_MoveBgActor { /* 80078624 */ dBgS_MoveBgActor(); /* 800786B0 */ bool IsDelete(); @@ -90,7 +90,6 @@ static void daObjLv3saka_create1st(daObjLv3saka_c*); static void daObjLv3saka_MoveBGDelete(daObjLv3saka_c*); static void daObjLv3saka_MoveBGExecute(daObjLv3saka_c*); static void daObjLv3saka_MoveBGDraw(daObjLv3saka_c*); -extern "C" extern void* g_profile_Obj_Lv3R10Saka[12]; extern "C" void initBaseMtx__14daObjLv3saka_cFv(); extern "C" void setBaseMtx__14daObjLv3saka_cFv(); @@ -117,10 +116,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/executor.cpp b/rel/d/a/obj/d_a_obj_lv3saka00/executor.cpp index b1216136e4f..56f48003561 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv3saka00/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C5C3BC[4]; -extern u8 const data_80C5C3C0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv3saka00/unknown_translation_unit_ctors.cpp index 8ad758f2e99..da5d681166c 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3saka00/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C5C3BC[4]; -extern u8 const data_80C5C3BC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C5C3BC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5C3BC-80C5C3C0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C5C3BC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3saka00/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv3saka00/unknown_translation_unit_dtors.cpp index b90dd4c3893..00d496ae24f 100644 --- a/rel/d/a/obj/d_a_obj_lv3saka00/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3saka00/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C5C3C0[4]; -extern u8 const data_80C5C3C0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C5C3C0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C5C3C0-80C5C3C4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C5C3C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp index 2e069396abf..c9cac3aebd4 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/d_a_obj_lv3waterEff.cpp @@ -24,17 +24,17 @@ struct daObjWaterEff_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz { /* 80C5C670 */ ~cXyz(); /* 80C5C6AC */ cXyz(); }; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -56,7 +56,6 @@ struct Z2SeMgr { static void daObjWaterEff_Execute(daObjWaterEff_c*); static void daObjWaterEff_Delete(daObjWaterEff_c*); static void daObjWaterEff_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_WaterEff[12]; extern "C" void Create__15daObjWaterEff_cFv(); extern "C" void create__15daObjWaterEff_cFv(); @@ -75,10 +74,6 @@ extern "C" extern void* g_profile_Obj_WaterEff[12]; void dKy_camera_water_in_status_check(); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/executor.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/executor.cpp index 1519e10e2aa..cb52c87a1fa 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C5C870[4]; -extern u8 const data_80C5C874[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/unknown_translation_unit_ctors.cpp index 8032e2f3c67..1cd927df1c8 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C5C870[4]; -extern u8 const data_80C5C870[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C5C870[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5C870-80C5C874 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C5C870[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv3waterEff/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv3waterEff/unknown_translation_unit_dtors.cpp index 62f6e8fa81c..01c476bcf72 100644 --- a/rel/d/a/obj/d_a_obj_lv3waterEff/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv3waterEff/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C5C874[4]; -extern u8 const data_80C5C874[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C5C874[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C5C874-80C5C878 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C5C874[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp index 188fcc3a9fb..69155933168 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.cpp @@ -72,8 +72,6 @@ static void dalv4CandleDemoTag_Draw(dalv4CandleDemoTag_c*); static void dalv4CandleDemoTag_Execute(dalv4CandleDemoTag_c*); static void dalv4CandleDemoTag_Delete(dalv4CandleDemoTag_c*); static void dalv4CandleDemoTag_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Tag_Lv4CandleDm[12]; extern "C" void __ct__24dalv4CandleDemoTag_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -119,10 +117,6 @@ void fopAcM_create(s16, u32, cXyz const*, int, csXyz const*, cXyz const*, s8); void fopAcM_myRoomSearchEnemy(s8); void dPath_GetRoomPath(int, int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/executor.cpp b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/executor.cpp index 9d4cf2abf1e..bc318669d55 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C5D204[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 02618d9b91a..57f6ddf9abb 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C5D210[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C5D210-80C5D218 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C5D210[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C5D340-80C5D348 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/unknown_translation_unit_ctors.cpp index 0703a46910c..7adf42eb3e1 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C5D204[2]; -extern void* const data_80C5D204[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv4CandleDemoTag_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5D204-80C5D20C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C5D204[2] = { + (void*)__sinit_d_a_obj_lv4CandleDemoTag_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp b/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp index 92555a8c9e2..73d9b806b66 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleTag/d_a_obj_lv4CandleTag.cpp @@ -74,8 +74,6 @@ static void dalv4CandleTag_Draw(dalv4CandleTag_c*); static void dalv4CandleTag_Execute(dalv4CandleTag_c*); static void dalv4CandleTag_Delete(dalv4CandleTag_c*); static void dalv4CandleTag_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Tag_Lv4Candle[12]; extern "C" void __ct__20dalv4CandleTag_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -115,11 +113,6 @@ extern "C" extern void* g_profile_Tag_Lv4Candle[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_lv4CandleTag/executor.cpp b/rel/d/a/obj/d_a_obj_lv4CandleTag/executor.cpp index 475bf0c3a5d..0833178996e 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleTag/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleTag/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C5DB48[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4CandleTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv4CandleTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e4343911f02..8e73e3d0a13 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C5DB54[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C5DB54-80C5DB5C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C5DB54[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C5DC90-80C5DC98 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv4CandleTag/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4CandleTag/unknown_translation_unit_ctors.cpp index d5b1f3817fb..3c6cb51ec82 100644 --- a/rel/d/a/obj/d_a_obj_lv4CandleTag/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4CandleTag/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C5DB48[2]; -extern void* const data_80C5DB48[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv4CandleTag_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5DB48-80C5DB50 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C5DB48[2] = { + (void*)__sinit_d_a_obj_lv4CandleTag_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp b/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp index 818455a026a..0f2257978a1 100644 --- a/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp +++ b/rel/d/a/obj/d_a_obj_lv4EdShutter/d_a_obj_lv4EdShutter.cpp @@ -51,12 +51,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -114,9 +114,6 @@ static void daLv4EdShutter_Draw(daLv4EdShutter_c*); static void daLv4EdShutter_Execute(daLv4EdShutter_c*); static void daLv4EdShutter_Delete(daLv4EdShutter_c*); static void daLv4EdShutter_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4EdShutter[12]; extern "C" void __ct__20daLv4EdShutter_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -167,14 +164,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv4EdShutter/executor.cpp b/rel/d/a/obj/d_a_obj_lv4EdShutter/executor.cpp index f17ba4e46da..bd26cb06a86 100644 --- a/rel/d/a/obj/d_a_obj_lv4EdShutter/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4EdShutter/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C5E8C8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4EdShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv4EdShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 0f8f8c9b14a..bc6072414f5 100644 --- a/rel/d/a/obj/d_a_obj_lv4EdShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv4EdShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C5E8D4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C5E8D4-80C5E8DC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C5E8D4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C5EA50-80C5EA58 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv4EdShutter/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4EdShutter/unknown_translation_unit_ctors.cpp index 90a7152130e..ca3d06237ec 100644 --- a/rel/d/a/obj/d_a_obj_lv4EdShutter/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4EdShutter/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C5E8C8[2]; -extern void* const data_80C5E8C8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv4EdShutter_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5E8C8-80C5E8D0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C5E8C8[2] = { + (void*)__sinit_d_a_obj_lv4EdShutter_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp b/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp index 4fa74585e1b..b6022ec085b 100644 --- a/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp +++ b/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.cpp @@ -108,9 +108,6 @@ static void daLv4Gate_Draw(daLv4Gate_c*); static void daLv4Gate_Execute(daLv4Gate_c*); static void daLv4Gate_Delete(daLv4Gate_c*); static void daLv4Gate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4Gate[12]; extern "C" void __ct__15daLv4Gate_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -152,13 +149,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv4Gate/executor.cpp b/rel/d/a/obj/d_a_obj_lv4Gate/executor.cpp index 797f7b39184..8aec7336e16 100644 --- a/rel/d/a/obj/d_a_obj_lv4Gate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4Gate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C5F3E0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4Gate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv4Gate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 373425128e7..890b3ca6a50 100644 --- a/rel/d/a/obj/d_a_obj_lv4Gate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv4Gate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C5F3EC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C5F3EC-80C5F3F4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C5F3EC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C5F518-80C5F520 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv4Gate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4Gate/unknown_translation_unit_ctors.cpp index c890b96a45b..2f26e71f522 100644 --- a/rel/d/a/obj/d_a_obj_lv4Gate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4Gate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C5F3E0[2]; -extern void* const data_80C5F3E0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv4Gate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5F3E0-80C5F3E8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C5F3E0[2] = { + (void*)__sinit_d_a_obj_lv4Gate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp index 7d2664100b9..ac60e4ced88 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/d_a_obj_lv4HsTarget.cpp @@ -33,12 +33,12 @@ struct daLv4HsTarget_HIO_c { /* 80C5F990 */ ~daLv4HsTarget_HIO_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -80,8 +80,6 @@ static void daLv4HsTarget_Draw(daLv4HsTarget_c*); static void daLv4HsTarget_Execute(daLv4HsTarget_c*); static void daLv4HsTarget_Delete(daLv4HsTarget_c*); static void daLv4HsTarget_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv4HsTarget[12]; extern "C" void __ct__19daLv4HsTarget_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -112,11 +110,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/executor.cpp b/rel/d/a/obj/d_a_obj_lv4HsTarget/executor.cpp index 67b60f7a4e6..2f005daaf53 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C5FA28[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv4HsTarget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5bde7627bb1..049699270dc 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C5FA34[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C5FA34-80C5FA3C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C5FA34[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C5FAD8-80C5FAE0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv4HsTarget/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4HsTarget/unknown_translation_unit_ctors.cpp index 0123765107d..d201af283cd 100644 --- a/rel/d/a/obj/d_a_obj_lv4HsTarget/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4HsTarget/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C5FA28[2]; -extern void* const data_80C5FA28[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv4HsTarget_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C5FA28-80C5FA30 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C5FA28[2] = { + (void*)__sinit_d_a_obj_lv4HsTarget_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp b/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp index 03521f852dd..d80c6ce45ad 100644 --- a/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.cpp @@ -127,9 +127,6 @@ static void daLv4PoGate_Draw(daLv4PoGate_c*); static void daLv4PoGate_Execute(daLv4PoGate_c*); static void daLv4PoGate_Delete(daLv4PoGate_c*); static void daLv4PoGate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4PoGate[12]; extern "C" void __ct__17daLv4PoGate_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -181,13 +178,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_lv4PoGate/executor.cpp b/rel/d/a/obj/d_a_obj_lv4PoGate/executor.cpp index 55e7b8072c5..0cf2f5f3a6d 100644 --- a/rel/d/a/obj/d_a_obj_lv4PoGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4PoGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C607F0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4PoGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv4PoGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index bf5c8e8ccec..00f7fec5c63 100644 --- a/rel/d/a/obj/d_a_obj_lv4PoGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv4PoGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C607FC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C607FC-80C60804 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C607FC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C609B0-80C609B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv4PoGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4PoGate/unknown_translation_unit_ctors.cpp index 606a710790d..b350d7e5a66 100644 --- a/rel/d/a/obj/d_a_obj_lv4PoGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4PoGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C607F0[2]; -extern void* const data_80C607F0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv4PoGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C607F0-80C607F8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C607F0[2] = { + (void*)__sinit_d_a_obj_lv4PoGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp b/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp index 350ed0a0617..b89955ab018 100644 --- a/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4RailWall/d_a_obj_lv4RailWall.cpp @@ -162,9 +162,6 @@ static void daObjLv4Wall_create1st(daObjLv4Wall_c*); static void daObjLv4Wall_MoveBGDelete(daObjLv4Wall_c*); static void daObjLv4Wall_MoveBGExecute(daObjLv4Wall_c*); static void daObjLv4Wall_MoveBGDraw(daObjLv4Wall_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4RailWall[12]; extern "C" static void s_BossSearch__FPvPv(); extern "C" void initBaseMtx__14daObjLv4Wall_cFv(); @@ -226,20 +223,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80C61D38[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv4RailWall/executor.cpp b/rel/d/a/obj/d_a_obj_lv4RailWall/executor.cpp index b1b5fbbd3b5..ad4b800ed48 100644 --- a/rel/d/a/obj/d_a_obj_lv4RailWall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4RailWall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C61B30[4]; -extern u8 const data_80C61B34[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_bss.cpp index 2d40db89a48..705f982b79f 100644 --- a/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C61D38[4]; -extern "C" extern u8 data_80C61D38[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_ctors.cpp index 08be28099cb..d0216900db2 100644 --- a/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C61B30[4]; -extern u8 const data_80C61B30[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C61B30[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C61B30-80C61B34 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C61B30[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_dtors.cpp index 85ea82bbd1f..2c47db5e822 100644 --- a/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4RailWall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C61B34[4]; -extern u8 const data_80C61B34[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C61B34[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C61B34-80C61B38 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C61B34[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp b/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp index c809acac617..6db823357f6 100644 --- a/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4SlideWall/d_a_obj_lv4SlideWall.cpp @@ -109,9 +109,6 @@ static void daSldWall_Draw(daSldWall_c*); static void daSldWall_Execute(daSldWall_c*); static void daSldWall_Delete(daSldWall_c*); static void daSldWall_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4SlideWall[12]; extern "C" void __ct__15daSldWall_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -153,13 +150,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_lv4SlideWall/executor.cpp b/rel/d/a/obj/d_a_obj_lv4SlideWall/executor.cpp index 307bb2cdb2d..417cf684c0e 100644 --- a/rel/d/a/obj/d_a_obj_lv4SlideWall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4SlideWall/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C62694[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4SlideWall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv4SlideWall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1f406352fa1..9abd293def3 100644 --- a/rel/d/a/obj/d_a_obj_lv4SlideWall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv4SlideWall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C626A0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C626A0-80C626A8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C626A0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C627C8-80C627D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv4SlideWall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4SlideWall/unknown_translation_unit_ctors.cpp index 34449293cac..26f8517dc7b 100644 --- a/rel/d/a/obj/d_a_obj_lv4SlideWall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4SlideWall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C62694[2]; -extern void* const data_80C62694[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv4SlideWall_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C62694-80C6269C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C62694[2] = { + (void*)__sinit_d_a_obj_lv4SlideWall_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp b/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp index cf94120d2a1..d518255718d 100644 --- a/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp +++ b/rel/d/a/obj/d_a_obj_lv4bridge/d_a_obj_lv4bridge.cpp @@ -116,9 +116,6 @@ static void daObjLv4Brg_create1st(daObjLv4Brg_c*); static void daObjLv4Brg_MoveBGDelete(daObjLv4Brg_c*); static void daObjLv4Brg_MoveBGExecute(daObjLv4Brg_c*); static void daObjLv4Brg_MoveBGDraw(daObjLv4Brg_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4Bridge[12]; extern "C" void initBaseMtx__13daObjLv4Brg_cFv(); extern "C" void setBaseMtx__13daObjLv4Brg_cFv(); @@ -164,15 +161,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80C632B8[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv4bridge/executor.cpp b/rel/d/a/obj/d_a_obj_lv4bridge/executor.cpp index 3bcf1161a90..bba78dec5a7 100644 --- a/rel/d/a/obj/d_a_obj_lv4bridge/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4bridge/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C63168[4]; -extern u8 const data_80C6316C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_bss.cpp index 5568feb3b6f..3b699309879 100644 --- a/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C632B8[4]; -extern "C" extern u8 data_80C632B8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_ctors.cpp index 59762428f23..fd410b49ee7 100644 --- a/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C63168[4]; -extern u8 const data_80C63168[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C63168[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C63168-80C6316C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C63168[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_dtors.cpp index 90fe5b1ec76..660a650cf06 100644 --- a/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4bridge/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C6316C[4]; -extern u8 const data_80C6316C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C6316C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C6316C-80C63170 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C6316C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp b/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp index 98f9e8449d0..70261943625 100644 --- a/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp +++ b/rel/d/a/obj/d_a_obj_lv4chandelier/d_a_obj_lv4chandelier.cpp @@ -192,8 +192,6 @@ static void daObjLv4Chan_create1st(daObjLv4Chan_c*); static void daObjLv4Chan_MoveBGDelete(daObjLv4Chan_c*); static void daObjLv4Chan_MoveBGExecute(daObjLv4Chan_c*); static void daObjLv4Chan_MoveBGDraw(daObjLv4Chan_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv4Chan[12]; extern "C" static void rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" void create1st__14daObjLv4Chan_cFv(); @@ -252,25 +250,6 @@ void cM_rndFX(f32); void cM3d_VectorProduct(cXyz const*, cXyz const*, cXyz const*, cXyz*); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 BaseZ__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv4chandelier/executor.cpp b/rel/d/a/obj/d_a_obj_lv4chandelier/executor.cpp index 0c87ebbf620..61f2ce33eaa 100644 --- a/rel/d/a/obj/d_a_obj_lv4chandelier/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4chandelier/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C66858[4]; -extern u8 const data_80C6685C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4chandelier/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4chandelier/unknown_translation_unit_ctors.cpp index 500949c2a57..41b684426e4 100644 --- a/rel/d/a/obj/d_a_obj_lv4chandelier/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4chandelier/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C66858[4]; -extern u8 const data_80C66858[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C66858[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C66858-80C6685C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C66858[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4chandelier/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4chandelier/unknown_translation_unit_dtors.cpp index 4b9986f954a..0c8ee253d11 100644 --- a/rel/d/a/obj/d_a_obj_lv4chandelier/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4chandelier/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C6685C[4]; -extern u8 const data_80C6685C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C6685C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C6685C-80C66860 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C6685C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp b/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp index 1bf802d27d0..7dcaab963b7 100644 --- a/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp +++ b/rel/d/a/obj/d_a_obj_lv4digsand/d_a_obj_lv4digsand.cpp @@ -38,12 +38,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -147,9 +147,6 @@ static void daObjL4DigSand_MoveBGDelete(daObjL4DigSand_c*); static void daObjL4DigSand_MoveBGExecute(daObjL4DigSand_c*); static void daObjL4DigSand_MoveBGDraw(daObjL4DigSand_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4DigSand[12]; extern "C" void initBaseMtx__16daObjL4DigSand_cFv(); extern "C" void setBaseMtx__16daObjL4DigSand_cFv(); @@ -201,18 +198,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void checkItemGet(u8, int); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 data_80C67760[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv4digsand/executor.cpp b/rel/d/a/obj/d_a_obj_lv4digsand/executor.cpp index cbe944be78e..7ad1539464e 100644 --- a/rel/d/a/obj/d_a_obj_lv4digsand/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4digsand/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C675CC[4]; -extern u8 const data_80C675D0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_bss.cpp index 73b7447cc6f..7215c32eb59 100644 --- a/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C67760[4]; -extern "C" extern u8 data_80C67760[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_ctors.cpp index d51cf48aff9..6f0777d94dc 100644 --- a/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C675CC[4]; -extern u8 const data_80C675CC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C675CC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C675CC-80C675D0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C675CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_dtors.cpp index af8a88f4807..e72a41249dd 100644 --- a/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4digsand/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C675D0[4]; -extern u8 const data_80C675D0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C675D0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C675D0-80C675D4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C675D0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp b/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp index 679d77eb5b2..d86a9a83c09 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4floor/d_a_obj_lv4floor.cpp @@ -36,12 +36,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -82,9 +82,6 @@ static void daObjLv4Floor_create1st(daObjLv4Floor_c*); static void daObjLv4Floor_MoveBGDelete(daObjLv4Floor_c*); static void daObjLv4Floor_MoveBGExecute(daObjLv4Floor_c*); static void daObjLv4Floor_MoveBGDraw(daObjLv4Floor_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4Floor[12]; extern "C" void initBaseMtx__15daObjLv4Floor_cFv(); extern "C" void setBaseMtx__15daObjLv4Floor_cFv(); @@ -120,13 +117,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_chaseF(f32*, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 data_80C67E80[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv4floor/executor.cpp b/rel/d/a/obj/d_a_obj_lv4floor/executor.cpp index 1c84d069d06..009c0333ca4 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4floor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C67D78[4]; -extern u8 const data_80C67D7C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_bss.cpp index fa69ffae060..2d02b6ae4bd 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C67E80[4]; -extern "C" extern u8 data_80C67E80[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_ctors.cpp index b4dedea2366..92f1181f831 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C67D78[4]; -extern u8 const data_80C67D78[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C67D78[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C67D78-80C67D7C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C67D78[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_dtors.cpp index b76758be106..90930c37301 100644 --- a/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4floor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C67D7C[4]; -extern u8 const data_80C67D7C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C67D7C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C67D7C-80C67D80 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C67D7C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp index 45d918167e6..8dd58ceafc3 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/d_a_obj_lv4gear.cpp @@ -69,9 +69,6 @@ static void daObjLv4Gear_Draw(daObjLv4Gear_c*); static void daObjLv4Gear_Execute(daObjLv4Gear_c*); static void daObjLv4Gear_Delete(daObjLv4Gear_c*); static void daObjLv4Gear_Create(daObjLv4Gear_c*); -extern "C" extern u8 const l_size[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv4Gear[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" static void searchSwSpinSub__FPvPv(); @@ -108,12 +105,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void cLib_chaseS(s16*, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_lv4gear/executor.cpp b/rel/d/a/obj/d_a_obj_lv4gear/executor.cpp index 955f0d11fb1..17ff8b3aac8 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C684F8[4]; -extern u8 const data_80C684FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4gear/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4gear/unknown_translation_unit_ctors.cpp index 9caa1fe7ee1..cb5364ed6fe 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C684F8[4]; -extern u8 const data_80C684F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C684F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C684F8-80C684FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C684F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4gear/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4gear/unknown_translation_unit_dtors.cpp index 56ab458d663..3c7f262b951 100644 --- a/rel/d/a/obj/d_a_obj_lv4gear/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4gear/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C684FC[4]; -extern u8 const data_80C684FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C684FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C684FC-80C68500 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C684FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp b/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp index c1b929ee562..259a31b6226 100644 --- a/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prelvtr/d_a_obj_lv4prelvtr.cpp @@ -32,12 +32,12 @@ struct daObjLv4PRwall_c { /* 80C68C98 */ void create1st(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -79,8 +79,6 @@ static void daObjPRElvtr_create1st(daObjPRElvtr_c*); static void daObjPRElvtr_MoveBGDelete(daObjPRElvtr_c*); static void daObjPRElvtr_MoveBGExecute(daObjPRElvtr_c*); static void daObjPRElvtr_MoveBGDraw(daObjPRElvtr_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_PRElvtr[12]; extern "C" void create1st__14daObjPRElvtr_cFv(); extern "C" void setMtx__14daObjPRElvtr_cFv(); @@ -112,13 +110,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_Trans(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv4prelvtr/executor.cpp b/rel/d/a/obj/d_a_obj_lv4prelvtr/executor.cpp index 115d38f4ec5..acd648d5039 100644 --- a/rel/d/a/obj/d_a_obj_lv4prelvtr/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prelvtr/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C68B60[4]; -extern u8 const data_80C68B64[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4prelvtr/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4prelvtr/unknown_translation_unit_ctors.cpp index 6f38fb2b405..888f12c6868 100644 --- a/rel/d/a/obj/d_a_obj_lv4prelvtr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prelvtr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C68B60[4]; -extern u8 const data_80C68B60[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C68B60[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C68B60-80C68B64 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C68B60[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4prelvtr/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4prelvtr/unknown_translation_unit_dtors.cpp index 330425b976d..9d52ce4e62f 100644 --- a/rel/d/a/obj/d_a_obj_lv4prelvtr/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prelvtr/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C68B64[4]; -extern u8 const data_80C68B64[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C68B64[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C68B64-80C68B68 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C68B64[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp b/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp index 9593d6fc7dc..e163e77913f 100644 --- a/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prwall/d_a_obj_lv4prwall.cpp @@ -99,7 +99,6 @@ static void daObjLv4PRwall_create1st(daObjLv4PRwall_c*); static void daObjLv4PRwall_MoveBGDelete(daObjLv4PRwall_c*); static void daObjLv4PRwall_MoveBGExecute(daObjLv4PRwall_c*); static void daObjLv4PRwall_MoveBGDraw(daObjLv4PRwall_c*); -extern "C" extern void* g_profile_Obj_Lv4PRwall[12]; extern "C" void create1st__16daObjLv4PRwall_cFv(); extern "C" void setMtx__16daObjLv4PRwall_cFv(); @@ -131,15 +130,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_lv4prwall/executor.cpp b/rel/d/a/obj/d_a_obj_lv4prwall/executor.cpp index ff666652557..48be8201558 100644 --- a/rel/d/a/obj/d_a_obj_lv4prwall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prwall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C698E0[4]; -extern u8 const data_80C698E4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4prwall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4prwall/unknown_translation_unit_ctors.cpp index 7cba17e0676..84f959f6c71 100644 --- a/rel/d/a/obj/d_a_obj_lv4prwall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prwall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C698E0[4]; -extern u8 const data_80C698E0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C698E0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C698E0-80C698E4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C698E0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4prwall/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4prwall/unknown_translation_unit_dtors.cpp index 0ab9f8bb692..874721ac914 100644 --- a/rel/d/a/obj/d_a_obj_lv4prwall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4prwall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C698E4[4]; -extern u8 const data_80C698E4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C698E4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C698E4-80C698E8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C698E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp b/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp index e2aa4f7288e..c2714291ce0 100644 --- a/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp +++ b/rel/d/a/obj/d_a_obj_lv4sand/d_a_obj_lv4sand.cpp @@ -59,12 +59,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -125,9 +125,6 @@ static void daObjLv4Sand_create1st(daObjLv4Sand_c*); static void daObjLv4Sand_MoveBGDelete(daObjLv4Sand_c*); static void daObjLv4Sand_MoveBGExecute(daObjLv4Sand_c*); static void daObjLv4Sand_MoveBGDraw(daObjLv4Sand_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv4Sand[12]; extern "C" void initBaseMtx__14daObjLv4Sand_cFv(); extern "C" void setBaseMtx__14daObjLv4Sand_cFv(); @@ -176,15 +173,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80C6A508[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_lv4sand/executor.cpp b/rel/d/a/obj/d_a_obj_lv4sand/executor.cpp index eb6ec2488ab..31a74c5150c 100644 --- a/rel/d/a/obj/d_a_obj_lv4sand/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv4sand/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C6A3B0[4]; -extern u8 const data_80C6A3B4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_bss.cpp index cd19cd0eed9..3a341f20437 100644 --- a/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C6A508[4]; -extern "C" extern u8 data_80C6A508[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_ctors.cpp index 114b691aeea..5f78ceb4d74 100644 --- a/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C6A3B0[4]; -extern u8 const data_80C6A3B0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C6A3B0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C6A3B0-80C6A3B4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C6A3B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_dtors.cpp index 28c9fedc1bf..3379bb8020b 100644 --- a/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv4sand/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C6A3B4[4]; -extern u8 const data_80C6A3B4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C6A3B4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C6A3B4-80C6A3B8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C6A3B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp b/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp index daa60611253..133c54dcca7 100644 --- a/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp +++ b/rel/d/a/obj/d_a_obj_lv5FloorBoard/d_a_obj_lv5FloorBoard.cpp @@ -47,12 +47,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -155,9 +155,6 @@ static void daFlorBoad_Draw(daFlorBoad_c*); static void daFlorBoad_Execute(daFlorBoad_c*); static void daFlorBoad_Delete(daFlorBoad_c*); static void daFlorBoad_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv5FBoard[12]; extern "C" void __ct__16daFlorBoad_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -201,18 +198,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv5FloorBoard/executor.cpp b/rel/d/a/obj/d_a_obj_lv5FloorBoard/executor.cpp index f3135e81a0d..a24fd946b29 100644 --- a/rel/d/a/obj/d_a_obj_lv5FloorBoard/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv5FloorBoard/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C6B134[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv5FloorBoard/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv5FloorBoard/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9b4a3759923..6ba774ffbea 100644 --- a/rel/d/a/obj/d_a_obj_lv5FloorBoard/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv5FloorBoard/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C6B140[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C6B140-80C6B148 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C6B140[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C6B2F8-80C6B300 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv5FloorBoard/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv5FloorBoard/unknown_translation_unit_ctors.cpp index 01d1164970b..0c3ba76b4cd 100644 --- a/rel/d/a/obj/d_a_obj_lv5FloorBoard/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv5FloorBoard/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C6B134[2]; -extern void* const data_80C6B134[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv5FloorBoard_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C6B134-80C6B13C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C6B134[2] = { + (void*)__sinit_d_a_obj_lv5FloorBoard_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp b/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp index 1320feb0c52..7f242eb99f4 100644 --- a/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp +++ b/rel/d/a/obj/d_a_obj_lv5IceWall/d_a_obj_lv5IceWall.cpp @@ -51,12 +51,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -166,10 +166,6 @@ static void daIceWall_Draw(daIceWall_c*); static void daIceWall_Execute(daIceWall_c*); static void daIceWall_Delete(daIceWall_c*); static void daIceWall_Create(fopAc_ac_c*); -extern "C" extern u8 const l_bmdIdx[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_IceWall[12]; extern "C" void __ct__15daIceWall_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -218,18 +214,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv5IceWall/executor.cpp b/rel/d/a/obj/d_a_obj_lv5IceWall/executor.cpp index fd704934d63..9f532e400ed 100644 --- a/rel/d/a/obj/d_a_obj_lv5IceWall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv5IceWall/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C6C62C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv5IceWall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv5IceWall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5c7d5de30b7..2126754d861 100644 --- a/rel/d/a/obj/d_a_obj_lv5IceWall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv5IceWall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C6C638[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C6C638-80C6C640 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C6C638[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C6C828-80C6C830 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv5IceWall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv5IceWall/unknown_translation_unit_ctors.cpp index 41ea1ebc43b..7cc83f3d0cb 100644 --- a/rel/d/a/obj/d_a_obj_lv5IceWall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv5IceWall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C6C62C[2]; -extern void* const data_80C6C62C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv5IceWall_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C6C62C-80C6C634 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C6C62C[2] = { + (void*)__sinit_d_a_obj_lv5IceWall_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp b/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp index 190cd588d45..ca53d426e7a 100644 --- a/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp +++ b/rel/d/a/obj/d_a_obj_lv5SwIce/d_a_obj_lv5SwIce.cpp @@ -47,12 +47,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -155,9 +155,6 @@ static void daLv5SwIce_Draw(daLv5SwIce_c*); static void daLv5SwIce_Execute(daLv5SwIce_c*); static void daLv5SwIce_Delete(daLv5SwIce_c*); static void daLv5SwIce_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv5SwIce[12]; extern "C" void __ct__16daLv5SwIce_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -202,19 +199,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80C6D500[2]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv5SwIce/executor.cpp b/rel/d/a/obj/d_a_obj_lv5SwIce/executor.cpp index aae04c10d59..3887dfbcc74 100644 --- a/rel/d/a/obj/d_a_obj_lv5SwIce/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv5SwIce/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C6D4F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv5SwIce/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv5SwIce/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8f37dd71ecf..004d36ac680 100644 --- a/rel/d/a/obj/d_a_obj_lv5SwIce/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv5SwIce/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C6D500[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C6D500-80C6D508 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80C6D500[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C6D6C0-80C6D6C8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv5SwIce/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv5SwIce/unknown_translation_unit_ctors.cpp index e00277bd87c..9fbc51a5122 100644 --- a/rel/d/a/obj/d_a_obj_lv5SwIce/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv5SwIce/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C6D4F4[2]; -extern void* const data_80C6D4F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv5SwIce_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C6D4F4-80C6D4FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C6D4F4[2] = { + (void*)__sinit_d_a_obj_lv5SwIce_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp b/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp index 99cc3b76d23..cccfe0944ef 100644 --- a/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp +++ b/rel/d/a/obj/d_a_obj_lv5ychndlr/d_a_obj_lv5ychndlr.cpp @@ -33,10 +33,6 @@ struct daObjYchndlr_c { /* 80C6E808 */ ~daObjYchndlr_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -44,6 +40,10 @@ struct cXyz { /* 80266EF4 */ void normalize(); }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -134,8 +134,6 @@ static void daObjYchndlr_create1st(daObjYchndlr_c*); static void daObjYchndlr_MoveBGDelete(daObjYchndlr_c*); static void daObjYchndlr_MoveBGExecute(daObjYchndlr_c*); static void daObjYchndlr_MoveBGDraw(daObjYchndlr_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Ychndlr[12]; extern "C" void create1st__14daObjYchndlr_cFv(); extern "C" void setMtx__14daObjYchndlr_cFv(); @@ -174,21 +172,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cM_atan2s(f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv5ychndlr/executor.cpp b/rel/d/a/obj/d_a_obj_lv5ychndlr/executor.cpp index 0a259fc6967..0ba7928baea 100644 --- a/rel/d/a/obj/d_a_obj_lv5ychndlr/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv5ychndlr/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C6E978[4]; -extern u8 const data_80C6E97C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv5ychndlr/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv5ychndlr/unknown_translation_unit_ctors.cpp index e95a0a3a71b..4cd4d42c7ec 100644 --- a/rel/d/a/obj/d_a_obj_lv5ychndlr/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv5ychndlr/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C6E978[4]; -extern u8 const data_80C6E978[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C6E978[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C6E978-80C6E97C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C6E978[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv5ychndlr/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv5ychndlr/unknown_translation_unit_dtors.cpp index d8c9668474d..ef3b57230e3 100644 --- a/rel/d/a/obj/d_a_obj_lv5ychndlr/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv5ychndlr/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C6E97C[4]; -extern u8 const data_80C6E97C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C6E97C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C6E97C-80C6E980 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C6E97C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp index 4f32307de1a..5116ad2fc6a 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/d_a_obj_lv5yiblltray.cpp @@ -62,14 +62,14 @@ struct dStage_roomControl_c { /* 80024338 */ void initZone(); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -187,8 +187,6 @@ static void daObjYIblltray_create1st(daObjYIblltray_c*); static void daObjYIblltray_MoveBGDelete(daObjYIblltray_c*); static void daObjYIblltray_MoveBGExecute(daObjYIblltray_c*); static void daObjYIblltray_MoveBGDraw(daObjYIblltray_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_YIblltray[12]; extern "C" void create1st__16daObjYIblltray_cFv(); extern "C" void setMtx__16daObjYIblltray_cFv(); @@ -239,22 +237,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/executor.cpp b/rel/d/a/obj/d_a_obj_lv5yiblltray/executor.cpp index 79e6706e69a..5fd38f98aa8 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C70998[4]; -extern u8 const data_80C7099C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv5yiblltray/unknown_translation_unit_ctors.cpp index f9276e5704f..d03e8616f37 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C70998[4]; -extern u8 const data_80C70998[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C70998[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C70998-80C7099C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C70998[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv5yiblltray/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv5yiblltray/unknown_translation_unit_dtors.cpp index 852c8e5e517..00008a2bf57 100644 --- a/rel/d/a/obj/d_a_obj_lv5yiblltray/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv5yiblltray/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C7099C[4]; -extern u8 const data_80C7099C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C7099C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C7099C-80C709A0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C7099C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp b/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp index 0d4b96a1daa..39549233941 100644 --- a/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6ChangeGate/d_a_obj_lv6ChangeGate.cpp @@ -60,12 +60,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -180,9 +180,6 @@ static void daLv6ChangeGate_Draw(daLv6ChangeGate_c*); static void daLv6ChangeGate_Execute(daLv6ChangeGate_c*); static void daLv6ChangeGate_Delete(daLv6ChangeGate_c*); static void daLv6ChangeGate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6ChgGate[12]; extern "C" void __ct__21daLv6ChangeGate_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -243,19 +240,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv6ChangeGate/executor.cpp b/rel/d/a/obj/d_a_obj_lv6ChangeGate/executor.cpp index bd0e7ab03ce..a6ec67e8275 100644 --- a/rel/d/a/obj/d_a_obj_lv6ChangeGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6ChangeGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C72138[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6ChangeGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv6ChangeGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2505c60fbc3..15e61d1cbb1 100644 --- a/rel/d/a/obj/d_a_obj_lv6ChangeGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv6ChangeGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C72144[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C72144-80C7214C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C72144[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C72378-80C72380 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv6ChangeGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6ChangeGate/unknown_translation_unit_ctors.cpp index c323dc961a7..c80035634c0 100644 --- a/rel/d/a/obj/d_a_obj_lv6ChangeGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6ChangeGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C72138[2]; -extern void* const data_80C72138[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6ChangeGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C72138-80C72140 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C72138[2] = { + (void*)__sinit_d_a_obj_lv6ChangeGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp index 9e1097a2e40..b65bf75e64a 100644 --- a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/d_a_obj_lv6FurikoTrap.cpp @@ -36,12 +36,12 @@ struct daLv6FurikoTrap_HIO_c { /* 80C73050 */ ~daLv6FurikoTrap_HIO_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -129,8 +129,6 @@ static void daLv6FurikoTrap_Draw(daLv6FurikoTrap_c*); static void daLv6FurikoTrap_Execute(daLv6FurikoTrap_c*); static void daLv6FurikoTrap_Delete(daLv6FurikoTrap_c*); static void daLv6FurikoTrap_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv6FuriTrap[12]; extern "C" void __ct__21daLv6FurikoTrap_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -172,19 +170,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/executor.cpp b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/executor.cpp index ad03ffcff12..f6037c39b1d 100644 --- a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C7311C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d690e802eda..d444732b405 100644 --- a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C73128[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C73128-80C73130 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C73128[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C732C0-80C732C8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/unknown_translation_unit_ctors.cpp index bcb97d3f83b..f5489e7a766 100644 --- a/rel/d/a/obj/d_a_obj_lv6FurikoTrap/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6FurikoTrap/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C7311C[2]; -extern void* const data_80C7311C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6FurikoTrap_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C7311C-80C73124 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C7311C[2] = { + (void*)__sinit_d_a_obj_lv6FurikoTrap_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp b/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp index b4153f94d0c..765a70bb89a 100644 --- a/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Lblock/d_a_obj_lv6Lblock.cpp @@ -45,12 +45,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -101,9 +101,6 @@ static void daLv6Lblock_Draw(daLv6Lblock_c*); static void daLv6Lblock_Execute(daLv6Lblock_c*); static void daLv6Lblock_Delete(daLv6Lblock_c*); static void daLv6Lblock_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6Lblock[12]; extern "C" void __ct__17daLv6Lblock_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -145,13 +142,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv6Lblock/executor.cpp b/rel/d/a/obj/d_a_obj_lv6Lblock/executor.cpp index 31ff880894b..ff04c6e5f72 100644 --- a/rel/d/a/obj/d_a_obj_lv6Lblock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Lblock/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C73CA8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6Lblock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv6Lblock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f5ba23d47ef..0ddb4700770 100644 --- a/rel/d/a/obj/d_a_obj_lv6Lblock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Lblock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C73CB4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C73CB4-80C73CBC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C73CB4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C73DE8-80C73DF0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv6Lblock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6Lblock/unknown_translation_unit_ctors.cpp index e483c085cfb..6beb9f6ba31 100644 --- a/rel/d/a/obj/d_a_obj_lv6Lblock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Lblock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C73CA8[2]; -extern void* const data_80C73CA8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6Lblock_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C73CA8-80C73CB0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C73CA8[2] = { + (void*)__sinit_d_a_obj_lv6Lblock_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp b/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp index 16b433609ea..86bdc667d25 100644 --- a/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SwGate/d_a_obj_lv6SwGate.cpp @@ -56,12 +56,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -190,9 +190,6 @@ static void daLv6SwGate_Draw(daLv6SwGate_c*); static void daLv6SwGate_Execute(daLv6SwGate_c*); static void daLv6SwGate_Delete(daLv6SwGate_c*); static void daLv6SwGate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6SwGate[12]; extern "C" void __ct__17daLv6SwGate_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -247,18 +244,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv6SwGate/executor.cpp b/rel/d/a/obj/d_a_obj_lv6SwGate/executor.cpp index c919d9275a6..b13ad53c029 100644 --- a/rel/d/a/obj/d_a_obj_lv6SwGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SwGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C75510[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6SwGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv6SwGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5e31beeac80..04f97500864 100644 --- a/rel/d/a/obj/d_a_obj_lv6SwGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SwGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C7551C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C7551C-80C75524 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C7551C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C75740-80C75748 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv6SwGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6SwGate/unknown_translation_unit_ctors.cpp index 3ac540de71c..13417949af5 100644 --- a/rel/d/a/obj/d_a_obj_lv6SwGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SwGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C75510[2]; -extern void* const data_80C75510[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6SwGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C75510-80C75518 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C75510[2] = { + (void*)__sinit_d_a_obj_lv6SwGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp b/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp index da0e4da0a93..e11ff7473f6 100644 --- a/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SzGate/d_a_obj_lv6SzGate.cpp @@ -161,9 +161,6 @@ static void daLv6SzGate_Draw(daLv6SzGate_c*); static void daLv6SzGate_Execute(daLv6SzGate_c*); static void daLv6SzGate_Delete(daLv6SzGate_c*); static void daLv6SzGate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6SzGate[12]; extern "C" void __ct__17daLv6SzGate_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -212,13 +209,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_lv6SzGate/executor.cpp b/rel/d/a/obj/d_a_obj_lv6SzGate/executor.cpp index 1a83b33e4ea..92b0da75f2a 100644 --- a/rel/d/a/obj/d_a_obj_lv6SzGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SzGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C7661C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6SzGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv6SzGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 28d081abd9f..6759993c8ac 100644 --- a/rel/d/a/obj/d_a_obj_lv6SzGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SzGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C76628[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C76628-80C76630 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C76628[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C767D0-80C767D8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv6SzGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6SzGate/unknown_translation_unit_ctors.cpp index 2922aeba4a0..3daaced7376 100644 --- a/rel/d/a/obj/d_a_obj_lv6SzGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6SzGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C7661C[2]; -extern void* const data_80C7661C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6SzGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C7661C-80C76624 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C7661C[2] = { + (void*)__sinit_d_a_obj_lv6SzGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp b/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp index d45a49634d5..32add430580 100644 --- a/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Tenbin/d_a_obj_lv6Tenbin.cpp @@ -48,12 +48,12 @@ struct daTenbin_HIO_c { /* 80C77904 */ ~daTenbin_HIO_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -122,8 +122,6 @@ static void daTenbin_Draw(daTenbin_c*); static void daTenbin_Execute(daTenbin_c*); static void daTenbin_Delete(daTenbin_c*); static void daTenbin_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv6Tenbin[12]; extern "C" void __ct__14daTenbin_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -166,14 +164,6 @@ void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs void cLib_addCalc(f32*, f32, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_lv6Tenbin/executor.cpp b/rel/d/a/obj/d_a_obj_lv6Tenbin/executor.cpp index 187b03db3d6..bc67b23a2e8 100644 --- a/rel/d/a/obj/d_a_obj_lv6Tenbin/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Tenbin/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C7799C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6Tenbin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv6Tenbin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f899c103637..a62d510cf3b 100644 --- a/rel/d/a/obj/d_a_obj_lv6Tenbin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Tenbin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C779A8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C779A8-80C779B0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C779A8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C77AC8-80C77AD0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv6Tenbin/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6Tenbin/unknown_translation_unit_ctors.cpp index 4ca48e782db..6247fde8c8b 100644 --- a/rel/d/a/obj/d_a_obj_lv6Tenbin/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6Tenbin/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C7799C[2]; -extern void* const data_80C7799C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6Tenbin_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C7799C-80C779A4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C7799C[2] = { + (void*)__sinit_d_a_obj_lv6Tenbin_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp b/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp index d4f2a4bb7d6..cd10ebb164f 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeRoll/d_a_obj_lv6TogeRoll.cpp @@ -52,10 +52,6 @@ struct daTogeRoll_HIO_c { /* 80C798D0 */ ~daTogeRoll_HIO_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -65,6 +61,10 @@ struct cXyz { /* 8026702C */ bool operator==(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -197,9 +197,6 @@ static void daTogeRoll_Draw(daTogeRoll_c*); static void daTogeRoll_Execute(daTogeRoll_c*); static void daTogeRoll_Delete(daTogeRoll_c*); static void daTogeRoll_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6TogeRoll[12]; extern "C" void __ct__16daTogeRoll_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -262,21 +259,6 @@ void cM3d_InDivPos2(Vec const*, Vec const*, f32, Vec*); void cLib_addCalcPos(cXyz*, cXyz const&, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv6TogeRoll/executor.cpp b/rel/d/a/obj/d_a_obj_lv6TogeRoll/executor.cpp index 9a94d3c7e6f..3639be17b8b 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeRoll/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeRoll/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C799D0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6TogeRoll/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv6TogeRoll/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d01092c22f9..37b0c06b795 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeRoll/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeRoll/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C799DC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C799DC-80C799E4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C799DC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C79D30-80C79D38 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv6TogeRoll/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6TogeRoll/unknown_translation_unit_ctors.cpp index ee763081c0f..ee395d80beb 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeRoll/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeRoll/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C799D0[2]; -extern void* const data_80C799D0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6TogeRoll_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C799D0-80C799D8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C799D0[2] = { + (void*)__sinit_d_a_obj_lv6TogeRoll_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp b/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp index 64bac25cf40..6bd646eb40c 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeTrap/d_a_obj_lv6TogeTrap.cpp @@ -71,10 +71,6 @@ struct daLv6TogeTrap_HIO_c { /* 80C7C504 */ ~daLv6TogeTrap_HIO_c(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -83,6 +79,10 @@ struct cXyz { /* 8026702C */ bool operator==(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -220,10 +220,6 @@ static void daLv6TogeTrap_Draw(daLv6TogeTrap_c*); static void daLv6TogeTrap_Execute(daLv6TogeTrap_c*); static void daLv6TogeTrap_Delete(daLv6TogeTrap_c*); static void daLv6TogeTrap_Create(fopAc_ac_c*); -extern "C" extern u8 const l_dzbIdx[12]; -extern "C" extern u8 const data_80C7C6EC[6 + 2 /* padding */]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6TogeTrap[12]; extern "C" void __ct__19daLv6TogeTrap_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -304,21 +300,6 @@ void cM3d_Len3dSqPntAndSegLine(cM3dGLin const*, Vec const*, Vec*, f32*); void cLib_addCalcPos(cXyz*, cXyz const&, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv6TogeTrap/executor.cpp b/rel/d/a/obj/d_a_obj_lv6TogeTrap/executor.cpp index b1cd35c0b93..73ea20ba9e1 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeTrap/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeTrap/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C7C604[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6TogeTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv6TogeTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index edca36cc4ee..273bff6db69 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C7C610[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C7C610-80C7C618 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C7C610[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C7CA50-80C7CA58 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv6TogeTrap/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6TogeTrap/unknown_translation_unit_ctors.cpp index 3eaedc47d17..f177940e328 100644 --- a/rel/d/a/obj/d_a_obj_lv6TogeTrap/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6TogeTrap/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C7C604[2]; -extern void* const data_80C7C604[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6TogeTrap_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C7C604-80C7C60C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C7C604[2] = { + (void*)__sinit_d_a_obj_lv6TogeTrap_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp b/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp index 339a2311e76..96133b778a7 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos/d_a_obj_lv6bemos.cpp @@ -211,9 +211,6 @@ static void daObjL6Bm_MoveBGDelete(daObjL6Bm_c*); static void daObjL6Bm_MoveBGExecute(daObjL6Bm_c*); static void daObjL6Bm_MoveBGDraw(daObjL6Bm_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6bemos[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" void initBaseMtx__11daObjL6Bm_cFv(); @@ -267,23 +264,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80C7E138[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/executor.cpp b/rel/d/a/obj/d_a_obj_lv6bemos/executor.cpp index d5f1385f2a2..3da157ee268 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C7DEC4[4]; -extern u8 const data_80C7DEC8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_bss.cpp index e529ed042c9..946064aa310 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C7E138[4]; -extern "C" extern u8 data_80C7E138[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_ctors.cpp index e143a5987bf..953e8f8cd0d 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C7DEC4[4]; -extern u8 const data_80C7DEC4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C7DEC4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C7DEC4-80C7DEC8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C7DEC4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_dtors.cpp index ef9fa80f3b8..503a6c440d1 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C7DEC8[4]; -extern u8 const data_80C7DEC8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C7DEC8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C7DEC8-80C7DECC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C7DEC8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp b/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp index 3d2c4359c42..81f4d1df547 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/d_a_obj_lv6bemos2.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -25,6 +23,8 @@ struct cXyz { /* 8026706C */ bool operator!=(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -270,9 +270,6 @@ static void daObjLv6Bm_MoveBGExecute(daObjLv6Bm_c*); static void daObjLv6Bm_MoveBGDraw(daObjLv6Bm_c*); static void cLib_calcTimer__template0(u16*); static void cLib_calcTimer__template1(u8*); -extern "C" extern u32 const lit_5280; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6bemos2[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" void initBaseMtx__12daObjLv6Bm_cFv(); @@ -353,26 +350,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80C81FE8[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/executor.cpp b/rel/d/a/obj/d_a_obj_lv6bemos2/executor.cpp index 182da947dfa..aee45699bb6 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C81C20[2]; -extern u8 const data_80C81C28[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_bss.cpp index 898c3e8b6b5..3ccc7657c9b 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80C81FE8[4]; -extern "C" extern u8 struct_80C81FE8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_ctors.cpp index 09efb3b3982..ce463577382 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C81C20[2]; -extern void* const data_80C81C20[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv6bemos2_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C81C20-80C81C28 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C81C20[2] = { + (void*)__sinit_d_a_obj_lv6bemos2_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_dtors.cpp index 7688b4b3f00..931fd867f3b 100644 --- a/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6bemos2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C81C28[4]; -extern u8 const data_80C81C28[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C81C28[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C81C28-80C81C2C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C81C28[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp b/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp index b30e99108c4..50bd619e226 100644 --- a/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp +++ b/rel/d/a/obj/d_a_obj_lv6egate/d_a_obj_lv6egate.cpp @@ -36,14 +36,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -140,8 +140,6 @@ static void daObjLv6EGate_create1st(daObjLv6EGate_c*); static void daObjLv6EGate_MoveBGDelete(daObjLv6EGate_c*); static void daObjLv6EGate_MoveBGExecute(daObjLv6EGate_c*); static void daObjLv6EGate_MoveBGDraw(daObjLv6EGate_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv6EGate[12]; extern "C" void create1st__15daObjLv6EGate_cFv(); extern "C" void setMtx__15daObjLv6EGate_cFv(); @@ -176,17 +174,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_lv6egate/executor.cpp b/rel/d/a/obj/d_a_obj_lv6egate/executor.cpp index 9a99425fda9..9144294ef03 100644 --- a/rel/d/a/obj/d_a_obj_lv6egate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6egate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C82B68[4]; -extern u8 const data_80C82B6C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6egate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6egate/unknown_translation_unit_ctors.cpp index bbf9f4fe92f..fdc63408f29 100644 --- a/rel/d/a/obj/d_a_obj_lv6egate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6egate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C82B68[4]; -extern u8 const data_80C82B68[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C82B68[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C82B68-80C82B6C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C82B68[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6egate/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv6egate/unknown_translation_unit_dtors.cpp index a1c71905a71..183b43ba16b 100644 --- a/rel/d/a/obj/d_a_obj_lv6egate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6egate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C82B6C[4]; -extern u8 const data_80C82B6C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C82B6C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C82B6C-80C82B70 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C82B6C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp b/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp index 2a08588128e..5cbd03f4fd5 100644 --- a/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp +++ b/rel/d/a/obj/d_a_obj_lv6elevta/d_a_obj_lv6elevta.cpp @@ -34,12 +34,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -99,8 +99,6 @@ static void daObjLv6ElevtA_create1st(daObjLv6ElevtA_c*); static void daObjLv6ElevtA_MoveBGDelete(daObjLv6ElevtA_c*); static void daObjLv6ElevtA_MoveBGExecute(daObjLv6ElevtA_c*); static void daObjLv6ElevtA_MoveBGDraw(daObjLv6ElevtA_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Lv6ElevtA[12]; extern "C" void create1st__16daObjLv6ElevtA_cFv(); extern "C" void setMtx__16daObjLv6ElevtA_cFv(); @@ -140,14 +138,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv6elevta/executor.cpp b/rel/d/a/obj/d_a_obj_lv6elevta/executor.cpp index 6d33f79b53a..38cbf44ab3c 100644 --- a/rel/d/a/obj/d_a_obj_lv6elevta/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6elevta/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C83808[4]; -extern u8 const data_80C8380C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6elevta/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6elevta/unknown_translation_unit_ctors.cpp index 43e45919ade..2a56739c1da 100644 --- a/rel/d/a/obj/d_a_obj_lv6elevta/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6elevta/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C83808[4]; -extern u8 const data_80C83808[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C83808[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C83808-80C8380C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C83808[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6elevta/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv6elevta/unknown_translation_unit_dtors.cpp index 34d88f0f529..5086f42046b 100644 --- a/rel/d/a/obj/d_a_obj_lv6elevta/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6elevta/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C8380C[4]; -extern u8 const data_80C8380C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C8380C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C8380C-80C83810 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C8380C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp b/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp index 3881415956c..bdf61b41018 100644 --- a/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp +++ b/rel/d/a/obj/d_a_obj_lv6swturn/d_a_obj_lv6swturn.cpp @@ -107,9 +107,6 @@ static void daObjLv6SwTurn_create1st(daObjLv6SwTurn_c*); static void daObjLv6SwTurn_MoveBGDelete(daObjLv6SwTurn_c*); static void daObjLv6SwTurn_MoveBGExecute(daObjLv6SwTurn_c*); static void daObjLv6SwTurn_MoveBGDraw(daObjLv6SwTurn_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv6SwTurn[12]; extern "C" static void PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); extern "C" void initBaseMtx__16daObjLv6SwTurn_cFv(); @@ -148,15 +145,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_addCalcAngleS2(s16*, s16, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80C847A0[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv6swturn/executor.cpp b/rel/d/a/obj/d_a_obj_lv6swturn/executor.cpp index 6b44269213c..30a3bf812e6 100644 --- a/rel/d/a/obj/d_a_obj_lv6swturn/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv6swturn/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C8469C[4]; -extern u8 const data_80C846A0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_bss.cpp index a9d8719879f..11d3caec6c5 100644 --- a/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C847A0[4]; -extern "C" extern u8 data_80C847A0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_ctors.cpp index cfbd7107fc4..60badf4223f 100644 --- a/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C8469C[4]; -extern u8 const data_80C8469C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C8469C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C8469C-80C846A0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C8469C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_dtors.cpp index aff1bee8e90..a1ee166743c 100644 --- a/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv6swturn/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C846A0[4]; -extern u8 const data_80C846A0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C846A0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C846A0-80C846A4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C846A0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp b/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp index 2b019740d5e..12914b6273c 100644 --- a/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp +++ b/rel/d/a/obj/d_a_obj_lv7BsGate/d_a_obj_lv7BsGate.cpp @@ -108,8 +108,6 @@ static void daLv7BsGate_Draw(daLv7BsGate_c*); static void daLv7BsGate_Execute(daLv7BsGate_c*); static void daLv7BsGate_Delete(daLv7BsGate_c*); static void daLv7BsGate_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv7BsGate[12]; extern "C" void __ct__17daLv7BsGate_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -149,13 +147,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_lv7BsGate/executor.cpp b/rel/d/a/obj/d_a_obj_lv7BsGate/executor.cpp index a5a0b459bfd..b41c24d833d 100644 --- a/rel/d/a/obj/d_a_obj_lv7BsGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv7BsGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C851FC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv7BsGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv7BsGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 968ffcb2103..8003f6fcc3f 100644 --- a/rel/d/a/obj/d_a_obj_lv7BsGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv7BsGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C85208[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C85208-80C85210 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C85208[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C85358-80C85360 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv7BsGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv7BsGate/unknown_translation_unit_ctors.cpp index 357dc8bf952..d8d6d8d76aa 100644 --- a/rel/d/a/obj/d_a_obj_lv7BsGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv7BsGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C851FC[2]; -extern void* const data_80C851FC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv7BsGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C851FC-80C85204 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C851FC[2] = { + (void*)__sinit_d_a_obj_lv7BsGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp b/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp index 83d9ee56b18..bc1d293b579 100644 --- a/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp +++ b/rel/d/a/obj/d_a_obj_lv7PropellerY/d_a_obj_lv7PropellerY.cpp @@ -48,12 +48,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -103,8 +103,6 @@ static void daPropY_Draw(daPropY_c*); static void daPropY_Execute(daPropY_c*); static void daPropY_Delete(daPropY_c*); static void daPropY_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv7PropY[12]; extern "C" void __ct__13daPropY_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -149,13 +147,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv7PropellerY/executor.cpp b/rel/d/a/obj/d_a_obj_lv7PropellerY/executor.cpp index 71a77b73056..6919ffda2ec 100644 --- a/rel/d/a/obj/d_a_obj_lv7PropellerY/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv7PropellerY/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C8611C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv7PropellerY/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv7PropellerY/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 1c3c2d870d6..5c4bd8bb8bb 100644 --- a/rel/d/a/obj/d_a_obj_lv7PropellerY/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv7PropellerY/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C86128[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C86128-80C86130 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C86128[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C862B8-80C862C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv7PropellerY/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv7PropellerY/unknown_translation_unit_ctors.cpp index a6582dd473f..b844b7da9bb 100644 --- a/rel/d/a/obj/d_a_obj_lv7PropellerY/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv7PropellerY/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C8611C[2]; -extern void* const data_80C8611C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv7PropellerY_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C8611C-80C86124 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C8611C[2] = { + (void*)__sinit_d_a_obj_lv7PropellerY_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp b/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp index 17a6bdf1153..e0261eae66a 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp +++ b/rel/d/a/obj/d_a_obj_lv7bridge/d_a_obj_lv7bridge.cpp @@ -217,8 +217,6 @@ static void daObjLv7Brg_create1st(daObjLv7Brg_c*); static void daObjLv7Brg_MoveBGDelete(daObjLv7Brg_c*); static void daObjLv7Brg_MoveBGExecute(daObjLv7Brg_c*); static void daObjLv7Brg_MoveBGDraw(daObjLv7Brg_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv7Bridge[12]; extern "C" static void searchSwSpinner__FPvPv(); extern "C" void search_swspinner__13daObjLv7Brg_cFv(); @@ -270,19 +268,6 @@ void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs void cLib_addCalc(f32*, f32, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80C87BB8[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/executor.cpp b/rel/d/a/obj/d_a_obj_lv7bridge/executor.cpp index a87c99f7ac0..24c0d2fbabf 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv7bridge/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C87998[4]; -extern u8 const data_80C8799C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_bss.cpp index 9a697a5cbab..a08da1d9324 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C87BB8[4]; -extern "C" extern u8 data_80C87BB8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_ctors.cpp index 54549c7410e..abc00d09bf2 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C87998[4]; -extern u8 const data_80C87998[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C87998[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C87998-80C8799C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C87998[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_dtors.cpp index 0e014f87146..a789a1d6abb 100644 --- a/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_lv7bridge/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C8799C[4]; -extern u8 const data_80C8799C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C8799C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C8799C-80C879A0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C8799C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp index ae5716003a5..dfcd4cd9017 100644 --- a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp +++ b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/d_a_obj_lv8KekkaiTrap.cpp @@ -44,12 +44,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -101,9 +101,6 @@ static void daKekaiTrap_Draw(daKekaiTrap_c*); static void daKekaiTrap_Execute(daKekaiTrap_c*); static void daKekaiTrap_Delete(daKekaiTrap_c*); static void daKekaiTrap_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv8KekkaiTrap[12]; extern "C" void __ct__17daKekaiTrap_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -144,12 +141,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/executor.cpp b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/executor.cpp index 58fcd0afbe4..74640637c47 100644 --- a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C884D0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4e4cb9cf4cb..87e91b54b79 100644 --- a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C884DC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C884DC-80C884E4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C884DC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C88608-80C88610 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/unknown_translation_unit_ctors.cpp index f3df2a30b6b..d13574807c8 100644 --- a/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv8KekkaiTrap/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C884D0[2]; -extern void* const data_80C884D0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv8KekkaiTrap_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C884D0-80C884D8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C884D0[2] = { + (void*)__sinit_d_a_obj_lv8KekkaiTrap_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp b/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp index 1da8c2308a8..70880296d30 100644 --- a/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp +++ b/rel/d/a/obj/d_a_obj_lv8Lift/d_a_obj_lv8Lift.cpp @@ -82,10 +82,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -93,6 +89,10 @@ struct cXyz { /* 8026702C */ bool operator==(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -186,9 +186,6 @@ static void daL8Lift_Draw(daL8Lift_c*); static void daL8Lift_Execute(daL8Lift_c*); static void daL8Lift_Delete(daL8Lift_c*); static void daL8Lift_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv8Lift[12]; extern "C" void __ct__14daL8Lift_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -256,14 +253,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void cLib_addCalcPos(cXyz*, cXyz const&, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv8Lift/executor.cpp b/rel/d/a/obj/d_a_obj_lv8Lift/executor.cpp index ff11aa29fef..6668bcab548 100644 --- a/rel/d/a/obj/d_a_obj_lv8Lift/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv8Lift/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C89F4C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv8Lift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv8Lift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 7a8288edae2..c0585db101a 100644 --- a/rel/d/a/obj/d_a_obj_lv8Lift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv8Lift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C89F58[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C89F58-80C89F60 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C89F58[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C8A1E0-80C8A1E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv8Lift/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv8Lift/unknown_translation_unit_ctors.cpp index fa105f079ad..7c8ca2deeef 100644 --- a/rel/d/a/obj/d_a_obj_lv8Lift/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv8Lift/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C89F4C[2]; -extern void* const data_80C89F4C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv8Lift_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C89F4C-80C89F54 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C89F4C[2] = { + (void*)__sinit_d_a_obj_lv8Lift_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp b/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp index 201f32e2b94..b73ec8715ce 100644 --- a/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp +++ b/rel/d/a/obj/d_a_obj_lv8OptiLift/d_a_obj_lv8OptiLift.cpp @@ -82,10 +82,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -93,6 +89,10 @@ struct cXyz { /* 8026702C */ bool operator==(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -160,9 +160,6 @@ static void daOptiLift_Draw(daOptiLift_c*); static void daOptiLift_Execute(daOptiLift_c*); static void daOptiLift_Delete(daOptiLift_c*); static void daOptiLift_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv8OptiLift[12]; extern "C" void __ct__16daOptiLift_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -225,14 +222,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void cLib_addCalcPos(cXyz*, cXyz const&, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_lv8OptiLift/executor.cpp b/rel/d/a/obj/d_a_obj_lv8OptiLift/executor.cpp index ecdc9b2e215..7178ac31360 100644 --- a/rel/d/a/obj/d_a_obj_lv8OptiLift/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv8OptiLift/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C8B998[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv8OptiLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv8OptiLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4de4872b600..8593f60df73 100644 --- a/rel/d/a/obj/d_a_obj_lv8OptiLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv8OptiLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C8B9A4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C8B9A4-80C8B9AC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C8B9A4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C8BBD8-80C8BBE0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv8OptiLift/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv8OptiLift/unknown_translation_unit_ctors.cpp index ac2fd1ee437..367efb5109a 100644 --- a/rel/d/a/obj/d_a_obj_lv8OptiLift/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv8OptiLift/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C8B998[2]; -extern void* const data_80C8B998[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv8OptiLift_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C8B998-80C8B9A0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C8B998[2] = { + (void*)__sinit_d_a_obj_lv8OptiLift_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp b/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp index a9ee1e2910b..849142d2825 100644 --- a/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp +++ b/rel/d/a/obj/d_a_obj_lv8UdFloor/d_a_obj_lv8UdFloor.cpp @@ -112,8 +112,6 @@ static void daUdFloor_Draw(daUdFloor_c*); static void daUdFloor_Execute(daUdFloor_c*); static void daUdFloor_Delete(daUdFloor_c*); static void daUdFloor_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv8UdFloor[12]; extern "C" void __ct__15daUdFloor_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -159,13 +157,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_lv8UdFloor/executor.cpp b/rel/d/a/obj/d_a_obj_lv8UdFloor/executor.cpp index 3df4dc6ce0a..a51abde676c 100644 --- a/rel/d/a/obj/d_a_obj_lv8UdFloor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv8UdFloor/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C8CBDC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv8UdFloor/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv8UdFloor/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d05a3a04b2e..a4f220f3523 100644 --- a/rel/d/a/obj/d_a_obj_lv8UdFloor/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv8UdFloor/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C8CBE8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C8CBE8-80C8CBF0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C8CBE8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C8CD78-80C8CD80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv8UdFloor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv8UdFloor/unknown_translation_unit_ctors.cpp index 6de6144970d..c27fa2423f6 100644 --- a/rel/d/a/obj/d_a_obj_lv8UdFloor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv8UdFloor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C8CBDC[2]; -extern void* const data_80C8CBDC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv8UdFloor_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C8CBDC-80C8CBE4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C8CBDC[2] = { + (void*)__sinit_d_a_obj_lv8UdFloor_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp b/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp index d94b720572a..6645e6c91e9 100644 --- a/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp +++ b/rel/d/a/obj/d_a_obj_lv9SwShutter/d_a_obj_lv9SwShutter.cpp @@ -48,12 +48,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -104,9 +104,6 @@ static void daLv9SwShutter_Draw(daLv9SwShutter_c*); static void daLv9SwShutter_Execute(daLv9SwShutter_c*); static void daLv9SwShutter_Delete(daLv9SwShutter_c*); static void daLv9SwShutter_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Lv9SwShutter[12]; extern "C" void __ct__20daLv9SwShutter_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -149,13 +146,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_lv9SwShutter/executor.cpp b/rel/d/a/obj/d_a_obj_lv9SwShutter/executor.cpp index c889ab3d996..026ee5e3893 100644 --- a/rel/d/a/obj/d_a_obj_lv9SwShutter/executor.cpp +++ b/rel/d/a/obj/d_a_obj_lv9SwShutter/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C8D7C8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_lv9SwShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_lv9SwShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 21a60175c5b..79d08e2ecbc 100644 --- a/rel/d/a/obj/d_a_obj_lv9SwShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_lv9SwShutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C8D7D4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C8D7D4-80C8D7DC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C8D7D4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C8D908-80C8D910 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_lv9SwShutter/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_lv9SwShutter/unknown_translation_unit_ctors.cpp index ebde6ddd3d6..f748a61fb5d 100644 --- a/rel/d/a/obj/d_a_obj_lv9SwShutter/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_lv9SwShutter/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C8D7C8[2]; -extern void* const data_80C8D7C8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_lv9SwShutter_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C8D7C8-80C8D7D0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C8D7C8[2] = { + (void*)__sinit_d_a_obj_lv9SwShutter_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp b/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp index d81886eb9e0..13b4d37da08 100644 --- a/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp +++ b/rel/d/a/obj/d_a_obj_magLift/d_a_obj_magLift.cpp @@ -51,10 +51,6 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -62,6 +58,10 @@ struct cXyz { /* 8026702C */ bool operator==(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -103,9 +103,6 @@ static void daMagLift_Draw(daMagLift_c*); static void daMagLift_Execute(daMagLift_c*); static void daMagLift_Delete(daMagLift_c*); static void daMagLift_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_MagLift[12]; extern "C" void __ct__15daMagLift_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -154,13 +151,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalcPos(cXyz*, cXyz const&, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_magLift/executor.cpp b/rel/d/a/obj/d_a_obj_magLift/executor.cpp index ef50f51a915..8ca4a7ec30e 100644 --- a/rel/d/a/obj/d_a_obj_magLift/executor.cpp +++ b/rel/d/a/obj/d_a_obj_magLift/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C8E648[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_magLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_magLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 478970e777b..c04a797d560 100644 --- a/rel/d/a/obj/d_a_obj_magLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_magLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C8E654[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C8E654-80C8E65C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C8E654[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C8E840-80C8E848 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_magLift/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_magLift/unknown_translation_unit_ctors.cpp index 23b76bdcd04..fae9fdb18e1 100644 --- a/rel/d/a/obj/d_a_obj_magLift/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_magLift/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C8E648[2]; -extern void* const data_80C8E648[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_magLift_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C8E648-80C8E650 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C8E648[2] = { + (void*)__sinit_d_a_obj_magLift_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp index 13577768ef8..ebd9c492c97 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp +++ b/rel/d/a/obj/d_a_obj_magLiftRot/d_a_obj_magLiftRot.cpp @@ -69,12 +69,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -129,8 +129,6 @@ static void daMagLiftRot_Draw(daMagLiftRot_c*); static void daMagLiftRot_Execute(daMagLiftRot_c*); static void daMagLiftRot_Delete(daMagLiftRot_c*); static void daMagLiftRot_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_MagLiftRot[12]; extern "C" void __ct__18daMagLiftRot_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -174,14 +172,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/executor.cpp b/rel/d/a/obj/d_a_obj_magLiftRot/executor.cpp index 3a5363eba71..d3f75d8d537 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/executor.cpp +++ b/rel/d/a/obj/d_a_obj_magLiftRot/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C8FAD4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_magLiftRot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index a071ca6f503..43745ae0d73 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_magLiftRot/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C8FAE0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C8FAE0-80C8FAE8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C8FAE0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C8FCB8-80C8FCC0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_magLiftRot/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_magLiftRot/unknown_translation_unit_ctors.cpp index 1b00d00da1d..84ab04931dd 100644 --- a/rel/d/a/obj/d_a_obj_magLiftRot/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_magLiftRot/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C8FAD4[2]; -extern void* const data_80C8FAD4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_magLiftRot_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C8FAD4-80C8FADC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C8FAD4[2] = { + (void*)__sinit_d_a_obj_magLiftRot_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp b/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp index cf10a20da18..363a79daaf9 100644 --- a/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp +++ b/rel/d/a/obj/d_a_obj_magne_arm/d_a_obj_magne_arm.cpp @@ -47,11 +47,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -275,52 +275,6 @@ static void daObjMarm_MoveBGDelete(daObjMarm_c*); static void daObjMarm_MoveBGExecute(daObjMarm_c*); static void daObjMarm_MoveBGDraw(daObjMarm_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u8 const data_805928D0[12]; -extern "C" extern u8 const data_805928DC[12]; -extern "C" extern u8 const data_805928E8[12]; -extern "C" extern u8 const data_805928F4[12]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_MagneArm[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80592DAC[4]; -extern "C" extern u8 data_80592DB0[4]; -extern "C" extern u8 data_80592DB4[4]; -extern "C" extern u8 data_80592DB8[4]; -extern "C" extern u8 data_80592DBC[4]; -extern "C" extern u8 data_80592DC0[4]; -extern "C" extern u8 data_80592DC4[4]; -extern "C" extern u8 data_80592DC8[4]; -extern "C" extern u8 data_80592DCC[4]; -extern "C" extern u8 data_80592DD0[4]; -extern "C" extern u8 data_80592DD4[4]; -extern "C" extern u8 data_80592DD8[4]; -extern "C" extern u8 data_80592DDC[4]; -extern "C" extern u8 data_80592DE0[4]; -extern "C" extern u8 data_80592DE4[4]; -extern "C" extern u8 data_80592DE8[4]; -extern "C" extern u8 data_80592DEC[4]; -extern "C" extern u8 data_80592DF0[4]; -extern "C" extern u8 data_80592DF4[4]; -extern "C" extern u8 data_80592DF8[4]; -extern "C" extern u8 data_80592DFC[4]; -extern "C" extern u8 data_80592E00[4]; -extern "C" extern u8 data_80592E04[4]; -extern "C" extern u8 data_80592E08[4]; -extern "C" extern u8 data_80592E0C[4]; extern "C" void getBpartsOffset__11daObjMarm_cFP4cXyz(); extern "C" void getDpartsOffset__11daObjMarm_cFP4cXyz(); @@ -479,23 +433,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_magne_arm/executor.cpp b/rel/d/a/obj/d_a_obj_magne_arm/executor.cpp index c3c4aac7ca8..7821f6c4907 100644 --- a/rel/d/a/obj/d_a_obj_magne_arm/executor.cpp +++ b/rel/d/a/obj/d_a_obj_magne_arm/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80592840[4]; -extern u8 const data_80592844[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_magne_arm/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_magne_arm/unknown_translation_unit_ctors.cpp index 82667e3261d..dff78ece943 100644 --- a/rel/d/a/obj/d_a_obj_magne_arm/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_magne_arm/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80592840[4]; -extern u8 const data_80592840[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80592840[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80592840-80592844 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80592840[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_magne_arm/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_magne_arm/unknown_translation_unit_dtors.cpp index e3cdfa5d0b6..6dd03334dd4 100644 --- a/rel/d/a/obj/d_a_obj_magne_arm/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_magne_arm/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80592844[4]; -extern u8 const data_80592844[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80592844[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80592844-80592848 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80592844[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp b/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp index ac45c86dc32..80f8982e6d9 100644 --- a/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp +++ b/rel/d/a/obj/d_a_obj_maki/d_a_obj_maki.cpp @@ -42,12 +42,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -142,8 +142,6 @@ static bool daObj_Maki_IsDelete(obj_maki_class*); static void daObj_Maki_Delete(obj_maki_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Maki_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_MAKI[12]; extern "C" void __ct__16daObj_Maki_HIO_cFv(); extern "C" static void daObj_Maki_Draw__FP14obj_maki_class(); @@ -177,17 +175,6 @@ void dKy_plight_set(LIGHT_INFLUENCE*); void dKy_plight_cut(LIGHT_INFLUENCE*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_maki/executor.cpp b/rel/d/a/obj/d_a_obj_maki/executor.cpp index ed8befe11e1..1ba4bff69aa 100644 --- a/rel/d/a/obj/d_a_obj_maki/executor.cpp +++ b/rel/d/a/obj/d_a_obj_maki/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C90920[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_maki/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_maki/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f7b7e62f617..d5a3cf678e9 100644 --- a/rel/d/a/obj/d_a_obj_maki/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_maki/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C9092C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C9092C-80C90934 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C9092C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C90A48-80C90A50 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_maki/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_maki/unknown_translation_unit_ctors.cpp index 394b0454de5..5f58a3cb8e2 100644 --- a/rel/d/a/obj/d_a_obj_maki/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_maki/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C90920[2]; -extern void* const data_80C90920[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_maki_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C90920-80C90928 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C90920[2] = { + (void*)__sinit_d_a_obj_maki_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp index ac62488fa1b..f7f49e6487e 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp +++ b/rel/d/a/obj/d_a_obj_master_sword/d_a_obj_master_sword.cpp @@ -177,9 +177,6 @@ static void daObjMasterSword_Delete(daObjMasterSword_c*); static void daObjMasterSword_Execute(daObjMasterSword_c*); static void daObjMasterSword_Draw(daObjMasterSword_c*); static bool daObjMasterSword_IsDelete(daObjMasterSword_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_MasterSword[12]; extern "C" void initWait__18daObjMasterSword_cFv(); extern "C" void executeWait__18daObjMasterSword_cFv(); @@ -227,21 +224,6 @@ void dComIfGs_setSelectEquipSword(u8); void dMeter2Info_setCloth(u8, bool); void dMeter2Info_setSword(u8, bool); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 data_80C91AD0[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_master_sword/executor.cpp b/rel/d/a/obj/d_a_obj_master_sword/executor.cpp index 02e9b0455ed..9b353bf0173 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/executor.cpp +++ b/rel/d/a/obj/d_a_obj_master_sword/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C91934[2]; -extern u8 const data_80C9193C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_bss.cpp index d40e5ca59bf..b891b6d43b8 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80C91AD0[4]; -extern "C" extern u8 data_80C91AD0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_ctors.cpp index 435f6b489de..ced44c8f791 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C91934[2]; -extern void* const data_80C91934[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_master_sword_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C91934-80C9193C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C91934[2] = { + (void*)__sinit_d_a_obj_master_sword_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_dtors.cpp index c3ff59b64f9..07c4e42b489 100644 --- a/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_master_sword/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C9193C[4]; -extern u8 const data_80C9193C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C9193C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C9193C-80C91940 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C9193C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp b/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp index e90922b22ab..74ec32644e6 100644 --- a/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp +++ b/rel/d/a/obj/d_a_obj_mato/d_a_obj_mato.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -137,8 +137,6 @@ static void daObjMATO_Delete(daObjMATO_c*); static void daObjMATO_Draw(daObjMATO_c*); static void daObjMATO_Execute(daObjMATO_c*); static bool daObjMATO_IsDelete(daObjMATO_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Mato[12]; extern "C" void setAction__11daObjMATO_cFM11daObjMATO_cFPCvPvi_vi(); extern "C" static void useHeapInit__FP10fopAc_ac_c(); @@ -179,17 +177,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dPath_GetRoomPath(int, int); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_mato/executor.cpp b/rel/d/a/obj/d_a_obj_mato/executor.cpp index b47714a57ce..c00e0e4cbae 100644 --- a/rel/d/a/obj/d_a_obj_mato/executor.cpp +++ b/rel/d/a/obj/d_a_obj_mato/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C92C48[4]; -extern u8 const data_80C92C4C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_mato/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_mato/unknown_translation_unit_ctors.cpp index 92d54fca67b..6b2fe96f259 100644 --- a/rel/d/a/obj/d_a_obj_mato/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_mato/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C92C48[4]; -extern u8 const data_80C92C48[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C92C48[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C92C48-80C92C4C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C92C48[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_mato/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_mato/unknown_translation_unit_dtors.cpp index e890a8f69bd..6ee85425011 100644 --- a/rel/d/a/obj/d_a_obj_mato/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_mato/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C92C4C[4]; -extern u8 const data_80C92C4C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C92C4C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C92C4C-80C92C50 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C92C4C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp b/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp index 411a6303513..b5ea8ac3339 100644 --- a/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp +++ b/rel/d/a/obj/d_a_obj_metalbox/d_a_obj_metalbox.cpp @@ -26,12 +26,12 @@ struct daObjMBox_c { /* 80593394 */ void Delete(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -107,8 +107,6 @@ static void daObjMBox_Draw(daObjMBox_c*); static void daObjMBox_Execute(daObjMBox_c*); static void daObjMBox_Delete(daObjMBox_c*); static void daObjMBox_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_MetalBox[12]; extern "C" void initBaseMtx__11daObjMBox_cFv(); extern "C" void setBaseMtx__11daObjMBox_cFv(); @@ -142,17 +140,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_metalbox/executor.cpp b/rel/d/a/obj/d_a_obj_metalbox/executor.cpp index 91b005c3848..b85880a9d53 100644 --- a/rel/d/a/obj/d_a_obj_metalbox/executor.cpp +++ b/rel/d/a/obj/d_a_obj_metalbox/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80593464[4]; -extern u8 const data_80593468[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_metalbox/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_metalbox/unknown_translation_unit_ctors.cpp index 6ab3acbcadf..474d7c806ae 100644 --- a/rel/d/a/obj/d_a_obj_metalbox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_metalbox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80593464[4]; -extern u8 const data_80593464[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80593464[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80593464-80593468 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80593464[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_metalbox/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_metalbox/unknown_translation_unit_dtors.cpp index adbb76c666b..09a950eaf19 100644 --- a/rel/d/a/obj/d_a_obj_metalbox/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_metalbox/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80593468[4]; -extern u8 const data_80593468[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80593468[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80593468-8059346C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80593468[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp index 1c7ef1cb43a..db2813dea33 100644 --- a/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.cpp @@ -85,11 +85,6 @@ static void daObjMGate_create1st(daObjMGate_c*); static void daObjMGate_MoveBGDelete(daObjMGate_c*); static void daObjMGate_MoveBGExecute(daObjMGate_c*); static void daObjMGate_MoveBGDraw(daObjMGate_c*); -extern "C" extern u8 const l_col_offsetX[20]; -extern "C" extern u8 const lit_3752[4]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_MGate[12]; extern "C" void initBaseMtx__12daObjMGate_cFv(); extern "C" void setBaseMtx__12daObjMGate_cFv(); @@ -125,14 +120,6 @@ void dComIfGp_getReverb(int); void dLib_checkActorInRectangle(fopAc_ac_c*, fopAc_ac_c*, cXyz const*, cXyz const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc0(f32*, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_mgate/executor.cpp b/rel/d/a/obj/d_a_obj_mgate/executor.cpp index 51f8a067d4e..895dce13bd5 100644 --- a/rel/d/a/obj/d_a_obj_mgate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80593E40[4]; -extern u8 const data_80593E44[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_mgate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_mgate/unknown_translation_unit_ctors.cpp index 72015338831..f28e4c4a160 100644 --- a/rel/d/a/obj/d_a_obj_mgate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80593E40[4]; -extern u8 const data_80593E40[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80593E40[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80593E40-80593E44 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80593E40[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_mgate/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_mgate/unknown_translation_unit_dtors.cpp index 95852df7ced..8122f91e482 100644 --- a/rel/d/a/obj/d_a_obj_mgate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_mgate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80593E44[4]; -extern u8 const data_80593E44[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80593E44[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80593E44-80593E48 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80593E44[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp b/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp index fdfd4f7b073..1284db4a192 100644 --- a/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp +++ b/rel/d/a/obj/d_a_obj_mhole/d_a_obj_mhole.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -159,7 +159,6 @@ static void daObjMHole_Draw(daObjMHole_c*); static void daObjMHole_Execute(daObjMHole_c*); static void daObjMHole_Delete(daObjMHole_c*); static void daObjMHole_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_MHole[12]; extern "C" static void searchParentSub__FPvPv(); extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); @@ -204,19 +203,6 @@ void dKyw_get_wind_vec(); void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_mhole/executor.cpp b/rel/d/a/obj/d_a_obj_mhole/executor.cpp index 2cb6b709743..416a1a6cb5c 100644 --- a/rel/d/a/obj/d_a_obj_mhole/executor.cpp +++ b/rel/d/a/obj/d_a_obj_mhole/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C93D80[4]; -extern u8 const data_80C93D84[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_mhole/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_mhole/unknown_translation_unit_ctors.cpp index 565a46cdb68..8614fbae856 100644 --- a/rel/d/a/obj/d_a_obj_mhole/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_mhole/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C93D80[4]; -extern u8 const data_80C93D80[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C93D80[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C93D80-80C93D84 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C93D80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_mhole/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_mhole/unknown_translation_unit_dtors.cpp index 3dbf34bec1a..b9b3fcfa9a8 100644 --- a/rel/d/a/obj/d_a_obj_mhole/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_mhole/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C93D84[4]; -extern u8 const data_80C93D84[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C93D84[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C93D84-80C93D88 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C93D84[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp b/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp index f22fd8c0de0..d347cfb2771 100644 --- a/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp +++ b/rel/d/a/obj/d_a_obj_mie/d_a_obj_mie.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,6 +21,8 @@ struct cXyz { /* 80C9453C */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -197,47 +197,6 @@ static void daObj_Mie_Execute(void*); static void daObj_Mie_Draw(void*); static bool daObj_Mie_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern void* g_profile_OBJ_MIE[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80C95D3C[4]; -extern "C" extern u8 data_80C95D40[4]; -extern "C" extern u8 data_80C95D44[4]; -extern "C" extern u8 data_80C95D48[4]; -extern "C" extern u8 data_80C95D4C[4]; -extern "C" extern u8 data_80C95D50[4]; -extern "C" extern u8 data_80C95D54[4]; -extern "C" extern u8 data_80C95D58[4]; -extern "C" extern u8 data_80C95D5C[4]; -extern "C" extern u8 data_80C95D60[4]; -extern "C" extern u8 data_80C95D64[4]; -extern "C" extern u8 data_80C95D68[4]; -extern "C" extern u8 data_80C95D6C[4]; -extern "C" extern u8 data_80C95D70[4]; -extern "C" extern u8 data_80C95D74[4]; -extern "C" extern u8 data_80C95D78[4]; -extern "C" extern u8 data_80C95D7C[4]; -extern "C" extern u8 data_80C95D80[4]; -extern "C" extern u8 data_80C95D84[4]; -extern "C" extern u8 data_80C95D88[4]; -extern "C" extern u8 data_80C95D8C[4]; -extern "C" extern u8 data_80C95D90[4]; -extern "C" extern u8 data_80C95D94[4]; -extern "C" extern u8 data_80C95D98[4]; -extern "C" extern u8 data_80C95D9C[4]; extern "C" void __dt__11daObj_Mie_cFv(); extern "C" void create__11daObj_Mie_cFv(); @@ -347,19 +306,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_mie/executor.cpp b/rel/d/a/obj/d_a_obj_mie/executor.cpp index 723acda9071..b9e204af648 100644 --- a/rel/d/a/obj/d_a_obj_mie/executor.cpp +++ b/rel/d/a/obj/d_a_obj_mie/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C95A98[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_mie/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_mie/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b9c37f6bbe8..419a48d7bfa 100644 --- a/rel/d/a/obj/d_a_obj_mie/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_mie/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C95AA4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C95AA4-80C95AAC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C95AA4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C95CC8-80C95CD0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_mie/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_mie/unknown_translation_unit_ctors.cpp index b12cad82ae0..754ff393921 100644 --- a/rel/d/a/obj/d_a_obj_mie/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_mie/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C95A98[2]; -extern void* const data_80C95A98[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_mie_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C95A98-80C95AA0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C95A98[2] = { + (void*)__sinit_d_a_obj_mie_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp index a6d194a2b2a..91838696caf 100644 --- a/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp +++ b/rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.cpp @@ -13,10 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - -struct Quaternion {}; - struct Vec {}; struct cXyz { @@ -25,6 +21,10 @@ struct cXyz { /* 8047DBEC */ cXyz(); }; +struct Quaternion {}; + +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -36,17 +36,15 @@ struct mDoMtx_stack_c { struct fopAc_ac_c {}; -struct dBgW_Base { - struct PushPullLabel {}; -}; - struct dBgW { /* 8007B9C0 */ void Move(); }; -struct daObjMovebox { - struct BgcSrc_c {}; +struct dBgW_Base { + struct PushPullLabel {}; +}; +struct daObjMovebox { struct Act_c { struct Prm_e {}; @@ -83,6 +81,8 @@ struct daObjMovebox { /* 804808FC */ void Delete(); }; + struct BgcSrc_c {}; + struct Bgc_c { /* 8047DAEC */ Bgc_c(); /* 8047DBF0 */ void gnd_pos(daObjMovebox::Act_c const*, daObjMovebox::BgcSrc_c const*, int, @@ -290,53 +290,6 @@ struct J3DModel {}; // Forward References: // -extern "C" extern u32 const lit_4774; -extern "C" extern u32 const lit_4775; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Movebox[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 lit_4762[12 + 4 /* padding */]; -extern "C" extern u8 data_80482BEC[12]; -extern "C" extern u8 data_80482BF8[4]; -extern "C" extern u8 data_80482BFC[4]; -extern "C" extern u8 data_80482C00[4]; -extern "C" extern u8 data_80482C04[4]; -extern "C" extern u8 data_80482C08[4]; -extern "C" extern u8 data_80482C0C[4]; -extern "C" extern u8 data_80482C10[4]; -extern "C" extern u8 data_80482C14[4]; -extern "C" extern u8 data_80482C18[4]; -extern "C" extern u8 data_80482C1C[4]; -extern "C" extern u8 data_80482C20[4]; -extern "C" extern u8 data_80482C24[4]; -extern "C" extern u8 data_80482C28[4]; -extern "C" extern u8 data_80482C2C[4]; -extern "C" extern u8 data_80482C30[4]; -extern "C" extern u8 data_80482C34[4]; -extern "C" extern u8 data_80482C38[4]; -extern "C" extern u8 data_80482C3C[4]; -extern "C" extern u8 data_80482C40[4]; -extern "C" extern u8 data_80482C44[4]; -extern "C" extern u8 data_80482C48[4]; -extern "C" extern u8 data_80482C4C[4]; -extern "C" extern u8 data_80482C50[4]; -extern "C" extern u8 data_80482C54[4]; -extern "C" extern u8 data_80482C58[4]; - extern "C" void __ct__Q212daObjMovebox5Bgc_cFv(); extern "C" void __dt__4cXyzFv(); extern "C" void __ct__4cXyzFv(); @@ -480,24 +433,6 @@ void dBgS_MoveBGProc_Trans(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXy void dKy_pol_sound_get(cBgS_PolyInfo const*); void cM_rnd(); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_max; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern void* M_dir_base__Q212daObjMovebox5Act_c[2]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_movebox/executor.cpp b/rel/d/a/obj/d_a_obj_movebox/executor.cpp index 0632cf106c2..b594bf77e60 100644 --- a/rel/d/a/obj/d_a_obj_movebox/executor.cpp +++ b/rel/d/a/obj/d_a_obj_movebox/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80480F14[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_movebox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_movebox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b4157431971..a0a9ca0b504 100644 --- a/rel/d/a/obj/d_a_obj_movebox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_movebox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80480F20[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80480F20-80480F28 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80480F20[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80481880-80481888 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_movebox/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_movebox/unknown_translation_unit_ctors.cpp index 79fc6562b48..b2900be49c4 100644 --- a/rel/d/a/obj/d_a_obj_movebox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_movebox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80480F14[2]; -extern void* const data_80480F14[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_movebox_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80480F14-80480F1C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80480F14[2] = { + (void*)__sinit_d_a_obj_movebox_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp b/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp index 83215a99d08..eb8f4b5b9df 100644 --- a/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp +++ b/rel/d/a/obj/d_a_obj_msima/d_a_obj_msima.cpp @@ -60,10 +60,6 @@ struct dSv_memBit_c { /* 80034934 */ void isDungeonItem(int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { @@ -73,6 +69,10 @@ struct cXyz { /* 80C9B890 */ ~cXyz(); }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -157,47 +157,6 @@ static bool daObj_Msima_IsDelete(obj_msima_class*); static void daObj_Msima_Delete(obj_msima_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Msima_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_MSIMA[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80C9CFA0[4]; -extern "C" extern u8 data_80C9CFA4[4]; -extern "C" extern u8 data_80C9CFA8[4]; -extern "C" extern u8 data_80C9CFAC[4]; -extern "C" extern u8 data_80C9CFB0[4]; -extern "C" extern u8 data_80C9CFB4[4]; -extern "C" extern u8 data_80C9CFB8[4]; -extern "C" extern u8 data_80C9CFBC[4]; -extern "C" extern u8 data_80C9CFC0[4]; -extern "C" extern u8 data_80C9CFC4[4]; -extern "C" extern u8 data_80C9CFC8[4]; -extern "C" extern u8 data_80C9CFCC[4]; -extern "C" extern u8 data_80C9CFD0[4]; -extern "C" extern u8 data_80C9CFD4[4]; -extern "C" extern u8 data_80C9CFD8[4]; -extern "C" extern u8 data_80C9CFDC[4]; -extern "C" extern u8 data_80C9CFE0[4]; -extern "C" extern u8 data_80C9CFE4[4]; -extern "C" extern u8 data_80C9CFE8[4]; -extern "C" extern u8 data_80C9CFEC[4]; -extern "C" extern u8 data_80C9CFF0[4]; -extern "C" extern u8 data_80C9CFF4[4]; -extern "C" extern u8 data_80C9CFF8[4]; -extern "C" extern u8 data_80C9CFFC[4]; -extern "C" extern u8 data_80C9D000[4]; extern "C" void __ct__17daObj_Msima_HIO_cFv(); extern "C" static void ride_call_back__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); @@ -291,16 +250,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_msima/executor.cpp b/rel/d/a/obj/d_a_obj_msima/executor.cpp index c2908fd9242..d137ba73c15 100644 --- a/rel/d/a/obj/d_a_obj_msima/executor.cpp +++ b/rel/d/a/obj/d_a_obj_msima/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C9CD38[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_msima/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_msima/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3835b5f4e94..26d9dc55a42 100644 --- a/rel/d/a/obj/d_a_obj_msima/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_msima/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C9CD44[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C9CD44-80C9CD4C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C9CD44[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C9CE60-80C9CE68 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_msima/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_msima/unknown_translation_unit_ctors.cpp index 2b9fd5ecf53..8a387c759d6 100644 --- a/rel/d/a/obj/d_a_obj_msima/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_msima/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C9CD38[2]; -extern void* const data_80C9CD38[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_msima_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C9CD38-80C9CD40 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C9CD38[2] = { + (void*)__sinit_d_a_obj_msima_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp b/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp index 9961959cfac..81d148805f3 100644 --- a/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp +++ b/rel/d/a/obj/d_a_obj_mvstair/d_a_obj_mvstair.cpp @@ -150,8 +150,6 @@ static void daObjStair_create1st(daObjStair_c*); static void daObjStair_MoveBGDelete(daObjStair_c*); static void daObjStair_MoveBGExecute(daObjStair_c*); static void daObjStair_MoveBGDraw(daObjStair_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_MvStair[12]; extern "C" void initBaseMtx__12daObjStair_cFv(); extern "C" void setBaseMtx__12daObjStair_cFv(); @@ -209,16 +207,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc0(f32*, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__19dPa_followEcallBack[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80C9EAA8[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_mvstair/executor.cpp b/rel/d/a/obj/d_a_obj_mvstair/executor.cpp index 42daa09bb1f..94b3afdf034 100644 --- a/rel/d/a/obj/d_a_obj_mvstair/executor.cpp +++ b/rel/d/a/obj/d_a_obj_mvstair/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C9E8A4[4]; -extern u8 const data_80C9E8A8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_bss.cpp index b86c7ee15d6..17dd177404e 100644 --- a/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80C9EAA8[4]; -extern "C" extern u8 struct_80C9EAA8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_ctors.cpp index 1b223cfaa7e..e06ce06be4a 100644 --- a/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C9E8A4[4]; -extern u8 const data_80C9E8A4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C9E8A4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C9E8A4-80C9E8A8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C9E8A4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_dtors.cpp index ad803d3c9e6..e5799901b2e 100644 --- a/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_mvstair/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C9E8A8[4]; -extern u8 const data_80C9E8A8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C9E8A8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C9E8A8-80C9E8AC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C9E8A8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp b/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp index f3d92825381..c47a92801c8 100644 --- a/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp +++ b/rel/d/a/obj/d_a_obj_myogan/d_a_obj_myogan.cpp @@ -52,12 +52,12 @@ struct dSv_memBit_c { /* 80034934 */ void isDungeonItem(int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -112,8 +112,6 @@ static bool daObj_Myogan_IsDelete(obj_myogan_class*); static void daObj_Myogan_Delete(obj_myogan_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Myogan_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_MYOGAN[12]; extern "C" void __ct__18daObj_Myogan_HIO_cFv(); extern "C" static void daObj_Myogan_Draw__FP16obj_myogan_class(); @@ -144,11 +142,6 @@ void cM_rndF(f32); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_myogan/executor.cpp b/rel/d/a/obj/d_a_obj_myogan/executor.cpp index 7a854a4fa09..cef54f00b99 100644 --- a/rel/d/a/obj/d_a_obj_myogan/executor.cpp +++ b/rel/d/a/obj/d_a_obj_myogan/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C9F274[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_myogan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_myogan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4b361d99f6b..c665f81d748 100644 --- a/rel/d/a/obj/d_a_obj_myogan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_myogan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80C9F280[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80C9F280-80C9F288 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80C9F280[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80C9F310-80C9F318 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_myogan/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_myogan/unknown_translation_unit_ctors.cpp index 8d31a11e1e4..442114b28b5 100644 --- a/rel/d/a/obj/d_a_obj_myogan/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_myogan/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C9F274[2]; -extern void* const data_80C9F274[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_myogan_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C9F274-80C9F27C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C9F274[2] = { + (void*)__sinit_d_a_obj_myogan_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp b/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp index cb20aaefc24..de8ed972804 100644 --- a/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp +++ b/rel/d/a/obj/d_a_obj_nagaisu/d_a_obj_nagaisu.cpp @@ -30,16 +30,16 @@ struct daObjNagaisu_c { /* 80C9F944 */ void setIsu(); }; +struct dCcD_Stts { + /* 80083860 */ void Init(int, int, fopAc_ac_c*); +}; + struct dMdl_obj_c {}; struct dMdl_c { /* 8009C668 */ void entryObj(dMdl_obj_c*); }; -struct dCcD_Stts { - /* 80083860 */ void Init(int, int, fopAc_ac_c*); -}; - struct daObjIsuChild_c { /* 80C9FA90 */ daObjIsuChild_c(); /* 80C9FCDC */ ~daObjIsuChild_c(); @@ -52,12 +52,12 @@ struct daObjIsuChild_c { /* 80CA0180 */ void callEmt(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -168,8 +168,6 @@ static void daObjNagaisu_create(daObjNagaisu_c*); static void daObjNagaisu_Delete(daObjNagaisu_c*); static void daObjNagaisu_execute(daObjNagaisu_c*); static void daObjNagaisu_draw(daObjNagaisu_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Nagaisu[12]; extern "C" static void daObjNagaisu_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__14daObjNagaisu_cFv(); @@ -215,17 +213,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); diff --git a/rel/d/a/obj/d_a_obj_nagaisu/executor.cpp b/rel/d/a/obj/d_a_obj_nagaisu/executor.cpp index c5799c36ea4..7847c467b71 100644 --- a/rel/d/a/obj/d_a_obj_nagaisu/executor.cpp +++ b/rel/d/a/obj/d_a_obj_nagaisu/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CA0354[4]; -extern u8 const data_80CA0358[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_nagaisu/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_nagaisu/unknown_translation_unit_ctors.cpp index ba5e6ef5838..939a6a4a8ae 100644 --- a/rel/d/a/obj/d_a_obj_nagaisu/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_nagaisu/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA0354[4]; -extern u8 const data_80CA0354[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CA0354[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA0354-80CA0358 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CA0354[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_nagaisu/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_nagaisu/unknown_translation_unit_dtors.cpp index 57d70efb964..10984ba2b06 100644 --- a/rel/d/a/obj/d_a_obj_nagaisu/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_nagaisu/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA0358[4]; -extern u8 const data_80CA0358[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CA0358[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CA0358-80CA035C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CA0358[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp b/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp index ced53483ea8..af62ddd26f6 100644 --- a/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp +++ b/rel/d/a/obj/d_a_obj_nameplate/d_a_obj_nameplate.cpp @@ -120,8 +120,6 @@ static void daObjNameplate_Execute(daObjNameplate_c*); static bool daObjNameplate_IsDelete(daObjNameplate_c*); static void daObjNameplate_Delete(daObjNameplate_c*); static void daObjNameplate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_NamePlate[12]; extern "C" void create_init__16daObjNameplate_cFv(); extern "C" void initBaseMtx__16daObjNameplate_cFv(); @@ -162,18 +160,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cLib_chaseF(f32*, f32, f32); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_nameplate/executor.cpp b/rel/d/a/obj/d_a_obj_nameplate/executor.cpp index 85c4f741ccc..97a60468da9 100644 --- a/rel/d/a/obj/d_a_obj_nameplate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_nameplate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80594E6C[4]; -extern u8 const data_80594E70[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_nameplate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_nameplate/unknown_translation_unit_ctors.cpp index e0c8ae15883..a4e276b5be3 100644 --- a/rel/d/a/obj/d_a_obj_nameplate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_nameplate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80594E6C[4]; -extern u8 const data_80594E6C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80594E6C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80594E6C-80594E70 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80594E6C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_nameplate/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_nameplate/unknown_translation_unit_dtors.cpp index 05385ff5f41..2849c3e5ff8 100644 --- a/rel/d/a/obj/d_a_obj_nameplate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_nameplate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80594E70[4]; -extern u8 const data_80594E70[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80594E70[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80594E70-80594E74 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80594E70[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp b/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp index f8542c8f400..786f60289b7 100644 --- a/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp +++ b/rel/d/a/obj/d_a_obj_nan/d_a_obj_nan.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF0C */ void ZXYrotS(csXyz const&); @@ -49,16 +49,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -240,10 +240,6 @@ static void daObjNAN_Delete(daObjNAN_c*); static void daObjNAN_Draw(daObjNAN_c*); static void daObjNAN_Execute(daObjNAN_c*); static bool daObjNAN_IsDelete(daObjNAN_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Nan[12]; -extern "C" extern void* __vt__9dInsect_c[3]; extern "C" void __ct__14daObj_NanHIO_cFv(); extern "C" void setAction__10daObjNAN_cFM10daObjNAN_cFPCvPv_v(); @@ -307,19 +303,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_nan/executor.cpp b/rel/d/a/obj/d_a_obj_nan/executor.cpp index 452796bedd9..fa166ca49fc 100644 --- a/rel/d/a/obj/d_a_obj_nan/executor.cpp +++ b/rel/d/a/obj/d_a_obj_nan/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CA31A8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_nan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_nan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d4da1a9e41a..2a031863fd8 100644 --- a/rel/d/a/obj/d_a_obj_nan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_nan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CA31B4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CA31B4-80CA31BC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CA31B4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CA3490-80CA3498 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_nan/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_nan/unknown_translation_unit_ctors.cpp index 470522f462d..ce92484fa59 100644 --- a/rel/d/a/obj/d_a_obj_nan/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_nan/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CA31A8[2]; -extern void* const data_80CA31A8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_nan_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA31A8-80CA31B0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CA31A8[2] = { + (void*)__sinit_d_a_obj_nan_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp b/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp index b8ba2444e26..cb9295c8974 100644 --- a/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp +++ b/rel/d/a/obj/d_a_obj_ndoor/d_a_obj_ndoor.cpp @@ -19,12 +19,12 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -86,8 +86,6 @@ static bool daObj_Ndoor_IsDelete(obj_ndoor_class*); static void daObj_Ndoor_Delete(obj_ndoor_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Ndoor_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_NDOOR[12]; extern "C" static void daObj_Ndoor_Draw__FP15obj_ndoor_class(); extern "C" static void daObj_Ndoor_Execute__FP15obj_ndoor_class(); @@ -115,17 +113,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void at_power_check(dCcU_AtInfo*); void cLib_addCalc0(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_ndoor/executor.cpp b/rel/d/a/obj/d_a_obj_ndoor/executor.cpp index faec530a358..67d7268526f 100644 --- a/rel/d/a/obj/d_a_obj_ndoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ndoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CA3A3C[4]; -extern u8 const data_80CA3A40[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ndoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ndoor/unknown_translation_unit_ctors.cpp index c9dbde65fe2..878b59798e7 100644 --- a/rel/d/a/obj/d_a_obj_ndoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ndoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA3A3C[4]; -extern u8 const data_80CA3A3C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CA3A3C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA3A3C-80CA3A40 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CA3A3C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ndoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ndoor/unknown_translation_unit_dtors.cpp index 48fd590c2ac..499ab494a20 100644 --- a/rel/d/a/obj/d_a_obj_ndoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ndoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA3A40[4]; -extern u8 const data_80CA3A40[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CA3A40[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CA3A40-80CA3A44 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CA3A40[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp b/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp index e8bde7c4867..b58567ad08c 100644 --- a/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp +++ b/rel/d/a/obj/d_a_obj_nougu/d_a_obj_nougu.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -154,8 +154,6 @@ static void daObj_Nougu_Delete(void*); static void daObj_Nougu_Execute(void*); static void daObj_Nougu_Draw(void*); static bool daObj_Nougu_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_NOUGU[12]; extern "C" void __dt__13daObj_Nougu_cFv(); extern "C" void __dt__8dCcD_SphFv(); @@ -203,18 +201,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_PolyInfo&, dKy_tevstr_c*, s16, f32, _GXTexObj*); void operator delete(void*); -extern "C" extern u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_nougu/executor.cpp b/rel/d/a/obj/d_a_obj_nougu/executor.cpp index 30bf06139aa..6142cea137e 100644 --- a/rel/d/a/obj/d_a_obj_nougu/executor.cpp +++ b/rel/d/a/obj/d_a_obj_nougu/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CA49A4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_nougu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_nougu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2cbd64435d1..22450cb8a6c 100644 --- a/rel/d/a/obj/d_a_obj_nougu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_nougu/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CA49B0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CA49B0-80CA49B8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CA49B0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CA4B10-80CA4B18 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_nougu/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_nougu/unknown_translation_unit_ctors.cpp index cf20e4eb928..9c1174a1aea 100644 --- a/rel/d/a/obj/d_a_obj_nougu/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_nougu/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CA49A4[2]; -extern void* const data_80CA49A4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_nougu_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA49A4-80CA49AC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CA49A4[2] = { + (void*)__sinit_d_a_obj_nougu_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp b/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp index deec44c1e60..80fc45fddf4 100644 --- a/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp +++ b/rel/d/a/obj/d_a_obj_octhashi/d_a_obj_octhashi.cpp @@ -13,6 +13,11 @@ struct request_of_phase_process_class {}; +struct cXyz { + /* 80CA54A8 */ ~cXyz(); + /* 80CA6250 */ cXyz(); +}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); /* 80CA624C */ csXyz(); @@ -20,11 +25,6 @@ struct csXyz { /* 80CA546C */ ~csXyz(); }; -struct cXyz { - /* 80CA54A8 */ ~cXyz(); - /* 80CA6250 */ cXyz(); -}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -200,14 +200,6 @@ static void rideCallBack(dBgW*, fopAc_ac_c*, fopAc_ac_c*); static void daObjOCTHASHI_Draw(daObjOCTHASHI_c*); static void daObjOCTHASHI_Execute(daObjOCTHASHI_c*); static bool daObjOCTHASHI_IsDelete(daObjOCTHASHI_c*); -extern "C" extern u8 const lit_3887[8]; -extern "C" extern u8 const lit_3888[8]; -extern "C" extern u8 const lit_3889[8]; -extern "C" extern u32 const lit_3890; -extern "C" extern u32 const lit_3903; -extern "C" extern u32 const lit_3904; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OCTHASHI[12]; extern "C" void initCcCylinder__15daObjOCTHASHI_cFv(); extern "C" static void daObjOCTHASHI_Create__FP10fopAc_ac_c(); @@ -270,22 +262,6 @@ void def_se_set(Z2Creature*, cCcD_Obj*, u32, fopAc_ac_c*); void cM_rndFX(f32); void cLib_targetAngleY(Vec const*, Vec const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CA6680[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_octhashi/executor.cpp b/rel/d/a/obj/d_a_obj_octhashi/executor.cpp index e7136712813..da45b9efc5e 100644 --- a/rel/d/a/obj/d_a_obj_octhashi/executor.cpp +++ b/rel/d/a/obj/d_a_obj_octhashi/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CA6478[4]; -extern u8 const data_80CA647C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_bss.cpp index ab72eeac0a3..edc3ed746f3 100644 --- a/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CA6680[4]; -extern "C" extern u8 data_80CA6680[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_ctors.cpp index cd2e3fce967..b9b3b0c1e32 100644 --- a/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA6478[4]; -extern u8 const data_80CA6478[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CA6478[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA6478-80CA647C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CA6478[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_dtors.cpp index 09e64d3d0bd..b0c83187fbe 100644 --- a/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_octhashi/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA647C[4]; -extern u8 const data_80CA647C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CA647C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CA647C-80CA6480 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CA647C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp b/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp index e07d9466986..ece0f828beb 100644 --- a/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp +++ b/rel/d/a/obj/d_a_obj_oiltubo/d_a_obj_oiltubo.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -193,8 +193,6 @@ static void daObj_Oiltubo_Delete(void*); static void daObj_Oiltubo_Execute(void*); static void daObj_Oiltubo_Draw(void*); static bool daObj_Oiltubo_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_OILTUBO[12]; extern "C" void create__15daObj_Oiltubo_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -246,19 +244,6 @@ void dComIfGp_getReverb(int); void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_PolyInfo&, dKy_tevstr_c*, s16, f32, _GXTexObj*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern u8 const data_80CA78F0[4]; extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_oiltubo/executor.cpp b/rel/d/a/obj/d_a_obj_oiltubo/executor.cpp index 4a50c42d533..8add2c7cae1 100644 --- a/rel/d/a/obj/d_a_obj_oiltubo/executor.cpp +++ b/rel/d/a/obj/d_a_obj_oiltubo/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CA78E8[2]; -extern u8 const data_80CA78F0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_oiltubo/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_oiltubo/unknown_translation_unit_ctors.cpp index f9b271ce188..441ce9085db 100644 --- a/rel/d/a/obj/d_a_obj_oiltubo/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_oiltubo/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CA78E8[2]; -extern void* const data_80CA78E8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_oiltubo_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA78E8-80CA78F0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CA78E8[2] = { + (void*)__sinit_d_a_obj_oiltubo_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_oiltubo/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_oiltubo/unknown_translation_unit_dtors.cpp index fae2bf92962..d2efab765e5 100644 --- a/rel/d/a/obj/d_a_obj_oiltubo/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_oiltubo/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA78F0[4]; -extern u8 const data_80CA78F0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CA78F0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CA78F0-80CA78F4 0004+00 s=0 e=2 z=0 None .dtors None */ +u8 const data_80CA78F0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp index ff5f77c021c..9f1ac1b6e73 100644 --- a/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp +++ b/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.cpp @@ -94,8 +94,6 @@ static void daObjOnsen_create1st(daObjOnsen_c*); static void daObjOnsen_MoveBGDelete(daObjOnsen_c*); static void daObjOnsen_MoveBGExecute(daObjOnsen_c*); static void daObjOnsen_MoveBGDraw(daObjOnsen_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Onsen[12]; extern "C" void initBaseMtx__12daObjOnsen_cFv(); extern "C" void setBaseMtx__12daObjOnsen_cFv(); @@ -126,12 +124,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dKy_bg_MAxx_proc(void*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_onsen/executor.cpp b/rel/d/a/obj/d_a_obj_onsen/executor.cpp index 26b0f5f73ae..24158e8e869 100644 --- a/rel/d/a/obj/d_a_obj_onsen/executor.cpp +++ b/rel/d/a/obj/d_a_obj_onsen/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CA8114[4]; -extern u8 const data_80CA8118[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_onsen/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_onsen/unknown_translation_unit_ctors.cpp index 770e7897c4d..79ec41f73b3 100644 --- a/rel/d/a/obj/d_a_obj_onsen/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_onsen/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA8114[4]; -extern u8 const data_80CA8114[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CA8114[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA8114-80CA8118 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CA8114[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_onsen/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_onsen/unknown_translation_unit_dtors.cpp index 63ce73323ca..83461b78a81 100644 --- a/rel/d/a/obj/d_a_obj_onsen/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_onsen/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA8118[4]; -extern u8 const data_80CA8118[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CA8118[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CA8118-80CA811C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CA8118[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp index 200f600e7c5..a4b56668fe5 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.cpp @@ -25,12 +25,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; -struct dKy_tevstr_c {}; - struct _GXColor {}; struct cXyz {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&, _GXColor const&, int, f32); @@ -51,7 +51,6 @@ struct Z2SeMgr { static void daObjOnsenFire_Create(fopAc_ac_c*); static void daObjOnsenFire_Execute(daObjOnsenFire_c*); static void daObjOnsenFire_Delete(daObjOnsenFire_c*); -extern "C" extern void* g_profile_OBJ_ONSEN_FIRE[12]; extern "C" void create__16daObjOnsenFire_cFv(); extern "C" void execute__16daObjOnsenFire_cFv(); @@ -64,13 +63,6 @@ extern "C" extern void* g_profile_OBJ_ONSEN_FIRE[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); extern "C" void isEventBit__11dSv_event_cCFUs(); diff --git a/rel/d/a/obj/d_a_obj_onsenFire/executor.cpp b/rel/d/a/obj/d_a_obj_onsenFire/executor.cpp index 1a79480ac51..67aaafd0f7a 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/executor.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CA846C[4]; -extern u8 const data_80CA8470[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_onsenFire/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_onsenFire/unknown_translation_unit_ctors.cpp index 089e50b5b85..43499be15a3 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA846C[4]; -extern u8 const data_80CA846C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CA846C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA846C-80CA8470 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CA846C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_onsenFire/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_onsenFire/unknown_translation_unit_dtors.cpp index 9598b75c33c..ca8ccc5b969 100644 --- a/rel/d/a/obj/d_a_obj_onsenFire/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_onsenFire/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CA8470[4]; -extern u8 const data_80CA8470[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CA8470[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CA8470-80CA8474 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CA8470[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp b/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp index 843264ae215..e4da26c648d 100644 --- a/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp +++ b/rel/d/a/obj/d_a_obj_onsenTaru/d_a_obj_onsenTaru.cpp @@ -197,9 +197,6 @@ static void daOnsTaru_Draw(daOnsTaru_c*); static void daOnsTaru_Execute(daOnsTaru_c*); static void daOnsTaru_Delete(daOnsTaru_c*); static void daOnsTaru_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_OnsenTaru[12]; extern "C" void __ct__15daOnsTaru_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -262,19 +259,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_onsenTaru/executor.cpp b/rel/d/a/obj/d_a_obj_onsenTaru/executor.cpp index 2789342d8cb..5c9bb81173d 100644 --- a/rel/d/a/obj/d_a_obj_onsenTaru/executor.cpp +++ b/rel/d/a/obj/d_a_obj_onsenTaru/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CA9B64[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_onsenTaru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_onsenTaru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f73ae998e3a..2c5bb94c5bc 100644 --- a/rel/d/a/obj/d_a_obj_onsenTaru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_onsenTaru/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CA9B70[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CA9B70-80CA9B78 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CA9B70[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CA9DE0-80CA9DE8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_onsenTaru/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_onsenTaru/unknown_translation_unit_ctors.cpp index 1b0f6976671..82f1719be58 100644 --- a/rel/d/a/obj/d_a_obj_onsenTaru/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_onsenTaru/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CA9B64[2]; -extern void* const data_80CA9B64[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_onsenTaru_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CA9B64-80CA9B6C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CA9B64[2] = { + (void*)__sinit_d_a_obj_onsenTaru_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp b/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp index 290759a8a42..fa3408d123a 100644 --- a/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp +++ b/rel/d/a/obj/d_a_obj_ornament_cloth/d_a_obj_ornament_cloth.cpp @@ -92,8 +92,6 @@ static void daObjOnCloth_Execute(daObjOnCloth_c*); static bool daObjOnCloth_IsDelete(daObjOnCloth_c*); static void daObjOnCloth_Delete(daObjOnCloth_c*); static void daObjOnCloth_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_OnCloth[12]; extern "C" void create_init__14daObjOnCloth_cFv(); extern "C" void initBaseMtx__14daObjOnCloth_cFv(); @@ -132,15 +130,6 @@ void cM_atan2s(f32, f32); void cM_rnd(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_ornament_cloth/executor.cpp b/rel/d/a/obj/d_a_obj_ornament_cloth/executor.cpp index 5dd029faecc..bf3204b5343 100644 --- a/rel/d/a/obj/d_a_obj_ornament_cloth/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ornament_cloth/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80595CAC[4]; -extern u8 const data_80595CB0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ornament_cloth/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ornament_cloth/unknown_translation_unit_ctors.cpp index ff0df99f683..9d3afc0f9c7 100644 --- a/rel/d/a/obj/d_a_obj_ornament_cloth/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ornament_cloth/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80595CAC[4]; -extern u8 const data_80595CAC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80595CAC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80595CAC-80595CB0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80595CAC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ornament_cloth/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ornament_cloth/unknown_translation_unit_dtors.cpp index ebca217472f..8386034a97b 100644 --- a/rel/d/a/obj/d_a_obj_ornament_cloth/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ornament_cloth/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80595CB0[4]; -extern u8 const data_80595CB0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80595CB0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80595CB0-80595CB4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80595CB0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp b/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp index 6b01863d6e1..988469e02ab 100644 --- a/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp +++ b/rel/d/a/obj/d_a_obj_pdoor/d_a_obj_pdoor.cpp @@ -107,9 +107,6 @@ static void daObjPDoor_create1st(daObjPDoor_c*); static void daObjPDoor_MoveBGDelete(daObjPDoor_c*); static void daObjPDoor_MoveBGExecute(daObjPDoor_c*); static void daObjPDoor_MoveBGDraw(daObjPDoor_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_PushDoor[12]; extern "C" static void PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); extern "C" void initBaseMtx__12daObjPDoor_cFv(); @@ -147,15 +144,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_addCalcAngleS2(s16*, s16, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CAAC30[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_pdoor/executor.cpp b/rel/d/a/obj/d_a_obj_pdoor/executor.cpp index 9b5917d54e2..31f339ec724 100644 --- a/rel/d/a/obj/d_a_obj_pdoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_pdoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CAAB18[4]; -extern u8 const data_80CAAB1C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_bss.cpp index 3975887c823..5ab269e4e9b 100644 --- a/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CAAC30[4]; -extern "C" extern u8 data_80CAAC30[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_ctors.cpp index 4a2ecf00c23..68dc037d268 100644 --- a/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CAAB18[4]; -extern u8 const data_80CAAB18[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CAAB18[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CAAB18-80CAAB1C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CAAB18[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_dtors.cpp index 460f53c1206..7961d667ae6 100644 --- a/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_pdoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CAAB1C[4]; -extern u8 const data_80CAAB1C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CAAB1C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CAAB1C-80CAAB20 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CAAB1C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp b/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp index be2e71624a0..e3acaafd2f0 100644 --- a/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp +++ b/rel/d/a/obj/d_a_obj_pdtile/d_a_obj_pdtile.cpp @@ -166,9 +166,6 @@ static void daObjPDtile_create1st(daObjPDtile_c*); static void daObjPDtile_MoveBGDelete(daObjPDtile_c*); static void daObjPDtile_MoveBGExecute(daObjPDtile_c*); static void daObjPDtile_MoveBGDraw(daObjPDtile_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_PDtile[12]; extern "C" static void rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" void create1st__13daObjPDtile_cFv(); @@ -212,22 +209,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cM_rndF(f32); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_pdtile/executor.cpp b/rel/d/a/obj/d_a_obj_pdtile/executor.cpp index 23a99ca7772..2887543bd63 100644 --- a/rel/d/a/obj/d_a_obj_pdtile/executor.cpp +++ b/rel/d/a/obj/d_a_obj_pdtile/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CAC504[4]; -extern u8 const data_80CAC508[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_pdtile/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_pdtile/unknown_translation_unit_ctors.cpp index 79b0264fb8c..3c60e0f9903 100644 --- a/rel/d/a/obj/d_a_obj_pdtile/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_pdtile/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CAC504[4]; -extern u8 const data_80CAC504[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CAC504[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CAC504-80CAC508 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CAC504[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_pdtile/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_pdtile/unknown_translation_unit_dtors.cpp index 80bb5982b47..b9eb3f4ab6b 100644 --- a/rel/d/a/obj/d_a_obj_pdtile/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_pdtile/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CAC508[4]; -extern u8 const data_80CAC508[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CAC508[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CAC508-80CAC50C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CAC508[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp b/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp index 4e4f8388a96..427cad4db9e 100644 --- a/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp +++ b/rel/d/a/obj/d_a_obj_pdwall/d_a_obj_pdwall.cpp @@ -117,8 +117,6 @@ static void daObjPDwall_create1st(daObjPDwall_c*); static void daObjPDwall_MoveBGDelete(daObjPDwall_c*); static void daObjPDwall_MoveBGExecute(daObjPDwall_c*); static void daObjPDwall_MoveBGDraw(daObjPDwall_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_PDwall[12]; extern "C" void create1st__13daObjPDwall_cFv(); extern "C" void setMtx__13daObjPDwall_cFv(); @@ -148,14 +146,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_pdwall/executor.cpp b/rel/d/a/obj/d_a_obj_pdwall/executor.cpp index ba4f7b87658..5e6f8aebb22 100644 --- a/rel/d/a/obj/d_a_obj_pdwall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_pdwall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CAD1B0[4]; -extern u8 const data_80CAD1B4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_pdwall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_pdwall/unknown_translation_unit_ctors.cpp index a04e62de881..5e5370054e3 100644 --- a/rel/d/a/obj/d_a_obj_pdwall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_pdwall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CAD1B0[4]; -extern u8 const data_80CAD1B0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CAD1B0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CAD1B0-80CAD1B4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CAD1B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_pdwall/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_pdwall/unknown_translation_unit_dtors.cpp index ade45eb6e23..76ae4f7db0a 100644 --- a/rel/d/a/obj/d_a_obj_pdwall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_pdwall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CAD1B4[4]; -extern u8 const data_80CAD1B4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CAD1B4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CAD1B4-80CAD1B8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CAD1B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp b/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp index c16862ab90d..3cba22b7a96 100644 --- a/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp +++ b/rel/d/a/obj/d_a_obj_picture/d_a_obj_picture.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -24,6 +22,8 @@ struct cXyz { /* 80266F48 */ void normalizeZP(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE38 */ void scaleM(f32, f32, f32); @@ -36,11 +36,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -197,8 +197,6 @@ static void daObjPicture_create(daObjPicture_c*); static void daObjPicture_Delete(daObjPicture_c*); static void daObjPicture_execute(daObjPicture_c*); static void daObjPicture_draw(daObjPicture_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Picture[12]; extern "C" static void daObjPicture_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__14daObjPicture_cFv(); @@ -250,24 +248,6 @@ void cLib_addCalcPosXZ2(cXyz*, cXyz const&, f32, f32); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_picture/executor.cpp b/rel/d/a/obj/d_a_obj_picture/executor.cpp index d10b5657ad2..50df4dc1f9b 100644 --- a/rel/d/a/obj/d_a_obj_picture/executor.cpp +++ b/rel/d/a/obj/d_a_obj_picture/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CAF014[4]; -extern u8 const data_80CAF018[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_picture/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_picture/unknown_translation_unit_ctors.cpp index 81fb657ea57..3b6de23b1c4 100644 --- a/rel/d/a/obj/d_a_obj_picture/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_picture/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CAF014[4]; -extern u8 const data_80CAF014[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CAF014[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CAF014-80CAF018 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CAF014[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_picture/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_picture/unknown_translation_unit_dtors.cpp index 968887f9057..be6bf9afa3c 100644 --- a/rel/d/a/obj/d_a_obj_picture/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_picture/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CAF018[4]; -extern u8 const data_80CAF018[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CAF018[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CAF018-80CAF01C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CAF018[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp b/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp index 332961fe46d..6b2f5ca77e9 100644 --- a/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp +++ b/rel/d/a/obj/d_a_obj_pillar/d_a_obj_pillar.cpp @@ -154,8 +154,6 @@ static void daPillar_create1st(daPillar_c*); static void daPillar_MoveBGDelete(daPillar_c*); static void daPillar_MoveBGExecute(daPillar_c*); static void daPillar_MoveBGDraw(daPillar_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Pillar[12]; extern "C" void __ct__14daPillar_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -208,20 +206,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_pillar/executor.cpp b/rel/d/a/obj/d_a_obj_pillar/executor.cpp index b6a42282f44..b9114fcd869 100644 --- a/rel/d/a/obj/d_a_obj_pillar/executor.cpp +++ b/rel/d/a/obj/d_a_obj_pillar/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CB09C0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_pillar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_pillar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9ab9b51bd92..0d8da4aa9b7 100644 --- a/rel/d/a/obj/d_a_obj_pillar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_pillar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CB09CC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CB09CC-80CB09D4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CB09CC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CB0C18-80CB0C20 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_pillar/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_pillar/unknown_translation_unit_ctors.cpp index ad6cb1f3f6e..45946e49f43 100644 --- a/rel/d/a/obj/d_a_obj_pillar/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_pillar/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CB09C0[2]; -extern void* const data_80CB09C0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_pillar_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB09C0-80CB09C8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CB09C0[2] = { + (void*)__sinit_d_a_obj_pillar_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp b/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp index 997c505c0e1..911b840c5f1 100644 --- a/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp +++ b/rel/d/a/obj/d_a_obj_pleaf/d_a_obj_pleaf.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -142,8 +142,6 @@ static void daObj_Pleaf_Delete(void*); static void daObj_Pleaf_Execute(void*); static void daObj_Pleaf_Draw(void*); static bool daObj_Pleaf_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_PLEAF[12]; extern "C" void __dt__13daObj_Pleaf_cFv(); extern "C" void create__13daObj_Pleaf_cFv(); @@ -188,17 +186,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_PolyInfo&, dKy_tevstr_c*, s16, f32, _GXTexObj*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_pleaf/executor.cpp b/rel/d/a/obj/d_a_obj_pleaf/executor.cpp index daf4270f437..011d5c3393b 100644 --- a/rel/d/a/obj/d_a_obj_pleaf/executor.cpp +++ b/rel/d/a/obj/d_a_obj_pleaf/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CB1850[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_pleaf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_pleaf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f9b70f71a77..d4413ce91bc 100644 --- a/rel/d/a/obj/d_a_obj_pleaf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_pleaf/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CB185C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CB185C-80CB1864 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CB185C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CB1968-80CB1970 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_pleaf/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_pleaf/unknown_translation_unit_ctors.cpp index e46010c0b33..70b2af8f121 100644 --- a/rel/d/a/obj/d_a_obj_pleaf/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_pleaf/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CB1850[2]; -extern void* const data_80CB1850[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_pleaf_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB1850-80CB1858 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CB1850[2] = { + (void*)__sinit_d_a_obj_pleaf_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp b/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp index 63fdaef9dca..0022b093e99 100644 --- a/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp +++ b/rel/d/a/obj/d_a_obj_poCandle/d_a_obj_poCandle.cpp @@ -53,12 +53,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -132,9 +132,6 @@ static void daPoCandle_Draw(daPoCandle_c*); static void daPoCandle_Execute(daPoCandle_c*); static void daPoCandle_Delete(daPoCandle_c*); static void daPoCandle_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_poCandle[12]; extern "C" void __ct__16daPoCandle_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -190,14 +187,6 @@ void dKy_plight_cut(LIGHT_INFLUENCE*); void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_poCandle/executor.cpp b/rel/d/a/obj/d_a_obj_poCandle/executor.cpp index d41c47bcc35..703b97744ac 100644 --- a/rel/d/a/obj/d_a_obj_poCandle/executor.cpp +++ b/rel/d/a/obj/d_a_obj_poCandle/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CB26A4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_poCandle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_poCandle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index da5898f2f41..2a2ed492233 100644 --- a/rel/d/a/obj/d_a_obj_poCandle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_poCandle/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CB26B0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CB26B0-80CB26B8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CB26B0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CB2838-80CB2840 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_poCandle/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_poCandle/unknown_translation_unit_ctors.cpp index d9b06f66616..65fbff24889 100644 --- a/rel/d/a/obj/d_a_obj_poCandle/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_poCandle/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CB26A4[2]; -extern void* const data_80CB26A4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_poCandle_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB26A4-80CB26AC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CB26A4[2] = { + (void*)__sinit_d_a_obj_poCandle_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp b/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp index 2c18bfba906..389e37b7097 100644 --- a/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp +++ b/rel/d/a/obj/d_a_obj_poFire/d_a_obj_poFire.cpp @@ -73,8 +73,6 @@ struct dSv_player_get_item_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -83,10 +81,12 @@ struct cXyz { /* 80266B84 */ void operator*(f32) const; }; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B8B4 */ void forceOnEventMove(u32); @@ -153,9 +153,6 @@ static void daPoFire_Draw(daPoFire_c*); static void daPoFire_Execute(daPoFire_c*); static void daPoFire_Delete(daPoFire_c*); static void daPoFire_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3889; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_poFire[12]; extern "C" void __ct__14daPoFire_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -222,12 +219,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcPos(cXyz*, cXyz const&, f32, f32, f32); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_poFire/executor.cpp b/rel/d/a/obj/d_a_obj_poFire/executor.cpp index ef0cf022915..844ff28f5d5 100644 --- a/rel/d/a/obj/d_a_obj_poFire/executor.cpp +++ b/rel/d/a/obj/d_a_obj_poFire/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CB3ED8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_poFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_poFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9e2bccb6fb4..53616957e7c 100644 --- a/rel/d/a/obj/d_a_obj_poFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_poFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CB3EE4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CB3EE4-80CB3EEC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CB3EE4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CB4100-80CB4108 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_poFire/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_poFire/unknown_translation_unit_ctors.cpp index 19d6e856454..e1c645e3c87 100644 --- a/rel/d/a/obj/d_a_obj_poFire/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_poFire/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CB3ED8[2]; -extern void* const data_80CB3ED8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_poFire_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB3ED8-80CB3EE0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CB3ED8[2] = { + (void*)__sinit_d_a_obj_poFire_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp b/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp index 39a253a9c7c..0d5a1bd0880 100644 --- a/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp +++ b/rel/d/a/obj/d_a_obj_poTbox/d_a_obj_poTbox.cpp @@ -74,10 +74,10 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -155,9 +155,6 @@ static void daPoTbox_Draw(daPoTbox_c*); static void daPoTbox_Execute(daPoTbox_c*); static void daPoTbox_Delete(daPoTbox_c*); static void daPoTbox_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_poTbox[12]; extern "C" void __ct__14daPoTbox_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -200,13 +197,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_poTbox/executor.cpp b/rel/d/a/obj/d_a_obj_poTbox/executor.cpp index 3bb64aaac64..ff64f2277c4 100644 --- a/rel/d/a/obj/d_a_obj_poTbox/executor.cpp +++ b/rel/d/a/obj/d_a_obj_poTbox/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CB4FAC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_poTbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_poTbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4bb6eb01982..abff2643a35 100644 --- a/rel/d/a/obj/d_a_obj_poTbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_poTbox/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CB4FB8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CB4FB8-80CB4FC0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CB4FB8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CB5120-80CB5128 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_poTbox/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_poTbox/unknown_translation_unit_ctors.cpp index 0f945cde071..ac94cdd9531 100644 --- a/rel/d/a/obj/d_a_obj_poTbox/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_poTbox/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CB4FAC[2]; -extern void* const data_80CB4FAC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_poTbox_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB4FAC-80CB4FB4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CB4FAC[2] = { + (void*)__sinit_d_a_obj_poTbox_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp index 56acf0570f1..4858b3b27b0 100644 --- a/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp +++ b/rel/d/a/obj/d_a_obj_prop/d_a_obj_prop.cpp @@ -30,12 +30,12 @@ struct daObjProp_c { /* 80CB54F4 */ void setModelMtx(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -58,8 +58,6 @@ static void daObjProp_create(daObjProp_c*); static void daObjProp_Delete(daObjProp_c*); static void daObjProp_execute(daObjProp_c*); static void daObjProp_draw(daObjProp_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Prop[12]; extern "C" static void daObjProp_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__11daObjProp_cFv(); @@ -90,11 +88,6 @@ void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdate__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_prop/executor.cpp b/rel/d/a/obj/d_a_obj_prop/executor.cpp index bc67174c663..d5ce97ba3e8 100644 --- a/rel/d/a/obj/d_a_obj_prop/executor.cpp +++ b/rel/d/a/obj/d_a_obj_prop/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CB560C[4]; -extern u8 const data_80CB5610[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_prop/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_prop/unknown_translation_unit_ctors.cpp index 2d89e2547c5..53073e8a690 100644 --- a/rel/d/a/obj/d_a_obj_prop/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_prop/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CB560C[4]; -extern u8 const data_80CB560C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CB560C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB560C-80CB5610 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CB560C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_prop/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_prop/unknown_translation_unit_dtors.cpp index 205aebfb861..800e4612752 100644 --- a/rel/d/a/obj/d_a_obj_prop/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_prop/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CB5610[4]; -extern u8 const data_80CB5610[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CB5610[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CB5610-80CB5614 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CB5610[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp b/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp index 6ce5278bc56..f763f835fd6 100644 --- a/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp +++ b/rel/d/a/obj/d_a_obj_pumpkin/d_a_obj_pumpkin.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -22,6 +20,8 @@ struct cXyz { /* 80266F48 */ void normalizeZP(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -231,8 +231,6 @@ static void daObj_Pumpkin_Execute(void*); static void daObj_Pumpkin_Draw(void*); static bool daObj_Pumpkin_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_PUMPKIN[12]; extern "C" void __dt__15daObj_Pumpkin_cFv(); extern "C" void create__15daObj_Pumpkin_cFv(); @@ -311,21 +309,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 const m__19daNpc_Jagar_Param_c[160]; SECTION_INIT void memset(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_pumpkin/executor.cpp b/rel/d/a/obj/d_a_obj_pumpkin/executor.cpp index 007b8d7efa7..a4104498423 100644 --- a/rel/d/a/obj/d_a_obj_pumpkin/executor.cpp +++ b/rel/d/a/obj/d_a_obj_pumpkin/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CB835C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_pumpkin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_pumpkin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 22ffe752a02..18a8175b486 100644 --- a/rel/d/a/obj/d_a_obj_pumpkin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_pumpkin/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CB8368[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CB8368-80CB8370 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CB8368[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CB85C8-80CB85D0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_pumpkin/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_pumpkin/unknown_translation_unit_ctors.cpp index 1c1104a98af..6cfbb94de1f 100644 --- a/rel/d/a/obj/d_a_obj_pumpkin/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_pumpkin/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CB835C[2]; -extern void* const data_80CB835C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_pumpkin_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB835C-80CB8364 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CB835C[2] = { + (void*)__sinit_d_a_obj_pumpkin_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp index 34ef9e8cf3c..16c2f354c8e 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp +++ b/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.cpp @@ -54,12 +54,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -87,8 +87,6 @@ static void daObjRCircle_create(daObjRCircle_c*); static void daObjRCircle_Delete(daObjRCircle_c*); static void daObjRCircle_execute(daObjRCircle_c*); static void daObjRCircle_draw(daObjRCircle_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_RCircle[12]; extern "C" static void daObjRCircle_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__14daObjRCircle_cFv(); @@ -120,12 +118,6 @@ void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); diff --git a/rel/d/a/obj/d_a_obj_rcircle/executor.cpp b/rel/d/a/obj/d_a_obj_rcircle/executor.cpp index 502989c4cde..4edad40ec70 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rcircle/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CB8CF8[4]; -extern u8 const data_80CB8CFC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rcircle/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rcircle/unknown_translation_unit_ctors.cpp index 13c1ec7ac30..da009cea40c 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rcircle/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CB8CF8[4]; -extern u8 const data_80CB8CF8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CB8CF8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB8CF8-80CB8CFC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CB8CF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rcircle/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_rcircle/unknown_translation_unit_dtors.cpp index 84555fb4f6d..9b4c9277fa5 100644 --- a/rel/d/a/obj/d_a_obj_rcircle/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_rcircle/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CB8CFC[4]; -extern u8 const data_80CB8CFC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CB8CFC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CB8CFC-80CB8D00 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CB8CFC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp b/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp index 8aef855c015..b0d891e3926 100644 --- a/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp +++ b/rel/d/a/obj/d_a_obj_rfHole/d_a_obj_rfHole.cpp @@ -122,9 +122,6 @@ static void daRfHole_Draw(daRfHole_c*); static void daRfHole_Execute(daRfHole_c*); static void daRfHole_Delete(daRfHole_c*); static void daRfHole_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_RfHole[12]; extern "C" void __ct__14daRfHole_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -171,14 +168,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_rfHole/executor.cpp b/rel/d/a/obj/d_a_obj_rfHole/executor.cpp index 77034cc1cda..067a664b13d 100644 --- a/rel/d/a/obj/d_a_obj_rfHole/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rfHole/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CB9A70[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rfHole/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_rfHole/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 09af8d196ff..f761e6ac5c6 100644 --- a/rel/d/a/obj/d_a_obj_rfHole/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_rfHole/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CB9A7C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CB9A7C-80CB9A84 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CB9A7C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CB9BE0-80CB9BE8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_rfHole/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rfHole/unknown_translation_unit_ctors.cpp index 32d5d20ef29..0d15840b499 100644 --- a/rel/d/a/obj/d_a_obj_rfHole/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rfHole/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CB9A70[2]; -extern void* const data_80CB9A70[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_rfHole_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CB9A70-80CB9A78 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CB9A70[2] = { + (void*)__sinit_d_a_obj_rfHole_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp b/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp index 31869e4f937..6aa22405b7a 100644 --- a/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp +++ b/rel/d/a/obj/d_a_obj_rgate/d_a_obj_rgate.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -186,9 +186,6 @@ static void daObjRgate_MoveBGDelete(daObjRgate_c*); static void daObjRgate_MoveBGExecute(daObjRgate_c*); static void daObjRgate_MoveBGDraw(daObjRgate_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u8 const l_cyl_src[68]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_RiderGate[12]; extern "C" static void search_coach__FPvPv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -254,22 +251,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_rgate/executor.cpp b/rel/d/a/obj/d_a_obj_rgate/executor.cpp index 6d2087f4568..670ab60214a 100644 --- a/rel/d/a/obj/d_a_obj_rgate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rgate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CBC360[4]; -extern u8 const data_80CBC364[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rgate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rgate/unknown_translation_unit_ctors.cpp index fed46fd4007..9e2655c2b13 100644 --- a/rel/d/a/obj/d_a_obj_rgate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rgate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CBC360[4]; -extern u8 const data_80CBC360[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CBC360[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CBC360-80CBC364 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CBC360[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rgate/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_rgate/unknown_translation_unit_dtors.cpp index 805e8250b4f..14061e8733b 100644 --- a/rel/d/a/obj/d_a_obj_rgate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_rgate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CBC364[4]; -extern u8 const data_80CBC364[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CBC364[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CBC364-80CBC368 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CBC364[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp b/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp index febaab62103..a8757b3f1d1 100644 --- a/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp +++ b/rel/d/a/obj/d_a_obj_riverrock/d_a_obj_riverrock.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -180,8 +180,6 @@ static void daObjRIVERROCK_Delete(daObjRIVERROCK_c*); static void daObjRIVERROCK_Draw(daObjRIVERROCK_c*); static void daObjRIVERROCK_Execute(daObjRIVERROCK_c*); static bool daObjRIVERROCK_IsDelete(daObjRIVERROCK_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_RIVERROCK[12]; extern "C" void __ct__20daObjRIVERROCK_HIO_cFv(); extern "C" void initCcCylinder__16daObjRIVERROCK_cFv(); @@ -228,19 +226,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_riverrock/executor.cpp b/rel/d/a/obj/d_a_obj_riverrock/executor.cpp index 61260f68052..0154e6a2718 100644 --- a/rel/d/a/obj/d_a_obj_riverrock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_riverrock/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CBDA48[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_riverrock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_riverrock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9b56ad029de..c9fa6b419b6 100644 --- a/rel/d/a/obj/d_a_obj_riverrock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_riverrock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CBDA54[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CBDA54-80CBDA5C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CBDA54[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CBDBE0-80CBDBE8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_riverrock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_riverrock/unknown_translation_unit_ctors.cpp index 5b8727c9276..72a56005ceb 100644 --- a/rel/d/a/obj/d_a_obj_riverrock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_riverrock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CBDA48[2]; -extern void* const data_80CBDA48[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_riverrock_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CBDA48-80CBDA50 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CBDA48[2] = { + (void*)__sinit_d_a_obj_riverrock_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp index 86aa4752632..e3decdeddbb 100644 --- a/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp +++ b/rel/d/a/obj/d_a_obj_rock/d_a_obj_rock.cpp @@ -114,8 +114,6 @@ static void daObj_Rock_Delete(obj_rock_class*); static void useHeapInit(fopAc_ac_c*); static void set_pos_check(obj_rock_class*, int); static void daObj_Rock_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_ROCK[12]; extern "C" static void daObj_Rock_Draw__FP14obj_rock_class(); extern "C" static void daObj_Rock_Execute__FP14obj_rock_class(); @@ -147,17 +145,6 @@ void MtxPosition(cXyz*, cXyz*); void MtxPush(); void MtxPull(); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_rock/executor.cpp b/rel/d/a/obj/d_a_obj_rock/executor.cpp index 127dc91ea81..746cad166c8 100644 --- a/rel/d/a/obj/d_a_obj_rock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rock/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CBE79C[4]; -extern u8 const data_80CBE7A0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rock/unknown_translation_unit_ctors.cpp index be80d774491..568212c669f 100644 --- a/rel/d/a/obj/d_a_obj_rock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CBE79C[4]; -extern u8 const data_80CBE79C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CBE79C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CBE79C-80CBE7A0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CBE79C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rock/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_rock/unknown_translation_unit_dtors.cpp index 17f05c2bc30..683f8465c14 100644 --- a/rel/d/a/obj/d_a_obj_rock/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_rock/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CBE7A0[4]; -extern u8 const data_80CBE7A0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CBE7A0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CBE7A0-80CBE7A4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CBE7A0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp index 2e82d7ee8b6..1c7f4bd981b 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/d_a_obj_rope_bridge.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -26,6 +24,8 @@ struct cXyz { /* 80596DE8 */ cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -38,11 +38,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -206,9 +206,6 @@ static void daObjRBridge_create1st(daObjRBridge_c*); static void daObjRBridge_MoveBGDelete(daObjRBridge_c*); static void daObjRBridge_MoveBGExecute(daObjRBridge_c*); static void daObjRBridge_MoveBGDraw(daObjRBridge_c*); -extern "C" extern u8 const l_brg_height[8]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_RopeBridge[12]; extern "C" void initBaseMtx__14daObjRBridge_cFv(); extern "C" void setBaseMtx__14daObjRBridge_cFv(); @@ -270,25 +267,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void* operator new(u32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_805980F8[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/executor.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/executor.cpp index 158882b728b..df8dd3564a5 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80597D74[4]; -extern u8 const data_80597D78[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_bss.cpp index bd3710d228d..eef54c3561e 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_805980F8[4]; -extern "C" extern u8 data_805980F8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_ctors.cpp index 5223046907a..5093d28337a 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80597D74[4]; -extern u8 const data_80597D74[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80597D74[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80597D74-80597D78 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80597D74[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_dtors.cpp index a63fc972f45..d4b3fb5ce50 100644 --- a/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_rope_bridge/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80597D78[4]; -extern u8 const data_80597D78[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80597D78[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80597D78-80597D7C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80597D78[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp b/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp index cbd1ce61672..4c4b347131f 100644 --- a/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp +++ b/rel/d/a/obj/d_a_obj_rotBridge/d_a_obj_rotBridge.cpp @@ -143,7 +143,6 @@ static void daRotBridge_Draw(daRotBridge_c*); static void daRotBridge_Execute(daRotBridge_c*); static void daRotBridge_Delete(daRotBridge_c*); static void daRotBridge_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_RotBridge[12]; extern "C" void __ct__17daRotBridge_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -180,14 +179,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_MtxToRot__FPA4_CfP5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_rotBridge/executor.cpp b/rel/d/a/obj/d_a_obj_rotBridge/executor.cpp index a841398d08b..bc7ea0d441e 100644 --- a/rel/d/a/obj/d_a_obj_rotBridge/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rotBridge/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CBF654[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rotBridge/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_rotBridge/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9d9eea626d2..220632289b2 100644 --- a/rel/d/a/obj/d_a_obj_rotBridge/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_rotBridge/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CBF660[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CBF660-80CBF668 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CBF660[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CBF780-80CBF788 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_rotBridge/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rotBridge/unknown_translation_unit_ctors.cpp index 967383c1259..4bb331a4877 100644 --- a/rel/d/a/obj/d_a_obj_rotBridge/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rotBridge/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CBF654[2]; -extern void* const data_80CBF654[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_rotBridge_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CBF654-80CBF65C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CBF654[2] = { + (void*)__sinit_d_a_obj_rotBridge_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp b/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp index 0d78370ac74..07b96232712 100644 --- a/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp +++ b/rel/d/a/obj/d_a_obj_rotTrap/d_a_obj_rotTrap.cpp @@ -172,9 +172,6 @@ static void daRotTrap_Draw(daRotTrap_c*); static void daRotTrap_Execute(daRotTrap_c*); static void daRotTrap_Delete(daRotTrap_c*); static void daRotTrap_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_RotTrap[12]; extern "C" void __ct__15daRotTrap_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -224,18 +221,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_chaseAngleS(s16*, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_rotTrap/executor.cpp b/rel/d/a/obj/d_a_obj_rotTrap/executor.cpp index 1b949c50608..ecf06bd81b9 100644 --- a/rel/d/a/obj/d_a_obj_rotTrap/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rotTrap/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CC07F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rotTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_rotTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5f83694a5d8..b9dc26519f6 100644 --- a/rel/d/a/obj/d_a_obj_rotTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_rotTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CC0800[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CC0800-80CC0808 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CC0800[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CC0AB0-80CC0AB8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_rotTrap/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rotTrap/unknown_translation_unit_ctors.cpp index 4df863c0057..a059f82ffad 100644 --- a/rel/d/a/obj/d_a_obj_rotTrap/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rotTrap/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CC07F4[2]; -extern void* const data_80CC07F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_rotTrap_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CC07F4-80CC07FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CC07F4[2] = { + (void*)__sinit_d_a_obj_rotTrap_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp b/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp index 3f0ecb1f770..f40c6f7fc23 100644 --- a/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp +++ b/rel/d/a/obj/d_a_obj_roten/d_a_obj_roten.cpp @@ -38,12 +38,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -103,8 +103,6 @@ static void daObj_Roten_Delete(void*); static void daObj_Roten_Execute(void*); static void daObj_Roten_Draw(void*); static bool daObj_Roten_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_ROTEN[12]; extern "C" void initBaseMtx__13daObj_Roten_cFv(); extern "C" void setBaseMtx__13daObj_Roten_cFv(); @@ -139,17 +137,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_roten/executor.cpp b/rel/d/a/obj/d_a_obj_roten/executor.cpp index d219d06c282..b076dc6c9e9 100644 --- a/rel/d/a/obj/d_a_obj_roten/executor.cpp +++ b/rel/d/a/obj/d_a_obj_roten/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CC13F8[4]; -extern u8 const data_80CC13FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_roten/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_roten/unknown_translation_unit_ctors.cpp index aff2d50d855..f1a742f4560 100644 --- a/rel/d/a/obj/d_a_obj_roten/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_roten/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC13F8[4]; -extern u8 const data_80CC13F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CC13F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CC13F8-80CC13FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CC13F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_roten/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_roten/unknown_translation_unit_dtors.cpp index aff2d12e179..9aad118a6f8 100644 --- a/rel/d/a/obj/d_a_obj_roten/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_roten/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC13FC[4]; -extern u8 const data_80CC13FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CC13FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CC13FC-80CC1400 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CC13FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp b/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp index 9b6bf6e2d00..68eaf4951b3 100644 --- a/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp +++ b/rel/d/a/obj/d_a_obj_rstair/d_a_obj_rstair.cpp @@ -164,10 +164,6 @@ static void daObjRotStair_create1st(daObjRotStair_c*); static void daObjRotStair_MoveBGDelete(daObjRotStair_c*); static void daObjRotStair_MoveBGExecute(daObjRotStair_c*); static void daObjRotStair_MoveBGDraw(daObjRotStair_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_water_check_offset[12]; -extern "C" extern void* g_profile_Obj_RotStair[12]; extern "C" void initBaseMtx__15daObjRotStair_cFv(); extern "C" void setBaseMtx__15daObjRotStair_cFv(); @@ -217,15 +213,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80CC2880[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_rstair/executor.cpp b/rel/d/a/obj/d_a_obj_rstair/executor.cpp index 4efc5640328..1bb0ae5cd5a 100644 --- a/rel/d/a/obj/d_a_obj_rstair/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rstair/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CC26F8[4]; -extern u8 const data_80CC26FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_bss.cpp index eb0b2bdb70e..ef84999c72c 100644 --- a/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80CC2880[4]; -extern "C" extern u8 struct_80CC2880[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_ctors.cpp index fff9da8ca78..6e731c49ddd 100644 --- a/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC26F8[4]; -extern u8 const data_80CC26F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CC26F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CC26F8-80CC26FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CC26F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_dtors.cpp index 2f1c6a0edda..af265cb2e8d 100644 --- a/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_rstair/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC26FC[4]; -extern u8 const data_80CC26FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CC26FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CC26FC-80CC2700 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CC26FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp b/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp index 24282fa19f3..12b80e90520 100644 --- a/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp +++ b/rel/d/a/obj/d_a_obj_rw/d_a_obj_rw.cpp @@ -146,8 +146,6 @@ static bool daOBJ_RW_IsDelete(obj_rw_class*); static void daOBJ_RW_Delete(obj_rw_class*); static void useHeapInit(fopAc_ac_c*); static void daOBJ_RW_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_RW[12]; extern "C" void __ct__14daOBJ_RW_HIO_cFv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -200,24 +198,6 @@ void cM_rndF(f32); void cLib_addCalc0(f32*, f32, f32); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_rw/executor.cpp b/rel/d/a/obj/d_a_obj_rw/executor.cpp index 2da39429194..9c83fb1b294 100644 --- a/rel/d/a/obj/d_a_obj_rw/executor.cpp +++ b/rel/d/a/obj/d_a_obj_rw/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CC3AE0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_rw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_rw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 90e5991f139..06c4c2bd233 100644 --- a/rel/d/a/obj/d_a_obj_rw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_rw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CC3AEC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CC3AEC-80CC3AF4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CC3AEC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CC3C78-80CC3C80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_rw/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_rw/unknown_translation_unit_ctors.cpp index f4dd5ae85b6..7d9f7be8676 100644 --- a/rel/d/a/obj/d_a_obj_rw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_rw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CC3AE0[2]; -extern void* const data_80CC3AE0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_rw_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CC3AE0-80CC3AE8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CC3AE0[2] = { + (void*)__sinit_d_a_obj_rw_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp b/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp index 93cfae275b3..f10f1750104 100644 --- a/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp +++ b/rel/d/a/obj/d_a_obj_saidan/d_a_obj_saidan.cpp @@ -44,12 +44,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -100,9 +100,6 @@ static void daSaidan_Draw(daSaidan_c*); static void daSaidan_Execute(daSaidan_c*); static void daSaidan_Delete(daSaidan_c*); static void daSaidan_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Saidan[12]; extern "C" void __ct__14daSaidan_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -143,13 +140,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_saidan/executor.cpp b/rel/d/a/obj/d_a_obj_saidan/executor.cpp index 7dcabdafd16..e84a6afffe2 100644 --- a/rel/d/a/obj/d_a_obj_saidan/executor.cpp +++ b/rel/d/a/obj/d_a_obj_saidan/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CC4510[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_saidan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_saidan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ad52eb8e8de..250e11e07b8 100644 --- a/rel/d/a/obj/d_a_obj_saidan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_saidan/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CC451C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CC451C-80CC4524 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CC451C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CC4648-80CC4650 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_saidan/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_saidan/unknown_translation_unit_ctors.cpp index 9bb97b83f83..b3985f45348 100644 --- a/rel/d/a/obj/d_a_obj_saidan/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_saidan/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CC4510[2]; -extern void* const data_80CC4510[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_saidan_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CC4510-80CC4518 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CC4510[2] = { + (void*)__sinit_d_a_obj_saidan_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp b/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp index 50448bd4ea5..e3fbff9b962 100644 --- a/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita/d_a_obj_sakuita.cpp @@ -88,9 +88,6 @@ static void daObjSakuita_Execute(daObjSakuita_c*); static bool daObjSakuita_IsDelete(daObjSakuita_c*); static void daObjSakuita_Delete(daObjSakuita_c*); static void daObjSakuita_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_3704; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Sakuita[12]; extern "C" void create_init__14daObjSakuita_cFv(); extern "C" void initBaseMtx__14daObjSakuita_cFv(); @@ -129,16 +126,6 @@ void cM_atan2s(f32, f32); void cM_rnd(); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_sakuita/executor.cpp b/rel/d/a/obj/d_a_obj_sakuita/executor.cpp index 54a55ee44f3..042484f938e 100644 --- a/rel/d/a/obj/d_a_obj_sakuita/executor.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CC50AC[4]; -extern u8 const data_80CC50B0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_sakuita/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_sakuita/unknown_translation_unit_ctors.cpp index 06ae0ecc3c6..067d4ea505e 100644 --- a/rel/d/a/obj/d_a_obj_sakuita/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC50AC[4]; -extern u8 const data_80CC50AC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CC50AC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CC50AC-80CC50B0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CC50AC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sakuita/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_sakuita/unknown_translation_unit_dtors.cpp index 41e953f9a77..f07df7cd810 100644 --- a/rel/d/a/obj/d_a_obj_sakuita/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC50B0[4]; -extern u8 const data_80CC50B0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CC50B0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CC50B0-80CC50B4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CC50B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp b/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp index 6a2290f9fe8..1e00744ce79 100644 --- a/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita_rope/d_a_obj_sakuita_rope.cpp @@ -19,11 +19,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -108,8 +108,6 @@ static void daObjItaRope_Execute(daObjItaRope_c*); static bool daObjItaRope_IsDelete(daObjItaRope_c*); static void daObjItaRope_Delete(daObjItaRope_c*); static void daObjItaRope_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_ItaRope[12]; extern "C" void setModelData__9Sakuita_cFP12J3DModelData(); extern "C" void create__9Sakuita_cFP4cXyzsSc(); @@ -159,16 +157,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_sakuita_rope/executor.cpp b/rel/d/a/obj/d_a_obj_sakuita_rope/executor.cpp index 611b1fdb298..01f4c5c1f67 100644 --- a/rel/d/a/obj/d_a_obj_sakuita_rope/executor.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita_rope/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CC68E8[4]; -extern u8 const data_80CC68EC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_sakuita_rope/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_sakuita_rope/unknown_translation_unit_ctors.cpp index d12ab501c13..01384fe1fbf 100644 --- a/rel/d/a/obj/d_a_obj_sakuita_rope/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita_rope/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC68E8[4]; -extern u8 const data_80CC68E8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CC68E8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CC68E8-80CC68EC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CC68E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sakuita_rope/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_sakuita_rope/unknown_translation_unit_dtors.cpp index 909415c9f44..6cb8265a253 100644 --- a/rel/d/a/obj/d_a_obj_sakuita_rope/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_sakuita_rope/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC68EC[4]; -extern u8 const data_80CC68EC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CC68EC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CC68EC-80CC68F0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CC68EC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp b/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp index 127c7068473..d0ab84ef955 100644 --- a/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp +++ b/rel/d/a/obj/d_a_obj_scannon/d_a_obj_scannon.cpp @@ -249,8 +249,6 @@ static void daSCannon_Delete(daSCannon_c*); static void daSCannon_execute(daSCannon_c*); static void daSCannon_draw(daSCannon_c*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SCannon[12]; extern "C" static void eventCallBack__FPvi(); extern "C" static void daSCannon_c_createHeap__FP10fopAc_ac_c(); @@ -330,15 +328,6 @@ void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_scannon/executor.cpp b/rel/d/a/obj/d_a_obj_scannon/executor.cpp index 02ff20c989f..23c3a50b56e 100644 --- a/rel/d/a/obj/d_a_obj_scannon/executor.cpp +++ b/rel/d/a/obj/d_a_obj_scannon/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CC917C[2]; -extern u8 const data_80CC9184[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_scannon/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_scannon/unknown_translation_unit_ctors.cpp index 5cdca0bbe14..ee43ca01b0c 100644 --- a/rel/d/a/obj/d_a_obj_scannon/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_scannon/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CC917C[2]; -extern void* const data_80CC917C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_scannon_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CC917C-80CC9184 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CC917C[2] = { + (void*)__sinit_d_a_obj_scannon_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_scannon/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_scannon/unknown_translation_unit_dtors.cpp index 035540855b1..6ac6d4ecd85 100644 --- a/rel/d/a/obj/d_a_obj_scannon/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_scannon/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CC9184[4]; -extern u8 const data_80CC9184[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CC9184[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CC9184-80CC9188 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CC9184[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp b/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp index 490d77f42ba..4bcb2a28ee9 100644 --- a/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_crs/d_a_obj_scannon_crs.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -209,9 +209,6 @@ static void daSCannonCrs_create(daSCannonCrs_c*); static void daSCannonCrs_Delete(daSCannonCrs_c*); static void daSCannonCrs_execute(daSCannonCrs_c*); static void daSCannonCrs_draw(daSCannonCrs_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SCannonCrs[12]; extern "C" static void daSCannonCrs_c_createHeap__FP10fopAc_ac_c(); extern "C" static void eventCallBack__FPvi(); @@ -266,17 +263,6 @@ void cM_atan2s(f32, f32); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_scannon_crs/executor.cpp b/rel/d/a/obj/d_a_obj_scannon_crs/executor.cpp index d9d6cb2147c..8daccc2ddba 100644 --- a/rel/d/a/obj/d_a_obj_scannon_crs/executor.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_crs/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CCB074[2]; -extern u8 const data_80CCB07C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_scannon_crs/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_scannon_crs/unknown_translation_unit_ctors.cpp index 7b859986369..f27519e1d33 100644 --- a/rel/d/a/obj/d_a_obj_scannon_crs/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_crs/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CCB074[2]; -extern void* const data_80CCB074[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_scannon_crs_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CCB074-80CCB07C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CCB074[2] = { + (void*)__sinit_d_a_obj_scannon_crs_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_scannon_crs/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_scannon_crs/unknown_translation_unit_dtors.cpp index 5f39b743aca..8da33515918 100644 --- a/rel/d/a/obj/d_a_obj_scannon_crs/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_crs/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CCB07C[4]; -extern u8 const data_80CCB07C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CCB07C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CCB07C-80CCB080 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CCB07C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp b/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp index 0a6ab193944..298e7ee63aa 100644 --- a/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_ten/d_a_obj_scannon_ten.cpp @@ -213,9 +213,6 @@ static void daObjSCannonTen_Delete(daObjSCannonTen_c*); static void daObjSCannonTen_execute(daObjSCannonTen_c*); static void daObjSCannonTen_draw(daObjSCannonTen_c*); static void cLib_calcTimer__template0(int*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SCannonTen[12]; extern "C" static void eventCallBack__FPvi(); extern "C" static void daObjSCannonTen_c_createHeap__FP10fopAc_ac_c(); @@ -290,14 +287,6 @@ void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_scannon_ten/executor.cpp b/rel/d/a/obj/d_a_obj_scannon_ten/executor.cpp index eb19c26340b..e72fb305ab6 100644 --- a/rel/d/a/obj/d_a_obj_scannon_ten/executor.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_ten/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CCCC2C[2]; -extern u8 const data_80CCCC34[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_scannon_ten/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_scannon_ten/unknown_translation_unit_ctors.cpp index bd328600170..5fec5589318 100644 --- a/rel/d/a/obj/d_a_obj_scannon_ten/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_ten/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CCCC2C[2]; -extern void* const data_80CCCC2C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_scannon_ten_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CCCC2C-80CCCC34 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CCCC2C[2] = { + (void*)__sinit_d_a_obj_scannon_ten_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_scannon_ten/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_scannon_ten/unknown_translation_unit_dtors.cpp index 25f068b652f..613fa03568b 100644 --- a/rel/d/a/obj/d_a_obj_scannon_ten/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_scannon_ten/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CCCC34[4]; -extern u8 const data_80CCCC34[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CCCC34[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CCCC34-80CCCC38 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CCCC34[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp b/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp index ee1b9efa4b7..2f36c9e1c3f 100644 --- a/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp +++ b/rel/d/a/obj/d_a_obj_sekidoor/d_a_obj_sekidoor.cpp @@ -112,8 +112,6 @@ static void daObj_SekiDoor_Delete(void*); static void daObj_SekiDoor_Execute(void*); static void daObj_SekiDoor_Draw(void*); static bool daObj_SekiDoor_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_SEKIDOOR[12]; extern "C" void create__16daObj_SekiDoor_cFv(); extern "C" void CreateHeap__16daObj_SekiDoor_cFv(); @@ -152,15 +150,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_chaseS(s16*, s16, s16); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_sekidoor/executor.cpp b/rel/d/a/obj/d_a_obj_sekidoor/executor.cpp index c2f1bf092a8..cbe612f80f2 100644 --- a/rel/d/a/obj/d_a_obj_sekidoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_sekidoor/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CCD9F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_sekidoor/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_sekidoor/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8869d48d9b8..e7980652983 100644 --- a/rel/d/a/obj/d_a_obj_sekidoor/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_sekidoor/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CCDA00[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CCDA00-80CCDA08 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CCDA00[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CCDAF8-80CCDB00 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_sekidoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_sekidoor/unknown_translation_unit_ctors.cpp index 65ca687c77e..9ae2a253a38 100644 --- a/rel/d/a/obj/d_a_obj_sekidoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_sekidoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CCD9F4[2]; -extern void* const data_80CCD9F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_sekidoor_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CCD9F4-80CCD9FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CCD9F4[2] = { + (void*)__sinit_d_a_obj_sekidoor_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp b/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp index 33d6d33af14..30aeed985cb 100644 --- a/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp +++ b/rel/d/a/obj/d_a_obj_sekizo/d_a_obj_sekizo.cpp @@ -91,8 +91,6 @@ static void daObj_Sekizo_Delete(void*); static void daObj_Sekizo_Execute(void*); static void daObj_Sekizo_Draw(void*); static bool daObj_Sekizo_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_SEKIZO[12]; extern "C" void create__14daObj_Sekizo_cFv(); extern "C" void CreateHeap__14daObj_Sekizo_cFv(); @@ -124,13 +122,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_sekizo/executor.cpp b/rel/d/a/obj/d_a_obj_sekizo/executor.cpp index 4459074a62b..2b248bab900 100644 --- a/rel/d/a/obj/d_a_obj_sekizo/executor.cpp +++ b/rel/d/a/obj/d_a_obj_sekizo/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CCE160[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_sekizo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_sekizo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9d4a69b9fb2..c4652efd04f 100644 --- a/rel/d/a/obj/d_a_obj_sekizo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_sekizo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CCE16C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CCE16C-80CCE174 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CCE16C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CCE238-80CCE240 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_sekizo/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_sekizo/unknown_translation_unit_ctors.cpp index fcb3369daf6..2d80d34dd22 100644 --- a/rel/d/a/obj/d_a_obj_sekizo/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_sekizo/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CCE160[2]; -extern void* const data_80CCE160[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_sekizo_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CCE160-80CCE168 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CCE160[2] = { + (void*)__sinit_d_a_obj_sekizo_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp b/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp index 5403ecd4fb8..65b0c54c767 100644 --- a/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp +++ b/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.cpp @@ -11,11 +11,6 @@ // Types: // -struct csXyz { - /* 80CD4C0C */ ~csXyz(); - /* 80CD51A8 */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -25,6 +20,11 @@ struct cXyz { /* 80CD52A8 */ cXyz(); }; +struct csXyz { + /* 80CD4C0C */ ~csXyz(); + /* 80CD51A8 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -57,18 +57,18 @@ struct mDoExt_brkAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; - -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + +struct J3DAnmTransform {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -171,8 +171,6 @@ struct daObj_SekiDoor_c { /* 80CCD5DC */ void evtSkip(); }; -struct _GXColorS10 {}; - struct J3DJoint {}; struct dCcD_GObjInf { @@ -185,6 +183,8 @@ struct dCcD_GObjInf { /* 800846F0 */ void GetCoHitObj(); }; +struct _GXColorS10 {}; + struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); /* 80147FD4 */ void srchActor(void*, void*); @@ -453,54 +453,6 @@ static void daObj_Sekizoa_Execute(void*); static void daObj_Sekizoa_Draw(void*); static bool daObj_Sekizoa_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 const lit_5481; -extern "C" extern u32 const lit_5482; -extern "C" extern u32 const lit_5483; -extern "C" extern u32 const lit_6332; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_80CD65F4[72]; -extern "C" extern u8 data_80CD663C[48]; -extern "C" extern void* g_profile_OBJ_SEKIZOA[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80CD6960[4]; -extern "C" extern u8 data_80CD6964[4]; -extern "C" extern u8 data_80CD6968[4]; -extern "C" extern u8 data_80CD696C[4]; -extern "C" extern u8 data_80CD6970[4]; -extern "C" extern u8 data_80CD6974[4]; -extern "C" extern u8 data_80CD6978[4]; -extern "C" extern u8 data_80CD697C[4]; -extern "C" extern u8 data_80CD6980[4]; -extern "C" extern u8 data_80CD6984[4]; -extern "C" extern u8 data_80CD6988[4]; -extern "C" extern u8 data_80CD698C[4]; -extern "C" extern u8 data_80CD6990[4]; -extern "C" extern u8 data_80CD6994[4]; -extern "C" extern u8 data_80CD6998[4]; -extern "C" extern u8 data_80CD699C[4]; -extern "C" extern u8 data_80CD69A0[4]; -extern "C" extern u8 data_80CD69A4[4]; -extern "C" extern u8 data_80CD69A8[4]; -extern "C" extern u8 data_80CD69AC[4]; -extern "C" extern u8 data_80CD69B0[4]; -extern "C" extern u8 data_80CD69B4[4]; -extern "C" extern u8 data_80CD69B8[4]; -extern "C" extern u8 data_80CD69BC[4]; -extern "C" extern u8 data_80CD69C0[4]; extern "C" void __dt__15daObj_Sekizoa_cFv(); extern "C" void create__15daObj_Sekizoa_cFv(); @@ -682,25 +634,6 @@ void cM_rndF(f32); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mSrchName__8daNpcT_c[2 + 2 /* padding */]; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_sekizoa/executor.cpp b/rel/d/a/obj/d_a_obj_sekizoa/executor.cpp index 4a30830c836..daa5f10e14c 100644 --- a/rel/d/a/obj/d_a_obj_sekizoa/executor.cpp +++ b/rel/d/a/obj/d_a_obj_sekizoa/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CD5CE8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_sekizoa/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_sekizoa/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8332c42cbeb..6816ea8d33f 100644 --- a/rel/d/a/obj/d_a_obj_sekizoa/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_sekizoa/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CD5CF4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CD5CF4-80CD5CFC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CD5CF4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CD68D8-80CD68E0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_sekizoa/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_sekizoa/unknown_translation_unit_ctors.cpp index c84a1399465..a7ea2a9cbd9 100644 --- a/rel/d/a/obj/d_a_obj_sekizoa/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_sekizoa/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CD5CE8[2]; -extern void* const data_80CD5CE8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_sekizoa_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CD5CE8-80CD5CF0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CD5CE8[2] = { + (void*)__sinit_d_a_obj_sekizoa_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp b/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp index 1709eef3534..33aa2efba86 100644 --- a/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp +++ b/rel/d/a/obj/d_a_obj_shield/d_a_obj_shield.cpp @@ -198,9 +198,6 @@ static void daItemShield_Execute(daItemShield_c*); static void daItemShield_Delete(daItemShield_c*); static void daItemShield_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Shield[12]; extern "C" static void Reflect__FP4cXyzRC13cBgS_PolyInfof(); extern "C" void __dt__8cM3dGPlaFv(); @@ -261,23 +258,6 @@ void CheckFieldItemCreateHeap(fopAc_ac_c*); void cM_atan2s(f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80CD8520[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_shield/executor.cpp b/rel/d/a/obj/d_a_obj_shield/executor.cpp index 6207e89be5b..a9235dcac7a 100644 --- a/rel/d/a/obj/d_a_obj_shield/executor.cpp +++ b/rel/d/a/obj/d_a_obj_shield/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CD826C[4]; -extern u8 const data_80CD8270[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_bss.cpp index 3c84d3247a3..36b673de6df 100644 --- a/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80CD8520[4]; -extern "C" extern u8 struct_80CD8520[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_ctors.cpp index cd4c700f745..380fef0ac4f 100644 --- a/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CD826C[4]; -extern u8 const data_80CD826C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CD826C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CD826C-80CD8270 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CD826C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_dtors.cpp index 398b51868d2..5736a74405b 100644 --- a/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_shield/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CD8270[4]; -extern u8 const data_80CD8270[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CD8270[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CD8270-80CD8274 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CD8270[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp b/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp index c17559b7da8..4c0714eb6ca 100644 --- a/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp +++ b/rel/d/a/obj/d_a_obj_sm_door/d_a_obj_sm_door.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -136,8 +136,6 @@ static void s_obj_sub(void*, void*); static void daObjSM_DOOR_Draw(daObjSM_DOOR_c*); static void daObjSM_DOOR_Execute(daObjSM_DOOR_c*); static bool daObjSM_DOOR_IsDelete(daObjSM_DOOR_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_SM_DOOR[12]; extern "C" static void daObjSM_DOOR_Create__FP10fopAc_ac_c(); extern "C" static void daObjSM_DOOR_Delete__FP14daObjSM_DOOR_c(); @@ -178,17 +176,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_sm_door/executor.cpp b/rel/d/a/obj/d_a_obj_sm_door/executor.cpp index 21e40ef3043..e460ac5be0f 100644 --- a/rel/d/a/obj/d_a_obj_sm_door/executor.cpp +++ b/rel/d/a/obj/d_a_obj_sm_door/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CD9588[4]; -extern u8 const data_80CD958C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_sm_door/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_sm_door/unknown_translation_unit_ctors.cpp index b97651f6fe5..16d4027af83 100644 --- a/rel/d/a/obj/d_a_obj_sm_door/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_sm_door/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CD9588[4]; -extern u8 const data_80CD9588[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CD9588[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CD9588-80CD958C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CD9588[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sm_door/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_sm_door/unknown_translation_unit_dtors.cpp index bba1c05438a..7a8af601301 100644 --- a/rel/d/a/obj/d_a_obj_sm_door/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_sm_door/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CD958C[4]; -extern u8 const data_80CD958C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CD958C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CD958C-80CD9590 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CD958C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp b/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp index 51776e2da67..3129ce5045b 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp +++ b/rel/d/a/obj/d_a_obj_smallkey/d_a_obj_smallkey.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -111,10 +111,10 @@ struct dPa_followEcallBack { /* 80CDA48C */ void __defctor(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -239,9 +239,6 @@ static void daKey_Execute(daKey_c*); static void daKey_Delete(daKey_c*); static void daKey_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SmallKey[12]; extern "C" static void searchParentSub__FPvPv(); extern "C" static void Reflect__FP4cXyzRC13cBgS_PolyInfof(); @@ -326,22 +323,6 @@ void dComIfGp_getReverb(int); void CheckFieldItemCreateHeap(fopAc_ac_c*); void cM_atan2s(f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__19dPa_followEcallBack[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CDBAB0[4]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_smallkey/executor.cpp b/rel/d/a/obj/d_a_obj_smallkey/executor.cpp index 18566cc294e..c82c33510a8 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/executor.cpp +++ b/rel/d/a/obj/d_a_obj_smallkey/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CDB7EC[4]; -extern u8 const data_80CDB7F0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_bss.cpp index 602b554c037..2184e8bd66d 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CDBAB0[4]; -extern "C" extern u8 data_80CDBAB0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_ctors.cpp index 4e74b482f37..1e032a5efcf 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CDB7EC[4]; -extern u8 const data_80CDB7EC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CDB7EC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CDB7EC-80CDB7F0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CDB7EC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_dtors.cpp index 34099261649..7a949a98727 100644 --- a/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_smallkey/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CDB7F0[4]; -extern u8 const data_80CDB7F0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CDB7F0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CDB7F0-80CDB7F4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CDB7F0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp b/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp index eace638ff4b..0e0ad025ec7 100644 --- a/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp +++ b/rel/d/a/obj/d_a_obj_smgdoor/d_a_obj_smgdoor.cpp @@ -132,8 +132,6 @@ static void daObjSmgDoor_MoveBGDelete(daObjSmgDoor_c*); static void daObjSmgDoor_MoveBGExecute(daObjSmgDoor_c*); static void daObjSmgDoor_MoveBGDraw(daObjSmgDoor_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SmgDoor[12]; extern "C" static void eventCallBack__FPvi(); extern "C" void initBaseMtx__14daObjSmgDoor_cFv(); @@ -179,16 +177,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dKy_change_colpat(u8); void cLib_chaseS(s16*, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CDCDF8[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_smgdoor/executor.cpp b/rel/d/a/obj/d_a_obj_smgdoor/executor.cpp index 405d2989914..1adf586980f 100644 --- a/rel/d/a/obj/d_a_obj_smgdoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_smgdoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CDCBEC[4]; -extern u8 const data_80CDCBF0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_bss.cpp index 2e4b04812ad..96b69c9c16d 100644 --- a/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CDCDF8[4]; -extern "C" extern u8 data_80CDCDF8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_ctors.cpp index 928f6ea70a7..18a40fdffd5 100644 --- a/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CDCBEC[4]; -extern u8 const data_80CDCBEC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CDCBEC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CDCBEC-80CDCBF0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CDCBEC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_dtors.cpp index 0da11289955..e30d8409e90 100644 --- a/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_smgdoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CDCBF0[4]; -extern u8 const data_80CDCBF0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CDCBF0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CDCBF0-80CDCBF4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CDCBF0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp index 9fae4eca9a6..2c827afd875 100644 --- a/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/d_a_obj_smoke.cpp @@ -30,14 +30,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -51,7 +51,6 @@ struct dPa_control_c { static void daObjSmoke_Execute(daObjSmoke_c*); static void daObjSmoke_Delete(daObjSmoke_c*); static void daObjSmoke_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_Smoke[12]; extern "C" void initBaseMtx__12daObjSmoke_cFv(); extern "C" void setBaseMtx__12daObjSmoke_cFv(); @@ -69,10 +68,6 @@ extern "C" extern void* g_profile_Obj_Smoke[12]; // void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_smoke/executor.cpp b/rel/d/a/obj/d_a_obj_smoke/executor.cpp index 1659f5dddbc..dbdd5bbf7db 100644 --- a/rel/d/a/obj/d_a_obj_smoke/executor.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CDD158[4]; -extern u8 const data_80CDD15C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_smoke/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_smoke/unknown_translation_unit_ctors.cpp index d546df9a1d8..b0d08fd5ee3 100644 --- a/rel/d/a/obj/d_a_obj_smoke/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CDD158[4]; -extern u8 const data_80CDD158[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CDD158[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CDD158-80CDD15C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CDD158[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_smoke/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_smoke/unknown_translation_unit_dtors.cpp index 1316a023cc5..3399f7c4c40 100644 --- a/rel/d/a/obj/d_a_obj_smoke/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_smoke/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CDD15C[4]; -extern u8 const data_80CDD15C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CDD15C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CDD15C-80CDD160 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CDD15C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp b/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp index f09f71d413f..4bf4a266daa 100644 --- a/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp +++ b/rel/d/a/obj/d_a_obj_smtile/d_a_obj_smtile.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,6 +21,8 @@ struct cXyz { /* 80CDD580 */ cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -126,7 +126,6 @@ static void daObj_SMTile_Execute(void*); static void daObj_SMTile_Draw(void*); static bool daObj_SMTile_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern void* g_profile_OBJ_SMTILE[12]; extern "C" void __dt__14daObj_SMTile_cFv(); extern "C" void __dt__4cXyzFv(); @@ -163,13 +162,6 @@ void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_smtile/executor.cpp b/rel/d/a/obj/d_a_obj_smtile/executor.cpp index 2e50f3c3216..697de93e383 100644 --- a/rel/d/a/obj/d_a_obj_smtile/executor.cpp +++ b/rel/d/a/obj/d_a_obj_smtile/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CDE348[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_smtile/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_smtile/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 44cb57fbb24..c7c4abf9eff 100644 --- a/rel/d/a/obj/d_a_obj_smtile/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_smtile/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CDE354[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CDE354-80CDE35C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CDE354[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CDE470-80CDE478 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_smtile/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_smtile/unknown_translation_unit_ctors.cpp index a7942910710..40423913697 100644 --- a/rel/d/a/obj/d_a_obj_smtile/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_smtile/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CDE348[2]; -extern void* const data_80CDE348[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_smtile_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CDE348-80CDE350 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CDE348[2] = { + (void*)__sinit_d_a_obj_smtile_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp b/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp index 4a0ff59825a..1bf2ce848cf 100644 --- a/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp +++ b/rel/d/a/obj/d_a_obj_smw_stone/d_a_obj_smw_stone.cpp @@ -36,12 +36,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -128,8 +128,6 @@ static void daSmWStone_create(daSmWStone_c*); static void daSmWStone_Delete(daSmWStone_c*); static void daSmWStone_execute(daSmWStone_c*); static void daSmWStone_draw(daSmWStone_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_SmWStone[12]; extern "C" static void daSmWStone_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__12daSmWStone_cFv(); @@ -168,13 +166,6 @@ void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_Poly dKy_tevstr_c*, s16, f32, _GXTexObj*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_smw_stone/executor.cpp b/rel/d/a/obj/d_a_obj_smw_stone/executor.cpp index de362bf1f25..b461a190180 100644 --- a/rel/d/a/obj/d_a_obj_smw_stone/executor.cpp +++ b/rel/d/a/obj/d_a_obj_smw_stone/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CDEEEC[4]; -extern u8 const data_80CDEEF0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_smw_stone/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_smw_stone/unknown_translation_unit_ctors.cpp index 4131cbf1936..6595531f74e 100644 --- a/rel/d/a/obj/d_a_obj_smw_stone/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_smw_stone/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CDEEEC[4]; -extern u8 const data_80CDEEEC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CDEEEC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CDEEEC-80CDEEF0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CDEEEC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_smw_stone/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_smw_stone/unknown_translation_unit_dtors.cpp index 6806ef92693..807c42ed73e 100644 --- a/rel/d/a/obj/d_a_obj_smw_stone/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_smw_stone/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CDEEF0[4]; -extern u8 const data_80CDEEF0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CDEEF0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CDEEF0-80CDEEF4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CDEEF0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp index ce2b8f3ef6d..7e105eff166 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/d_a_obj_snowEffTag.cpp @@ -35,18 +35,18 @@ struct daSnowEffTag_HIO_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -78,7 +78,6 @@ static void daSnowEffTag_Draw(daSnowEffTag_c*); static void daSnowEffTag_Execute(daSnowEffTag_c*); static void daSnowEffTag_Delete(daSnowEffTag_c*); static void daSnowEffTag_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_SnowEff[12]; extern "C" void __ct__18daSnowEffTag_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -105,13 +104,6 @@ void dComIfGp_getReverb(int); void cM_atan2s(f32, f32); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/executor.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/executor.cpp index bf91eab24e6..b60b3cccc0d 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/executor.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CDF70C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 73472d59d48..606ec2cf745 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CDF718[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CDF718-80CDF720 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CDF718[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CDF7C0-80CDF7C8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_snowEffTag/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_snowEffTag/unknown_translation_unit_ctors.cpp index ac9b2affce5..1928ababef2 100644 --- a/rel/d/a/obj/d_a_obj_snowEffTag/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_snowEffTag/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CDF70C[2]; -extern void* const data_80CDF70C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_snowEffTag_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CDF70C-80CDF714 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CDF70C[2] = { + (void*)__sinit_d_a_obj_snowEffTag_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp index 15ed9cde25f..8f751baa998 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/d_a_obj_snow_soup.cpp @@ -38,12 +38,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -88,8 +88,6 @@ static void daObjSnowSoup_create(daObjSnowSoup_c*); static void daObjSnowSoup_Delete(daObjSnowSoup_c*); static void daObjSnowSoup_execute(daObjSnowSoup_c*); static void daObjSnowSoup_draw(daObjSnowSoup_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_SnowSoup[12]; extern "C" static void daObjSnowSoup_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__15daObjSnowSoup_cFv(); @@ -125,13 +123,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_snow_soup/executor.cpp b/rel/d/a/obj/d_a_obj_snow_soup/executor.cpp index 0d110bc91b4..d771d3537b9 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/executor.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CE0234[4]; -extern u8 const data_80CE0238[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_snow_soup/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_snow_soup/unknown_translation_unit_ctors.cpp index b49aa22453f..3a65884fa29 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CE0234[4]; -extern u8 const data_80CE0234[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CE0234[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CE0234-80CE0238 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CE0234[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_snow_soup/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_snow_soup/unknown_translation_unit_dtors.cpp index 7882be432f3..1bd26922ee5 100644 --- a/rel/d/a/obj/d_a_obj_snow_soup/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_snow_soup/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CE0238[4]; -extern u8 const data_80CE0238[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CE0238[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CE0238-80CE023C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CE0238[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp b/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp index ca951bd83f1..4c08c046338 100644 --- a/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp +++ b/rel/d/a/obj/d_a_obj_so/d_a_obj_so.cpp @@ -226,8 +226,6 @@ static bool daObj_So_IsDelete(obj_so_class*); static void daObj_So_Delete(obj_so_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_So_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_SO[12]; extern "C" void __ct__14daObj_So_HIO_cFv(); extern "C" static void daObj_So_Draw__FP12obj_so_class(); @@ -305,20 +303,6 @@ void MtxTrans(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_so/executor.cpp b/rel/d/a/obj/d_a_obj_so/executor.cpp index b5cf5455421..128b66033e1 100644 --- a/rel/d/a/obj/d_a_obj_so/executor.cpp +++ b/rel/d/a/obj/d_a_obj_so/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CE39D4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_so/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_so/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5c5239ee42e..2e910a51240 100644 --- a/rel/d/a/obj/d_a_obj_so/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_so/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CE39E0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CE39E0-80CE39E8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CE39E0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CE3C88-80CE3C90 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_so/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_so/unknown_translation_unit_ctors.cpp index d6738976fe8..0c8d4833baf 100644 --- a/rel/d/a/obj/d_a_obj_so/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_so/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CE39D4[2]; -extern void* const data_80CE39D4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_so_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CE39D4-80CE39DC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CE39D4[2] = { + (void*)__sinit_d_a_obj_so_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp b/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp index 917ed89bf6a..b38312c610e 100644 --- a/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp +++ b/rel/d/a/obj/d_a_obj_spinLift/d_a_obj_spinLift.cpp @@ -117,8 +117,6 @@ static void daSpinLift_Draw(daSpinLift_c*); static void daSpinLift_Execute(daSpinLift_c*); static void daSpinLift_Delete(daSpinLift_c*); static void daSpinLift_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SpinLift[12]; extern "C" void __ct__16daSpinLift_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -160,13 +158,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); diff --git a/rel/d/a/obj/d_a_obj_spinLift/executor.cpp b/rel/d/a/obj/d_a_obj_spinLift/executor.cpp index eede634760e..45d54cb4b89 100644 --- a/rel/d/a/obj/d_a_obj_spinLift/executor.cpp +++ b/rel/d/a/obj/d_a_obj_spinLift/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CE4CA8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_spinLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_spinLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c13533d937a..08e084633ec 100644 --- a/rel/d/a/obj/d_a_obj_spinLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_spinLift/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CE4CB4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CE4CB4-80CE4CBC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CE4CB4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CE4EC0-80CE4EC8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_spinLift/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_spinLift/unknown_translation_unit_ctors.cpp index 80ee96283cb..ffdb3c58edf 100644 --- a/rel/d/a/obj/d_a_obj_spinLift/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_spinLift/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CE4CA8[2]; -extern void* const data_80CE4CA8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_spinLift_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CE4CA8-80CE4CB0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CE4CA8[2] = { + (void*)__sinit_d_a_obj_spinLift_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp b/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp index df64b8e7984..ea122cf3d88 100644 --- a/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp +++ b/rel/d/a/obj/d_a_obj_ss_drink/d_a_obj_ss_drink.cpp @@ -13,19 +13,19 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -236,9 +236,6 @@ static void daObj_SSDrink_Delete(void*); static void daObj_SSDrink_Execute(void*); static void daObj_SSDrink_Draw(void*); static bool daObj_SSDrink_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_SSDRINK[12]; extern "C" void __dt__15daObj_SSDrink_cFv(); extern "C" void create__15daObj_SSDrink_cFv(); @@ -306,18 +303,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dMsgObject_addTotalPrice(s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern u8 const data_80CE692C[4]; extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_ss_drink/executor.cpp b/rel/d/a/obj/d_a_obj_ss_drink/executor.cpp index b07a8982bfc..922ff575b5d 100644 --- a/rel/d/a/obj/d_a_obj_ss_drink/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ss_drink/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CE6924[2]; -extern u8 const data_80CE692C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ss_drink/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ss_drink/unknown_translation_unit_ctors.cpp index eddcb71231b..546f236380c 100644 --- a/rel/d/a/obj/d_a_obj_ss_drink/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ss_drink/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CE6924[2]; -extern void* const data_80CE6924[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ss_drink_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CE6924-80CE692C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CE6924[2] = { + (void*)__sinit_d_a_obj_ss_drink_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ss_drink/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ss_drink/unknown_translation_unit_dtors.cpp index 57c96f95949..464e3e28b2a 100644 --- a/rel/d/a/obj/d_a_obj_ss_drink/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ss_drink/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CE692C[4]; -extern u8 const data_80CE692C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CE692C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CE692C-80CE6930 0004+00 s=0 e=2 z=0 None .dtors None */ +u8 const data_80CE692C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp index deab911ad80..b8b76b61032 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp +++ b/rel/d/a/obj/d_a_obj_ss_item/d_a_obj_ss_item.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -188,7 +188,6 @@ static void daObj_SSItem_Delete(void*); static void daObj_SSItem_Execute(void*); static void daObj_SSItem_Draw(void*); static bool daObj_SSItem_IsDelete(void*); -extern "C" extern void* g_profile_OBJ_SSITEM[12]; extern "C" void __dt__14daObj_SSItem_cFv(); extern "C" void create__14daObj_SSItem_cFv(); @@ -245,18 +244,6 @@ void fpcSch_JudgeByID(void*, void*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern u8 const data_80CE7EAC[4]; extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_ss_item/executor.cpp b/rel/d/a/obj/d_a_obj_ss_item/executor.cpp index 3e1d1e45167..21924acac5d 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ss_item/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CE7EA4[2]; -extern u8 const data_80CE7EAC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ss_item/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ss_item/unknown_translation_unit_ctors.cpp index deccdea986a..7c3eafc4e32 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ss_item/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CE7EA4[2]; -extern void* const data_80CE7EA4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ss_item_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CE7EA4-80CE7EAC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CE7EA4[2] = { + (void*)__sinit_d_a_obj_ss_item_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_ss_item/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ss_item/unknown_translation_unit_dtors.cpp index 3bd52833ca4..a2f1942f7bd 100644 --- a/rel/d/a/obj/d_a_obj_ss_item/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ss_item/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CE7EAC[4]; -extern u8 const data_80CE7EAC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CE7EAC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CE7EAC-80CE7EB0 0004+00 s=0 e=2 z=0 None .dtors None */ +u8 const data_80CE7EAC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp b/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp index 1fa063eb19b..d7927abb48a 100644 --- a/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp +++ b/rel/d/a/obj/d_a_obj_stairBlock/d_a_obj_stairBlock.cpp @@ -51,10 +51,10 @@ struct daStairBlock_HIO_c { /* 80CE8CDC */ ~daStairBlock_HIO_c(); }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -127,8 +127,6 @@ static void daStairBlock_Draw(daStairBlock_c*); static void daStairBlock_Execute(daStairBlock_c*); static void daStairBlock_Delete(daStairBlock_c*); static void daStairBlock_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_StairBlock[12]; extern "C" void __ct__18daStairBlock_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -169,18 +167,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_stairBlock/executor.cpp b/rel/d/a/obj/d_a_obj_stairBlock/executor.cpp index e986317b29c..215529278b3 100644 --- a/rel/d/a/obj/d_a_obj_stairBlock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_stairBlock/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80CE8DA8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_stairBlock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_stairBlock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 26158581cbd..d4281dbb0be 100644 --- a/rel/d/a/obj/d_a_obj_stairBlock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_stairBlock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CE8DB4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CE8DB4-80CE8DBC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CE8DB4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CE8FC0-80CE8FC8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_stairBlock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_stairBlock/unknown_translation_unit_ctors.cpp index 28ae424717d..dad78b259fb 100644 --- a/rel/d/a/obj/d_a_obj_stairBlock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_stairBlock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80CE8DA8[2]; -extern void* const data_80CE8DA8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_stairBlock_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CE8DA8-80CE8DB0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80CE8DA8[2] = { + (void*)__sinit_d_a_obj_stairBlock_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp b/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp index b750e2aa8fa..eabc001da93 100644 --- a/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp +++ b/rel/d/a/obj/d_a_obj_stick/d_a_obj_stick.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -144,8 +144,6 @@ static void daObj_Stick_Delete(void*); static void daObj_Stick_Execute(void*); static void daObj_Stick_Draw(void*); static bool daObj_Stick_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_STICK[12]; extern "C" void __dt__13daObj_Stick_cFv(); extern "C" void create__13daObj_Stick_cFv(); @@ -190,18 +188,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_PolyInfo&, dKy_tevstr_c*, s16, f32, _GXTexObj*); void operator delete(void*); -extern "C" extern u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_stick/executor.cpp b/rel/d/a/obj/d_a_obj_stick/executor.cpp index b903607b884..f200115029b 100644 --- a/rel/d/a/obj/d_a_obj_stick/executor.cpp +++ b/rel/d/a/obj/d_a_obj_stick/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80599E28[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_stick/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_stick/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 5280d6eb33b..ed8f8c12e81 100644 --- a/rel/d/a/obj/d_a_obj_stick/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_stick/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80599E34[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80599E34-80599E3C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80599E34[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80599F80-80599F88 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_stick/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_stick/unknown_translation_unit_ctors.cpp index acee4a4b481..f6eb03130e7 100644 --- a/rel/d/a/obj/d_a_obj_stick/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_stick/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80599E28[2]; -extern void* const data_80599E28[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_stick_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80599E28-80599E30 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80599E28[2] = { + (void*)__sinit_d_a_obj_stick_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp index ce5d5aa02cd..6c11e9f8df7 100644 --- a/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp +++ b/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct Quaternion {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct Quaternion {}; - struct mDoMtx_stack_c { /* 8000CF44 */ void ZXYrotM(csXyz const&); /* 8000CF7C */ void quatM(Quaternion const*); @@ -247,10 +247,6 @@ static void daObjStone_Draw(daObjStone_c*); static void daObjStone_Execute(daObjStone_c*); static void daObjStone_Delete(daObjStone_c*); static void daObjStone_Create(fopAc_ac_c*); -extern "C" extern u8 const l_rolling_time[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Stone[12]; extern "C" static void bound__FP4cXyzRC13cBgS_PolyInfof(); extern "C" void __dt__8cM3dGPlaFv(); @@ -334,27 +330,6 @@ void dComIfGd_setSimpleShadow(cXyz*, f32, f32, cBgS_PolyInfo&, s16, f32, _GXTexO void cM_atan2s(f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 ZeroQuat[16]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CECE10[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_stone/executor.cpp b/rel/d/a/obj/d_a_obj_stone/executor.cpp index f28ac1c1518..36fdc703a3e 100644 --- a/rel/d/a/obj/d_a_obj_stone/executor.cpp +++ b/rel/d/a/obj/d_a_obj_stone/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CECAAC[4]; -extern u8 const data_80CECAB0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_bss.cpp index c1285bdc285..5cafdb4c1d5 100644 --- a/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CECE10[4]; -extern "C" extern u8 data_80CECE10[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_ctors.cpp index 766646dce44..c5a95c23a5d 100644 --- a/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CECAAC[4]; -extern u8 const data_80CECAAC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CECAAC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CECAAC-80CECAB0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CECAAC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_dtors.cpp index 5b51394969e..53dbd36779d 100644 --- a/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_stone/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CECAB0[4]; -extern u8 const data_80CECAB0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CECAB0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CECAB0-80CECAB4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CECAB0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark.cpp b/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark.cpp index c90a8eeb2d9..e8ca13558c8 100644 --- a/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark.cpp +++ b/rel/d/a/obj/d_a_obj_stonemark/d_a_obj_stoneMark.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -82,8 +82,6 @@ struct ResTIMG {}; static void daObjSMark_Draw(daObjSMark_c*); static void daObjSMark_Delete(daObjSMark_c*); static void daObjSMark_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_StoneMark[12]; extern "C" void initBaseMtx__12daObjSMark_cFv(); extern "C" void setBaseMtx__12daObjSMark_cFv(); @@ -110,13 +108,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGd_setSimpleShadow(cXyz*, f32, f32, cBgS_PolyInfo&, s16, f32, _GXTexObj*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_stonemark/executor.cpp b/rel/d/a/obj/d_a_obj_stonemark/executor.cpp index bce27df2450..119f53585a3 100644 --- a/rel/d/a/obj/d_a_obj_stonemark/executor.cpp +++ b/rel/d/a/obj/d_a_obj_stonemark/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8059A3E0[4]; -extern u8 const data_8059A3E4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_stonemark/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_stonemark/unknown_translation_unit_ctors.cpp index af0fdf07c13..ebb21b2d4e6 100644 --- a/rel/d/a/obj/d_a_obj_stonemark/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_stonemark/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059A3E0[4]; -extern u8 const data_8059A3E0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8059A3E0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8059A3E0-8059A3E4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8059A3E0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_stonemark/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_stonemark/unknown_translation_unit_dtors.cpp index 2e97e0af5a7..9873905e8bb 100644 --- a/rel/d/a/obj/d_a_obj_stonemark/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_stonemark/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059A3E4[4]; -extern u8 const data_8059A3E4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8059A3E4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8059A3E4-8059A3E8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8059A3E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp b/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp index 584ec5d884e..acf8fb51c1e 100644 --- a/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp +++ b/rel/d/a/obj/d_a_obj_stopper/d_a_obj_stopper.cpp @@ -185,49 +185,6 @@ static void daObjStopper_Delete(daObjStopper_c*); static void daObjStopper_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u16*); static void cLib_calcTimer__template1(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Stopper[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80CEF248[4]; -extern "C" extern u8 data_80CEF24C[4]; -extern "C" extern u8 data_80CEF250[4]; -extern "C" extern u8 data_80CEF254[4]; -extern "C" extern u8 data_80CEF258[4]; -extern "C" extern u8 data_80CEF25C[4]; -extern "C" extern u8 data_80CEF260[4]; -extern "C" extern u8 data_80CEF264[4]; -extern "C" extern u8 data_80CEF268[4]; -extern "C" extern u8 data_80CEF26C[4]; -extern "C" extern u8 data_80CEF270[4]; -extern "C" extern u8 data_80CEF274[4]; -extern "C" extern u8 data_80CEF278[4]; -extern "C" extern u8 data_80CEF27C[4]; -extern "C" extern u8 data_80CEF280[4]; -extern "C" extern u8 data_80CEF284[4]; -extern "C" extern u8 data_80CEF288[4]; -extern "C" extern u8 data_80CEF28C[4]; -extern "C" extern u8 data_80CEF290[4]; -extern "C" extern u8 data_80CEF294[4]; -extern "C" extern u8 data_80CEF298[4]; -extern "C" extern u8 data_80CEF29C[4]; -extern "C" extern u8 data_80CEF2A0[4]; -extern "C" extern u8 data_80CEF2A4[4]; -extern "C" extern u8 data_80CEF2A8[4]; extern "C" static void getStopModelData__Fv(); extern "C" void initBaseMtx__14daObjStopper_cFv(); @@ -335,19 +292,6 @@ void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__19dPa_followEcallBack[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_stopper/executor.cpp b/rel/d/a/obj/d_a_obj_stopper/executor.cpp index fea9dde9204..e73f7c379a8 100644 --- a/rel/d/a/obj/d_a_obj_stopper/executor.cpp +++ b/rel/d/a/obj/d_a_obj_stopper/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CEEF90[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_stopper/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_stopper/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index d69325de6e9..f2720cc5833 100644 --- a/rel/d/a/obj/d_a_obj_stopper/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_stopper/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80CEEF98[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80CEEF98-80CEEFA0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80CEEF98[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80CEF1E0-80CEF1E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_stopper/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_stopper/unknown_translation_unit_ctors.cpp index 8074690f682..6ea36873b23 100644 --- a/rel/d/a/obj/d_a_obj_stopper/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_stopper/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CEEF90[4]; -extern u8 const data_80CEEF90[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CEEF90[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CEEF90-80CEEF94 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CEEF90[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp b/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp index 4eef671d663..e8734213ac6 100644 --- a/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp +++ b/rel/d/a/obj/d_a_obj_stopper2/d_a_obj_stopper2.cpp @@ -40,12 +40,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -88,8 +88,6 @@ static void daObjStopper2_Execute(daObjStopper2_c*); static void daObjStopper2_Delete(daObjStopper2_c*); static void daObjStopper2_Create(daObjStopper2_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Stopper2[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" static void getStopName__Fv(); @@ -133,13 +131,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void dComIfG_getStageRes(char const*); void cLib_chaseF(f32*, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CEFFF8[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_stopper2/executor.cpp b/rel/d/a/obj/d_a_obj_stopper2/executor.cpp index 6988b155d57..f3b9aa6ae86 100644 --- a/rel/d/a/obj/d_a_obj_stopper2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_stopper2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CEFE88[4]; -extern u8 const data_80CEFE8C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_bss.cpp index 368b5909927..a29170c367b 100644 --- a/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CEFFF8[4]; -extern "C" extern u8 data_80CEFFF8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_ctors.cpp index 603616d7724..1062e32ac67 100644 --- a/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CEFE88[4]; -extern u8 const data_80CEFE88[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CEFE88[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CEFE88-80CEFE8C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CEFE88[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_dtors.cpp index d3b43e8d124..9e7ff1df808 100644 --- a/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_stopper2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CEFE8C[4]; -extern u8 const data_80CEFE8C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CEFE8C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CEFE8C-80CEFE90 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CEFE8C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp index ebb3b14e50c..72f51499415 100644 --- a/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp +++ b/rel/d/a/obj/d_a_obj_suisya/d_a_obj_suisya.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -92,8 +92,6 @@ static bool daObj_Suisya_IsDelete(daObj_Suisya_c*); static void daObj_Suisya_Delete(daObj_Suisya_c*); static void useHeapInit(fopAc_ac_c*); static void daObj_Suisya_Create(daObj_Suisya_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_SUISYA[12]; extern "C" void draw__14daObj_Suisya_cFv(); extern "C" static void daObj_Suisya_Draw__FP14daObj_Suisya_c(); @@ -126,13 +124,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_PolyInfo&, dKy_tevstr_c*, s16, f32, _GXTexObj*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_suisya/executor.cpp b/rel/d/a/obj/d_a_obj_suisya/executor.cpp index e920c31cdd5..8bc12192a63 100644 --- a/rel/d/a/obj/d_a_obj_suisya/executor.cpp +++ b/rel/d/a/obj/d_a_obj_suisya/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CF0518[4]; -extern u8 const data_80CF051C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_suisya/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_suisya/unknown_translation_unit_ctors.cpp index 3412bb377da..e6f106a394e 100644 --- a/rel/d/a/obj/d_a_obj_suisya/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_suisya/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF0518[4]; -extern u8 const data_80CF0518[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CF0518[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CF0518-80CF051C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CF0518[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_suisya/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_suisya/unknown_translation_unit_dtors.cpp index 967f7fee87c..bed1021890a 100644 --- a/rel/d/a/obj/d_a_obj_suisya/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_suisya/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF051C[4]; -extern u8 const data_80CF051C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CF051C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CF051C-80CF0520 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CF051C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp b/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp index 8a3c4d2be94..9a26f6dbc8f 100644 --- a/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp +++ b/rel/d/a/obj/d_a_obj_sw/d_a_obj_sw.cpp @@ -30,11 +30,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -52,11 +52,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014738 */ void setMat(mDoExt_3DlineMat_c*); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -143,8 +143,6 @@ static bool daObj_Sw_IsDelete(obj_sw_class*); static void daObj_Sw_Delete(obj_sw_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Sw_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_SW[12]; extern "C" static void daObj_Sw_Draw__FP12obj_sw_class(); extern "C" static void s_ks_sub__FPvPv(); @@ -198,17 +196,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_sw/executor.cpp b/rel/d/a/obj/d_a_obj_sw/executor.cpp index 857f3149c13..6ffc9f15b04 100644 --- a/rel/d/a/obj/d_a_obj_sw/executor.cpp +++ b/rel/d/a/obj/d_a_obj_sw/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CF2FF8[4]; -extern u8 const data_80CF2FFC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_sw/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_sw/unknown_translation_unit_ctors.cpp index bd53369e499..b36abf1eb8b 100644 --- a/rel/d/a/obj/d_a_obj_sw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_sw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF2FF8[4]; -extern u8 const data_80CF2FF8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CF2FF8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CF2FF8-80CF2FFC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CF2FF8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sw/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_sw/unknown_translation_unit_dtors.cpp index f9c50a89fea..0008e778f87 100644 --- a/rel/d/a/obj/d_a_obj_sw/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_sw/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF2FFC[4]; -extern u8 const data_80CF2FFC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CF2FFC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CF2FFC-80CF3000 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CF2FFC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp index c9d234b4c93..109a6331cb0 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/d_a_obj_swBallA.cpp @@ -64,12 +64,12 @@ struct dStage_roomControl_c { /* 80024338 */ void initZone(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -116,9 +116,6 @@ static void daObjSwBallA_Draw(daObjSwBallA_c*); static void daObjSwBallA_Execute(daObjSwBallA_c*); static void daObjSwBallA_Delete(daObjSwBallA_c*); static void daObjSwBallA_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SwBallA[12]; extern "C" static void s_ball_sub__FPvPv(); extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); @@ -176,13 +173,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_swBallA/executor.cpp b/rel/d/a/obj/d_a_obj_swBallA/executor.cpp index c201f27127e..b7d5ebb89bf 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CF43DC[4]; -extern u8 const data_80CF43E0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swBallA/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swBallA/unknown_translation_unit_ctors.cpp index 5a5ff375c62..dc8ab239231 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF43DC[4]; -extern u8 const data_80CF43DC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CF43DC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CF43DC-80CF43E0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CF43DC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swBallA/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swBallA/unknown_translation_unit_dtors.cpp index f891e8c25bb..ba55a612a99 100644 --- a/rel/d/a/obj/d_a_obj_swBallA/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swBallA/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF43E0[4]; -extern u8 const data_80CF43E0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CF43E0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CF43E0-80CF43E4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CF43E0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp index ce95513f58a..926081733c1 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/d_a_obj_swBallB.cpp @@ -68,12 +68,12 @@ struct dStage_roomControl_c { /* 80024338 */ void initZone(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -120,9 +120,6 @@ static void daObjSwBallB_Draw(daObjSwBallB_c*); static void daObjSwBallB_Execute(daObjSwBallB_c*); static void daObjSwBallB_Delete(daObjSwBallB_c*); static void daObjSwBallB_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SwBallB[12]; extern "C" static void s_ball_sub__FPvPv(); extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); @@ -180,14 +177,6 @@ void cLib_chaseF(f32*, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_swBallB/executor.cpp b/rel/d/a/obj/d_a_obj_swBallB/executor.cpp index 5599dacb5cb..3f3d2e91297 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CF59C8[4]; -extern u8 const data_80CF59CC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swBallB/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swBallB/unknown_translation_unit_ctors.cpp index edca2a96719..5709e71f4ca 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF59C8[4]; -extern u8 const data_80CF59C8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CF59C8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CF59C8-80CF59CC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CF59C8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swBallB/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swBallB/unknown_translation_unit_dtors.cpp index c36fd48db21..7f37ecd7505 100644 --- a/rel/d/a/obj/d_a_obj_swBallB/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swBallB/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF59CC[4]; -extern u8 const data_80CF59CC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CF59CC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CF59CC-80CF59D0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CF59CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp b/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp index d1abcac5257..21d10306e73 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp +++ b/rel/d/a/obj/d_a_obj_swBallC/d_a_obj_swBallC.cpp @@ -66,12 +66,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -130,12 +130,6 @@ static void daObjSwBallC_Execute(daObjSwBallC_c*); static void daObjSwBallC_Delete(daObjSwBallC_c*); static void daObjSwBallC_Create(daObjSwBallC_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 const lit_3697; -extern "C" extern u32 const lit_4109; -extern "C" extern u32 const lit_4110; -extern "C" extern u32 const lit_4111; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SwBallC[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" static void s_swb_sub__FPvPv(); @@ -199,14 +193,6 @@ void dMeter2Info_setSword(u8, bool); void cLib_chaseF(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CF6F18[4]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_swBallC/executor.cpp b/rel/d/a/obj/d_a_obj_swBallC/executor.cpp index a0916ea8a99..a8a0b28eebd 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swBallC/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CF6CCC[4]; -extern u8 const data_80CF6CD0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp index 52251541e13..444d56036c8 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CF6F18[4]; -extern "C" extern u8 data_80CF6F18[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_ctors.cpp index 3d5dc9d0bef..a6c9aec147f 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF6CCC[4]; -extern u8 const data_80CF6CCC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CF6CCC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CF6CCC-80CF6CD0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CF6CCC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_dtors.cpp index 92b5a43a72d..9c8769564a7 100644 --- a/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swBallC/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF6CD0[4]; -extern u8 const data_80CF6CD0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CF6CD0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CF6CD0-80CF6CD4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CF6CD0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp b/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp index 3ef00ca04a1..a68d25dc06a 100644 --- a/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp +++ b/rel/d/a/obj/d_a_obj_swLight/d_a_obj_swLight.cpp @@ -187,9 +187,6 @@ static void daObjSwLight_MoveBGExecute(daObjSwLight_c*); static void daObjSwLight_MoveBGDraw(daObjSwLight_c*); static void cLib_calcTimer__template0(u16*); static void cLib_calcTimer__template1(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SwLight[12]; extern "C" void initBaseMtx__14daObjSwLight_cFv(); extern "C" void setBaseMtx__14daObjSwLight_cFv(); @@ -247,23 +244,6 @@ void dKy_dalkmist_inf_set(DALKMIST_INFLUENCE*); void dKy_dalkmist_inf_cut(DALKMIST_INFLUENCE*); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CF8630[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_swLight/executor.cpp b/rel/d/a/obj/d_a_obj_swLight/executor.cpp index c108819bca2..af3df25fc8b 100644 --- a/rel/d/a/obj/d_a_obj_swLight/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swLight/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CF8398[4]; -extern u8 const data_80CF839C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_bss.cpp index 6d959c04c6c..c5db4ddc9e5 100644 --- a/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CF8630[4]; -extern "C" extern u8 data_80CF8630[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_ctors.cpp index a37e4496eff..a9d4b0fd009 100644 --- a/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF8398[4]; -extern u8 const data_80CF8398[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CF8398[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CF8398-80CF839C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CF8398[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_dtors.cpp index a8b768df9af..ba0466f1065 100644 --- a/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swLight/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CF839C[4]; -extern u8 const data_80CF839C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CF839C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CF839C-80CF83A0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CF839C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swallshutter/d_a_obj_sWallShutter.cpp b/rel/d/a/obj/d_a_obj_swallshutter/d_a_obj_sWallShutter.cpp index 6dc59738330..637a4fc1416 100644 --- a/rel/d/a/obj/d_a_obj_swallshutter/d_a_obj_sWallShutter.cpp +++ b/rel/d/a/obj/d_a_obj_swallshutter/d_a_obj_sWallShutter.cpp @@ -120,9 +120,6 @@ static void daSwShutter_Draw(daSwShutter_c*); static void daSwShutter_Execute(daSwShutter_c*); static void daSwShutter_Delete(daSwShutter_c*); static void daSwShutter_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SwallShutter[12]; extern "C" void __ct__17daSwShutter_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -166,14 +163,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_swallshutter/executor.cpp b/rel/d/a/obj/d_a_obj_swallshutter/executor.cpp index d342a2f362f..d39c70e2298 100644 --- a/rel/d/a/obj/d_a_obj_swallshutter/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swallshutter/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80598F64[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swallshutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_swallshutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c51e8ca6200..c41b2a874ab 100644 --- a/rel/d/a/obj/d_a_obj_swallshutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_swallshutter/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80598F70[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80598F70-80598F78 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80598F70[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805990E0-805990E8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_swallshutter/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swallshutter/unknown_translation_unit_ctors.cpp index 26dde4e2455..fed7eb49585 100644 --- a/rel/d/a/obj/d_a_obj_swallshutter/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swallshutter/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80598F64[2]; -extern void* const data_80598F64[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_sWallShutter_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80598F64-80598F6C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80598F64[2] = { + (void*)__sinit_d_a_obj_sWallShutter_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp b/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp index eea5cc4d0f4..a06a6dbd1b0 100644 --- a/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp +++ b/rel/d/a/obj/d_a_obj_swchain/d_a_obj_swchain.cpp @@ -186,8 +186,6 @@ static void daObjSwChain_Execute(daObjSwChain_c*); static void daObjSwChain_Delete(daObjSwChain_c*); static void daObjSwChain_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_SwChain[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" static void GetActorName__FR13cBgS_PolyInfo(); @@ -243,23 +241,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__6dMdl_c[5 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_swchain/executor.cpp b/rel/d/a/obj/d_a_obj_swchain/executor.cpp index 21abf7dede1..a78ec630b0f 100644 --- a/rel/d/a/obj/d_a_obj_swchain/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swchain/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CFB6E4[4]; -extern u8 const data_80CFB6E8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swchain/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swchain/unknown_translation_unit_ctors.cpp index fa2930466b2..da6089f52f2 100644 --- a/rel/d/a/obj/d_a_obj_swchain/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swchain/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CFB6E4[4]; -extern u8 const data_80CFB6E4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CFB6E4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CFB6E4-80CFB6E8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CFB6E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swchain/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swchain/unknown_translation_unit_dtors.cpp index 6bae16e9b2b..3fcf5cca392 100644 --- a/rel/d/a/obj/d_a_obj_swchain/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swchain/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CFB6E8[4]; -extern u8 const data_80CFB6E8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CFB6E8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CFB6E8-80CFB6EC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CFB6E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp b/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp index 8edba123fcf..7a5bcbae16f 100644 --- a/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp +++ b/rel/d/a/obj/d_a_obj_swhang/d_a_obj_swhang.cpp @@ -191,8 +191,6 @@ static void daObjSwHang_MoveBGDelete(daObjSwHang_c*); static void daObjSwHang_MoveBGExecute(daObjSwHang_c*); static void daObjSwHang_MoveBGDraw(daObjSwHang_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SwHang[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" void initBaseMtx__13daObjSwHang_cFv(); @@ -247,21 +245,6 @@ void dComIfGp_getReverb(int); void cLib_addCalc0(f32*, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80CFD4D0[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_swhang/executor.cpp b/rel/d/a/obj/d_a_obj_swhang/executor.cpp index e73a0e4a595..2a90c6b8e9c 100644 --- a/rel/d/a/obj/d_a_obj_swhang/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swhang/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CFD1D4[4]; -extern u8 const data_80CFD1D8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_bss.cpp index 79a2760850b..4a1c925ddd3 100644 --- a/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CFD4D0[4]; -extern "C" extern u8 data_80CFD4D0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_ctors.cpp index 97a0b1883c7..2cd9c967264 100644 --- a/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CFD1D4[4]; -extern u8 const data_80CFD1D4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CFD1D4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CFD1D4-80CFD1D8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CFD1D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_dtors.cpp index 46aba206d83..426acded0de 100644 --- a/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swhang/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CFD1D8[4]; -extern u8 const data_80CFD1D8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CFD1D8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CFD1D8-80CFD1DC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CFD1D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp b/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp index f0a32aae945..e555aaf698e 100644 --- a/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp +++ b/rel/d/a/obj/d_a_obj_sword/d_a_obj_sword.cpp @@ -127,9 +127,6 @@ static void daObjSword_Draw(daObjSword_c*); static void daObjSword_Execute(daObjSword_c*); static void daObjSword_Delete(daObjSword_c*); static void daObjSword_Create(daObjSword_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Sword[12]; extern "C" void initBaseMtx__12daObjSword_cFv(); extern "C" void setBaseMtx__12daObjSword_cFv(); @@ -172,18 +169,6 @@ void fopAcM_cancelCarryNow(fopAc_ac_c*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void CheckFieldItemCreateHeap(fopAc_ac_c*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80CFE008[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_sword/executor.cpp b/rel/d/a/obj/d_a_obj_sword/executor.cpp index cd16b4c30ec..b2cc196b8e9 100644 --- a/rel/d/a/obj/d_a_obj_sword/executor.cpp +++ b/rel/d/a/obj/d_a_obj_sword/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CFDE7C[4]; -extern u8 const data_80CFDE80[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_bss.cpp index a87263ed854..721f93d45f9 100644 --- a/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80CFE008[4]; -extern "C" extern u8 data_80CFE008[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_ctors.cpp index e6465352bdd..23f9444c45a 100644 --- a/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CFDE7C[4]; -extern u8 const data_80CFDE7C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CFDE7C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CFDE7C-80CFDE80 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CFDE7C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_dtors.cpp index 19a986fa604..337177ba4c8 100644 --- a/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_sword/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CFDE80[4]; -extern u8 const data_80CFDE80[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CFDE80[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CFDE80-80CFDE84 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CFDE80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp index a1579481236..cd867f6b4d9 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp +++ b/rel/d/a/obj/d_a_obj_swpropeller/d_a_obj_swpropeller.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -133,8 +133,6 @@ static void daObjSwPr_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u16*); static void cLib_calcTimer__template1(u8*); static void cLib_calcTimer__template2(s16*); -extern "C" extern u8 const l_r00_rot_time[6 + 2 /* padding */]; -extern "C" extern void* g_profile_Obj_Swpropeller[12]; extern "C" static void nodeCallBack__FP8J3DJointi(); extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); @@ -177,20 +175,6 @@ void dComIfGp_getReverb(int); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_swpropeller/executor.cpp b/rel/d/a/obj/d_a_obj_swpropeller/executor.cpp index d070e93e3c4..3fb531c9735 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swpropeller/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8059B2C0[4]; -extern u8 const data_8059B2C4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swpropeller/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swpropeller/unknown_translation_unit_ctors.cpp index 7d11a3c051b..90580a5bf0f 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swpropeller/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059B2C0[4]; -extern u8 const data_8059B2C0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8059B2C0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8059B2C0-8059B2C4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8059B2C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swpropeller/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swpropeller/unknown_translation_unit_dtors.cpp index 33cb8344b66..76c77aa2edb 100644 --- a/rel/d/a/obj/d_a_obj_swpropeller/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swpropeller/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059B2C4[4]; -extern u8 const data_8059B2C4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8059B2C4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8059B2C4-8059B2C8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8059B2C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp b/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp index d5c9ad4c36b..7398bd9b6ba 100644 --- a/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp +++ b/rel/d/a/obj/d_a_obj_swpush/d_a_obj_swpush.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz { /* 80483450 */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CCC8 */ void push(); /* 8000CD14 */ void pop(); @@ -178,49 +178,6 @@ struct J3DModel {}; // Forward References: // -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Swpush[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_804850A0[4]; -extern "C" extern u8 data_804850A4[4]; -extern "C" extern u8 data_804850A8[4]; -extern "C" extern u8 data_804850AC[4]; -extern "C" extern u8 data_804850B0[4]; -extern "C" extern u8 data_804850B4[4]; -extern "C" extern u8 data_804850B8[4]; -extern "C" extern u8 data_804850BC[4]; -extern "C" extern u8 data_804850C0[4]; -extern "C" extern u8 data_804850C4[4]; -extern "C" extern u8 data_804850C8[4]; -extern "C" extern u8 data_804850CC[4]; -extern "C" extern u8 data_804850D0[4]; -extern "C" extern u8 data_804850D4[4]; -extern "C" extern u8 data_804850D8[4]; -extern "C" extern u8 data_804850DC[4]; -extern "C" extern u8 data_804850E0[4]; -extern "C" extern u8 data_804850E4[4]; -extern "C" extern u8 data_804850E8[4]; -extern "C" extern u8 data_804850EC[4]; -extern "C" extern u8 data_804850F0[4]; -extern "C" extern u8 data_804850F4[4]; -extern "C" extern u8 data_804850F8[4]; -extern "C" extern u8 data_804850FC[4]; -extern "C" extern u8 data_80485100[4]; - extern "C" void prmZ_init__Q211daObjSwpush5Act_cFv(); extern "C" void is_switch2__Q211daObjSwpush5Act_cCFv(); extern "C" void solidHeapCB__Q211daObjSwpush5Act_cFP10fopAc_ac_c(); @@ -330,15 +287,6 @@ void cM3d_CrossY_Tri(cM3dGTri const*, Vec const*); void cLib_targetAngleY(Vec const*, Vec const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void push__14mDoMtx_stack_cFv(); diff --git a/rel/d/a/obj/d_a_obj_swpush/executor.cpp b/rel/d/a/obj/d_a_obj_swpush/executor.cpp index 98d163fe3bc..2988c5f2e29 100644 --- a/rel/d/a/obj/d_a_obj_swpush/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swpush/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80484D00[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swpush/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_swpush/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index eeef96a7214..755b6184a8d 100644 --- a/rel/d/a/obj/d_a_obj_swpush/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_swpush/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80484D08[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80484D08-80484D10 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80484D08[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80484FF0-80484FF8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_swpush/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swpush/unknown_translation_unit_ctors.cpp index 8cecaeeb07f..8210db228bf 100644 --- a/rel/d/a/obj/d_a_obj_swpush/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swpush/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80484D00[4]; -extern u8 const data_80484D00[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80484D00[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80484D00-80484D04 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80484D00[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp b/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp index 3ce3aedb4c4..239713cf64d 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp +++ b/rel/d/a/obj/d_a_obj_swpush2/d_a_obj_swpush2.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -25,10 +25,10 @@ struct mDoMtx_stack_c { struct J3DAnmTextureSRTKey {}; -struct J3DAnmTevRegKey {}; - struct J3DAnmColor {}; +struct J3DAnmTevRegKey {}; + struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); /* 8032F7B4 */ void removeTexMtxAnimator(J3DAnmTextureSRTKey*); @@ -191,10 +191,6 @@ struct J3DFrameCtrl { // Forward References: // -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Swpush2[12]; - extern "C" void getArcName__Q212daObjSwpush25Act_cFv(); extern "C" void getBmdName__Q212daObjSwpush25Act_cFv(); extern "C" void getDzbName__Q212daObjSwpush25Act_cFv(); @@ -264,15 +260,6 @@ void dBgW_NewSet(cBgD_t*, u32, f32 (*)[3][4]); void cLib_addCalc(f32*, f32, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80CFFEF8[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_swpush2/executor.cpp b/rel/d/a/obj/d_a_obj_swpush2/executor.cpp index 0f323d430a8..50356ae1671 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swpush2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80CFFBEC[4]; -extern u8 const data_80CFFBF0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_bss.cpp index 639fdd83264..267c34957bd 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80CFFEF8[4]; -extern "C" extern u8 struct_80CFFEF8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_ctors.cpp index 642f9e78a35..8bab4d09f09 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CFFBEC[4]; -extern u8 const data_80CFFBEC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80CFFBEC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80CFFBEC-80CFFBF0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80CFFBEC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_dtors.cpp index c83ff328da2..21b0afdf472 100644 --- a/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swpush2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80CFFBF0[4]; -extern u8 const data_80CFFBF0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80CFFBF0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80CFFBF0-80CFFBF4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80CFFBF0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp b/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp index 1c438e137a4..f6000e9c97c 100644 --- a/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp +++ b/rel/d/a/obj/d_a_obj_swpush5/d_a_obj_swpush5.cpp @@ -151,49 +151,6 @@ static void daObjSw5_Draw(daObjSw5_c*); static void daObjSw5_Execute(daObjSw5_c*); static void daObjSw5_Delete(daObjSw5_c*); static void daObjSw5_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Swpush5[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_8059C918[4]; -extern "C" extern u8 data_8059C91C[4]; -extern "C" extern u8 data_8059C920[4]; -extern "C" extern u8 data_8059C924[4]; -extern "C" extern u8 data_8059C928[4]; -extern "C" extern u8 data_8059C92C[4]; -extern "C" extern u8 data_8059C930[4]; -extern "C" extern u8 data_8059C934[4]; -extern "C" extern u8 data_8059C938[4]; -extern "C" extern u8 data_8059C93C[4]; -extern "C" extern u8 data_8059C940[4]; -extern "C" extern u8 data_8059C944[4]; -extern "C" extern u8 data_8059C948[4]; -extern "C" extern u8 data_8059C94C[4]; -extern "C" extern u8 data_8059C950[4]; -extern "C" extern u8 data_8059C954[4]; -extern "C" extern u8 data_8059C958[4]; -extern "C" extern u8 data_8059C95C[4]; -extern "C" extern u8 data_8059C960[4]; -extern "C" extern u8 data_8059C964[4]; -extern "C" extern u8 data_8059C968[4]; -extern "C" extern u8 data_8059C96C[4]; -extern "C" extern u8 data_8059C970[4]; -extern "C" extern u8 data_8059C974[4]; -extern "C" extern u8 data_8059C978[4]; extern "C" static void rideCallBack__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -291,14 +248,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_swpush5/executor.cpp b/rel/d/a/obj/d_a_obj_swpush5/executor.cpp index cb712115459..fee5f1b8c1d 100644 --- a/rel/d/a/obj/d_a_obj_swpush5/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swpush5/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8059C694[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swpush5/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_swpush5/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index ae34b2fc23c..6cc83b5a5ff 100644 --- a/rel/d/a/obj/d_a_obj_swpush5/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_swpush5/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8059C69C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8059C69C-8059C6A4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8059C69C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8059C868-8059C870 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_swpush5/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swpush5/unknown_translation_unit_ctors.cpp index f346f548a3f..83c5cba0307 100644 --- a/rel/d/a/obj/d_a_obj_swpush5/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swpush5/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059C694[4]; -extern u8 const data_8059C694[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8059C694[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8059C694-8059C698 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8059C694[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp index 9a7426ea324..25ba5ce9bfa 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/d_a_obj_swspinner.cpp @@ -115,8 +115,6 @@ static void daObjSwSpinner_create1st(daObjSwSpinner_c*); static void daObjSwSpinner_MoveBGDelete(daObjSwSpinner_c*); static void daObjSwSpinner_MoveBGExecute(daObjSwSpinner_c*); static void daObjSwSpinner_MoveBGDraw(daObjSwSpinner_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_SwSpinner[12]; extern "C" static void search_spinner_sub__FPvPv(); extern "C" void initBaseMtx__16daObjSwSpinner_cFv(); @@ -150,14 +148,6 @@ void dComIfGp_getReverb(int); void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_distanceAngleS(s16, s16); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_swspinner/executor.cpp b/rel/d/a/obj/d_a_obj_swspinner/executor.cpp index c60ba0378f0..d61b90bf90f 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D00A8C[4]; -extern u8 const data_80D00A90[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swspinner/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swspinner/unknown_translation_unit_ctors.cpp index bc1dbf515f0..74009bfabe6 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D00A8C[4]; -extern u8 const data_80D00A8C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D00A8C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D00A8C-80D00A90 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D00A8C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swspinner/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swspinner/unknown_translation_unit_dtors.cpp index e8999842bec..bb4fa1a31bc 100644 --- a/rel/d/a/obj/d_a_obj_swspinner/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swspinner/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D00A90[4]; -extern u8 const data_80D00A90[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D00A90[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D00A90-80D00A94 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D00A90[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp b/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp index 105d6ffc637..1f2c7235916 100644 --- a/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp +++ b/rel/d/a/obj/d_a_obj_swturn/d_a_obj_swturn.cpp @@ -109,8 +109,6 @@ static void daObjSwTurn_create1st(daObjSwTurn_c*); static void daObjSwTurn_MoveBGDelete(daObjSwTurn_c*); static void daObjSwTurn_MoveBGExecute(daObjSwTurn_c*); static void daObjSwTurn_MoveBGDraw(daObjSwTurn_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SwTurn[12]; extern "C" static void PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel(); extern "C" void initBaseMtx__13daObjSwTurn_cFv(); @@ -150,15 +148,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_addCalcAngleS2(s16*, s16, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80D021A0[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_swturn/executor.cpp b/rel/d/a/obj/d_a_obj_swturn/executor.cpp index 99874f515a3..5d966e38318 100644 --- a/rel/d/a/obj/d_a_obj_swturn/executor.cpp +++ b/rel/d/a/obj/d_a_obj_swturn/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D02064[4]; -extern u8 const data_80D02068[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_bss.cpp index 7a49513ab6f..3077f855f63 100644 --- a/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80D021A0[4]; -extern "C" extern u8 data_80D021A0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_ctors.cpp index f7bb984f500..007575710ea 100644 --- a/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D02064[4]; -extern u8 const data_80D02064[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D02064[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D02064-80D02068 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D02064[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_dtors.cpp index 2c684cfb7bd..5ac0a4c3057 100644 --- a/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_swturn/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D02068[4]; -extern u8 const data_80D02068[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D02068[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D02068-80D0206C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D02068[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp b/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp index 627ba434c43..958e52fdd68 100644 --- a/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp +++ b/rel/d/a/obj/d_a_obj_syRock/d_a_obj_syRock.cpp @@ -241,9 +241,6 @@ static void daSyRock_Draw(daSyRock_c*); static void daSyRock_Execute(daSyRock_c*); static void daSyRock_Delete(daSyRock_c*); static void daSyRock_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_SyRock[12]; extern "C" void __ct__14daSyRock_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -318,21 +315,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_syRock/executor.cpp b/rel/d/a/obj/d_a_obj_syRock/executor.cpp index bd551ebd0fb..10ef3b0784e 100644 --- a/rel/d/a/obj/d_a_obj_syRock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_syRock/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D03F7C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_syRock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_syRock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2eb6199a108..ec8634718bd 100644 --- a/rel/d/a/obj/d_a_obj_syRock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_syRock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D03F88[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D03F88-80D03F90 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D03F88[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D04258-80D04260 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_syRock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_syRock/unknown_translation_unit_ctors.cpp index 9847077cfbe..efb33140d4d 100644 --- a/rel/d/a/obj/d_a_obj_syRock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_syRock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D03F7C[2]; -extern void* const data_80D03F7C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_syRock_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D03F7C-80D03F84 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D03F7C[2] = { + (void*)__sinit_d_a_obj_syRock_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp b/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp index 3991290540c..5784278e93f 100644 --- a/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp +++ b/rel/d/a/obj/d_a_obj_szbridge/d_a_obj_szbridge.cpp @@ -30,12 +30,12 @@ struct daObjSZbridge_c { /* 80D04B90 */ ~daObjSZbridge_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -112,8 +112,6 @@ static void daObjSZbridge_create1st(daObjSZbridge_c*); static void daObjSZbridge_MoveBGDelete(daObjSZbridge_c*); static void daObjSZbridge_MoveBGExecute(daObjSZbridge_c*); static void daObjSZbridge_MoveBGDraw(daObjSZbridge_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_SZbridge[12]; extern "C" static void rideCallback__FP4dBgWP10fopAc_ac_cP10fopAc_ac_c(); extern "C" void rideActor__15daObjSZbridge_cFP10fopAc_ac_c(); @@ -155,14 +153,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cM_rndF(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_szbridge/executor.cpp b/rel/d/a/obj/d_a_obj_szbridge/executor.cpp index b19902fff64..5989e17a810 100644 --- a/rel/d/a/obj/d_a_obj_szbridge/executor.cpp +++ b/rel/d/a/obj/d_a_obj_szbridge/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D04C30[4]; -extern u8 const data_80D04C34[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_szbridge/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_szbridge/unknown_translation_unit_ctors.cpp index dc744809e2e..8f1d773853d 100644 --- a/rel/d/a/obj/d_a_obj_szbridge/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_szbridge/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D04C30[4]; -extern u8 const data_80D04C30[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D04C30[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D04C30-80D04C34 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D04C30[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_szbridge/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_szbridge/unknown_translation_unit_dtors.cpp index 934584b94ac..8dbb3984d61 100644 --- a/rel/d/a/obj/d_a_obj_szbridge/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_szbridge/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D04C34[4]; -extern u8 const data_80D04C34[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D04C34[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D04C34-80D04C38 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D04C34[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp b/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp index bae899d38e7..5a0dd8303b6 100644 --- a/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp +++ b/rel/d/a/obj/d_a_obj_taFence/d_a_obj_taFence.cpp @@ -168,9 +168,6 @@ static void daTaFence_Draw(daTaFence_c*); static void daTaFence_Execute(daTaFence_c*); static void daTaFence_Delete(daTaFence_c*); static void daTaFence_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_TaFence[12]; extern "C" void __ct__15daTaFence_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -223,19 +220,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_taFence/executor.cpp b/rel/d/a/obj/d_a_obj_taFence/executor.cpp index 2ef9d303377..9b69ea13023 100644 --- a/rel/d/a/obj/d_a_obj_taFence/executor.cpp +++ b/rel/d/a/obj/d_a_obj_taFence/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D060CC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_taFence/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_taFence/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index df8746a39a2..c58d946084c 100644 --- a/rel/d/a/obj/d_a_obj_taFence/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_taFence/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D060D8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D060D8-80D060E0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D060D8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D06328-80D06330 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_taFence/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_taFence/unknown_translation_unit_ctors.cpp index 9c6a0d5e18d..081fcb5bdbc 100644 --- a/rel/d/a/obj/d_a_obj_taFence/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_taFence/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D060CC[2]; -extern void* const data_80D060CC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_taFence_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D060CC-80D060D4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D060CC[2] = { + (void*)__sinit_d_a_obj_taFence_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp b/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp index a1efb1f096d..252c4930986 100644 --- a/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp +++ b/rel/d/a/obj/d_a_obj_table/d_a_obj_table.cpp @@ -107,8 +107,6 @@ static void daObjTable_Execute(daObjTable_c*); static bool daObjTable_IsDelete(daObjTable_c*); static void daObjTable_Delete(daObjTable_c*); static void daObjTable_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Table[12]; extern "C" static void daObjTable_Draw__FP12daObjTable_c(); extern "C" static void daObjTable_Execute__FP12daObjTable_c(); @@ -136,14 +134,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGs_isStageSwitch(int, int); void dKy_darkworld_check(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_table/executor.cpp b/rel/d/a/obj/d_a_obj_table/executor.cpp index 6fdb00a6d4f..b58a6d46954 100644 --- a/rel/d/a/obj/d_a_obj_table/executor.cpp +++ b/rel/d/a/obj/d_a_obj_table/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D06BFC[4]; -extern u8 const data_80D06C00[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_table/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_table/unknown_translation_unit_ctors.cpp index 488aea9b6cf..0e96b127c0a 100644 --- a/rel/d/a/obj/d_a_obj_table/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_table/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D06BFC[4]; -extern u8 const data_80D06BFC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D06BFC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D06BFC-80D06C00 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D06BFC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_table/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_table/unknown_translation_unit_dtors.cpp index 6aa5d38300c..de5c238c9cf 100644 --- a/rel/d/a/obj/d_a_obj_table/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_table/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D06C00[4]; -extern u8 const data_80D06C00[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D06C00[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D06C00-80D06C04 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D06C00[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp b/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp index efa31575924..f366c2fee20 100644 --- a/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp +++ b/rel/d/a/obj/d_a_obj_takaraDai/d_a_obj_takaraDai.cpp @@ -40,12 +40,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -110,8 +110,6 @@ static void daTkraDai_Draw(daTkraDai_c*); static void daTkraDai_Execute(daTkraDai_c*); static void daTkraDai_Delete(daTkraDai_c*); static void daTkraDai_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_TakaraDai[12]; extern "C" void __ct__15daTkraDai_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -148,13 +146,6 @@ void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_takaraDai/executor.cpp b/rel/d/a/obj/d_a_obj_takaraDai/executor.cpp index ef3daa520b4..e8aba77425c 100644 --- a/rel/d/a/obj/d_a_obj_takaraDai/executor.cpp +++ b/rel/d/a/obj/d_a_obj_takaraDai/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D077F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_takaraDai/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_takaraDai/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 16f8b9b3fe7..fb3671b70e5 100644 --- a/rel/d/a/obj/d_a_obj_takaraDai/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_takaraDai/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D07800[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D07800-80D07808 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D07800[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D07908-80D07910 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_takaraDai/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_takaraDai/unknown_translation_unit_ctors.cpp index 2ad88c9e236..ff74e714d9d 100644 --- a/rel/d/a/obj/d_a_obj_takaraDai/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_takaraDai/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D077F4[2]; -extern void* const data_80D077F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_takaraDai_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D077F4-80D077FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D077F4[2] = { + (void*)__sinit_d_a_obj_takaraDai_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp b/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp index e84300cb2ea..96e853c0960 100644 --- a/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp +++ b/rel/d/a/obj/d_a_obj_tatigi/d_a_obj_tatigi.cpp @@ -114,8 +114,6 @@ static void daObj_Tatigi_Delete(obj_tatigi_class*); static void useHeapInit(fopAc_ac_c*); static void set_pos_check(obj_tatigi_class*, int); static void daObj_Tatigi_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_TATIGI[12]; extern "C" static void daObj_Tatigi_Draw__FP16obj_tatigi_class(); extern "C" static void daObj_Tatigi_Execute__FP16obj_tatigi_class(); @@ -150,18 +148,6 @@ void MtxPosition(cXyz*, cXyz*); void MtxPush(); void MtxPull(); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_tatigi/executor.cpp b/rel/d/a/obj/d_a_obj_tatigi/executor.cpp index ebd10f89d05..b33306fe21f 100644 --- a/rel/d/a/obj/d_a_obj_tatigi/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tatigi/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D085B8[4]; -extern u8 const data_80D085BC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tatigi/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tatigi/unknown_translation_unit_ctors.cpp index 394c5c8ffae..3f4b5140d7b 100644 --- a/rel/d/a/obj/d_a_obj_tatigi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tatigi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D085B8[4]; -extern u8 const data_80D085B8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D085B8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D085B8-80D085BC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D085B8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tatigi/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_tatigi/unknown_translation_unit_dtors.cpp index 8784e40ec8c..a84b60e25b2 100644 --- a/rel/d/a/obj/d_a_obj_tatigi/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_tatigi/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D085BC[4]; -extern u8 const data_80D085BC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D085BC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D085BC-80D085C0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D085BC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp b/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp index 3e898b599ad..ca86aaf68bc 100644 --- a/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp +++ b/rel/d/a/obj/d_a_obj_ten/d_a_obj_ten.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -50,16 +50,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -259,9 +259,6 @@ static void daObjTEN_Delete(daObjTEN_c*); static void daObjTEN_Draw(daObjTEN_c*); static void daObjTEN_Execute(daObjTEN_c*); static bool daObjTEN_IsDelete(daObjTEN_c*); -extern "C" extern u32 const lit_4423; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Ten[12]; extern "C" void __ct__14daObj_TenHIO_cFv(); extern "C" void InitCcSph__10daObjTEN_cFv(); @@ -329,20 +326,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_ten/executor.cpp b/rel/d/a/obj/d_a_obj_ten/executor.cpp index 74a30a2d3ae..fdfd9f939af 100644 --- a/rel/d/a/obj/d_a_obj_ten/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ten/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D0B8DC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ten/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_ten/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index b238309f234..46e21e8f0e3 100644 --- a/rel/d/a/obj/d_a_obj_ten/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_ten/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D0B8E8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D0B8E8-80D0B8F0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D0B8E8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D0BAB0-80D0BAB8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_ten/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ten/unknown_translation_unit_ctors.cpp index 89f55008bc1..dd85b720db0 100644 --- a/rel/d/a/obj/d_a_obj_ten/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ten/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D0B8DC[2]; -extern void* const data_80D0B8DC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_ten_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D0B8DC-80D0B8E4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D0B8DC[2] = { + (void*)__sinit_d_a_obj_ten_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.cpp b/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.cpp index 52fb27cb46d..bacdbd0cce6 100644 --- a/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.cpp +++ b/rel/d/a/obj/d_a_obj_testcube/d_a_obj_testcube.cpp @@ -13,8 +13,6 @@ extern "C" extern void* g_profile_Obj_TestCube[12]; -extern "C" extern void* g_profile_Obj_TestCube[12]; - // // External References: // @@ -22,9 +20,6 @@ extern "C" extern void* g_profile_Obj_TestCube[12]; extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/rel/d/a/obj/d_a_obj_testcube/executor.cpp b/rel/d/a/obj/d_a_obj_testcube/executor.cpp index 4f83cb3ba59..9ea71fa531a 100644 --- a/rel/d/a/obj/d_a_obj_testcube/executor.cpp +++ b/rel/d/a/obj/d_a_obj_testcube/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D0BB58[4]; -extern u8 const data_80D0BB5C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_testcube/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_testcube/unknown_translation_unit_ctors.cpp index d2be7b15316..7ac4f4e2d76 100644 --- a/rel/d/a/obj/d_a_obj_testcube/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_testcube/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D0BB58[4]; -extern u8 const data_80D0BB58[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D0BB58[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D0BB58-80D0BB5C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D0BB58[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_testcube/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_testcube/unknown_translation_unit_dtors.cpp index f64de85bbf7..270c9420169 100644 --- a/rel/d/a/obj/d_a_obj_testcube/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_testcube/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D0BB5C[4]; -extern u8 const data_80D0BB5C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D0BB5C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D0BB5C-80D0BB60 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D0BB5C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp index c56424a076e..2f8f3f74067 100644 --- a/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp +++ b/rel/d/a/obj/d_a_obj_tgake/d_a_obj_tgake.cpp @@ -94,8 +94,6 @@ static void daObjGake_create1st(daObjGake_c*); static void daObjGake_MoveBGDelete(daObjGake_c*); static void daObjGake_MoveBGExecute(daObjGake_c*); static void daObjGake_MoveBGDraw(daObjGake_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Gake[12]; extern "C" void initBaseMtx__11daObjGake_cFv(); extern "C" void setBaseMtx__11daObjGake_cFv(); @@ -123,13 +121,6 @@ void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_tgake/executor.cpp b/rel/d/a/obj/d_a_obj_tgake/executor.cpp index 6aab9ccb6f5..ff6b8697b8d 100644 --- a/rel/d/a/obj/d_a_obj_tgake/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tgake/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D0C134[4]; -extern u8 const data_80D0C138[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tgake/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tgake/unknown_translation_unit_ctors.cpp index da5d9cefd6d..aea5ed5cc59 100644 --- a/rel/d/a/obj/d_a_obj_tgake/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tgake/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D0C134[4]; -extern u8 const data_80D0C134[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D0C134[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D0C134-80D0C138 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D0C134[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tgake/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_tgake/unknown_translation_unit_dtors.cpp index d49594af9f2..169148282cb 100644 --- a/rel/d/a/obj/d_a_obj_tgake/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_tgake/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D0C138[4]; -extern u8 const data_80D0C138[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D0C138[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D0C138-80D0C13C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D0C138[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp b/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp index e66357136c8..6117d5769f5 100644 --- a/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp +++ b/rel/d/a/obj/d_a_obj_thashi/d_a_obj_thashi.cpp @@ -13,16 +13,16 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80D0C318 */ ~csXyz(); - /* 80D0CE60 */ csXyz(); -}; - struct cXyz { /* 80D0C2DC */ ~cXyz(); /* 80D0CE64 */ cXyz(); }; +struct csXyz { + /* 80D0C318 */ ~csXyz(); + /* 80D0CE60 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -154,44 +154,6 @@ static void daObjTHASHI_Delete(daObjTHASHI_c*); static void daObjTHASHI_Draw(daObjTHASHI_c*); static void daObjTHASHI_Execute(daObjTHASHI_c*); static bool daObjTHASHI_IsDelete(daObjTHASHI_c*); -extern "C" extern u8 const lit_3693[4]; -extern "C" extern u32 const lit_3694; -extern "C" extern u32 const lit_3695[1 + 1 /* padding */]; -extern "C" extern u8 const lit_3697[8]; -extern "C" extern u32 const lit_3795; -extern "C" extern u32 const lit_3796; -extern "C" extern u32 const lit_3797; -extern "C" extern u32 const lit_3833; -extern "C" extern u32 const lit_3834; -extern "C" extern u32 const lit_3855; -extern "C" extern u32 const lit_3856; -extern "C" extern u32 const lit_3857; -extern "C" extern u32 const lit_3858; -extern "C" extern u32 const lit_3859; -extern "C" extern u32 const lit_3860; -extern "C" extern u32 const lit_3861; -extern "C" extern u32 const lit_3862; -extern "C" extern u32 const lit_3863; -extern "C" extern u32 const lit_3864; -extern "C" extern u32 const lit_3947; -extern "C" extern u32 const lit_3973; -extern "C" extern u32 const lit_3974; -extern "C" extern u32 const lit_3975; -extern "C" extern u32 const lit_3976; -extern "C" extern u32 const lit_3977; -extern "C" extern u32 const lit_3978; -extern "C" extern u32 const lit_4017; -extern "C" extern u32 const lit_4018; -extern "C" extern u32 const lit_4019[1 + 1 /* padding */]; -extern "C" extern u8 const lit_4270[8]; -extern "C" extern u8 const lit_4271[8]; -extern "C" extern u8 const lit_4272[8]; -extern "C" extern u32 const lit_4310; -extern "C" extern u32 const lit_4433; -extern "C" extern u32 const lit_4446; -extern "C" extern u32 const lit_4447; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_THASHI[12]; extern "C" void initCcCylinder__13daObjTHASHI_cFv(); extern "C" static void daObjTHASHI_Create__FP10fopAc_ac_c(); @@ -272,21 +234,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_thashi/executor.cpp b/rel/d/a/obj/d_a_obj_thashi/executor.cpp index 081be47cae9..d186d31ab08 100644 --- a/rel/d/a/obj/d_a_obj_thashi/executor.cpp +++ b/rel/d/a/obj/d_a_obj_thashi/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D0D184[4]; -extern u8 const data_80D0D188[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_thashi/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_thashi/unknown_translation_unit_ctors.cpp index e5ee56dbf00..8ea9170801e 100644 --- a/rel/d/a/obj/d_a_obj_thashi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_thashi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D0D184[4]; -extern u8 const data_80D0D184[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D0D184[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D0D184-80D0D188 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D0D184[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_thashi/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_thashi/unknown_translation_unit_dtors.cpp index 84c333a4f42..5f34cd057ba 100644 --- a/rel/d/a/obj/d_a_obj_thashi/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_thashi/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D0D188[4]; -extern u8 const data_80D0D188[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D0D188[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D0D188-80D0D18C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D0D188[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp b/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp index 8552e5d4e52..d8ce361e1ca 100644 --- a/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp +++ b/rel/d/a/obj/d_a_obj_thdoor/d_a_obj_thdoor.cpp @@ -183,8 +183,6 @@ static void daObjThDoor_MoveBGDelete(daObjThDoor_c*); static void daObjThDoor_MoveBGExecute(daObjThDoor_c*); static void daObjThDoor_MoveBGDraw(daObjThDoor_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_TDoor[12]; extern "C" static void checkPlayerPos__FP13daObjThDoor_c(); extern "C" static void @@ -236,19 +234,6 @@ void dComIfGp_getReverb(int); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void cLib_chaseS(s16*, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80D0E7E0[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_thdoor/executor.cpp b/rel/d/a/obj/d_a_obj_thdoor/executor.cpp index 4008c127791..da8210cf653 100644 --- a/rel/d/a/obj/d_a_obj_thdoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_thdoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D0E5F0[4]; -extern u8 const data_80D0E5F4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_bss.cpp index 6ea8dd44628..c0140c7090c 100644 --- a/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80D0E7E0[4]; -extern "C" extern u8 data_80D0E7E0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_ctors.cpp index 568f85c5cad..b43426dc4bd 100644 --- a/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D0E5F0[4]; -extern u8 const data_80D0E5F0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D0E5F0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D0E5F0-80D0E5F4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D0E5F0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_dtors.cpp index 503518586ed..5cd895d218e 100644 --- a/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_thdoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D0E5F4[4]; -extern u8 const data_80D0E5F4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D0E5F4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D0E5F4-80D0E5F8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D0E5F4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp b/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp index 12892de9dd7..af50e6d545f 100644 --- a/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp +++ b/rel/d/a/obj/d_a_obj_timeFire/d_a_obj_timeFire.cpp @@ -42,14 +42,14 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -75,7 +75,6 @@ static void daTimeFire_Draw(daTimeFire_c*); static void daTimeFire_Execute(daTimeFire_c*); static void daTimeFire_Delete(daTimeFire_c*); static void daTimeFire_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_TimeFire[12]; extern "C" void __ct__16daTimeFire_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -107,11 +106,6 @@ void dKy_getdaytime_minute(); void dKy_plight_set(LIGHT_INFLUENCE*); void dKy_plight_cut(LIGHT_INFLUENCE*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_timeFire/executor.cpp b/rel/d/a/obj/d_a_obj_timeFire/executor.cpp index c3e288df1bf..ba3587b0b3b 100644 --- a/rel/d/a/obj/d_a_obj_timeFire/executor.cpp +++ b/rel/d/a/obj/d_a_obj_timeFire/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D0F0D0[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_timeFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_timeFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2b2edef1ac0..d83326094a2 100644 --- a/rel/d/a/obj/d_a_obj_timeFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_timeFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D0F0DC[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D0F0DC-80D0F0E4 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D0F0DC[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D0F168-80D0F170 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_timeFire/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_timeFire/unknown_translation_unit_ctors.cpp index 2b14f15c990..ba585fb59f8 100644 --- a/rel/d/a/obj/d_a_obj_timeFire/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_timeFire/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D0F0D0[2]; -extern void* const data_80D0F0D0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_timeFire_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D0F0D0-80D0F0D8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D0F0D0[2] = { + (void*)__sinit_d_a_obj_timeFire_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp b/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp index cd54c8d3158..5484050235f 100644 --- a/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp +++ b/rel/d/a/obj/d_a_obj_timer/d_a_obj_timer.cpp @@ -57,9 +57,6 @@ struct Z2SeMgr { // Forward References: // -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Timer[12]; - extern "C" void _create__Q210daObjTimer5Act_cFv(); extern "C" bool _delete__Q210daObjTimer5Act_cFv(); extern "C" void mode_wait_init__Q210daObjTimer5Act_cFv(); @@ -82,11 +79,6 @@ extern "C" extern void* g_profile_Obj_Timer[12]; void fopAcM_delete(fopAc_ac_c*); void fopDwTg_DrawQTo(create_tag_class*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_804856E8[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_delete__FP10fopAc_ac_c(); diff --git a/rel/d/a/obj/d_a_obj_timer/executor.cpp b/rel/d/a/obj/d_a_obj_timer/executor.cpp index 6a021ec86a9..3ecf236cde7 100644 --- a/rel/d/a/obj/d_a_obj_timer/executor.cpp +++ b/rel/d/a/obj/d_a_obj_timer/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80485638[4]; -extern u8 const data_8048563C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_bss.cpp index 3d7ef3050f7..f557518c533 100644 --- a/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_804856E8[4]; -extern "C" extern u8 data_804856E8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_ctors.cpp index 33afa5a6f8a..eda21799ae4 100644 --- a/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80485638[4]; -extern u8 const data_80485638[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80485638[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80485638-8048563C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80485638[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_dtors.cpp index 989eb9a463f..ca7df1f0166 100644 --- a/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_timer/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048563C[4]; -extern u8 const data_8048563C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048563C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048563C-80485640 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048563C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp b/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp index 5df4cbf2be6..3fb40fd4167 100644 --- a/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp +++ b/rel/d/a/obj/d_a_obj_tks/d_a_obj_tks.cpp @@ -13,11 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80D11FBC */ ~csXyz(); - /* 80D11FF8 */ csXyz(); -}; - struct Vec {}; struct cXyz { @@ -26,6 +21,11 @@ struct cXyz { /* 80D12038 */ cXyz(); }; +struct csXyz { + /* 80D11FBC */ ~csXyz(); + /* 80D11FF8 */ csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -41,16 +41,16 @@ struct mDoExt_bckAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DModelData {}; - -struct mDoExt_McaMorfCallBack1_c {}; - struct Z2Creature { /* 802C03C8 */ Z2Creature(); /* 802C0420 */ ~Z2Creature(); /* 802C0530 */ void init(Vec*, Vec*, u8, u8); }; +struct J3DModelData {}; + +struct mDoExt_McaMorfCallBack1_c {}; + struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, @@ -104,16 +104,16 @@ struct daObjTks_Param_c { /* 80D126D0 */ ~daObjTks_Param_c(); }; +struct J3DAnmTextureSRTKey {}; + struct _GXColorS10 {}; +struct J3DAnmTransformKey {}; + struct J3DAnmTexPattern { /* 8032AF50 */ void getTexNo(u16, u16*) const; }; -struct J3DAnmTextureSRTKey {}; - -struct J3DAnmTransformKey {}; - struct daNpcF_c { struct daNpcF_anmPlayData {}; @@ -341,9 +341,6 @@ static void daObjTks_Delete(void*); static void daObjTks_Execute(void*); static void daObjTks_Draw(void*); static bool daObjTks_IsDelete(void*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 l_evtNames[4]; -extern "C" extern void* g_profile_OBJ_TKS[12]; extern "C" void __ct__10daObjTks_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -441,25 +438,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_tks/executor.cpp b/rel/d/a/obj/d_a_obj_tks/executor.cpp index cd43d60c691..a1673f3520a 100644 --- a/rel/d/a/obj/d_a_obj_tks/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tks/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D12728[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_tks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 6a4a7ad2062..9b5ad6afe2e 100644 --- a/rel/d/a/obj/d_a_obj_tks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_tks/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D12734[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D12734-80D1273C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D12734[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D12AF0-80D12AF8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_tks/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tks/unknown_translation_unit_ctors.cpp index cc4ab49a670..245abefee7e 100644 --- a/rel/d/a/obj/d_a_obj_tks/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tks/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D12728[2]; -extern void* const data_80D12728[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_tks_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D12728-80D12730 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D12728[2] = { + (void*)__sinit_d_a_obj_tks_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp index acb673360b4..9d73b4c7ae3 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/d_a_obj_tmoon.cpp @@ -59,8 +59,6 @@ static void daObjTMoon_Draw(daObjTMoon_c*); static void daObjTMoon_Execute(daObjTMoon_c*); static void daObjTMoon_Delete(daObjTMoon_c*); static void daObjTMoon_Create(daObjTMoon_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_TMoon[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void initBaseMtx__12daObjTMoon_cFv(); @@ -90,12 +88,6 @@ void fopDwTg_DrawQTo(create_tag_class*); void fpcLf_GetPriority(leafdraw_class const*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_tmoon/executor.cpp b/rel/d/a/obj/d_a_obj_tmoon/executor.cpp index 308040df735..4b43b87427a 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D12F90[4]; -extern u8 const data_80D12F94[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tmoon/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tmoon/unknown_translation_unit_ctors.cpp index deb1fdc04fb..aea3ce68617 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D12F90[4]; -extern u8 const data_80D12F90[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D12F90[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D12F90-80D12F94 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D12F90[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tmoon/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_tmoon/unknown_translation_unit_dtors.cpp index ff9b318d011..244a6fea7ec 100644 --- a/rel/d/a/obj/d_a_obj_tmoon/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_tmoon/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D12F94[4]; -extern u8 const data_80D12F94[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D12F94[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D12F94-80D12F98 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D12F94[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp b/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp index d307988ac11..094d041b10c 100644 --- a/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp +++ b/rel/d/a/obj/d_a_obj_toaru_maki/d_a_obj_toaru_maki.cpp @@ -29,12 +29,12 @@ struct daObjToaruMaki_c { /* 80D13524 */ void execute(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -81,8 +81,6 @@ static void daObjToaruMaki_create(daObjToaruMaki_c*); static void daObjToaruMaki_Delete(daObjToaruMaki_c*); static void daObjToaruMaki_execute(daObjToaruMaki_c*); static void daObjToaruMaki_draw(daObjToaruMaki_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_ToaruMaki[12]; extern "C" static void daObjToaruMaki_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__16daObjToaruMaki_cFv(); @@ -113,12 +111,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_toaru_maki/executor.cpp b/rel/d/a/obj/d_a_obj_toaru_maki/executor.cpp index 0092acecfe1..841714f09c7 100644 --- a/rel/d/a/obj/d_a_obj_toaru_maki/executor.cpp +++ b/rel/d/a/obj/d_a_obj_toaru_maki/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D135FC[4]; -extern u8 const data_80D13600[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_toaru_maki/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_toaru_maki/unknown_translation_unit_ctors.cpp index e14828790fb..f148999b0fc 100644 --- a/rel/d/a/obj/d_a_obj_toaru_maki/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_toaru_maki/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D135FC[4]; -extern u8 const data_80D135FC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D135FC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D135FC-80D13600 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D135FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_toaru_maki/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_toaru_maki/unknown_translation_unit_dtors.cpp index aeb1d7a1555..a9ec4474b4c 100644 --- a/rel/d/a/obj/d_a_obj_toaru_maki/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_toaru_maki/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D13600[4]; -extern u8 const data_80D13600[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D13600[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D13600-80D13604 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D13600[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp b/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp index 684efddc574..d9ebe503872 100644 --- a/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp +++ b/rel/d/a/obj/d_a_obj_toby/d_a_obj_toby.cpp @@ -46,8 +46,6 @@ struct dSv_info_c { /* 80035200 */ void onSwitch(int, int); }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { @@ -56,6 +54,8 @@ struct cXyz { /* 80D139FC */ ~cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); }; @@ -157,47 +157,6 @@ static void daObj_Toby_Delete(obj_toby_class*); static void useHeapInit(fopAc_ac_c*); static void set_pos_check(obj_toby_class*, int); static void daObj_Toby_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_TOBY[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80D15950[4]; -extern "C" extern u8 data_80D15954[4]; -extern "C" extern u8 data_80D15958[4]; -extern "C" extern u8 data_80D1595C[4]; -extern "C" extern u8 data_80D15960[4]; -extern "C" extern u8 data_80D15964[4]; -extern "C" extern u8 data_80D15968[4]; -extern "C" extern u8 data_80D1596C[4]; -extern "C" extern u8 data_80D15970[4]; -extern "C" extern u8 data_80D15974[4]; -extern "C" extern u8 data_80D15978[4]; -extern "C" extern u8 data_80D1597C[4]; -extern "C" extern u8 data_80D15980[4]; -extern "C" extern u8 data_80D15984[4]; -extern "C" extern u8 data_80D15988[4]; -extern "C" extern u8 data_80D1598C[4]; -extern "C" extern u8 data_80D15990[4]; -extern "C" extern u8 data_80D15994[4]; -extern "C" extern u8 data_80D15998[4]; -extern "C" extern u8 data_80D1599C[4]; -extern "C" extern u8 data_80D159A0[4]; -extern "C" extern u8 data_80D159A4[4]; -extern "C" extern u8 data_80D159A8[4]; -extern "C" extern u8 data_80D159AC[4]; -extern "C" extern u8 data_80D159B0[4]; extern "C" void __ct__16daObj_Toby_HIO_cFv(); extern "C" static void daObj_Toby_Draw__FP14obj_toby_class(); @@ -286,14 +245,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_toby/executor.cpp b/rel/d/a/obj/d_a_obj_toby/executor.cpp index f9b8cf3d226..2e33eccac73 100644 --- a/rel/d/a/obj/d_a_obj_toby/executor.cpp +++ b/rel/d/a/obj/d_a_obj_toby/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D155D4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_toby/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_toby/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f15f247b212..38da7aef354 100644 --- a/rel/d/a/obj/d_a_obj_toby/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_toby/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D155E0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D155E0-80D155E8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D155E0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D158B0-80D158B8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_toby/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_toby/unknown_translation_unit_ctors.cpp index 1524ad9909f..d0922826262 100644 --- a/rel/d/a/obj/d_a_obj_toby/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_toby/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D155D4[2]; -extern void* const data_80D155D4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_toby_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D155D4-80D155DC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D155D4[2] = { + (void*)__sinit_d_a_obj_toby_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp b/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp index e67cfd8b46d..1b190d84ff3 100644 --- a/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp +++ b/rel/d/a/obj/d_a_obj_tobyhouse/d_a_obj_tobyhouse.cpp @@ -180,50 +180,6 @@ static void daObjTobyHouse_MoveBGDelete(daObjTobyHouse_c*); static void daObjTobyHouse_MoveBGExecute(daObjTobyHouse_c*); static void daObjTobyHouse_MoveBGDraw(daObjTobyHouse_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 const lit_4773; -extern "C" extern u8 const lit_4776[8]; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern u8 data_80D17908[12]; -extern "C" extern void* g_profile_Obj_TobyHouse[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 data_80D17A1C[4]; -extern "C" extern u8 data_80D17A20[4]; -extern "C" extern u8 data_80D17A24[4]; -extern "C" extern u8 data_80D17A28[4]; -extern "C" extern u8 data_80D17A2C[4]; -extern "C" extern u8 data_80D17A30[4]; -extern "C" extern u8 data_80D17A34[4]; -extern "C" extern u8 data_80D17A38[4]; -extern "C" extern u8 data_80D17A3C[4]; -extern "C" extern u8 data_80D17A40[4]; -extern "C" extern u8 data_80D17A44[4]; -extern "C" extern u8 data_80D17A48[4]; -extern "C" extern u8 data_80D17A4C[4]; -extern "C" extern u8 data_80D17A50[4]; -extern "C" extern u8 data_80D17A54[4]; -extern "C" extern u8 data_80D17A58[4]; -extern "C" extern u8 data_80D17A5C[4]; -extern "C" extern u8 data_80D17A60[4]; -extern "C" extern u8 data_80D17A64[4]; -extern "C" extern u8 data_80D17A68[4]; -extern "C" extern u8 data_80D17A6C[4]; -extern "C" extern u8 data_80D17A70[4]; -extern "C" extern u8 data_80D17A74[4]; -extern "C" extern u8 data_80D17A78[4]; -extern "C" extern u8 data_80D17A7C[4]; extern "C" static void s_b_sub__FPvPv(); extern "C" static void nodeCallBack__FP8J3DJointi(); @@ -327,18 +283,6 @@ void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_tobyhouse/executor.cpp b/rel/d/a/obj/d_a_obj_tobyhouse/executor.cpp index 1ae8ed00e5f..238497d31be 100644 --- a/rel/d/a/obj/d_a_obj_tobyhouse/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tobyhouse/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D1773C[4]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tobyhouse/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_tobyhouse/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 24242838e6f..5de5533fae5 100644 --- a/rel/d/a/obj/d_a_obj_tobyhouse/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_tobyhouse/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D17744[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D17744-80D1774C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D17744[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D179B8-80D179C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_tobyhouse/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tobyhouse/unknown_translation_unit_ctors.cpp index cb748e2b5f9..ca86c4ca8dd 100644 --- a/rel/d/a/obj/d_a_obj_tobyhouse/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tobyhouse/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D1773C[4]; -extern u8 const data_80D1773C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D1773C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D1773C-80D17740 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D1773C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp b/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp index 172eda8b018..b602e64fab1 100644 --- a/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp +++ b/rel/d/a/obj/d_a_obj_togeTrap/d_a_obj_togeTrap.cpp @@ -180,9 +180,6 @@ static void daTogeTrap_Draw(daTogeTrap_c*); static void daTogeTrap_Execute(daTogeTrap_c*); static void daTogeTrap_Delete(daTogeTrap_c*); static void daTogeTrap_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_TogeTrap[12]; extern "C" void __ct__16daTogeTrap_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -239,18 +236,6 @@ void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz* void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_togeTrap/executor.cpp b/rel/d/a/obj/d_a_obj_togeTrap/executor.cpp index 9a29890f276..20ce1181351 100644 --- a/rel/d/a/obj/d_a_obj_togeTrap/executor.cpp +++ b/rel/d/a/obj/d_a_obj_togeTrap/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D18E84[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_togeTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_togeTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index af150dd650f..c17fd22a5ed 100644 --- a/rel/d/a/obj/d_a_obj_togeTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_togeTrap/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D18E90[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D18E90-80D18E98 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D18E90[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D190A0-80D190A8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_togeTrap/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_togeTrap/unknown_translation_unit_ctors.cpp index f62fc4a8602..9fabfafab9a 100644 --- a/rel/d/a/obj/d_a_obj_togeTrap/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_togeTrap/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D18E84[2]; -extern void* const data_80D18E84[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_togeTrap_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D18E84-80D18E8C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D18E84[2] = { + (void*)__sinit_d_a_obj_togeTrap_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp b/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp index 431846fb240..d98e9644532 100644 --- a/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp +++ b/rel/d/a/obj/d_a_obj_tombo/d_a_obj_tombo.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -49,16 +49,16 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -269,13 +269,6 @@ static void daObjTOMBO_Delete(daObjTOMBO_c*); static void daObjTOMBO_Draw(daObjTOMBO_c*); static void daObjTOMBO_Execute(daObjTOMBO_c*); static bool daObjTOMBO_IsDelete(daObjTOMBO_c*); -extern "C" extern u32 const lit_4311; -extern "C" extern u32 const lit_4312; -extern "C" extern u32 const lit_4313; -extern "C" extern u32 const lit_4315; -extern "C" extern u32 const lit_4316; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Tombo[12]; extern "C" void __ct__14daObj_TomHIO_cFv(); extern "C" void InitCcSph__12daObjTOMBO_cFv(); @@ -353,21 +346,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_tombo/executor.cpp b/rel/d/a/obj/d_a_obj_tombo/executor.cpp index f7f6b73547c..94752cc1125 100644 --- a/rel/d/a/obj/d_a_obj_tombo/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tombo/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D1B6C4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tombo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_tombo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 30ff8d05c3a..9fd740ecf45 100644 --- a/rel/d/a/obj/d_a_obj_tombo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_tombo/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D1B6D0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D1B6D0-80D1B6D8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D1B6D0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D1B8E8-80D1B8F0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_tombo/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tombo/unknown_translation_unit_ctors.cpp index 118ae7a4f32..0ffe336bf86 100644 --- a/rel/d/a/obj/d_a_obj_tombo/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tombo/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D1B6C4[2]; -extern void* const data_80D1B6C4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_tombo_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D1B6C4-80D1B6CC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D1B6C4[2] = { + (void*)__sinit_d_a_obj_tombo_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp b/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp index eb0f5d6f70d..c47f878d6a4 100644 --- a/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp +++ b/rel/d/a/obj/d_a_obj_tornado/d_a_obj_tornado.cpp @@ -11,13 +11,13 @@ // Types: // -struct csXyz {}; - struct cXyz { /* 80266EF4 */ void normalize(); /* 802670AC */ void isZero() const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -98,8 +98,6 @@ static void daObjTrnd_Draw(daObjTrnd_c*); static void daObjTrnd_Execute(daObjTrnd_c*); static void daObjTrnd_Delete(daObjTrnd_c*); static void daObjTrnd_Create(daObjTrnd_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Tornado[12]; extern "C" void setPntWind__11daObjTrnd_cFv(); extern "C" void cutPntWind__11daObjTrnd_cFv(); @@ -133,19 +131,6 @@ void dKyr_get_vectle_calc(cXyz*, cXyz*, cXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_tornado/executor.cpp b/rel/d/a/obj/d_a_obj_tornado/executor.cpp index 1c566e4bc7e..aaf97126c51 100644 --- a/rel/d/a/obj/d_a_obj_tornado/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tornado/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D1C34C[4]; -extern u8 const data_80D1C350[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tornado/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tornado/unknown_translation_unit_ctors.cpp index 0daf01d5f00..aed7bbe673d 100644 --- a/rel/d/a/obj/d_a_obj_tornado/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tornado/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D1C34C[4]; -extern u8 const data_80D1C34C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D1C34C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D1C34C-80D1C350 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D1C34C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tornado/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_tornado/unknown_translation_unit_dtors.cpp index c1ae9ba12b7..d3cbb17ca0f 100644 --- a/rel/d/a/obj/d_a_obj_tornado/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_tornado/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D1C350[4]; -extern u8 const data_80D1C350[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D1C350[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D1C350-80D1C354 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D1C350[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp b/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp index 409a2f4ac90..75f18586269 100644 --- a/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp +++ b/rel/d/a/obj/d_a_obj_tornado2/d_a_obj_tornado2.cpp @@ -11,13 +11,13 @@ // Types: // -struct csXyz {}; - struct cXyz { /* 80266EF4 */ void normalize(); /* 802670AC */ void isZero() const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -51,10 +51,10 @@ struct dSv_info_c { struct dPa_levelEcallBack {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -107,7 +107,6 @@ static void daObjTrnd2_Execute(daObjTrnd2_c*); static void daObjTrnd2_Delete(daObjTrnd2_c*); static void daObjTrnd2_Create(daObjTrnd2_c*); static void cLib_calcTimer__template0(s32*); -extern "C" extern void* g_profile_Obj_Tornado2[12]; extern "C" void setPntWind__12daObjTrnd2_cFv(); extern "C" void cutPntWind__12daObjTrnd2_cFv(); @@ -146,18 +145,6 @@ void cM_rndF(f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u32 __float_nan; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_tornado2/executor.cpp b/rel/d/a/obj/d_a_obj_tornado2/executor.cpp index c5e432363bf..ff867e99038 100644 --- a/rel/d/a/obj/d_a_obj_tornado2/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tornado2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D1D3CC[4]; -extern u8 const data_80D1D3D0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tornado2/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tornado2/unknown_translation_unit_ctors.cpp index 95500e24b10..91b694f7fc3 100644 --- a/rel/d/a/obj/d_a_obj_tornado2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tornado2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D1D3CC[4]; -extern u8 const data_80D1D3CC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D1D3CC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D1D3CC-80D1D3D0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D1D3CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tornado2/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_tornado2/unknown_translation_unit_dtors.cpp index ff5a0a61aba..15a6c316d37 100644 --- a/rel/d/a/obj/d_a_obj_tornado2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_tornado2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D1D3D0[4]; -extern u8 const data_80D1D3D0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D1D3D0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D1D3D0-80D1D3D4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D1D3D0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp b/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp index 624131fd641..bd97dd12e26 100644 --- a/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp +++ b/rel/d/a/obj/d_a_obj_tp/d_a_obj_tp.cpp @@ -44,14 +44,14 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; - -struct J3DAnmTransform {}; - struct J3DModelData { /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); }; +struct J3DAnmTransform {}; + +struct Vec {}; + struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int, @@ -197,24 +197,6 @@ static bool daObj_Tp_IsDelete(obj_tp_class*); static void daObj_Tp_Delete(obj_tp_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Tp_Create(fopAc_ac_c*); -extern "C" extern u32 const lit_4247; -extern "C" extern u32 const lit_4248; -extern "C" extern u32 const lit_4249; -extern "C" extern u32 const lit_4250; -extern "C" extern u32 const lit_4251; -extern "C" extern u32 const lit_4252; -extern "C" extern u8 const lit_4253[8]; -extern "C" extern u8 const lit_4254[8]; -extern "C" extern u8 const lit_4255[8]; -extern "C" extern u32 const lit_4256; -extern "C" extern u32 const lit_4257; -extern "C" extern u32 const lit_4258; -extern "C" extern u32 const lit_4260; -extern "C" extern u32 const lit_4261; -extern "C" extern u32 const lit_4262; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_TP[12]; extern "C" static void daObj_Tp_Draw__FP12obj_tp_class(); extern "C" static void anm_init__FP12obj_tp_classifUcf(); @@ -275,21 +257,6 @@ void cM_rndF(f32); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_tp/executor.cpp b/rel/d/a/obj/d_a_obj_tp/executor.cpp index 901b46ca7bf..bb7892e33fb 100644 --- a/rel/d/a/obj/d_a_obj_tp/executor.cpp +++ b/rel/d/a/obj/d_a_obj_tp/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D1EE24[4]; -extern u8 const data_80D1EE28[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_tp/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_tp/unknown_translation_unit_ctors.cpp index d70ee924153..26bc7d2538a 100644 --- a/rel/d/a/obj/d_a_obj_tp/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_tp/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D1EE24[4]; -extern u8 const data_80D1EE24[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D1EE24[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D1EE24-80D1EE28 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D1EE24[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_tp/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_tp/unknown_translation_unit_dtors.cpp index a43907ff775..ddbafc7383d 100644 --- a/rel/d/a/obj/d_a_obj_tp/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_tp/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D1EE28[4]; -extern u8 const data_80D1EE28[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D1EE28[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D1EE28-80D1EE2C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D1EE28[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp b/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp index 5591c9d87c9..e338bedd0cd 100644 --- a/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp +++ b/rel/d/a/obj/d_a_obj_treesh/d_a_obj_treesh.cpp @@ -91,8 +91,6 @@ static void daTreeSh_create1st(daTreeSh_c*); static void daTreeSh_MoveBGDelete(daTreeSh_c*); static void daTreeSh_MoveBGExecute(daTreeSh_c*); static void daTreeSh_MoveBGDraw(daTreeSh_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_TREESH[12]; extern "C" void __ct__14daTreeSh_HIO_cFv(); extern "C" void __dt__5csXyzFv(); @@ -130,14 +128,6 @@ void dKyw_get_wind_pow(); void cM_rndF(f32); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_treesh/executor.cpp b/rel/d/a/obj/d_a_obj_treesh/executor.cpp index 05abf41c163..2963cb1423f 100644 --- a/rel/d/a/obj/d_a_obj_treesh/executor.cpp +++ b/rel/d/a/obj/d_a_obj_treesh/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D1F8B4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_treesh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_treesh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e6507685fa1..421288873a4 100644 --- a/rel/d/a/obj/d_a_obj_treesh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_treesh/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D1F8C0[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D1F8C0-80D1F8C8 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D1F8C0[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D1F988-80D1F990 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_treesh/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_treesh/unknown_translation_unit_ctors.cpp index d4235d82e25..cace9bb8da6 100644 --- a/rel/d/a/obj/d_a_obj_treesh/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_treesh/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D1F8B4[2]; -extern void* const data_80D1F8B4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_treesh_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D1F8B4-80D1F8BC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D1F8B4[2] = { + (void*)__sinit_d_a_obj_treesh_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp b/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp index 8a2d0780053..7258c35e769 100644 --- a/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp +++ b/rel/d/a/obj/d_a_obj_twGate/d_a_obj_twGate.cpp @@ -61,12 +61,12 @@ struct dSv_player_status_b_c { /* 80032BB0 */ void isDarkClearLV(int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -120,7 +120,6 @@ static void daTwGate_Draw(daTwGate_c*); static void daTwGate_Execute(daTwGate_c*); static void daTwGate_Delete(daTwGate_c*); static void daTwGate_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_TwGate[12]; extern "C" void __ct__14daTwGate_HIO_cFv(); extern "C" void __dt__18fOpAcm_HIO_entry_cFv(); @@ -155,12 +154,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cM3d_Len3dSqPntAndSegLine(cM3dGLin const*, Vec const*, Vec*, f32*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/obj/d_a_obj_twGate/executor.cpp b/rel/d/a/obj/d_a_obj_twGate/executor.cpp index f37626e6245..08dbc01b624 100644 --- a/rel/d/a/obj/d_a_obj_twGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_twGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D202F4[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_twGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_twGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 3801123f337..af184e06b2f 100644 --- a/rel/d/a/obj/d_a_obj_twGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_twGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D20300[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D20300-80D20308 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D20300[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D20698-80D206A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_twGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_twGate/unknown_translation_unit_ctors.cpp index 1fa24a93cef..dbbc5588c93 100644 --- a/rel/d/a/obj/d_a_obj_twGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_twGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D202F4[2]; -extern void* const data_80D202F4[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_twGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D202F4-80D202FC 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D202F4[2] = { + (void*)__sinit_d_a_obj_twGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp b/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp index 0dfcbf12969..dc8ffcbb52b 100644 --- a/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp +++ b/rel/d/a/obj/d_a_obj_udoor/d_a_obj_udoor.cpp @@ -19,12 +19,12 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -111,8 +111,6 @@ static bool daObj_Udoor_IsDelete(obj_udoor_class*); static void daObj_Udoor_Delete(obj_udoor_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Udoor_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_UDOOR[12]; extern "C" static void daObj_Udoor_Draw__FP15obj_udoor_class(); extern "C" static void daObj_Udoor_Execute__FP15obj_udoor_class(); @@ -142,18 +140,6 @@ void cLib_addCalc0(f32*, f32, f32); void cLib_addCalcAngleS2(s16*, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_udoor/executor.cpp b/rel/d/a/obj/d_a_obj_udoor/executor.cpp index 5865ba06851..acbce63458d 100644 --- a/rel/d/a/obj/d_a_obj_udoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_udoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D20DD8[4]; -extern u8 const data_80D20DDC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_udoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_udoor/unknown_translation_unit_ctors.cpp index 9a1205fb20a..261c73d73a0 100644 --- a/rel/d/a/obj/d_a_obj_udoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_udoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D20DD8[4]; -extern u8 const data_80D20DD8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D20DD8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D20DD8-80D20DDC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D20DD8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_udoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_udoor/unknown_translation_unit_dtors.cpp index 48b8545fa3f..372420508b2 100644 --- a/rel/d/a/obj/d_a_obj_udoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_udoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D20DDC[4]; -extern u8 const data_80D20DDC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D20DDC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D20DDC-80D20DE0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D20DDC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp b/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp index 0c6e17c0929..6a40e69f798 100644 --- a/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp +++ b/rel/d/a/obj/d_a_obj_usaku/d_a_obj_usaku.cpp @@ -19,12 +19,12 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -73,8 +73,6 @@ static bool daObj_Usaku_IsDelete(obj_usaku_class*); static void daObj_Usaku_Delete(obj_usaku_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Usaku_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_USAKU[12]; extern "C" static void daObj_Usaku_Draw__FP15obj_usaku_class(); extern "C" static void daObj_Usaku_Execute__FP15obj_usaku_class(); @@ -99,11 +97,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_usaku/executor.cpp b/rel/d/a/obj/d_a_obj_usaku/executor.cpp index a8ca2f35b8e..6b20fac34c6 100644 --- a/rel/d/a/obj/d_a_obj_usaku/executor.cpp +++ b/rel/d/a/obj/d_a_obj_usaku/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D212D4[4]; -extern u8 const data_80D212D8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_usaku/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_usaku/unknown_translation_unit_ctors.cpp index f2abf24e5df..2570998f05b 100644 --- a/rel/d/a/obj/d_a_obj_usaku/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_usaku/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D212D4[4]; -extern u8 const data_80D212D4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D212D4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D212D4-80D212D8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D212D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_usaku/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_usaku/unknown_translation_unit_dtors.cpp index 592c95833c1..7e053361deb 100644 --- a/rel/d/a/obj/d_a_obj_usaku/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_usaku/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D212D8[4]; -extern u8 const data_80D212D8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D212D8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D212D8-80D212DC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D212D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp index d4e01a58c49..f785096b2d0 100644 --- a/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp +++ b/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.cpp @@ -52,12 +52,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -85,8 +85,6 @@ static void daObjVGnd_Draw(daObjVGnd_c*); static void daObjVGnd_Execute(daObjVGnd_c*); static void daObjVGnd_Delete(daObjVGnd_c*); static void daObjVGnd_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_VolcGnd[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void initBaseMtx__11daObjVGnd_cFv(); @@ -118,13 +116,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); diff --git a/rel/d/a/obj/d_a_obj_vground/executor.cpp b/rel/d/a/obj/d_a_obj_vground/executor.cpp index 6b4b157702c..a701fef2b9a 100644 --- a/rel/d/a/obj/d_a_obj_vground/executor.cpp +++ b/rel/d/a/obj/d_a_obj_vground/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D21A00[4]; -extern u8 const data_80D21A04[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_vground/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_vground/unknown_translation_unit_ctors.cpp index 1b05b403037..977f40a90d3 100644 --- a/rel/d/a/obj/d_a_obj_vground/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_vground/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D21A00[4]; -extern u8 const data_80D21A00[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D21A00[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D21A00-80D21A04 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D21A00[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_vground/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_vground/unknown_translation_unit_dtors.cpp index f24e4b36ac8..537b772fc7b 100644 --- a/rel/d/a/obj/d_a_obj_vground/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_vground/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D21A04[4]; -extern u8 const data_80D21A04[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D21A04[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D21A04-80D21A08 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D21A04[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp index 73f911465ae..129ebaf0085 100644 --- a/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/d_a_obj_volcball.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -229,9 +229,6 @@ static void daObjVolcBall_Delete(daObjVolcBall_c*); static void daObjVolcBall_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); static void cLib_calcTimer__template1(u32*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_VolcanicBall[12]; extern "C" void getData__15daObjVolcBall_cFv(); extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); @@ -322,22 +319,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__19dPa_followEcallBack[10]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80D24100[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_volcball/executor.cpp b/rel/d/a/obj/d_a_obj_volcball/executor.cpp index 82765f9aea9..c34b5925f1a 100644 --- a/rel/d/a/obj/d_a_obj_volcball/executor.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D23DC4[4]; -extern u8 const data_80D23DC8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp index 27271b086de..e1a3fed6832 100644 --- a/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80D24100[4]; -extern "C" extern u8 data_80D24100[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_ctors.cpp index 2cf35d2a2ea..0fedbc6fdcf 100644 --- a/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D23DC4[4]; -extern u8 const data_80D23DC4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D23DC4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D23DC4-80D23DC8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D23DC4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_dtors.cpp index 31ffcaf5942..635930454a9 100644 --- a/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_volcball/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D23DC8[4]; -extern u8 const data_80D23DC8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D23DC8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D23DC8-80D23DCC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D23DC8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp b/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp index e353ef21276..ae94027be49 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp +++ b/rel/d/a/obj/d_a_obj_volcbom/d_a_obj_volcbom.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -301,8 +301,6 @@ static void daObjVolcBom_MoveBGDelete(daObjVolcBom_c*); static void daObjVolcBom_MoveBGExecute(daObjVolcBom_c*); static void daObjVolcBom_MoveBGDraw(daObjVolcBom_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_VolcanicBomb[12]; extern "C" static void eventCallBack__FPvi(); extern "C" void initBaseMtx__14daObjVolcBom_cFv(); @@ -385,25 +383,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 struct_80D26EA8[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_volcbom/executor.cpp b/rel/d/a/obj/d_a_obj_volcbom/executor.cpp index c50dbe29d4c..b3caa958d89 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/executor.cpp +++ b/rel/d/a/obj/d_a_obj_volcbom/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D26B54[4]; -extern u8 const data_80D26B58[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_bss.cpp index 12c259e305e..683f0c1ac0e 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 struct_80D26EA8[4]; -extern "C" extern u8 struct_80D26EA8[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_ctors.cpp index 56a7656be09..0e2de9f4b8f 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D26B54[4]; -extern u8 const data_80D26B54[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D26B54[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D26B54-80D26B58 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D26B54[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_dtors.cpp index d8d79e10435..b6096a97c95 100644 --- a/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_volcbom/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D26B58[4]; -extern u8 const data_80D26B58[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D26B58[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D26B58-80D26B5C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D26B58[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp b/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp index d855119ae22..d31cf394840 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/d_a_obj_warp_kbrg.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -224,15 +224,6 @@ static void daObjWarpKBrg_MoveBGDelete(daObjWarpKBrg_c*); static void daObjWarpKBrg_MoveBGExecute(daObjWarpKBrg_c*); static void daObjWarpKBrg_MoveBGDraw(daObjWarpKBrg_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 const lit_4526; -extern "C" extern u32 const lit_4527; -extern "C" extern u32 const lit_4528; -extern "C" extern u32 const lit_4529; -extern "C" extern u32 const lit_4530; -extern "C" extern u32 const lit_4531; -extern "C" extern u32 const lit_4532; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_KakarikoBrg[12]; extern "C" static void eventCallBack__FPvi(); extern "C" void initBaseMtx__15daObjWarpKBrg_cFv(); @@ -306,18 +297,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80D29928[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/executor.cpp b/rel/d/a/obj/d_a_obj_warp_kbrg/executor.cpp index 0a6112bbb53..1c42fc390c2 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/executor.cpp +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D295AC[4]; -extern u8 const data_80D295B0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_bss.cpp index 0d0edd12f72..db6e2265a3c 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80D29928[4]; -extern "C" extern u8 data_80D29928[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_ctors.cpp index 8487f4e8cb1..af6dc0ec7fb 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D295AC[4]; -extern u8 const data_80D295AC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D295AC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D295AC-80D295B0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D295AC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_dtors.cpp index 72a31c6a396..173b12c14f0 100644 --- a/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_warp_kbrg/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D295B0[4]; -extern u8 const data_80D295B0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D295B0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D295B0-80D295B4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D295B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp b/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp index f66cb891b18..7a7b468970f 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp +++ b/rel/d/a/obj/d_a_obj_warp_obrg/d_a_obj_warp_obrg.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -195,8 +195,6 @@ static void daObjWarpOBrg_MoveBGDelete(daObjWarpOBrg_c*); static void daObjWarpOBrg_MoveBGExecute(daObjWarpOBrg_c*); static void daObjWarpOBrg_MoveBGDraw(daObjWarpOBrg_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_OrdinBrg[12]; extern "C" void initBaseMtx__15daObjWarpOBrg_cFv(); extern "C" void setBaseMtx__15daObjWarpOBrg_cFv(); @@ -246,19 +244,6 @@ void cLib_targetAngleX(cXyz const*, cXyz const*); void JPASetRMtxTVecfromMtx(f32 const (*)[4], f32 (*)[4], JGeometry::TVec3__template0*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80D2BA88[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/executor.cpp b/rel/d/a/obj/d_a_obj_warp_obrg/executor.cpp index 988dbc2917c..dd53d2c4fdd 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/executor.cpp +++ b/rel/d/a/obj/d_a_obj_warp_obrg/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D2B7F0[4]; -extern u8 const data_80D2B7F4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_bss.cpp index fe63b11a437..9fe08086979 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80D2BA88[4]; -extern "C" extern u8 data_80D2BA88[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_ctors.cpp index 6a45d1f9db7..f14116aa327 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D2B7F0[4]; -extern u8 const data_80D2B7F0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D2B7F0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D2B7F0-80D2B7F4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D2B7F0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_dtors.cpp index f501e6f4424..c280d98e939 100644 --- a/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_warp_obrg/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D2B7F4[4]; -extern u8 const data_80D2B7F4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D2B7F4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D2B7F4-80D2B7F8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D2B7F4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp b/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp index 9059bc4590c..46a56bebcd8 100644 --- a/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp +++ b/rel/d/a/obj/d_a_obj_waterGate/d_a_obj_waterGate.cpp @@ -46,12 +46,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -102,9 +102,6 @@ static void daWtGate_Draw(daWtGate_c*); static void daWtGate_Execute(daWtGate_c*); static void daWtGate_Delete(daWtGate_c*); static void daWtGate_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_WtGate[12]; extern "C" void __ct__14daWtGate_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -147,13 +144,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_waterGate/executor.cpp b/rel/d/a/obj/d_a_obj_waterGate/executor.cpp index 1fe1a703167..8eb6f9ff261 100644 --- a/rel/d/a/obj/d_a_obj_waterGate/executor.cpp +++ b/rel/d/a/obj/d_a_obj_waterGate/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D2C458[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_waterGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_waterGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 4346e39ec5c..171ebb71819 100644 --- a/rel/d/a/obj/d_a_obj_waterGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_waterGate/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D2C464[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D2C464-80D2C46C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D2C464[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D2C5A8-80D2C5B0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_waterGate/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_waterGate/unknown_translation_unit_ctors.cpp index c192ceaa3ff..8670e6046db 100644 --- a/rel/d/a/obj/d_a_obj_waterGate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_waterGate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D2C458[2]; -extern void* const data_80D2C458[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_waterGate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D2C458-80D2C460 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D2C458[2] = { + (void*)__sinit_d_a_obj_waterGate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp b/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp index c29bfed45b7..841fd83e88f 100644 --- a/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp +++ b/rel/d/a/obj/d_a_obj_waterPillar/d_a_obj_waterPillar.cpp @@ -94,14 +94,14 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - struct Vec {}; struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -242,9 +242,6 @@ static void daWtPillar_Draw(daWtPillar_c*); static void daWtPillar_Execute(daWtPillar_c*); static void daWtPillar_Delete(daWtPillar_c*); static void daWtPillar_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_WaterPillar[12]; extern "C" void __ct__16daWtPillar_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -322,21 +319,6 @@ void dComIfGp_getReverb(int); void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_waterPillar/executor.cpp b/rel/d/a/obj/d_a_obj_waterPillar/executor.cpp index e0acd252b9c..edf96818ae7 100644 --- a/rel/d/a/obj/d_a_obj_waterPillar/executor.cpp +++ b/rel/d/a/obj/d_a_obj_waterPillar/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D2E75C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_waterPillar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_waterPillar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c7c2d72a417..a7b2162d801 100644 --- a/rel/d/a/obj/d_a_obj_waterPillar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_waterPillar/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D2E768[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D2E768-80D2E770 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D2E768[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D2EB28-80D2EB30 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_waterPillar/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_waterPillar/unknown_translation_unit_ctors.cpp index ee89df986b8..56afca22eea 100644 --- a/rel/d/a/obj/d_a_obj_waterPillar/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_waterPillar/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D2E75C[2]; -extern void* const data_80D2E75C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_waterPillar_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D2E75C-80D2E764 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D2E75C[2] = { + (void*)__sinit_d_a_obj_waterPillar_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp b/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp index 7678c6ec3c4..bd0c4883ba2 100644 --- a/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp +++ b/rel/d/a/obj/d_a_obj_waterfall/d_a_obj_waterfall.cpp @@ -109,8 +109,6 @@ static void daObjWaterFall_Draw(daObjWaterFall_c*); static void daObjWaterFall_Execute(daObjWaterFall_c*); static void daObjWaterFall_Delete(daObjWaterFall_c*); static void daObjWaterFall_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_WaterFall[12]; extern "C" static void s_b_sub__FPvPv(); extern "C" static void s_a_sub__FPvPv(); @@ -154,17 +152,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cM_atan2s(f32, f32); void cLib_chasePosXZ(cXyz*, cXyz const&, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Tri[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_TriAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_waterfall/executor.cpp b/rel/d/a/obj/d_a_obj_waterfall/executor.cpp index 6948248df66..6d5a5f40c35 100644 --- a/rel/d/a/obj/d_a_obj_waterfall/executor.cpp +++ b/rel/d/a/obj/d_a_obj_waterfall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D2FD50[4]; -extern u8 const data_80D2FD54[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_waterfall/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_waterfall/unknown_translation_unit_ctors.cpp index 2333e84303b..d4681ee809f 100644 --- a/rel/d/a/obj/d_a_obj_waterfall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_waterfall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D2FD50[4]; -extern u8 const data_80D2FD50[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D2FD50[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D2FD50-80D2FD54 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D2FD50[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_waterfall/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_waterfall/unknown_translation_unit_dtors.cpp index d5752f8b3ee..50f9802800a 100644 --- a/rel/d/a/obj/d_a_obj_waterfall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_waterfall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D2FD54[4]; -extern u8 const data_80D2FD54[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D2FD54[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D2FD54-80D2FD58 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D2FD54[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp index 680d56ca76e..36449eaa383 100644 --- a/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp +++ b/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.cpp @@ -13,12 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80D303D0 */ csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); - /* 80D30394 */ ~csXyz(); -}; - struct Vec {}; struct cXyz { @@ -31,6 +25,12 @@ struct cXyz { /* 80D303D8 */ ~cXyz(); }; +struct csXyz { + /* 80D303D0 */ csXyz(); + /* 802673F4 */ csXyz(s16, s16, s16); + /* 80D30394 */ ~csXyz(); +}; + struct mDoMtx_stack_c { /* 8000CDD4 */ void transM(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -114,7 +114,6 @@ static void daObjWchain_Create(fopAc_ac_c*); static void daObjWchain_Delete(daObjWchain_c*); static void daObjWchain_Execute(daObjWchain_c*); static void daObjWchain_Draw(daObjWchain_c*); -extern "C" extern void* g_profile_Obj_Wchain[12]; extern "C" void createHeap__13daObjWchain_cFv(); extern "C" static void daObjWchain_createHeap__FP10fopAc_ac_c(); @@ -161,21 +160,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mRoofY__11fopAcM_rc_c[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoMtx_YrotS__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_wchain/executor.cpp b/rel/d/a/obj/d_a_obj_wchain/executor.cpp index 5120d2cba27..d71bc99b6fa 100644 --- a/rel/d/a/obj/d_a_obj_wchain/executor.cpp +++ b/rel/d/a/obj/d_a_obj_wchain/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D3191C[4]; -extern u8 const data_80D31920[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_wchain/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_wchain/unknown_translation_unit_ctors.cpp index b0f99396828..2f15640eef8 100644 --- a/rel/d/a/obj/d_a_obj_wchain/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_wchain/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3191C[4]; -extern u8 const data_80D3191C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D3191C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D3191C-80D31920 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D3191C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wchain/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_wchain/unknown_translation_unit_dtors.cpp index 3656c84ab7e..eb9c3644e8f 100644 --- a/rel/d/a/obj/d_a_obj_wchain/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_wchain/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D31920[4]; -extern u8 const data_80D31920[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D31920[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D31920-80D31924 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D31920[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp b/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp index 02ef7d9858e..daacffd2430 100644 --- a/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp +++ b/rel/d/a/obj/d_a_obj_wdStick/d_a_obj_wdStick.cpp @@ -222,9 +222,6 @@ static void daWdStick_Draw(daWdStick_c*); static void daWdStick_Execute(daWdStick_c*); static void daWdStick_Delete(daWdStick_c*); static void daWdStick_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_WdStick[12]; extern "C" void __ct__15daWdStick_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -294,22 +291,6 @@ void dComIfGp_getReverb(int); void cM_atan2s(f32, f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern void* const pad_80D34130[2]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_wdStick/executor.cpp b/rel/d/a/obj/d_a_obj_wdStick/executor.cpp index 732e154478c..c0bdaa67f69 100644 --- a/rel/d/a/obj/d_a_obj_wdStick/executor.cpp +++ b/rel/d/a/obj/d_a_obj_wdStick/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D34124[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_wdStick/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_wdStick/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 17942ecb38c..8fd26e32c03 100644 --- a/rel/d/a/obj/d_a_obj_wdStick/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_wdStick/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D34130[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D34130-80D34138 0008+00 s=0 e=1 z=0 None .dtors None */ +void* const pad_80D34130[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D34410-80D34418 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_wdStick/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_wdStick/unknown_translation_unit_ctors.cpp index 6261c9418f1..4958da4255c 100644 --- a/rel/d/a/obj/d_a_obj_wdStick/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_wdStick/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D34124[2]; -extern void* const data_80D34124[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_wdStick_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D34124-80D3412C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D34124[2] = { + (void*)__sinit_d_a_obj_wdStick_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp index 4cfde173af8..24df9d2d1f9 100644 --- a/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp +++ b/rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp @@ -46,12 +46,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -164,8 +164,6 @@ static bool daObj_Web0_IsDelete(obj_web0_class*); static void daObj_Web0_Delete(obj_web0_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Web0_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_WEB0[12]; extern "C" void __ct__16daObj_Web0_HIO_cFv(); extern "C" static void daObj_Web0_Draw__FP14obj_web0_class(); @@ -203,18 +201,6 @@ void dComIfGp_getReverb(int); void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoMtx_ZrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_web0/executor.cpp b/rel/d/a/obj/d_a_obj_web0/executor.cpp index 16a5d9a0fdd..9001d919a1f 100644 --- a/rel/d/a/obj/d_a_obj_web0/executor.cpp +++ b/rel/d/a/obj/d_a_obj_web0/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D35168[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_web0/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_web0/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 99ebfe52f59..7d2ee55bf2a 100644 --- a/rel/d/a/obj/d_a_obj_web0/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_web0/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D35174[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D35174-80D3517C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D35174[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D35288-80D35290 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_web0/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_web0/unknown_translation_unit_ctors.cpp index 86c25936b82..f154934831b 100644 --- a/rel/d/a/obj/d_a_obj_web0/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_web0/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D35168[2]; -extern void* const data_80D35168[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_web0_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D35168-80D35170 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D35168[2] = { + (void*)__sinit_d_a_obj_web0_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp index aeade36136a..bbf1cdfbc77 100644 --- a/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp +++ b/rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp @@ -47,12 +47,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -173,8 +173,6 @@ static bool daObj_Web1_IsDelete(obj_web1_class*); static void daObj_Web1_Delete(obj_web1_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Web1_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_WEB1[12]; extern "C" void __ct__16daObj_Web1_HIO_cFv(); extern "C" static void daObj_Web1_Draw__FP14obj_web1_class(); @@ -211,18 +209,6 @@ void dBgS_MoveBGProc_Typical(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, cs void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_web1/executor.cpp b/rel/d/a/obj/d_a_obj_web1/executor.cpp index f00b4a53cea..952c44896b8 100644 --- a/rel/d/a/obj/d_a_obj_web1/executor.cpp +++ b/rel/d/a/obj/d_a_obj_web1/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D360AC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_web1/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_web1/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 8373eb92dbc..a8137c93929 100644 --- a/rel/d/a/obj/d_a_obj_web1/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_web1/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D360B8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D360B8-80D360C0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D360B8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D361F0-80D361F8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_web1/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_web1/unknown_translation_unit_ctors.cpp index 27b80ad12eb..e5d2785f2c9 100644 --- a/rel/d/a/obj/d_a_obj_web1/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_web1/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D360AC[2]; -extern void* const data_80D360AC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_web1_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D360AC-80D360B4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D360AC[2] = { + (void*)__sinit_d_a_obj_web1_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp b/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp index cf8bedba2db..f4ca8b3890a 100644 --- a/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp +++ b/rel/d/a/obj/d_a_obj_well_cover/d_a_obj_well_cover.cpp @@ -95,9 +95,6 @@ static void daObjWCover_Draw(daObjWCover_c*); static void daObjWCover_Execute(daObjWCover_c*); static void daObjWCover_Delete(daObjWCover_c*); static void daObjWCover_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_WellCover[12]; extern "C" void initBaseMtx__13daObjWCover_cFv(); extern "C" void setBaseMtx__13daObjWCover_cFv(); @@ -130,14 +127,6 @@ void fopAcM_delete(fopAc_ac_c*); void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80D36B18[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_well_cover/executor.cpp b/rel/d/a/obj/d_a_obj_well_cover/executor.cpp index fef366ff31e..b49b99a84ca 100644 --- a/rel/d/a/obj/d_a_obj_well_cover/executor.cpp +++ b/rel/d/a/obj/d_a_obj_well_cover/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D36A04[4]; -extern u8 const data_80D36A08[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp index 34d9051886d..5a8bc7f45b9 100644 --- a/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80D36B18[4]; -extern "C" extern u8 data_80D36B18[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_ctors.cpp index bead8c0baad..bdf0f7f7948 100644 --- a/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D36A04[4]; -extern u8 const data_80D36A04[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D36A04[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D36A04-80D36A08 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D36A04[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_dtors.cpp index 3baab344982..6e64cda8ba5 100644 --- a/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_well_cover/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D36A08[4]; -extern u8 const data_80D36A08[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D36A08[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D36A08-80D36A0C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D36A08[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp b/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp index 03f6932fd8e..fa18b48d731 100644 --- a/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp +++ b/rel/d/a/obj/d_a_obj_wflag/d_a_obj_wflag.cpp @@ -26,10 +26,10 @@ struct mDoMtx_stack_c { /* 8000CD9C */ void transM(f32, f32, f32); }; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -50,11 +50,11 @@ struct mDoExt_McaMorfCallBack2_c {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Vec {}; +struct J3DModelData {}; struct J3DAnmTransform {}; -struct J3DModelData {}; +struct Vec {}; struct mDoExt_McaMorf { /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -71,14 +71,14 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; /* 80D36F54 */ ~cXyz(); /* 80D37880 */ cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -114,8 +114,6 @@ static bool daObj_Wflag_IsDelete(obj_wflag_class*); static void daObj_Wflag_Delete(obj_wflag_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Wflag_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_WFLAG[12]; extern "C" static void daObj_Wflag_Draw__FP15obj_wflag_class(); extern "C" static void tail_control__FP10fopAc_ac_cP9wf_tail_s(); @@ -159,13 +157,6 @@ void MtxTrans(f32, f32, f32, u8); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_XrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_wflag/executor.cpp b/rel/d/a/obj/d_a_obj_wflag/executor.cpp index c092efa3bcc..b041c118b38 100644 --- a/rel/d/a/obj/d_a_obj_wflag/executor.cpp +++ b/rel/d/a/obj/d_a_obj_wflag/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D37884[4]; -extern u8 const data_80D37888[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_wflag/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_wflag/unknown_translation_unit_ctors.cpp index 540779701c6..578ee4e08b1 100644 --- a/rel/d/a/obj/d_a_obj_wflag/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_wflag/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D37884[4]; -extern u8 const data_80D37884[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D37884[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D37884-80D37888 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D37884[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wflag/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_wflag/unknown_translation_unit_dtors.cpp index 54049e5d4ca..103ca1474a7 100644 --- a/rel/d/a/obj/d_a_obj_wflag/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_wflag/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D37888[4]; -extern u8 const data_80D37888[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D37888[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D37888-80D3788C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D37888[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp b/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp index af8981ff9f8..e42927d8694 100644 --- a/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp +++ b/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.cpp @@ -46,12 +46,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -138,8 +138,6 @@ static void daWindStone_create(daWindStone_c*); static void daWindStone_Delete(daWindStone_c*); static void daWindStone_execute(daWindStone_c*); static void daWindStone_draw(daWindStone_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_WindStone[12]; extern "C" static void daWindStone_c_createHeap__FP10fopAc_ac_c(); extern "C" void __ct__13daWindStone_cFv(); @@ -182,15 +180,6 @@ void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_Poly dKy_tevstr_c*, s16, f32, _GXTexObj*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_wind_stone/executor.cpp b/rel/d/a/obj/d_a_obj_wind_stone/executor.cpp index 16c65f523f3..986f69a2b87 100644 --- a/rel/d/a/obj/d_a_obj_wind_stone/executor.cpp +++ b/rel/d/a/obj/d_a_obj_wind_stone/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D38600[4]; -extern u8 const data_80D38604[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_wind_stone/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_wind_stone/unknown_translation_unit_ctors.cpp index 24382753d83..183844e35a3 100644 --- a/rel/d/a/obj/d_a_obj_wind_stone/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_wind_stone/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D38600[4]; -extern u8 const data_80D38600[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D38600[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D38600-80D38604 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D38600[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wind_stone/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_wind_stone/unknown_translation_unit_dtors.cpp index efcf156f9b1..ea0f162fd9d 100644 --- a/rel/d/a/obj/d_a_obj_wind_stone/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_wind_stone/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D38604[4]; -extern u8 const data_80D38604[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D38604[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D38604-80D38608 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D38604[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp index 97b7977f4d9..5294f627acf 100644 --- a/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp +++ b/rel/d/a/obj/d_a_obj_window/d_a_obj_window.cpp @@ -135,8 +135,6 @@ static void daObjWindow_create1st(daObjWindow_c*); static void daObjWindow_MoveBGDelete(daObjWindow_c*); static void daObjWindow_MoveBGExecute(daObjWindow_c*); static void daObjWindow_MoveBGDraw(daObjWindow_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Window[12]; extern "C" void initBaseMtx__13daObjWindow_cFv(); extern "C" void setBaseMtx__13daObjWindow_cFv(); @@ -169,18 +167,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_window/executor.cpp b/rel/d/a/obj/d_a_obj_window/executor.cpp index 0aecaf84063..894f462ec2e 100644 --- a/rel/d/a/obj/d_a_obj_window/executor.cpp +++ b/rel/d/a/obj/d_a_obj_window/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D39224[4]; -extern u8 const data_80D39228[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_window/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_window/unknown_translation_unit_ctors.cpp index 71d1e8e5531..abde4c37779 100644 --- a/rel/d/a/obj/d_a_obj_window/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_window/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D39224[4]; -extern u8 const data_80D39224[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D39224[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D39224-80D39228 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D39224[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_window/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_window/unknown_translation_unit_dtors.cpp index 598016a161e..8a67d36b89d 100644 --- a/rel/d/a/obj/d_a_obj_window/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_window/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D39228[4]; -extern u8 const data_80D39228[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D39228[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D39228-80D3922C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D39228[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp b/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp index 12af2cdde0e..ecbdd9c5c1b 100644 --- a/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp +++ b/rel/d/a/obj/d_a_obj_wood_pendulum/d_a_obj_wood_pendulum.cpp @@ -96,9 +96,6 @@ static void daObjWPndlm_Draw(daObjWPndlm_c*); static void daObjWPndlm_Execute(daObjWPndlm_c*); static void daObjWPndlm_Delete(daObjWPndlm_c*); static void daObjWPndlm_Create(fopAc_ac_c*); -extern "C" extern u8 const lit_3826[24]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_WoodPendulum[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void initBaseMtx__13daObjWPndlm_cFv(); @@ -133,16 +130,6 @@ void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_wood_pendulum/executor.cpp b/rel/d/a/obj/d_a_obj_wood_pendulum/executor.cpp index dea48af6778..35734cf82f6 100644 --- a/rel/d/a/obj/d_a_obj_wood_pendulum/executor.cpp +++ b/rel/d/a/obj/d_a_obj_wood_pendulum/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D39C80[4]; -extern u8 const data_80D39C84[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_wood_pendulum/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_wood_pendulum/unknown_translation_unit_ctors.cpp index 164610754c2..28f347a1191 100644 --- a/rel/d/a/obj/d_a_obj_wood_pendulum/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_wood_pendulum/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D39C80[4]; -extern u8 const data_80D39C80[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D39C80[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D39C80-80D39C84 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D39C80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wood_pendulum/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_wood_pendulum/unknown_translation_unit_dtors.cpp index 4f49890fd0f..8cda5ae0350 100644 --- a/rel/d/a/obj/d_a_obj_wood_pendulum/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_wood_pendulum/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D39C84[4]; -extern u8 const data_80D39C84[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D39C84[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D39C84-80D39C88 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D39C84[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp b/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp index d9e8bfa62a3..50d757aba3e 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp +++ b/rel/d/a/obj/d_a_obj_wood_statue/d_a_obj_wood_statue.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -92,10 +92,10 @@ struct dPa_followEcallBack { /* 80D3A6F4 */ void __defctor(); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -234,8 +234,6 @@ static void daObjWStatue_Execute(daObjWStatue_c*); static void daObjWStatue_Delete(daObjWStatue_c*); static void daObjWStatue_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_WoodStatue[12]; extern "C" static void Reflect__FP4cXyzRC13cBgS_PolyInfof(); extern "C" void __dt__8cM3dGPlaFv(); @@ -310,22 +308,6 @@ void dComIfGp_getReverb(int); void CheckFieldItemCreateHeap(fopAc_ac_c*); void cM_atan2s(f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__19dPa_followEcallBack[10]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80D3B8F0[4]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_wood_statue/executor.cpp b/rel/d/a/obj/d_a_obj_wood_statue/executor.cpp index 4c6341e07ec..575a69bc936 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/executor.cpp +++ b/rel/d/a/obj/d_a_obj_wood_statue/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D3B630[4]; -extern u8 const data_80D3B634[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_bss.cpp b/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_bss.cpp index 590c022dd27..48ac640f63c 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_bss.cpp +++ b/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80D3B8F0[4]; -extern "C" extern u8 data_80D3B8F0[4]; - // // External References: // diff --git a/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_ctors.cpp index e46f6446e97..1823f8552de 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3B630[4]; -extern u8 const data_80D3B630[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D3B630[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D3B630-80D3B634 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D3B630[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_dtors.cpp index 656dc753a21..77ab3e4b7ee 100644 --- a/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_wood_statue/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3B634[4]; -extern u8 const data_80D3B634[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D3B634[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D3B634-80D3B638 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D3B634[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp b/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp index 14e95d6b86f..cf60dac9fef 100644 --- a/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp +++ b/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.cpp @@ -28,12 +28,12 @@ struct daObjWSword_c { /* 80D3BE54 */ void _delete(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -106,8 +106,6 @@ static void daObjWSword_Draw(daObjWSword_c*); static void daObjWSword_Execute(daObjWSword_c*); static void daObjWSword_Delete(daObjWSword_c*); static void daObjWSword_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_WoodenSword[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" void initBaseMtx__13daObjWSword_cFv(); @@ -142,16 +140,6 @@ void fopAcM_setCullSizeBox2(fopAc_ac_c*, J3DModelData*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/obj/d_a_obj_wsword/executor.cpp b/rel/d/a/obj/d_a_obj_wsword/executor.cpp index aa82626e62c..1d095cfe326 100644 --- a/rel/d/a/obj/d_a_obj_wsword/executor.cpp +++ b/rel/d/a/obj/d_a_obj_wsword/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D3BF18[4]; -extern u8 const data_80D3BF1C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_wsword/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_wsword/unknown_translation_unit_ctors.cpp index e972c965db4..d70756874ad 100644 --- a/rel/d/a/obj/d_a_obj_wsword/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_wsword/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3BF18[4]; -extern u8 const data_80D3BF18[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D3BF18[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D3BF18-80D3BF1C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D3BF18[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_wsword/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_wsword/unknown_translation_unit_dtors.cpp index d9562d80ca5..7844e0c1b11 100644 --- a/rel/d/a/obj/d_a_obj_wsword/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_wsword/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3BF1C[4]; -extern u8 const data_80D3BF1C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D3BF1C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D3BF1C-80D3BF20 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D3BF1C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp b/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp index 3cbbbd43bdd..92a14e732d2 100644 --- a/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp +++ b/rel/d/a/obj/d_a_obj_yel_bag/d_a_obj_yel_bag.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -23,6 +21,8 @@ struct cXyz { /* 80D3C35C */ ~cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CE70 */ void scaleM(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -195,49 +195,6 @@ static void daObj_YBag_Execute(void*); static void daObj_YBag_Draw(void*); static bool daObj_YBag_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_OBJ_YBAG[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 data_80D3DF3C[4]; -extern "C" extern u8 data_80D3DF40[4]; -extern "C" extern u8 data_80D3DF44[4]; -extern "C" extern u8 data_80D3DF48[4]; -extern "C" extern u8 data_80D3DF4C[4]; -extern "C" extern u8 data_80D3DF50[4]; -extern "C" extern u8 data_80D3DF54[4]; -extern "C" extern u8 data_80D3DF58[4]; -extern "C" extern u8 data_80D3DF5C[4]; -extern "C" extern u8 data_80D3DF60[4]; -extern "C" extern u8 data_80D3DF64[4]; -extern "C" extern u8 data_80D3DF68[4]; -extern "C" extern u8 data_80D3DF6C[4]; -extern "C" extern u8 data_80D3DF70[4]; -extern "C" extern u8 data_80D3DF74[4]; -extern "C" extern u8 data_80D3DF78[4]; -extern "C" extern u8 data_80D3DF7C[4]; -extern "C" extern u8 data_80D3DF80[4]; -extern "C" extern u8 data_80D3DF84[4]; -extern "C" extern u8 data_80D3DF88[4]; -extern "C" extern u8 data_80D3DF8C[4]; -extern "C" extern u8 data_80D3DF90[4]; -extern "C" extern u8 data_80D3DF94[4]; -extern "C" extern u8 data_80D3DF98[4]; -extern "C" extern u8 data_80D3DF9C[4]; extern "C" void __ct__12daObj_YBag_cFv(); extern "C" void __dt__8cM3dGCylFv(); @@ -351,20 +308,6 @@ void cLib_addCalcAngleS2(s16*, s16, s16, s16); void cLib_chaseF(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_yel_bag/executor.cpp b/rel/d/a/obj/d_a_obj_yel_bag/executor.cpp index ced59ef638e..934d24ac4a2 100644 --- a/rel/d/a/obj/d_a_obj_yel_bag/executor.cpp +++ b/rel/d/a/obj/d_a_obj_yel_bag/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D3DC78[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_yel_bag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_yel_bag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index c45dc9df5bf..3123aa3a916 100644 --- a/rel/d/a/obj/d_a_obj_yel_bag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_yel_bag/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D3DC84[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D3DC84-80D3DC8C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D3DC84[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D3DEC8-80D3DED0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_yel_bag/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_yel_bag/unknown_translation_unit_ctors.cpp index a5f4b6962b2..d9ecbd27ea8 100644 --- a/rel/d/a/obj/d_a_obj_yel_bag/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_yel_bag/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D3DC78[2]; -extern void* const data_80D3DC78[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_yel_bag_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D3DC78-80D3DC80 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D3DC78[2] = { + (void*)__sinit_d_a_obj_yel_bag_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp b/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp index 4a4bf3490c7..314c084a456 100644 --- a/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp +++ b/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp @@ -170,8 +170,6 @@ static void daObjYobikusa_Execute(daObjYobikusa_c*); static bool daObjYobikusa_IsDelete(daObjYobikusa_c*); static void daObjYobikusa_Delete(daObjYobikusa_c*); static void daObjYobikusa_Create(fopAc_ac_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Yobikusa[12]; extern "C" void setAction__15daObjYobikusa_cFQ215daObjYobikusa_c6Mode_e(); extern "C" void callInit__15daObjYobikusa_cFv(); @@ -232,19 +230,6 @@ void dKyw_get_AllWind_vec(cXyz*, cXyz*, f32*); void cM_rnd(); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_yobikusa/executor.cpp b/rel/d/a/obj/d_a_obj_yobikusa/executor.cpp index b01b627831a..6b50ebe71b0 100644 --- a/rel/d/a/obj/d_a_obj_yobikusa/executor.cpp +++ b/rel/d/a/obj/d_a_obj_yobikusa/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8059DE70[2]; -extern u8 const data_8059DE78[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_yobikusa/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_yobikusa/unknown_translation_unit_ctors.cpp index 3c265aeace4..51ff72654b4 100644 --- a/rel/d/a/obj/d_a_obj_yobikusa/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_yobikusa/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8059DE70[2]; -extern void* const data_8059DE70[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_yobikusa_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8059DE70-8059DE78 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8059DE70[2] = { + (void*)__sinit_d_a_obj_yobikusa_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_yobikusa/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_yobikusa/unknown_translation_unit_dtors.cpp index d52b67840a6..dad92ed15af 100644 --- a/rel/d/a/obj/d_a_obj_yobikusa/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_yobikusa/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8059DE78[4]; -extern u8 const data_8059DE78[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8059DE78[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8059DE78-8059DE7C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8059DE78[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp b/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp index 24c294f1112..4396b8e9e97 100644 --- a/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp +++ b/rel/d/a/obj/d_a_obj_yousei/d_a_obj_yousei.cpp @@ -11,14 +11,14 @@ // Types: // -struct csXyz {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE70 */ void scaleM(cXyz const&); @@ -27,16 +27,16 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature { + /* 802C03C8 */ Z2Creature(); + /* 802C0530 */ void init(Vec*, Vec*, u8, u8); +}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature { - /* 802C03C8 */ Z2Creature(); - /* 802C0530 */ void init(Vec*, Vec*, u8, u8); -}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -234,49 +234,6 @@ static void daObjYOUSEI_Delete(daObjYOUSEI_c*); static void daObjYOUSEI_Draw(daObjYOUSEI_c*); static void daObjYOUSEI_Execute(daObjYOUSEI_c*); static bool daObjYOUSEI_IsDelete(daObjYOUSEI_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_Yousei[12]; -extern "C" extern u8 lit_1107[1 + 3 /* padding */]; -extern "C" extern u8 lit_1105[1 + 3 /* padding */]; -extern "C" extern u8 lit_1104[1 + 3 /* padding */]; -extern "C" extern u8 lit_1099[1 + 3 /* padding */]; -extern "C" extern u8 lit_1097[1 + 3 /* padding */]; -extern "C" extern u8 lit_1095[1 + 3 /* padding */]; -extern "C" extern u8 lit_1094[1 + 3 /* padding */]; -extern "C" extern u8 lit_1057[1 + 3 /* padding */]; -extern "C" extern u8 lit_1055[1 + 3 /* padding */]; -extern "C" extern u8 lit_1053[1 + 3 /* padding */]; -extern "C" extern u8 lit_1052[1 + 3 /* padding */]; -extern "C" extern u8 lit_1014[1 + 3 /* padding */]; -extern "C" extern u8 lit_1012[1 + 3 /* padding */]; -extern "C" extern u8 lit_1010[1 + 3 /* padding */]; -extern "C" extern u8 lit_1009[1 + 3 /* padding */]; -extern "C" extern u8 s_dis[4]; -extern "C" extern u8 data_804D1834[4]; -extern "C" extern u8 data_804D1838[4]; -extern "C" extern u8 data_804D183C[4]; -extern "C" extern u8 data_804D1840[4]; -extern "C" extern u8 data_804D1844[4]; -extern "C" extern u8 data_804D1848[4]; -extern "C" extern u8 data_804D184C[4]; -extern "C" extern u8 data_804D1850[4]; -extern "C" extern u8 data_804D1854[4]; -extern "C" extern u8 data_804D1858[4]; -extern "C" extern u8 data_804D185C[4]; -extern "C" extern u8 data_804D1860[4]; -extern "C" extern u8 data_804D1864[4]; -extern "C" extern u8 data_804D1868[4]; -extern "C" extern u8 data_804D186C[4]; -extern "C" extern u8 data_804D1870[4]; -extern "C" extern u8 data_804D1874[4]; -extern "C" extern u8 data_804D1878[4]; -extern "C" extern u8 data_804D187C[4]; -extern "C" extern u8 data_804D1880[4]; -extern "C" extern u8 data_804D1884[4]; -extern "C" extern u8 data_804D1888[4]; -extern "C" extern u8 data_804D188C[4]; -extern "C" extern u8 data_804D1890[4]; -extern "C" extern u8 data_804D1894[4]; extern "C" void InitCcSph__13daObjYOUSEI_cFv(); extern "C" void SetCcSph__13daObjYOUSEI_cFv(); @@ -385,21 +342,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void MtxPosition(cXyz*, cXyz*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_yousei/executor.cpp b/rel/d/a/obj/d_a_obj_yousei/executor.cpp index f7892fcc232..c66c2b3646e 100644 --- a/rel/d/a/obj/d_a_obj_yousei/executor.cpp +++ b/rel/d/a/obj/d_a_obj_yousei/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804D15E8[4]; -extern u8 const data_804D15EC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_yousei/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_yousei/unknown_translation_unit_ctors.cpp index cb67419df2c..3b66d3f9da5 100644 --- a/rel/d/a/obj/d_a_obj_yousei/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_yousei/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D15E8[4]; -extern u8 const data_804D15E8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804D15E8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804D15E8-804D15EC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804D15E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_yousei/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_yousei/unknown_translation_unit_dtors.cpp index d07fb200b46..ea52875cee8 100644 --- a/rel/d/a/obj/d_a_obj_yousei/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_yousei/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D15EC[4]; -extern u8 const data_804D15EC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804D15EC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804D15EC-804D15F0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804D15EC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp index bba3f8bf913..9c23521f72c 100644 --- a/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/d_a_obj_ystone.cpp @@ -41,13 +41,13 @@ struct mDoExt_baseAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -63,10 +63,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -113,7 +113,6 @@ static bool daObj_Ystone_IsDelete(obj_ystone_class*); static void daObj_Ystone_Delete(obj_ystone_class*); static void useHeapInit(fopAc_ac_c*); static void daObj_Ystone_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_OBJ_YSTONE[12]; extern "C" static void getNowLevel__Fv(); extern "C" static void daObj_Ystone_Draw__FP16obj_ystone_class(); @@ -141,11 +140,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_ystone/executor.cpp b/rel/d/a/obj/d_a_obj_ystone/executor.cpp index 35be795a961..8a6ecb31049 100644 --- a/rel/d/a/obj/d_a_obj_ystone/executor.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D3EC04[4]; -extern u8 const data_80D3EC08[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_ystone/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_ystone/unknown_translation_unit_ctors.cpp index 17b9a26adde..7aaf5f43a71 100644 --- a/rel/d/a/obj/d_a_obj_ystone/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3EC04[4]; -extern u8 const data_80D3EC04[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D3EC04[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D3EC04-80D3EC08 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D3EC04[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_ystone/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_ystone/unknown_translation_unit_dtors.cpp index 598332672e3..ce84dcce8c3 100644 --- a/rel/d/a/obj/d_a_obj_ystone/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_ystone/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3EC08[4]; -extern u8 const data_80D3EC08[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D3EC08[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D3EC08-80D3EC0C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D3EC08[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp b/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp index 94a70454f93..397c8cd1965 100644 --- a/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp +++ b/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.cpp @@ -88,7 +88,6 @@ static void daObjZCloth_Draw(daObjZCloth_c*); static void daObjZCloth_Execute(daObjZCloth_c*); static void daObjZCloth_Delete(daObjZCloth_c*); static void daObjZCloth_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Obj_ZoraCloth[12]; extern "C" void initBaseMtx__13daObjZCloth_cFv(); extern "C" void setBaseMtx__13daObjZCloth_cFv(); @@ -119,16 +118,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void CheckFieldItemCreateHeap(fopAc_ac_c*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/obj/d_a_obj_zcloth/executor.cpp b/rel/d/a/obj/d_a_obj_zcloth/executor.cpp index 2aefac54b7e..b5789ad2eea 100644 --- a/rel/d/a/obj/d_a_obj_zcloth/executor.cpp +++ b/rel/d/a/obj/d_a_obj_zcloth/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D3F2CC[4]; -extern u8 const data_80D3F2D0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_zcloth/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_zcloth/unknown_translation_unit_ctors.cpp index 1de6608a3c1..34907e74679 100644 --- a/rel/d/a/obj/d_a_obj_zcloth/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_zcloth/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3F2CC[4]; -extern u8 const data_80D3F2CC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D3F2CC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D3F2CC-80D3F2D0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D3F2CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zcloth/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_zcloth/unknown_translation_unit_dtors.cpp index 607e03b6105..0324f9fb85d 100644 --- a/rel/d/a/obj/d_a_obj_zcloth/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_zcloth/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D3F2D0[4]; -extern u8 const data_80D3F2D0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D3F2D0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D3F2D0-80D3F2D4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D3F2D0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp b/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp index bf28ef16303..81b72c82453 100644 --- a/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp +++ b/rel/d/a/obj/d_a_obj_zdoor/d_a_obj_zdoor.cpp @@ -27,16 +27,16 @@ struct daZdoor_c { /* 80D3FD8C */ void Delete(); }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -143,8 +143,6 @@ static void daZdoor_create1st(daZdoor_c*); static void daZdoor_MoveBGDelete(daZdoor_c*); static void daZdoor_MoveBGExecute(daZdoor_c*); static void daZdoor_MoveBGDraw(daZdoor_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_ZDoor[12]; extern "C" static void checkPlayerPos__FP9daZdoor_c(); extern "C" static void @@ -188,18 +186,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/obj/d_a_obj_zdoor/executor.cpp b/rel/d/a/obj/d_a_obj_zdoor/executor.cpp index 3ac6dae7e6c..23d15e7cd5c 100644 --- a/rel/d/a/obj/d_a_obj_zdoor/executor.cpp +++ b/rel/d/a/obj/d_a_obj_zdoor/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D401E4[4]; -extern u8 const data_80D401E8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_zdoor/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_zdoor/unknown_translation_unit_ctors.cpp index 3740a41315a..1efb1159cd9 100644 --- a/rel/d/a/obj/d_a_obj_zdoor/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_zdoor/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D401E4[4]; -extern u8 const data_80D401E4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D401E4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D401E4-80D401E8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D401E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zdoor/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_zdoor/unknown_translation_unit_dtors.cpp index 23f4cfca87d..bf0e1c01725 100644 --- a/rel/d/a/obj/d_a_obj_zdoor/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_zdoor/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D401E8[4]; -extern u8 const data_80D401E8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D401E8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D401E8-80D401EC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D401E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp b/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp index 9c64ed44907..95e3d74fb8f 100644 --- a/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp +++ b/rel/d/a/obj/d_a_obj_zrTurara/d_a_obj_zrTurara.cpp @@ -48,12 +48,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -185,9 +185,6 @@ static void daZrTurara_Draw(daZrTurara_c*); static void daZrTurara_Execute(daZrTurara_c*); static void daZrTurara_Delete(daZrTurara_c*); static void daZrTurara_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_zrTurara[12]; extern "C" void __ct__16daZrTurara_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -234,18 +231,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_zrTurara/executor.cpp b/rel/d/a/obj/d_a_obj_zrTurara/executor.cpp index b13b346a0e0..9b66b3c0b42 100644 --- a/rel/d/a/obj/d_a_obj_zrTurara/executor.cpp +++ b/rel/d/a/obj/d_a_obj_zrTurara/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D41588[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_zrTurara/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_zrTurara/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9323576e593..fb46058f1d3 100644 --- a/rel/d/a/obj/d_a_obj_zrTurara/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_zrTurara/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D41594[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D41594-80D4159C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D41594[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D41778-80D41780 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_zrTurara/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_zrTurara/unknown_translation_unit_ctors.cpp index 865c3efd7c9..495ecfdb73d 100644 --- a/rel/d/a/obj/d_a_obj_zrTurara/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_zrTurara/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D41588[2]; -extern void* const data_80D41588[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_zrTurara_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D41588-80D41590 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D41588[2] = { + (void*)__sinit_d_a_obj_zrTurara_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp b/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp index e27aa3a7cf8..572eac6d037 100644 --- a/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp +++ b/rel/d/a/obj/d_a_obj_zrTuraraRock/d_a_obj_zrTuraraRock.cpp @@ -46,12 +46,12 @@ struct daZrTuraRc_HIO_c { /* 80D422D0 */ ~daZrTuraRc_HIO_c(); }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -154,9 +154,6 @@ static void daZrTuraRc_Draw(daZrTuraRc_c*); static void daZrTuraRc_Execute(daZrTuraRc_c*); static void daZrTuraRc_Delete(daZrTuraRc_c*); static void daZrTuraRc_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_zrTuraraRc[12]; extern "C" void __ct__16daZrTuraRc_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -207,16 +204,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_getReverb(int); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/obj/d_a_obj_zrTuraraRock/executor.cpp b/rel/d/a/obj/d_a_obj_zrTuraraRock/executor.cpp index 8a32f347b0e..06972da8fc8 100644 --- a/rel/d/a/obj/d_a_obj_zrTuraraRock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_zrTuraraRock/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D423AC[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_zrTuraraRock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/obj/d_a_obj_zrTuraraRock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2faaf954dca..f2a770e295a 100644 --- a/rel/d/a/obj/d_a_obj_zrTuraraRock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/obj/d_a_obj_zrTuraraRock/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D423B8[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D423B8-80D423C0 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D423B8[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D42598-80D425A0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/obj/d_a_obj_zrTuraraRock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_zrTuraraRock/unknown_translation_unit_ctors.cpp index f217f105a99..88d91d15a41 100644 --- a/rel/d/a/obj/d_a_obj_zrTuraraRock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_zrTuraraRock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D423AC[2]; -extern void* const data_80D423AC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_zrTuraraRock_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D423AC-80D423B4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D423AC[2] = { + (void*)__sinit_d_a_obj_zrTuraraRock_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp b/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp index cf5b2480aa7..fd98d9c02e6 100644 --- a/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp +++ b/rel/d/a/obj/d_a_obj_zraMark/d_a_obj_zraMark.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 8026745C */ void operator+=(csXyz&); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CE38 */ void scaleM(f32, f32, f32); /* 8000CE70 */ void scaleM(cXyz const&); @@ -162,8 +162,6 @@ static bool daObjZraMark_IsDelete(daObjZraMark_c*); static void daObjZraMark_Delete(daObjZraMark_c*); static void daObjZraMark_create(fopAc_ac_c*); static void cLib_getRndValue__template0(int, int); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_ZRA_MARK[12]; extern "C" static void createSolidHeap__FP10fopAc_ac_c(); extern "C" void Create__14daObjZraMark_cFv(); @@ -218,22 +216,6 @@ void dComIfGp_getReverb(int); void dKy_tevstr_init(dKy_tevstr_c*, s8, u8); void cM_rndF(f32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void scaleM__14mDoMtx_stack_cFfff(); extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/d_a_obj_zraMark/executor.cpp b/rel/d/a/obj/d_a_obj_zraMark/executor.cpp index 2495b042b93..775b9134cc1 100644 --- a/rel/d/a/obj/d_a_obj_zraMark/executor.cpp +++ b/rel/d/a/obj/d_a_obj_zraMark/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D43D80[4]; -extern u8 const data_80D43D84[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_zraMark/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_zraMark/unknown_translation_unit_ctors.cpp index ca42acad040..064fcc0bdba 100644 --- a/rel/d/a/obj/d_a_obj_zraMark/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_zraMark/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D43D80[4]; -extern u8 const data_80D43D80[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D43D80[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D43D80-80D43D84 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D43D80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zraMark/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_zraMark/unknown_translation_unit_dtors.cpp index 3885fa8de4c..06f4ba14ba2 100644 --- a/rel/d/a/obj/d_a_obj_zraMark/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_zraMark/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D43D84[4]; -extern u8 const data_80D43D84[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D43D84[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D43D84-80D43D88 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D43D84[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp b/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp index 38b7f6d1469..55ff3864532 100644 --- a/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp +++ b/rel/d/a/obj/d_a_obj_zra_freeze/d_a_obj_zra_freeze.cpp @@ -44,16 +44,16 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -95,8 +95,6 @@ static void daZraFreeze_Execute(daZraFreeze_c*); static bool daZraFreeze_IsDelete(daZraFreeze_c*); static void daZraFreeze_Delete(daZraFreeze_c*); static void daZraFreeze_create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_OBJ_ZRAFREEZE[12]; extern "C" void setBaseMtx__13daZraFreeze_cFv(); extern "C" void chkActorInScreen__13daZraFreeze_cFv(); @@ -131,13 +129,6 @@ void dComIfGs_sense_type_change_Set(s8); void dComIfGs_wolfeye_effect_check(); void dKy_darkworld_check(); void cM_rndF(f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; extern "C" void transM__14mDoMtx_stack_cFfff(); extern "C" void XYZrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/d_a_obj_zra_freeze/executor.cpp b/rel/d/a/obj/d_a_obj_zra_freeze/executor.cpp index 483fbd6df6f..e2fd1babd99 100644 --- a/rel/d/a/obj/d_a_obj_zra_freeze/executor.cpp +++ b/rel/d/a/obj/d_a_obj_zra_freeze/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D44B40[4]; -extern u8 const data_80D44B44[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_zra_freeze/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_zra_freeze/unknown_translation_unit_ctors.cpp index 300cb6eeffb..35f4028b75c 100644 --- a/rel/d/a/obj/d_a_obj_zra_freeze/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_zra_freeze/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D44B40[4]; -extern u8 const data_80D44B40[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D44B40[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D44B40-80D44B44 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D44B40[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zra_freeze/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_zra_freeze/unknown_translation_unit_dtors.cpp index ca0e183ab95..8747a1f66ac 100644 --- a/rel/d/a/obj/d_a_obj_zra_freeze/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_zra_freeze/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D44B44[4]; -extern u8 const data_80D44B44[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D44B44[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D44B44-80D44B48 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D44B44[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp b/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp index 31b1325fb57..05894eccabc 100644 --- a/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp +++ b/rel/d/a/obj/d_a_obj_zra_rock/d_a_obj_zra_rock.cpp @@ -47,12 +47,12 @@ struct dSv_info_c { /* 80035360 */ void isSwitch(int, int) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -139,8 +139,6 @@ static void daObjZraRock_Execute(daObjZraRock_c*); static bool daObjZraRock_IsDelete(daObjZraRock_c*); static void daObjZraRock_Delete(daObjZraRock_c*); static void daObjZraRock_create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_ZraRock[12]; extern "C" void setAttnPos__14daObjZraRock_cFv(); extern "C" void setBaseMtx__14daObjZraRock_cFv(); @@ -177,12 +175,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_Trans(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_ZXYrotS__FPA4_fsss(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); diff --git a/rel/d/a/obj/d_a_obj_zra_rock/executor.cpp b/rel/d/a/obj/d_a_obj_zra_rock/executor.cpp index 7962b66251d..0bb6796d435 100644 --- a/rel/d/a/obj/d_a_obj_zra_rock/executor.cpp +++ b/rel/d/a/obj/d_a_obj_zra_rock/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D455BC[4]; -extern u8 const data_80D455C0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/d_a_obj_zra_rock/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/d_a_obj_zra_rock/unknown_translation_unit_ctors.cpp index 853fec602da..c567755b611 100644 --- a/rel/d/a/obj/d_a_obj_zra_rock/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/d_a_obj_zra_rock/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D455BC[4]; -extern u8 const data_80D455BC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D455BC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D455BC-80D455C0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D455BC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/d_a_obj_zra_rock/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/d_a_obj_zra_rock/unknown_translation_unit_dtors.cpp index bea6c472782..990525bf08b 100644 --- a/rel/d/a/obj/d_a_obj_zra_rock/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/d_a_obj_zra_rock/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D455C0[4]; -extern u8 const data_80D455C0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D455C0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D455C0-80D455C4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D455C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp index c0b6c13689f..cff205303a9 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/d_a_obj_mirror_6pole.cpp @@ -84,9 +84,6 @@ static void daObjMirror6Pole_Delete(daObjMirror6Pole_c*); static void daObjMirror6Pole_Execute(daObjMirror6Pole_c*); static void daObjMirror6Pole_Draw(daObjMirror6Pole_c*); static bool daObjMirror6Pole_IsDelete(daObjMirror6Pole_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_Mirror6Pole[12]; extern "C" void initWait__18daObjMirror6Pole_cFv(); extern "C" void executeWait__18daObjMirror6Pole_cFv(); @@ -118,13 +115,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/executor.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/executor.cpp index 0b32c0e6a8b..00903993eeb 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/executor.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C96504[2]; -extern u8 const data_80C9650C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/unknown_translation_unit_ctors.cpp index 04733ecd3ca..6324cb66760 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C96504[2]; -extern void* const data_80C96504[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_mirror_6pole_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C96504-80C9650C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C96504[2] = { + (void*)__sinit_d_a_obj_mirror_6pole_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/unknown_translation_unit_dtors.cpp index 822814ef946..4136518a1ab 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_6pole/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C9650C[4]; -extern u8 const data_80C9650C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C9650C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C9650C-80C96510 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C9650C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp index 8daab914f03..fae32131c27 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/d_a_obj_mirror_chain.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -26,6 +24,8 @@ struct cXyz { /* 80C9801C */ cXyz(); }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -168,12 +168,6 @@ static void daObjMirrorChain_Execute(daObjMirrorChain_c*); static bool daObjMirrorChain_IsDelete(daObjMirrorChain_c*); static void daObjMirrorChain_Delete(daObjMirrorChain_c*); static void daObjMirrorChain_Create(fopAc_ac_c*); -extern "C" extern u8 const data_80C98060[4]; -extern "C" extern u8 const data_80C98064[4]; -extern "C" extern u8 const data_80C98068[4]; -extern "C" extern u8 const data_80C9806C[4]; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_MirrorChain[12]; extern "C" void draw__22dScissorBegin_packet_cFv(); extern "C" void __dt__4cXyzFv(); @@ -212,17 +206,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__4dBgW[65]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_max; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/executor.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/executor.cpp index fa57bc9ce66..45c1632ad3a 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/executor.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C98020[4]; -extern u8 const data_80C98024[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/unknown_translation_unit_ctors.cpp index 099b430f4f4..7548b439ff6 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C98020[4]; -extern u8 const data_80C98020[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C98020[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C98020-80C98024 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C98020[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/unknown_translation_unit_dtors.cpp index d7ff4e3d3c3..d9cf07839ea 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_chain/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_chain/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C98024[4]; -extern u8 const data_80C98024[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C98024[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C98024-80C98028 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C98024[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp index 1c96ab9ffc3..c760764dcb5 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/d_a_obj_mirror_sand.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -110,8 +110,6 @@ static void daObjMirrorSand_Execute(daObjMirrorSand_c*); static bool daObjMirrorSand_IsDelete(daObjMirrorSand_c*); static void daObjMirrorSand_Delete(daObjMirrorSand_c*); static void daObjMirrorSand_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_MirrorSand[12]; extern "C" static void createSolidHeap__FP10fopAc_ac_c(); extern "C" void __dt__12J3DFrameCtrlFv(); @@ -138,14 +136,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__4dBgW[65]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/executor.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/executor.cpp index 9b50532cbdf..6c36d93dedd 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/executor.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C989D0[4]; -extern u8 const data_80C989D4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/unknown_translation_unit_ctors.cpp index 174a0150cfe..58d60bb16da 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C989D0[4]; -extern u8 const data_80C989D0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C989D0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C989D0-80C989D4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C989D0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/unknown_translation_unit_dtors.cpp index c53836c0b82..52e3293cc39 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_sand/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_sand/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C989D4[4]; -extern u8 const data_80C989D4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C989D4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C989D4-80C989D8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C989D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp index ed3a56ef3ed..664f316994b 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/d_a_obj_mirror_screw.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -118,9 +118,6 @@ static void daObjMirrorScrew_Execute(daObjMirrorScrew_c*); static bool daObjMirrorScrew_IsDelete(daObjMirrorScrew_c*); static void daObjMirrorScrew_Delete(daObjMirrorScrew_c*); static void daObjMirrorScrew_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Obj_MirrorScrew[12]; extern "C" void initWait__18daObjMirrorScrew_cFv(); extern "C" void executeWait__18daObjMirrorScrew_cFv(); @@ -158,14 +155,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dBgS_MoveBGProc_TypicalRotY(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*); void cLib_chaseF(f32*, f32, f32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/executor.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/executor.cpp index 7813a8609d9..bcfce1b85fa 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/executor.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80C99750[2]; -extern u8 const data_80C99758[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/unknown_translation_unit_ctors.cpp index 90c4076ebdc..22b85b92624 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80C99750[2]; -extern void* const data_80C99750[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_obj_mirror_screw_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C99750-80C99758 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80C99750[2] = { + (void*)__sinit_d_a_obj_mirror_screw_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/unknown_translation_unit_dtors.cpp index c1016331617..f9a95f037cb 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_screw/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_screw/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C99758[4]; -extern u8 const data_80C99758[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C99758[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C99758-80C9975C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C99758[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp index 5b3407eafba..a26f360dad3 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_table/d_a_obj_mirror_table.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CCC8 */ void push(); /* 8000CD14 */ void pop(); @@ -164,8 +164,6 @@ static bool daObjMirrorTable_IsDelete(daObjMirrorTable_c*); static void daObjMirrorTable_Delete(daObjMirrorTable_c*); static void daObjMirrorTable_Create(fopAc_ac_c*); static void cLib_calcTimer__template0(s8*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Obj_MirrorTable[12]; extern "C" static void createSolidHeap__FP10fopAc_ac_c(); extern "C" void createHeap__18daObjMirrorTable_cFv(); @@ -200,15 +198,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__4dBgW[65]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void push__14mDoMtx_stack_cFv(); extern "C" void pop__14mDoMtx_stack_cFv(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_table/executor.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_table/executor.cpp index 51a3928fa72..5559e1478c4 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_table/executor.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_table/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80C9B23C[4]; -extern u8 const data_80C9B240[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_table/unknown_translation_unit_ctors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_table/unknown_translation_unit_ctors.cpp index c09af002dd7..515a85dd89a 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_table/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_table/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C9B23C[4]; -extern u8 const data_80C9B23C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80C9B23C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80C9B23C-80C9B240 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80C9B23C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/obj/mirror/d_a_obj_mirror_table/unknown_translation_unit_dtors.cpp b/rel/d/a/obj/mirror/d_a_obj_mirror_table/unknown_translation_unit_dtors.cpp index 0f983d8cb52..8124a8deb17 100644 --- a/rel/d/a/obj/mirror/d_a_obj_mirror_table/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/obj/mirror/d_a_obj_mirror_table/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80C9B240[4]; -extern u8 const data_80C9B240[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80C9B240[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80C9B240-80C9B244 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80C9B240[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp b/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp index ffd6c33d6dd..ba1b6c6ea23 100644 --- a/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.cpp @@ -149,8 +149,6 @@ static void daTagLv6Gate_Execute(daTagLv6Gate_c*); static void daTagLv6Gate_Draw(daTagLv6Gate_c*); static bool daTagLv6Gate_IsDelete(daTagLv6Gate_c*); static void daTagLv6Gate_Delete(daTagLv6Gate_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Tag_Lv6Gate[12]; extern "C" static void createSolidHeap__FP10fopAc_ac_c(); extern "C" void createHeap__14daTagLv6Gate_cFv(); @@ -187,14 +185,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__4dBgW[65]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void push__14mDoMtx_stack_cFv(); diff --git a/rel/d/a/tag/d_a_tag_Lv6Gate/executor.cpp b/rel/d/a/tag/d_a_tag_Lv6Gate/executor.cpp index 3f52c2c3dd8..dae2cd37229 100644 --- a/rel/d/a/tag/d_a_tag_Lv6Gate/executor.cpp +++ b/rel/d/a/tag/d_a_tag_Lv6Gate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D50900[4]; -extern u8 const data_80D50904[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_Lv6Gate/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_Lv6Gate/unknown_translation_unit_ctors.cpp index 4f0101104f1..e70ff042e34 100644 --- a/rel/d/a/tag/d_a_tag_Lv6Gate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_Lv6Gate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D50900[4]; -extern u8 const data_80D50900[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D50900[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D50900-80D50904 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D50900[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_Lv6Gate/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_Lv6Gate/unknown_translation_unit_dtors.cpp index 3ff2d17d21d..050f7c4aa84 100644 --- a/rel/d/a/tag/d_a_tag_Lv6Gate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_Lv6Gate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D50904[4]; -extern u8 const data_80D50904[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D50904[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D50904-80D50908 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D50904[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp b/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp index 23fcf9274f8..af78110e998 100644 --- a/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.cpp @@ -13,12 +13,12 @@ struct request_of_phase_process_class {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -112,9 +112,6 @@ static void daTagLv7Gate_Execute(daTagLv7Gate_c*); static void daTagLv7Gate_Draw(daTagLv7Gate_c*); static bool daTagLv7Gate_IsDelete(daTagLv7Gate_c*); static void daTagLv7Gate_Delete(daTagLv7Gate_c*); -extern "C" extern u32 const lit_4047; -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Tag_Lv7Gate[12]; extern "C" static void createSolidHeap__FP10fopAc_ac_c(); extern "C" void __dt__12J3DFrameCtrlFv(); @@ -150,14 +147,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/tag/d_a_tag_Lv7Gate/executor.cpp b/rel/d/a/tag/d_a_tag_Lv7Gate/executor.cpp index abc1825e596..1ce40001208 100644 --- a/rel/d/a/tag/d_a_tag_Lv7Gate/executor.cpp +++ b/rel/d/a/tag/d_a_tag_Lv7Gate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D51ACC[4]; -extern u8 const data_80D51AD0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_Lv7Gate/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_Lv7Gate/unknown_translation_unit_ctors.cpp index 8ce4de063d1..fc9a3c428d9 100644 --- a/rel/d/a/tag/d_a_tag_Lv7Gate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_Lv7Gate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D51ACC[4]; -extern u8 const data_80D51ACC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D51ACC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D51ACC-80D51AD0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D51ACC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_Lv7Gate/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_Lv7Gate/unknown_translation_unit_dtors.cpp index 9d7a56a764c..2e15955e36c 100644 --- a/rel/d/a/tag/d_a_tag_Lv7Gate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_Lv7Gate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D51AD0[4]; -extern u8 const data_80D51AD0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D51AD0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D51AD0-80D51AD4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D51AD0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp b/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp index 5520dd447f7..facdb7779ee 100644 --- a/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp +++ b/rel/d/a/tag/d_a_tag_Lv8Gate/d_a_tag_Lv8Gate.cpp @@ -106,8 +106,6 @@ static void daTagLv8Gate_Execute(daTagLv8Gate_c*); static void daTagLv8Gate_Draw(daTagLv8Gate_c*); static bool daTagLv8Gate_IsDelete(daTagLv8Gate_c*); static void daTagLv8Gate_Delete(daTagLv8Gate_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Tag_Lv8Gate[12]; extern "C" static void createSolidHeap__FP10fopAc_ac_c(); extern "C" void createHeap__14daTagLv8Gate_cFv(); @@ -141,14 +139,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dEv_noFinishSkipProc(void*, int); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/tag/d_a_tag_Lv8Gate/executor.cpp b/rel/d/a/tag/d_a_tag_Lv8Gate/executor.cpp index bf49784bfdf..b70eda6578c 100644 --- a/rel/d/a/tag/d_a_tag_Lv8Gate/executor.cpp +++ b/rel/d/a/tag/d_a_tag_Lv8Gate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D524C4[4]; -extern u8 const data_80D524C8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_Lv8Gate/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_Lv8Gate/unknown_translation_unit_ctors.cpp index e81902b79a9..d9eef10638c 100644 --- a/rel/d/a/tag/d_a_tag_Lv8Gate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_Lv8Gate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D524C4[4]; -extern u8 const data_80D524C4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D524C4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D524C4-80D524C8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D524C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_Lv8Gate/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_Lv8Gate/unknown_translation_unit_dtors.cpp index a87511c4985..b6152d46fe0 100644 --- a/rel/d/a/tag/d_a_tag_Lv8Gate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_Lv8Gate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D524C8[4]; -extern u8 const data_80D524C8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D524C8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D524C8-80D524CC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D524C8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp index 3c2767bdbe8..227dbbd8e98 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp @@ -22,13 +22,13 @@ struct mDoMtx_stack_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -105,10 +105,10 @@ struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -164,8 +164,6 @@ static void daTagTWGate_Delete(daTagTWGate_c*); static void daTagTWGate_Execute(daTagTWGate_c*); static void daTagTWGate_Draw(daTagTWGate_c*); static bool daTagTWGate_IsDelete(daTagTWGate_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Tag_TWGate[12]; extern "C" void initWait__13daTagTWGate_cFv(); extern "C" void executeWait__13daTagTWGate_cFv(); @@ -222,12 +220,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void dComIfGp_setNextStage(char const*, s16, s8, s8); void dEv_noFinishSkipProc(void*, int); void* operator new(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/tag/d_a_tag_TWgate/executor.cpp b/rel/d/a/tag/d_a_tag_TWgate/executor.cpp index 3d5e754f2fe..ff5461cb4ff 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/executor.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D557A0[2]; -extern u8 const data_80D557A8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_TWgate/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_TWgate/unknown_translation_unit_ctors.cpp index f3f09097cd0..e48c3c00d6f 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D557A0[2]; -extern void* const data_80D557A0[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tag_TWgate_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D557A0-80D557A8 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D557A0[2] = { + (void*)__sinit_d_a_tag_TWgate_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/tag/d_a_tag_TWgate/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_TWgate/unknown_translation_unit_dtors.cpp index caddde20a01..36b4ced0c74 100644 --- a/rel/d/a/tag/d_a_tag_TWgate/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_TWgate/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D557A8[4]; -extern u8 const data_80D557A8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D557A8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D557A8-80D557AC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D557A8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp index 20486d4e2c6..1afe0edc2bf 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp +++ b/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp @@ -30,7 +30,6 @@ static void daTagAJnot_Create(fopAc_ac_c*); static void daTagAJnot_Delete(daTagAJnot_c*); static void daTagAJnot_Execute(daTagAJnot_c*); static bool daTagAJnot_Draw(daTagAJnot_c*); -extern "C" extern void* g_profile_Tag_AJnot[12]; extern "C" void create__12daTagAJnot_cFv(); extern "C" static void daTagAJnot_Create__FP10fopAc_ac_c(); @@ -46,9 +45,6 @@ extern "C" extern void* g_profile_Tag_AJnot[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_ajnot/executor.cpp b/rel/d/a/tag/d_a_tag_ajnot/executor.cpp index b3d1ab56f53..217f6e1845e 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/executor.cpp +++ b/rel/d/a/tag/d_a_tag_ajnot/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A2878[4]; -extern u8 const data_805A287C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_ajnot/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_ajnot/unknown_translation_unit_ctors.cpp index 76d7b24570c..90f89c71a72 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_ajnot/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A2878[4]; -extern u8 const data_805A2878[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A2878[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A2878-805A287C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A2878[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_ajnot/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_ajnot/unknown_translation_unit_dtors.cpp index f6c07a6a278..6a978bbbe43 100644 --- a/rel/d/a/tag/d_a_tag_ajnot/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_ajnot/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A287C[4]; -extern u8 const data_805A287C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A287C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A287C-805A2880 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A287C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp b/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp index 3bf3a8c0b9e..42f75ded1eb 100644 --- a/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp +++ b/rel/d/a/tag/d_a_tag_allmato/d_a_tag_allmato.cpp @@ -114,7 +114,6 @@ static void daTag_AllMato_Delete(void*); static void daTag_AllMato_Execute(void*); static void daTag_AllMato_Draw(void*); static bool daTag_AllMato_IsDelete(void*); -extern "C" extern void* g_profile_TAG_ALLMATO[12]; extern "C" void create__15daTag_AllMato_cFv(); extern "C" void __dt__4cXyzFv(); @@ -167,12 +166,6 @@ void dCam_getBody(); void cM3d_Cross_LinSph(cM3dGLin const*, cM3dGSph const*, Vec*); void cM3d_Cross_CylLin(cM3dGCyl const*, cM3dGLin const*, Vec*, Vec*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_allmato/executor.cpp b/rel/d/a/tag/d_a_tag_allmato/executor.cpp index 646f9839dbb..839520e4e1b 100644 --- a/rel/d/a/tag/d_a_tag_allmato/executor.cpp +++ b/rel/d/a/tag/d_a_tag_allmato/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804896DC[4]; -extern u8 const data_804896E0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_allmato/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_allmato/unknown_translation_unit_ctors.cpp index 803061415ac..1b4bb6a5d70 100644 --- a/rel/d/a/tag/d_a_tag_allmato/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_allmato/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804896DC[4]; -extern u8 const data_804896DC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804896DC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804896DC-804896E0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804896DC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_allmato/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_allmato/unknown_translation_unit_dtors.cpp index b8c832db115..fedc1cc69d1 100644 --- a/rel/d/a/tag/d_a_tag_allmato/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_allmato/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804896E0[4]; -extern u8 const data_804896E0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804896E0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804896E0-804896E4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804896E0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp b/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp index bb5c56857b9..7d5ab458082 100644 --- a/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp +++ b/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.cpp @@ -24,7 +24,6 @@ struct daTagArena_c {}; static void daTagArena_Create(fopAc_ac_c*); static void daTagArena_Delete(daTagArena_c*); -extern "C" extern void* g_profile_Tag_Arena[12]; extern "C" static void daTagArena_Create__FP10fopAc_ac_c(); extern "C" static void daTagArena_Delete__FP12daTagArena_c(); @@ -34,9 +33,6 @@ extern "C" extern void* g_profile_Tag_Arena[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; diff --git a/rel/d/a/tag/d_a_tag_arena/executor.cpp b/rel/d/a/tag/d_a_tag_arena/executor.cpp index 839c5615161..7afe4d4c7ee 100644 --- a/rel/d/a/tag/d_a_tag_arena/executor.cpp +++ b/rel/d/a/tag/d_a_tag_arena/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D55D58[4]; -extern u8 const data_80D55D5C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_arena/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_arena/unknown_translation_unit_ctors.cpp index 097f189c2ed..15a6fbbbd5a 100644 --- a/rel/d/a/tag/d_a_tag_arena/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_arena/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D55D58[4]; -extern u8 const data_80D55D58[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D55D58[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D55D58-80D55D5C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D55D58[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_arena/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_arena/unknown_translation_unit_dtors.cpp index 116cb8f4475..d015acb5443 100644 --- a/rel/d/a/tag/d_a_tag_arena/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_arena/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D55D5C[4]; -extern u8 const data_80D55D5C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D55D5C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D55D5C-80D55D60 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D55D5C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp b/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp index a88eb393d1a..9df7cf61ce2 100644 --- a/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp +++ b/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.cpp @@ -26,7 +26,6 @@ static void daTagAssist_Create(fopAc_ac_c*); static void daTagAssist_Execute(daTagAssist_c*); static bool daTagAssist_IsDelete(daTagAssist_c*); static void daTagAssist_Delete(daTagAssist_c*); -extern "C" extern void* g_profile_Tag_Assist[12]; extern "C" static void daTagAssist_Create__FP10fopAc_ac_c(); extern "C" static void daTagAssist_Execute__FP13daTagAssist_c(); @@ -39,9 +38,6 @@ extern "C" extern void* g_profile_Tag_Assist[12]; // void fopAcM_searchActorDistanceXZ(fopAc_ac_c const*, fopAc_ac_c const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_assistance/executor.cpp b/rel/d/a/tag/d_a_tag_assistance/executor.cpp index f0e436f5025..bc056938321 100644 --- a/rel/d/a/tag/d_a_tag_assistance/executor.cpp +++ b/rel/d/a/tag/d_a_tag_assistance/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D55F00[4]; -extern u8 const data_80D55F04[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_assistance/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_assistance/unknown_translation_unit_ctors.cpp index 533ba85cc77..a0d5ddfa2e5 100644 --- a/rel/d/a/tag/d_a_tag_assistance/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_assistance/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D55F00[4]; -extern u8 const data_80D55F00[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D55F00[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D55F00-80D55F04 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D55F00[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_assistance/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_assistance/unknown_translation_unit_dtors.cpp index 3f17da1ea06..d720a616d9c 100644 --- a/rel/d/a/tag/d_a_tag_assistance/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_assistance/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D55F04[4]; -extern u8 const data_80D55F04[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D55F04[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D55F04-80D55F08 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D55F04[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp b/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp index 15dc6fd302f..44595cd4003 100644 --- a/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp +++ b/rel/d/a/tag/d_a_tag_attack_item/d_a_tag_attack_item.cpp @@ -11,12 +11,12 @@ // Types: // +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; - struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CF44 */ void ZXYrotM(csXyz const&); @@ -100,7 +100,6 @@ struct cCcD_GStts { static void daTagAtkItem_Execute(daTagAtkItem_c*); static void daTagAtkItem_Delete(daTagAtkItem_c*); static void daTagAtkItem_Create(daTagAtkItem_c*); -extern "C" extern void* g_profile_Tag_AttackItem[12]; extern "C" void setBaseMtx__14daTagAtkItem_cFv(); extern "C" void Create__14daTagAtkItem_cFv(); @@ -138,15 +137,6 @@ void fopAcM_createItemFromTable(cXyz const*, int, int, int, csXyz const*, int, c f32*, bool); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); diff --git a/rel/d/a/tag/d_a_tag_attack_item/executor.cpp b/rel/d/a/tag/d_a_tag_attack_item/executor.cpp index ab4e4653a28..7086e590c36 100644 --- a/rel/d/a/tag/d_a_tag_attack_item/executor.cpp +++ b/rel/d/a/tag/d_a_tag_attack_item/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A32C0[4]; -extern u8 const data_805A32C4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_attack_item/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_attack_item/unknown_translation_unit_ctors.cpp index 118da8ccdc6..7c471614e26 100644 --- a/rel/d/a/tag/d_a_tag_attack_item/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_attack_item/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A32C0[4]; -extern u8 const data_805A32C0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A32C0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A32C0-805A32C4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A32C0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_attack_item/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_attack_item/unknown_translation_unit_dtors.cpp index 870b6e8e0c3..f6aca13a327 100644 --- a/rel/d/a/tag/d_a_tag_attack_item/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_attack_item/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A32C4[4]; -extern u8 const data_805A32C4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A32C4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A32C4-805A32C8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A32C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp index 688d3ee6ebb..9b4d40122a9 100644 --- a/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp +++ b/rel/d/a/tag/d_a_tag_attention/d_a_tag_attention.cpp @@ -41,7 +41,6 @@ static void daAttp_Draw(daAttp_c*); static void daAttp_Execute(daAttp_c*); static void daAttp_Delete(daAttp_c*); static void daAttp_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_Attp[12]; extern "C" void Create__8daAttp_cFv(); extern "C" void create__8daAttp_cFv(); @@ -59,10 +58,6 @@ extern "C" extern void* g_profile_Tag_Attp[12]; // void mDoMtx_YrotS(f32 (*)[4], s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_attention/executor.cpp b/rel/d/a/tag/d_a_tag_attention/executor.cpp index 2d5f5d7f7c0..648ed0b3e3e 100644 --- a/rel/d/a/tag/d_a_tag_attention/executor.cpp +++ b/rel/d/a/tag/d_a_tag_attention/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_804D571C[4]; -extern u8 const data_804D5720[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_attention/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_attention/unknown_translation_unit_ctors.cpp index 64ff1e66669..97db83d8d47 100644 --- a/rel/d/a/tag/d_a_tag_attention/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_attention/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D571C[4]; -extern u8 const data_804D571C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_804D571C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 804D571C-804D5720 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_804D571C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_attention/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_attention/unknown_translation_unit_dtors.cpp index 189284e761c..43c416b0790 100644 --- a/rel/d/a/tag/d_a_tag_attention/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_attention/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_804D5720[4]; -extern u8 const data_804D5720[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_804D5720[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 804D5720-804D5724 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_804D5720[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp b/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp index 2270fab9d83..6cdacffdaf4 100644 --- a/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp +++ b/rel/d/a/tag/d_a_tag_bottle_item/d_a_tag_bottle_item.cpp @@ -57,7 +57,6 @@ static void daTag_BottleItem_Delete(void*); static void daTag_BottleItem_Execute(void*); static void daTag_BottleItem_Draw(void*); static bool daTag_BottleItem_IsDelete(void*); -extern "C" extern void* g_profile_TAG_BTLITM[12]; extern "C" void create__18daTag_BottleItem_cFv(); extern "C" bool Delete__18daTag_BottleItem_cFv(); @@ -88,9 +87,6 @@ extern "C" extern void* g_profile_TAG_BTLITM[12]; void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void isBottleItem(u8); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_bottle_item/executor.cpp b/rel/d/a/tag/d_a_tag_bottle_item/executor.cpp index e79aa84100f..6c70193c408 100644 --- a/rel/d/a/tag/d_a_tag_bottle_item/executor.cpp +++ b/rel/d/a/tag/d_a_tag_bottle_item/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D56650[4]; -extern u8 const data_80D56654[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_bottle_item/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_bottle_item/unknown_translation_unit_ctors.cpp index a89dca03e22..7cf75d5bc11 100644 --- a/rel/d/a/tag/d_a_tag_bottle_item/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_bottle_item/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D56650[4]; -extern u8 const data_80D56650[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D56650[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D56650-80D56654 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D56650[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_bottle_item/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_bottle_item/unknown_translation_unit_dtors.cpp index 00ef72bc4c6..888b7867dc3 100644 --- a/rel/d/a/tag/d_a_tag_bottle_item/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_bottle_item/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D56654[4]; -extern u8 const data_80D56654[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D56654[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D56654-80D56658 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D56654[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp b/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp index a077a9ba43b..10c992f7470 100644 --- a/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp +++ b/rel/d/a/tag/d_a_tag_camera/d_a_tag_camera.cpp @@ -59,8 +59,6 @@ static void daTag_Cam_Execute(daTag_Cam_c*); static bool daTag_Cam_IsDelete(daTag_Cam_c*); static void daTag_Cam_Delete(daTag_Cam_c*); static void daTag_Cam_Create(fopAc_ac_c*); -extern "C" extern void* const lit_4358[22]; -extern "C" extern void* g_profile_TAG_CAMERA[12]; extern "C" static bool func_80489A98(); extern "C" static void func_80489AA0(); @@ -107,12 +105,6 @@ extern "C" extern void* g_profile_TAG_CAMERA[12]; void mDoMtx_YrotM(f32 (*)[4], s16); void dCam_getBody(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); diff --git a/rel/d/a/tag/d_a_tag_camera/executor.cpp b/rel/d/a/tag/d_a_tag_camera/executor.cpp index b590fd0abbb..f42c887af12 100644 --- a/rel/d/a/tag/d_a_tag_camera/executor.cpp +++ b/rel/d/a/tag/d_a_tag_camera/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8048A588[4]; -extern u8 const data_8048A58C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_camera/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_camera/unknown_translation_unit_ctors.cpp index 6402f83e1c5..6bd3e650d88 100644 --- a/rel/d/a/tag/d_a_tag_camera/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_camera/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048A588[4]; -extern u8 const data_8048A588[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8048A588[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048A588-8048A58C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8048A588[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_camera/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_camera/unknown_translation_unit_dtors.cpp index 789610d0ad8..1b811b46c1c 100644 --- a/rel/d/a/tag/d_a_tag_camera/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_camera/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048A58C[4]; -extern u8 const data_8048A58C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048A58C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048A58C-8048A590 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048A58C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp b/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp index 364b5983495..4d40315d371 100644 --- a/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp +++ b/rel/d/a/tag/d_a_tag_chgrestart/d_a_tag_chgrestart.cpp @@ -47,7 +47,6 @@ struct dStage_roomControl_c { static void daTagChgRestart_Execute(daTagChgRestart_c*); static void daTagChgRestart_Delete(daTagChgRestart_c*); static void daTagChgRestart_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_ChgRestart[12]; extern "C" void Create__17daTagChgRestart_cFv(); extern "C" void create__17daTagChgRestart_cFv(); @@ -66,10 +65,6 @@ extern "C" extern void* g_profile_Tag_ChgRestart[12]; void mDoMtx_YrotS(f32 (*)[4], s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_chgrestart/executor.cpp b/rel/d/a/tag/d_a_tag_chgrestart/executor.cpp index 3b44401bab2..8cac76ea622 100644 --- a/rel/d/a/tag/d_a_tag_chgrestart/executor.cpp +++ b/rel/d/a/tag/d_a_tag_chgrestart/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D56AEC[4]; -extern u8 const data_80D56AF0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_chgrestart/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_chgrestart/unknown_translation_unit_ctors.cpp index add4804f7bc..067eea23c4a 100644 --- a/rel/d/a/tag/d_a_tag_chgrestart/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_chgrestart/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D56AEC[4]; -extern u8 const data_80D56AEC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D56AEC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D56AEC-80D56AF0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D56AEC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_chgrestart/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_chgrestart/unknown_translation_unit_dtors.cpp index 43e81afa29a..c04672d7618 100644 --- a/rel/d/a/tag/d_a_tag_chgrestart/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_chgrestart/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D56AF0[4]; -extern u8 const data_80D56AF0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D56AF0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D56AF0-80D56AF4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D56AF0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp index bcd2f038287..f74d92a4aac 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.cpp @@ -39,7 +39,6 @@ static void daTag_Chk_Execute(daTag_Chk_c*); static bool daTag_Chk_IsDelete(daTag_Chk_c*); static void daTag_Chk_Delete(daTag_Chk_c*); static void daTag_Chk_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_TAG_CHKPOINT[12]; extern "C" void execute__11daTag_Chk_cFv(); extern "C" static bool daTag_Chk_Draw__FP11daTag_Chk_c(); @@ -53,12 +52,6 @@ extern "C" extern void* g_profile_TAG_CHKPOINT[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); extern "C" void isSwitch__10dSv_info_cCFii(); diff --git a/rel/d/a/tag/d_a_tag_chkpoint/executor.cpp b/rel/d/a/tag/d_a_tag_chkpoint/executor.cpp index 1ba4f82bfc2..d41e2773116 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/executor.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8048AC20[4]; -extern u8 const data_8048AC24[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_chkpoint/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_chkpoint/unknown_translation_unit_ctors.cpp index 40fbc6ec641..d4d9ac3ccf6 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048AC20[4]; -extern u8 const data_8048AC20[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8048AC20[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048AC20-8048AC24 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8048AC20[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_chkpoint/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_chkpoint/unknown_translation_unit_dtors.cpp index eb639ac3020..23abb1fc603 100644 --- a/rel/d/a/tag/d_a_tag_chkpoint/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_chkpoint/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048AC24[4]; -extern u8 const data_8048AC24[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048AC24[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048AC24-8048AC28 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048AC24[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp b/rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp index c5d07b218ab..51e2a00cc3f 100644 --- a/rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_cstasw/d_a_tag_CstaSw.cpp @@ -54,7 +54,6 @@ static void daTagCstaSw_Draw(daTagCstaSw_c*); static void daTagCstaSw_Execute(daTagCstaSw_c*); static void daTagCstaSw_Delete(daTagCstaSw_c*); static void daTagCstaSw_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_CstaSw[12]; extern "C" void __ct__17daTagCstaSw_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -81,11 +80,6 @@ void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); void fopAc_IsActor(void*); void fopAcIt_Judge(void* (*)(void*, void*), void*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_cstasw/executor.cpp b/rel/d/a/tag/d_a_tag_cstasw/executor.cpp index 19181b10a03..d3dd432ef05 100644 --- a/rel/d/a/tag/d_a_tag_cstasw/executor.cpp +++ b/rel/d/a/tag/d_a_tag_cstasw/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805A2518[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_cstasw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/tag/d_a_tag_cstasw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 9c6b317ef69..8dea771e13d 100644 --- a/rel/d/a/tag/d_a_tag_cstasw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/tag/d_a_tag_cstasw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805A2524[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805A2524-805A252C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805A2524[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805A25B8-805A25C0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/tag/d_a_tag_cstasw/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_cstasw/unknown_translation_unit_ctors.cpp index 6024a5a22d6..16ac8be55c4 100644 --- a/rel/d/a/tag/d_a_tag_cstasw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_cstasw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805A2518[2]; -extern void* const data_805A2518[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tag_CstaSw_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A2518-805A2520 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805A2518[2] = { + (void*)__sinit_d_a_tag_CstaSw_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp b/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp index 68d595606da..227610c2cd3 100644 --- a/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp +++ b/rel/d/a/tag/d_a_tag_csw/d_a_tag_csw.cpp @@ -54,14 +54,14 @@ struct dSv_info_c { /* 80035590 */ void isItem(int, int) const; }; -struct dKy_tevstr_c {}; - -struct J3DModelData {}; - struct cXyz { /* 80266EF4 */ void normalize(); }; +struct dKy_tevstr_c {}; + +struct J3DModelData {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -170,11 +170,6 @@ static void daTagCsw_Execute(daTagCsw_c*); static bool daTagCsw_IsDelete(daTagCsw_c*); static void daTagCsw_Delete(daTagCsw_c*); static void daTagCsw_Create(fopAc_ac_c*); -extern "C" extern u8 const l_brk_idx[8]; -extern "C" extern u8 const l_dbz_idx[8]; -extern "C" extern char const* const stringBase0; -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_TAG_CSW[12]; extern "C" void __dt__10daTagCsw_cFv(); extern "C" void setMtx__10daTagCsw_cFv(); @@ -220,20 +215,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/tag/d_a_tag_csw/executor.cpp b/rel/d/a/tag/d_a_tag_csw/executor.cpp index 7055cf8a6ea..3af548e73fe 100644 --- a/rel/d/a/tag/d_a_tag_csw/executor.cpp +++ b/rel/d/a/tag/d_a_tag_csw/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D585B0[4]; -extern u8 const data_80D585B4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_csw/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_csw/unknown_translation_unit_ctors.cpp index df7f889acfd..e0a6e1714a4 100644 --- a/rel/d/a/tag/d_a_tag_csw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_csw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D585B0[4]; -extern u8 const data_80D585B0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D585B0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D585B0-80D585B4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D585B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_csw/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_csw/unknown_translation_unit_dtors.cpp index fad26ca619c..7e84f2fbecf 100644 --- a/rel/d/a/tag/d_a_tag_csw/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_csw/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D585B4[4]; -extern u8 const data_80D585B4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D585B4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D585B4-80D585B8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D585B4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp b/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp index f9c5ef08e8d..02c508fa166 100644 --- a/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp +++ b/rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp @@ -24,7 +24,6 @@ struct daTagEscape_c {}; static void daTagEscape_Create(fopAc_ac_c*); static void daTagEscape_Delete(daTagEscape_c*); -extern "C" extern void* g_profile_Tag_Escape[12]; extern "C" static void daTagEscape_Create__FP10fopAc_ac_c(); extern "C" static void daTagEscape_Delete__FP13daTagEscape_c(); @@ -34,9 +33,6 @@ extern "C" extern void* g_profile_Tag_Escape[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; diff --git a/rel/d/a/tag/d_a_tag_escape/executor.cpp b/rel/d/a/tag/d_a_tag_escape/executor.cpp index 04210b877a2..6e9b65119ec 100644 --- a/rel/d/a/tag/d_a_tag_escape/executor.cpp +++ b/rel/d/a/tag/d_a_tag_escape/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D58858[4]; -extern u8 const data_80D5885C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_escape/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_escape/unknown_translation_unit_ctors.cpp index d76e8db7afb..4df42bf9421 100644 --- a/rel/d/a/tag/d_a_tag_escape/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_escape/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D58858[4]; -extern u8 const data_80D58858[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D58858[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D58858-80D5885C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D58858[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_escape/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_escape/unknown_translation_unit_dtors.cpp index a605736f43d..f19b74b0022 100644 --- a/rel/d/a/tag/d_a_tag_escape/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_escape/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5885C[4]; -extern u8 const data_80D5885C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5885C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5885C-80D58860 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5885C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp b/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp index dbd04c8b38c..5bdef767c0a 100644 --- a/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp +++ b/rel/d/a/tag/d_a_tag_event/d_a_tag_event.cpp @@ -77,8 +77,6 @@ static void daTag_Event_Execute(daTag_Event_c*); static bool daTag_Event_IsDelete(daTag_Event_c*); static void daTag_Event_Delete(daTag_Event_c*); static void daTag_Event_Create(fopAc_ac_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_TAG_EVENT[12]; extern "C" static void daTag_getBk__FUl(); extern "C" void getEventNo__13daTag_Event_cFv(); @@ -118,11 +116,6 @@ extern "C" extern void* g_profile_TAG_EVENT[12]; void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); void fopAcM_searchFromName(char const*, u32, u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_event/executor.cpp b/rel/d/a/tag/d_a_tag_event/executor.cpp index b351a7f9c7d..069c7765aa6 100644 --- a/rel/d/a/tag/d_a_tag_event/executor.cpp +++ b/rel/d/a/tag/d_a_tag_event/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8048B828[4]; -extern u8 const data_8048B82C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_event/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_event/unknown_translation_unit_ctors.cpp index e69e5dac8d7..6b5e6732a62 100644 --- a/rel/d/a/tag/d_a_tag_event/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_event/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048B828[4]; -extern u8 const data_8048B828[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8048B828[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048B828-8048B82C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8048B828[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_event/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_event/unknown_translation_unit_dtors.cpp index 13a6f694e07..1b351de21e8 100644 --- a/rel/d/a/tag/d_a_tag_event/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_event/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048B82C[4]; -extern u8 const data_8048B82C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048B82C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048B82C-8048B830 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048B82C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp index 336da48fafd..a146c239e0e 100644 --- a/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp +++ b/rel/d/a/tag/d_a_tag_evt/d_a_tag_evt.cpp @@ -82,7 +82,6 @@ static void daTag_Evt_Execute(void*); static void daTag_Evt_Draw(void*); static bool daTag_Evt_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern void* g_profile_TAG_EVT[12]; extern "C" void create__11daTag_Evt_cFv(); extern "C" void destroy__11daTag_Evt_cFv(); @@ -113,12 +112,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void daNpcMsg_setEvtNum(u8); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_evt/executor.cpp b/rel/d/a/tag/d_a_tag_evt/executor.cpp index a333b002294..781360ceea6 100644 --- a/rel/d/a/tag/d_a_tag_evt/executor.cpp +++ b/rel/d/a/tag/d_a_tag_evt/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8048C390[4]; -extern u8 const data_8048C394[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_evt/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_evt/unknown_translation_unit_ctors.cpp index 0079e7a0706..30e6c2c9196 100644 --- a/rel/d/a/tag/d_a_tag_evt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_evt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048C390[4]; -extern u8 const data_8048C390[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8048C390[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048C390-8048C394 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8048C390[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_evt/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_evt/unknown_translation_unit_dtors.cpp index def24583279..f87b16be56d 100644 --- a/rel/d/a/tag/d_a_tag_evt/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_evt/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048C394[4]; -extern u8 const data_8048C394[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048C394[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048C394-8048C398 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048C394[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp index b045523149c..b0e11ab7e70 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.cpp @@ -47,10 +47,6 @@ static void daTag_EvtArea_Delete(void*); static void daTag_EvtArea_Execute(void*); static void daTag_EvtArea_Draw(void*); static bool daTag_EvtArea_IsDelete(void*); -extern "C" extern u32 const lit_3854; -extern "C" extern u32 const lit_3855; -extern "C" extern u32 const lit_3856; -extern "C" extern void* g_profile_TAG_EVTAREA[12]; extern "C" void create__15daTag_EvtArea_cFv(); extern "C" bool Delete__15daTag_EvtArea_cFv(); @@ -79,11 +75,6 @@ void fopAcM_delete(fopAc_ac_c*); void daNpcT_chkPointInArea(cXyz, cXyz, cXyz, s16, int); void daNpcT_chkEvtBit(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_evtarea/executor.cpp b/rel/d/a/tag/d_a_tag_evtarea/executor.cpp index b146d3cdfb1..39d9b957540 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/executor.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8048CDC8[4]; -extern u8 const data_8048CDCC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_evtarea/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_evtarea/unknown_translation_unit_ctors.cpp index 10966a5fccc..221509f0114 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048CDC8[4]; -extern u8 const data_8048CDC8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8048CDC8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048CDC8-8048CDCC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8048CDC8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_evtarea/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_evtarea/unknown_translation_unit_dtors.cpp index 8ac847c620a..60c518d968f 100644 --- a/rel/d/a/tag/d_a_tag_evtarea/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_evtarea/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048CDCC[4]; -extern u8 const data_8048CDCC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048CDCC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048CDCC-8048CDD0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048CDCC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp index 1b2d803a17d..5b0720e6b3a 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/d_a_tag_evtmsg.cpp @@ -71,8 +71,6 @@ static void daTag_EvtMsg_Execute(void*); static void daTag_EvtMsg_Draw(void*); static bool daTag_EvtMsg_IsDelete(void*); static void cLib_calcTimer__template0(int*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_TAG_EVTMSG[12]; extern "C" void create__14daTag_EvtMsg_cFv(); extern "C" bool Delete__14daTag_EvtMsg_cFv(); @@ -109,11 +107,6 @@ void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); void daNpcF_chkEvtBit(u32); void daNpcF_chkPointInArea(cXyz, cXyz, cXyz, s16); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_evtmsg/executor.cpp b/rel/d/a/tag/d_a_tag_evtmsg/executor.cpp index 10150be6fdd..c29d8cb1ddf 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/executor.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8048D7DC[2]; -extern u8 const data_8048D7E4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_evtmsg/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_evtmsg/unknown_translation_unit_ctors.cpp index 0f9d8d5e13a..8428efe1eb3 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8048D7DC[2]; -extern void* const data_8048D7DC[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tag_evtmsg_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048D7DC-8048D7E4 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8048D7DC[2] = { + (void*)__sinit_d_a_tag_evtmsg_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/tag/d_a_tag_evtmsg/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_evtmsg/unknown_translation_unit_dtors.cpp index c7d94181bc2..9eaa481aee3 100644 --- a/rel/d/a/tag/d_a_tag_evtmsg/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_evtmsg/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048D7E4[4]; -extern u8 const data_8048D7E4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048D7E4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048D7E4-8048D7E8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048D7E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp b/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp index 163f09de3c3..e1b5f3b1a71 100644 --- a/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp +++ b/rel/d/a/tag/d_a_tag_firewall/d_a_tag_firewall.cpp @@ -37,10 +37,10 @@ struct dPa_levelEcallBack {}; struct csXyz {}; -struct dKy_tevstr_c {}; - struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { struct level_c { /* 8004B918 */ void getEmitter(u32); @@ -107,7 +107,6 @@ static void daTag_FWall_Execute(daTag_FWall_c*); static void daTag_FWall_IsDelete(daTag_FWall_c*); static bool daTag_FWall_Delete(daTag_FWall_c*); static void daTag_FWall_Create(daTag_FWall_c*); -extern "C" extern void* g_profile_Tag_FWall[12]; extern "C" static bool daTag_FWall_Draw__FP13daTag_FWall_c(); extern "C" void execute__13daTag_FWall_cFv(); @@ -134,16 +133,6 @@ void fopAcM_fastCreate(s16, u32, cXyz const*, int, csXyz const*, cXyz const*, s8 void dCam_getBody(); void cLib_chaseUC(u8*, u8, u8); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv(); diff --git a/rel/d/a/tag/d_a_tag_firewall/executor.cpp b/rel/d/a/tag/d_a_tag_firewall/executor.cpp index b535e014e60..a13380cc05e 100644 --- a/rel/d/a/tag/d_a_tag_firewall/executor.cpp +++ b/rel/d/a/tag/d_a_tag_firewall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D594D4[4]; -extern u8 const data_80D594D8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_firewall/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_firewall/unknown_translation_unit_ctors.cpp index 925b734b4e9..571c26242c9 100644 --- a/rel/d/a/tag/d_a_tag_firewall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_firewall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D594D4[4]; -extern u8 const data_80D594D4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D594D4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D594D4-80D594D8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D594D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_firewall/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_firewall/unknown_translation_unit_dtors.cpp index f71e2928e4f..ff7bf4251ae 100644 --- a/rel/d/a/tag/d_a_tag_firewall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_firewall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D594D8[4]; -extern u8 const data_80D594D8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D594D8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D594D8-80D594DC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D594D8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp b/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp index e8a51a9e709..d98d8bf62ee 100644 --- a/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp +++ b/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.cpp @@ -28,7 +28,6 @@ struct dSv_info_c { static void daTagGra_Create(fopAc_ac_c*); static void daTagGra_Delete(daTagGra_c*); -extern "C" extern void* g_profile_TAG_GRA[12]; extern "C" static void daTagGra_Create__FP10fopAc_ac_c(); extern "C" static void daTagGra_Delete__FP10daTagGra_c(); @@ -38,10 +37,6 @@ extern "C" extern void* g_profile_TAG_GRA[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); extern "C" void isSwitch__10dSv_info_cCFii(); diff --git a/rel/d/a/tag/d_a_tag_gra/executor.cpp b/rel/d/a/tag/d_a_tag_gra/executor.cpp index 2e90de64e25..184fa5bf445 100644 --- a/rel/d/a/tag/d_a_tag_gra/executor.cpp +++ b/rel/d/a/tag/d_a_tag_gra/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D59718[4]; -extern u8 const data_80D5971C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_gra/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_gra/unknown_translation_unit_ctors.cpp index a1937993a5a..610f1c0a8ea 100644 --- a/rel/d/a/tag/d_a_tag_gra/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_gra/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D59718[4]; -extern u8 const data_80D59718[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D59718[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D59718-80D5971C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D59718[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_gra/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_gra/unknown_translation_unit_dtors.cpp index 9f6eb6c3170..7763923acaa 100644 --- a/rel/d/a/tag/d_a_tag_gra/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_gra/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5971C[4]; -extern u8 const data_80D5971C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5971C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5971C-80D59720 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5971C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp b/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp index 95cd8655566..641d74380ed 100644 --- a/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp +++ b/rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp @@ -34,7 +34,6 @@ static void daTagGstart_Create(fopAc_ac_c*); static void daTagGstart_Delete(daTagGstart_c*); static void daTagGstart_Execute(daTagGstart_c*); static bool daTagGstart_Draw(daTagGstart_c*); -extern "C" extern void* g_profile_Tag_Gstart[12]; extern "C" void create__13daTagGstart_cFv(); extern "C" static void daTagGstart_Create__FP10fopAc_ac_c(); @@ -50,9 +49,6 @@ extern "C" extern void* g_profile_Tag_Gstart[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_gstart/executor.cpp b/rel/d/a/tag/d_a_tag_gstart/executor.cpp index edf2cd4713d..b1f73ccd256 100644 --- a/rel/d/a/tag/d_a_tag_gstart/executor.cpp +++ b/rel/d/a/tag/d_a_tag_gstart/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A3680[4]; -extern u8 const data_805A3684[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_gstart/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_gstart/unknown_translation_unit_ctors.cpp index fa491d69fe3..c3fe6d15cef 100644 --- a/rel/d/a/tag/d_a_tag_gstart/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_gstart/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A3680[4]; -extern u8 const data_805A3680[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A3680[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A3680-805A3684 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A3680[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_gstart/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_gstart/unknown_translation_unit_dtors.cpp index 9cc18150aa9..0826c7bca93 100644 --- a/rel/d/a/tag/d_a_tag_gstart/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_gstart/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A3684[4]; -extern u8 const data_805A3684[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A3684[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A3684-805A3688 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A3684[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp b/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp index df6c482b446..d8ec33341f6 100644 --- a/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp +++ b/rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp @@ -35,7 +35,6 @@ struct cXyz {}; static void daTagGuard_Create(fopAc_ac_c*); static void daTagGuard_Delete(daTagGuard_c*); -extern "C" extern void* g_profile_TAG_GUARD[12]; extern "C" void getAppearPoint__12daTagGuard_cFP3Vec(); extern "C" void createGuard__12daTagGuard_cFUl(); @@ -52,8 +51,6 @@ void fopAcM_createChild(s16, unsigned int, u32, cXyz const*, int, csXyz const*, void dPath_GetPnt(dPath const*, int); void dPath_GetRoomPath(int, int); void cLib_targetAngleY(Vec const*, Vec const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_guard/executor.cpp b/rel/d/a/tag/d_a_tag_guard/executor.cpp index ce3f0e03a54..e70825f84c3 100644 --- a/rel/d/a/tag/d_a_tag_guard/executor.cpp +++ b/rel/d/a/tag/d_a_tag_guard/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D59A10[4]; -extern u8 const data_80D59A14[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_guard/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_guard/unknown_translation_unit_ctors.cpp index 69de9286170..65cadb51a70 100644 --- a/rel/d/a/tag/d_a_tag_guard/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_guard/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D59A10[4]; -extern u8 const data_80D59A10[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D59A10[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D59A10-80D59A14 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D59A10[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_guard/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_guard/unknown_translation_unit_dtors.cpp index 98aabee9c3b..a565d322148 100644 --- a/rel/d/a/tag/d_a_tag_guard/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_guard/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D59A14[4]; -extern u8 const data_80D59A14[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D59A14[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D59A14-80D59A18 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D59A14[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp index 1591d885dc0..af4f5c43732 100644 --- a/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp +++ b/rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp @@ -39,7 +39,6 @@ static void daTagHinit_Create(fopAc_ac_c*); static void daTagHinit_Delete(daTagHinit_c*); static void daTagHinit_Execute(daTagHinit_c*); static bool daTagHinit_Draw(daTagHinit_c*); -extern "C" extern void* g_profile_Tag_Hinit[12]; extern "C" void create__12daTagHinit_cFv(); extern "C" static void daTagHinit_Create__FP10fopAc_ac_c(); @@ -56,10 +55,6 @@ extern "C" extern void* g_profile_Tag_Hinit[12]; void fopAcM_delete(fopAc_ac_c*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_hinit/executor.cpp b/rel/d/a/tag/d_a_tag_hinit/executor.cpp index f387c1aa6ad..e33a9e4d1c5 100644 --- a/rel/d/a/tag/d_a_tag_hinit/executor.cpp +++ b/rel/d/a/tag/d_a_tag_hinit/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A39E0[4]; -extern u8 const data_805A39E4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_hinit/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_hinit/unknown_translation_unit_ctors.cpp index ce0eefc85bb..36273d2a895 100644 --- a/rel/d/a/tag/d_a_tag_hinit/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_hinit/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A39E0[4]; -extern u8 const data_805A39E0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A39E0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A39E0-805A39E4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A39E0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_hinit/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_hinit/unknown_translation_unit_dtors.cpp index 6950f9079a0..a3cc8f90c7e 100644 --- a/rel/d/a/tag/d_a_tag_hinit/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_hinit/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A39E4[4]; -extern u8 const data_805A39E4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A39E4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A39E4-805A39E8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A39E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp b/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp index ec6cf6c35ec..b61f21d75db 100644 --- a/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp +++ b/rel/d/a/tag/d_a_tag_hjump/d_a_tag_hjump.cpp @@ -29,12 +29,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -77,7 +77,6 @@ static void daTagHjump_Create(fopAc_ac_c*); static void daTagHjump_Delete(daTagHjump_c*); static void daTagHjump_Execute(daTagHjump_c*); static void daTagHjump_Draw(daTagHjump_c*); -extern "C" extern void* g_profile_Tag_Hjump[12]; extern "C" void CreateHeap__12daTagHjump_cFv(); extern "C" void create__12daTagHjump_cFv(); @@ -103,15 +102,6 @@ void fpoAcM_relativePos(fopAc_ac_c const*, cXyz const*, cXyz*); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); diff --git a/rel/d/a/tag/d_a_tag_hjump/executor.cpp b/rel/d/a/tag/d_a_tag_hjump/executor.cpp index b86c025314c..501af9b68f1 100644 --- a/rel/d/a/tag/d_a_tag_hjump/executor.cpp +++ b/rel/d/a/tag/d_a_tag_hjump/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A4230[4]; -extern u8 const data_805A4234[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_hjump/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_hjump/unknown_translation_unit_ctors.cpp index ccb6370c7e7..23405f6c6a3 100644 --- a/rel/d/a/tag/d_a_tag_hjump/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_hjump/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A4230[4]; -extern u8 const data_805A4230[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A4230[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A4230-805A4234 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A4230[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_hjump/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_hjump/unknown_translation_unit_dtors.cpp index 64c784a8faf..7b56f76d275 100644 --- a/rel/d/a/tag/d_a_tag_hjump/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_hjump/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A4234[4]; -extern u8 const data_805A4234[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A4234[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A4234-805A4238 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A4234[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp index 0a5172ea645..da65a9681a0 100644 --- a/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp +++ b/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.cpp @@ -46,7 +46,6 @@ static void daTag_Howl_Delete(void*); static void daTag_Howl_Execute(void*); static void daTag_Howl_Draw(void*); static bool daTag_Howl_IsDelete(void*); -extern "C" extern void* g_profile_TAG_HOWL[12]; extern "C" void create__12daTag_Howl_cFv(); extern "C" bool destroy__12daTag_Howl_cFv(); @@ -68,11 +67,6 @@ extern "C" extern void* g_profile_TAG_HOWL[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_howl/executor.cpp b/rel/d/a/tag/d_a_tag_howl/executor.cpp index 7a1b5322c82..f9351203135 100644 --- a/rel/d/a/tag/d_a_tag_howl/executor.cpp +++ b/rel/d/a/tag/d_a_tag_howl/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8048DD5C[4]; -extern u8 const data_8048DD60[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_howl/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_howl/unknown_translation_unit_ctors.cpp index 456be76c578..ca4b1ed4d61 100644 --- a/rel/d/a/tag/d_a_tag_howl/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_howl/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048DD5C[4]; -extern u8 const data_8048DD5C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8048DD5C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048DD5C-8048DD60 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8048DD5C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_howl/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_howl/unknown_translation_unit_dtors.cpp index c311c9d475d..d1306da7c9e 100644 --- a/rel/d/a/tag/d_a_tag_howl/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_howl/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048DD60[4]; -extern u8 const data_8048DD60[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048DD60[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048DD60-8048DD64 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048DD60[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp index 46d368b8620..3da8aac9a3f 100644 --- a/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp @@ -56,7 +56,6 @@ static void daTagHstop_Create(fopAc_ac_c*); static void daTagHstop_Delete(daTagHstop_c*); static void daTagHstop_Execute(daTagHstop_c*); static bool daTagHstop_Draw(daTagHstop_c*); -extern "C" extern void* g_profile_Tag_Hstop[12]; extern "C" void create__12daTagHstop_cFv(); extern "C" static void daTagHstop_Create__FP10fopAc_ac_c(); @@ -75,11 +74,6 @@ extern "C" extern void* g_profile_Tag_Hstop[12]; void fopAcM_orderSpeakEvent(fopAc_ac_c*, u16, u16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 m_top__12daTagHstop_c[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_hstop/executor.cpp b/rel/d/a/tag/d_a_tag_hstop/executor.cpp index 5e6ffb3bb81..c37587876df 100644 --- a/rel/d/a/tag/d_a_tag_hstop/executor.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_805A4B0C[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_hstop/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/tag/d_a_tag_hstop/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index fad142b3ba9..2d0be4bff96 100644 --- a/rel/d/a/tag/d_a_tag_hstop/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_805A4B18[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 805A4B18-805A4B20 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_805A4B18[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 805A4B78-805A4B80 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/tag/d_a_tag_hstop/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_hstop/unknown_translation_unit_ctors.cpp index 689ef2039c6..01dff2f35ae 100644 --- a/rel/d/a/tag/d_a_tag_hstop/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_hstop/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_805A4B0C[2]; -extern void* const data_805A4B0C[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tag_hstop_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A4B0C-805A4B14 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_805A4B0C[2] = { + (void*)__sinit_d_a_tag_hstop_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp b/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp index a07a66d76c0..5da5010ca31 100644 --- a/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp +++ b/rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp @@ -24,7 +24,6 @@ struct daTagInst_c {}; static void daTagInst_Create(fopAc_ac_c*); static void daTagInst_Delete(daTagInst_c*); -extern "C" extern void* g_profile_Tag_Instruction[12]; extern "C" static void daTagInst_Create__FP10fopAc_ac_c(); extern "C" static void daTagInst_Delete__FP11daTagInst_c(); @@ -34,9 +33,6 @@ extern "C" extern void* g_profile_Tag_Instruction[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; diff --git a/rel/d/a/tag/d_a_tag_instruction/executor.cpp b/rel/d/a/tag/d_a_tag_instruction/executor.cpp index b422049c944..01368c25f33 100644 --- a/rel/d/a/tag/d_a_tag_instruction/executor.cpp +++ b/rel/d/a/tag/d_a_tag_instruction/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D59B78[4]; -extern u8 const data_80D59B7C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_instruction/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_instruction/unknown_translation_unit_ctors.cpp index 2d4b9108a3e..ae56df65b25 100644 --- a/rel/d/a/tag/d_a_tag_instruction/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_instruction/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D59B78[4]; -extern u8 const data_80D59B78[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D59B78[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D59B78-80D59B7C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D59B78[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_instruction/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_instruction/unknown_translation_unit_dtors.cpp index 6b1dc233e96..8dd0ea5a45c 100644 --- a/rel/d/a/tag/d_a_tag_instruction/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_instruction/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D59B7C[4]; -extern u8 const data_80D59B7C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D59B7C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D59B7C-80D59B80 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D59B7C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp b/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp index 6d40aefe418..31c3de383b8 100644 --- a/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp +++ b/rel/d/a/tag/d_a_tag_kago_fall/d_a_tag_kago_fall.cpp @@ -80,8 +80,6 @@ struct Z2SeMgr { static void daTagKagoFall_Execute(daTagKagoFall_c*); static void daTagKagoFall_Delete(daTagKagoFall_c*); static void daTagKagoFall_Create(daTagKagoFall_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Tag_KagoFall[12]; extern "C" void create__15daTagKagoFall_cFv(); extern "C" void execute__15daTagKagoFall_cFv(); @@ -104,13 +102,6 @@ void fopAcM_orderPotentialEvent(fopAc_ac_c*, u16, u16, u16); void dStage_changeScene(int, f32, u32, s8, s16, int); void dComIfGp_setNextStage(char const*, s16, s8, s8, f32, u32, int, s8, s16, int, int); void dCam_getBody(); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 g_blackColor; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void mDoMtx_YrotM__FPA4_fs(); diff --git a/rel/d/a/tag/d_a_tag_kago_fall/executor.cpp b/rel/d/a/tag/d_a_tag_kago_fall/executor.cpp index 9f776bf2887..3f5e6a3b9aa 100644 --- a/rel/d/a/tag/d_a_tag_kago_fall/executor.cpp +++ b/rel/d/a/tag/d_a_tag_kago_fall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5A6E4[4]; -extern u8 const data_80D5A6E8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_kago_fall/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_kago_fall/unknown_translation_unit_ctors.cpp index b47f06538e1..5ecfb980f10 100644 --- a/rel/d/a/tag/d_a_tag_kago_fall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_kago_fall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5A6E4[4]; -extern u8 const data_80D5A6E4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5A6E4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5A6E4-80D5A6E8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5A6E4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_kago_fall/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_kago_fall/unknown_translation_unit_dtors.cpp index e57b3d0f655..7b435f9657a 100644 --- a/rel/d/a/tag/d_a_tag_kago_fall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_kago_fall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5A6E8[4]; -extern u8 const data_80D5A6E8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5A6E8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5A6E8-80D5A6EC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5A6E8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp b/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp index 30729c5dcfa..931cfbb1db1 100644 --- a/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp +++ b/rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.cpp @@ -87,7 +87,6 @@ static void daTag_KMsg_Delete(void*); static void daTag_KMsg_Execute(void*); static void daTag_KMsg_Draw(void*); static bool daTag_KMsg_IsDelete(void*); -extern "C" extern void* g_profile_TAG_KMSG[12]; extern "C" void create__12daTag_KMsg_cFv(); extern "C" void Delete__12daTag_KMsg_cFv(); @@ -116,10 +115,6 @@ void daNpcT_chkDoBtnIsSpeak(fopAc_ac_c*); void daNpcT_getDistTableIdx(int, int); void daNpcT_chkEvtBit(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_kmsg/executor.cpp b/rel/d/a/tag/d_a_tag_kmsg/executor.cpp index a7a76e677bf..7372672698e 100644 --- a/rel/d/a/tag/d_a_tag_kmsg/executor.cpp +++ b/rel/d/a/tag/d_a_tag_kmsg/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8048EAD4[4]; -extern u8 const data_8048EAD8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_kmsg/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_kmsg/unknown_translation_unit_ctors.cpp index 417857264e8..6308dd48f81 100644 --- a/rel/d/a/tag/d_a_tag_kmsg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_kmsg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048EAD4[4]; -extern u8 const data_8048EAD4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8048EAD4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048EAD4-8048EAD8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8048EAD4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_kmsg/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_kmsg/unknown_translation_unit_dtors.cpp index c6bd3e4fdd6..b9491866499 100644 --- a/rel/d/a/tag/d_a_tag_kmsg/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_kmsg/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048EAD8[4]; -extern u8 const data_8048EAD8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048EAD8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048EAD8-8048EADC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048EAD8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp index cc9cc56484f..41d3498abc8 100644 --- a/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.cpp @@ -68,7 +68,6 @@ static void daTag_Lantern_Delete(void*); static void daTag_Lantern_Execute(void*); static void daTag_Lantern_Draw(void*); static bool daTag_Lantern_IsDelete(void*); -extern "C" extern void* g_profile_TAG_LANTERN[12]; extern "C" void __dt__15daTag_Lantern_cFv(); extern "C" void create__15daTag_Lantern_cFv(); @@ -92,10 +91,6 @@ extern "C" extern void* g_profile_TAG_LANTERN[12]; void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void fopAcM_orderSpeakEvent(fopAc_ac_c*, u16, u16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_lantern/executor.cpp b/rel/d/a/tag/d_a_tag_lantern/executor.cpp index c8e2af2743c..2894db67c08 100644 --- a/rel/d/a/tag/d_a_tag_lantern/executor.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_8048F134[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_lantern/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/tag/d_a_tag_lantern/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index f2fba672bdd..1a05c4c3369 100644 --- a/rel/d/a/tag/d_a_tag_lantern/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_8048F140[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 8048F140-8048F148 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_8048F140[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 8048F1C0-8048F1C8 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/tag/d_a_tag_lantern/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_lantern/unknown_translation_unit_ctors.cpp index 19275488dbe..00ed3a7a1dc 100644 --- a/rel/d/a/tag/d_a_tag_lantern/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_lantern/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_8048F134[2]; -extern void* const data_8048F134[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tag_lantern_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048F134-8048F13C 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_8048F134[2] = { + (void*)__sinit_d_a_tag_lantern_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp b/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp index e3b24d0245c..8fe1955d4a4 100644 --- a/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp +++ b/rel/d/a/tag/d_a_tag_lightball/d_a_tag_lightball.cpp @@ -40,7 +40,6 @@ static void daTagLightBall_Draw(daTagLightBall_c*); static void daTagLightBall_Execute(daTagLightBall_c*); static void daTagLightBall_Delete(daTagLightBall_c*); static void daTagLightBall_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_LightBall[12]; extern "C" void initBaseMtx__16daTagLightBall_cFv(); extern "C" void setBaseMtx__16daTagLightBall_cFv(); @@ -62,10 +61,6 @@ extern "C" extern void* g_profile_Tag_LightBall[12]; void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); void dKy_dalkmist_inf_set(DALKMIST_INFLUENCE*); void dKy_dalkmist_inf_cut(DALKMIST_INFLUENCE*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_lightball/executor.cpp b/rel/d/a/tag/d_a_tag_lightball/executor.cpp index 8940f0386ba..c41ed59486f 100644 --- a/rel/d/a/tag/d_a_tag_lightball/executor.cpp +++ b/rel/d/a/tag/d_a_tag_lightball/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5AC70[4]; -extern u8 const data_80D5AC74[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_lightball/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_lightball/unknown_translation_unit_ctors.cpp index c3e4ceda347..01dc2019fb3 100644 --- a/rel/d/a/tag/d_a_tag_lightball/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_lightball/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5AC70[4]; -extern u8 const data_80D5AC70[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5AC70[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5AC70-80D5AC74 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5AC70[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_lightball/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_lightball/unknown_translation_unit_dtors.cpp index b6b55a670da..de1b82cd1e8 100644 --- a/rel/d/a/tag/d_a_tag_lightball/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_lightball/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5AC74[4]; -extern u8 const data_80D5AC74[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5AC74[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5AC74-80D5AC78 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5AC74[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp index ceb47191572..e859b293157 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/d_a_tag_lv2prchk.cpp @@ -46,8 +46,6 @@ struct Z2SeMgr { static void daTagLv2PrChk_Execute(daTagLv2PrChk_c*); static void daTagLv2PrChk_Delete(daTagLv2PrChk_c*); static void daTagLv2PrChk_Create(daTagLv2PrChk_c*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Tag_Lv2PrChk[12]; extern "C" void Create__15daTagLv2PrChk_cFv(); extern "C" void create__15daTagLv2PrChk_cFv(); @@ -67,12 +65,6 @@ extern "C" extern void* g_profile_Tag_Lv2PrChk[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_805A5410[4]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void onSwitch__10dSv_info_cFii(); extern "C" void isSwitch__10dSv_info_cCFii(); diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/executor.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/executor.cpp index a904e5c0a4c..c54c33d7c2c 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/executor.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A535C[4]; -extern u8 const data_805A5360[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.cpp index adb4dfe993e..2d27473ff47 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_805A5410[4]; -extern "C" extern u8 data_805A5410[4]; - // // External References: // diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_ctors.cpp index a1de563a467..5daf8d47048 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A535C[4]; -extern u8 const data_805A535C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A535C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A535C-805A5360 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A535C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_dtors.cpp index a14edee153f..778ca2edf0a 100644 --- a/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_lv2prchk/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A5360[4]; -extern u8 const data_805A5360[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A5360[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A5360-805A5364 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A5360[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp index a6100a43248..f14d7115a79 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp @@ -45,7 +45,6 @@ static void daTag_Lv5Soup_Delete(void*); static void daTag_Lv5Soup_Execute(void*); static void daTag_Lv5Soup_Draw(void*); static bool daTag_Lv5Soup_IsDelete(void*); -extern "C" extern void* g_profile_TAG_LV5SOUP[12]; extern "C" void create__15daTag_Lv5Soup_cFv(); extern "C" bool Delete__15daTag_Lv5Soup_cFv(); @@ -66,10 +65,6 @@ extern "C" extern void* g_profile_TAG_LV5SOUP[12]; void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_lv5soup/executor.cpp b/rel/d/a/tag/d_a_tag_lv5soup/executor.cpp index 09d6527b323..c57b16c7d38 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/executor.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5B154[4]; -extern u8 const data_80D5B158[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_lv5soup/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_lv5soup/unknown_translation_unit_ctors.cpp index d8e44488ea0..5e303bec509 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5B154[4]; -extern u8 const data_80D5B154[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5B154[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5B154-80D5B158 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5B154[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_lv5soup/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_lv5soup/unknown_translation_unit_dtors.cpp index fa17473f461..f694d5ce33b 100644 --- a/rel/d/a/tag/d_a_tag_lv5soup/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_lv5soup/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5B158[4]; -extern u8 const data_80D5B158[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5B158[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5B158-80D5B15C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5B158[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp index 0478894d0b0..133cad95af3 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.cpp @@ -54,7 +54,6 @@ static void daLv6CstaSw_Draw(daLv6CstaSw_c*); static void daLv6CstaSw_Execute(daLv6CstaSw_c*); static void daLv6CstaSw_Delete(daLv6CstaSw_c*); static void daLv6CstaSw_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_Lv6CstaSw[12]; extern "C" void __ct__17daLv6CstaSw_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -81,11 +80,6 @@ void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); void fopAc_IsActor(void*); void fopAcIt_Judge(void* (*)(void*, void*), void*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/executor.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/executor.cpp index b2628eace8e..ae0ba0f39c8 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/executor.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D5B7D8[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 531f10afb04..341c607eeda 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D5B7E4[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D5B7E4-80D5B7EC 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D5B7E4[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D5B878-80D5B880 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/tag/d_a_tag_lv6CstaSw/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_lv6CstaSw/unknown_translation_unit_ctors.cpp index c4fbae3278e..bdefeeaa736 100644 --- a/rel/d/a/tag/d_a_tag_lv6CstaSw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_lv6CstaSw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D5B7D8[2]; -extern void* const data_80D5B7D8[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tag_lv6CstaSw_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5B7D8-80D5B7E0 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D5B7D8[2] = { + (void*)__sinit_d_a_tag_lv6CstaSw_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp b/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp index a422066dfb2..3af76b757c7 100644 --- a/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp +++ b/rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp @@ -27,7 +27,6 @@ struct daTagMagne_c { static void daTagMagne_Delete(daTagMagne_c*); static void daTagMagne_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_Magne[12]; extern "C" void Create__12daTagMagne_cFv(); extern "C" void create__12daTagMagne_cFv(); @@ -40,10 +39,6 @@ extern "C" extern void* g_profile_Tag_Magne[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 mTagMagne__12daTagMagne_c[4]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; diff --git a/rel/d/a/tag/d_a_tag_magne/executor.cpp b/rel/d/a/tag/d_a_tag_magne/executor.cpp index b99d74c7345..7bdc4f10938 100644 --- a/rel/d/a/tag/d_a_tag_magne/executor.cpp +++ b/rel/d/a/tag/d_a_tag_magne/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A55CC[4]; -extern u8 const data_805A55D0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_magne/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_magne/unknown_translation_unit_ctors.cpp index 75431cf28bf..35a9f4d7dde 100644 --- a/rel/d/a/tag/d_a_tag_magne/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_magne/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A55CC[4]; -extern u8 const data_805A55CC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A55CC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A55CC-805A55D0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A55CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_magne/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_magne/unknown_translation_unit_dtors.cpp index 13ec84f95ae..bf7fe8ba4ae 100644 --- a/rel/d/a/tag/d_a_tag_magne/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_magne/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A55D0[4]; -extern u8 const data_805A55D0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A55D0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A55D0-805A55D4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A55D0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp index e2954e3f2a1..cfc61ecc160 100644 --- a/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp @@ -69,8 +69,6 @@ static void daTagMhint_Create(fopAc_ac_c*); static void daTagMhint_Delete(daTagMhint_c*); static void daTagMhint_Execute(daTagMhint_c*); static bool daTagMhint_Draw(daTagMhint_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Tag_Mhint[12]; extern "C" void create__12daTagMhint_cFv(); extern "C" static void daTagMhint_Create__FP10fopAc_ac_c(); @@ -95,13 +93,6 @@ void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); void dComIfGp_getRoomCamera(int); void dComIfGp_getRoomArrow(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_mhint/executor.cpp b/rel/d/a/tag/d_a_tag_mhint/executor.cpp index 9ac3006fdd5..a16a4900797 100644 --- a/rel/d/a/tag/d_a_tag_mhint/executor.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A602C[4]; -extern u8 const data_805A6030[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_mhint/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_mhint/unknown_translation_unit_ctors.cpp index 44ac8af3935..29561601254 100644 --- a/rel/d/a/tag/d_a_tag_mhint/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A602C[4]; -extern u8 const data_805A602C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A602C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A602C-805A6030 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A602C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mhint/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_mhint/unknown_translation_unit_dtors.cpp index a48f80905ec..2aba6fee9d8 100644 --- a/rel/d/a/tag/d_a_tag_mhint/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_mhint/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A6030[4]; -extern u8 const data_805A6030[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A6030[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A6030-805A6034 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A6030[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp index 2b90cbe055c..b127da9d299 100644 --- a/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp +++ b/rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.cpp @@ -43,7 +43,6 @@ struct cXyz { static void daTagMist_Execute(daTagMist_c*); static void daTagMist_Delete(daTagMist_c*); static void daTagMist_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_Mist[12]; extern "C" void offSw__11daTagMist_cFv(); extern "C" void onMySw__11daTagMist_cFv(); @@ -65,11 +64,6 @@ extern "C" extern void* g_profile_Tag_Mist[12]; void mDoMtx_YrotS(f32 (*)[4], s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450DC0[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_mist/executor.cpp b/rel/d/a/tag/d_a_tag_mist/executor.cpp index 25b197e4aca..7c218feb99c 100644 --- a/rel/d/a/tag/d_a_tag_mist/executor.cpp +++ b/rel/d/a/tag/d_a_tag_mist/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_8048F6F8[4]; -extern u8 const data_8048F6FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_mist/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_mist/unknown_translation_unit_ctors.cpp index 4992a13c129..9b9d1273fe6 100644 --- a/rel/d/a/tag/d_a_tag_mist/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_mist/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048F6F8[4]; -extern u8 const data_8048F6F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_8048F6F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 8048F6F8-8048F6FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_8048F6F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mist/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_mist/unknown_translation_unit_dtors.cpp index 5c93c02dd60..eb745c1885a 100644 --- a/rel/d/a/tag/d_a_tag_mist/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_mist/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_8048F6FC[4]; -extern u8 const data_8048F6FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_8048F6FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 8048F6FC-8048F700 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_8048F6FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp index d5d461bc6e9..559dd1f3bed 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp @@ -39,7 +39,6 @@ static void daTagMmsg_Create(fopAc_ac_c*); static void daTagMmsg_Delete(daTagMmsg_c*); static void daTagMmsg_Execute(daTagMmsg_c*); static bool daTagMmsg_Draw(daTagMmsg_c*); -extern "C" extern void* g_profile_Tag_Mmsg[12]; extern "C" void create__11daTagMmsg_cFv(); extern "C" static void daTagMmsg_Create__FP10fopAc_ac_c(); @@ -60,11 +59,6 @@ void fopAcM_searchActorDistanceXZ2(fopAc_ac_c const*, fopAc_ac_c const*); void dComIfGp_getRoomCamera(int); void dComIfGp_getRoomArrow(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_mmsg/executor.cpp b/rel/d/a/tag/d_a_tag_mmsg/executor.cpp index bd21c9a34ca..5b9735812f0 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/executor.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5BD30[4]; -extern u8 const data_80D5BD34[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_mmsg/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_mmsg/unknown_translation_unit_ctors.cpp index 9197263c9a1..e0193ceefa4 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5BD30[4]; -extern u8 const data_80D5BD30[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5BD30[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5BD30-80D5BD34 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5BD30[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mmsg/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_mmsg/unknown_translation_unit_dtors.cpp index cc460d0edda..a215ecf6b55 100644 --- a/rel/d/a/tag/d_a_tag_mmsg/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_mmsg/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5BD34[4]; -extern u8 const data_80D5BD34[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5BD34[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5BD34-80D5BD38 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5BD34[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp b/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp index 616f0c459da..abfc8eb6fd8 100644 --- a/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp +++ b/rel/d/a/tag/d_a_tag_msg/d_a_tag_msg.cpp @@ -81,7 +81,6 @@ static void daTag_Msg_Delete(void*); static void daTag_Msg_Execute(void*); static void daTag_Msg_Draw(void*); static bool daTag_Msg_IsDelete(void*); -extern "C" extern void* g_profile_TAG_MSG[12]; extern "C" static void createHeapCallBack__FP10fopAc_ac_c(); extern "C" void __dt__11daTag_Msg_cFv(); @@ -114,12 +113,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_msg/executor.cpp b/rel/d/a/tag/d_a_tag_msg/executor.cpp index 989017ca80c..58138911c88 100644 --- a/rel/d/a/tag/d_a_tag_msg/executor.cpp +++ b/rel/d/a/tag/d_a_tag_msg/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80490170[4]; -extern u8 const data_80490174[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_msg/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_msg/unknown_translation_unit_ctors.cpp index cb00989e6d7..b2d512dcd45 100644 --- a/rel/d/a/tag/d_a_tag_msg/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_msg/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80490170[4]; -extern u8 const data_80490170[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80490170[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80490170-80490174 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80490170[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_msg/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_msg/unknown_translation_unit_dtors.cpp index 7b60b7f9c5a..7dcf4f91c9c 100644 --- a/rel/d/a/tag/d_a_tag_msg/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_msg/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80490174[4]; -extern u8 const data_80490174[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80490174[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80490174-80490178 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80490174[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp index b2a7746a527..904361e4e05 100644 --- a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp @@ -64,7 +64,6 @@ static void daTagMstop_Create(fopAc_ac_c*); static void daTagMstop_Delete(daTagMstop_c*); static void daTagMstop_Execute(daTagMstop_c*); static bool daTagMstop_Draw(daTagMstop_c*); -extern "C" extern void* g_profile_Tag_Mstop[12]; extern "C" void create__12daTagMstop_cFv(); extern "C" static void daTagMstop_Create__FP10fopAc_ac_c(); @@ -90,12 +89,6 @@ void dComIfGp_getRoomCamera(int); void dComIfGp_getRoomArrow(int); void daNpcF_getPlayerInfoFromPlayerList(int, int, cXyz&, csXyz&); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_mstop/executor.cpp b/rel/d/a/tag/d_a_tag_mstop/executor.cpp index d901b8c1853..58bd3845c23 100644 --- a/rel/d/a/tag/d_a_tag_mstop/executor.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A6964[4]; -extern u8 const data_805A6968[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_mstop/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_mstop/unknown_translation_unit_ctors.cpp index de6c49bf3e2..a8e01e82756 100644 --- a/rel/d/a/tag/d_a_tag_mstop/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A6964[4]; -extern u8 const data_805A6964[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A6964[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A6964-805A6968 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A6964[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mstop/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_mstop/unknown_translation_unit_dtors.cpp index bd000a2aeb7..c1b45183774 100644 --- a/rel/d/a/tag/d_a_tag_mstop/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A6968[4]; -extern u8 const data_805A6968[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A6968[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A6968-805A696C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A6968[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp b/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp index 6d4b5f616be..d90f0352c3d 100644 --- a/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp +++ b/rel/d/a/tag/d_a_tag_mwait/d_a_tag_mwait.cpp @@ -46,7 +46,6 @@ static void daTagMwait_Create(fopAc_ac_c*); static void daTagMwait_Delete(daTagMwait_c*); static void daTagMwait_Execute(daTagMwait_c*); static bool daTagMwait_Draw(daTagMwait_c*); -extern "C" extern void* g_profile_Tag_Mwait[12]; extern "C" void create__12daTagMwait_cFv(); extern "C" static void daTagMwait_Create__FP10fopAc_ac_c(); @@ -64,11 +63,6 @@ extern "C" extern void* g_profile_Tag_Mwait[12]; void fopAcM_delete(fopAc_ac_c*); void fopAcM_orderSpeakEvent(fopAc_ac_c*, u16, u16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_mwait/executor.cpp b/rel/d/a/tag/d_a_tag_mwait/executor.cpp index 50968bc438c..98a9bcfa8f8 100644 --- a/rel/d/a/tag/d_a_tag_mwait/executor.cpp +++ b/rel/d/a/tag/d_a_tag_mwait/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5C578[4]; -extern u8 const data_80D5C57C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_mwait/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_mwait/unknown_translation_unit_ctors.cpp index 2f54c4bde3c..11b7dd5f00d 100644 --- a/rel/d/a/tag/d_a_tag_mwait/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_mwait/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5C578[4]; -extern u8 const data_80D5C578[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5C578[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5C578-80D5C57C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5C578[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_mwait/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_mwait/unknown_translation_unit_dtors.cpp index 805b6ef6e82..fe81becd354 100644 --- a/rel/d/a/tag/d_a_tag_mwait/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_mwait/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5C57C[4]; -extern u8 const data_80D5C57C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5C57C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5C57C-80D5C580 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5C57C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp b/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp index 08e79649f43..8911257126f 100644 --- a/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp +++ b/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.cpp @@ -48,7 +48,6 @@ static void daTagMyna2_Create(fopAc_ac_c*); static void daTagMyna2_Execute(daTagMyna2_c*); static void daTagMyna2_Delete(daTagMyna2_c*); static void cLib_calcTimer__template0(s16*); -extern "C" extern void* g_profile_TAG_MYNA2[12]; extern "C" void create__12daTagMyna2_cFv(); extern "C" void execute__12daTagMyna2_cFv(); @@ -64,11 +63,6 @@ extern "C" extern void* g_profile_TAG_MYNA2[12]; void fopAcM_create(s16, u32, cXyz const*, int, csXyz const*, cXyz const*, s8); void fopAcM_searchActorAngleY(fopAc_ac_c const*, fopAc_ac_c const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_myna2/executor.cpp b/rel/d/a/tag/d_a_tag_myna2/executor.cpp index aaff9012391..e1e6bfa0c9c 100644 --- a/rel/d/a/tag/d_a_tag_myna2/executor.cpp +++ b/rel/d/a/tag/d_a_tag_myna2/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5CA34[4]; -extern u8 const data_80D5CA38[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_myna2/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_myna2/unknown_translation_unit_ctors.cpp index 5679e295297..6012ec855bc 100644 --- a/rel/d/a/tag/d_a_tag_myna2/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_myna2/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5CA34[4]; -extern u8 const data_80D5CA34[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5CA34[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5CA34-80D5CA38 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5CA34[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_myna2/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_myna2/unknown_translation_unit_dtors.cpp index 9bbb4a9aede..2a48bc66941 100644 --- a/rel/d/a/tag/d_a_tag_myna2/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_myna2/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5CA38[4]; -extern u8 const data_80D5CA38[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5CA38[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5CA38-80D5CA3C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5CA38[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp index 4dc0e02ec54..64137829485 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp +++ b/rel/d/a/tag/d_a_tag_myna_light/d_a_tag_myna_light.cpp @@ -30,14 +30,14 @@ struct daTag_MynaLight_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -62,7 +62,6 @@ static void daTag_MynaLight_Delete(void*); static void daTag_MynaLight_Execute(void*); static void daTag_MynaLight_Draw(void*); static bool daTag_MynaLight_IsDelete(void*); -extern "C" extern void* g_profile_TAG_MNLIGHT[12]; extern "C" void create__17daTag_MynaLight_cFv(); extern "C" void Delete__17daTag_MynaLight_cFv(); @@ -89,11 +88,6 @@ void dComIfGp_getReverb(int); void dKy_BossLight_set(cXyz*, _GXColor*, f32, u8); void cLib_addCalc(f32*, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_myna_light/executor.cpp b/rel/d/a/tag/d_a_tag_myna_light/executor.cpp index 97f538c7ebb..6985443fec0 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/executor.cpp +++ b/rel/d/a/tag/d_a_tag_myna_light/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5D2F8[4]; -extern u8 const data_80D5D2FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_myna_light/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_myna_light/unknown_translation_unit_ctors.cpp index c38edd06601..b43e43d6783 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_myna_light/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5D2F8[4]; -extern u8 const data_80D5D2F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5D2F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5D2F8-80D5D2FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5D2F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_myna_light/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_myna_light/unknown_translation_unit_dtors.cpp index 74230d3966d..e95106a4d0a 100644 --- a/rel/d/a/tag/d_a_tag_myna_light/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_myna_light/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5D2FC[4]; -extern u8 const data_80D5D2FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5D2FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5D2FC-80D5D300 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5D2FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp b/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp index b71e2c2934d..fbb4457ce00 100644 --- a/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp +++ b/rel/d/a/tag/d_a_tag_pachi/d_a_tag_pachi.cpp @@ -75,7 +75,6 @@ struct cCcD_GStts { static void daTagPati_Create(fopAc_ac_c*); static void daTagPati_Execute(fopAc_ac_c*); static void daTagPati_Delete(daTagPati_c*); -extern "C" extern void* g_profile_TAG_PATI[12]; extern "C" void __dt__11daTagPati_cFv(); extern "C" void create__11daTagPati_cFv(); @@ -96,14 +95,6 @@ extern "C" extern void* g_profile_TAG_PATI[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_pachi/executor.cpp b/rel/d/a/tag/d_a_tag_pachi/executor.cpp index 854cecee587..d0797d4a08f 100644 --- a/rel/d/a/tag/d_a_tag_pachi/executor.cpp +++ b/rel/d/a/tag/d_a_tag_pachi/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5D90C[4]; -extern u8 const data_80D5D910[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_pachi/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_pachi/unknown_translation_unit_ctors.cpp index f34174d4fd7..448e285ce47 100644 --- a/rel/d/a/tag/d_a_tag_pachi/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_pachi/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5D90C[4]; -extern u8 const data_80D5D90C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5D90C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5D90C-80D5D910 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5D90C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_pachi/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_pachi/unknown_translation_unit_dtors.cpp index 8a4862aa485..de79d725885 100644 --- a/rel/d/a/tag/d_a_tag_pachi/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_pachi/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5D910[4]; -extern u8 const data_80D5D910[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5D910[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5D910-80D5D914 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5D910[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp index 70c83dcbd89..8d83339101d 100644 --- a/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/d_a_tag_poFire.cpp @@ -40,7 +40,6 @@ static void daTagPoFire_Draw(daTagPoFire_c*); static void daTagPoFire_Execute(daTagPoFire_c*); static void daTagPoFire_Delete(daTagPoFire_c*); static void daTagPoFire_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_poFire[12]; extern "C" void __ct__17daTagPoFire_HIO_cFv(); extern "C" void __dt__14mDoHIO_entry_cFv(); @@ -64,9 +63,6 @@ extern "C" extern void* g_profile_Tag_poFire[12]; void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); void fopAcM_delete(fopAc_ac_c*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_poFire/executor.cpp b/rel/d/a/tag/d_a_tag_poFire/executor.cpp index e44fd4b2ee8..5cdda562503 100644 --- a/rel/d/a/tag/d_a_tag_poFire/executor.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D5DD48[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_poFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/tag/d_a_tag_poFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index e759e0dee25..9dbd8a175a3 100644 --- a/rel/d/a/tag/d_a_tag_poFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D5DD54[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D5DD54-80D5DD5C 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D5DD54[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D5DDC8-80D5DDD0 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/tag/d_a_tag_poFire/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_poFire/unknown_translation_unit_ctors.cpp index e197578691e..3f8c2616de5 100644 --- a/rel/d/a/tag/d_a_tag_poFire/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_poFire/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D5DD48[2]; -extern void* const data_80D5DD48[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tag_poFire_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5DD48-80D5DD50 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D5DD48[2] = { + (void*)__sinit_d_a_tag_poFire_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp b/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp index cf36f853d4c..614f0507e1d 100644 --- a/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp +++ b/rel/d/a/tag/d_a_tag_push/d_a_tag_push.cpp @@ -53,7 +53,6 @@ static void daTag_Push_Delete(void*); static void daTag_Push_Execute(void*); static void daTag_Push_Draw(void*); static bool daTag_Push_IsDelete(void*); -extern "C" extern void* g_profile_TAG_PUSH[12]; extern "C" void srchActor__12daTag_Push_cFPvPv(); extern "C" void create__12daTag_Push_cFv(); @@ -81,10 +80,6 @@ void fpcEx_Search(void* (*)(void*, void*), void*); void fpcEx_IsExist(unsigned int); void daNpcT_chkPointInArea(cXyz, cXyz, cXyz, s16, int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_push/executor.cpp b/rel/d/a/tag/d_a_tag_push/executor.cpp index 1e62a43ce9c..f9df3b25d60 100644 --- a/rel/d/a/tag/d_a_tag_push/executor.cpp +++ b/rel/d/a/tag/d_a_tag_push/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80490944[4]; -extern u8 const data_80490948[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_push/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_push/unknown_translation_unit_ctors.cpp index 59ee62d67eb..4576bf0083e 100644 --- a/rel/d/a/tag/d_a_tag_push/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_push/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80490944[4]; -extern u8 const data_80490944[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80490944[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80490944-80490948 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80490944[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_push/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_push/unknown_translation_unit_dtors.cpp index 74808db5cfe..530589964ce 100644 --- a/rel/d/a/tag/d_a_tag_push/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_push/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80490948[4]; -extern u8 const data_80490948[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80490948[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80490948-8049094C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80490948[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp b/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp index b2818410443..4e1e9dc11fd 100644 --- a/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp +++ b/rel/d/a/tag/d_a_tag_qs/d_a_tag_qs.cpp @@ -96,7 +96,6 @@ static void daTagQs_Execute(daTagQs_c*); static bool daTagQs_IsDelete(daTagQs_c*); static void daTagQs_Delete(daTagQs_c*); static void daTagQs_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_TAG_QS[12]; extern "C" void __dt__9daTagQs_cFv(); extern "C" void create__9daTagQs_cFv(); @@ -132,16 +131,6 @@ void dComIfGs_BossLife_public_Set(s8); void cM_atan2s(f32, f32); void cM_rndFX(f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_qs/executor.cpp b/rel/d/a/tag/d_a_tag_qs/executor.cpp index d2f7537a170..06282af9989 100644 --- a/rel/d/a/tag/d_a_tag_qs/executor.cpp +++ b/rel/d/a/tag/d_a_tag_qs/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5ECD8[4]; -extern u8 const data_80D5ECDC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_qs/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_qs/unknown_translation_unit_ctors.cpp index ac568fdcc70..9e9c09f633f 100644 --- a/rel/d/a/tag/d_a_tag_qs/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_qs/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5ECD8[4]; -extern u8 const data_80D5ECD8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5ECD8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5ECD8-80D5ECDC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5ECD8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_qs/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_qs/unknown_translation_unit_dtors.cpp index 6a257bb347c..0982376e764 100644 --- a/rel/d/a/tag/d_a_tag_qs/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_qs/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5ECDC[4]; -extern u8 const data_80D5ECDC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5ECDC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5ECDC-80D5ECE0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5ECDC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp index d2de879d8d0..8fca613a987 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp +++ b/rel/d/a/tag/d_a_tag_ret_room/d_a_tag_ret_room.cpp @@ -45,7 +45,6 @@ static void daTagRetRm_create(daTagRetRm_c*); static void daTagRetRm_Delete(daTagRetRm_c*); static void daTagRetRm_execute(daTagRetRm_c*); static void daTagRetRm_draw(daTagRetRm_c*); -extern "C" extern void* g_profile_Tag_RetRoom[12]; extern "C" void __ct__12daTagRetRm_cFv(); extern "C" void __dt__12daTagRetRm_cFv(); @@ -67,10 +66,6 @@ extern "C" extern void* g_profile_Tag_RetRoom[12]; void mDoMtx_YrotS(f32 (*)[4], s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_ret_room/executor.cpp b/rel/d/a/tag/d_a_tag_ret_room/executor.cpp index 86e846873a0..425befbaa05 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/executor.cpp +++ b/rel/d/a/tag/d_a_tag_ret_room/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5F200[4]; -extern u8 const data_80D5F204[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_ret_room/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_ret_room/unknown_translation_unit_ctors.cpp index 791795ea6b7..bbc1579c098 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_ret_room/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5F200[4]; -extern u8 const data_80D5F200[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5F200[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5F200-80D5F204 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5F200[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_ret_room/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_ret_room/unknown_translation_unit_dtors.cpp index 2d49f82cda5..05264a3b387 100644 --- a/rel/d/a/tag/d_a_tag_ret_room/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_ret_room/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5F204[4]; -extern u8 const data_80D5F204[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5F204[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5F204-80D5F208 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5F204[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp b/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp index 83d61a870ac..5f7f253c005 100644 --- a/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp +++ b/rel/d/a/tag/d_a_tag_river_back/d_a_tag_river_back.cpp @@ -64,8 +64,6 @@ static void daTagRiverBack_Execute(daTagRiverBack_c*); static void daTagRiverBack_Delete(daTagRiverBack_c*); static void daTagRiverBack_Create(daTagRiverBack_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Tag_RiverBack[12]; extern "C" void Create__16daTagRiverBack_cFv(); extern "C" void create__16daTagRiverBack_cFv(); @@ -92,11 +90,6 @@ void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); void dStage_changeScene(int, f32, u32, s8, s16, int); void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_80D5FA68[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); diff --git a/rel/d/a/tag/d_a_tag_river_back/executor.cpp b/rel/d/a/tag/d_a_tag_river_back/executor.cpp index ef16a5299e4..70d1b542a2e 100644 --- a/rel/d/a/tag/d_a_tag_river_back/executor.cpp +++ b/rel/d/a/tag/d_a_tag_river_back/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5F93C[4]; -extern u8 const data_80D5F940[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_bss.cpp b/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_bss.cpp index cc36c0151d5..dd607b941c0 100644 --- a/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_bss.cpp +++ b/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_80D5FA68[4]; -extern "C" extern u8 data_80D5FA68[4]; - // // External References: // diff --git a/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_ctors.cpp index 222b3c96236..cf5461e46f8 100644 --- a/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5F93C[4]; -extern u8 const data_80D5F93C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5F93C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5F93C-80D5F940 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5F93C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_dtors.cpp index 854bc4c0546..5a6809b6a1b 100644 --- a/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_river_back/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5F940[4]; -extern u8 const data_80D5F940[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5F940[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5F940-80D5F944 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5F940[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp index 91c64e24e91..7571c1c0e28 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/d_a_tag_rmbit_sw.cpp @@ -54,7 +54,6 @@ static void daTagRmbitSw_create(daTagRmbitSw_c*); static void daTagRmbitSw_Delete(daTagRmbitSw_c*); static void daTagRmbitSw_execute(daTagRmbitSw_c*); static void daTagRmbitSw_draw(daTagRmbitSw_c*); -extern "C" extern void* g_profile_Tag_RmbitSw[12]; extern "C" void __ct__14daTagRmbitSw_cFv(); extern "C" void __dt__14daTagRmbitSw_cFv(); @@ -78,10 +77,6 @@ void mDoMtx_YrotS(f32 (*)[4], s16); void dComIfGs_onVisitedRoom(int); void dComIfGs_offVisitedRoom(int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/executor.cpp b/rel/d/a/tag/d_a_tag_rmbit_sw/executor.cpp index f8911b563f5..9fdc4deffb2 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/executor.cpp +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D5FFA0[4]; -extern u8 const data_80D5FFA4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_rmbit_sw/unknown_translation_unit_ctors.cpp index 87106790e9a..b6ab83ad93a 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5FFA0[4]; -extern u8 const data_80D5FFA0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D5FFA0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D5FFA0-80D5FFA4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D5FFA0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_rmbit_sw/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_rmbit_sw/unknown_translation_unit_dtors.cpp index 2494926a451..250fbe37d9f 100644 --- a/rel/d/a/tag/d_a_tag_rmbit_sw/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_rmbit_sw/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D5FFA4[4]; -extern u8 const data_80D5FFA4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D5FFA4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D5FFA4-80D5FFA8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D5FFA4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp b/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp index 660df685342..cfc5f3c265e 100644 --- a/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp +++ b/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.cpp @@ -24,7 +24,6 @@ struct daTagSchedule_c {}; static void daTagSchedule_Create(fopAc_ac_c*); static void daTagSchedule_Delete(daTagSchedule_c*); -extern "C" extern void* g_profile_Tag_Schedule[12]; extern "C" static void daTagSchedule_Create__FP10fopAc_ac_c(); extern "C" static void daTagSchedule_Delete__FP15daTagSchedule_c(); @@ -34,9 +33,6 @@ extern "C" extern void* g_profile_Tag_Schedule[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; diff --git a/rel/d/a/tag/d_a_tag_schedule/executor.cpp b/rel/d/a/tag/d_a_tag_schedule/executor.cpp index e016aca1943..edede9da5a3 100644 --- a/rel/d/a/tag/d_a_tag_schedule/executor.cpp +++ b/rel/d/a/tag/d_a_tag_schedule/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D60118[4]; -extern u8 const data_80D6011C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_schedule/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_schedule/unknown_translation_unit_ctors.cpp index 8e6ad9959b8..ee944004d90 100644 --- a/rel/d/a/tag/d_a_tag_schedule/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_schedule/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D60118[4]; -extern u8 const data_80D60118[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D60118[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D60118-80D6011C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D60118[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_schedule/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_schedule/unknown_translation_unit_dtors.cpp index 161f9cc32f8..be5e584317c 100644 --- a/rel/d/a/tag/d_a_tag_schedule/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_schedule/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D6011C[4]; -extern u8 const data_80D6011C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D6011C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D6011C-80D60120 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D6011C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp b/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp index b3a9d1ae5e0..7f3e76b1863 100644 --- a/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp +++ b/rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp @@ -31,7 +31,6 @@ struct daTagSetBall_c { static void daTagSetBall_Execute(daTagSetBall_c*); static void daTagSetBall_Delete(daTagSetBall_c*); static void daTagSetBall_Create(daTagSetBall_c*); -extern "C" extern void* g_profile_Tag_SetBall[12]; extern "C" void initBaseMtx__14daTagSetBall_cFv(); extern "C" void setBaseMtx__14daTagSetBall_cFv(); @@ -48,9 +47,6 @@ extern "C" extern void* g_profile_Tag_SetBall[12]; // External References: // -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; - extern "C" void __ct__10fopAc_ac_cFv(); extern "C" extern void* g_fopAc_Method[8]; extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; diff --git a/rel/d/a/tag/d_a_tag_setBall/executor.cpp b/rel/d/a/tag/d_a_tag_setBall/executor.cpp index b9f4b163160..5e63af654c0 100644 --- a/rel/d/a/tag/d_a_tag_setBall/executor.cpp +++ b/rel/d/a/tag/d_a_tag_setBall/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D60324[4]; -extern u8 const data_80D60328[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_setBall/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_setBall/unknown_translation_unit_ctors.cpp index 51bbdb4c2be..4bbaa4c7a7b 100644 --- a/rel/d/a/tag/d_a_tag_setBall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_setBall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D60324[4]; -extern u8 const data_80D60324[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D60324[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D60324-80D60328 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D60324[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_setBall/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_setBall/unknown_translation_unit_dtors.cpp index e12c21a7fe8..f39b5310281 100644 --- a/rel/d/a/tag/d_a_tag_setBall/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_setBall/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D60328[4]; -extern u8 const data_80D60328[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D60328[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D60328-80D6032C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D60328[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp index f52a16622ac..1f5b8c69f2c 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp @@ -45,7 +45,6 @@ struct dSv_restart_c { static void daTagRestart_Execute(daTagRestart_c*); static void daTagRestart_Delete(daTagRestart_c*); static void daTagRestart_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_Restart[12]; extern "C" void Create__14daTagRestart_cFv(); extern "C" void create__14daTagRestart_cFv(); @@ -64,12 +63,6 @@ extern "C" extern void* g_profile_Tag_Restart[12]; void mDoMtx_YrotS(f32 (*)[4], s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_setrestart/executor.cpp b/rel/d/a/tag/d_a_tag_setrestart/executor.cpp index ae500fa0b51..c3552d70a65 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/executor.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D607AC[4]; -extern u8 const data_80D607B0[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_setrestart/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_setrestart/unknown_translation_unit_ctors.cpp index d6263d7f02a..579858b55d7 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D607AC[4]; -extern u8 const data_80D607AC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D607AC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D607AC-80D607B0 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D607AC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_setrestart/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_setrestart/unknown_translation_unit_dtors.cpp index 1465350718a..d3a3480e80d 100644 --- a/rel/d/a/tag/d_a_tag_setrestart/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_setrestart/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D607B0[4]; -extern u8 const data_80D607B0[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D607B0[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D607B0-80D607B4 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D607B0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp b/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp index 253ab621fd8..82d726f8655 100644 --- a/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp +++ b/rel/d/a/tag/d_a_tag_shop_camera/d_a_tag_shop_camera.cpp @@ -34,7 +34,6 @@ static void daTag_ShopCamera_Delete(void*); static void daTag_ShopCamera_Execute(void*); static void daTag_ShopCamera_Draw(void*); static bool daTag_ShopCamera_IsDelete(void*); -extern "C" extern void* g_profile_TAG_SHOPCAM[12]; extern "C" void create__18daTag_ShopCamera_cFv(); extern "C" bool Delete__18daTag_ShopCamera_cFv(); @@ -55,8 +54,6 @@ extern "C" extern void* g_profile_TAG_SHOPCAM[12]; void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_shop_camera/executor.cpp b/rel/d/a/tag/d_a_tag_shop_camera/executor.cpp index cc90d8b414b..07933fbdfa2 100644 --- a/rel/d/a/tag/d_a_tag_shop_camera/executor.cpp +++ b/rel/d/a/tag/d_a_tag_shop_camera/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D60A78[4]; -extern u8 const data_80D60A7C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_shop_camera/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_shop_camera/unknown_translation_unit_ctors.cpp index 9f10d27c5f2..b000e66da61 100644 --- a/rel/d/a/tag/d_a_tag_shop_camera/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_shop_camera/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D60A78[4]; -extern u8 const data_80D60A78[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D60A78[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D60A78-80D60A7C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D60A78[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_shop_camera/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_shop_camera/unknown_translation_unit_dtors.cpp index a465e600826..8b2415b32f9 100644 --- a/rel/d/a/tag/d_a_tag_shop_camera/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_shop_camera/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D60A7C[4]; -extern u8 const data_80D60A7C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D60A7C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D60A7C-80D60A80 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D60A7C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp index 01e10820b8c..2c2a2d5cc0f 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp +++ b/rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.cpp @@ -57,8 +57,6 @@ static void daTag_ShopItem_Delete(void*); static void daTag_ShopItem_Execute(void*); static void daTag_ShopItem_Draw(void*); static bool daTag_ShopItem_IsDelete(void*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_TAG_SHOPITM[12]; extern "C" void create__16daTag_ShopItem_cFv(); extern "C" void Delete__16daTag_ShopItem_cFv(); @@ -87,10 +85,6 @@ void fopAcM_create(s16, u32, cXyz const*, int, csXyz const*, cXyz const*, s8); void fopAcM_setCullSizeBox(fopAc_ac_c*, f32, f32, f32, f32, f32, f32); void fpcSch_JudgeByID(void*, void*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_shop_item/executor.cpp b/rel/d/a/tag/d_a_tag_shop_item/executor.cpp index 8431cbe68de..23fdc62aa9f 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/executor.cpp +++ b/rel/d/a/tag/d_a_tag_shop_item/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D611C8[4]; -extern u8 const data_80D611CC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_shop_item/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_shop_item/unknown_translation_unit_ctors.cpp index e627befdbef..7fdaa84ad90 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_shop_item/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D611C8[4]; -extern u8 const data_80D611C8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D611C8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D611C8-80D611CC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D611C8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_shop_item/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_shop_item/unknown_translation_unit_dtors.cpp index 64613193e7b..135f7d59562 100644 --- a/rel/d/a/tag/d_a_tag_shop_item/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_shop_item/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D611CC[4]; -extern u8 const data_80D611CC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D611CC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D611CC-80D611D0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D611CC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp index 87ea4fadf1d..ac00dbea7f8 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/d_a_tag_smk_emt.cpp @@ -29,16 +29,16 @@ struct daTagSmkEmt_c { struct dPa_levelEcallBack {}; +struct cXyz {}; + struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct cXyz {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; - struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -53,7 +53,6 @@ static void daTagSmkEmt_create(daTagSmkEmt_c*); static void daTagSmkEmt_Delete(daTagSmkEmt_c*); static void daTagSmkEmt_execute(daTagSmkEmt_c*); static void daTagSmkEmt_draw(daTagSmkEmt_c*); -extern "C" extern void* g_profile_Tag_SmkEmt[12]; extern "C" void __ct__13daTagSmkEmt_cFv(); extern "C" void __dt__13daTagSmkEmt_cFv(); @@ -74,9 +73,6 @@ extern "C" extern void* g_profile_Tag_SmkEmt[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; SECTION_INIT void memset(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_smk_emt/executor.cpp b/rel/d/a/tag/d_a_tag_smk_emt/executor.cpp index 6eb6df47aa8..97908c165ae 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/executor.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D615F8[4]; -extern u8 const data_80D615FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_smk_emt/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_smk_emt/unknown_translation_unit_ctors.cpp index 256d13d228b..c04ee959fc4 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D615F8[4]; -extern u8 const data_80D615F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D615F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D615F8-80D615FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D615F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_smk_emt/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_smk_emt/unknown_translation_unit_dtors.cpp index 7ee91e9c56b..617b3ff8203 100644 --- a/rel/d/a/tag/d_a_tag_smk_emt/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_smk_emt/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D615FC[4]; -extern u8 const data_80D615FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D615FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D615FC-80D61600 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D615FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp index 60a6e1c41d4..f8a6a7ab3f6 100644 --- a/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp +++ b/rel/d/a/tag/d_a_tag_spinner/d_a_tag_spinner.cpp @@ -15,10 +15,10 @@ struct fopAc_ac_c { /* 80018B64 */ fopAc_ac_c(); }; -struct dPath {}; - struct cXyz {}; +struct dPath {}; + struct daTagSppath_c { /* 80D62024 */ void getNearPathPos(cXyz*, dPath*); }; @@ -47,7 +47,6 @@ static void search_spinner_sub(void*, void*); static void daTagSpinner_Execute(daTagSpinner_c*); static void daTagSpinner_Delete(daTagSpinner_c*); static void daTagSpinner_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_Tag_Spinner[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" static void search_spinner_sub__FPvPv(); @@ -71,11 +70,6 @@ void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); void fopAc_IsActor(void*); void fopAcIt_Judge(void* (*)(void*, void*), void*); void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_spinner/executor.cpp b/rel/d/a/tag/d_a_tag_spinner/executor.cpp index d5f0a3e71ef..f4e1ccd213b 100644 --- a/rel/d/a/tag/d_a_tag_spinner/executor.cpp +++ b/rel/d/a/tag/d_a_tag_spinner/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D61B1C[4]; -extern u8 const data_80D61B20[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_spinner/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_spinner/unknown_translation_unit_ctors.cpp index 6e03f22dd8f..90bfe4ca177 100644 --- a/rel/d/a/tag/d_a_tag_spinner/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_spinner/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D61B1C[4]; -extern u8 const data_80D61B1C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D61B1C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D61B1C-80D61B20 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D61B1C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_spinner/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_spinner/unknown_translation_unit_dtors.cpp index 465150817a0..1c82d5ec33e 100644 --- a/rel/d/a/tag/d_a_tag_spinner/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_spinner/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D61B20[4]; -extern u8 const data_80D61B20[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D61B20[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D61B20-80D61B24 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D61B20[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp b/rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp index fa2dc64a875..994c3b446ed 100644 --- a/rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp +++ b/rel/d/a/tag/d_a_tag_sppath/d_a_tag_sppath.cpp @@ -16,8 +16,6 @@ struct fopAc_ac_c { /* 80018C8C */ ~fopAc_ac_c(); }; -struct dPath {}; - struct Vec {}; struct cXyz { @@ -26,6 +24,8 @@ struct cXyz { /* 80266F48 */ void normalizeZP(); }; +struct dPath {}; + struct daTagSppath_c { /* 80D61C18 */ void create(); /* 80D61EC4 */ ~daTagSppath_c(); @@ -90,8 +90,6 @@ static void daTagSppath_Create(fopAc_ac_c*); static void daTagSppath_Delete(daTagSppath_c*); static void daTagSppath_Execute(daTagSppath_c*); static bool daTagSppath_Draw(daTagSppath_c*); -extern "C" extern char const* const stringBase0; -extern "C" extern void* g_profile_Tag_Sppath[12]; extern "C" void create__13daTagSppath_cFv(); extern "C" void __dt__10dCcD_GSttsFv(); @@ -117,16 +115,6 @@ void dPath_GetRoomPath(int, int); void dPath_GetNextRoomPath(dPath const*, int); void cM3d_Len3dSqPntAndSegLine(cM3dGLin const*, Vec const*, Vec*, f32*); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_sppath/executor.cpp b/rel/d/a/tag/d_a_tag_sppath/executor.cpp index 5b10e607803..dfc26c54a9e 100644 --- a/rel/d/a/tag/d_a_tag_sppath/executor.cpp +++ b/rel/d/a/tag/d_a_tag_sppath/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D62C10[4]; -extern u8 const data_80D62C14[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_sppath/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_sppath/unknown_translation_unit_ctors.cpp index 69b19c2d7a8..598f0b5d216 100644 --- a/rel/d/a/tag/d_a_tag_sppath/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_sppath/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D62C10[4]; -extern u8 const data_80D62C10[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D62C10[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D62C10-80D62C14 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D62C10[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_sppath/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_sppath/unknown_translation_unit_dtors.cpp index c4883cc5862..9498953c7c4 100644 --- a/rel/d/a/tag/d_a_tag_sppath/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_sppath/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D62C14[4]; -extern u8 const data_80D62C14[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D62C14[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D62C14-80D62C18 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D62C14[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp index 554b5d08c0f..0c002408d5b 100644 --- a/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp +++ b/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.cpp @@ -42,7 +42,6 @@ struct dSv_info_c { static void daTagSpring_Execute(daTagSpring_c*); static void daTagSpring_Delete(daTagSpring_c*); static void daTagSpring_Create(daTagSpring_c*); -extern "C" extern void* g_profile_Tag_Spring[12]; extern "C" void initBaseMtx__13daTagSpring_cFv(); extern "C" void setBaseMtx__13daTagSpring_cFv(); @@ -61,12 +60,6 @@ extern "C" extern void* g_profile_Tag_Spring[12]; // void mDoMtx_ZXYrotM(f32 (*)[4], s16, s16, s16); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_spring/executor.cpp b/rel/d/a/tag/d_a_tag_spring/executor.cpp index 2feedc4ca34..8008f815173 100644 --- a/rel/d/a/tag/d_a_tag_spring/executor.cpp +++ b/rel/d/a/tag/d_a_tag_spring/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A6E64[4]; -extern u8 const data_805A6E68[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_spring/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_spring/unknown_translation_unit_ctors.cpp index ff384220f03..50ccd6fa6d2 100644 --- a/rel/d/a/tag/d_a_tag_spring/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_spring/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A6E64[4]; -extern u8 const data_805A6E64[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A6E64[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A6E64-805A6E68 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A6E64[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_spring/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_spring/unknown_translation_unit_dtors.cpp index 65f723577ab..caa9190dd09 100644 --- a/rel/d/a/tag/d_a_tag_spring/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_spring/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A6E68[4]; -extern u8 const data_805A6E68[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A6E68[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A6E68-805A6E6C 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A6E68[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp b/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp index 23316929f05..2fc3b055008 100644 --- a/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp +++ b/rel/d/a/tag/d_a_tag_ss_drink/d_a_tag_ss_drink.cpp @@ -79,7 +79,6 @@ static void daTag_SSDrink_Delete(void*); static void daTag_SSDrink_Execute(void*); static void daTag_SSDrink_Draw(void*); static bool daTag_SSDrink_IsDelete(void*); -extern "C" extern void* g_profile_TAG_SSDRINK[12]; extern "C" void create__15daTag_SSDrink_cFv(); extern "C" bool Delete__15daTag_SSDrink_cFv(); @@ -116,9 +115,6 @@ void fopAcM_seenActorAngleY(fopAc_ac_c const*, fopAc_ac_c const*); void fopAcM_searchActorDistanceXZ(fopAc_ac_c const*, fopAc_ac_c const*); void dMsgObject_addTotalPrice(s16); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(); extern "C" void fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(); diff --git a/rel/d/a/tag/d_a_tag_ss_drink/executor.cpp b/rel/d/a/tag/d_a_tag_ss_drink/executor.cpp index ac1151db808..6f656d011c1 100644 --- a/rel/d/a/tag/d_a_tag_ss_drink/executor.cpp +++ b/rel/d/a/tag/d_a_tag_ss_drink/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D63798[4]; -extern u8 const data_80D6379C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_ss_drink/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_ss_drink/unknown_translation_unit_ctors.cpp index e4fc6e11dba..10d6736bf36 100644 --- a/rel/d/a/tag/d_a_tag_ss_drink/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_ss_drink/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D63798[4]; -extern u8 const data_80D63798[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D63798[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D63798-80D6379C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D63798[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_ss_drink/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_ss_drink/unknown_translation_unit_dtors.cpp index 86fa96a9d38..7a24672cc2f 100644 --- a/rel/d/a/tag/d_a_tag_ss_drink/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_ss_drink/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D6379C[4]; -extern u8 const data_80D6379C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D6379C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D6379C-80D637A0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D6379C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt.cpp b/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt.cpp index 333c36b4aaf..cc85623558c 100644 --- a/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt.cpp +++ b/rel/d/a/tag/d_a_tag_statue_evt/d_a_tag_statue_evt.cpp @@ -77,12 +77,12 @@ struct dSv_event_c { /* 800349BC */ void isEventBit(u16) const; }; +struct cXyz {}; + struct dKy_tevstr_c {}; struct J3DModelData {}; -struct cXyz {}; - struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -140,8 +140,6 @@ static void daTagStatue_Execute(daTagStatue_c*); static void daTagStatue_Delete(daTagStatue_c*); static void daTagStatue_Create(daTagStatue_c*); static void cLib_calcTimer__template0(u8*); -extern "C" extern u32 lit_1787[1 + 4 /* padding */]; -extern "C" extern void* g_profile_Tag_Statue[12]; extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); extern "C" static void s_s_sub__FPvPv(); @@ -194,15 +192,6 @@ void dComIfG_resLoad(request_of_phase_process_class*, char const*); void dComIfG_resDelete(request_of_phase_process_class*, char const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 data_805A8390[4]; extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); extern "C" void play__14mDoExt_baseAnmFv(); diff --git a/rel/d/a/tag/d_a_tag_statue_evt/executor.cpp b/rel/d/a/tag/d_a_tag_statue_evt/executor.cpp index 7a080f96ff3..e80a0755799 100644 --- a/rel/d/a/tag/d_a_tag_statue_evt/executor.cpp +++ b/rel/d/a/tag/d_a_tag_statue_evt/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_805A80FC[4]; -extern u8 const data_805A8100[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_bss.cpp b/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_bss.cpp index 6ccfea9baff..8a87bad0d9c 100644 --- a/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_bss.cpp +++ b/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_bss.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 data_805A8390[4]; -extern "C" extern u8 data_805A8390[4]; - // // External References: // diff --git a/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_ctors.cpp index 706cca095ff..5d6e477a3bb 100644 --- a/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A80FC[4]; -extern u8 const data_805A80FC[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_805A80FC[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 805A80FC-805A8100 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_805A80FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_dtors.cpp index 4a7ca068a8a..95f17737c8e 100644 --- a/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_statue_evt/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_805A8100[4]; -extern u8 const data_805A8100[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_805A8100[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 805A8100-805A8104 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_805A8100[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp index 394d408043d..bb217bff837 100644 --- a/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp +++ b/rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.cpp @@ -34,7 +34,6 @@ static void daTagStream_Create(fopAc_ac_c*); static void daTagStream_Delete(daTagStream_c*); static void daTagStream_Execute(daTagStream_c*); static bool daTagStream_Draw(daTagStream_c*); -extern "C" extern void* g_profile_Tag_Stream[12]; extern "C" void create__13daTagStream_cFv(); extern "C" static void daTagStream_Create__FP10fopAc_ac_c(); @@ -50,11 +49,6 @@ extern "C" extern void* g_profile_Tag_Stream[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 m_top__13daTagStream_c[4]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_stream/executor.cpp b/rel/d/a/tag/d_a_tag_stream/executor.cpp index f8038bc918d..091b7583f00 100644 --- a/rel/d/a/tag/d_a_tag_stream/executor.cpp +++ b/rel/d/a/tag/d_a_tag_stream/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D63BE8[4]; -extern u8 const data_80D63BEC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_stream/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_stream/unknown_translation_unit_ctors.cpp index 8e149cba20d..62d92d918bc 100644 --- a/rel/d/a/tag/d_a_tag_stream/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_stream/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D63BE8[4]; -extern u8 const data_80D63BE8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D63BE8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D63BE8-80D63BEC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D63BE8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_stream/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_stream/unknown_translation_unit_dtors.cpp index 5b7d12cdbec..97eab5a3b47 100644 --- a/rel/d/a/tag/d_a_tag_stream/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_stream/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D63BEC[4]; -extern u8 const data_80D63BEC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D63BEC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D63BEC-80D63BF0 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D63BEC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp index 959d725e118..8e287da04bf 100644 --- a/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp +++ b/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp @@ -34,7 +34,6 @@ static void daTag_Telop_Execute(daTag_Telop_c*); static bool daTag_Telop_IsDelete(daTag_Telop_c*); static void daTag_Telop_Delete(daTag_Telop_c*); static void daTag_Telop_Create(fopAc_ac_c*); -extern "C" extern void* g_profile_TAG_TELOP[12]; extern "C" void create__13daTag_Telop_cFv(); extern "C" void execute__13daTag_Telop_cFv(); @@ -51,9 +50,6 @@ extern "C" extern void* g_profile_TAG_TELOP[12]; void fopAcM_delete(fopAc_ac_c*); void fopMsgM_messageSetDemo(u32); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_telop/executor.cpp b/rel/d/a/tag/d_a_tag_telop/executor.cpp index c32aab704c8..3ab5bd2e0f9 100644 --- a/rel/d/a/tag/d_a_tag_telop/executor.cpp +++ b/rel/d/a/tag/d_a_tag_telop/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80490BE0[4]; -extern u8 const data_80490BE4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_telop/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_telop/unknown_translation_unit_ctors.cpp index 841b2ea3be7..143aa04ce69 100644 --- a/rel/d/a/tag/d_a_tag_telop/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_telop/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80490BE0[4]; -extern u8 const data_80490BE0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80490BE0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80490BE0-80490BE4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80490BE0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_telop/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_telop/unknown_translation_unit_dtors.cpp index cfec4bc9a14..235f739a8c7 100644 --- a/rel/d/a/tag/d_a_tag_telop/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_telop/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80490BE4[4]; -extern u8 const data_80490BE4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80490BE4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80490BE4-80490BE8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80490BE4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp b/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp index d167be6fb45..49c47746574 100644 --- a/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp +++ b/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.cpp @@ -33,7 +33,6 @@ struct dSv_info_c { static void daTagTheBHint_Create(fopAc_ac_c*); static void daTagTheBHint_Delete(daTagTheBHint_c*); static void daTagTheBHint_Execute(daTagTheBHint_c*); -extern "C" extern void* g_profile_Tag_TheBHint[12]; extern "C" static void daTagTheBHint_Create__FP10fopAc_ac_c(); extern "C" static void daTagTheBHint_Delete__FP15daTagTheBHint_c(); @@ -48,9 +47,6 @@ void fopAcM_delete(fopAc_ac_c*); void fopAcM_searchActorDistanceXZ2(fopAc_ac_c const*, fopAc_ac_c const*); void fpcLyIt_AllJudge(void* (*)(void*, void*), void*); void fpcSch_JudgeForPName(void*, void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_theB_hint/executor.cpp b/rel/d/a/tag/d_a_tag_theB_hint/executor.cpp index a4c113cae78..d6f502bfbe9 100644 --- a/rel/d/a/tag/d_a_tag_theB_hint/executor.cpp +++ b/rel/d/a/tag/d_a_tag_theB_hint/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D63E4C[4]; -extern u8 const data_80D63E50[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_theB_hint/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_theB_hint/unknown_translation_unit_ctors.cpp index b66b0f683a2..c474ce5f686 100644 --- a/rel/d/a/tag/d_a_tag_theB_hint/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_theB_hint/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D63E4C[4]; -extern u8 const data_80D63E4C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D63E4C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D63E4C-80D63E50 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D63E4C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_theB_hint/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_theB_hint/unknown_translation_unit_dtors.cpp index 85b442807d2..c149b64937f 100644 --- a/rel/d/a/tag/d_a_tag_theB_hint/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_theB_hint/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D63E50[4]; -extern u8 const data_80D63E50[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D63E50[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D63E50-80D63E54 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D63E50[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp index 668713b0410..d6ba50d5d99 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp @@ -35,7 +35,6 @@ static void daTagWrHowl_create(daTagWrHowl_c*); static void daTagWrHowl_Delete(daTagWrHowl_c*); static void daTagWrHowl_execute(daTagWrHowl_c*); static void daTagWrHowl_draw(daTagWrHowl_c*); -extern "C" extern void* g_profile_Tag_WaraHowl[12]; extern "C" void __ct__13daTagWrHowl_cFv(); extern "C" void __dt__13daTagWrHowl_cFv(); @@ -56,9 +55,6 @@ extern "C" extern void* g_profile_Tag_WaraHowl[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_wara_howl/executor.cpp b/rel/d/a/tag/d_a_tag_wara_howl/executor.cpp index 8b4b25515b1..deb65e2b5bd 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/executor.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D641F8[4]; -extern u8 const data_80D641FC[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_wara_howl/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_wara_howl/unknown_translation_unit_ctors.cpp index 853f889e934..636ae61f1e6 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D641F8[4]; -extern u8 const data_80D641F8[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D641F8[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D641F8-80D641FC 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D641F8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_wara_howl/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_wara_howl/unknown_translation_unit_dtors.cpp index 119d3b4085b..83af0dac1c1 100644 --- a/rel/d/a/tag/d_a_tag_wara_howl/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_wara_howl/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D641FC[4]; -extern u8 const data_80D641FC[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D641FC[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D641FC-80D64200 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D641FC[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp b/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp index b248b8a42d2..ed38fc9c997 100644 --- a/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp +++ b/rel/d/a/tag/d_a_tag_watchge/d_a_tag_watchge.cpp @@ -36,7 +36,6 @@ static void daTagWatchGe_Execute(daTagWatchGe_c*); static bool daTagWatchGe_IsDelete(daTagWatchGe_c*); static bool daTagWatchGe_Delete(daTagWatchGe_c*); static void daTagWatchGe_Create(daTagWatchGe_c*); -extern "C" extern void* g_profile_Tag_WatchGe[12]; extern "C" bool draw__14daTagWatchGe_cFv(); extern "C" static void daTagWatchGe_Draw__FP14daTagWatchGe_c(); @@ -55,9 +54,6 @@ extern "C" extern void* g_profile_Tag_WatchGe[12]; void fopAcIt_Judge(void* (*)(void*, void*), void*); void fopAcM_delete(fopAc_ac_c*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); diff --git a/rel/d/a/tag/d_a_tag_watchge/executor.cpp b/rel/d/a/tag/d_a_tag_watchge/executor.cpp index fc884eb56fd..f6521dfb23e 100644 --- a/rel/d/a/tag/d_a_tag_watchge/executor.cpp +++ b/rel/d/a/tag/d_a_tag_watchge/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D644D0[4]; -extern u8 const data_80D644D4[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_watchge/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_watchge/unknown_translation_unit_ctors.cpp index 76aa3dc0bb9..ec15ec17f68 100644 --- a/rel/d/a/tag/d_a_tag_watchge/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_watchge/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D644D0[4]; -extern u8 const data_80D644D0[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D644D0[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D644D0-80D644D4 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D644D0[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_watchge/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_watchge/unknown_translation_unit_dtors.cpp index a721538273a..eae1f002e57 100644 --- a/rel/d/a/tag/d_a_tag_watchge/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_watchge/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D644D4[4]; -extern u8 const data_80D644D4[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D644D4[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D644D4-80D644D8 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D644D4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp index e8f05500814..c0389b26e0b 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp +++ b/rel/d/a/tag/d_a_tag_waterfall/d_a_tag_waterfall.cpp @@ -46,7 +46,6 @@ static void daTagWaterFall_Execute(daTagWaterFall_c*); static bool daTagWaterFall_IsDelete(daTagWaterFall_c*); static void daTagWaterFall_Delete(daTagWaterFall_c*); static void daTagWaterFall_Create(daTagWaterFall_c*); -extern "C" extern void* g_profile_Tag_WaterFall[12]; extern "C" void __ct__20daTagWaterFall_HIO_cFv(); extern "C" bool draw__16daTagWaterFall_cFv(); @@ -78,11 +77,6 @@ void dKy_fog_startendz_set(f32, f32, f32); void dKy_custom_colset(u8, u8, f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transM__14mDoMtx_stack_cFfff(); diff --git a/rel/d/a/tag/d_a_tag_waterfall/executor.cpp b/rel/d/a/tag/d_a_tag_waterfall/executor.cpp index ff94aa483b7..90c31402fab 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/executor.cpp +++ b/rel/d/a/tag/d_a_tag_waterfall/executor.cpp @@ -19,10 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern void* const data_80D64D60[2]; -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_waterfall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp b/rel/d/a/tag/d_a_tag_waterfall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp index 2e5e9faf1d4..398b81b84df 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp +++ b/rel/d/a/tag/d_a_tag_waterfall/libs/Runtime.PPCEABI.H/global_destructor_chain.cpp @@ -11,10 +11,6 @@ // Forward References: // -#pragma section ".dtors$10" -__declspec(section ".dtors$10") extern void* const __destroy_global_chain_reference; -extern void* const pad_80D64D6C[2]; - extern "C" void __register_global_object(); extern "C" static void __destroy_global_chain(); #pragma section ".dtors$10" @@ -36,6 +32,12 @@ __declspec(section ".dtors$10") void* const __destroy_global_chain_reference = ( __destroy_global_chain; #pragma section ".dtors$15" +/* 80D64D6C-80D64D74 0008+00 s=0 e=0 z=0 None .dtors None */ +void* const pad_80D64D6C[2] = { + (void*)__destroy_global_chain, + (void*)NULL, +}; + /* ############################################################################################## */ /* 80D64DF8-80D64E00 0004+04 s=2 e=0 z=0 None .bss __global_destructor_chain */ static u8 __global_destructor_chain[4 + 4 /* padding */]; diff --git a/rel/d/a/tag/d_a_tag_waterfall/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_waterfall/unknown_translation_unit_ctors.cpp index 0ae5683414a..d8d9556d7ac 100644 --- a/rel/d/a/tag/d_a_tag_waterfall/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_waterfall/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern void* const data_80D64D60[2]; -extern void* const data_80D64D60[2]; - // // External References: // @@ -27,3 +25,8 @@ extern "C" void __sinit_d_a_tag_waterfall_cpp(); /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D64D60-80D64D68 0008+00 s=0 e=1 z=0 None .ctors None */ +void* const data_80D64D60[2] = { + (void*)__sinit_d_a_tag_waterfall_cpp, + (void*)NULL, +}; diff --git a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp index 1b337a36b32..19cf3364610 100644 --- a/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp +++ b/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.cpp @@ -67,7 +67,6 @@ static void daTagWljump_Create(fopAc_ac_c*); static void daTagWljump_Delete(daTagWljump_c*); static void daTagWljump_Execute(daTagWljump_c*); static void daTagWljump_Draw(daTagWljump_c*); -extern "C" extern void* g_profile_Tag_Wljump[12]; extern "C" void create__13daTagWljump_cFv(); extern "C" static void daTagWljump_Create__FP10fopAc_ac_c(); @@ -85,12 +84,6 @@ extern "C" extern void* g_profile_Tag_Wljump[12]; void dPath_GetRoomPath(int, int); void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_wljump/executor.cpp b/rel/d/a/tag/d_a_tag_wljump/executor.cpp index 7127733e644..da5347c6436 100644 --- a/rel/d/a/tag/d_a_tag_wljump/executor.cpp +++ b/rel/d/a/tag/d_a_tag_wljump/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D658C4[4]; -extern u8 const data_80D658C8[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_wljump/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_wljump/unknown_translation_unit_ctors.cpp index 94e7cee6434..cfdca8b8d4d 100644 --- a/rel/d/a/tag/d_a_tag_wljump/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_wljump/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D658C4[4]; -extern u8 const data_80D658C4[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D658C4[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D658C4-80D658C8 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D658C4[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_wljump/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_wljump/unknown_translation_unit_dtors.cpp index 2b0ca6eccf3..10609ab61ba 100644 --- a/rel/d/a/tag/d_a_tag_wljump/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_wljump/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D658C8[4]; -extern u8 const data_80D658C8[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D658C8[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D658C8-80D658CC 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D658C8[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp b/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp index 2265c7bd641..5b908c98365 100644 --- a/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp +++ b/rel/d/a/tag/d_a_tag_yami/d_a_tag_yami.cpp @@ -92,7 +92,6 @@ struct cCcD_GStts { static void daTagYami_Create(fopAc_ac_c*); static void daTagYami_Execute(fopAc_ac_c*); static void daTagYami_Delete(daTagYami_c*); -extern "C" extern void* g_profile_TAG_YAMI[12]; extern "C" void create__11daTagYami_cFv(); extern "C" void Execute__11daTagYami_cFv(); @@ -117,17 +116,6 @@ extern "C" extern void* g_profile_TAG_YAMI[12]; // void operator delete(void*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); extern "C" void __ct__10fopAc_ac_cFv(); diff --git a/rel/d/a/tag/d_a_tag_yami/executor.cpp b/rel/d/a/tag/d_a_tag_yami/executor.cpp index 9671f66bb88..85ecf598612 100644 --- a/rel/d/a/tag/d_a_tag_yami/executor.cpp +++ b/rel/d/a/tag/d_a_tag_yami/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80D66208[4]; -extern u8 const data_80D6620C[4]; - extern "C" void ModuleProlog(); extern "C" void ModuleEpilog(); extern "C" void ModuleUnresolved(); diff --git a/rel/d/a/tag/d_a_tag_yami/unknown_translation_unit_ctors.cpp b/rel/d/a/tag/d_a_tag_yami/unknown_translation_unit_ctors.cpp index 75afde9511a..43b4bd201be 100644 --- a/rel/d/a/tag/d_a_tag_yami/unknown_translation_unit_ctors.cpp +++ b/rel/d/a/tag/d_a_tag_yami/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D66208[4]; -extern u8 const data_80D66208[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80D66208[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80D66208-80D6620C 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80D66208[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/d/a/tag/d_a_tag_yami/unknown_translation_unit_dtors.cpp b/rel/d/a/tag/d_a_tag_yami/unknown_translation_unit_dtors.cpp index 6157018b06c..e3dbf2c92aa 100644 --- a/rel/d/a/tag/d_a_tag_yami/unknown_translation_unit_dtors.cpp +++ b/rel/d/a/tag/d_a_tag_yami/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80D6620C[4]; -extern u8 const data_80D6620C[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80D6620C[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80D6620C-80D66210 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80D6620C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/f_pc/f_pc_profile_lst/executor.cpp b/rel/f_pc/f_pc_profile_lst/executor.cpp index b76da7fa06b..17e75027a28 100644 --- a/rel/f_pc/f_pc_profile_lst/executor.cpp +++ b/rel/f_pc/f_pc_profile_lst/executor.cpp @@ -19,9 +19,6 @@ extern "C" void _unresolved(); // External References: // -extern u8 const data_80456C7C[4]; -extern u8 const data_80456C80[4]; - extern "C" void ModuleUnresolved(); extern "C" void ModuleConstructorsX(); extern "C" void ModuleDestructorsX(); diff --git a/rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp b/rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp index 9e4c27e00a8..ac029a83ff8 100644 --- a/rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp +++ b/rel/f_pc/f_pc_profile_lst/f_pc_profile_lst.cpp @@ -812,800 +812,6 @@ extern "C" extern void* g_profile_TBOX_SW[12]; extern "C" extern void* g_profile_TITLE[12]; extern "C" extern void* g_profile_WarpBug[12]; -extern "C" extern void* g_profile_ALINK[12 + 9 /* padding */]; -extern "C" extern void* g_profile_NO_CHG_ROOM[12]; -extern "C" extern void* g_profile_ITEM[12]; -extern "C" extern void* g_profile_CAMERA[17]; -extern "C" extern void* g_profile_CAMERA2[17 + 6 /* padding */]; -extern "C" extern void* g_profile_ENVSE[10 + 1 /* padding */]; -extern "C" extern void* g_profile_GAMEOVER[10]; -extern "C" extern void* g_profile_KANKYO[10]; -extern "C" extern void* g_profile_KYEFF[10 + 1 /* padding */]; -extern "C" extern void* g_profile_KYEFF2[10 + 1 /* padding */]; -extern "C" extern void* g_profile_KY_THUNDER[10 + 1 /* padding */]; -extern "C" extern void* g_profile_MENUWINDOW[10 + 6 /* padding */]; -extern "C" extern void* g_profile_METER2[10]; -extern "C" extern void* g_profile_MSG_OBJECT[10]; -extern "C" extern void* g_profile_OVERLAP0[10]; -extern "C" extern void* g_profile_OVERLAP1[10]; -extern "C" extern void* g_profile_OVERLAP6[10]; -extern "C" extern void* g_profile_OVERLAP7[10]; -extern "C" extern void* g_profile_OVERLAP8[10]; -extern "C" extern void* g_profile_OVERLAP9[10]; -extern "C" extern void* g_profile_OVERLAP10[10]; -extern "C" extern void* g_profile_OVERLAP11[10 + 1 /* padding */]; -extern "C" extern void* g_profile_OVERLAP2[10]; -extern "C" extern void* g_profile_OVERLAP3[10]; -extern "C" extern void* g_profile_LOGO_SCENE[10]; -extern "C" extern void* g_profile_MENU_SCENE[10]; -extern "C" extern void* g_profile_NAME_SCENE[10]; -extern "C" extern void* g_profile_NAMEEX_SCENE[10]; -extern "C" extern void* g_profile_PLAY_SCENE[10]; -extern "C" extern void* g_profile_OPENING_SCENE[10]; -extern "C" extern void* g_profile_ROOM_SCENE[10]; -extern "C" extern void* g_profile_WARNING_SCENE[10]; -extern "C" extern void* g_profile_WARNING2_SCENE[10]; -extern "C" extern void* g_profile_TIMER[10]; -extern "C" extern void* g_profile_WMARK[10 + 1 /* padding */]; -extern "C" extern void* g_profile_WPILLAR[10 + 1 /* padding */]; -extern "C" extern u8 g_fpcPf_ProfileList_p[4 + 4 /* padding */]; -extern "C" extern void* g_profile_ANDSW[12]; -extern "C" extern void* g_profile_BG[13]; -extern "C" extern void* g_profile_BG_OBJ[12]; -extern "C" extern void* g_profile_DMIDNA[12]; -extern "C" extern void* g_profile_DBDOOR[12]; -extern "C" extern void* g_profile_KNOB20[12]; -extern "C" extern void* g_profile_DOOR20[12]; -extern "C" extern void* g_profile_SPIRAL_DOOR[12]; -extern "C" extern void* g_profile_DSHUTTER[13]; -extern "C" extern void* g_profile_EP[12]; -extern "C" extern void* g_profile_HITOBJ[12]; -extern "C" extern void* g_profile_KYTAG00[12]; -extern "C" extern void* g_profile_KYTAG04[12]; -extern "C" extern void* g_profile_KYTAG17[12]; -extern "C" extern void* g_profile_OBJ_BEF[12]; -extern "C" extern void* g_profile_Obj_BurnBox[12]; -extern "C" extern void* g_profile_Obj_Carry[12]; -extern "C" extern void* g_profile_OBJ_ITO[12]; -extern "C" extern void* g_profile_Obj_Movebox[12]; -extern "C" extern void* g_profile_Obj_Swpush[12]; -extern "C" extern void* g_profile_Obj_Timer[12]; -extern "C" extern void* g_profile_PATH_LINE[13]; -extern "C" extern void* g_profile_SCENE_EXIT[13]; -extern "C" extern void* g_profile_SET_BG_OBJ[12]; -extern "C" extern void* g_profile_SWHIT0[12]; -extern "C" extern void* g_profile_TAG_ALLMATO[12]; -extern "C" extern void* g_profile_TAG_CAMERA[12]; -extern "C" extern void* g_profile_TAG_CHKPOINT[12]; -extern "C" extern void* g_profile_TAG_EVENT[12]; -extern "C" extern void* g_profile_TAG_EVT[12]; -extern "C" extern void* g_profile_TAG_EVTAREA[12]; -extern "C" extern void* g_profile_TAG_EVTMSG[12]; -extern "C" extern void* g_profile_TAG_HOWL[12]; -extern "C" extern void* g_profile_TAG_KMSG[12]; -extern "C" extern void* g_profile_TAG_LANTERN[12]; -extern "C" extern void* g_profile_Tag_Mist[12]; -extern "C" extern void* g_profile_TAG_MSG[12]; -extern "C" extern void* g_profile_TAG_PUSH[12]; -extern "C" extern void* g_profile_TAG_TELOP[12]; -extern "C" extern void* g_profile_TBOX[12]; -extern "C" extern void* g_profile_TBOX2[12]; -extern "C" extern void* g_profile_VRBOX[12]; -extern "C" extern void* g_profile_VRBOX2[12]; -extern "C" extern void* g_profile_ARROW[12]; -extern "C" extern void* g_profile_BOOMERANG[12]; -extern "C" extern void* g_profile_CROD[12]; -extern "C" extern void* g_profile_DEMO00[12]; -extern "C" extern void* g_profile_DISAPPEAR[12]; -extern "C" extern void* g_profile_MG_ROD[12]; -extern "C" extern void* g_profile_MIDNA[12]; -extern "C" extern void* g_profile_NBOMB[12]; -extern "C" extern void* g_profile_Obj_LifeContainer[12]; -extern "C" extern void* g_profile_Obj_Yousei[12]; -extern "C" extern void* g_profile_SPINNER[12]; -extern "C" extern void* g_profile_SUSPEND[12]; -extern "C" extern void* g_profile_Tag_Attp[12]; -extern "C" extern void* g_profile_ALLDIE[12]; -extern "C" extern void* g_profile_ANDSW2[12]; -extern "C" extern void* g_profile_BD[12]; -extern "C" extern void* g_profile_CANOE[12]; -extern "C" extern void* g_profile_CSTAF[12]; -extern "C" extern void* g_profile_Demo_Item[12]; -extern "C" extern void* g_profile_L1BOSS_DOOR[12]; -extern "C" extern void* g_profile_E_DN[12]; -extern "C" extern void* g_profile_E_FM[12]; -extern "C" extern void* g_profile_E_GA[12]; -extern "C" extern void* g_profile_E_HB[12]; -extern "C" extern void* g_profile_E_NEST[12]; -extern "C" extern void* g_profile_E_RD[12]; -extern "C" extern void* g_profile_ECONT[12]; -extern "C" extern void* g_profile_FR[12]; -extern "C" extern void* g_profile_GRASS[12]; -extern "C" extern void* g_profile_KYTAG05[12]; -extern "C" extern void* g_profile_KYTAG10[12]; -extern "C" extern void* g_profile_KYTAG11[12]; -extern "C" extern void* g_profile_KYTAG14[12]; -extern "C" extern void* g_profile_MG_FISH[12]; -extern "C" extern void* g_profile_NPC_BESU[12]; -extern "C" extern void* g_profile_NPC_FAIRY_SEIREI[12]; -extern "C" extern void* g_profile_NPC_FISH[12]; -extern "C" extern void* g_profile_NPC_HENNA[12]; -extern "C" extern void* g_profile_NPC_KAKASHI[12]; -extern "C" extern void* g_profile_NPC_KKRI[12]; -extern "C" extern void* g_profile_NPC_KOLIN[12]; -extern "C" extern void* g_profile_NPC_MARO[12]; -extern "C" extern void* g_profile_NPC_TARO[12]; -extern "C" extern void* g_profile_NPC_TKJ[12]; -extern "C" extern void* g_profile_Obj_BHASHI[12]; -extern "C" extern void* g_profile_Obj_BkDoor[12]; -extern "C" extern void* g_profile_Obj_BossWarp[12]; -extern "C" extern void* g_profile_Obj_Cboard[12]; -extern "C" extern void* g_profile_Obj_Digpl[12]; -extern "C" extern void* g_profile_Obj_Eff[12]; -extern "C" extern void* g_profile_OBJ_FMOBJ[12]; -extern "C" extern void* g_profile_Obj_GpTaru[12]; -extern "C" extern void* g_profile_Obj_HHASHI[12]; -extern "C" extern void* g_profile_OBJ_KANBAN2[12]; -extern "C" extern void* g_profile_OBJ_KBACKET[12]; -extern "C" extern void* g_profile_Obj_KkrGate[12]; -extern "C" extern void* g_profile_Obj_KLift00[12]; -extern "C" extern void* g_profile_Tag_KtOnFire[12]; -extern "C" extern void* g_profile_Obj_Ladder[12]; -extern "C" extern void* g_profile_Obj_Lv2Candle[12]; -extern "C" extern void* g_profile_Obj_MagneArm[12]; -extern "C" extern void* g_profile_Obj_MetalBox[12]; -extern "C" extern void* g_profile_Obj_MGate[12]; -extern "C" extern void* g_profile_Obj_NamePlate[12]; -extern "C" extern void* g_profile_Obj_OnCloth[12]; -extern "C" extern void* g_profile_Obj_RopeBridge[12]; -extern "C" extern void* g_profile_Obj_SwallShutter[12]; -extern "C" extern void* g_profile_OBJ_STICK[12]; -extern "C" extern void* g_profile_Obj_StoneMark[12]; -extern "C" extern void* g_profile_Obj_Swpropeller[12]; -extern "C" extern void* g_profile_Obj_Swpush5[12]; -extern "C" extern void* g_profile_Obj_Yobikusa[12]; -extern "C" extern void* g_profile_SCENE_EXIT2[12]; -extern "C" extern void* g_profile_ShopItem[12]; -extern "C" extern void* g_profile_SQ[12]; -extern "C" extern void* g_profile_SWC00[12]; -extern "C" extern void* g_profile_Tag_CstaSw[12]; -extern "C" extern void* g_profile_Tag_AJnot[12]; -extern "C" extern void* g_profile_Tag_AttackItem[12]; -extern "C" extern void* g_profile_Tag_Gstart[12]; -extern "C" extern void* g_profile_Tag_Hinit[12]; -extern "C" extern void* g_profile_Tag_Hjump[12]; -extern "C" extern void* g_profile_Tag_Hstop[12]; -extern "C" extern void* g_profile_Tag_Lv2PrChk[12]; -extern "C" extern void* g_profile_Tag_Magne[12]; -extern "C" extern void* g_profile_Tag_Mhint[12]; -extern "C" extern void* g_profile_Tag_Mstop[12]; -extern "C" extern void* g_profile_Tag_Spring[12]; -extern "C" extern void* g_profile_Tag_Statue[12]; -extern "C" extern void* g_profile_Ykgr[12]; -extern "C" extern void* g_profile_DR[12]; -extern "C" extern void* g_profile_L7lowDr[12]; -extern "C" extern void* g_profile_L7ODR[12]; -extern "C" extern void* g_profile_B_BH[12]; -extern "C" extern void* g_profile_B_BQ[12]; -extern "C" extern void* g_profile_B_DR[12]; -extern "C" extern void* g_profile_B_DRE[12]; -extern "C" extern void* g_profile_B_DS[12]; -extern "C" extern void* g_profile_B_GG[12]; -extern "C" extern void* g_profile_B_GM[12]; -extern "C" extern void* g_profile_B_GND[12]; -extern "C" extern void* g_profile_B_GO[12]; -extern "C" extern void* g_profile_B_GOS[12]; -extern "C" extern void* g_profile_B_MGN[12]; -extern "C" extern void* g_profile_B_OB[12]; -extern "C" extern void* g_profile_B_OH[12]; -extern "C" extern void* g_profile_B_OH2[12]; -extern "C" extern void* g_profile_B_TN[12]; -extern "C" extern void* g_profile_B_YO[12]; -extern "C" extern void* g_profile_B_YOI[12]; -extern "C" extern void* g_profile_B_ZANT[12]; -extern "C" extern void* g_profile_B_ZANTM[12]; -extern "C" extern void* g_profile_B_ZANTZ[12]; -extern "C" extern void* g_profile_B_ZANTS[12]; -extern "C" extern void* g_profile_BALLOON2D[12]; -extern "C" extern void* g_profile_BULLET[12]; -extern "C" extern void* g_profile_COACH2D[12]; -extern "C" extern void* g_profile_COACH_FIRE[12]; -extern "C" extern void* g_profile_COW[12]; -extern "C" extern void* g_profile_CSTATUE[12]; -extern "C" extern void* g_profile_DO[12]; -extern "C" extern void* g_profile_BOSS_DOOR[12]; -extern "C" extern void* g_profile_L5BOSS_DOOR[12]; -extern "C" extern void* g_profile_L1MBOSS_DOOR[12]; -extern "C" extern void* g_profile_PushDoor[12]; -extern "C" extern void* g_profile_E_AI[12]; -extern "C" extern void* g_profile_E_ARROW[12]; -extern "C" extern void* g_profile_E_BA[12]; -extern "C" extern void* g_profile_E_BEE[12]; -extern "C" extern void* g_profile_E_BG[12]; -extern "C" extern void* g_profile_E_BI[12]; -extern "C" extern void* g_profile_E_BI_LEAF[12]; -extern "C" extern void* g_profile_E_BS[12]; -extern "C" extern void* g_profile_E_BU[12]; -extern "C" extern void* g_profile_E_BUG[12]; -extern "C" extern void* g_profile_E_CR[12]; -extern "C" extern void* g_profile_E_CR_EGG[12]; -extern "C" extern void* g_profile_E_DB[12]; -extern "C" extern void* g_profile_E_DB_LEAF[12]; -extern "C" extern void* g_profile_E_DD[12]; -extern "C" extern void* g_profile_E_DF[12]; -extern "C" extern void* g_profile_E_DK[12]; -extern "C" extern void* g_profile_E_DT[12]; -extern "C" extern void* g_profile_E_FB[12]; -extern "C" extern void* g_profile_E_FK[12]; -extern "C" extern void* g_profile_E_FS[12]; -extern "C" extern void* g_profile_E_FZ[12]; -extern "C" extern void* g_profile_E_GB[12]; -extern "C" extern void* g_profile_E_GE[12]; -extern "C" extern void* g_profile_E_GI[12]; -extern "C" extern void* g_profile_E_GM[12]; -extern "C" extern void* g_profile_E_GOB[12]; -extern "C" extern void* g_profile_E_GS[12]; -extern "C" extern void* g_profile_E_HB_LEAF[12]; -extern "C" extern void* g_profile_E_HM[12]; -extern "C" extern void* g_profile_E_HP[12]; -extern "C" extern void* g_profile_E_HZ[12]; -extern "C" extern void* g_profile_E_HZELDA[12]; -extern "C" extern void* g_profile_E_IS[12]; -extern "C" extern void* g_profile_E_KG[12]; -extern "C" extern void* g_profile_E_KK[12]; -extern "C" extern void* g_profile_E_KR[12]; -extern "C" extern void* g_profile_E_MB[12]; -extern "C" extern void* g_profile_E_MD[12]; -extern "C" extern void* g_profile_E_MF[12]; -extern "C" extern void* g_profile_E_MK[12]; -extern "C" extern void* g_profile_E_MK_BO[12]; -extern "C" extern void* g_profile_E_MM[12]; -extern "C" extern void* g_profile_E_MM_MT[12]; -extern "C" extern void* g_profile_E_MS[12]; -extern "C" extern void* g_profile_E_NZ[12]; -extern "C" extern void* g_profile_E_OC[12]; -extern "C" extern void* g_profile_E_OctBg[12]; -extern "C" extern void* g_profile_E_OT[12]; -extern "C" extern void* g_profile_E_PH[12]; -extern "C" extern void* g_profile_E_PM[12]; -extern "C" extern void* g_profile_E_PO[12]; -extern "C" extern void* g_profile_E_PZ[12]; -extern "C" extern void* g_profile_E_RB[12]; -extern "C" extern void* g_profile_E_RDB[12]; -extern "C" extern void* g_profile_E_RDY[12]; -extern "C" extern void* g_profile_E_S1[12]; -extern "C" extern void* g_profile_E_SB[12]; -extern "C" extern void* g_profile_E_SF[12]; -extern "C" extern void* g_profile_E_SG[12]; -extern "C" extern void* g_profile_E_SH[12]; -extern "C" extern void* g_profile_E_SM[12]; -extern "C" extern void* g_profile_E_SM2[12]; -extern "C" extern void* g_profile_E_ST[12]; -extern "C" extern void* g_profile_E_ST_LINE[12]; -extern "C" extern void* g_profile_E_SW[12]; -extern "C" extern void* g_profile_E_TH[12]; -extern "C" extern void* g_profile_E_TH_BALL[12]; -extern "C" extern void* g_profile_E_TK[12]; -extern "C" extern void* g_profile_E_TK2[12]; -extern "C" extern void* g_profile_E_TK_BALL[12]; -extern "C" extern void* g_profile_E_TT[12]; -extern "C" extern void* g_profile_E_VT[12]; -extern "C" extern void* g_profile_E_WAP[12]; -extern "C" extern void* g_profile_E_WB[12]; -extern "C" extern void* g_profile_E_WS[12]; -extern "C" extern void* g_profile_E_WW[12]; -extern "C" extern void* g_profile_E_YC[12]; -extern "C" extern void* g_profile_E_YD[12]; -extern "C" extern void* g_profile_E_YD_LEAF[12]; -extern "C" extern void* g_profile_E_YG[12]; -extern "C" extern void* g_profile_E_YH[12]; -extern "C" extern void* g_profile_E_YK[12]; -extern "C" extern void* g_profile_E_YM[12]; -extern "C" extern void* g_profile_E_YM_TAG[12]; -extern "C" extern void* g_profile_E_YMB[12]; -extern "C" extern void* g_profile_E_YR[12]; -extern "C" extern void* g_profile_E_ZH[12]; -extern "C" extern void* g_profile_E_ZM[12]; -extern "C" extern void* g_profile_E_ZS[12]; -extern "C" extern void* g_profile_FORMATION_MNG[12]; -extern "C" extern void* g_profile_GUARD_MNG[12]; -extern "C" extern void* g_profile_HORSE[12]; -extern "C" extern void* g_profile_HOZELDA[12]; -extern "C" extern void* g_profile_Izumi_Gate[12]; -extern "C" extern void* g_profile_KAGO[12]; -extern "C" extern void* g_profile_KYTAG01[12]; -extern "C" extern void* g_profile_KYTAG02[12]; -extern "C" extern void* g_profile_KYTAG03[12]; -extern "C" extern void* g_profile_KYTAG06[12]; -extern "C" extern void* g_profile_KYTAG07[12]; -extern "C" extern void* g_profile_KYTAG08[12]; -extern "C" extern void* g_profile_KYTAG09[12]; -extern "C" extern void* g_profile_KYTAG12[12]; -extern "C" extern void* g_profile_KYTAG13[12]; -extern "C" extern void* g_profile_KYTAG15[12]; -extern "C" extern void* g_profile_KYTAG16[12]; -extern "C" extern void* g_profile_MANT[12]; -extern "C" extern void* g_profile_FSHOP[12]; -extern "C" extern void* g_profile_MIRROR[12]; -extern "C" extern void* g_profile_MOVIE_PLAYER[12]; -extern "C" extern void* g_profile_MYNA[12]; -extern "C" extern void* g_profile_NI[12]; -extern "C" extern void* g_profile_NPC_ARU[12]; -extern "C" extern void* g_profile_NPC_ASH[12]; -extern "C" extern void* g_profile_NPC_ASHB[12]; -extern "C" extern void* g_profile_NPC_BANS[12]; -extern "C" extern void* g_profile_NPC_BLUENS[12]; -extern "C" extern void* g_profile_NPC_BOU[12]; -extern "C" extern void* g_profile_NPC_BOU_S[12]; -extern "C" extern void* g_profile_NPC_CD3[12]; -extern "C" extern void* g_profile_NPC_CHAT[12]; -extern "C" extern void* g_profile_NPC_CHIN[12]; -extern "C" extern void* g_profile_NPC_CLERKA[12]; -extern "C" extern void* g_profile_NPC_CLERKB[12]; -extern "C" extern void* g_profile_NPC_CLERKT[12]; -extern "C" extern void* g_profile_NPC_COACH[12]; -extern "C" extern void* g_profile_NPC_DF[12]; -extern "C" extern void* g_profile_NPC_DOC[12]; -extern "C" extern void* g_profile_NPC_DOORBOY[12]; -extern "C" extern void* g_profile_NPC_DRSOL[12]; -extern "C" extern void* g_profile_NPC_DU[12]; -extern "C" extern void* g_profile_NPC_FAIRY[12]; -extern "C" extern void* g_profile_NPC_FGUARD[12]; -extern "C" extern void* g_profile_NPC_GND[12]; -extern "C" extern void* g_profile_NPC_GRA[12]; -extern "C" extern void* g_profile_NPC_GRC[12]; -extern "C" extern void* g_profile_NPC_GRD[12]; -extern "C" extern void* g_profile_NPC_GRM[12]; -extern "C" extern void* g_profile_NPC_GRMC[12]; -extern "C" extern void* g_profile_NPC_GRO[12]; -extern "C" extern void* g_profile_NPC_GRR[12]; -extern "C" extern void* g_profile_NPC_GRS[12]; -extern "C" extern void* g_profile_NPC_GRZ[12]; -extern "C" extern void* g_profile_NPC_GUARD[12]; -extern "C" extern void* g_profile_NPC_GWOLF[12]; -extern "C" extern void* g_profile_NPC_HANJO[12]; -extern "C" extern void* g_profile_NPC_HENNA0[12]; -extern "C" extern void* g_profile_NPC_HOZ[12]; -extern "C" extern void* g_profile_NPC_IMPAL[12]; -extern "C" extern void* g_profile_NPC_INKO[12]; -extern "C" extern void* g_profile_NPC_INS[12]; -extern "C" extern void* g_profile_NPC_JAGAR[12]; -extern "C" extern void* g_profile_NPC_KASIHANA[12]; -extern "C" extern void* g_profile_NPC_KASIKYU[12]; -extern "C" extern void* g_profile_NPC_KASIMICH[12]; -extern "C" extern void* g_profile_NPC_KDK[12]; -extern "C" extern void* g_profile_NPC_KN[12]; -extern "C" extern void* g_profile_NPC_KNJ[12]; -extern "C" extern void* g_profile_NPC_KOLINB[12]; -extern "C" extern void* g_profile_NPC_KS[12]; -extern "C" extern void* g_profile_NPC_KYURY[12]; -extern "C" extern void* g_profile_NPC_LEN[12]; -extern "C" extern void* g_profile_NPC_LF[12]; -extern "C" extern void* g_profile_NPC_LUD[12]; -extern "C" extern void* g_profile_NPC_MIDP[12]; -extern "C" extern void* g_profile_NPC_MK[12]; -extern "C" extern void* g_profile_NPC_MOI[12]; -extern "C" extern void* g_profile_NPC_MOIR[12]; -extern "C" extern void* g_profile_MYNA2[12]; -extern "C" extern void* g_profile_NPC_NE[12]; -extern "C" extern void* g_profile_NPC_P2[12]; -extern "C" extern void* g_profile_NPC_PACHI_BESU[12]; -extern "C" extern void* g_profile_NPC_PACHI_MARO[12]; -extern "C" extern void* g_profile_NPC_PACHI_TARO[12]; -extern "C" extern void* g_profile_NPC_PASSER[12]; -extern "C" extern void* g_profile_NPC_PASSER2[12]; -extern "C" extern void* g_profile_NPC_POST[12]; -extern "C" extern void* g_profile_NPC_POUYA[12]; -extern "C" extern void* g_profile_NPC_PRAYER[12]; -extern "C" extern void* g_profile_NPC_RACA[12]; -extern "C" extern void* g_profile_NPC_RAFREL[12]; -extern "C" extern void* g_profile_NPC_SARU[12]; -extern "C" extern void* g_profile_NPC_SEIB[12]; -extern "C" extern void* g_profile_NPC_SEIC[12]; -extern "C" extern void* g_profile_NPC_SEID[12]; -extern "C" extern void* g_profile_NPC_SEIRA[12]; -extern "C" extern void* g_profile_NPC_SERA2[12]; -extern "C" extern void* g_profile_NPC_SEIREI[12]; -extern "C" extern void* g_profile_NPC_SHAD[12]; -extern "C" extern void* g_profile_NPC_SHAMAN[12]; -extern "C" extern void* g_profile_NPC_SHOE[12]; -extern "C" extern void* g_profile_NPC_SHOP0[12]; -extern "C" extern void* g_profile_NPC_SMARO[12]; -extern "C" extern void* g_profile_NPC_SOLA[12]; -extern "C" extern void* g_profile_NPC_SOLDIERa[12]; -extern "C" extern void* g_profile_NPC_SOLDIERb[12]; -extern "C" extern void* g_profile_NPC_SQ[12]; -extern "C" extern void* g_profile_NPC_THE[12]; -extern "C" extern void* g_profile_NPC_THEB[12]; -extern "C" extern void* g_profile_NPC_TK[12]; -extern "C" extern void* g_profile_NPC_TKC[12]; -extern "C" extern void* g_profile_NPC_TKJ2[12]; -extern "C" extern void* g_profile_NPC_TKS[12]; -extern "C" extern void* g_profile_NPC_TOBY[12]; -extern "C" extern void* g_profile_NPC_TR[12]; -extern "C" extern void* g_profile_NPC_URI[12]; -extern "C" extern void* g_profile_NPC_WORM[12]; -extern "C" extern void* g_profile_NPC_WRESTLER[12]; -extern "C" extern void* g_profile_NPC_YAMID[12]; -extern "C" extern void* g_profile_NPC_YAMIS[12]; -extern "C" extern void* g_profile_NPC_YAMIT[12]; -extern "C" extern void* g_profile_NPC_YELIA[12]; -extern "C" extern void* g_profile_NPC_YKM[12]; -extern "C" extern void* g_profile_NPC_YKW[12]; -extern "C" extern void* g_profile_NPC_ZANB[12]; -extern "C" extern void* g_profile_NPC_ZANT[12]; -extern "C" extern void* g_profile_NPC_ZELR[12]; -extern "C" extern void* g_profile_NPC_ZELRO[12]; -extern "C" extern void* g_profile_NPC_ZELDA[12]; -extern "C" extern void* g_profile_NPC_ZRA[12]; -extern "C" extern void* g_profile_NPC_ZRC[12]; -extern "C" extern void* g_profile_NPC_ZRZ[12]; -extern "C" extern void* g_profile_Obj_Lv5Key[12]; -extern "C" extern void* g_profile_Obj_Turara[12]; -extern "C" extern void* g_profile_Obj_TvCdlst[12]; -extern "C" extern void* g_profile_Obj_Ytaihou[12]; -extern "C" extern void* g_profile_Obj_AmiShutter[12]; -extern "C" extern void* g_profile_Obj_Ari[12]; -extern "C" extern void* g_profile_OBJ_AUTOMATA[12]; -extern "C" extern void* g_profile_Obj_Avalanche[12]; -extern "C" extern void* g_profile_OBJ_BALLOON[12]; -extern "C" extern void* g_profile_Obj_BarDesk[12]; -extern "C" extern void* g_profile_Obj_Batta[12]; -extern "C" extern void* g_profile_Obj_BBox[12]; -extern "C" extern void* g_profile_OBJ_BED[12]; -extern "C" extern void* g_profile_Obj_Bemos[12]; -extern "C" extern void* g_profile_Obj_Bhbridge[12]; -extern "C" extern void* g_profile_Obj_BkLeaf[12]; -extern "C" extern void* g_profile_BkyRock[12]; -extern "C" extern void* g_profile_Obj_BmWindow[12]; -extern "C" extern void* g_profile_Obj_BoomShutter[12]; -extern "C" extern void* g_profile_Obj_Bombf[12]; -extern "C" extern void* g_profile_OBJ_BOUMATO[12]; -extern "C" extern void* g_profile_OBJ_BRG[12]; -extern "C" extern void* g_profile_Obj_BsGate[12]; -extern "C" extern void* g_profile_Obj_awaPlar[12]; -extern "C" extern void* g_profile_Obj_CatDoor[12]; -extern "C" extern void* g_profile_OBJ_CB[12]; -extern "C" extern void* g_profile_Obj_ChainBlock[12]; -extern "C" extern void* g_profile_Obj_Cdoor[12]; -extern "C" extern void* g_profile_Obj_Chandelier[12]; -extern "C" extern void* g_profile_Obj_Chest[12]; -extern "C" extern void* g_profile_Obj_Cho[12]; -extern "C" extern void* g_profile_Obj_Cowdoor[12]; -extern "C" extern void* g_profile_Obj_Crope[12]; -extern "C" extern void* g_profile_Obj_CRVFENCE[12]; -extern "C" extern void* g_profile_Obj_CRVGATE[12]; -extern "C" extern void* g_profile_Obj_CRVHAHEN[12]; -extern "C" extern void* g_profile_Obj_CRVLH_DW[12]; -extern "C" extern void* g_profile_Obj_CRVLH_UP[12]; -extern "C" extern void* g_profile_Obj_CRVSTEEL[12]; -extern "C" extern void* g_profile_Obj_Crystal[12]; -extern "C" extern void* g_profile_Obj_ChainWall[12]; -extern "C" extern void* g_profile_Obj_DamCps[12]; -extern "C" extern void* g_profile_Obj_Dan[12]; -extern "C" extern void* g_profile_Obj_Digholl[12]; -extern "C" extern void* g_profile_Obj_DigSnow[12]; -extern "C" extern void* g_profile_Obj_Elevator[12]; -extern "C" extern void* g_profile_Obj_Drop[12]; -extern "C" extern void* g_profile_Obj_DUST[12]; -extern "C" extern void* g_profile_Obj_E_CREATE[12]; -extern "C" extern void* g_profile_Obj_FallObj[12]; -extern "C" extern void* g_profile_Obj_Fan[12]; -extern "C" extern void* g_profile_Obj_Fchain[12]; -extern "C" extern void* g_profile_Obj_FireWood[12]; -extern "C" extern void* g_profile_Obj_FireWood2[12]; -extern "C" extern void* g_profile_Obj_FirePillar[12]; -extern "C" extern void* g_profile_Obj_FirePillar2[12]; -extern "C" extern void* g_profile_Obj_Flag[12]; -extern "C" extern void* g_profile_Obj_Flag2[12]; -extern "C" extern void* g_profile_Obj_Flag3[12]; -extern "C" extern void* g_profile_OBJ_FOOD[12]; -extern "C" extern void* g_profile_OBJ_FW[12]; -extern "C" extern void* g_profile_OBJ_GADGET[12]; -extern "C" extern void* g_profile_Obj_GanonWall[12]; -extern "C" extern void* g_profile_Obj_GanonWall2[12]; -extern "C" extern void* g_profile_OBJ_GB[12]; -extern "C" extern void* g_profile_Obj_Geyser[12]; -extern "C" extern void* g_profile_Obj_glowSphere[12]; -extern "C" extern void* g_profile_OBJ_GM[12]; -extern "C" extern void* g_profile_Obj_GoGate[12]; -extern "C" extern void* g_profile_Obj_GOMIKABE[12]; -extern "C" extern void* g_profile_OBJ_GRA[12]; -extern "C" extern void* g_profile_GRA_WALL[12]; -extern "C" extern void* g_profile_Obj_GraRock[12]; -extern "C" extern void* g_profile_Obj_GraveStone[12]; -extern "C" extern void* g_profile_GRDWATER[12]; -extern "C" extern void* g_profile_Obj_GrzRock[12]; -extern "C" extern void* g_profile_Obj_H_Saku[12]; -extern "C" extern void* g_profile_Obj_HBarrel[12]; -extern "C" extern void* g_profile_Obj_HFtr[12]; -extern "C" extern void* g_profile_Obj_MHasu[12]; -extern "C" extern void* g_profile_Obj_Hata[12]; -extern "C" extern void* g_profile_OBJ_HB[12]; -extern "C" extern void* g_profile_Obj_HBombkoya[12]; -extern "C" extern void* g_profile_Obj_HeavySw[12]; -extern "C" extern void* g_profile_Obj_Hfuta[12]; -extern "C" extern void* g_profile_Obj_HsTarget[12]; -extern "C" extern void* g_profile_Obj_Ice_l[12]; -extern "C" extern void* g_profile_Obj_Ice_s[12]; -extern "C" extern void* g_profile_Obj_IceBlock[12]; -extern "C" extern void* g_profile_Obj_IceLeaf[12]; -extern "C" extern void* g_profile_OBJ_IHASI[12]; -extern "C" extern void* g_profile_Obj_Ikada[12]; -extern "C" extern void* g_profile_Obj_InoBone[12]; -extern "C" extern void* g_profile_Obj_ITA[12]; -extern "C" extern void* g_profile_OBJ_ITAMATO[12]; -extern "C" extern void* g_profile_Obj_Kabuto[12]; -extern "C" extern void* g_profile_Obj_Kag[12]; -extern "C" extern void* g_profile_OBJ_KAGE[12]; -extern "C" extern void* g_profile_OBJ_KAGO[12]; -extern "C" extern void* g_profile_Obj_Kaisou[12]; -extern "C" extern void* g_profile_Obj_Kam[12]; -extern "C" extern void* g_profile_Obj_Kantera[12]; -extern "C" extern void* g_profile_Obj_Kat[12]; -extern "C" extern void* g_profile_Obj_KazeNeko[12]; -extern "C" extern void* g_profile_OBJ_KBOX[12]; -extern "C" extern void* g_profile_OBJ_KEY[12]; -extern "C" extern void* g_profile_OBJ_KEYHOLE[12]; -extern "C" extern void* g_profile_OBJ_KI[12]; -extern "C" extern void* g_profile_Obj_KiPot[12]; -extern "C" extern void* g_profile_OBJ_KITA[12]; -extern "C" extern void* g_profile_Obj_KJgjs[12]; -extern "C" extern void* g_profile_Obj_KKanban[12]; -extern "C" extern void* g_profile_KN_BULLET[12]; -extern "C" extern void* g_profile_Obj_Kshutter[12]; -extern "C" extern void* g_profile_Obj_Kuw[12]; -extern "C" extern void* g_profile_Obj_KWheel00[12]; -extern "C" extern void* g_profile_Obj_KWheel01[12]; -extern "C" extern void* g_profile_Obj_KznkArm[12]; -extern "C" extern void* g_profile_Obj_Laundry[12]; -extern "C" extern void* g_profile_Obj_LndRope[12]; -extern "C" extern void* g_profile_OBJ_LBOX[12]; -extern "C" extern void* g_profile_OBJ_LP[12]; -extern "C" extern void* g_profile_Obj_Lv1Cdl00[12]; -extern "C" extern void* g_profile_Obj_Lv1Cdl01[12]; -extern "C" extern void* g_profile_Obj_Lv3Candle[12]; -extern "C" extern void* g_profile_Obj_Lv3Water[12]; -extern "C" extern void* g_profile_Obj_Lv3Water2[12]; -extern "C" extern void* g_profile_OBJ_LV3WATERB[12]; -extern "C" extern void* g_profile_Obj_Lv3R10Saka[12]; -extern "C" extern void* g_profile_Obj_WaterEff[12]; -extern "C" extern void* g_profile_Tag_Lv4CandleDm[12]; -extern "C" extern void* g_profile_Tag_Lv4Candle[12]; -extern "C" extern void* g_profile_Obj_Lv4EdShutter[12]; -extern "C" extern void* g_profile_Obj_Lv4Gate[12]; -extern "C" extern void* g_profile_Obj_Lv4HsTarget[12]; -extern "C" extern void* g_profile_Obj_Lv4PoGate[12]; -extern "C" extern void* g_profile_Obj_Lv4RailWall[12]; -extern "C" extern void* g_profile_Obj_Lv4SlideWall[12]; -extern "C" extern void* g_profile_Obj_Lv4Bridge[12]; -extern "C" extern void* g_profile_Obj_Lv4Chan[12]; -extern "C" extern void* g_profile_Obj_Lv4DigSand[12]; -extern "C" extern void* g_profile_Obj_Lv4Floor[12]; -extern "C" extern void* g_profile_Obj_Lv4Gear[12]; -extern "C" extern void* g_profile_Obj_PRElvtr[12]; -extern "C" extern void* g_profile_Obj_Lv4PRwall[12]; -extern "C" extern void* g_profile_Obj_Lv4Sand[12]; -extern "C" extern void* g_profile_Obj_Lv5FBoard[12]; -extern "C" extern void* g_profile_Obj_IceWall[12]; -extern "C" extern void* g_profile_Obj_Lv5SwIce[12]; -extern "C" extern void* g_profile_Obj_Ychndlr[12]; -extern "C" extern void* g_profile_Obj_YIblltray[12]; -extern "C" extern void* g_profile_Obj_Lv6ChgGate[12]; -extern "C" extern void* g_profile_Obj_Lv6FuriTrap[12]; -extern "C" extern void* g_profile_Obj_Lv6Lblock[12]; -extern "C" extern void* g_profile_Obj_Lv6SwGate[12]; -extern "C" extern void* g_profile_Obj_Lv6SzGate[12]; -extern "C" extern void* g_profile_Obj_Lv6Tenbin[12]; -extern "C" extern void* g_profile_Obj_Lv6TogeRoll[12]; -extern "C" extern void* g_profile_Obj_Lv6TogeTrap[12]; -extern "C" extern void* g_profile_Obj_Lv6bemos[12]; -extern "C" extern void* g_profile_Obj_Lv6bemos2[12]; -extern "C" extern void* g_profile_Obj_Lv6EGate[12]; -extern "C" extern void* g_profile_Obj_Lv6ElevtA[12]; -extern "C" extern void* g_profile_Obj_Lv6SwTurn[12]; -extern "C" extern void* g_profile_Obj_Lv7BsGate[12]; -extern "C" extern void* g_profile_Obj_Lv7PropY[12]; -extern "C" extern void* g_profile_Obj_Lv7Bridge[12]; -extern "C" extern void* g_profile_Obj_Lv8KekkaiTrap[12]; -extern "C" extern void* g_profile_Obj_Lv8Lift[12]; -extern "C" extern void* g_profile_Obj_Lv8OptiLift[12]; -extern "C" extern void* g_profile_Obj_Lv8UdFloor[12]; -extern "C" extern void* g_profile_Obj_Lv9SwShutter[12]; -extern "C" extern void* g_profile_Obj_MagLift[12]; -extern "C" extern void* g_profile_Obj_MagLiftRot[12]; -extern "C" extern void* g_profile_OBJ_MAKI[12]; -extern "C" extern void* g_profile_Obj_MasterSword[12]; -extern "C" extern void* g_profile_Obj_Mato[12]; -extern "C" extern void* g_profile_Obj_MHole[12]; -extern "C" extern void* g_profile_OBJ_MIE[12]; -extern "C" extern void* g_profile_Obj_Mirror6Pole[12]; -extern "C" extern void* g_profile_Obj_MirrorChain[12]; -extern "C" extern void* g_profile_Obj_MirrorSand[12]; -extern "C" extern void* g_profile_Obj_MirrorScrew[12]; -extern "C" extern void* g_profile_Obj_MirrorTable[12]; -extern "C" extern void* g_profile_OBJ_MSIMA[12]; -extern "C" extern void* g_profile_Obj_MvStair[12]; -extern "C" extern void* g_profile_OBJ_MYOGAN[12]; -extern "C" extern void* g_profile_Obj_Nagaisu[12]; -extern "C" extern void* g_profile_Obj_Nan[12]; -extern "C" extern void* g_profile_OBJ_NDOOR[12]; -extern "C" extern void* g_profile_OBJ_NOUGU[12]; -extern "C" extern void* g_profile_OCTHASHI[12]; -extern "C" extern void* g_profile_OBJ_OILTUBO[12]; -extern "C" extern void* g_profile_Obj_Onsen[12]; -extern "C" extern void* g_profile_OBJ_ONSEN_FIRE[12]; -extern "C" extern void* g_profile_Obj_OnsenTaru[12]; -extern "C" extern void* g_profile_Obj_PushDoor[12]; -extern "C" extern void* g_profile_Obj_PDtile[12]; -extern "C" extern void* g_profile_Obj_PDwall[12]; -extern "C" extern void* g_profile_Obj_Picture[12]; -extern "C" extern void* g_profile_Obj_Pillar[12]; -extern "C" extern void* g_profile_OBJ_PLEAF[12]; -extern "C" extern void* g_profile_Obj_poCandle[12]; -extern "C" extern void* g_profile_Obj_poFire[12]; -extern "C" extern void* g_profile_Obj_poTbox[12]; -extern "C" extern void* g_profile_Obj_Prop[12]; -extern "C" extern void* g_profile_OBJ_PUMPKIN[12]; -extern "C" extern void* g_profile_Obj_RCircle[12]; -extern "C" extern void* g_profile_Obj_RfHole[12]; -extern "C" extern void* g_profile_Obj_RiderGate[12]; -extern "C" extern void* g_profile_Obj_RIVERROCK[12]; -extern "C" extern void* g_profile_OBJ_ROCK[12]; -extern "C" extern void* g_profile_Obj_RotBridge[12]; -extern "C" extern void* g_profile_Obj_RotTrap[12]; -extern "C" extern void* g_profile_OBJ_ROTEN[12]; -extern "C" extern void* g_profile_Obj_RotStair[12]; -extern "C" extern void* g_profile_OBJ_RW[12]; -extern "C" extern void* g_profile_Obj_Saidan[12]; -extern "C" extern void* g_profile_Obj_Sakuita[12]; -extern "C" extern void* g_profile_Obj_ItaRope[12]; -extern "C" extern void* g_profile_Obj_SCannon[12]; -extern "C" extern void* g_profile_Obj_SCannonCrs[12]; -extern "C" extern void* g_profile_Obj_SCannonTen[12]; -extern "C" extern void* g_profile_OBJ_SEKIDOOR[12]; -extern "C" extern void* g_profile_OBJ_SEKIZO[12]; -extern "C" extern void* g_profile_OBJ_SEKIZOA[12]; -extern "C" extern void* g_profile_Obj_Shield[12]; -extern "C" extern void* g_profile_Obj_SM_DOOR[12]; -extern "C" extern void* g_profile_Obj_SmallKey[12]; -extern "C" extern void* g_profile_Obj_SmgDoor[12]; -extern "C" extern void* g_profile_Obj_Smoke[12]; -extern "C" extern void* g_profile_OBJ_SMTILE[12]; -extern "C" extern void* g_profile_Obj_SmWStone[12]; -extern "C" extern void* g_profile_Tag_SnowEff[12]; -extern "C" extern void* g_profile_Obj_SnowSoup[12]; -extern "C" extern void* g_profile_OBJ_SO[12]; -extern "C" extern void* g_profile_Obj_SpinLift[12]; -extern "C" extern void* g_profile_OBJ_SSDRINK[12]; -extern "C" extern void* g_profile_OBJ_SSITEM[12]; -extern "C" extern void* g_profile_Obj_StairBlock[12]; -extern "C" extern void* g_profile_Obj_Stone[12]; -extern "C" extern void* g_profile_Obj_Stopper[12]; -extern "C" extern void* g_profile_Obj_Stopper2[12]; -extern "C" extern void* g_profile_OBJ_SUISYA[12]; -extern "C" extern void* g_profile_OBJ_SW[12]; -extern "C" extern void* g_profile_Obj_SwBallA[12]; -extern "C" extern void* g_profile_Obj_SwBallB[12]; -extern "C" extern void* g_profile_Obj_SwBallC[12]; -extern "C" extern void* g_profile_Obj_SwLight[12]; -extern "C" extern void* g_profile_Obj_SwChain[12]; -extern "C" extern void* g_profile_Obj_SwHang[12]; -extern "C" extern void* g_profile_Obj_Sword[12]; -extern "C" extern void* g_profile_Obj_Swpush2[12]; -extern "C" extern void* g_profile_Obj_SwSpinner[12]; -extern "C" extern void* g_profile_Obj_SwTurn[12]; -extern "C" extern void* g_profile_Obj_SyRock[12]; -extern "C" extern void* g_profile_Obj_SZbridge[12]; -extern "C" extern void* g_profile_Obj_TaFence[12]; -extern "C" extern void* g_profile_Obj_Table[12]; -extern "C" extern void* g_profile_Obj_TakaraDai[12]; -extern "C" extern void* g_profile_OBJ_TATIGI[12]; -extern "C" extern void* g_profile_Obj_Ten[12]; -extern "C" extern void* g_profile_Obj_TestCube[12]; -extern "C" extern void* g_profile_Obj_Gake[12]; -extern "C" extern void* g_profile_Obj_THASHI[12]; -extern "C" extern void* g_profile_Obj_TDoor[12]; -extern "C" extern void* g_profile_Obj_TimeFire[12]; -extern "C" extern void* g_profile_OBJ_TKS[12]; -extern "C" extern void* g_profile_Obj_TMoon[12]; -extern "C" extern void* g_profile_Obj_ToaruMaki[12]; -extern "C" extern void* g_profile_OBJ_TOBY[12]; -extern "C" extern void* g_profile_Obj_TobyHouse[12]; -extern "C" extern void* g_profile_Obj_TogeTrap[12]; -extern "C" extern void* g_profile_Obj_Tombo[12]; -extern "C" extern void* g_profile_Obj_Tornado[12]; -extern "C" extern void* g_profile_Obj_Tornado2[12]; -extern "C" extern void* g_profile_OBJ_TP[12]; -extern "C" extern void* g_profile_TREESH[12]; -extern "C" extern void* g_profile_Obj_TwGate[12]; -extern "C" extern void* g_profile_OBJ_UDOOR[12]; -extern "C" extern void* g_profile_OBJ_USAKU[12]; -extern "C" extern void* g_profile_Obj_VolcGnd[12]; -extern "C" extern void* g_profile_Obj_VolcanicBall[12]; -extern "C" extern void* g_profile_Obj_VolcanicBomb[12]; -extern "C" extern void* g_profile_Obj_KakarikoBrg[12]; -extern "C" extern void* g_profile_Obj_OrdinBrg[12]; -extern "C" extern void* g_profile_Obj_WtGate[12]; -extern "C" extern void* g_profile_Obj_WaterPillar[12]; -extern "C" extern void* g_profile_Obj_WaterFall[12]; -extern "C" extern void* g_profile_Obj_Wchain[12]; -extern "C" extern void* g_profile_Obj_WdStick[12]; -extern "C" extern void* g_profile_OBJ_WEB0[12]; -extern "C" extern void* g_profile_OBJ_WEB1[12]; -extern "C" extern void* g_profile_Obj_WellCover[12]; -extern "C" extern void* g_profile_OBJ_WFLAG[12]; -extern "C" extern void* g_profile_Obj_WindStone[12]; -extern "C" extern void* g_profile_Obj_Window[12]; -extern "C" extern void* g_profile_Obj_WoodPendulum[12]; -extern "C" extern void* g_profile_Obj_WoodStatue[12]; -extern "C" extern void* g_profile_Obj_WoodenSword[12]; -extern "C" extern void* g_profile_OBJ_YBAG[12]; -extern "C" extern void* g_profile_OBJ_YSTONE[12]; -extern "C" extern void* g_profile_Obj_ZoraCloth[12]; -extern "C" extern void* g_profile_Obj_ZDoor[12]; -extern "C" extern void* g_profile_Obj_zrTurara[12]; -extern "C" extern void* g_profile_Obj_zrTuraraRc[12]; -extern "C" extern void* g_profile_ZRA_MARK[12]; -extern "C" extern void* g_profile_OBJ_ZRAFREEZE[12]; -extern "C" extern void* g_profile_Obj_ZraRock[12]; -extern "C" extern void* g_profile_PASSER_MNG[12]; -extern "C" extern void* g_profile_PERU[12]; -extern "C" extern void* g_profile_PPolamp[12]; -extern "C" extern void* g_profile_SKIP2D[12]; -extern "C" extern void* g_profile_START_AND_GOAL[12]; -extern "C" extern void* g_profile_SwBall[12]; -extern "C" extern void* g_profile_SwLBall[12]; -extern "C" extern void* g_profile_SwTime[12]; -extern "C" extern void* g_profile_Tag_Lv6Gate[12]; -extern "C" extern void* g_profile_Tag_Lv7Gate[12]; -extern "C" extern void* g_profile_Tag_Lv8Gate[12]; -extern "C" extern void* g_profile_Tag_TWGate[12]; -extern "C" extern void* g_profile_Tag_Arena[12]; -extern "C" extern void* g_profile_Tag_Assist[12]; -extern "C" extern void* g_profile_TAG_BTLITM[12]; -extern "C" extern void* g_profile_Tag_ChgRestart[12]; -extern "C" extern void* g_profile_TAG_CSW[12]; -extern "C" extern void* g_profile_Tag_Escape[12]; -extern "C" extern void* g_profile_Tag_FWall[12]; -extern "C" extern void* g_profile_TAG_GRA[12]; -extern "C" extern void* g_profile_TAG_GUARD[12]; -extern "C" extern void* g_profile_Tag_Instruction[12]; -extern "C" extern void* g_profile_Tag_KagoFall[12]; -extern "C" extern void* g_profile_Tag_LightBall[12]; -extern "C" extern void* g_profile_TAG_LV5SOUP[12]; -extern "C" extern void* g_profile_Tag_Lv6CstaSw[12]; -extern "C" extern void* g_profile_Tag_Mmsg[12]; -extern "C" extern void* g_profile_Tag_Mwait[12]; -extern "C" extern void* g_profile_TAG_MYNA2[12]; -extern "C" extern void* g_profile_TAG_MNLIGHT[12]; -extern "C" extern void* g_profile_TAG_PATI[12]; -extern "C" extern void* g_profile_Tag_poFire[12]; -extern "C" extern void* g_profile_TAG_QS[12]; -extern "C" extern void* g_profile_Tag_RetRoom[12]; -extern "C" extern void* g_profile_Tag_RiverBack[12]; -extern "C" extern void* g_profile_Tag_RmbitSw[12]; -extern "C" extern void* g_profile_Tag_Schedule[12]; -extern "C" extern void* g_profile_Tag_SetBall[12]; -extern "C" extern void* g_profile_Tag_Restart[12]; -extern "C" extern void* g_profile_TAG_SHOPCAM[12]; -extern "C" extern void* g_profile_TAG_SHOPITM[12]; -extern "C" extern void* g_profile_Tag_SmkEmt[12]; -extern "C" extern void* g_profile_Tag_Spinner[12]; -extern "C" extern void* g_profile_Tag_Sppath[12]; -extern "C" extern void* g_profile_TAG_SSDRINK[12]; -extern "C" extern void* g_profile_Tag_Stream[12]; -extern "C" extern void* g_profile_Tag_TheBHint[12]; -extern "C" extern void* g_profile_Tag_WaraHowl[12]; -extern "C" extern void* g_profile_Tag_WatchGe[12]; -extern "C" extern void* g_profile_Tag_WaterFall[12]; -extern "C" extern void* g_profile_Tag_Wljump[12]; -extern "C" extern void* g_profile_TAG_YAMI[12]; -extern "C" extern void* g_profile_TALK[12]; -extern "C" extern void* g_profile_TBOX_SW[12]; -extern "C" extern void* g_profile_TITLE[12]; -extern "C" extern void* g_profile_WarpBug[12]; - // // Declarations: // diff --git a/rel/f_pc/f_pc_profile_lst/unknown_translation_unit_ctors.cpp b/rel/f_pc/f_pc_profile_lst/unknown_translation_unit_ctors.cpp index a4ff3254454..605bce8c634 100644 --- a/rel/f_pc/f_pc_profile_lst/unknown_translation_unit_ctors.cpp +++ b/rel/f_pc/f_pc_profile_lst/unknown_translation_unit_ctors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80456C7C[4]; -extern u8 const data_80456C7C[4]; - // // External References: // @@ -25,3 +23,10 @@ extern u8 const data_80456C7C[4]; /* ############################################################################################## */ #pragma section ".ctors$10" +/* 80456C7C-80456C80 0004+00 s=0 e=1 z=0 None .ctors None */ +u8 const data_80456C7C[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/rel/f_pc/f_pc_profile_lst/unknown_translation_unit_dtors.cpp b/rel/f_pc/f_pc_profile_lst/unknown_translation_unit_dtors.cpp index 28bf52dafba..6e80bc945e9 100644 --- a/rel/f_pc/f_pc_profile_lst/unknown_translation_unit_dtors.cpp +++ b/rel/f_pc/f_pc_profile_lst/unknown_translation_unit_dtors.cpp @@ -13,8 +13,6 @@ extern u8 const data_80456C80[4]; -extern u8 const data_80456C80[4]; - // // External References: // @@ -26,3 +24,10 @@ extern u8 const data_80456C80[4]; /* ############################################################################################## */ #pragma section ".dtors$10" #pragma section ".dtors$15" +/* 80456C80-80456C84 0004+00 s=0 e=1 z=0 None .dtors None */ +u8 const data_80456C80[4] = { + 0x00, + 0x00, + 0x00, + 0x00, +}; diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp index 0a54fbcf798..955c571e654 100644 --- a/src/DynamicLink.cpp +++ b/src/DynamicLink.cpp @@ -90,8 +90,6 @@ struct DynamicModuleControl { // static void calcSum2(u16 const*, u32); -extern "C" extern char const* const DynamicLink__stringBase0; -extern "C" extern void* __vt__20DynamicModuleControl[13]; extern "C" void __dt__24DynamicModuleControlBaseFv(); extern "C" void __ct__24DynamicModuleControlBaseFv(); @@ -346,9 +344,7 @@ SECTION_SDATA2 static f32 lit_3772[1 + 1 /* padding */] = { }; /* 80455010-80455018 0008+00 s=1 e=0 z=0 None .sdata2 @3774 */ -SECTION_SDATA2 static u8 lit_3774[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3774 = 4503599627370496.0 /* cast u32 to float */; /* 80262470-80262660 01F0+00 s=2 e=2 z=0 None .text dump__24DynamicModuleControlBaseFv */ #pragma push diff --git a/src/a/npc/d_a_npc_cd.cpp b/src/a/npc/d_a_npc_cd.cpp index 1ecf05f37a8..44b5b8989b3 100644 --- a/src/a/npc/d_a_npc_cd.cpp +++ b/src/a/npc/d_a_npc_cd.cpp @@ -24,13 +24,13 @@ struct mDoHIO_entry_c { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -52,10 +52,10 @@ struct daPy_py_c { struct J3DModel {}; -struct J3DJoint {}; - struct J3DAnmTransformKey {}; +struct J3DJoint {}; + struct daNpcCd_c { /* 8015605C */ void NpcCreate(int); /* 801561E8 */ void ObjCreate(int); @@ -91,12 +91,12 @@ struct daNpcCd_HIO_Child_c { /* 80157858 */ daNpcCd_HIO_Child_c(); }; -struct dKy_tevstr_c {}; - struct cXyz { /* 80009184 */ ~cXyz(); }; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -143,11 +143,6 @@ struct Z2CreatureCitizen { // static void jntNodeCallBack(J3DJoint*, int); -extern "C" extern u8 const m_cylDat__9daNpcCd_c[68]; -extern "C" extern char const* const a_npc_d_a_npc_cd__stringBase0; -extern "C" extern void* __vt__18fOpAcm_HIO_entry_c[3]; -extern "C" extern void* __vt__14mDoHIO_entry_c[3]; -extern "C" extern u8 l_Cd_HIO[10684]; extern "C" static void jntNodeCallBack__FP8J3DJointi(); extern "C" void NpcCreate__9daNpcCd_cFi(); @@ -194,13 +189,6 @@ void dComIfG_resDelete(request_of_phase_process_class*, char const*); void cLib_calcTimer__template2(int*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 data_80450FF8[8]; SECTION_INIT void memcpy(); extern "C" void __dt__4cXyzFv(); @@ -739,7 +727,7 @@ SECTION_DEAD static char const* const pad_8039324E = "\0"; #pragma pop /* 804534B8-804534BC 0004+00 s=2 e=0 z=0 None .sdata2 @4021 */ -SECTION_SDATA2 static u32 lit_4021 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4021 = 1.0f; /* 8015605C-801561E8 018C+00 s=0 e=0 z=1 None .text NpcCreate__9daNpcCd_cFi */ #pragma push @@ -897,9 +885,7 @@ SECTION_SDATA2 static f32 lit_4373[1 + 1 /* padding */] = { }; /* 804534C8-804534D0 0008+00 s=3 e=0 z=0 None .sdata2 @4375 */ -SECTION_SDATA2 static u8 lit_4375[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4375 = 4503601774854144.0 /* cast s32 to float */; /* 801563C8-80156B4C 0784+00 s=0 e=0 z=2 None .text setAttention__9daNpcCd_cFi */ #pragma push @@ -1013,7 +999,7 @@ asm void daNpcCd_c::drawNpc() { /* ############################################################################################## */ /* 804534D0-804534D4 0004+00 s=1 e=0 z=0 None .sdata2 @4582 */ -SECTION_SDATA2 static u32 lit_4582 = 0x43360B61; +SECTION_SDATA2 static f32 lit_4582 = 182.04444885253906f; /* 80157084-8015736C 02E8+00 s=1 e=0 z=0 None .text jntNodeCB__9daNpcCd_cFP8J3DJointP8J3DModel */ @@ -1036,10 +1022,10 @@ SECTION_SDATA2 static u8 id[4] = { }; /* 804534D8-804534DC 0004+00 s=1 e=0 z=0 None .sdata2 @4656 */ -SECTION_SDATA2 static u32 lit_4656 = 0x41000000; +SECTION_SDATA2 static f32 lit_4656 = 8.0f; /* 804534DC-804534E0 0004+00 s=1 e=0 z=0 None .sdata2 @4657 */ -SECTION_SDATA2 static u32 lit_4657 = 0x40800000; +SECTION_SDATA2 static f32 lit_4657 = 4.0f; /* 8015736C-80157524 01B8+00 s=1 e=0 z=0 None .text setHitodamaParticle__9daNpcCd_cFv */ #pragma push diff --git a/src/a/npc/d_a_npc_cd2.cpp b/src/a/npc/d_a_npc_cd2.cpp index b8b260a0ea7..0eb720a861e 100644 --- a/src/a/npc/d_a_npc_cd2.cpp +++ b/src/a/npc/d_a_npc_cd2.cpp @@ -13,14 +13,14 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct cXyz { /* 80009184 */ ~cXyz(); }; +struct csXyz { + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -41,13 +41,13 @@ struct mDoExt_btpAnm { struct mDoExt_McaMorfCallBack2_c {}; -struct J3DAnmTransform {}; +struct Z2Creature {}; struct J3DModelData {}; struct mDoExt_McaMorfCallBack1_c {}; -struct Z2Creature {}; +struct J3DAnmTransform {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -67,10 +67,10 @@ struct daPy_py_c { struct J3DModel {}; -struct J3DJoint {}; - struct J3DAnmTransformKey {}; +struct J3DJoint {}; + struct daNpcCd2_c { /* 80157D00 */ void NpcCreate(int); /* 80157F28 */ void ObjCreate(int); @@ -186,10 +186,6 @@ struct J3DFrameCtrl { static void jntNodeCallBack(J3DJoint*, int); static void s_sub1(void*, void*); static void s_sub(void*, void*); -extern "C" extern u8 const m_cylDat__10daNpcCd2_c[68]; -extern "C" extern char const* const a_npc_d_a_npc_cd2__stringBase0; -extern "C" extern u8 l_Cd2_HIO[16396]; -extern "C" extern u8 data_80451010[8]; extern "C" static void jntNodeCallBack__FP8J3DJointi(); extern "C" void NpcCreate__10daNpcCd2_cFi(); @@ -265,17 +261,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_distanceAngleS(s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* __vt__18fOpAcm_HIO_entry_c[3]; -extern "C" extern void* __vt__14mDoHIO_entry_c[3]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; SECTION_INIT void memcpy(); extern "C" void __dt__4cXyzFv(); @@ -948,7 +933,7 @@ SECTION_DEAD static char const* const pad_80393D84 = "\0\0\0"; #pragma pop /* 804534E0-804534E4 0004+00 s=3 e=0 z=0 None .sdata2 @4050 */ -SECTION_SDATA2 static u32 lit_4050 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4050 = 1.0f; /* 80157D00-80157F28 0228+00 s=0 e=0 z=4 None .text NpcCreate__10daNpcCd2_cFi */ #pragma push @@ -2176,9 +2161,7 @@ SECTION_SDATA2 static f32 lit_4586[1 + 1 /* padding */] = { }; /* 804534F0-804534F8 0008+00 s=3 e=0 z=0 None .sdata2 @4588 */ -SECTION_SDATA2 static u8 lit_4588[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4588 = 4503601774854144.0 /* cast s32 to float */; /* 80158420-80158BB8 0798+00 s=0 e=0 z=5 None .text setAttention__10daNpcCd2_cFi */ #pragma push @@ -2284,7 +2267,7 @@ asm void daNpcCd2_c::drawNpc() { /* ############################################################################################## */ /* 804534F8-804534FC 0004+00 s=1 e=0 z=0 None .sdata2 @4845 */ -SECTION_SDATA2 static u32 lit_4845 = 0x43360B61; +SECTION_SDATA2 static f32 lit_4845 = 182.04444885253906f; /* 80159258-80159550 02F8+00 s=1 e=0 z=0 None .text jntNodeCB__10daNpcCd2_cFP8J3DJointP8J3DModel */ @@ -2307,10 +2290,10 @@ SECTION_SDATA2 static u8 id[4] = { }; /* 80453500-80453504 0004+00 s=1 e=0 z=0 None .sdata2 @4921 */ -SECTION_SDATA2 static u32 lit_4921 = 0x41000000; +SECTION_SDATA2 static f32 lit_4921 = 8.0f; /* 80453504-80453508 0004+00 s=1 e=0 z=0 None .sdata2 @4922 */ -SECTION_SDATA2 static u32 lit_4922 = 0x40800000; +SECTION_SDATA2 static f32 lit_4922 = 4.0f; /* 80159550-80159708 01B8+00 s=1 e=0 z=0 None .text setHitodamaParticle__10daNpcCd2_cFv */ #pragma push @@ -2361,14 +2344,10 @@ SECTION_SDATA2 static f32 lit_4970[1 + 1 /* padding */] = { }; /* 80453510-80453518 0008+00 s=1 e=0 z=0 None .sdata2 @4971 */ -SECTION_SDATA2 static u8 lit_4971[8] = { - 0x40, 0x7F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4971 = 500.0; /* 80453518-80453520 0008+00 s=2 e=0 z=0 None .sdata2 @4972 */ -SECTION_SDATA2 static u8 lit_4972[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4972 = 2.0; /* 80159818-801598E8 00D0+00 s=0 e=0 z=5 None .text checkFearSituation__10daNpcCd2_cFv */ #pragma push @@ -2419,14 +2398,10 @@ SECTION_SDATA2 static f32 lit_5050[1 + 1 /* padding */] = { }; /* 80453528-80453530 0008+00 s=4 e=0 z=0 None .sdata2 @5051 */ -SECTION_SDATA2 static u8 lit_5051[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5051 = 0.5; /* 80453530-80453538 0008+00 s=4 e=0 z=0 None .sdata2 @5052 */ -SECTION_SDATA2 static u8 lit_5052[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5052 = 3.0; /* 80453538-80453540 0008+00 s=4 e=0 z=0 None .sdata2 @5053 */ SECTION_SDATA2 static u8 lit_5053[8] = { @@ -2554,9 +2529,7 @@ asm void PathTrace_c::checkObstacle(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80453548-80453550 0008+00 s=1 e=0 z=0 None .sdata2 @5359 */ -SECTION_SDATA2 static u8 lit_5359[8] = { - 0x40, 0x6F, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5359 = 250.0; /* 8015A3E4-8015A4D8 00F4+00 s=1 e=0 z=0 None .text checkObstacleSub__11PathTrace_cFP10fopAc_ac_c */ diff --git a/src/a/obj/d_a_obj_item.cpp b/src/a/obj/d_a_obj_item.cpp index 22101de3a1b..cf7b45c070d 100644 --- a/src/a/obj/d_a_obj_item.cpp +++ b/src/a/obj/d_a_obj_item.cpp @@ -13,8 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -25,6 +23,8 @@ struct cXyz { /* 8026706C */ bool operator!=(Vec const&) const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -260,8 +260,6 @@ static void daItem_Draw(daItem_c*); static void daItem_Execute(daItem_c*); static void daItem_Delete(daItem_c*); static void daItem_Create(fopAc_ac_c*); -extern "C" extern char const* const a_obj_d_a_obj_item__stringBase0; -extern "C" extern void* g_profile_ITEM[12]; extern "C" static void Reflect__FP4cXyzRC13cBgS_PolyInfof(); extern "C" void getData__12daItemBase_cFv(); @@ -355,30 +353,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern u8 const m_data__12daItemBase_c[56]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern void* __vt__12dBgS_ObjAcch[9]; -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__16Z2SoundObjSimple[8]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80451010[8]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); @@ -517,27 +491,17 @@ extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80453550-80453558 0004+04 s=11 e=0 z=0 None .sdata2 @3857 */ -SECTION_SDATA2 static u8 lit_3857[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3857[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80453558-80453560 0008+00 s=2 e=0 z=0 None .sdata2 @3858 */ -SECTION_SDATA2 static u8 lit_3858[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3858 = 0.5; /* 80453560-80453568 0008+00 s=2 e=0 z=0 None .sdata2 @3859 */ -SECTION_SDATA2 static u8 lit_3859[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3859 = 3.0; /* 80453568-80453570 0008+00 s=2 e=0 z=0 None .sdata2 @3860 */ SECTION_SDATA2 static u8 lit_3860[8] = { @@ -596,7 +560,7 @@ asm void daItem_c::setBaseMtx_0() { /* ############################################################################################## */ /* 80453570-80453574 0004+00 s=3 e=0 z=0 None .sdata2 @3923 */ -SECTION_SDATA2 static u32 lit_3923 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3923 = 0.5f; /* 8015B1C8-8015B254 008C+00 s=1 e=0 z=0 None .text setBaseMtx_1__8daItem_cFv */ #pragma push @@ -766,13 +730,13 @@ SECTION_DATA static u8 m_cyl_src__8daItem_c[68] = { }; /* 80453574-80453578 0004+00 s=1 e=0 z=0 None .sdata2 @4067 */ -SECTION_SDATA2 static u32 lit_4067 = 0x41F00000; +SECTION_SDATA2 static f32 lit_4067 = 30.0f; /* 80453578-8045357C 0004+00 s=1 e=0 z=0 None .sdata2 @4068 */ -SECTION_SDATA2 static u32 lit_4068 = 0x461C4000; +SECTION_SDATA2 static f32 lit_4068 = 10000.0f; /* 8045357C-80453580 0004+00 s=7 e=0 z=0 None .sdata2 @4069 */ -SECTION_SDATA2 static u32 lit_4069 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4069 = 1.0f; /* 80453580-80453588 0004+04 s=2 e=0 z=0 None .sdata2 @4070 */ SECTION_SDATA2 static f32 lit_4070[1 + 1 /* padding */] = { @@ -782,9 +746,7 @@ SECTION_SDATA2 static f32 lit_4070[1 + 1 /* padding */] = { }; /* 80453588-80453590 0008+00 s=3 e=0 z=0 None .sdata2 @4072 */ -SECTION_SDATA2 static u8 lit_4072[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4072 = 4503599627370496.0 /* cast u32 to float */; /* 8015B3D8-8015B7BC 03E4+00 s=1 e=0 z=0 None .text CreateInit__8daItem_cFv */ #pragma push @@ -909,10 +871,10 @@ asm Z2SoundObjSimple::~Z2SoundObjSimple() { /* ############################################################################################## */ /* 80453590-80453594 0004+00 s=1 e=0 z=0 None .sdata2 @4320 */ -SECTION_SDATA2 static u32 lit_4320 = 0x43960000; +SECTION_SDATA2 static f32 lit_4320 = 300.0f; /* 80453594-80453598 0004+00 s=1 e=0 z=0 None .sdata2 @4321 */ -SECTION_SDATA2 static u32 lit_4321 = 0x41900000; +SECTION_SDATA2 static f32 lit_4321 = 18.0f; /* 8015BA9C-8015BD84 02E8+00 s=1 e=0 z=0 None .text _daItem_execute__8daItem_cFv */ #pragma push @@ -991,7 +953,7 @@ asm void daItem_c::procMainForceGet() { /* ############################################################################################## */ /* 80453598-8045359C 0004+00 s=3 e=0 z=0 None .sdata2 @4404 */ -SECTION_SDATA2 static u32 lit_4404 = 0x41700000; +SECTION_SDATA2 static f32 lit_4404 = 15.0f; /* 8015C058-8015C134 00DC+00 s=4 e=0 z=0 None .text procInitSimpleGetDemo__8daItem_cFv */ #pragma push @@ -1053,7 +1015,7 @@ asm void daItem_c::procMainGetDemoEvent() { /* ############################################################################################## */ /* 8045359C-804535A0 0004+00 s=2 e=0 z=0 None .sdata2 @4506 */ -SECTION_SDATA2 static u32 lit_4506 = 0x40000000; +SECTION_SDATA2 static f32 lit_4506 = 2.0f; /* 8015C41C-8015C514 00F8+00 s=1 e=0 z=0 None .text procInitBoomerangCarry__8daItem_cFv */ #pragma push @@ -1067,7 +1029,7 @@ asm void daItem_c::procInitBoomerangCarry() { /* ############################################################################################## */ /* 804535A0-804535A4 0004+00 s=2 e=0 z=0 None .sdata2 @4524 */ -SECTION_SDATA2 static u32 lit_4524 = 0x43480000; +SECTION_SDATA2 static f32 lit_4524 = 200.0f; /* 8015C514-8015C5F4 00E0+00 s=1 e=0 z=0 None .text procMainBoomerangCarry__8daItem_cFv */ #pragma push @@ -1111,7 +1073,7 @@ asm void daItem_c::procInitBoomHitWait() { /* ############################################################################################## */ /* 804535A4-804535A8 0004+00 s=2 e=0 z=0 None .sdata2 @4665 */ -SECTION_SDATA2 static u32 lit_4665 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4665 = 100.0f; /* 804535A8-804535B0 0004+04 s=2 e=0 z=0 None .sdata2 @4666 */ SECTION_SDATA2 static f32 lit_4666[1 + 1 /* padding */] = { @@ -1121,9 +1083,7 @@ SECTION_SDATA2 static f32 lit_4666[1 + 1 /* padding */] = { }; /* 804535B0-804535B8 0008+00 s=3 e=0 z=0 None .sdata2 @4668 */ -SECTION_SDATA2 static u8 lit_4668[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4668 = 4503601774854144.0 /* cast s32 to float */; /* 8015C738-8015CAB8 0380+00 s=1 e=0 z=0 None .text procMainBoomHitWait__8daItem_cFv */ #pragma push @@ -1177,7 +1137,7 @@ asm void daItem_c::mode_wait() { /* ############################################################################################## */ /* 804535B8-804535BC 0004+00 s=1 e=0 z=0 None .sdata2 @4781 */ -SECTION_SDATA2 static u32 lit_4781 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4781 = 1.0f / 10.0f; /* 8015CDCC-8015CE94 00C8+00 s=1 e=0 z=0 None .text mode_water__8daItem_cFv */ #pragma push @@ -1211,7 +1171,7 @@ asm void daItem_c::itemGetNextExecute() { /* ############################################################################################## */ /* 804535BC-804535C0 0004+00 s=3 e=0 z=0 None .sdata2 @4923 */ -SECTION_SDATA2 static u32 lit_4923 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4923 = -1.0f; /* 8015D0A8-8015D370 02C8+00 s=2 e=0 z=0 None .text itemGet__8daItem_cFv */ #pragma push @@ -1265,7 +1225,7 @@ asm void daItem_c::deleteItem() { /* ############################################################################################## */ /* 804535C0-804535C4 0004+00 s=1 e=0 z=0 None .sdata2 @4979 */ -SECTION_SDATA2 static u32 lit_4979 = 0x3F733333; +SECTION_SDATA2 static f32 lit_4979 = 19.0f / 20.0f; /* 8015D4AC-8015D56C 00C0+00 s=1 e=0 z=0 None .text itemActionForRupee__8daItem_cFv */ #pragma push @@ -1309,10 +1269,10 @@ asm void daItem_c::itemActionForBoomerang() { /* ############################################################################################## */ /* 804535C4-804535C8 0004+00 s=3 e=0 z=0 None .sdata2 @5050 */ -SECTION_SDATA2 static u32 lit_5050 = 0x40A00000; +SECTION_SDATA2 static f32 lit_5050 = 5.0f; /* 804535C8-804535CC 0004+00 s=1 e=0 z=0 None .sdata2 @5051 */ -SECTION_SDATA2 static u32 lit_5051 = 0x40400000; +SECTION_SDATA2 static f32 lit_5051 = 3.0f; /* 8015D734-8015D834 0100+00 s=2 e=0 z=0 None .text bg_check__8daItem_cFv */ #pragma push @@ -1354,7 +1314,7 @@ asm void daItem_c::CountTimer() { /* ############################################################################################## */ /* 804535CC-804535D0 0004+00 s=1 e=0 z=0 None .sdata2 @5110 */ -SECTION_SDATA2 static u32 lit_5110 = 0x41A00000; +SECTION_SDATA2 static f32 lit_5110 = 20.0f; /* 8015D9F0-8015DAAC 00BC+00 s=1 e=0 z=0 None .text initAction__8daItem_cFv */ #pragma push @@ -1388,16 +1348,16 @@ asm void daItem_c::initScale() { /* ############################################################################################## */ /* 804535D0-804535D4 0004+00 s=1 e=0 z=0 None .sdata2 @5230 */ -SECTION_SDATA2 static u32 lit_5230 = 0x3F333333; +SECTION_SDATA2 static f32 lit_5230 = 7.0f / 10.0f; /* 804535D4-804535D8 0004+00 s=1 e=0 z=0 None .sdata2 @5231 */ -SECTION_SDATA2 static u32 lit_5231 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_5231 = 6.0f / 5.0f; /* 804535D8-804535DC 0004+00 s=1 e=0 z=0 None .sdata2 @5232 */ -SECTION_SDATA2 static u32 lit_5232 = 0x3F0CCCCD; +SECTION_SDATA2 static f32 lit_5232 = 11.0f / 20.0f; /* 804535DC-804535E0 0004+00 s=1 e=0 z=0 None .sdata2 @5233 */ -SECTION_SDATA2 static u32 lit_5233 = 0x42480000; +SECTION_SDATA2 static f32 lit_5233 = 50.0f; /* 8015DC40-8015DE38 01F8+00 s=2 e=0 z=0 None .text initSpeed__8daItem_cFi */ #pragma push diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp index f0d47e13199..3cf8b3acfcd 100644 --- a/src/c/c_damagereaction.cpp +++ b/src/c/c_damagereaction.cpp @@ -34,9 +34,6 @@ struct JPAParticleCallBack { // void cDmrNowMidnaTalk(); -extern "C" extern void* __vt__19JPAParticleCallBack[5]; -extern "C" extern u8 data_80450CA0[4]; -extern "C" extern u8 JPTracePCB4[4]; extern "C" void execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle(); extern "C" void draw__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle(); @@ -55,7 +52,6 @@ extern "C" extern u8 JPTracePCB4[4]; void fopAcM_getTalkEventPartner(fopAc_ac_c const*); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void fopAcM_getTalkEventPartner__FPC10fopAc_ac_c(); extern "C" void __dt__19JPAParticleCallBackFv(); @@ -69,7 +65,7 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; /* ############################################################################################## */ /* 80451BA8-80451BAC 0004+00 s=1 e=0 z=0 None .sdata2 @3731 */ -SECTION_SDATA2 static u32 lit_3731 = 0x41C80000; +SECTION_SDATA2 static f32 lit_3731 = 25.0f; /* 80451BAC-80451BB0 0004+00 s=1 e=0 z=0 None .sdata2 @3732 */ SECTION_SDATA2 static u8 lit_3732[4] = { @@ -80,15 +76,13 @@ SECTION_SDATA2 static u8 lit_3732[4] = { }; /* 80451BB0-80451BB4 0004+00 s=1 e=0 z=0 None .sdata2 @3733 */ -SECTION_SDATA2 static u32 lit_3733 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_3733 = 3.0f / 10.0f; /* 80451BB4-80451BB8 0004+00 s=1 e=0 z=0 None .sdata2 @3734 */ -SECTION_SDATA2 static u32 lit_3734 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3734 = 0.5f; /* 80451BB8-80451BC0 0008+00 s=1 e=0 z=0 None .sdata2 @3736 */ -SECTION_SDATA2 static u8 lit_3736[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3736 = 4503599627370496.0 /* cast u32 to float */; /* 8001817C-800182A4 0128+00 s=1 e=0 z=0 None .text * execute__24JPTraceParticleCallBack4FP14JPABaseEmitterP15JPABaseParticle */ diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index 9a80b89d02d..618bb050801 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -68,7 +68,6 @@ void cDyl_LinkASync(s16); static void cDyl_InitCallback(void*); void cDyl_InitAsync(); void cDyl_InitAsyncIsDone(); -extern "C" extern char const* const c_c_dylink__stringBase0; extern "C" static void cCc_Init__Fv(); extern "C" void cDyl_IsLinked__Fs(); @@ -95,7 +94,6 @@ void fopScnM_CreateReq(s16, s16, u16, u32); void dComLbG_PhaseHandler(request_of_phase_process_class*, int (**)(void*), void*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__20DynamicModuleControl[13]; SECTION_INIT void memset(); extern "C" void OSReport_Error(); diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index 381b5737dfc..62a5961941d 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -15,14 +15,6 @@ struct stage_stag_info_class {}; struct request_of_phase_process_class {}; -struct csXyz { - /* 80018BD0 */ ~csXyz(); - /* 80112C80 */ csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); -}; - -struct Quaternion {}; - struct Vec {}; struct cXyz { @@ -44,6 +36,14 @@ struct cXyz { /* 80267150 */ void atan2sY_XZ() const; }; +struct Quaternion {}; + +struct csXyz { + /* 80018BD0 */ ~csXyz(); + /* 80112C80 */ csXyz(); + /* 802673F4 */ csXyz(s16, s16, s16); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CDD4 */ void transM(cXyz const&); @@ -54,10 +54,10 @@ struct mDoMtx_stack_c { /* 8000CF7C */ void quatM(Quaternion const*); }; -struct J3DDeformData {}; - struct J3DAnmCluster {}; +struct J3DDeformData {}; + struct mDoExt_blkAnm { /* 8000DA08 */ void init(J3DDeformData*, J3DAnmCluster*, int, int, f32, s16, s16); }; @@ -489,6 +489,42 @@ struct daAlink_footData_c { /* 800CFCF4 */ daAlink_footData_c(); }; +struct dCcG_At_Spl {}; + +struct cM3dGPla { + /* 8001DB90 */ ~cM3dGPla(); + /* 801411F0 */ cM3dGPla(); + /* 8026F3DC */ cM3dGPla(cXyz const*, f32); + /* 8026F408 */ void crossInfLin(cXyz const&, cXyz const&, cXyz&) const; +}; + +struct JKRHeap { + /* 802CE5CC */ void freeAll(); +}; + +struct JKRExpHeap { + /* 802CEE2C */ void create(u32, JKRHeap*, bool); +}; + +struct JPABaseEmitter {}; + +struct _GXColorS10 {}; + +struct J3DAnmTevRegKey { + /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const; + /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); +}; + +struct dBgS_LinChk { + /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); +}; + +struct dBgW_Base { + struct PushPullLabel {}; +}; + +struct daAlinkHIO_anm_c {}; + struct dCcD_GObjInf { /* 80083A28 */ dCcD_GObjInf(); /* 800840E4 */ ~dCcD_GObjInf(); @@ -504,18 +540,9 @@ struct dCcD_GObjInf { /* 800846B0 */ void ResetCoHit(); }; -struct JPABaseEmitter {}; - -struct J3DGXColorS10 { - /* 8000E460 */ J3DGXColorS10(); -}; - -struct JKRHeap { - /* 802CE5CC */ void freeAll(); -}; - -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); +struct dDemo_actor_c { + /* 8003819C */ void getPrm_Morf(); + /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); }; struct J3DAnmBase {}; @@ -524,35 +551,8 @@ struct dAttList_c { /* 80073864 */ void getActor(); }; -struct cM3dGPla { - /* 8001DB90 */ ~cM3dGPla(); - /* 801411F0 */ cM3dGPla(); - /* 8026F3DC */ cM3dGPla(cXyz const*, f32); - /* 8026F408 */ void crossInfLin(cXyz const&, cXyz const&, cXyz&) const; -}; - -struct dDemo_actor_c { - /* 8003819C */ void getPrm_Morf(); - /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*); -}; - -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dBgW_Base { - struct PushPullLabel {}; -}; - -struct daAlinkHIO_anm_c {}; - -struct dCcG_At_Spl {}; - -struct _GXColorS10 {}; - -struct J3DAnmTevRegKey { - /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const; - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); +struct J3DGXColorS10 { + /* 8000E460 */ J3DGXColorS10(); }; struct daAlink_c { @@ -2574,6 +2574,13 @@ struct dPa_control_c { cXyz const*, int, dPa_levelEcallBack*, s8, cXyz const*); }; +struct dBgS_AcchCir { + /* 80075EAC */ dBgS_AcchCir(); + /* 80075F40 */ void SetWallR(f32); + /* 80075F58 */ void SetWall(f32, f32); + /* 80077414 */ ~dBgS_AcchCir(); +}; + struct dBgS_RoofChk { /* 80078FF4 */ dBgS_RoofChk(); /* 80079090 */ ~dBgS_RoofChk(); @@ -2605,13 +2612,6 @@ struct dBgS { dBgW_Base::PushPullLabel); }; -struct dBgS_AcchCir { - /* 80075EAC */ dBgS_AcchCir(); - /* 80075F40 */ void SetWallR(f32); - /* 80075F58 */ void SetWall(f32, f32); - /* 80077414 */ ~dBgS_AcchCir(); -}; - struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -2724,15 +2724,15 @@ struct dDlst_peekZ_c { /* 80056018 */ void newData(s16, s16, u32*); }; -struct J3DDrawBuffer; -struct J3DPacket { - /* 80312750 */ bool entry(J3DDrawBuffer*); -}; - +struct J3DPacket; struct J3DDrawBuffer { /* 8032548C */ void entryImm(J3DPacket*, u16); }; +struct J3DPacket { + /* 80312750 */ bool entry(J3DDrawBuffer*); +}; + struct dDlst_list_c { /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&); }; @@ -3153,10 +3153,10 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; -struct J2DAnmTevRegKey {}; - struct J2DAnmColor {}; +struct J2DAnmTevRegKey {}; + struct J2DPane { /* 80126350 */ void setAnimation(J2DAnmTevRegKey*); /* 80126354 */ void setAnimation(J2DAnmColor*); @@ -3239,18 +3239,6 @@ static void dComIfGs_getRupee(); static void dComIfGp_setItemRupeeCount(s32); static void dMeter2Info_setFloatingMessage(u16, s16, bool); void cLib_calcTimer__template0(u8*); -extern "C" extern u8 const m__21daAlinkHIO_gAtKick_c0[36]; -extern "C" extern u8 const m__21daAlinkHIO_zwLight_c0[28]; -extern "C" extern u8 const m__20daAlinkHIO_wlBall_c0[56]; -extern "C" extern u8 const l_worldChangeEventName[16]; -extern "C" extern u8 const l_wolfWorldChangeEventName[21 + 3 /* padding */]; -extern "C" extern u8 const l_crawlStartFrontOffset[12]; -extern "C" extern u8 const m_handLeftInSidePos__9daAlink_c[12]; -extern "C" extern u8 const m_handRightInSidePos__9daAlink_c[12]; -extern "C" extern u8 const data_80391FBC[12]; -extern "C" extern char const* const d_a_d_a_alink__stringBase0; -extern "C" extern void* g_profile_ALINK[12 + 9 /* padding */]; -extern "C" extern void* __vt__12dBgS_ObjAcch[9]; extern "C" bool getE3Zhint__9daAlink_cFv(); extern "C" void getAlinkArcName__9daAlink_cFv(); @@ -5616,82 +5604,6 @@ void* operator new[](u32); void* operator new[](u32, int); void operator delete(void*); void JMAEulerToQuat(s16, s16, s16, Quaternion*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* data_803A3360[11]; -extern "C" extern void* __vt__19J3DMtxCalcNoAnmBase[11]; -extern "C" extern void* __vt__28mDoExt_MtxCalcAnmBlendTblOld[11]; -extern "C" extern void* __vt__25mDoExt_MtxCalcAnmBlendTbl[11]; -extern "C" extern void* __vt__10J3DMtxCalc[11 + 1 /* padding */]; -extern "C" extern void* __vt__19JPAParticleCallBack[5]; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8cM3dGSph[3]; -extern "C" extern void* __vt__22dPa_hermiteEcallBack_c[9]; -extern "C" extern void* __vt__18dPa_levelEcallBack[9]; -extern "C" extern void* __vt__18JPAEmitterCallBack[7]; -extern "C" extern u8 m_typeFourData__8dPaPoF_c[60]; -extern "C" extern u8 m_emitterFourData__8dPaPoF_c[60 + 28 /* padding */]; -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__10dCcD_GStts[3]; -extern "C" extern void* __vt__10cCcD_GStts[3]; -extern "C" extern void* __vt__18daPy_sightPacket_c[4 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseX__4cXyz[12]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 BaseZ__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u16 m_branchId__7dDemo_c[1 + 3 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern u8 data_80450B38[4]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_top__12daTagHstop_c[4 + 4 /* padding */]; -extern "C" extern u8 m_object__7dDemo_c[4]; -extern "C" extern u8 mWaterBubblePcallBack__13dPa_control_c[4]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450FB8[4]; -extern "C" extern u8 struct_80450FBC[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_8045101C[4]; -extern "C" extern u8 Zero__5csXyz[4]; -extern "C" extern u8 data_80451164[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 mLinkPtr__14Z2CreatureLink[4 + 4 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void __dt__4cXyzFv(); extern "C" s32 getAtnActorID__9daPy_py_cCFv(); @@ -6586,33 +6498,31 @@ static u8 struct_80450FC4[4]; static u8 struct_80450FC8[4]; /* 80452C98-80452C9C 0004+00 s=102 e=0 z=0 None .sdata2 @5943 */ -SECTION_SDATA2 static u32 lit_5943 = 0x3F000000; +SECTION_SDATA2 static f32 lit_5943 = 0.5f; /* 80452C9C-80452CA0 0004+00 s=23 e=0 z=0 None .sdata2 @5944 */ -SECTION_SDATA2 static u32 lit_5944 = 0x41C80000; +SECTION_SDATA2 static f32 lit_5944 = 25.0f; /* 80452CA0-80452CA4 0004+00 s=3 e=0 z=0 None .sdata2 @5945 */ -SECTION_SDATA2 static u32 lit_5945 = 0xC1C80000; +SECTION_SDATA2 static f32 lit_5945 = -25.0f; /* 80452CA4-80452CA8 0004+00 s=122 e=0 z=0 None .sdata2 @6021 */ -SECTION_SDATA2 static u32 lit_6021 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_6021 = 1.0f / 20.0f; /* 80452CA8-80452CAC 0004+00 s=1 e=0 z=0 None .sdata2 @6022 */ -SECTION_SDATA2 static u32 lit_6022 = 0x44000000; +SECTION_SDATA2 static f32 lit_6022 = 512.0f; /* 80452CAC-80452CB0 0004+00 s=6 e=0 z=0 None .sdata2 @6023 */ -SECTION_SDATA2 static u32 lit_6023 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_6023 = 3.0f / 5.0f; /* 80452CB0-80452CB8 0008+00 s=117 e=0 z=0 None .sdata2 @6025 */ -SECTION_SDATA2 static u8 lit_6025[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6025 = 4503601774854144.0 /* cast s32 to float */; /* 80452CB8-80452CBC 0004+00 s=327 e=0 z=0 None .sdata2 @6040 */ -SECTION_SDATA2 static u32 lit_6040 = 0x3F800000; +SECTION_SDATA2 static f32 lit_6040 = 1.0f; /* 80452CBC-80452CC0 0004+00 s=182 e=0 z=0 None .sdata2 @6041 */ -SECTION_SDATA2 static u32 lit_6041 = 0xBF800000; +SECTION_SDATA2 static f32 lit_6041 = -1.0f; /* 80452CC0-80452CC4 0004+00 s=674 e=0 z=0 None .sdata2 @6108 */ SECTION_SDATA2 static u8 lit_6108[4] = { @@ -6750,25 +6660,25 @@ asm static void daAlink_modelCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80452CC4-80452CC8 0004+00 s=137 e=0 z=0 None .sdata2 @6109 */ -SECTION_SDATA2 static u32 lit_6109 = 0x40400000; +SECTION_SDATA2 static f32 lit_6109 = 3.0f; /* 80452CC8-80452CCC 0004+00 s=1 e=0 z=0 None .sdata2 @6183 */ -SECTION_SDATA2 static u32 lit_6183 = 0x4B189680; +SECTION_SDATA2 static f32 lit_6183 = 10000000.0f; /* 80452CCC-80452CD0 0004+00 s=2 e=0 z=0 None .sdata2 @6237 */ -SECTION_SDATA2 static u32 lit_6237 = 0x48742400; +SECTION_SDATA2 static f32 lit_6237 = 250000.0f; /* 80452CD0-80452CD4 0004+00 s=6 e=0 z=0 None .sdata2 @6238 */ -SECTION_SDATA2 static u32 lit_6238 = 0x43960000; +SECTION_SDATA2 static f32 lit_6238 = 300.0f; /* 80452CD4-80452CD8 0004+00 s=1 e=0 z=0 None .sdata2 @6398 */ -SECTION_SDATA2 static u32 lit_6398 = 0x481C4000; +SECTION_SDATA2 static f32 lit_6398 = 160000.0f; /* 80452CD8-80452CDC 0004+00 s=1 e=0 z=0 None .sdata2 @6399 */ -SECTION_SDATA2 static u32 lit_6399 = 0x4845C100; +SECTION_SDATA2 static f32 lit_6399 = 202500.0f; /* 80452CDC-80452CE0 0004+00 s=1 e=0 z=0 None .sdata2 @6400 */ -SECTION_SDATA2 static u32 lit_6400 = 0x43AF0000; +SECTION_SDATA2 static f32 lit_6400 = 350.0f; /* 80452CE0-80452CE8 0004+04 s=59 e=0 z=0 None .sdata2 @6845 */ SECTION_SDATA2 static f32 lit_6845[1 + 1 /* padding */] = { @@ -6778,14 +6688,10 @@ SECTION_SDATA2 static f32 lit_6845[1 + 1 /* padding */] = { }; /* 80452CE8-80452CF0 0008+00 s=84 e=0 z=0 None .sdata2 @6846 */ -SECTION_SDATA2 static u8 lit_6846[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6846 = 0.5; /* 80452CF0-80452CF8 0008+00 s=84 e=0 z=0 None .sdata2 @6847 */ -SECTION_SDATA2 static u8 lit_6847[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6847 = 3.0; /* 80452CF8-80452D00 0008+00 s=84 e=0 z=0 None .sdata2 @6848 */ SECTION_SDATA2 static u8 lit_6848[8] = { @@ -6793,364 +6699,364 @@ SECTION_SDATA2 static u8 lit_6848[8] = { }; /* 80452D00-80452D04 0004+00 s=47 e=0 z=0 None .sdata2 @6895 */ -SECTION_SDATA2 static u32 lit_6895 = 0x42480000; +SECTION_SDATA2 static f32 lit_6895 = 50.0f; /* 80452D04-80452D08 0004+00 s=6 e=0 z=0 None .sdata2 @6896 */ -SECTION_SDATA2 static u32 lit_6896 = 0x43020000; +SECTION_SDATA2 static f32 lit_6896 = 130.0f; /* 80452D08-80452D0C 0004+00 s=1 e=0 z=0 None .sdata2 @7174 */ -SECTION_SDATA2 static u32 lit_7174 = 0x491C4000; +SECTION_SDATA2 static f32 lit_7174 = 640000.0f; /* 80452D0C-80452D10 0004+00 s=1 e=0 z=0 None .sdata2 @7305 */ -SECTION_SDATA2 static u32 lit_7305 = 0x3FACCCCD; +SECTION_SDATA2 static f32 lit_7305 = 27.0f / 20.0f; /* 80452D10-80452D14 0004+00 s=15 e=0 z=0 None .sdata2 @7306 */ -SECTION_SDATA2 static u32 lit_7306 = 0x428C0000; +SECTION_SDATA2 static f32 lit_7306 = 70.0f; /* 80452D14-80452D18 0004+00 s=57 e=0 z=0 None .sdata2 @7307 */ -SECTION_SDATA2 static u32 lit_7307 = 0x40000000; +SECTION_SDATA2 static f32 lit_7307 = 2.0f; /* 80452D18-80452D1C 0004+00 s=9 e=0 z=0 None .sdata2 @7308 */ -SECTION_SDATA2 static u32 lit_7308 = 0x43FA0000; +SECTION_SDATA2 static f32 lit_7308 = 500.0f; /* 80452D1C-80452D20 0004+00 s=23 e=0 z=0 None .sdata2 @7448 */ -SECTION_SDATA2 static u32 lit_7448 = 0x41400000; +SECTION_SDATA2 static f32 lit_7448 = 12.0f; /* 80452D20-80452D24 0004+00 s=11 e=0 z=0 None .sdata2 @7449 */ -SECTION_SDATA2 static u32 lit_7449 = 0x41C00000; +SECTION_SDATA2 static f32 lit_7449 = 24.0f; /* 80452D24-80452D28 0004+00 s=38 e=0 z=0 None .sdata2 @7450 */ -SECTION_SDATA2 static u32 lit_7450 = 0x40800000; +SECTION_SDATA2 static f32 lit_7450 = 4.0f; /* 80452D28-80452D2C 0004+00 s=7 e=0 z=0 None .sdata2 @7451 */ -SECTION_SDATA2 static u32 lit_7451 = 0x41D00000; +SECTION_SDATA2 static f32 lit_7451 = 26.0f; /* 80452D2C-80452D30 0004+00 s=28 e=0 z=0 None .sdata2 @7624 */ -SECTION_SDATA2 static u32 lit_7624 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_7624 = 1.5f; /* 80452D30-80452D34 0004+00 s=67 e=0 z=0 None .sdata2 @7625 */ -SECTION_SDATA2 static u32 lit_7625 = 0x41200000; +SECTION_SDATA2 static f32 lit_7625 = 10.0f; /* 80452D34-80452D38 0004+00 s=36 e=0 z=0 None .sdata2 @7710 */ -SECTION_SDATA2 static u32 lit_7710 = 0x41100000; +SECTION_SDATA2 static f32 lit_7710 = 9.0f; /* 80452D38-80452D3C 0004+00 s=5 e=0 z=0 None .sdata2 @7807 */ -SECTION_SDATA2 static u32 lit_7807 = 0x41D80000; +SECTION_SDATA2 static f32 lit_7807 = 27.0f; /* 80452D3C-80452D40 0004+00 s=82 e=0 z=0 None .sdata2 @7808 */ -SECTION_SDATA2 static u32 lit_7808 = 0x40A00000; +SECTION_SDATA2 static f32 lit_7808 = 5.0f; /* 80452D40-80452D44 0004+00 s=1 e=0 z=0 None .sdata2 @7945 */ -SECTION_SDATA2 static u32 lit_7945 = 0x42300000; +SECTION_SDATA2 static f32 lit_7945 = 44.0f; /* 80452D44-80452D48 0004+00 s=27 e=0 z=0 None .sdata2 @7977 */ -SECTION_SDATA2 static u32 lit_7977 = 0x40C00000; +SECTION_SDATA2 static f32 lit_7977 = 6.0f; /* 80452D48-80452D4C 0004+00 s=21 e=0 z=0 None .sdata2 @8130 */ -SECTION_SDATA2 static u32 lit_8130 = 0x41600000; +SECTION_SDATA2 static f32 lit_8130 = 14.0f; /* 80452D4C-80452D50 0004+00 s=8 e=0 z=0 None .sdata2 @8131 */ -SECTION_SDATA2 static u32 lit_8131 = 0xBF000000; +SECTION_SDATA2 static f32 lit_8131 = -0.5f; /* 80452D50-80452D54 0004+00 s=39 e=0 z=0 None .sdata2 @8247 */ -SECTION_SDATA2 static u32 lit_8247 = 0x42C80000; +SECTION_SDATA2 static f32 lit_8247 = 100.0f; /* 80452D54-80452D58 0004+00 s=6 e=0 z=0 None .sdata2 @8248 */ -SECTION_SDATA2 static u32 lit_8248 = 0x42BE0000; +SECTION_SDATA2 static f32 lit_8248 = 95.0f; /* 80452D58-80452D5C 0004+00 s=3 e=0 z=0 None .sdata2 @8249 */ -SECTION_SDATA2 static u32 lit_8249 = 0x44480000; +SECTION_SDATA2 static f32 lit_8249 = 800.0f; /* 80452D5C-80452D60 0004+00 s=9 e=0 z=0 None .sdata2 @8322 */ -SECTION_SDATA2 static u32 lit_8322 = 0x461C4000; +SECTION_SDATA2 static f32 lit_8322 = 10000.0f; /* 80452D60-80452D64 0004+00 s=3 e=0 z=0 None .sdata2 @8369 */ -SECTION_SDATA2 static u32 lit_8369 = 0x42140000; +SECTION_SDATA2 static f32 lit_8369 = 37.0f; /* 80452D64-80452D68 0004+00 s=1 e=0 z=0 None .sdata2 @8370 */ -SECTION_SDATA2 static u32 lit_8370 = 0x42580000; +SECTION_SDATA2 static f32 lit_8370 = 54.0f; /* 80452D68-80452D6C 0004+00 s=13 e=0 z=0 None .sdata2 @8472 */ -SECTION_SDATA2 static u32 lit_8472 = 0x43480000; +SECTION_SDATA2 static f32 lit_8472 = 200.0f; /* 80452D6C-80452D70 0004+00 s=9 e=0 z=0 None .sdata2 @8473 */ -SECTION_SDATA2 static u32 lit_8473 = 0xC0000000; +SECTION_SDATA2 static f32 lit_8473 = -2.0f; /* 80452D70-80452D74 0004+00 s=3 e=0 z=0 None .sdata2 @8501 */ -SECTION_SDATA2 static u32 lit_8501 = 0x3F7D70A4; +SECTION_SDATA2 static f32 lit_8501 = 99.0f / 100.0f; /* 80452D74-80452D78 0004+00 s=21 e=0 z=0 None .sdata2 @8502 */ -SECTION_SDATA2 static u32 lit_8502 = 0x40E00000; +SECTION_SDATA2 static f32 lit_8502 = 7.0f; /* 80452D78-80452D7C 0004+00 s=31 e=0 z=0 None .sdata2 @8676 */ -SECTION_SDATA2 static u32 lit_8676 = 0x41A00000; +SECTION_SDATA2 static f32 lit_8676 = 20.0f; /* 80452D7C-80452D80 0004+00 s=5 e=0 z=0 None .sdata2 @8779 */ -SECTION_SDATA2 static u32 lit_8779 = 0x421C0000; +SECTION_SDATA2 static f32 lit_8779 = 39.0f; /* 80452D80-80452D84 0004+00 s=7 e=0 z=0 None .sdata2 @8780 */ -SECTION_SDATA2 static u32 lit_8780 = 0x42100000; +SECTION_SDATA2 static f32 lit_8780 = 36.0f; /* 80452D84-80452D88 0004+00 s=19 e=0 z=0 None .sdata2 @8781 */ -SECTION_SDATA2 static u32 lit_8781 = 0x41500000; +SECTION_SDATA2 static f32 lit_8781 = 13.0f; /* 80452D88-80452D8C 0004+00 s=29 e=0 z=0 None .sdata2 @8782 */ -SECTION_SDATA2 static u32 lit_8782 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_8782 = 1.0f / 100.0f; /* 80452D8C-80452D90 0004+00 s=23 e=0 z=0 None .sdata2 @8783 */ -SECTION_SDATA2 static u32 lit_8783 = 0x41000000; +SECTION_SDATA2 static f32 lit_8783 = 8.0f; /* 80452D90-80452D94 0004+00 s=4 e=0 z=0 None .sdata2 @8784 */ -SECTION_SDATA2 static u32 lit_8784 = 0x41E00000; +SECTION_SDATA2 static f32 lit_8784 = 28.0f; /* 80452D94-80452D98 0004+00 s=10 e=0 z=0 None .sdata2 @8785 */ -SECTION_SDATA2 static u32 lit_8785 = 0x42180000; +SECTION_SDATA2 static f32 lit_8785 = 38.0f; /* 80452D98-80452D9C 0004+00 s=4 e=0 z=0 None .sdata2 @8786 */ -SECTION_SDATA2 static u32 lit_8786 = 0x42400000; +SECTION_SDATA2 static f32 lit_8786 = 48.0f; /* 80452D9C-80452DA0 0004+00 s=4 e=0 z=0 None .sdata2 @9053 */ -SECTION_SDATA2 static u32 lit_9053 = 0xC1200000; +SECTION_SDATA2 static f32 lit_9053 = -10.0f; /* 80452DA0-80452DA4 0004+00 s=43 e=0 z=0 None .sdata2 @9054 */ -SECTION_SDATA2 static u32 lit_9054 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_9054 = 1.0f / 10.0f; /* 80452DA4-80452DA8 0004+00 s=19 e=0 z=0 None .sdata2 @9138 */ -SECTION_SDATA2 static u32 lit_9138 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_9138 = -1000000000.0f; /* 80452DA8-80452DAC 0004+00 s=15 e=0 z=0 None .sdata2 @9652 */ -SECTION_SDATA2 static u32 lit_9652 = 0x3F333333; +SECTION_SDATA2 static f32 lit_9652 = 7.0f / 10.0f; /* 80452DAC-80452DB0 0004+00 s=8 e=0 z=0 None .sdata2 @9828 */ -SECTION_SDATA2 static u32 lit_9828 = 0x40490FDB; +SECTION_SDATA2 static f32 lit_9828 = 3.1415927410125732f; /* 80452DB0-80452DB4 0004+00 s=13 e=0 z=0 None .sdata2 @10039 */ -SECTION_SDATA2 static u32 lit_10039 = 0x42A00000; +SECTION_SDATA2 static f32 lit_10039 = 80.0f; /* 80452DB4-80452DB8 0004+00 s=14 e=0 z=0 None .sdata2 @10040 */ -SECTION_SDATA2 static u32 lit_10040 = 0x42700000; +SECTION_SDATA2 static f32 lit_10040 = 60.0f; /* 80452DB8-80452DBC 0004+00 s=15 e=0 z=0 None .sdata2 @10041 */ -SECTION_SDATA2 static u32 lit_10041 = 0x447A0000; +SECTION_SDATA2 static f32 lit_10041 = 1000.0f; /* 80452DBC-80452DC0 0004+00 s=15 e=0 z=0 None .sdata2 @10042 */ -SECTION_SDATA2 static u32 lit_10042 = 0x420C0000; +SECTION_SDATA2 static f32 lit_10042 = 35.0f; /* 80452DC0-80452DC4 0004+00 s=12 e=0 z=0 None .sdata2 @10193 */ -SECTION_SDATA2 static u32 lit_10193 = 0x41900000; +SECTION_SDATA2 static f32 lit_10193 = 18.0f; /* 80452DC4-80452DC8 0004+00 s=6 e=0 z=0 None .sdata2 @10194 */ -SECTION_SDATA2 static u32 lit_10194 = 0x41E80000; +SECTION_SDATA2 static f32 lit_10194 = 29.0f; /* 80452DC8-80452DCC 0004+00 s=11 e=0 z=0 None .sdata2 @10286 */ -SECTION_SDATA2 static u32 lit_10286 = 0x41980000; +SECTION_SDATA2 static f32 lit_10286 = 19.0f; /* 80452DCC-80452DD0 0004+00 s=6 e=0 z=0 None .sdata2 @10532 */ -SECTION_SDATA2 static u32 lit_10532 = 0xC2480000; +SECTION_SDATA2 static f32 lit_10532 = -50.0f; /* 80452DD0-80452DD4 0004+00 s=1 e=0 z=0 None .sdata2 @11122 */ -SECTION_SDATA2 static u32 lit_11122 = 0x45800000; +SECTION_SDATA2 static f32 lit_11122 = 4096.0f; /* 80452DD4-80452DD8 0004+00 s=23 e=0 z=0 None .sdata2 @11442 */ -SECTION_SDATA2 static u32 lit_11442 = 0x42200000; +SECTION_SDATA2 static f32 lit_11442 = 40.0f; /* 80452DD8-80452DDC 0004+00 s=10 e=0 z=0 None .sdata2 @11470 */ -SECTION_SDATA2 static u32 lit_11470 = 0x40200000; +SECTION_SDATA2 static f32 lit_11470 = 2.5f; /* 80452DDC-80452DE0 0004+00 s=3 e=0 z=0 None .sdata2 @11471 */ -SECTION_SDATA2 static u32 lit_11471 = 0x3FA00000; +SECTION_SDATA2 static f32 lit_11471 = 1.25f; /* 80452DE0-80452DE4 0004+00 s=17 e=0 z=0 None .sdata2 @11673 */ -SECTION_SDATA2 static u32 lit_11673 = 0x43160000; +SECTION_SDATA2 static f32 lit_11673 = 150.0f; /* 80452DE4-80452DE8 0004+00 s=16 e=0 z=0 None .sdata2 @12328 */ -SECTION_SDATA2 static u32 lit_12328 = 0x3A83126F; +SECTION_SDATA2 static f32 lit_12328 = 0.0010000000474974513f; /* 80452DE8-80452DEC 0004+00 s=1 e=0 z=0 None .sdata2 @12475 */ -SECTION_SDATA2 static u32 lit_12475 = 0x45228000; +SECTION_SDATA2 static f32 lit_12475 = 2600.0f; /* 80452DEC-80452DF0 0004+00 s=6 e=0 z=0 None .sdata2 @13119 */ -SECTION_SDATA2 static u32 lit_13119 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_13119 = 3.0f / 20.0f; /* 80452DF0-80452DF4 0004+00 s=7 e=0 z=0 None .sdata2 @13382 */ -SECTION_SDATA2 static u32 lit_13382 = 0x41A80000; +SECTION_SDATA2 static f32 lit_13382 = 21.0f; /* 80452DF4-80452DF8 0004+00 s=1 e=0 z=0 None .sdata2 @13699 */ -SECTION_SDATA2 static u32 lit_13699 = 0x3F7FF972; +SECTION_SDATA2 static f32 lit_13699 = 0.9998999834060669f; /* 80452DF8-80452DFC 0004+00 s=19 e=0 z=0 None .sdata2 @13700 */ -SECTION_SDATA2 static u32 lit_13700 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_13700 = 1.0f / 5.0f; /* 80452DFC-80452E00 0004+00 s=6 e=0 z=0 None .sdata2 @13701 */ -SECTION_SDATA2 static u32 lit_13701 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_13701 = 2.0f / 5.0f; /* 80452E00-80452E04 0004+00 s=2 e=0 z=0 None .sdata2 @13702 */ -SECTION_SDATA2 static u32 lit_13702 = 0x3CCCCCCD; +SECTION_SDATA2 static f32 lit_13702 = 1.0f / 40.0f; /* 80452E04-80452E08 0004+00 s=10 e=0 z=0 None .sdata2 @13794 */ -SECTION_SDATA2 static u32 lit_13794 = 0x41800000; +SECTION_SDATA2 static f32 lit_13794 = 16.0f; /* 80452E08-80452E0C 0004+00 s=10 e=0 z=0 None .sdata2 @14064 */ -SECTION_SDATA2 static u32 lit_14064 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_14064 = 4.0f / 5.0f; /* 80452E0C-80452E10 0004+00 s=12 e=0 z=0 None .sdata2 @14614 */ -SECTION_SDATA2 static u32 lit_14614 = 0xC1F00000; +SECTION_SDATA2 static f32 lit_14614 = -30.0f; /* 80452E10-80452E14 0004+00 s=2 e=0 z=0 None .sdata2 @14615 */ -SECTION_SDATA2 static u32 lit_14615 = 0xC0A00000; +SECTION_SDATA2 static f32 lit_14615 = -5.0f; /* 80452E14-80452E18 0004+00 s=4 e=0 z=0 None .sdata2 @14616 */ -SECTION_SDATA2 static u32 lit_14616 = 0xC0400000; +SECTION_SDATA2 static f32 lit_14616 = -3.0f; /* 80452E18-80452E1C 0004+00 s=1 e=0 z=0 None .sdata2 @14617 */ -SECTION_SDATA2 static u32 lit_14617 = 0xC0900000; +SECTION_SDATA2 static f32 lit_14617 = -4.5f; /* 80452E1C-80452E20 0004+00 s=1 e=0 z=0 None .sdata2 @14618 */ -SECTION_SDATA2 static u32 lit_14618 = 0xC2040000; +SECTION_SDATA2 static f32 lit_14618 = -33.0f; /* 80452E20-80452E24 0004+00 s=2 e=0 z=0 None .sdata2 @14619 */ -SECTION_SDATA2 static u32 lit_14619 = 0x429C0000; +SECTION_SDATA2 static f32 lit_14619 = 78.0f; /* 80452E24-80452E28 0004+00 s=3 e=0 z=0 None .sdata2 @14620 */ -SECTION_SDATA2 static u32 lit_14620 = 0x42280000; +SECTION_SDATA2 static f32 lit_14620 = 42.0f; /* 80452E28-80452E2C 0004+00 s=16 e=0 z=0 None .sdata2 @14621 */ -SECTION_SDATA2 static u32 lit_14621 = 0x42000000; +SECTION_SDATA2 static f32 lit_14621 = 32.0f; /* 80452E2C-80452E30 0004+00 s=1 e=0 z=0 None .sdata2 @14622 */ -SECTION_SDATA2 static u32 lit_14622 = 0x45AAA800; +SECTION_SDATA2 static f32 lit_14622 = 5461.0f; /* 80452E30-80452E34 0004+00 s=2 e=0 z=0 None .sdata2 @14623 */ -SECTION_SDATA2 static u32 lit_14623 = 0xC1000000; +SECTION_SDATA2 static f32 lit_14623 = -8.0f; /* 80452E34-80452E38 0004+00 s=5 e=0 z=0 None .sdata2 @14624 */ -SECTION_SDATA2 static u32 lit_14624 = 0xC1700000; +SECTION_SDATA2 static f32 lit_14624 = -15.0f; /* 80452E38-80452E3C 0004+00 s=2 e=0 z=0 None .sdata2 @14625 */ -SECTION_SDATA2 static u32 lit_14625 = 0xC1900000; +SECTION_SDATA2 static f32 lit_14625 = -18.0f; /* 80452E3C-80452E40 0004+00 s=1 e=0 z=0 None .sdata2 @14626 */ -SECTION_SDATA2 static u32 lit_14626 = 0xC15CA015; +SECTION_SDATA2 static f32 lit_14626 = -13.789082527160645f; /* 80452E40-80452E44 0004+00 s=1 e=0 z=0 None .sdata2 @14627 */ -SECTION_SDATA2 static u32 lit_14627 = 0xC15D34BA; +SECTION_SDATA2 static f32 lit_14627 = -13.825372695922852f; /* 80452E44-80452E48 0004+00 s=5 e=0 z=0 None .sdata2 @14760 */ -SECTION_SDATA2 static u32 lit_14760 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_14760 = 1.0f / 50.0f; /* 80452E48-80452E4C 0004+00 s=1 e=0 z=0 None .sdata2 @14781 */ -SECTION_SDATA2 static u32 lit_14781 = 0xC4BB8000; +SECTION_SDATA2 static f32 lit_14781 = -1500.0f; /* 80452E4C-80452E50 0004+00 s=5 e=0 z=0 None .sdata2 @14782 */ -SECTION_SDATA2 static u32 lit_14782 = 0x44FA0000; +SECTION_SDATA2 static f32 lit_14782 = 2000.0f; /* 80452E50-80452E54 0004+00 s=1 e=0 z=0 None .sdata2 @14783 */ -SECTION_SDATA2 static u32 lit_14783 = 0x455AC000; +SECTION_SDATA2 static f32 lit_14783 = 3500.0f; /* 80452E54-80452E58 0004+00 s=4 e=0 z=0 None .sdata2 @14784 */ -SECTION_SDATA2 static u32 lit_14784 = 0x451C4000; +SECTION_SDATA2 static f32 lit_14784 = 2500.0f; /* 80452E58-80452E5C 0004+00 s=2 e=0 z=0 None .sdata2 @14785 */ -SECTION_SDATA2 static u32 lit_14785 = 0x457A0000; +SECTION_SDATA2 static f32 lit_14785 = 4000.0f; /* 80452E5C-80452E60 0004+00 s=2 e=0 z=0 None .sdata2 @14786 */ -SECTION_SDATA2 static u32 lit_14786 = 0xC59C4000; +SECTION_SDATA2 static f32 lit_14786 = -5000.0f; /* 80452E60-80452E64 0004+00 s=2 e=0 z=0 None .sdata2 @14787 */ -SECTION_SDATA2 static u32 lit_14787 = 0x459C4000; +SECTION_SDATA2 static f32 lit_14787 = 5000.0f; /* 80452E64-80452E68 0004+00 s=47 e=0 z=0 None .sdata2 @14954 */ -SECTION_SDATA2 static u32 lit_14954 = 0x41700000; +SECTION_SDATA2 static f32 lit_14954 = 15.0f; /* 80452E68-80452E6C 0004+00 s=7 e=0 z=0 None .sdata2 @14955 */ -SECTION_SDATA2 static u32 lit_14955 = 0x42B40000; +SECTION_SDATA2 static f32 lit_14955 = 90.0f; /* 80452E6C-80452E70 0004+00 s=1 e=0 z=0 None .sdata2 @15106 */ -SECTION_SDATA2 static u32 lit_15106 = 0x3F6E147B; +SECTION_SDATA2 static f32 lit_15106 = 93.0f / 100.0f; /* 80452E70-80452E74 0004+00 s=1 e=0 z=0 None .sdata2 @15188 */ -SECTION_SDATA2 static u32 lit_15188 = 0x4238346F; +SECTION_SDATA2 static f32 lit_15188 = 46.051204681396484f; /* 80452E74-80452E78 0004+00 s=5 e=0 z=0 None .sdata2 @15341 */ -SECTION_SDATA2 static u32 lit_15341 = 0x41B80000; +SECTION_SDATA2 static f32 lit_15341 = 23.0f; /* 80452E78-80452E7C 0004+00 s=5 e=0 z=0 None .sdata2 @15460 */ -SECTION_SDATA2 static u32 lit_15460 = 0x3BA3D70A; +SECTION_SDATA2 static f32 lit_15460 = 0.004999999888241291f; /* 80452E7C-80452E80 0004+00 s=2 e=0 z=0 None .sdata2 @15808 */ -SECTION_SDATA2 static u32 lit_15808 = 0x46610000; +SECTION_SDATA2 static f32 lit_15808 = 14400.0f; /* 80452E80-80452E84 0004+00 s=6 e=0 z=0 None .sdata2 @16036 */ -SECTION_SDATA2 static u32 lit_16036 = 0x42960000; +SECTION_SDATA2 static f32 lit_16036 = 75.0f; /* 80452E84-80452E88 0004+00 s=3 e=0 z=0 None .sdata2 @16037 */ -SECTION_SDATA2 static u32 lit_16037 = 0x4301FD71; +SECTION_SDATA2 static f32 lit_16037 = 129.99000549316406f; /* 80452E88-80452E8C 0004+00 s=2 e=0 z=0 None .sdata2 @16038 */ -SECTION_SDATA2 static u32 lit_16038 = 0x42080000; +SECTION_SDATA2 static f32 lit_16038 = 34.0f; /* 80452E8C-80452E90 0004+00 s=1 e=0 z=0 None .sdata2 @16066 */ -SECTION_SDATA2 static u32 lit_16066 = 0x49742400; +SECTION_SDATA2 static f32 lit_16066 = 1000000.0f; /* 80452E90-80452E94 0004+00 s=2 e=0 z=0 None .sdata2 @16067 */ -SECTION_SDATA2 static u32 lit_16067 = 0x47AFC800; +SECTION_SDATA2 static f32 lit_16067 = 90000.0f; /* 80452E94-80452E98 0004+00 s=12 e=0 z=0 None .sdata2 @16210 */ -SECTION_SDATA2 static u32 lit_16210 = 0x41880000; +SECTION_SDATA2 static f32 lit_16210 = 17.0f; /* 80452E98-80452E9C 0004+00 s=1 e=0 z=0 None .sdata2 @16566 */ -SECTION_SDATA2 static u32 lit_16566 = 0x442F0000; +SECTION_SDATA2 static f32 lit_16566 = 700.0f; /* 80452E9C-80452EA0 0004+00 s=4 e=0 z=0 None .sdata2 @16567 */ -SECTION_SDATA2 static u32 lit_16567 = 0x44160000; +SECTION_SDATA2 static f32 lit_16567 = 600.0f; /* 80452EA0-80452EA4 0004+00 s=3 e=0 z=0 None .sdata2 @16568 */ -SECTION_SDATA2 static u32 lit_16568 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_16568 = -100.0f; /* 80452EA4-80452EA8 0004+00 s=1 e=0 z=0 None .sdata2 @16569 */ -SECTION_SDATA2 static u32 lit_16569 = 0x437A0000; +SECTION_SDATA2 static f32 lit_16569 = 250.0f; /* 80452EA8-80452EAC 0004+00 s=20 e=0 z=0 None .sdata2 @16570 */ -SECTION_SDATA2 static u32 lit_16570 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_16570 = 3.0f / 10.0f; /* 80452EAC-80452EB0 0004+00 s=11 e=0 z=0 None .sdata2 @16641 */ -SECTION_SDATA2 static u32 lit_16641 = 0x3F400000; +SECTION_SDATA2 static f32 lit_16641 = 0.75f; /* 80452EB0-80452EB4 0004+00 s=2 e=0 z=0 None .sdata2 @16790 */ -SECTION_SDATA2 static u32 lit_16790 = 0x42A20000; +SECTION_SDATA2 static f32 lit_16790 = 81.0f; /* 80452EB4-80452EB8 0004+00 s=22 e=0 z=0 None .sdata2 @17382 */ -SECTION_SDATA2 static u32 lit_17382 = 0x41300000; +SECTION_SDATA2 static f32 lit_17382 = 11.0f; /* 80452EB8-80452EBC 0004+00 s=3 e=0 z=0 None .sdata2 @17592 */ -SECTION_SDATA2 static u32 lit_17592 = 0x42FE0000; +SECTION_SDATA2 static f32 lit_17592 = 127.0f; /* 80452EBC-80452EC0 0004+00 s=6 e=0 z=0 None .sdata2 @17593 */ -SECTION_SDATA2 static u32 lit_17593 = 0x42820000; +SECTION_SDATA2 static f32 lit_17593 = 65.0f; /* 80452EC0-80452EC4 0004+00 s=1 e=0 z=0 None .sdata2 @18068 */ -SECTION_SDATA2 static u32 lit_18068 = 0xC1300000; +SECTION_SDATA2 static f32 lit_18068 = -11.0f; /* 80452EC4-80452EC8 0004+00 s=2 e=0 z=0 None .sdata2 @18176 */ -SECTION_SDATA2 static u32 lit_18176 = 0x43660000; +SECTION_SDATA2 static f32 lit_18176 = 230.0f; /* 80452EC8-80452ECC 0004+00 s=2 e=0 z=0 None .sdata2 @18706 */ -SECTION_SDATA2 static u32 lit_18706 = 0x3B03126F; +SECTION_SDATA2 static f32 lit_18706 = 0.0020000000949949026f; /* 80452ECC-80452ED0 0004+00 s=1 e=0 z=0 None .sdata2 @18830 */ -SECTION_SDATA2 static u32 lit_18830 = 0x40555555; +SECTION_SDATA2 static f32 lit_18830 = 10.0f / 3.0f; /* 80452ED0-80452ED4 0004+00 s=6 e=0 z=0 None .sdata2 @18847 */ -SECTION_SDATA2 static u32 lit_18847 = 0x3F666666; +SECTION_SDATA2 static f32 lit_18847 = 9.0f / 10.0f; /* 80452ED4-80452ED8 0004+00 s=7 e=0 z=0 None .sdata2 @18929 */ -SECTION_SDATA2 static u32 lit_18929 = 0x43360B61; +SECTION_SDATA2 static f32 lit_18929 = 182.04444885253906f; /* 80452ED8-80452EDC 0004+00 s=1 e=0 z=0 None .sdata2 @18997 */ -SECTION_SDATA2 static u32 lit_18997 = 0x42FA0000; +SECTION_SDATA2 static f32 lit_18997 = 125.0f; /* 80452EDC-80452EE0 0004+00 s=3 e=0 z=0 None .sdata2 @19240 */ -SECTION_SDATA2 static u32 lit_19240 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_19240 = 6.0f / 5.0f; /* 8009ECA0-8009EF38 0298+00 s=1 e=0 z=0 None .text headModelCallBack__9daAlink_cFi */ #pragma push @@ -7194,70 +7100,70 @@ asm static void daAlink_wolfModelCallBack(J3DJoint* param_0, int param_1) { /* ############################################################################################## */ /* 80452EE0-80452EE4 0004+00 s=6 e=0 z=0 None .sdata2 @19379 */ -SECTION_SDATA2 static u32 lit_19379 = 0x3E800000; +SECTION_SDATA2 static f32 lit_19379 = 0.25f; /* 80452EE4-80452EE8 0004+00 s=4 e=0 z=0 None .sdata2 @19380 */ -SECTION_SDATA2 static u32 lit_19380 = 0x42380000; +SECTION_SDATA2 static f32 lit_19380 = 46.0f; /* 80452EE8-80452EEC 0004+00 s=1 e=0 z=0 None .sdata2 @19381 */ -SECTION_SDATA2 static u32 lit_19381 = 0x42540000; +SECTION_SDATA2 static f32 lit_19381 = 53.0f; /* 80452EEC-80452EF0 0004+00 s=3 e=0 z=0 None .sdata2 @19382 */ -SECTION_SDATA2 static u32 lit_19382 = 0x42240000; +SECTION_SDATA2 static f32 lit_19382 = 41.0f; /* 80452EF0-80452EF4 0004+00 s=1 e=0 z=0 None .sdata2 @19428 */ -SECTION_SDATA2 static u32 lit_19428 = 0x42CC0000; +SECTION_SDATA2 static f32 lit_19428 = 102.0f; /* 80452EF4-80452EF8 0004+00 s=1 e=0 z=0 None .sdata2 @19580 */ -SECTION_SDATA2 static u32 lit_19580 = 0x48AFC800; +SECTION_SDATA2 static f32 lit_19580 = 360000.0f; /* 80452EF8-80452EFC 0004+00 s=1 e=0 z=0 None .sdata2 @20303 */ -SECTION_SDATA2 static u32 lit_20303 = 0x42880000; +SECTION_SDATA2 static f32 lit_20303 = 68.0f; /* 80452EFC-80452F00 0004+00 s=2 e=0 z=0 None .sdata2 @20400 */ -SECTION_SDATA2 static u32 lit_20400 = 0x43800000; +SECTION_SDATA2 static f32 lit_20400 = 256.0f; /* 80452F00-80452F04 0004+00 s=1 e=0 z=0 None .sdata2 @20401 */ -SECTION_SDATA2 static u32 lit_20401 = 0x38D1B717; +SECTION_SDATA2 static f32 lit_20401 = 9.999999747378752e-05f; /* 80452F04-80452F08 0004+00 s=2 e=0 z=0 None .sdata2 @20402 */ -SECTION_SDATA2 static u32 lit_20402 = 0x40C90FDB; +SECTION_SDATA2 static f32 lit_20402 = 6.2831854820251465f; /* 80452F08-80452F0C 0004+00 s=4 e=0 z=0 None .sdata2 @20495 */ -SECTION_SDATA2 static u32 lit_20495 = 0x453B8000; +SECTION_SDATA2 static f32 lit_20495 = 3000.0f; /* 80452F0C-80452F10 0004+00 s=5 e=0 z=0 None .sdata2 @20496 */ -SECTION_SDATA2 static u32 lit_20496 = 0x44BB8000; +SECTION_SDATA2 static f32 lit_20496 = 1500.0f; /* 80452F10-80452F14 0004+00 s=1 e=0 z=0 None .sdata2 @20790 */ -SECTION_SDATA2 static u32 lit_20790 = 0x38800000; +SECTION_SDATA2 static f32 lit_20790 = 6.103515625e-05f; /* 80452F14-80452F18 0004+00 s=3 e=0 z=0 None .sdata2 @20823 */ -SECTION_SDATA2 static u32 lit_20823 = 0xC20C0000; +SECTION_SDATA2 static f32 lit_20823 = -35.0f; /* 80452F18-80452F1C 0004+00 s=5 e=0 z=0 None .sdata2 @20824 */ -SECTION_SDATA2 static u32 lit_20824 = 0x432F0000; +SECTION_SDATA2 static f32 lit_20824 = 175.0f; /* 80452F1C-80452F20 0004+00 s=6 e=0 z=0 None .sdata2 @20991 */ -SECTION_SDATA2 static u32 lit_20991 = 0x425C0000; +SECTION_SDATA2 static f32 lit_20991 = 55.0f; /* 80452F20-80452F24 0004+00 s=1 e=0 z=0 None .sdata2 @20992 */ -SECTION_SDATA2 static u32 lit_20992 = 0xC25C0000; +SECTION_SDATA2 static f32 lit_20992 = -55.0f; /* 80452F24-80452F28 0004+00 s=1 e=0 z=0 None .sdata2 @21021 */ -SECTION_SDATA2 static u32 lit_21021 = 0xC0800000; +SECTION_SDATA2 static f32 lit_21021 = -4.0f; /* 80452F28-80452F2C 0004+00 s=3 e=0 z=0 None .sdata2 @21624 */ -SECTION_SDATA2 static u32 lit_21624 = 0x47000000; +SECTION_SDATA2 static f32 lit_21624 = 32768.0f; /* 80452F2C-80452F30 0004+00 s=3 e=0 z=0 None .sdata2 @21680 */ -SECTION_SDATA2 static u32 lit_21680 = 0x44800000; +SECTION_SDATA2 static f32 lit_21680 = 1024.0f; /* 80452F30-80452F34 0004+00 s=4 e=0 z=0 None .sdata2 @21736 */ -SECTION_SDATA2 static u32 lit_21736 = 0x42340000; +SECTION_SDATA2 static f32 lit_21736 = 45.0f; /* 80452F34-80452F38 0004+00 s=1 e=0 z=0 None .sdata2 @22146 */ -SECTION_SDATA2 static u32 lit_22146 = 0x3E3D3C19; +SECTION_SDATA2 static f32 lit_22146 = 0.18479956686496735f; /* 80452F38-80452F3C 0004+00 s=1 e=0 z=0 None .sdata2 None */ SECTION_SDATA2 static u8 struct_80452F38[4] = { @@ -7270,85 +7176,85 @@ SECTION_SDATA2 static u8 struct_80452F38[4] = { }; /* 80452F3C-80452F40 0004+00 s=1 e=0 z=0 None .sdata2 @22608 */ -SECTION_SDATA2 static u32 lit_22608 = 0x460D0400; +SECTION_SDATA2 static f32 lit_22608 = 9025.0f; /* 80452F40-80452F44 0004+00 s=1 e=0 z=0 None .sdata2 @22609 */ -SECTION_SDATA2 static u32 lit_22609 = 0x45992000; +SECTION_SDATA2 static f32 lit_22609 = 4900.0f; /* 80452F44-80452F48 0004+00 s=1 e=0 z=0 None .sdata2 @23155 */ -SECTION_SDATA2 static u32 lit_23155 = 0x41780000; +SECTION_SDATA2 static f32 lit_23155 = 15.5f; /* 80452F48-80452F4C 0004+00 s=6 e=0 z=0 None .sdata2 @23416 */ -SECTION_SDATA2 static u32 lit_23416 = 0x40900000; +SECTION_SDATA2 static f32 lit_23416 = 4.5f; /* 80452F4C-80452F50 0004+00 s=1 e=0 z=0 None .sdata2 @23542 */ -SECTION_SDATA2 static u32 lit_23542 = 0x3F7FA440; +SECTION_SDATA2 static f32 lit_23542 = 0.9986000061035156f; /* 80452F50-80452F54 0004+00 s=10 e=0 z=0 None .sdata2 @23595 */ -SECTION_SDATA2 static u32 lit_23595 = 0x42F00000; +SECTION_SDATA2 static f32 lit_23595 = 120.0f; /* 80452F54-80452F58 0004+00 s=2 e=0 z=0 None .sdata2 @24322 */ -SECTION_SDATA2 static u32 lit_24322 = 0x42040000; +SECTION_SDATA2 static f32 lit_24322 = 33.0f; /* 80452F58-80452F5C 0004+00 s=4 e=0 z=0 None .sdata2 @24323 */ -SECTION_SDATA2 static u32 lit_24323 = 0x41F80000; +SECTION_SDATA2 static f32 lit_24323 = 31.0f; /* 80452F5C-80452F60 0004+00 s=1 e=0 z=0 None .sdata2 @24400 */ -SECTION_SDATA2 static u32 lit_24400 = 0x43D470A4; +SECTION_SDATA2 static f32 lit_24400 = 424.8800048828125f; /* 80452F60-80452F64 0004+00 s=1 e=0 z=0 None .sdata2 @24401 */ -SECTION_SDATA2 static u32 lit_24401 = 0x43AD83D7; +SECTION_SDATA2 static f32 lit_24401 = 347.0299987792969f; /* 80452F64-80452F68 0004+00 s=2 e=0 z=0 None .sdata2 @24589 */ -SECTION_SDATA2 static u32 lit_24589 = 0x42740000; +SECTION_SDATA2 static f32 lit_24589 = 61.0f; /* 80452F68-80452F6C 0004+00 s=2 e=0 z=0 None .sdata2 @24590 */ -SECTION_SDATA2 static u32 lit_24590 = 0x426C0000; +SECTION_SDATA2 static f32 lit_24590 = 59.0f; /* 80452F6C-80452F70 0004+00 s=4 e=0 z=0 None .sdata2 @24591 */ -SECTION_SDATA2 static u32 lit_24591 = 0x424C0000; +SECTION_SDATA2 static f32 lit_24591 = 51.0f; /* 80452F70-80452F74 0004+00 s=1 e=0 z=0 None .sdata2 @24592 */ -SECTION_SDATA2 static u32 lit_24592 = 0x43140000; +SECTION_SDATA2 static f32 lit_24592 = 148.0f; /* 80452F74-80452F78 0004+00 s=1 e=0 z=0 None .sdata2 @24593 */ -SECTION_SDATA2 static u32 lit_24593 = 0x43080000; +SECTION_SDATA2 static f32 lit_24593 = 136.0f; /* 80452F78-80452F7C 0004+00 s=1 e=0 z=0 None .sdata2 @24594 */ -SECTION_SDATA2 static u32 lit_24594 = 0x42EA0000; +SECTION_SDATA2 static f32 lit_24594 = 117.0f; /* 80452F7C-80452F80 0004+00 s=1 e=0 z=0 None .sdata2 @24595 */ -SECTION_SDATA2 static u32 lit_24595 = 0x42D20000; +SECTION_SDATA2 static f32 lit_24595 = 105.0f; /* 80452F80-80452F84 0004+00 s=1 e=0 z=0 None .sdata2 @24600 */ -SECTION_SDATA2 static u32 lit_24600 = 0x3CDA740E; +SECTION_SDATA2 static f32 lit_24600 = 2.0f / 75.0f; /* 80452F84-80452F88 0004+00 s=4 e=0 z=0 None .sdata2 @24618 */ -SECTION_SDATA2 static u32 lit_24618 = 0x42160000; +SECTION_SDATA2 static f32 lit_24618 = 37.5f; /* 80452F88-80452F8C 0004+00 s=4 e=0 z=0 None .sdata2 @24680 */ -SECTION_SDATA2 static u32 lit_24680 = 0x40B00000; +SECTION_SDATA2 static f32 lit_24680 = 5.5f; /* 80452F8C-80452F90 0004+00 s=1 e=0 z=0 None .sdata2 @24852 */ -SECTION_SDATA2 static u32 lit_24852 = 0x433B8000; +SECTION_SDATA2 static f32 lit_24852 = 187.5f; /* 80452F90-80452F94 0004+00 s=5 e=0 z=0 None .sdata2 @25059 */ -SECTION_SDATA2 static u32 lit_25059 = 0xC1A00000; +SECTION_SDATA2 static f32 lit_25059 = -20.0f; /* 80452F94-80452F98 0004+00 s=2 e=0 z=0 None .sdata2 @25113 */ -SECTION_SDATA2 static u32 lit_25113 = 0x42DC0000; +SECTION_SDATA2 static f32 lit_25113 = 110.0f; /* 80452F98-80452F9C 0004+00 s=2 e=0 z=0 None .sdata2 @25684 */ -SECTION_SDATA2 static u32 lit_25684 = 0x433E0000; +SECTION_SDATA2 static f32 lit_25684 = 190.0f; /* 80452F9C-80452FA0 0004+00 s=1 e=0 z=0 None .sdata2 @25873 */ -SECTION_SDATA2 static u32 lit_25873 = 0x392AAAAB; +SECTION_SDATA2 static f32 lit_25873 = 0.00016276042151730508f; /* 80452FA0-80452FA4 0004+00 s=1 e=0 z=0 None .sdata2 @25874 */ -SECTION_SDATA2 static u32 lit_25874 = 0xB92AAAAB; +SECTION_SDATA2 static f32 lit_25874 = -0.00016276042151730508f; /* 80452FA4-80452FA8 0004+00 s=6 e=0 z=0 None .sdata2 @25916 */ -SECTION_SDATA2 static u32 lit_25916 = 0x43560000; +SECTION_SDATA2 static f32 lit_25916 = 214.0f; /* 80452FA8-80452FB0 0008+00 s=1 e=0 z=0 None .sdata2 offsetAngle$25945 */ SECTION_SDATA2 static u8 offsetAngle[8] = { @@ -7356,87 +7262,85 @@ SECTION_SDATA2 static u8 offsetAngle[8] = { }; /* 80452FB0-80452FB4 0004+00 s=1 e=0 z=0 None .sdata2 @26233 */ -SECTION_SDATA2 static u32 lit_26233 = 0x3DAAAAAB; +SECTION_SDATA2 static f32 lit_26233 = 1.0f / 12.0f; /* 80452FB4-80452FB8 0004+00 s=1 e=0 z=0 None .sdata2 @26275 */ -SECTION_SDATA2 static u32 lit_26275 = 0xC10E63CD; +SECTION_SDATA2 static f32 lit_26275 = -8.899365425109863f; /* 80452FB8-80452FBC 0004+00 s=1 e=0 z=0 None .sdata2 @26276 */ -SECTION_SDATA2 static u32 lit_26276 = 0x41940000; +SECTION_SDATA2 static f32 lit_26276 = 18.5f; /* 80452FBC-80452FC0 0004+00 s=1 e=0 z=0 None .sdata2 @26297 */ -SECTION_SDATA2 static u32 lit_26297 = 0x418E63CD; +SECTION_SDATA2 static f32 lit_26297 = 17.798730850219727f; /* 80452FC0-80452FC4 0004+00 s=2 e=0 z=0 None .sdata2 @26816 */ -SECTION_SDATA2 static u32 lit_26816 = 0x46AFC800; +SECTION_SDATA2 static f32 lit_26816 = 22500.0f; /* 80452FC4-80452FC8 0004+00 s=1 e=0 z=0 None .sdata2 @26817 */ -SECTION_SDATA2 static u32 lit_26817 = 0x46800000; +SECTION_SDATA2 static f32 lit_26817 = 16384.0f; /* 80452FC8-80452FCC 0004+00 s=1 e=0 z=0 None .sdata2 @26818 */ -SECTION_SDATA2 static u32 lit_26818 = 0x45C00000; +SECTION_SDATA2 static f32 lit_26818 = 6144.0f; /* 80452FCC-80452FD0 0004+00 s=1 e=0 z=0 None .sdata2 @26819 */ -SECTION_SDATA2 static u32 lit_26819 = 0x46000000; +SECTION_SDATA2 static f32 lit_26819 = 8192.0f; /* 80452FD0-80452FD4 0004+00 s=2 e=0 z=0 None .sdata2 @27005 */ -SECTION_SDATA2 static u32 lit_27005 = 0xC2820000; +SECTION_SDATA2 static f32 lit_27005 = -65.0f; /* 80452FD4-80452FD8 0004+00 s=1 e=0 z=0 None .sdata2 @27418 */ -SECTION_SDATA2 static u32 lit_27418 = 0x46555400; +SECTION_SDATA2 static f32 lit_27418 = 13653.0f; /* 80452FD8-80452FDC 0004+00 s=1 e=0 z=0 None .sdata2 @27476 */ -SECTION_SDATA2 static u32 lit_27476 = 0x4511A000; +SECTION_SDATA2 static f32 lit_27476 = 2330.0f; /* 80452FDC-80452FE0 0004+00 s=7 e=0 z=0 None .sdata2 @27477 */ -SECTION_SDATA2 static u32 lit_27477 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_27477 = 17.0f / 20.0f; /* 80452FE0-80452FE4 0004+00 s=2 e=0 z=0 None .sdata2 @28016 */ -SECTION_SDATA2 static u32 lit_28016 = 0xC2340000; +SECTION_SDATA2 static f32 lit_28016 = -45.0f; /* 80452FE4-80452FE8 0004+00 s=1 e=0 z=0 None .sdata2 @28017 */ -SECTION_SDATA2 static u32 lit_28017 = 0x43110000; +SECTION_SDATA2 static f32 lit_28017 = 145.0f; /* 80452FE8-80452FEC 0004+00 s=1 e=0 z=0 None .sdata2 @28045 */ -SECTION_SDATA2 static u32 lit_28045 = 0xC2080000; +SECTION_SDATA2 static f32 lit_28045 = -34.0f; /* 80452FEC-80452FF0 0004+00 s=1 e=0 z=0 None .sdata2 @28285 */ -SECTION_SDATA2 static u32 lit_28285 = 0x44638000; +SECTION_SDATA2 static f32 lit_28285 = 910.0f; /* 80452FF0-80452FF4 0004+00 s=2 e=0 z=0 None .sdata2 @28286 */ -SECTION_SDATA2 static u32 lit_28286 = 0x3EB33333; +SECTION_SDATA2 static f32 lit_28286 = 7.0f / 20.0f; /* 80452FF4-80452FF8 0004+00 s=1 e=0 z=0 None .sdata2 @28287 */ -SECTION_SDATA2 static u32 lit_28287 = 0x3FC90FDB; +SECTION_SDATA2 static f32 lit_28287 = 1.5707963705062866f; /* 80452FF8-80452FFC 0004+00 s=1 e=0 z=0 None .sdata2 @28405 */ -SECTION_SDATA2 static u32 lit_28405 = 0x3CAAAAAB; +SECTION_SDATA2 static f32 lit_28405 = 1.0f / 48.0f; /* 80452FFC-80453000 0004+00 s=2 e=0 z=0 None .sdata2 @30372 */ -SECTION_SDATA2 static u32 lit_30372 = 0x43C80000; +SECTION_SDATA2 static f32 lit_30372 = 400.0f; /* 80453000-80453004 0004+00 s=4 e=0 z=0 None .sdata2 @30895 */ -SECTION_SDATA2 static u32 lit_30895 = 0x40D00000; +SECTION_SDATA2 static f32 lit_30895 = 6.5f; /* 80453004-80453008 0004+00 s=1 e=0 z=0 None .sdata2 @31530 */ -SECTION_SDATA2 static u32 lit_31530 = 0x43C00000; +SECTION_SDATA2 static f32 lit_31530 = 384.0f; /* 80453008-80453010 0008+00 s=5 e=0 z=0 None .sdata2 @32072 */ -SECTION_SDATA2 static u8 lit_32072[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_32072 = 4503599627370496.0 /* cast u32 to float */; /* 80453010-80453014 0004+00 s=1 e=0 z=0 None .sdata2 @32830 */ -SECTION_SDATA2 static u32 lit_32830 = 0x44180000; +SECTION_SDATA2 static f32 lit_32830 = 608.0f; /* 80453014-80453018 0004+00 s=1 e=0 z=0 None .sdata2 @32831 */ -SECTION_SDATA2 static u32 lit_32831 = 0x43E00000; +SECTION_SDATA2 static f32 lit_32831 = 448.0f; /* 80453018-8045301C 0004+00 s=1 e=0 z=0 None .sdata2 @32832 */ -SECTION_SDATA2 static u32 lit_32832 = 0xBC23D70A; +SECTION_SDATA2 static f32 lit_32832 = -1.0f / 100.0f; /* 8045301C-80453020 0004+00 s=1 e=0 z=0 None .sdata2 @32833 */ -SECTION_SDATA2 static u32 lit_32833 = 0x4B7FFFFF; +SECTION_SDATA2 static f32 lit_32833 = 16777215.0f; /* 80453020-80453024 0004+00 s=1 e=0 z=0 None .sdata2 grassWhistleIdx$33097 */ SECTION_SDATA2 static u8 grassWhistleIdx[4] = { @@ -7447,88 +7351,88 @@ SECTION_SDATA2 static u8 grassWhistleIdx[4] = { }; /* 80453024-80453028 0004+00 s=1 e=0 z=0 None .sdata2 @33587 */ -SECTION_SDATA2 static u32 lit_33587 = 0x42800000; +SECTION_SDATA2 static f32 lit_33587 = 64.0f; /* 80453028-8045302C 0004+00 s=1 e=0 z=0 None .sdata2 @34189 */ -SECTION_SDATA2 static u32 lit_34189 = 0xC6800000; +SECTION_SDATA2 static f32 lit_34189 = -16384.0f; /* 8045302C-80453030 0004+00 s=3 e=0 z=0 None .sdata2 @34190 */ -SECTION_SDATA2 static u32 lit_34190 = 0x46600000; +SECTION_SDATA2 static f32 lit_34190 = 14336.0f; /* 80453030-80453034 0004+00 s=1 e=0 z=0 None .sdata2 @34772 */ -SECTION_SDATA2 static u32 lit_34772 = 0xC0C00000; +SECTION_SDATA2 static f32 lit_34772 = -6.0f; /* 80453034-80453038 0004+00 s=1 e=0 z=0 None .sdata2 @34773 */ -SECTION_SDATA2 static u32 lit_34773 = 0xC0666666; +SECTION_SDATA2 static f32 lit_34773 = -18.0f / 5.0f; /* 80453038-8045303C 0004+00 s=1 e=0 z=0 None .sdata2 @34774 */ -SECTION_SDATA2 static u32 lit_34774 = 0xC20D3333; +SECTION_SDATA2 static f32 lit_34774 = -35.29999923706055f; /* 8045303C-80453040 0004+00 s=1 e=0 z=0 None .sdata2 @34775 */ -SECTION_SDATA2 static u32 lit_34775 = 0xC1180000; +SECTION_SDATA2 static f32 lit_34775 = -9.5f; /* 80453040-80453044 0004+00 s=1 e=0 z=0 None .sdata2 @34776 */ -SECTION_SDATA2 static u32 lit_34776 = 0xC1800000; +SECTION_SDATA2 static f32 lit_34776 = -16.0f; /* 80453044-80453048 0004+00 s=1 e=0 z=0 None .sdata2 @34777 */ -SECTION_SDATA2 static u32 lit_34777 = 0x47800000; +SECTION_SDATA2 static f32 lit_34777 = 65536.0f; /* 80453048-8045304C 0004+00 s=1 e=0 z=0 None .sdata2 @34778 */ -SECTION_SDATA2 static u32 lit_34778 = 0x3FD55555; +SECTION_SDATA2 static f32 lit_34778 = 5.0f / 3.0f; /* 8045304C-80453050 0004+00 s=1 e=0 z=0 None .sdata2 @34779 */ -SECTION_SDATA2 static u32 lit_34779 = 0xBE4CCCCD; +SECTION_SDATA2 static f32 lit_34779 = -1.0f / 5.0f; /* 80453050-80453054 0004+00 s=3 e=0 z=0 None .sdata2 @34957 */ -SECTION_SDATA2 static u32 lit_34957 = 0x41B00000; +SECTION_SDATA2 static f32 lit_34957 = 22.0f; /* 80453054-80453058 0004+00 s=1 e=0 z=0 None .sdata2 @35610 */ -SECTION_SDATA2 static u32 lit_35610 = 0x3EB33334; +SECTION_SDATA2 static f32 lit_35610 = 0.3500000238418579f; /* 80453058-8045305C 0004+00 s=4 e=0 z=0 None .sdata2 @37152 */ -SECTION_SDATA2 static u32 lit_37152 = 0x40600000; +SECTION_SDATA2 static f32 lit_37152 = 3.5f; /* 8045305C-80453060 0004+00 s=1 e=0 z=0 None .sdata2 @37322 */ -SECTION_SDATA2 static u32 lit_37322 = 0x42DE0000; +SECTION_SDATA2 static f32 lit_37322 = 111.0f; /* 80453060-80453064 0004+00 s=1 e=0 z=0 None .sdata2 @37323 */ -SECTION_SDATA2 static u32 lit_37323 = 0x42B00000; +SECTION_SDATA2 static f32 lit_37323 = 88.0f; /* 80453064-80453068 0004+00 s=1 e=0 z=0 None .sdata2 @37527 */ -SECTION_SDATA2 static u32 lit_37527 = 0x3DE38E39; +SECTION_SDATA2 static f32 lit_37527 = 1.0f / 9.0f; /* 80453068-8045306C 0004+00 s=3 e=0 z=0 None .sdata2 @37528 */ -SECTION_SDATA2 static u32 lit_37528 = 0x3E124925; +SECTION_SDATA2 static f32 lit_37528 = 1.0f / 7.0f; /* 8045306C-80453070 0004+00 s=1 e=0 z=0 None .sdata2 @37749 */ -SECTION_SDATA2 static u32 lit_37749 = 0x4078E38E; +SECTION_SDATA2 static f32 lit_37749 = 35.0f / 9.0f; /* 80453070-80453074 0004+00 s=2 e=0 z=0 None .sdata2 @38059 */ -SECTION_SDATA2 static u32 lit_38059 = 0x3EC28F5C; +SECTION_SDATA2 static f32 lit_38059 = 19.0f / 50.0f; /* 80453074-80453078 0004+00 s=1 e=0 z=0 None .sdata2 @38175 */ -SECTION_SDATA2 static u32 lit_38175 = 0x42CA0000; +SECTION_SDATA2 static f32 lit_38175 = 101.0f; /* 80453078-8045307C 0004+00 s=1 e=0 z=0 None .sdata2 @38176 */ -SECTION_SDATA2 static u32 lit_38176 = 0x42F40000; +SECTION_SDATA2 static f32 lit_38176 = 122.0f; /* 8045307C-80453080 0004+00 s=1 e=0 z=0 None .sdata2 @38177 */ -SECTION_SDATA2 static u32 lit_38177 = 0x42E40000; +SECTION_SDATA2 static f32 lit_38177 = 114.0f; /* 80453080-80453084 0004+00 s=1 e=0 z=0 None .sdata2 @38624 */ -SECTION_SDATA2 static u32 lit_38624 = 0xC2B40000; +SECTION_SDATA2 static f32 lit_38624 = -90.0f; /* 80453084-80453088 0004+00 s=1 e=0 z=0 None .sdata2 @39330 */ -SECTION_SDATA2 static u32 lit_39330 = 0x3D75C28F; +SECTION_SDATA2 static f32 lit_39330 = 3.0f / 50.0f; /* 80453088-8045308C 0004+00 s=1 e=0 z=0 None .sdata2 @40561 */ -SECTION_SDATA2 static u32 lit_40561 = 0x3D800000; +SECTION_SDATA2 static f32 lit_40561 = 0.0625f; /* 8045308C-80453090 0004+00 s=1 e=0 z=0 None .sdata2 @40562 */ -SECTION_SDATA2 static u32 lit_40562 = 0x434D0000; +SECTION_SDATA2 static f32 lit_40562 = 205.0f; /* 80453090-80453094 0004+00 s=1 e=0 z=0 None .sdata2 @40716 */ -SECTION_SDATA2 static u32 lit_40716 = 0x42A80000; +SECTION_SDATA2 static f32 lit_40716 = 84.0f; /* 80453094-8045309C 0006+02 s=1 e=0 z=0 None .sdata2 effName$40765 */ SECTION_SDATA2 static u8 effName_40765[6 + 2 /* padding */] = { @@ -7591,7 +7495,7 @@ SECTION_SDATA2 static u8 effNameWater[4] = { }; /* 804530BC-804530C0 0004+00 s=1 e=0 z=0 None .sdata2 @41180 */ -SECTION_SDATA2 static u32 lit_41180 = 0x3BB400B4; +SECTION_SDATA2 static f32 lit_41180 = 0.005493247881531715f; /* 804530C0-804530C8 0008+00 s=1 e=0 z=0 None .sdata2 jointID$41285 */ SECTION_SDATA2 static u8 jointID[8] = { @@ -7677,7 +7581,7 @@ SECTION_SDATA2 static u8 effDataTable[8] = { }; /* 80453100-80453104 0004+00 s=4 e=0 z=0 None .sdata2 @41718 */ -SECTION_SDATA2 static u32 lit_41718 = 0x3F266666; +SECTION_SDATA2 static f32 lit_41718 = 13.0f / 20.0f; /* 80453104-8045310C 0008+00 s=1 e=0 z=0 None .sdata2 cutSplashName$41756 */ SECTION_SDATA2 static u8 cutSplashName[8] = { @@ -7709,43 +7613,43 @@ SECTION_SDATA2 static u8 effName_42340[4] = { }; /* 80453118-8045311C 0004+00 s=4 e=0 z=0 None .sdata2 @42493 */ -SECTION_SDATA2 static u32 lit_42493 = 0xC2700000; +SECTION_SDATA2 static f32 lit_42493 = -60.0f; /* 8045311C-80453120 0004+00 s=2 e=0 z=0 None .sdata2 @42622 */ -SECTION_SDATA2 static u32 lit_42622 = 0xC1E80000; +SECTION_SDATA2 static f32 lit_42622 = -29.0f; /* 80453120-80453124 0004+00 s=1 e=0 z=0 None .sdata2 @42685 */ -SECTION_SDATA2 static u32 lit_42685 = 0x3E2AAAAB; +SECTION_SDATA2 static f32 lit_42685 = 1.0f / 6.0f; /* 80453124-80453128 0004+00 s=1 e=0 z=0 None .sdata2 @42686 */ -SECTION_SDATA2 static u32 lit_42686 = 0x3B800000; +SECTION_SDATA2 static f32 lit_42686 = 0.00390625f; /* 80453128-8045312C 0004+00 s=1 e=0 z=0 None .sdata2 @42687 */ -SECTION_SDATA2 static u32 lit_42687 = 0x40278D36; +SECTION_SDATA2 static f32 lit_42687 = 2.6179938316345215f; /* 8045312C-80453130 0004+00 s=1 e=0 z=0 None .sdata2 @42688 */ -SECTION_SDATA2 static u32 lit_42688 = 0x3F060A92; +SECTION_SDATA2 static f32 lit_42688 = 0.5235987901687622f; /* 80453130-80453134 0004+00 s=1 e=0 z=0 None .sdata2 @42933 */ -SECTION_SDATA2 static u32 lit_42933 = 0x42E60000; +SECTION_SDATA2 static f32 lit_42933 = 115.0f; /* 80453134-80453138 0004+00 s=1 e=0 z=0 None .sdata2 @42934 */ -SECTION_SDATA2 static u32 lit_42934 = 0xC3020000; +SECTION_SDATA2 static f32 lit_42934 = -130.0f; /* 80453138-8045313C 0004+00 s=1 e=0 z=0 None .sdata2 @43529 */ -SECTION_SDATA2 static u32 lit_43529 = 0x43340000; +SECTION_SDATA2 static f32 lit_43529 = 180.0f; /* 8045313C-80453140 0004+00 s=2 e=0 z=0 None .sdata2 @43530 */ -SECTION_SDATA2 static u32 lit_43530 = 0xC2F00000; +SECTION_SDATA2 static f32 lit_43530 = -120.0f; /* 80453140-80453144 0004+00 s=2 e=0 z=0 None .sdata2 @43531 */ -SECTION_SDATA2 static u32 lit_43531 = 0xC3480000; +SECTION_SDATA2 static f32 lit_43531 = -200.0f; /* 80453144-80453148 0004+00 s=1 e=0 z=0 None .sdata2 @44003 */ -SECTION_SDATA2 static u32 lit_44003 = 0xBEC3EF15; +SECTION_SDATA2 static f32 lit_44003 = -0.3826834261417389f; /* 80453148-8045314C 0004+00 s=1 e=0 z=0 None .sdata2 @44004 */ -SECTION_SDATA2 static u32 lit_44004 = 0xBE31D0D4; +SECTION_SDATA2 static f32 lit_44004 = -0.1736481785774231f; /* 8045314C-80453150 0004+00 s=1 e=0 z=0 None .sdata2 fFootJoint$44785 */ SECTION_SDATA2 static u8 fFootJoint[4] = { @@ -7764,103 +7668,103 @@ SECTION_SDATA2 static u8 bFootJoint[4] = { }; /* 80453154-80453158 0004+00 s=1 e=0 z=0 None .sdata2 @45401 */ -SECTION_SDATA2 static u32 lit_45401 = 0x43250000; +SECTION_SDATA2 static f32 lit_45401 = 165.0f; /* 80453158-8045315C 0004+00 s=2 e=0 z=0 None .sdata2 @45501 */ -SECTION_SDATA2 static u32 lit_45501 = 0xC47A0000; +SECTION_SDATA2 static f32 lit_45501 = -1000.0f; /* 8045315C-80453160 0004+00 s=1 e=0 z=0 None .sdata2 @45756 */ -SECTION_SDATA2 static u32 lit_45756 = 0xBFC00000; +SECTION_SDATA2 static f32 lit_45756 = -1.5f; /* 80453160-80453164 0004+00 s=1 e=0 z=0 None .sdata2 @46081 */ -SECTION_SDATA2 static u32 lit_46081 = 0x41840000; +SECTION_SDATA2 static f32 lit_46081 = 16.5f; /* 80453164-80453168 0004+00 s=3 e=0 z=0 None .sdata2 @46462 */ -SECTION_SDATA2 static u32 lit_46462 = 0x42600000; +SECTION_SDATA2 static f32 lit_46462 = 56.0f; /* 80453168-8045316C 0004+00 s=1 e=0 z=0 None .sdata2 @47052 */ -SECTION_SDATA2 static u32 lit_47052 = 0x4B095440; +SECTION_SDATA2 static f32 lit_47052 = 9000000.0f; /* 8045316C-80453170 0004+00 s=1 e=0 z=0 None .sdata2 @47417 */ -SECTION_SDATA2 static u32 lit_47417 = 0xC5C00000; +SECTION_SDATA2 static f32 lit_47417 = -6144.0f; /* 80453170-80453174 0004+00 s=3 e=0 z=0 None .sdata2 @47597 */ -SECTION_SDATA2 static u32 lit_47597 = 0x41580000; +SECTION_SDATA2 static f32 lit_47597 = 13.5f; /* 80453174-80453178 0004+00 s=1 e=0 z=0 None .sdata2 @47598 */ -SECTION_SDATA2 static u32 lit_47598 = 0x3E6E4BAE; +SECTION_SDATA2 static f32 lit_47598 = 0.2327105700969696f; /* 80453178-8045317C 0004+00 s=1 e=0 z=0 None .sdata2 @47725 */ -SECTION_SDATA2 static u32 lit_47725 = 0x45400000; +SECTION_SDATA2 static f32 lit_47725 = 3072.0f; /* 8045317C-80453180 0004+00 s=1 e=0 z=0 None .sdata2 @47726 */ -SECTION_SDATA2 static u32 lit_47726 = 0x44C00000; +SECTION_SDATA2 static f32 lit_47726 = 1536.0f; /* 80453180-80453184 0004+00 s=2 e=0 z=0 None .sdata2 @48076 */ -SECTION_SDATA2 static u32 lit_48076 = 0x42AA0000; +SECTION_SDATA2 static f32 lit_48076 = 85.0f; /* 80453184-80453188 0004+00 s=2 e=0 z=0 None .sdata2 @48077 */ -SECTION_SDATA2 static u32 lit_48077 = 0x41480000; +SECTION_SDATA2 static f32 lit_48077 = 12.5f; /* 80453188-8045318C 0004+00 s=2 e=0 z=0 None .sdata2 @48078 */ -SECTION_SDATA2 static u32 lit_48078 = 0x41680000; +SECTION_SDATA2 static f32 lit_48078 = 14.5f; /* 8045318C-80453190 0004+00 s=1 e=0 z=0 None .sdata2 @48504 */ -SECTION_SDATA2 static u32 lit_48504 = 0x42AC0000; +SECTION_SDATA2 static f32 lit_48504 = 86.0f; /* 80453190-80453194 0004+00 s=1 e=0 z=0 None .sdata2 @48505 */ -SECTION_SDATA2 static u32 lit_48505 = 0x428E0000; +SECTION_SDATA2 static f32 lit_48505 = 71.0f; /* 80453194-80453198 0004+00 s=1 e=0 z=0 None .sdata2 @48506 */ -SECTION_SDATA2 static u32 lit_48506 = 0x427C0000; +SECTION_SDATA2 static f32 lit_48506 = 63.0f; /* 80453198-8045319C 0004+00 s=1 e=0 z=0 None .sdata2 @49124 */ -SECTION_SDATA2 static u32 lit_49124 = 0x471C4000; +SECTION_SDATA2 static f32 lit_49124 = 40000.0f; /* 8045319C-804531A0 0004+00 s=1 e=0 z=0 None .sdata2 @49395 */ -SECTION_SDATA2 static u32 lit_49395 = 0x3EAD62D9; +SECTION_SDATA2 static f32 lit_49395 = 0.33864477276802063f; /* 804531A0-804531A4 0004+00 s=1 e=0 z=0 None .sdata2 @49396 */ -SECTION_SDATA2 static u32 lit_49396 = 0xC1EC337A; +SECTION_SDATA2 static f32 lit_49396 = -29.525135040283203f; /* 804531A4-804531A8 0004+00 s=1 e=0 z=0 None .sdata2 @49938 */ -SECTION_SDATA2 static u32 lit_49938 = 0x3E567750; +SECTION_SDATA2 static f32 lit_49938 = 0.20943951606750488f; /* 804531A8-804531AC 0004+00 s=1 e=0 z=0 None .sdata2 @49992 */ -SECTION_SDATA2 static u32 lit_49992 = 0x41A40000; +SECTION_SDATA2 static f32 lit_49992 = 20.5f; /* 804531AC-804531B0 0004+00 s=1 e=0 z=0 None .sdata2 @50951 */ -SECTION_SDATA2 static u32 lit_50951 = 0x43070000; +SECTION_SDATA2 static f32 lit_50951 = 135.0f; /* 804531B0-804531B4 0004+00 s=1 e=0 z=0 None .sdata2 @51575 */ -SECTION_SDATA2 static u32 lit_51575 = 0x431B0000; +SECTION_SDATA2 static f32 lit_51575 = 155.0f; /* 804531B4-804531B8 0004+00 s=4 e=0 z=0 None .sdata2 @52234 */ -SECTION_SDATA2 static u32 lit_52234 = 0x40F00000; +SECTION_SDATA2 static f32 lit_52234 = 7.5f; /* 804531B8-804531BC 0004+00 s=1 e=0 z=0 None .sdata2 @52470 */ -SECTION_SDATA2 static u32 lit_52470 = 0x418C0000; +SECTION_SDATA2 static f32 lit_52470 = 17.5f; /* 804531BC-804531C0 0004+00 s=1 e=0 z=0 None .sdata2 @52534 */ -SECTION_SDATA2 static u32 lit_52534 = 0xC1100000; +SECTION_SDATA2 static f32 lit_52534 = -9.0f; /* 804531C0-804531C4 0004+00 s=1 e=0 z=0 None .sdata2 @52535 */ -SECTION_SDATA2 static u32 lit_52535 = 0xC1880000; +SECTION_SDATA2 static f32 lit_52535 = -17.0f; /* 804531C4-804531C8 0004+00 s=2 e=0 z=0 None .sdata2 @52536 */ -SECTION_SDATA2 static u32 lit_52536 = 0xC0E00000; +SECTION_SDATA2 static f32 lit_52536 = -7.0f; /* 804531C8-804531CC 0004+00 s=1 e=0 z=0 None .sdata2 @52882 */ -SECTION_SDATA2 static u32 lit_52882 = 0x42BC0000; +SECTION_SDATA2 static f32 lit_52882 = 94.0f; /* 804531CC-804531D0 0004+00 s=2 e=0 z=0 None .sdata2 @52883 */ -SECTION_SDATA2 static u32 lit_52883 = 0x42C20000; +SECTION_SDATA2 static f32 lit_52883 = 97.0f; /* 804531D0-804531D4 0004+00 s=1 e=0 z=0 None .sdata2 @52884 */ -SECTION_SDATA2 static u32 lit_52884 = 0x3F733333; +SECTION_SDATA2 static f32 lit_52884 = 19.0f / 20.0f; /* 804531D4-804531D8 0004+00 s=1 e=0 z=0 None .sdata2 @53012 */ -SECTION_SDATA2 static u32 lit_53012 = 0x42840000; +SECTION_SDATA2 static f32 lit_53012 = 66.0f; /* 804531D8-804531E0 0008+00 s=1 e=0 z=0 None .sdata2 snowID$53110 */ SECTION_SDATA2 static u8 snowID[8] = { @@ -7878,10 +7782,10 @@ SECTION_SDATA2 static u8 waterColor[8] = { }; /* 804531F0-804531F4 0004+00 s=1 e=0 z=0 None .sdata2 @55047 */ -SECTION_SDATA2 static u32 lit_55047 = 0x429A0000; +SECTION_SDATA2 static f32 lit_55047 = 77.0f; /* 804531F4-804531F8 0004+00 s=1 e=0 z=0 None .sdata2 @55048 */ -SECTION_SDATA2 static u32 lit_55048 = 0x457DC000; +SECTION_SDATA2 static f32 lit_55048 = 4060.0f; /* 8009F034-8009FFF8 0FC4+00 s=1 e=0 z=0 None .text setHatAngle__9daAlink_cFv */ #pragma push @@ -7905,25 +7809,25 @@ asm void daAlink_c::calcHairAngle(s16* param_0) { /* ############################################################################################## */ /* 804531F8-804531FC 0004+00 s=2 e=0 z=0 None .sdata2 @55145 */ -SECTION_SDATA2 static u32 lit_55145 = 0x3D088889; +SECTION_SDATA2 static f32 lit_55145 = 1.0f / 30.0f; /* 804531FC-80453200 0004+00 s=1 e=0 z=0 None .sdata2 @55146 */ -SECTION_SDATA2 static u32 lit_55146 = 0x45BB8000; +SECTION_SDATA2 static f32 lit_55146 = 6000.0f; /* 80453200-80453204 0004+00 s=1 e=0 z=0 None .sdata2 @55147 */ -SECTION_SDATA2 static u32 lit_55147 = 0x45FA0000; +SECTION_SDATA2 static f32 lit_55147 = 8000.0f; /* 80453204-80453208 0004+00 s=1 e=0 z=0 None .sdata2 @55148 */ -SECTION_SDATA2 static u32 lit_55148 = 0x45DAC000; +SECTION_SDATA2 static f32 lit_55148 = 7000.0f; /* 80453208-8045320C 0004+00 s=1 e=0 z=0 None .sdata2 @55149 */ -SECTION_SDATA2 static u32 lit_55149 = 0xC60CA000; +SECTION_SDATA2 static f32 lit_55149 = -9000.0f; /* 8045320C-80453210 0004+00 s=1 e=0 z=0 None .sdata2 @55150 */ -SECTION_SDATA2 static u32 lit_55150 = 0xC66A6000; +SECTION_SDATA2 static f32 lit_55150 = -15000.0f; /* 80453210-80453214 0004+00 s=1 e=0 z=0 None .sdata2 @55151 */ -SECTION_SDATA2 static u32 lit_55151 = 0xC5DAC000; +SECTION_SDATA2 static f32 lit_55151 = -7000.0f; /* 800A002C-800A0744 0718+00 s=1 e=0 z=0 None .text setHairAngle__9daAlink_cFP4cXyzff */ #pragma push @@ -9054,16 +8958,16 @@ asm void daAlink_c::getNeckAimAngle(cXyz* param_0, s16* param_1, s16* param_2, s /* ############################################################################################## */ /* 80453214-80453218 0004+00 s=1 e=0 z=0 None .sdata2 @55845 */ -SECTION_SDATA2 static u32 lit_55845 = 0x39000000; +SECTION_SDATA2 static f32 lit_55845 = 0.0001220703125f; /* 80453218-8045321C 0004+00 s=1 e=0 z=0 None .sdata2 @55846 */ -SECTION_SDATA2 static u32 lit_55846 = 0x39800000; +SECTION_SDATA2 static f32 lit_55846 = 0.000244140625f; /* 8045321C-80453220 0004+00 s=2 e=0 z=0 None .sdata2 @55847 */ -SECTION_SDATA2 static u32 lit_55847 = 0x3CF5C28F; +SECTION_SDATA2 static f32 lit_55847 = 3.0f / 100.0f; /* 80453220-80453224 0004+00 s=1 e=0 z=0 None .sdata2 @55848 */ -SECTION_SDATA2 static u32 lit_55848 = 0x3DA3D70A; +SECTION_SDATA2 static f32 lit_55848 = 2.0f / 25.0f; /* 800A1AEC-800A1F90 04A4+00 s=1 e=0 z=0 None .text setEyeMove__9daAlink_cFP4cXyzss */ #pragma push @@ -9130,7 +9034,7 @@ asm void daAlink_c::checkGoronRide() { /* ############################################################################################## */ /* 80453224-80453228 0004+00 s=1 e=0 z=0 None .sdata2 @56018 */ -SECTION_SDATA2 static u32 lit_56018 = 0xC0799999; +SECTION_SDATA2 static f32 lit_56018 = -3.8999998569488525f; /* 800A22E8-800A2710 0428+00 s=1 e=0 z=0 None .text setMoveSlantAngle__9daAlink_cFv */ #pragma push @@ -10221,8 +10125,10 @@ SECTION_RODATA static u8 const hsVec[12] = { }; /* 80391A08-80391A14 000C+00 s=1 e=0 z=0 None .rodata hookRoot$29726 */ -SECTION_RODATA static u8 const hookRoot[12] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xBC, 0x00, 0x00, +SECTION_RODATA static f32 const hookRoot[3] = { + 0.0f, + 0.0f, + 23.5f, }; /* 80391A14-80391A20 000C+00 s=1 e=0 z=0 None .rodata bottleTop$32160 */ @@ -10872,10 +10778,10 @@ SECTION_RODATA static u8 const localRightToeOffset[12] = { }; /* 80450690-80450694 0004+00 s=20 e=0 z=0 None .sdata l_autoUpHeight */ -SECTION_SDATA static u32 l_autoUpHeight = 0x41F0147B; +SECTION_SDATA static f32 l_autoUpHeight = 30.010000228881836f; /* 80450694-80450698 0004+00 s=12 e=0 z=0 None .sdata l_autoDownHeight */ -SECTION_SDATA static u32 l_autoDownHeight = 0xC1F0147B; +SECTION_SDATA static f32 l_autoDownHeight = -30.010000228881836f; /* 800A3430-800A39B8 0588+00 s=1 e=0 z=0 None .text footBgCheck__9daAlink_cFv */ #pragma push @@ -15596,10 +15502,10 @@ static u8 bgWaitFlg[4]; static u8 struct_80450FD0[8]; /* 80453230-80453234 0004+00 s=1 e=0 z=0 None .sdata2 @58630 */ -SECTION_SDATA2 static u32 lit_58630 = 0x45EA6000; +SECTION_SDATA2 static f32 lit_58630 = 7500.0f; /* 80453234-80453238 0004+00 s=2 e=0 z=0 None .sdata2 @58631 */ -SECTION_SDATA2 static u32 lit_58631 = 0x43898000; +SECTION_SDATA2 static f32 lit_58631 = 275.0f; /* 800A5CC8-800A660C 0944+00 s=1 e=0 z=0 None .text create__9daAlink_cFv */ #pragma push @@ -15673,13 +15579,13 @@ asm void daAlink_c::setIceSlipSpeed() { /* ############################################################################################## */ /* 80453238-8045323C 0004+00 s=3 e=0 z=0 None .sdata2 @59593 */ -SECTION_SDATA2 static u32 lit_59593 = 0x3BB40000; +SECTION_SDATA2 static f32 lit_59593 = 0.0054931640625f; /* 8045323C-80453240 0004+00 s=1 e=0 z=0 None .sdata2 @59594 */ -SECTION_SDATA2 static u32 lit_59594 = 0x41EF3333; +SECTION_SDATA2 static f32 lit_59594 = 29.899999618530273f; /* 80453240-80453244 0004+00 s=1 e=0 z=0 None .sdata2 @59595 */ -SECTION_SDATA2 static u32 lit_59595 = 0x3C8A577C; +SECTION_SDATA2 static f32 lit_59595 = 0.016887418925762177f; /* 800A7358-800A7950 05F8+00 s=1 e=0 z=0 None .text setPolygonSpeed__9daAlink_cFv */ #pragma push @@ -15835,7 +15741,7 @@ asm void daAlink_c::setAttentionPos() { /* ############################################################################################## */ /* 80453244-80453248 0004+00 s=1 e=0 z=0 None .sdata2 @60413 */ -SECTION_SDATA2 static u32 lit_60413 = 0xC28C0000; +SECTION_SDATA2 static f32 lit_60413 = -70.0f; /* 800A8CE4-800A9248 0564+00 s=3 e=0 z=0 None .text setMatrix__9daAlink_cFv */ #pragma push @@ -15870,34 +15776,34 @@ asm void daAlink_c::setSwordPos() { /* ############################################################################################## */ /* 80453248-8045324C 0004+00 s=1 e=0 z=0 None .sdata2 @61025 */ -SECTION_SDATA2 static u32 lit_61025 = 0xC1940000; +SECTION_SDATA2 static f32 lit_61025 = -18.5f; /* 8045324C-80453250 0004+00 s=1 e=0 z=0 None .sdata2 @61026 */ -SECTION_SDATA2 static u32 lit_61026 = 0x3E0F5C29; +SECTION_SDATA2 static f32 lit_61026 = 7.0f / 50.0f; /* 80453250-80453254 0004+00 s=1 e=0 z=0 None .sdata2 @61027 */ -SECTION_SDATA2 static u32 lit_61027 = 0x41433333; +SECTION_SDATA2 static f32 lit_61027 = 61.0f / 5.0f; /* 80453254-80453258 0004+00 s=1 e=0 z=0 None .sdata2 @61028 */ -SECTION_SDATA2 static u32 lit_61028 = 0x40866666; +SECTION_SDATA2 static f32 lit_61028 = 21.0f / 5.0f; /* 80453258-8045325C 0004+00 s=1 e=0 z=0 None .sdata2 @61029 */ -SECTION_SDATA2 static u32 lit_61029 = 0xC08CCCCD; +SECTION_SDATA2 static f32 lit_61029 = -22.0f / 5.0f; /* 8045325C-80453260 0004+00 s=1 e=0 z=0 None .sdata2 @61030 */ -SECTION_SDATA2 static u32 lit_61030 = 0xC0F00000; +SECTION_SDATA2 static f32 lit_61030 = -7.5f; /* 80453260-80453264 0004+00 s=1 e=0 z=0 None .sdata2 @61031 */ -SECTION_SDATA2 static u32 lit_61031 = 0xC0B00000; +SECTION_SDATA2 static f32 lit_61031 = -5.5f; /* 80453264-80453268 0004+00 s=1 e=0 z=0 None .sdata2 @61032 */ -SECTION_SDATA2 static u32 lit_61032 = 0xBFA66666; +SECTION_SDATA2 static f32 lit_61032 = -13.0f / 10.0f; /* 80453268-8045326C 0004+00 s=1 e=0 z=0 None .sdata2 @61033 */ -SECTION_SDATA2 static u32 lit_61033 = 0xBDCCCCCD; +SECTION_SDATA2 static f32 lit_61033 = -1.0f / 10.0f; /* 8045326C-80453270 0004+00 s=1 e=0 z=0 None .sdata2 @61034 */ -SECTION_SDATA2 static u32 lit_61034 = 0xBF333333; +SECTION_SDATA2 static f32 lit_61034 = -7.0f / 10.0f; /* 800A9450-800A9F4C 0AFC+00 s=4 e=0 z=0 None .text setItemMatrix__9daAlink_cFi */ #pragma push @@ -15911,10 +15817,10 @@ asm void daAlink_c::setItemMatrix(int param_0) { /* ############################################################################################## */ /* 80453270-80453274 0004+00 s=1 e=0 z=0 None .sdata2 @61141 */ -SECTION_SDATA2 static u32 lit_61141 = 0xC1A80000; +SECTION_SDATA2 static f32 lit_61141 = -21.0f; /* 80453274-80453278 0004+00 s=1 e=0 z=0 None .sdata2 @61142 */ -SECTION_SDATA2 static u32 lit_61142 = 0xC1500000; +SECTION_SDATA2 static f32 lit_61142 = -13.0f; /* 800A9F4C-800AA2BC 0370+00 s=4 e=0 z=0 None .text setWolfItemMatrix__9daAlink_cFv */ #pragma push @@ -16443,13 +16349,13 @@ asm void daAlink_c::setBlendMoveAnime(f32 param_0) { /* ############################################################################################## */ /* 80453280-80453284 0004+00 s=2 e=0 z=0 None .sdata2 @63332 */ -SECTION_SDATA2 static u32 lit_63332 = 0xBF7D70A4; +SECTION_SDATA2 static f32 lit_63332 = -99.0f / 100.0f; /* 80453284-80453288 0004+00 s=1 e=0 z=0 None .sdata2 @63333 */ -SECTION_SDATA2 static u32 lit_63333 = 0x3F5DB22D; +SECTION_SDATA2 static f32 lit_63333 = 0.8659999966621399f; /* 80453288-8045328C 0004+00 s=2 e=0 z=0 None .sdata2 @63334 */ -SECTION_SDATA2 static u32 lit_63334 = 0xBF5DB22D; +SECTION_SDATA2 static f32 lit_63334 = -0.8659999966621399f; /* 800AEA70-800AF11C 06AC+00 s=17 e=0 z=0 None .text setBlendAtnMoveAnime__9daAlink_cFf */ #pragma push @@ -16483,7 +16389,7 @@ asm void daAlink_c::setFaceBck(u16 param_0, int param_1, u16 param_2) { /* ############################################################################################## */ /* 8045328C-80453290 0004+00 s=2 e=0 z=0 None .sdata2 @63482 */ -SECTION_SDATA2 static u32 lit_63482 = 0x3C449BA6; +SECTION_SDATA2 static f32 lit_63482 = 0.012000000104308128f; /* 800AF61C-800AF7D0 01B4+00 s=7 e=0 z=0 None .text setFaceBtp__9daAlink_cFUsiUs */ #pragma push @@ -16645,7 +16551,7 @@ asm void daAlink_c::getWallEdgePos(cXyz const& param_0, cM3dGPla* param_1, cM3dG /* ############################################################################################## */ /* 80453290-80453294 0004+00 s=1 e=0 z=0 None .sdata2 @64357 */ -SECTION_SDATA2 static u32 lit_64357 = 0x42120000; +SECTION_SDATA2 static f32 lit_64357 = 36.5f; /* 800B02BC-800B146C 11B0+00 s=9 e=0 z=0 None .text setFrontWallType__9daAlink_cFv */ #pragma push @@ -16709,19 +16615,19 @@ asm void daAlink_c::setSandDownBgCheckWallH() { /* ############################################################################################## */ /* 80453294-80453298 0004+00 s=1 e=0 z=0 None .sdata2 @64592 */ -SECTION_SDATA2 static u32 lit_64592 = 0x413A7AE1; +SECTION_SDATA2 static f32 lit_64592 = 11.654999732971191f; /* 80453298-8045329C 0004+00 s=1 e=0 z=0 None .sdata2 @64593 */ -SECTION_SDATA2 static u32 lit_64593 = 0x430C0000; +SECTION_SDATA2 static f32 lit_64593 = 140.0f; /* 8045329C-804532A0 0004+00 s=1 e=0 z=0 None .sdata2 @64594 */ -SECTION_SDATA2 static u32 lit_64594 = 0xC3820000; +SECTION_SDATA2 static f32 lit_64594 = -260.0f; /* 804532A0-804532A4 0004+00 s=1 e=0 z=0 None .sdata2 @64595 */ -SECTION_SDATA2 static u32 lit_64595 = 0xC30C0000; +SECTION_SDATA2 static f32 lit_64595 = -140.0f; /* 804532A4-804532A8 0004+00 s=1 e=0 z=0 None .sdata2 @64596 */ -SECTION_SDATA2 static u32 lit_64596 = 0x4247F5C4; +SECTION_SDATA2 static f32 lit_64596 = 49.99000549316406f; /* 800B1770-800B1B28 03B8+00 s=2 e=0 z=0 None .text setBgCheckParam__9daAlink_cFv */ #pragma push @@ -16755,10 +16661,10 @@ asm void daAlink_c::checkNotItemSinkLimit() { /* ############################################################################################## */ /* 804532A8-804532AC 0004+00 s=1 e=0 z=0 None .sdata2 @64730 */ -SECTION_SDATA2 static u32 lit_64730 = 0x3EDB6DB7; +SECTION_SDATA2 static f32 lit_64730 = 3.0f / 7.0f; /* 804532AC-804532B0 0004+00 s=1 e=0 z=0 None .sdata2 @64731 */ -SECTION_SDATA2 static u32 lit_64731 = 0x43000000; +SECTION_SDATA2 static f32 lit_64731 = 128.0f; /* 800B1BAC-800B1FB8 040C+00 s=2 e=0 z=0 None .text setSandShapeOffset__9daAlink_cFv */ #pragma push @@ -17347,7 +17253,7 @@ asm void daAlink_c::checkCutJumpInFly() { /* ############################################################################################## */ /* 80450698-8045069C 0004+00 s=4 e=0 z=0 None .sdata l_ladderAnmBaseTransY */ -SECTION_SDATA static u32 l_ladderAnmBaseTransY = 0x42CC0047; +SECTION_SDATA static f32 l_ladderAnmBaseTransY = 102.00054168701172f; /* 800B6A30-800B6F28 04F8+00 s=16 e=0 z=0 None .text checkFrontWallTypeAction__9daAlink_cFv */ #pragma push @@ -17490,7 +17396,7 @@ asm void daAlink_c::orderTalk(int param_0) { /* ############################################################################################## */ /* 804532B4-804532B8 0004+00 s=1 e=0 z=0 None .sdata2 @67554 */ -SECTION_SDATA2 static u32 lit_67554 = 0x44898000; +SECTION_SDATA2 static f32 lit_67554 = 1100.0f; /* 800B7D4C-800B7F84 0238+00 s=1 e=0 z=0 None .text daAlink_searchBouDoor__FP10fopAc_ac_cPv */ #pragma push @@ -17640,7 +17546,7 @@ asm void daAlink_c::checkSwordTwirlAnime() const { /* ############################################################################################## */ /* 804532B8-804532BC 0004+00 s=1 e=0 z=0 None .sdata2 @68266 */ -SECTION_SDATA2 static u32 lit_68266 = 0xBF4CCCCD; +SECTION_SDATA2 static f32 lit_68266 = -4.0f / 5.0f; /* 800B93F4-800B9580 018C+00 s=7 e=0 z=0 None .text swordEquip__9daAlink_cFi */ #pragma push @@ -17765,7 +17671,7 @@ asm void daAlink_c::commonChangeItem() { /* ############################################################################################## */ /* 804532BC-804532C0 0004+00 s=1 e=0 z=0 None .sdata2 @68956 */ -SECTION_SDATA2 static u32 lit_68956 = 0x41180000; +SECTION_SDATA2 static f32 lit_68956 = 9.5f; /* 800BA914-800BAF08 05F4+00 s=1 e=0 z=0 None .text setItemAction__9daAlink_cFv */ #pragma push @@ -17920,7 +17826,7 @@ asm void daAlink_c::setFootSpeed() { /* ############################################################################################## */ /* 804532C0-804532C4 0004+00 s=2 e=0 z=0 None .sdata2 @70084 */ -SECTION_SDATA2 static u32 lit_70084 = 0x40100000; +SECTION_SDATA2 static f32 lit_70084 = 2.25f; /* 800BBF68-800BD6FC 1794+00 s=1 e=0 z=0 None .text posMove__9daAlink_cFv */ #pragma push @@ -17934,7 +17840,7 @@ asm void daAlink_c::posMove() { /* ############################################################################################## */ /* 804532C4-804532C8 0004+00 s=1 e=0 z=0 None .sdata2 @70267 */ -SECTION_SDATA2 static u32 lit_70267 = 0x358637BD; +SECTION_SDATA2 static f32 lit_70267 = 9.999999974752427e-07f; /* 800BD6FC-800BDD70 0674+00 s=1 e=0 z=0 None .text autoGroundHit__9daAlink_cFv */ #pragma push @@ -18488,13 +18394,13 @@ asm void daAlink_c::deleteEquipItem(int param_0, int param_1) { SECTION_SDATA2 static u32 lit_71910 = 0x000000FF; /* 804532CC-804532D0 0004+00 s=1 e=0 z=0 None .sdata2 @71997 */ -SECTION_SDATA2 static u32 lit_71997 = 0x3E8F5C29; +SECTION_SDATA2 static f32 lit_71997 = 7.0f / 25.0f; /* 804532D0-804532D4 0004+00 s=1 e=0 z=0 None .sdata2 @71998 */ -SECTION_SDATA2 static u32 lit_71998 = 0x432E0000; +SECTION_SDATA2 static f32 lit_71998 = 174.0f; /* 804532D4-804532D8 0004+00 s=1 e=0 z=0 None .sdata2 @71999 */ -SECTION_SDATA2 static u32 lit_71999 = 0x430D0000; +SECTION_SDATA2 static f32 lit_71999 = 141.0f; /* 800C1704-800C1CEC 05E8+00 s=1 e=0 z=0 None .text setLight__9daAlink_cFv */ #pragma push @@ -18829,7 +18735,7 @@ asm void daAlink_c::procSlideInit(s16 param_0) { /* ############################################################################################## */ /* 804532E0-804532E4 0004+00 s=1 e=0 z=0 None .sdata2 @73057 */ -SECTION_SDATA2 static u32 lit_73057 = 0xC5800000; +SECTION_SDATA2 static f32 lit_73057 = -4096.0f; /* 800C4514-800C47AC 0298+00 s=1 e=0 z=0 None .text procSlide__9daAlink_cFv */ #pragma push @@ -19023,7 +18929,7 @@ asm void daAlink_c::procAutoJumpInit(int param_0) { /* ############################################################################################## */ /* 804532E4-804532E8 0004+00 s=1 e=0 z=0 None .sdata2 @73781 */ -SECTION_SDATA2 static u32 lit_73781 = 0x3F2AAAAB; +SECTION_SDATA2 static f32 lit_73781 = 2.0f / 3.0f; /* 800C61EC-800C66DC 04F0+00 s=1 e=0 z=0 None .text procAutoJump__9daAlink_cFv */ #pragma push @@ -19037,7 +18943,7 @@ asm void daAlink_c::procAutoJump() { /* ############################################################################################## */ /* 804532E8-804532EC 0004+00 s=1 e=0 z=0 None .sdata2 @73790 */ -SECTION_SDATA2 static u32 lit_73790 = 0x42B80000; +SECTION_SDATA2 static f32 lit_73790 = 92.0f; /* 800C66DC-800C6798 00BC+00 s=1 e=0 z=0 None .text procDiveJumpInit__9daAlink_cFv */ #pragma push @@ -19171,7 +19077,7 @@ asm void daAlink_c::procCrouchInit() { /* ############################################################################################## */ /* 804532EC-804532F0 0004+00 s=1 e=0 z=0 None .sdata2 @74138 */ -SECTION_SDATA2 static u32 lit_74138 = 0xC2A00000; +SECTION_SDATA2 static f32 lit_74138 = -80.0f; /* 800C76F8-800C77F4 00FC+00 s=1 e=0 z=0 None .text procCrouch__9daAlink_cFv */ #pragma push @@ -19208,51 +19114,37 @@ asm void daAlink_c::procCoMetamorphoseInit() { /* ############################################################################################## */ /* 804532F0-804532F4 0004+00 s=1 e=0 z=0 None .sdata2 @74385 */ -SECTION_SDATA2 static u32 lit_74385 = 0x3D1D89D9; +SECTION_SDATA2 static f32 lit_74385 = 1.0f / 26.0f; /* 804532F4-804532F8 0004+00 s=1 e=0 z=0 None .sdata2 @74386 */ -SECTION_SDATA2 static u32 lit_74386 = 0xC2800000; +SECTION_SDATA2 static f32 lit_74386 = -64.0f; /* 804532F8-80453300 0008+00 s=1 e=0 z=0 None .sdata2 @74387 */ -SECTION_SDATA2 static u8 lit_74387[8] = { - 0x40, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_74387 = 15.0; /* 80453300-80453308 0008+00 s=1 e=0 z=0 None .sdata2 @74388 */ -SECTION_SDATA2 static u8 lit_74388[8] = { - 0x40, 0x48, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_74388 = 49.0; /* 80453308-80453310 0008+00 s=1 e=0 z=0 None .sdata2 @74389 */ -SECTION_SDATA2 static u8 lit_74389[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_74389 = 1.0; /* 80453310-80453318 0008+00 s=1 e=0 z=0 None .sdata2 @74390 */ -SECTION_SDATA2 static u8 lit_74390[8] = { - 0x3F, 0xB2, 0x49, 0x24, 0x92, 0x49, 0x24, 0x92, -}; +SECTION_SDATA2 static f64 lit_74390 = 1.0 / 14.0; /* 80453318-80453320 0008+00 s=1 e=0 z=0 None .sdata2 @74391 */ -SECTION_SDATA2 static u8 lit_74391[8] = { - 0xC0, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_74391 = -64.0; /* 80453320-80453328 0008+00 s=1 e=0 z=0 None .sdata2 @74392 */ -SECTION_SDATA2 static u8 lit_74392[8] = { - 0xC0, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_74392 = -15.0; /* 80453328-80453330 0008+00 s=1 e=0 z=0 None .sdata2 @74393 */ -SECTION_SDATA2 static u8 lit_74393[8] = { - 0x3F, 0xBC, 0x71, 0xC7, 0x1C, 0x71, 0xC7, 0x1C, -}; +SECTION_SDATA2 static f64 lit_74393 = 1.0 / 9.0; /* 80453330-80453334 0004+00 s=1 e=0 z=0 None .sdata2 @74394 */ -SECTION_SDATA2 static u32 lit_74394 = 0x42440000; +SECTION_SDATA2 static f32 lit_74394 = 49.0f; /* 80453334-80453338 0004+00 s=1 e=0 z=0 None .sdata2 @74395 */ -SECTION_SDATA2 static u32 lit_74395 = 0x3CE38E39; +SECTION_SDATA2 static f32 lit_74395 = 1.0f / 36.0f; /* 800C7C64-800C82E8 0684+00 s=1 e=0 z=0 None .text procCoMetamorphose__9daAlink_cFv */ #pragma push @@ -19398,7 +19290,7 @@ asm void daAlink_c::initShadowScaleLight() { /* ############################################################################################## */ /* 80453338-8045333C 0004+00 s=1 e=0 z=0 None .sdata2 @75939 */ -SECTION_SDATA2 static u32 lit_75939 = 0x47435000; +SECTION_SDATA2 static f32 lit_75939 = 50000.0f; /* 800CBA38-800CBC18 01E0+00 s=0 e=0 z=1 None .text moveShadowScaleLight__9daAlink_cFv */ #pragma push @@ -36838,73 +36730,73 @@ asm void cLib_calcTimer__template0(u8* param_0) { /* ############################################################################################## */ /* 80453344-80453348 0004+00 s=1 e=0 z=0 None .sdata2 @77808 */ -SECTION_SDATA2 static u32 lit_77808 = 0x3F9F13BE; +SECTION_SDATA2 static f32 lit_77808 = 1.2427899837493896f; /* 80453348-8045334C 0004+00 s=1 e=0 z=0 None .sdata2 @77809 */ -SECTION_SDATA2 static u32 lit_77809 = 0x42CC0047; +SECTION_SDATA2 static f32 lit_77809 = 102.00054168701172f; /* 8045334C-80453350 0004+00 s=1 e=0 z=0 None .sdata2 @77810 */ -SECTION_SDATA2 static u32 lit_77810 = 0xC087F74D; +SECTION_SDATA2 static f32 lit_77810 = -4.248938083648682f; /* 80453350-80453354 0004+00 s=1 e=0 z=0 None .sdata2 @77811 */ -SECTION_SDATA2 static u32 lit_77811 = 0x42B20000; +SECTION_SDATA2 static f32 lit_77811 = 89.0f; /* 80453354-80453358 0004+00 s=1 e=0 z=0 None .sdata2 @77812 */ -SECTION_SDATA2 static u32 lit_77812 = 0xC0A88BA2; +SECTION_SDATA2 static f32 lit_77812 = -5.267045021057129f; /* 80453358-8045335C 0004+00 s=1 e=0 z=0 None .sdata2 @77813 */ -SECTION_SDATA2 static u32 lit_77813 = 0x408A0BE3; +SECTION_SDATA2 static f32 lit_77813 = 4.313951015472412f; /* 8045335C-80453360 0004+00 s=1 e=0 z=0 None .sdata2 @77814 */ -SECTION_SDATA2 static u32 lit_77814 = 0x42BBE383; +SECTION_SDATA2 static f32 lit_77814 = 93.9443588256836f; /* 80453360-80453364 0004+00 s=1 e=0 z=0 None .sdata2 @77815 */ -SECTION_SDATA2 static u32 lit_77815 = 0xC0A6A210; +SECTION_SDATA2 static f32 lit_77815 = -5.207283020019531f; /* 80453364-80453368 0004+00 s=1 e=0 z=0 None .sdata2 @77816 */ -SECTION_SDATA2 static u32 lit_77816 = 0xC089A1B2; +SECTION_SDATA2 static f32 lit_77816 = -4.30098819732666f; /* 80453368-8045336C 0004+00 s=1 e=0 z=0 None .sdata2 @77817 */ -SECTION_SDATA2 static u32 lit_77817 = 0x42BBE972; +SECTION_SDATA2 static f32 lit_77817 = 93.95594787597656f; /* 8045336C-80453370 0004+00 s=1 e=0 z=0 None .sdata2 @77818 */ -SECTION_SDATA2 static u32 lit_77818 = 0xC0A6FDFC; +SECTION_SDATA2 static f32 lit_77818 = -5.218503952026367f; /* 80453370-80453374 0004+00 s=1 e=0 z=0 None .sdata2 @77819 */ -SECTION_SDATA2 static u32 lit_77819 = 0x4361B333; +SECTION_SDATA2 static f32 lit_77819 = 225.6999969482422f; /* 80453374-80453378 0004+00 s=1 e=0 z=0 None .sdata2 @77820 */ -SECTION_SDATA2 static u32 lit_77820 = 0x3FE7AE14; +SECTION_SDATA2 static f32 lit_77820 = 1.809999942779541f; /* 80453378-8045337C 0004+00 s=1 e=0 z=0 None .sdata2 @77821 */ -SECTION_SDATA2 static u32 lit_77821 = 0x433A2B85; +SECTION_SDATA2 static f32 lit_77821 = 186.1699981689453f; /* 8045337C-80453380 0004+00 s=1 e=0 z=0 None .sdata2 @77822 */ -SECTION_SDATA2 static u32 lit_77822 = 0xC1A251EC; +SECTION_SDATA2 static f32 lit_77822 = -20.290000915527344f; /* 80453380-80453384 0004+00 s=1 e=0 z=0 None .sdata2 @77823 */ -SECTION_SDATA2 static u32 lit_77823 = 0xC2886B00; +SECTION_SDATA2 static f32 lit_77823 = -68.208984375f; /* 80453384-80453388 0004+00 s=1 e=0 z=0 None .sdata2 @77824 */ -SECTION_SDATA2 static u32 lit_77824 = 0x42267090; +SECTION_SDATA2 static f32 lit_77824 = 41.60992431640625f; /* 80453388-8045338C 0004+00 s=1 e=0 z=0 None .sdata2 @77825 */ -SECTION_SDATA2 static u32 lit_77825 = 0x3F623FFF; +SECTION_SDATA2 static f32 lit_77825 = 0.8837890028953552f; /* 8045338C-80453390 0004+00 s=1 e=0 z=0 None .sdata2 @77826 */ -SECTION_SDATA2 static u32 lit_77826 = 0xC2900000; +SECTION_SDATA2 static f32 lit_77826 = -72.0f; /* 80453390-80453394 0004+00 s=1 e=0 z=0 None .sdata2 @77827 */ -SECTION_SDATA2 static u32 lit_77827 = 0x42B14758; +SECTION_SDATA2 static f32 lit_77827 = 88.63934326171875f; /* 80453394-80453398 0004+00 s=1 e=0 z=0 None .sdata2 @77828 */ -SECTION_SDATA2 static u32 lit_77828 = 0xC1E3FBC4; +SECTION_SDATA2 static f32 lit_77828 = -28.49793243408203f; /* 80453398-8045339C 0004+00 s=1 e=0 z=0 None .sdata2 @77829 */ -SECTION_SDATA2 static u32 lit_77829 = 0x3DEBDB1A; +SECTION_SDATA2 static f32 lit_77829 = 0.11516399681568146f; /* 8045339C-804533A0 0004+00 s=1 e=0 z=0 None .sdata2 @77830 */ -SECTION_SDATA2 static u32 lit_77830 = 0x4288AC2F; +SECTION_SDATA2 static f32 lit_77830 = 68.33629608154297f; /* 804533A0-804533A8 0004+04 s=1 e=0 z=0 None .sdata2 @77831 */ SECTION_SDATA2 static f32 lit_77831[1 + 1 /* padding */] = { diff --git a/src/d/a/d_a_horse_static.cpp b/src/d/a/d_a_horse_static.cpp index daa085705de..3ee15828c52 100644 --- a/src/d/a/d_a_horse_static.cpp +++ b/src/d/a/d_a_horse_static.cpp @@ -29,8 +29,6 @@ struct Z2CreatureRide { // Forward References: // -extern "C" extern u8 m_top__12daTagHstop_c[4 + 4 /* padding */]; - extern "C" void checkWait__10e_wb_classFv(); extern "C" void setPlayerRideNow__10e_wb_classFv(); extern "C" void setPlayerRide__10e_wb_classFv(); diff --git a/src/d/a/d_a_itembase.cpp b/src/d/a/d_a_itembase.cpp index 352c714d0ae..d7c0ef1125f 100644 --- a/src/d/a/d_a_itembase.cpp +++ b/src/d/a/d_a_itembase.cpp @@ -13,10 +13,10 @@ struct request_of_phase_process_class {}; -struct J3DAnmTexPattern {}; - struct J3DMaterialTable {}; +struct J3DAnmTexPattern {}; + struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -81,10 +81,10 @@ struct daItemBase_c { /* 8015B0B8 */ void getData(); }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -110,8 +110,6 @@ struct J3DFrameCtrl { // Forward References: // -extern "C" extern void* __vt__12daItemBase_c[17 + 1 /* padding */]; - extern "C" void DeleteBase__12daItemBase_cFPCc(); extern "C" bool clothCreate__12daItemBase_cFv(); extern "C" bool __CreateHeap__12daItemBase_cFv(); @@ -145,13 +143,6 @@ void dComIfGd_setSimpleShadow(cXyz*, f32, f32, cBgS_PolyInfo&, s16, f32, _GXTexO void dComIfGd_setShadow(u32, s8, J3DModel*, cXyz*, f32, f32, f32, f32, cBgS_PolyInfo&, dKy_tevstr_c*, s16, f32, _GXTexObj*); void* operator new(u32); -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* item_resource__10dItem_data[1530]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_bpkAnmFP16J3DMaterialTableP11J3DAnmColoriifss(); @@ -215,7 +206,7 @@ bool daItemBase_c::__CreateHeap() { /* ############################################################################################## */ /* 804533A8-804533AC 0004+00 s=2 e=0 z=0 None .sdata2 @3881 */ -SECTION_SDATA2 static u32 lit_3881 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3881 = 1.0f; /* 8014475C-80144B94 0438+00 s=0 e=3 z=0 None .text CreateItemHeap__12daItemBase_cFPCcsssssss */ @@ -306,9 +297,7 @@ SECTION_SDATA2 static f32 lit_3953[1 + 1 /* padding */] = { }; /* 804533B8-804533C0 0008+00 s=1 e=0 z=0 None .sdata2 @3955 */ -SECTION_SDATA2 static u8 lit_3955[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3955 = 4503599627370496.0 /* cast u32 to float */; /* 80144D70-80144EDC 016C+00 s=1 e=1 z=9 None .text setShadow__12daItemBase_cFv */ #pragma push @@ -322,9 +311,7 @@ asm void daItemBase_c::setShadow() { /* ############################################################################################## */ /* 804533C0-804533C8 0008+00 s=1 e=0 z=0 None .sdata2 @4041 */ -SECTION_SDATA2 static u8 lit_4041[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4041 = 4503601774854144.0 /* cast s32 to float */; /* 80144EDC-8014503C 0160+00 s=1 e=1 z=9 None .text animEntry__12daItemBase_cFv */ #pragma push diff --git a/src/d/a/d_a_itembase_static.cpp b/src/d/a/d_a_itembase_static.cpp index 6b1605b0c24..e060b67ae5b 100644 --- a/src/d/a/d_a_itembase_static.cpp +++ b/src/d/a/d_a_itembase_static.cpp @@ -30,7 +30,6 @@ struct daItemBase_c { void CheckItemCreateHeap(fopAc_ac_c*); void CheckFieldItemCreateHeap(fopAc_ac_c*); -extern "C" extern u8 const m_data__12daItemBase_c[56]; extern "C" void getItemNo__12daItemBase_cFv(); extern "C" void hide__12daItemBase_cFv(); @@ -47,9 +46,6 @@ extern "C" extern u8 const m_data__12daItemBase_c[56]; // External References: // -extern "C" extern void* item_resource__10dItem_data[1530]; -extern "C" extern void* field_item_res__10dItem_data[1020]; - extern "C" void CreateItemHeap__12daItemBase_cFPCcsssssss(); extern "C" extern void* item_resource__10dItem_data[1530]; extern "C" extern void* field_item_res__10dItem_data[1020]; diff --git a/src/d/a/d_a_no_chg_room.cpp b/src/d/a/d_a_no_chg_room.cpp index 1ad9bc10a83..72c78c0ca88 100644 --- a/src/d/a/d_a_no_chg_room.cpp +++ b/src/d/a/d_a_no_chg_room.cpp @@ -43,8 +43,6 @@ static void daNocrm_create(daNocrm_c*); static bool daNocrm_Delete(daNocrm_c*); static void daNocrm_execute(daNocrm_c*); static bool daNocrm_draw(daNocrm_c*); -extern "C" extern char const* const d_a_d_a_no_chg_room__stringBase0; -extern "C" extern void* g_profile_NO_CHG_ROOM[12]; extern "C" static void isLoadRoom__Fi(); extern "C" void execute__9daNocrm_cFv(); @@ -63,14 +61,6 @@ extern "C" extern void* g_profile_NO_CHG_ROOM[12]; void mDoMtx_YrotM(f32 (*)[4], s16); void fopScnM_SearchByID(unsigned int); void fpcNd_IsDeleteTiming(process_node_class*); -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_804505F0[8]; -extern "C" extern u8 data_80450D68[4]; extern "C" void OSReport_Warning(); extern "C" void mDoMtx_YrotM__FPA4_fs(); @@ -150,7 +140,7 @@ SECTION_DEAD static char const* const pad_8039267C = "\0\0\0"; #pragma pop /* 804533CC-804533D0 0004+00 s=1 e=0 z=0 None .sdata2 @3832 */ -SECTION_SDATA2 static u32 lit_3832 = 0x447A0000; +SECTION_SDATA2 static f32 lit_3832 = 1000.0f; /* 804533D0-804533D8 0004+04 s=1 e=0 z=0 None .sdata2 @3833 */ SECTION_SDATA2 static f32 lit_3833[1 + 1 /* padding */] = { diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 7a27a146b4b..e0cbcbbfc5c 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -13,12 +13,6 @@ struct request_of_phase_process_class {}; -struct csXyz { - /* 80018BD0 */ ~csXyz(); - /* 80112C80 */ csXyz(); - /* 8026745C */ void operator+=(csXyz&); -}; - struct Vec {}; struct cXyz { @@ -30,6 +24,12 @@ struct cXyz { /* 802670AC */ void isZero() const; }; +struct csXyz { + /* 80018BD0 */ ~csXyz(); + /* 80112C80 */ csXyz(); + /* 8026745C */ void operator+=(csXyz&); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -44,13 +44,13 @@ struct mDoExt_morf_c { /* 8000FB7C */ void setMorf(f32); }; -struct J3DAnmTexPattern {}; - struct J3DAnmTextureSRTKey {}; +struct J3DAnmColor {}; + struct J3DAnmTevRegKey {}; -struct J3DAnmColor {}; +struct J3DAnmTexPattern {}; struct J3DMaterialTable { /* 8032F64C */ void removeMatColorAnimator(J3DAnmColor*); @@ -116,21 +116,21 @@ struct daNpcT_motionAnmData_c {}; struct daNpcT_faceMotionAnmData_c {}; -struct _GXColorS10 {}; +struct J3DModel {}; -struct dCcD_GObjInf { - /* 80084460 */ void ChkTgHit(); -}; +struct J3DJoint {}; struct J3DFrameCtrl { /* 803283FC */ void init(s16); }; -struct J3DModel {}; - struct J3DAnmTransformKey {}; -struct J3DJoint {}; +struct dCcD_GObjInf { + /* 80084460 */ void ChkTgHit(); +}; + +struct _GXColorS10 {}; struct daNpcT_c { /* 80147FA4 */ void tgHitCallBack(fopAc_ac_c*, dCcD_GObjInf*, fopAc_ac_c*, dCcD_GObjInf*); @@ -763,24 +763,6 @@ void daNpcF_chkDoBtnEqSpeak(fopAc_ac_c*); void daNpcF_chkPointInArea(cXyz, cXyz, cXyz, s16); void daNpcF_getDistTableIdx(int, int); void daNpcF_clearMessageTmpBit(); -extern "C" extern u8 const mCcDObjData__8daNpcT_c[48]; -extern "C" extern u8 const mCcDObj__11daBaseNpc_c[48]; -extern "C" extern u8 const mCcDObjInfo__8daNpcF_c[48]; -extern "C" extern char const* const d_a_d_a_npc__stringBase0; -extern "C" extern u8 mCcDCyl__8daNpcT_c[68]; -extern "C" extern u8 mCcDSph__8daNpcT_c[64]; -extern "C" extern u8 mCcDCyl__11daBaseNpc_c[68]; -extern "C" extern u8 mCcDSph__11daBaseNpc_c[64]; -extern "C" extern u8 mCcDCyl__8daNpcF_c[68]; -extern "C" extern u8 mCcDSph__8daNpcF_c[64]; -extern "C" extern void* __vt__8daNpcF_c[18]; -extern "C" extern void* __vt__15daNpcF_MatAnm_c[4 + 6 /* padding */]; -extern "C" extern void* __vt__8daNpcT_c[49]; -extern "C" extern void* __vt__15daNpcT_MatAnm_c[4 + 1 /* padding */]; -extern "C" extern u8 mFindActorPtrs__8daNpcT_c[200]; -extern "C" extern u8 mSrchName__8daNpcT_c[2 + 2 /* padding */]; -extern "C" extern u8 mFindCount__8daNpcT_c[4]; -extern "C" extern u8 data_80450FF8[8]; extern "C" void initialize__18daNpcT_ActorMngr_cFv(); extern "C" void entry__18daNpcT_ActorMngr_cFP10fopAc_ac_c(); @@ -1195,29 +1177,6 @@ void cLib_targetAngleY(Vec const*, Vec const*); void cLib_targetAngleX(cXyz const*, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern void* __vt__12dBgS_AcchCir[3]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__10dCcD_GStts[3]; -extern "C" extern void* __vt__10cCcD_GStts[3]; -extern "C" extern void* __vt__12dBgS_ObjAcch[9]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 Zero__5csXyz[4]; -extern "C" extern u8 data_80451164[4]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; SECTION_INIT void memset(); extern "C" void __dt__4cXyzFv(); @@ -1512,12 +1471,10 @@ asm void daNpcT_MatAnm_c::initialize() { /* ############################################################################################## */ /* 804533DC-804533E0 0004+00 s=25 e=0 z=0 None .sdata2 @4140 */ -SECTION_SDATA2 static u32 lit_4140 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4140 = 1.0f; /* 804533E0-804533E8 0008+00 s=24 e=0 z=0 None .sdata2 @4142 */ -SECTION_SDATA2 static u8 lit_4142[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4142 = 4503601774854144.0 /* cast s32 to float */; /* 80145788-80145898 0110+00 s=1 e=0 z=0 None .text calc__15daNpcT_MatAnm_cCFP11J3DMaterial */ #pragma push @@ -1531,7 +1488,7 @@ asm void daNpcT_MatAnm_c::calc(J3DMaterial* param_0) const { /* ############################################################################################## */ /* 804533E8-804533EC 0004+00 s=13 e=0 z=0 None .sdata2 @4148 */ -SECTION_SDATA2 static u32 lit_4148 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4148 = -1.0f; /* 80145898-801458C0 0028+00 s=4 e=0 z=533 None .text initialize__22daNpcT_MotionSeqMngr_cFv */ @@ -1690,7 +1647,7 @@ asm void daNpcT_Path_c::getDstPosH(cXyz param_0, cXyz* param_1, int param_2, int /* ############################################################################################## */ /* 804533EC-804533F0 0004+00 s=1 e=0 z=0 None .sdata2 @4513 */ -SECTION_SDATA2 static u32 lit_4513 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4513 = 100.0f; /* 80146188-801464D8 0350+00 s=2 e=0 z=2 None .text chkPassed1__13daNpcT_Path_cF4cXyzi */ #pragma push @@ -2039,10 +1996,10 @@ SECTION_DATA static void* __vt__16daNpcT_Hermite_c[3] = { }; /* 804533F0-804533F4 0004+00 s=4 e=0 z=0 None .sdata2 @4672 */ -SECTION_SDATA2 static u32 lit_4672 = 0x40000000; +SECTION_SDATA2 static f32 lit_4672 = 2.0f; /* 804533F4-804533F8 0004+00 s=1 e=0 z=0 None .sdata2 @4673 */ -SECTION_SDATA2 static u32 lit_4673 = 0x40400000; +SECTION_SDATA2 static f32 lit_4673 = 3.0f; /* 804533F8-80453400 0004+04 s=3 e=0 z=0 None .sdata2 @4674 */ SECTION_SDATA2 static f32 lit_4674[1 + 1 /* padding */] = { @@ -2052,9 +2009,7 @@ SECTION_SDATA2 static f32 lit_4674[1 + 1 /* padding */] = { }; /* 80453400-80453408 0008+00 s=1 e=0 z=0 None .sdata2 @4677 */ -SECTION_SDATA2 static u8 lit_4677[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4677 = 4503599627370496.0 /* cast u32 to float */; /* 801464D8-8014698C 04B4+00 s=1 e=0 z=0 None .text chkPassed2__13daNpcT_Path_cF4cXyzP4cXyzii */ @@ -2091,14 +2046,10 @@ asm void daNpcT_JntAnm_c::initialize() { /* ############################################################################################## */ /* 80453408-80453410 0008+00 s=8 e=0 z=0 None .sdata2 @4723 */ -SECTION_SDATA2 static u8 lit_4723[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4723 = 0.5; /* 80453410-80453418 0008+00 s=8 e=0 z=0 None .sdata2 @4724 */ -SECTION_SDATA2 static u8 lit_4724[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4724 = 3.0; /* 80453418-80453420 0008+00 s=8 e=0 z=0 None .sdata2 @4725 */ SECTION_SDATA2 static u8 lit_4725[8] = { @@ -2106,13 +2057,13 @@ SECTION_SDATA2 static u8 lit_4725[8] = { }; /* 80453420-80453424 0004+00 s=5 e=0 z=0 None .sdata2 @5239 */ -SECTION_SDATA2 static u32 lit_5239 = 0x43360B61; +SECTION_SDATA2 static f32 lit_5239 = 182.04444885253906f; /* 80453424-80453428 0004+00 s=2 e=0 z=0 None .sdata2 @5240 */ -SECTION_SDATA2 static u32 lit_5240 = 0x38C90FDB; +SECTION_SDATA2 static f32 lit_5240 = 9.58738019107841e-05f; /* 80453428-8045342C 0004+00 s=2 e=0 z=0 None .sdata2 @5241 */ -SECTION_SDATA2 static u32 lit_5241 = 0x447A0000; +SECTION_SDATA2 static f32 lit_5241 = 1000.0f; /* 80146CD8-80147858 0B80+00 s=1 e=0 z=52 None .text * setParam__15daNpcT_JntAnm_cFP10fopAc_ac_cP8J3DModelP4cXyziiiffffffffffP4cXyz */ @@ -2141,7 +2092,7 @@ asm void daNpcT_JntAnm_c::calc(f32 param_0) { /* ############################################################################################## */ /* 8045342C-80453430 0004+00 s=1 e=0 z=0 None .sdata2 @5410 */ -SECTION_SDATA2 static u32 lit_5410 = 0x40490FDB; +SECTION_SDATA2 static f32 lit_5410 = 3.1415927410125732f; /* 80147C38-80147DCC 0194+00 s=0 e=0 z=52 None .text calcJntRad__15daNpcT_JntAnm_cFfff */ #pragma push @@ -2155,10 +2106,10 @@ asm void daNpcT_JntAnm_c::calcJntRad(f32 param_0, f32 param_1, f32 param_2) { /* ############################################################################################## */ /* 80453430-80453434 0004+00 s=1 e=0 z=0 None .sdata2 @5422 */ -SECTION_SDATA2 static u32 lit_5422 = 0x462AA800; +SECTION_SDATA2 static f32 lit_5422 = 10922.0f; /* 80453434-80453438 0004+00 s=1 e=0 z=0 None .sdata2 @5423 */ -SECTION_SDATA2 static u32 lit_5423 = 0x45E38800; +SECTION_SDATA2 static f32 lit_5423 = 7281.0f; /* 80147DCC-80147E3C 0070+00 s=0 e=0 z=28 None .text * setParam__19daNpcT_DmgStagger_cFP10fopAc_ac_cP10fopAc_ac_cs */ @@ -2173,10 +2124,10 @@ asm void daNpcT_DmgStagger_c::setParam(fopAc_ac_c* param_0, fopAc_ac_c* param_1, /* ############################################################################################## */ /* 80453438-8045343C 0004+00 s=1 e=0 z=0 None .sdata2 @5459 */ -SECTION_SDATA2 static u32 lit_5459 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_5459 = 1.0f / 10.0f; /* 8045343C-80453440 0004+00 s=1 e=0 z=0 None .sdata2 @5460 */ -SECTION_SDATA2 static u32 lit_5460 = 0x42FA0000; +SECTION_SDATA2 static f32 lit_5460 = 125.0f; /* 80147E3C-80147FA4 0168+00 s=0 e=0 z=47 None .text calc__19daNpcT_DmgStagger_cFi */ #pragma push @@ -2374,7 +2325,7 @@ asm void daNpcT_c::deleteRes(s8 const* param_0, char const** param_1) { /* ############################################################################################## */ /* 80453440-80453444 0004+00 s=3 e=0 z=0 None .sdata2 @5667 */ -SECTION_SDATA2 static u32 lit_5667 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_5667 = -1000000000.0f; /* 8014852C-8014886C 0340+00 s=0 e=0 z=59 None .text execute__8daNpcT_cFv */ #pragma push @@ -2388,7 +2339,7 @@ asm void daNpcT_c::execute() { /* ############################################################################################## */ /* 80453444-80453448 0004+00 s=3 e=0 z=0 None .sdata2 @5794 */ -SECTION_SDATA2 static u32 lit_5794 = 0x41A00000; +SECTION_SDATA2 static f32 lit_5794 = 20.0f; /* 8014886C-80148C70 0404+00 s=0 e=0 z=58 None .text draw__8daNpcT_cFiifP11_GXColorS10fiii */ #pragma push @@ -2680,7 +2631,7 @@ asm void daNpcT_c::setMotionAnm(int param_0, f32 param_1, int param_2) { /* ############################################################################################## */ /* 80453448-8045344C 0004+00 s=1 e=0 z=0 None .sdata2 @6667 */ -SECTION_SDATA2 static u32 lit_6667 = 0x43960000; +SECTION_SDATA2 static f32 lit_6667 = 300.0f; /* 8014A908-8014A99C 0094+00 s=0 e=0 z=40 None .text setPos__8daNpcT_cF4cXyz */ #pragma push @@ -2734,7 +2685,7 @@ asm void daNpcT_c::setDamage(int param_0, int param_1, int param_2) { /* ############################################################################################## */ /* 8045344C-80453450 0004+00 s=7 e=0 z=0 None .sdata2 @6775 */ -SECTION_SDATA2 static u32 lit_6775 = 0x43340000; +SECTION_SDATA2 static f32 lit_6775 = 180.0f; /* 8014ABD0-8014ACF0 0120+00 s=2 e=0 z=53 None .text chkActorInSight__8daNpcT_cFP10fopAc_ac_cfs */ @@ -2772,22 +2723,22 @@ asm void daNpcT_c::chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 /* ############################################################################################## */ /* 80453450-80453454 0004+00 s=2 e=0 z=0 None .sdata2 @6904 */ -SECTION_SDATA2 static u32 lit_6904 = 0x41F00000; +SECTION_SDATA2 static f32 lit_6904 = 30.0f; /* 80453454-80453458 0004+00 s=2 e=0 z=0 None .sdata2 @6905 */ -SECTION_SDATA2 static u32 lit_6905 = 0x42340000; +SECTION_SDATA2 static f32 lit_6905 = 45.0f; /* 80453458-8045345C 0004+00 s=2 e=0 z=0 None .sdata2 @6906 */ -SECTION_SDATA2 static u32 lit_6906 = 0x42700000; +SECTION_SDATA2 static f32 lit_6906 = 60.0f; /* 8045345C-80453460 0004+00 s=2 e=0 z=0 None .sdata2 @6907 */ -SECTION_SDATA2 static u32 lit_6907 = 0x42B40000; +SECTION_SDATA2 static f32 lit_6907 = 90.0f; /* 80453460-80453464 0004+00 s=2 e=0 z=0 None .sdata2 @6908 */ -SECTION_SDATA2 static u32 lit_6908 = 0x42DC0000; +SECTION_SDATA2 static f32 lit_6908 = 110.0f; /* 80453464-80453468 0004+00 s=2 e=0 z=0 None .sdata2 @6909 */ -SECTION_SDATA2 static u32 lit_6909 = 0x43070000; +SECTION_SDATA2 static f32 lit_6909 = 135.0f; /* 8014AE1C-8014B010 01F4+00 s=1 e=0 z=0 None .text chkFindActor__8daNpcT_cFP10fopAc_ac_cis */ #pragma push @@ -2852,13 +2803,13 @@ asm void daNpcT_c::getAttnPos(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80453468-8045346C 0004+00 s=4 e=0 z=0 None .sdata2 @7089 */ -SECTION_SDATA2 static u32 lit_7089 = 0x3BB40000; +SECTION_SDATA2 static f32 lit_7089 = 0.0054931640625f; /* 8045346C-80453470 0004+00 s=4 e=0 z=0 None .sdata2 @7090 */ -SECTION_SDATA2 static u32 lit_7090 = 0x41000000; +SECTION_SDATA2 static f32 lit_7090 = 8.0f; /* 80453470-80453474 0004+00 s=2 e=0 z=0 None .sdata2 @7091 */ -SECTION_SDATA2 static u32 lit_7091 = 0x46800000; +SECTION_SDATA2 static f32 lit_7091 = 16384.0f; /* 8014B4A4-8014B648 01A4+00 s=1 e=0 z=1 None .text turn__8daNpcT_cFsii */ #pragma push @@ -2882,7 +2833,7 @@ asm void daNpcT_c::step(s16 param_0, int param_1, int param_2, int param_3, int /* ############################################################################################## */ /* 80453474-80453478 0004+00 s=1 e=0 z=0 None .sdata2 @7222 */ -SECTION_SDATA2 static u32 lit_7222 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_7222 = 17.0f / 20.0f; /* 8014B808-8014BB00 02F8+00 s=0 e=0 z=11 None .text calcSpeedAndAngle__8daNpcT_cF4cXyziss */ #pragma push @@ -2896,7 +2847,7 @@ asm void daNpcT_c::calcSpeedAndAngle(cXyz param_0, int param_1, s16 param_2, s16 /* ############################################################################################## */ /* 80453478-8045347C 0004+00 s=1 e=0 z=0 None .sdata2 @7242 */ -SECTION_SDATA2 static u32 lit_7242 = 0x40C00000; +SECTION_SDATA2 static f32 lit_7242 = 6.0f; /* 8014BB00-8014BBF0 00F0+00 s=0 e=0 z=2 None .text getActorDistance__8daNpcT_cFP10fopAc_ac_cii */ @@ -2932,7 +2883,7 @@ asm void daNpcT_c::talkProc(int* param_0, int param_1, fopAc_ac_c** param_2, int /* ############################################################################################## */ /* 8045347C-80453480 0004+00 s=2 e=0 z=0 None .sdata2 @7337 */ -SECTION_SDATA2 static u32 lit_7337 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_7337 = 1000000000.0f; /* 8014BE2C-8014BEE4 00B8+00 s=0 e=0 z=25 None .text getNearestActorP__8daNpcT_cFs */ #pragma push @@ -2974,7 +2925,7 @@ SECTION_SDATA2 static u8 id_7388[4] = { }; /* 80453484-80453488 0004+00 s=2 e=0 z=0 None .sdata2 @7442 */ -SECTION_SDATA2 static u32 lit_7442 = 0x40800000; +SECTION_SDATA2 static f32 lit_7442 = 4.0f; /* 8014C030-8014C200 01D0+00 s=1 e=0 z=0 None .text setHitodamaPrtcl__8daNpcT_cFv */ #pragma push @@ -2988,10 +2939,10 @@ asm void daNpcT_c::setHitodamaPrtcl() { /* ############################################################################################## */ /* 80453488-8045348C 0004+00 s=1 e=0 z=0 None .sdata2 @7550 */ -SECTION_SDATA2 static u32 lit_7550 = 0x44180000; +SECTION_SDATA2 static f32 lit_7550 = 608.0f; /* 8045348C-80453490 0004+00 s=1 e=0 z=0 None .sdata2 @7551 */ -SECTION_SDATA2 static u32 lit_7551 = 0x43E00000; +SECTION_SDATA2 static f32 lit_7551 = 448.0f; /* 8014C200-8014C384 0184+00 s=0 e=0 z=2 None .text * daNpcT_chkActorInScreen__FP10fopAc_ac_cfffffffi */ @@ -3622,10 +3573,10 @@ asm void daBaseNpc_lookat_c::limitter(s16 param_0, s16* param_1, s16 param_2, s1 /* ############################################################################################## */ /* 80453490-80453494 0004+00 s=2 e=0 z=0 None .sdata2 @8404 */ -SECTION_SDATA2 static u32 lit_8404 = 0x3E800000; +SECTION_SDATA2 static f32 lit_8404 = 0.25f; /* 80453494-80453498 0004+00 s=1 e=0 z=0 None .sdata2 @8405 */ -SECTION_SDATA2 static u32 lit_8405 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_8405 = 4.0f / 5.0f; /* 8014DBB4-8014E634 0A80+00 s=0 e=0 z=1 None .text * calc__18daBaseNpc_lookat_cFP10fopAc_ac_cPA4_fs */ @@ -4379,7 +4330,7 @@ static u8 vec[12]; static u8 data_80450FEC[4]; /* 80453498-8045349C 0004+00 s=1 e=0 z=0 None .sdata2 @9971 */ -SECTION_SDATA2 static u32 lit_9971 = 0x42000000; +SECTION_SDATA2 static f32 lit_9971 = 32.0f; /* 801510B8-80151350 0298+00 s=0 e=0 z=34 None .text * setParam__15daNpcF_Lookat_cFffffffffffffsP4cXyz */ @@ -4419,7 +4370,7 @@ asm void daNpcF_Lookat_c::adjustMoveDisAngle(s16& param_0, s16 param_1, s16 para /* ############################################################################################## */ /* 8045349C-804534A0 0004+00 s=1 e=0 z=0 None .sdata2 @10253 */ -SECTION_SDATA2 static u32 lit_10253 = 0x3F2147AE; +SECTION_SDATA2 static f32 lit_10253 = 63.0f / 100.0f; /* 80151648-80151A54 040C+00 s=1 e=0 z=0 None .text * initCalc__15daNpcF_Lookat_cFP10fopAc_ac_cPA4_fP4cXyzP5csXyzPfR4cXyzi */ @@ -4561,7 +4512,7 @@ asm void daNpcF_c::setMtx2() { /* ############################################################################################## */ /* 804534A0-804534A4 0004+00 s=1 e=0 z=0 None .sdata2 @10745 */ -SECTION_SDATA2 static u32 lit_10745 = 0x47800000; +SECTION_SDATA2 static f32 lit_10745 = 65536.0f; /* 801528C8-80152B2C 0264+00 s=0 e=0 z=76 None .text initialize__8daNpcF_cFv */ #pragma push @@ -4767,10 +4718,10 @@ asm void daNpcF_c::hitChk2(dCcD_Cyl* param_0, int param_1, int param_2) { /* ############################################################################################## */ /* 804534A4-804534A8 0004+00 s=1 e=0 z=0 None .sdata2 @11061 */ -SECTION_SDATA2 static u32 lit_11061 = 0x46000000; +SECTION_SDATA2 static f32 lit_11061 = 8192.0f; /* 804534A8-804534AC 0004+00 s=1 e=0 z=0 None .sdata2 @11062 */ -SECTION_SDATA2 static u32 lit_11062 = 0x46471C00; +SECTION_SDATA2 static f32 lit_11062 = 12743.0f; /* 80153658-80153718 00C0+00 s=0 e=0 z=12 None .text setDamage__8daNpcF_cFiii */ #pragma push @@ -4838,7 +4789,7 @@ asm void daNpcF_c::chkActorInArea(fopAc_ac_c* param_0, cXyz param_1, cXyz param_ /* ############################################################################################## */ /* 804534AC-804534B0 0004+00 s=3 e=0 z=0 None .sdata2 @11253 */ -SECTION_SDATA2 static u32 lit_11253 = 0x3F000000; +SECTION_SDATA2 static f32 lit_11253 = 0.5f; /* 80153BDC-80153D1C 0140+00 s=0 e=0 z=25 None .text * chkActorInAttnArea__8daNpcF_cFP10fopAc_ac_cP10fopAc_ac_ci */ @@ -4923,7 +4874,7 @@ asm void daNpcF_c::getEvtAreaTagP(int param_0, int param_1) { /* ############################################################################################## */ /* 804534B0-804534B4 0004+00 s=1 e=0 z=0 None .sdata2 @11605 */ -SECTION_SDATA2 static u32 lit_11605 = 0x43E10000; +SECTION_SDATA2 static f32 lit_11605 = 450.0f; /* 8015436C-80154730 03C4+00 s=0 e=0 z=12 None .text getAttnActorP__8daNpcF_cFiPFPvPv_Pvffffsii */ diff --git a/src/d/a/d_a_obj.cpp b/src/d/a/d_a_obj.cpp index c1bd11c5d92..9e90fd07daf 100644 --- a/src/d/a/d_a_obj.cpp +++ b/src/d/a/d_a_obj.cpp @@ -17,13 +17,6 @@ struct daPy_py_c { /* 8015F398 */ void checkMasterSwordEquip(); }; -struct Quaternion {}; - -struct dCcD_GObjInf { - /* 800844F8 */ void GetTgHitObj(); - /* 8008457C */ void GetTgHitObjSe(); -}; - struct Vec {}; struct cXyz { @@ -34,6 +27,13 @@ struct cXyz { /* 80266CBC */ void outprod(Vec const&) const; }; +struct Quaternion {}; + +struct dCcD_GObjInf { + /* 800844F8 */ void GetTgHitObj(); + /* 8008457C */ void GetTgHitObjSe(); +}; + struct daObj { /* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int); /* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*); @@ -98,8 +98,6 @@ struct Z2SeMgr { // Forward References: // -extern "C" extern char const* const d_a_d_a_obj__stringBase0; - extern "C" void eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi(); extern "C" void make_eff_break_kotubo__5daObjFP10fopAc_ac_c(); extern "C" void make_eff_break_kotubo2__5daObjFP10fopAc_ac_c(); @@ -123,14 +121,6 @@ void fopAcM_posMove(fopAc_ac_c*, cXyz const*); void dComIfGp_getReverb(int); void cM_atan2s(f32, f32); void cM3d_CrawVec(Vec const&, Vec const&, Vec*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mTsubo__13dPa_control_c[64]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450DF0[8]; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __dt__4cXyzFv(); extern "C" void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(); @@ -182,8 +172,11 @@ extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; /* ############################################################################################## */ /* 80379298-803792A8 0010+00 s=1 e=0 z=0 None .rodata zero_quat$3920 */ -SECTION_RODATA static u8 const zero_quat[16] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, +SECTION_RODATA static f32 const zero_quat[4] = { + 0.0f, + 0.0f, + 0.0f, + 1.0f, }; /* 803792A8-803792B0 0007+01 s=1 e=0 z=0 None .rodata @stringBase0 */ @@ -196,7 +189,7 @@ SECTION_DEAD static char const* const pad_803792AF = ""; #pragma pop /* 80451D98-80451D9C 0004+00 s=6 e=0 z=0 None .sdata2 @3671 */ -SECTION_SDATA2 static u32 lit_3671 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3671 = 1.0f; /* 80037038-80037180 0148+00 s=4 e=0 z=0 None .text eff_break_tsubo__5daObjFP10fopAc_ac_c4cXyzi */ @@ -271,7 +264,7 @@ static u8 lit_3732[12]; static f32 scale_3731[3]; /* 80451D9C-80451DA0 0004+00 s=1 e=0 z=0 None .sdata2 @3714 */ -SECTION_SDATA2 static u32 lit_3714 = 0x40000000; +SECTION_SDATA2 static f32 lit_3714 = 2.0f; /* 80037330-800373C0 0090+00 s=0 e=0 z=1 None .text * make_eff_break_gm_ootubo__5daObjFP10fopAc_ac_c */ @@ -307,7 +300,7 @@ asm void daObj::posMoveF_stream(fopAc_ac_c* param_0, cXyz const* param_1, cXyz c /* ############################################################################################## */ /* 80451DA4-80451DA8 0004+00 s=2 e=0 z=0 None .sdata2 @3836 */ -SECTION_SDATA2 static u32 lit_3836 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3836 = -1.0f; /* 800373F0-800374EC 00FC+00 s=1 e=0 z=0 None .text * posMoveF_resist_acc__Q25daObj21@unnamed@d_a_obj_cpp@FP4cXyzPC10fopAc_ac_cPC4cXyzff */ diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp index b9bec201fef..8f59936cca6 100644 --- a/src/d/a/d_a_player.cpp +++ b/src/d/a/d_a_player.cpp @@ -164,9 +164,6 @@ struct J3DAnmLoaderDataBase { // void daPy_addCalcShort(s16*, s16, s16, s16, s16); -extern "C" extern void* __vt__18daPy_sightPacket_c[4 + 1 /* padding */]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 struct_8045101C[4]; extern "C" void checkAnmEnd__16daPy_frameCtrl_cFv(); extern "C" void updateFrame__16daPy_frameCtrl_cFv(); @@ -246,15 +243,6 @@ void* operator new(u32); void* operator new[](u32); void* operator new[](u32, int); void operator delete(void*); -extern "C" extern void* __vt__18mDoExt_transAnmBas[5]; -extern "C" extern void* __vt__18J3DAnmTransformKey[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void scaleM__14mDoMtx_stack_cFfff(); extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FPP7JKRHeapUlUl(); @@ -324,16 +312,10 @@ extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; /* ############################################################################################## */ /* 80453600-80453608 0004+04 s=6 e=0 z=0 None .sdata2 @4215 */ -SECTION_SDATA2 static u8 lit_4215[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_4215[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 8015E4CC-8015E510 0044+00 s=0 e=235 z=6 None .text checkAnmEnd__16daPy_frameCtrl_cFv */ @@ -358,9 +340,7 @@ asm void daPy_frameCtrl_c::updateFrame() { /* ############################################################################################## */ /* 80453608-80453610 0008+00 s=2 e=0 z=0 None .sdata2 @4237 */ -SECTION_SDATA2 static u8 lit_4237[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4237 = 4503601774854144.0 /* cast s32 to float */; /* 8015E544-8015E5B0 006C+00 s=0 e=1 z=6 None .text setFrameCtrl__16daPy_frameCtrl_cFUcssff */ #pragma push @@ -375,16 +355,16 @@ asm void daPy_frameCtrl_c::setFrameCtrl(u8 param_0, s16 param_1, s16 param_2, f3 /* ############################################################################################## */ /* 80453610-80453614 0004+00 s=1 e=0 z=0 None .sdata2 @4247 */ -SECTION_SDATA2 static u32 lit_4247 = 0x41F00000; +SECTION_SDATA2 static f32 lit_4247 = 30.0f; /* 80453614-80453618 0004+00 s=1 e=0 z=0 None .sdata2 @4248 */ -SECTION_SDATA2 static u32 lit_4248 = 0x428C0000; +SECTION_SDATA2 static f32 lit_4248 = 70.0f; /* 80453618-8045361C 0004+00 s=2 e=0 z=0 None .sdata2 @4249 */ -SECTION_SDATA2 static u32 lit_4249 = 0x42480000; +SECTION_SDATA2 static f32 lit_4249 = 50.0f; /* 8045361C-80453620 0004+00 s=1 e=0 z=0 None .sdata2 @4250 */ -SECTION_SDATA2 static u32 lit_4250 = 0x47800000; +SECTION_SDATA2 static f32 lit_4250 = 65536.0f; /* 8015E5B0-8015E654 00A4+00 s=0 e=1 z=18 None .text initOffset__20daPy_boomerangMove_cFPC4cXyz */ @@ -405,10 +385,10 @@ u8 m_midnaActor__9daPy_py_c[4]; u8 struct_8045101C[4]; /* 80453620-80453624 0004+00 s=1 e=0 z=0 None .sdata2 @4332 */ -SECTION_SDATA2 static u32 lit_4332 = 0x43960000; +SECTION_SDATA2 static f32 lit_4332 = 300.0f; /* 80453624-80453628 0004+00 s=1 e=0 z=0 None .sdata2 @4333 */ -SECTION_SDATA2 static u32 lit_4333 = 0xC42F0000; +SECTION_SDATA2 static f32 lit_4333 = -700.0f; /* 80453628-80453630 0004+04 s=1 e=0 z=0 None .sdata2 @4334 */ SECTION_SDATA2 static f32 lit_4334[1 + 1 /* padding */] = { @@ -431,14 +411,10 @@ asm void daPy_boomerangMove_c::posMove(cXyz* param_0, s16* param_1, fopAc_ac_c* /* ############################################################################################## */ /* 80453630-80453638 0008+00 s=1 e=0 z=0 None .sdata2 @4379 */ -SECTION_SDATA2 static u8 lit_4379[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4379 = 0.5; /* 80453638-80453640 0008+00 s=1 e=0 z=0 None .sdata2 @4380 */ -SECTION_SDATA2 static u8 lit_4380[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4380 = 3.0; /* 80453640-80453648 0008+00 s=1 e=0 z=0 None .sdata2 @4381 */ SECTION_SDATA2 static u8 lit_4381[8] = { @@ -983,7 +959,7 @@ asm void daPy_sightPacket_c::draw() { /* ############################################################################################## */ /* 80453680-80453684 0004+00 s=1 e=0 z=0 None .sdata2 @4699 */ -SECTION_SDATA2 static u32 lit_4699 = 0x42000000; +SECTION_SDATA2 static f32 lit_4699 = 32.0f; /* 8015F2FC-8015F384 0088+00 s=0 e=1 z=0 None .text setSight__18daPy_sightPacket_cFv */ #pragma push @@ -1028,7 +1004,7 @@ asm void daPy_py_c::checkWoodShieldEquip() { /* ############################################################################################## */ /* 80453684-80453688 0004+00 s=1 e=0 z=0 None .sdata2 @4741 */ -SECTION_SDATA2 static u32 lit_4741 = 0xC1480000; +SECTION_SDATA2 static f32 lit_4741 = -12.5f; /* 80453688-80453690 0004+04 s=1 e=0 z=0 None .sdata2 @4742 */ SECTION_SDATA2 static f32 lit_4742[1 + 1 /* padding */] = { diff --git a/src/d/a/d_a_shop_item_static.cpp b/src/d/a/d_a_shop_item_static.cpp index 8d6ecdb656c..492585adcb8 100644 --- a/src/d/a/d_a_shop_item_static.cpp +++ b/src/d/a/d_a_shop_item_static.cpp @@ -27,8 +27,6 @@ struct daItemBase_c { // void CheckShopItemCreateHeap(fopAc_ac_c*); -extern "C" extern void* const mData__12daShopItem_c[276]; -extern "C" extern char const* const d_a_d_a_shop_item_static__stringBase0; extern "C" void getRotateP__12daShopItem_cFv(); extern "C" void getPosP__12daShopItem_cFv(); diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp index 1c6396f674f..8545581e2d9 100644 --- a/src/d/bg/d_bg_s.cpp +++ b/src/d/bg/d_bg_s.cpp @@ -38,10 +38,10 @@ struct dBgS_Acch { /* 8007732C */ void CalcWallRR(); }; -struct csXyz {}; - struct cXyz {}; +struct csXyz {}; + struct cBgS_PolyInfo { /* 802680F8 */ void ChkSetInfo() const; /* 80268120 */ void ClearPi(); @@ -157,10 +157,6 @@ void dBgS_CheckBWallPoly(cBgS_PolyInfo const&); void dBgS_CheckBGroundPoly(cBgS_PolyInfo const&); void dBgS_CheckBRoofPoly(cBgS_PolyInfo const&); void dBgS_GetNY(cBgS_PolyInfo const&); -extern "C" extern void* __vt__4dBgS[5]; -extern "C" extern void* __vt__4cBgS[5]; -extern "C" extern void* __vt__11cBgS_ChkElm[4]; -extern "C" extern u8 data_80450F68[8]; extern "C" void Init__11cBgS_ChkElmFv(); extern "C" void Regist2__11cBgS_ChkElmFP9dBgW_BaseUiPv(); @@ -240,8 +236,6 @@ extern "C" extern u8 data_80450F68[8]; void cBgW_CheckBGround(f32); void cBgW_CheckBRoof(f32); void cBgW_CheckBWall(f32); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __dt__11cBgS_ChkElmFv(); extern "C" void __dt__4dBgSFv(); diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp index f2f7df62c34..5ac13ead17a 100644 --- a/src/d/bg/d_bg_s_acch.cpp +++ b/src/d/bg/d_bg_s_acch.cpp @@ -62,9 +62,6 @@ struct dBgS_AcchCir { struct csXyz {}; -struct Vec {}; - -struct dBgS_Acch; struct cBgS_PolyInfo { /* 80268074 */ cBgS_PolyInfo(); /* 802680B0 */ ~cBgS_PolyInfo(); @@ -73,6 +70,7 @@ struct cBgS_PolyInfo { /* 802681A4 */ void SetPolyIndex(int); }; +struct dBgS_Acch; struct dBgS { /* 8007524C */ void WallCorrect(dBgS_Acch*); /* 80075374 */ void WallCorrectSort(dBgS_Acch*); @@ -82,6 +80,8 @@ struct dBgS { /* 80075B84 */ void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*); }; +struct Vec {}; + struct dBgS_Acch { /* 80075F94 */ ~dBgS_Acch(); /* 800760A0 */ dBgS_Acch(); @@ -159,8 +159,6 @@ struct cBgS { // Forward References: // -extern "C" extern void* __vt__12dBgS_AcchCir[3]; - extern "C" void __ct__12dBgS_AcchCirFv(); extern "C" void ClrWallHit__12dBgS_AcchCirFv(); extern "C" void SetWallR__12dBgS_AcchCirFf(); @@ -209,13 +207,6 @@ extern "C" extern void* __vt__12dBgS_AcchCir[3]; void cBgW_CheckBGround(f32); void operator delete(void*); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__11dBgS_WtrChk[12]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern void* __vt__8cM3dGLin[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450F68[8]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void LineCross__4cBgSFP11cBgS_LinChk(); extern "C" void GroundCross__4cBgSFP11cBgS_GndChk(); @@ -373,16 +364,16 @@ asm dBgS_Acch::~dBgS_Acch() { /* ############################################################################################## */ /* 804526C4-804526C8 0004+00 s=5 e=0 z=0 None .sdata2 @4089 */ -SECTION_SDATA2 static u32 lit_4089 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_4089 = -1000000000.0f; /* 804526C8-804526CC 0004+00 s=1 e=0 z=0 None .sdata2 @4090 */ -SECTION_SDATA2 static u32 lit_4090 = 0x42700000; +SECTION_SDATA2 static f32 lit_4090 = 60.0f; /* 804526CC-804526D0 0004+00 s=3 e=0 z=0 None .sdata2 @4091 */ -SECTION_SDATA2 static u32 lit_4091 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_4091 = 1000000000.0f; /* 804526D0-804526D4 0004+00 s=1 e=0 z=0 None .sdata2 @4092 */ -SECTION_SDATA2 static u32 lit_4092 = 0x447A0000; +SECTION_SDATA2 static f32 lit_4092 = 1000.0f; /* 800760A0-800761CC 012C+00 s=0 e=4 z=338 None .text __ct__9dBgS_AcchFv */ #pragma push @@ -466,7 +457,7 @@ asm void dBgS_Acch::GroundRoofProc(dBgS& param_0) { /* ############################################################################################## */ /* 804526D4-804526D8 0004+00 s=1 e=0 z=0 None .sdata2 @4424 */ -SECTION_SDATA2 static u32 lit_4424 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4424 = 1.0f; /* 80076624-80076AAC 0488+00 s=1 e=0 z=0 None .text LineCheck__9dBgS_AcchFR4dBgS */ #pragma push @@ -480,10 +471,10 @@ asm void dBgS_Acch::LineCheck(dBgS& param_0) { /* ############################################################################################## */ /* 804526D8-804526DC 0004+00 s=1 e=0 z=0 None .sdata2 @4554 */ -SECTION_SDATA2 static u32 lit_4554 = 0x42480000; +SECTION_SDATA2 static f32 lit_4554 = 50.0f; /* 804526DC-804526E0 0004+00 s=1 e=0 z=0 None .sdata2 @4555 */ -SECTION_SDATA2 static u32 lit_4555 = 0x49742400; +SECTION_SDATA2 static f32 lit_4555 = 1000000.0f; /* 80076AAC-80076F84 04D8+00 s=0 e=15 z=414 None .text CrrPos__9dBgS_AcchFR4dBgS */ #pragma push diff --git a/src/d/bg/d_bg_s_gnd_chk.cpp b/src/d/bg/d_bg_s_gnd_chk.cpp index a72f9607e77..07e947fdc19 100644 --- a/src/d/bg/d_bg_s_gnd_chk.cpp +++ b/src/d/bg/d_bg_s_gnd_chk.cpp @@ -60,9 +60,6 @@ struct cBgS_GndChk { // Forward References: // -extern "C" extern void* __vt__14dBgS_CamGndChk[12]; -extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; - extern "C" void __ct__11dBgS_GndChkFv(); extern "C" void __dt__11dBgS_GndChkFv(); extern "C" void __ct__18dBgS_ObjGndChk_WtrFv(); @@ -99,7 +96,6 @@ extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; // void operator delete(void*); -extern "C" extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */]; extern "C" void __ct__8dBgS_ChkFv(); extern "C" void __dt__8dBgS_ChkFv(); diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp index 01b07f189b2..7017e34bcfd 100644 --- a/src/d/bg/d_bg_s_movebg_actor.cpp +++ b/src/d/bg/d_bg_s_movebg_actor.cpp @@ -32,12 +32,12 @@ struct dBgW { /* 8007B9C0 */ void Move(); }; +struct cXyz {}; + struct csXyz {}; struct cBgS_PolyInfo {}; -struct cXyz {}; - struct dBgS_MoveBgActor { /* 80078624 */ dBgS_MoveBgActor(); /* 80078688 */ bool CreateHeap(); @@ -80,8 +80,6 @@ struct cBgS { // static void CheckCreateHeap(fopAc_ac_c*); -extern "C" extern void* __vt__16dBgS_MoveBgActor[10]; -extern "C" extern u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */]; extern "C" void __ct__16dBgS_MoveBgActorFv(); extern "C" static void CheckCreateHeap__FP10fopAc_ac_c(); @@ -108,8 +106,6 @@ extern "C" extern u8 m_set_func__16dBgS_MoveBgActor[4 + 4 /* padding */]; void mDoMtx_YrotM(f32 (*)[4], s16); void fopAcM_entrySolidHeap(fopAc_ac_c*, int (*)(fopAc_ac_c*), u32); void* operator new(u32); -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_YrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); diff --git a/src/d/bg/d_bg_s_roof_chk.cpp b/src/d/bg/d_bg_s_roof_chk.cpp index a9e3c258fb3..35e83dd381b 100644 --- a/src/d/bg/d_bg_s_roof_chk.cpp +++ b/src/d/bg/d_bg_s_roof_chk.cpp @@ -106,7 +106,7 @@ asm dBgS_RoofChk::~dBgS_RoofChk() { /* ############################################################################################## */ /* 804526F4-804526F8 0004+00 s=1 e=0 z=0 None .sdata2 @333 */ -SECTION_SDATA2 static u32 lit_333 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_333 = 1000000000.0f; /* 80079124-8007914C 0028+00 s=0 e=1 z=0 None .text Init__12dBgS_RoofChkFv */ #pragma push diff --git a/src/d/bg/d_bg_s_sph_chk.cpp b/src/d/bg/d_bg_s_sph_chk.cpp index 16f7915bf0d..fa28e5c69ee 100644 --- a/src/d/bg/d_bg_s_sph_chk.cpp +++ b/src/d/bg/d_bg_s_sph_chk.cpp @@ -50,7 +50,6 @@ extern "C" static void func_80078B88(); // void operator delete(void*); -extern "C" extern void* __vt__8cM3dGSph[3]; extern "C" void __ct__8dBgS_ChkFv(); extern "C" void __dt__8dBgS_ChkFv(); diff --git a/src/d/bg/d_bg_s_spl_grp_chk.cpp b/src/d/bg/d_bg_s_spl_grp_chk.cpp index 0ab531fad7e..8954cd32761 100644 --- a/src/d/bg/d_bg_s_spl_grp_chk.cpp +++ b/src/d/bg/d_bg_s_spl_grp_chk.cpp @@ -99,7 +99,7 @@ SECTION_SDATA2 static u8 lit_319[4] = { }; /* 804526EC-804526F0 0004+00 s=1 e=0 z=0 None .sdata2 @320 */ -SECTION_SDATA2 static u32 lit_320 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_320 = 1000000000.0f; /* 80078BB0-80078C78 00C8+00 s=0 e=1 z=0 None .text __ct__14dBgS_SplGrpChkFv */ #pragma push diff --git a/src/d/bg/d_bg_s_wtr_chk.cpp b/src/d/bg/d_bg_s_wtr_chk.cpp index ecad5525006..c605250705d 100644 --- a/src/d/bg/d_bg_s_wtr_chk.cpp +++ b/src/d/bg/d_bg_s_wtr_chk.cpp @@ -29,8 +29,6 @@ extern "C" void __ct__11dBgS_WtrChkFv(); // External References: // -extern "C" extern void* __vt__11dBgS_WtrChk[12]; - extern "C" void __ct__14dBgS_SplGrpChkFv(); extern "C" extern void* __vt__11dBgS_WtrChk[12]; diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp index c5ec6bebd37..f5c0622297a 100644 --- a/src/d/bg/d_bg_w.cpp +++ b/src/d/bg/d_bg_w.cpp @@ -25,21 +25,17 @@ struct dBgW_Base { struct csXyz {}; -struct dBgS_SphChk {}; - -struct dBgS_SplGrpChk {}; - struct cBgS_PolyInfo { /* 802681A4 */ void SetPolyIndex(int); }; -struct cBgS_PolyPassChk {}; +struct dBgS_RoofChk {}; struct cM3dGPla { /* 8026F57C */ void getCrossY(cXyz const&, f32*) const; }; -struct cBgS_GrpPassChk {}; +struct cBgS_PolyPassChk {}; struct Vec {}; @@ -50,9 +46,13 @@ struct dBgS_Acch { /* 800772E8 */ void CalcMovePosWork(); }; -struct dBgS_CaptPoly {}; +struct dBgS_SplGrpChk {}; -struct dBgS_RoofChk {}; +struct cBgS_GrpPassChk {}; + +struct dBgS_SphChk {}; + +struct dBgS_CaptPoly {}; struct dBgW { /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&); @@ -174,12 +174,12 @@ struct cBgW_GrpElm { /* 8007A1E4 */ cBgW_GrpElm(); }; +struct cBgD_t {}; + struct cBgS_GndChk {}; struct cBgS_ShdwDraw {}; -struct cBgD_t {}; - struct cBgS_LinChk {}; struct cBgW { @@ -243,9 +243,6 @@ struct cBgW { // void dBgW_NewSet(cBgD_t*, u32, f32 (*)[3][4]); -extern "C" extern void* __vt__4dBgW[65]; -extern "C" extern void* __vt__8cM3dGTri[3]; -extern "C" extern u8 struct_80450F88[8]; extern "C" void __ct__11cBgW_RwgElmFv(); extern "C" void __dt__11cBgW_RwgElmFv(); @@ -405,11 +402,6 @@ void cM3d_Cross_SphTri(cM3dGSph const*, cM3dGTri const*, Vec*); void* operator new(u32); void* operator new[](u32); void operator delete(void*); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void SetOldShapeAngleY__9dBgW_BaseFs(); extern "C" void GetSpeedY__9dBgS_AcchFv(); @@ -841,13 +833,13 @@ asm void cBgW::MakeBlckMinMax(int param_0, cXyz* param_1, cXyz* param_2) { /* ############################################################################################## */ /* 804526FC-80452700 0004+00 s=1 e=0 z=0 None .sdata2 @3935 */ -SECTION_SDATA2 static u32 lit_3935 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_3935 = 1000000000.0f; /* 80452700-80452704 0004+00 s=1 e=0 z=0 None .sdata2 @3936 */ -SECTION_SDATA2 static u32 lit_3936 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_3936 = -1000000000.0f; /* 80452704-80452708 0004+00 s=5 e=0 z=0 None .sdata2 @3937 */ -SECTION_SDATA2 static u32 lit_3937 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3937 = 1.0f; /* 80079A68-80079BDC 0174+00 s=1 e=0 z=0 None .text MakeBlckBnd__4cBgWFiP4cXyzP4cXyz */ #pragma push @@ -901,7 +893,7 @@ asm void cBgW::ChkMemoryError() { /* ############################################################################################## */ /* 80452708-8045270C 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */ -SECTION_SDATA2 static u32 lit_4073 = 0x43000000; +SECTION_SDATA2 static f32 lit_4073 = 128.0f; /* 80079F38-8007A184 024C+00 s=1 e=3 z=85 None .text Set__4cBgWFP6cBgD_tUlPA3_A4_f */ #pragma push @@ -1007,7 +999,7 @@ asm void cBgW::RwgGroundCheckGnd(u16 param_0, cBgS_GndChk* param_1) { /* ############################################################################################## */ /* 8045270C-80452710 0004+00 s=1 e=0 z=0 None .sdata2 @4271 */ -SECTION_SDATA2 static u32 lit_4271 = 0x3C656042; +SECTION_SDATA2 static f32 lit_4271 = 0.014000000432133675f; /* 8007A824-8007A8F4 00D0+00 s=1 e=0 z=0 None .text RwgGroundCheckWall__4cBgWFUsP11cBgS_GndChk */ diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp index 7c11190fcec..34271250498 100644 --- a/src/d/bg/d_bg_w_kcol.cpp +++ b/src/d/bg/d_bg_w_kcol.cpp @@ -29,34 +29,12 @@ struct dBgW_Base { struct csXyz {}; -struct dBgS_SphChk {}; - -struct cBgS_GndChk {}; +struct dBgS_RoofChk {}; struct cBgS_ShdwDraw {}; -struct dBgS_SplGrpChk {}; - -struct dBgPc { - /* 80074048 */ void setCode(sBgPc&); -}; - -struct cBgS_PolyPassChk {}; - struct Vec {}; -struct dBgS_CaptPoly {}; - -struct cBgS_LinChk {}; - -struct cBgS_PolyInfo { - /* 802681A4 */ void SetPolyIndex(int); -}; - -struct KC_PrismData {}; - -struct cBgS_GrpPassChk {}; - struct dBgS_Acch { /* 800771E4 */ void GetSpeedY(); /* 80077200 */ void GetWallAddY(Vec&); @@ -64,7 +42,29 @@ struct dBgS_Acch { /* 800772E8 */ void CalcMovePosWork(); }; -struct dBgS_RoofChk {}; +struct cBgS_LinChk {}; + +struct dBgS_SphChk {}; + +struct dBgS_CaptPoly {}; + +struct dBgPc { + /* 80074048 */ void setCode(sBgPc&); +}; + +struct cBgS_PolyInfo { + /* 802681A4 */ void SetPolyIndex(int); +}; + +struct KC_PrismData {}; + +struct cBgS_PolyPassChk {}; + +struct cBgS_GndChk {}; + +struct dBgS_SplGrpChk {}; + +struct cBgS_GrpPassChk {}; struct dBgWKCol { /* 8007E6F4 */ dBgWKCol(); @@ -245,13 +245,6 @@ void cM3d_Len2dSq(f32, f32, f32, f32); void cM3d_Len2dSqPntAndSegLine(f32, f32, f32, f32, f32, f32, f32*, f32*, f32*); void cM3d_Cross_SphTri(cM3dGSph const*, cM3dGTri const*, Vec*); void operator delete(void*); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__8cM3dGTri[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void setCode__5dBgPcFR5sBgPc(); extern "C" void __ct__6dBgPlcFv(); @@ -565,16 +558,16 @@ SECTION_SDATA2 static u8 lit_4187[4] = { }; /* 8045271C-80452720 0004+00 s=1 e=0 z=0 None .sdata2 @4188 */ -SECTION_SDATA2 static u32 lit_4188 = 0x43FA0000; +SECTION_SDATA2 static f32 lit_4188 = 500.0f; /* 80452720-80452724 0004+00 s=6 e=0 z=0 None .sdata2 @4189 */ -SECTION_SDATA2 static u32 lit_4189 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4189 = 1.0f; /* 80452724-80452728 0004+00 s=4 e=0 z=0 None .sdata2 @4190 */ -SECTION_SDATA2 static u32 lit_4190 = 0x3BF5C28F; +SECTION_SDATA2 static f32 lit_4190 = 0.007499999832361937f; /* 80452728-8045272C 0004+00 s=4 e=0 z=0 None .sdata2 @4191 */ -SECTION_SDATA2 static u32 lit_4191 = 0xBBF5C28F; +SECTION_SDATA2 static f32 lit_4191 = -0.007499999832361937f; /* 8007EE34-8007F628 07F4+00 s=1 e=0 z=0 None .text LineCheck__8dBgWKColFP11cBgS_LinChk */ #pragma push @@ -588,7 +581,7 @@ asm void dBgWKCol::LineCheck(cBgS_LinChk* param_0) { /* ############################################################################################## */ /* 8045272C-80452730 0004+00 s=1 e=0 z=0 None .sdata2 @4293 */ -SECTION_SDATA2 static u32 lit_4293 = 0x3C656042; +SECTION_SDATA2 static f32 lit_4293 = 0.014000000432133675f; /* 8007F628-8007F9A4 037C+00 s=1 e=0 z=0 None .text GroundCross__8dBgWKColFP11cBgS_GndChk */ #pragma push @@ -639,14 +632,10 @@ asm void dBgWKCol::CaptPoly(dBgS_CaptPoly& param_0) { static u8 l_wcsbuf[1008]; /* 80452730-80452738 0008+00 s=2 e=0 z=0 None .sdata2 @5298 */ -SECTION_SDATA2 static u8 lit_5298[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5298 = 0.5; /* 80452738-80452740 0008+00 s=2 e=0 z=0 None .sdata2 @5299 */ -SECTION_SDATA2 static u8 lit_5299[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5299 = 3.0; /* 80452740-80452748 0008+00 s=2 e=0 z=0 None .sdata2 @5300 */ SECTION_SDATA2 static u8 lit_5300[8] = { @@ -716,9 +705,7 @@ asm void dBgWKCol::SphChk(dBgS_SphChk* param_0, void* param_1) { /* ############################################################################################## */ /* 80452750-80452758 0008+00 s=1 e=0 z=0 None .sdata2 @6099 */ -SECTION_SDATA2 static u8 lit_6099[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6099 = 4503599627370496.0 /* cast u32 to float */; /* 800829AC-800829F0 0044+00 s=1 e=0 z=0 None .text GetTopUnder__8dBgWKColCFPfPf */ #pragma push diff --git a/src/d/bg/d_bg_w_sv.cpp b/src/d/bg/d_bg_w_sv.cpp index 607a16a3395..f29394a0a8d 100644 --- a/src/d/bg/d_bg_w_sv.cpp +++ b/src/d/bg/d_bg_w_sv.cpp @@ -17,14 +17,14 @@ struct dBgW_Base { /* 80074AB4 */ void SetOldShapeAngleY(s16); }; +struct cXyz {}; + struct csXyz {}; struct cBgS_PolyInfo {}; struct cBgD_t {}; -struct cXyz {}; - struct dBgWSv { /* 80082F98 */ void Set(cBgD_t*, u32); /* 80083020 */ void CopyBackVtx(); @@ -36,19 +36,19 @@ struct dBgWSv { /* 800835DC */ ~dBgWSv(); }; -struct dBgS_SphChk {}; - -struct dBgS_SplGrpChk {}; +struct dBgS_RoofChk {}; struct cBgS_PolyPassChk {}; -struct cBgS_GrpPassChk {}; +struct dBgS_SplGrpChk {}; struct dBgS_Acch {}; -struct dBgS_CaptPoly {}; +struct cBgS_GrpPassChk {}; -struct dBgS_RoofChk {}; +struct dBgS_SphChk {}; + +struct dBgS_CaptPoly {}; struct dBgW { /* 8007B3AC */ void GetExitId(cBgS_PolyInfo const&); @@ -126,8 +126,6 @@ struct cBgW { // Forward References: // -extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */]; - extern "C" void Set__6dBgWSvFP6cBgD_tUl(); extern "C" void CopyBackVtx__6dBgWSvFv(); extern "C" void CrrPosWork__6dBgWSvFP4cXyziii(); @@ -144,8 +142,6 @@ extern "C" extern void* __vt__6dBgWSv[65 + 1 /* padding */]; void* operator new[](u32); void operator delete(void*); -extern "C" extern void* __vt__4dBgW[65]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void SetOldShapeAngleY__9dBgW_BaseFs(); extern "C" void __dt__4cBgWFv(); @@ -271,7 +267,7 @@ SECTION_SDATA2 static u8 lit_3807[4] = { }; /* 8045275C-80452760 0004+00 s=1 e=0 z=0 None .sdata2 @3808 */ -SECTION_SDATA2 static u32 lit_3808 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3808 = 1.0f; /* 80083300-8008351C 021C+00 s=1 e=0 z=0 None .text TransPosWork__6dBgWSvFP4cXyziii */ #pragma push diff --git a/src/d/cc/d_cc_d.cpp b/src/d/cc/d_cc_d.cpp index 4fd335795f1..7454a275d22 100644 --- a/src/d/cc/d_cc_d.cpp +++ b/src/d/cc/d_cc_d.cpp @@ -153,7 +153,8 @@ struct cM3dGCps { /* 8026F03C */ void Set(cM3dGCpsS const&); }; -struct cCcD_CpsAttr; +struct cCcD_PntAttr {}; + struct cCcD_ShapeAttr { struct Shape {}; @@ -163,33 +164,10 @@ struct cCcD_ShapeAttr { }; struct cCcD_TriAttr; -struct cCcD_CylAttr; -struct cCcD_PntAttr {}; - +struct cCcD_SphAttr; +struct cCcD_CpsAttr; struct cCcD_AabAttr {}; -struct cCcD_SphAttr { - /* 80084B44 */ void GetCoCP() const; - /* 80037A54 */ void GetCoCP(); - /* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; - /* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; - /* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; - /* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; - /* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; - /* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; - /* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; - /* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; - /* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const; - /* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const; - /* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const; - /* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; - /* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const; - /* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const; - /* 802646E0 */ void CalcAabBox(); - /* 8026476C */ void GetNVec(cXyz const&, cXyz*) const; - /* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; -}; - struct cCcD_CylAttr { /* 80084CC0 */ void GetCoCP() const; /* 80037A4C */ void GetCoCP(); @@ -231,6 +209,28 @@ struct cCcD_CpsAttr { /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const; }; +struct cCcD_SphAttr { + /* 80084B44 */ void GetCoCP() const; + /* 80037A54 */ void GetCoCP(); + /* 80264538 */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const; + /* 802645C0 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const; + /* 80084B4C */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; + /* 80084B54 */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const; + /* 80084B5C */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const; + /* 802644EC */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; + /* 8026457C */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const; + /* 80264688 */ void CrossCo(cCcD_CpsAttr const&, f32*) const; + /* 80084B94 */ bool CrossCo(cCcD_AabAttr const&, f32*) const; + /* 80084B9C */ bool CrossCo(cCcD_TriAttr const&, f32*) const; + /* 80084BA4 */ bool CrossCo(cCcD_PntAttr const&, f32*) const; + /* 80084BAC */ void CrossCo(cCcD_ShapeAttr const&, f32*) const; + /* 80264644 */ void CrossCo(cCcD_SphAttr const&, f32*) const; + /* 802645F8 */ void CrossCo(cCcD_CylAttr const&, f32*) const; + /* 802646E0 */ void CalcAabBox(); + /* 8026476C */ void GetNVec(cXyz const&, cXyz*) const; + /* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const; +}; + struct cCcD_TriAttr { /* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const; /* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const; @@ -313,13 +313,6 @@ struct cCcD_GObjInf { // void dCcD_GetGObjInf(cCcD_Obj*); -extern "C" extern void* __vt__8dCcD_Sph[36]; -extern "C" extern void* __vt__8dCcD_Cyl[36]; -extern "C" extern void* __vt__8dCcD_Tri[36]; -extern "C" extern void* __vt__8dCcD_Cps[36]; -extern "C" extern void* __vt__9dCcD_Stts[11]; -extern "C" extern void* __vt__10dCcD_GStts[3]; -extern "C" extern void* __vt__10cCcD_GStts[3]; extern "C" void ClrActorInfo__22dCcD_GAtTgCoCommonBaseFv(); extern "C" void ct__22dCcD_GAtTgCoCommonBaseFv(); @@ -463,20 +456,6 @@ extern "C" extern void* __vt__10cCcD_GStts[3]; void fopAcIt_Judge(void* (*)(void*, void*), void*); void fpcSch_JudgeByID(void*, void*); void operator delete(void*); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__15cCcD_DivideInfo[3]; -extern "C" extern void* __vt__8cM3dGSph[3]; -extern "C" extern void* __vt__8cM3dGTri[3]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__12cCcD_TriAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__9cCcD_Stts[8]; -extern "C" extern u8 m_virtual_center__14cCcD_ShapeAttr[12]; -extern "C" extern f32 Zero__4cXyz[3]; extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); extern "C" void fpcSch_JudgeByID__FPvPv(); diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/cc/d_cc_mass_s.cpp index 3caa5d3d494..820475d6351 100644 --- a/src/d/cc/d_cc_mass_s.cpp +++ b/src/d/cc/d_cc_mass_s.cpp @@ -13,10 +13,10 @@ struct fopAc_ac_c {}; -struct cCcD_Obj {}; - struct cXyz {}; +struct cCcD_Obj {}; + struct dCcMassS_Obj { /* 800300F4 */ ~dCcMassS_Obj(); /* 800852E0 */ void Set(cCcD_Obj*, u8, void (*)(fopAc_ac_c*, cXyz*, u32)); @@ -24,16 +24,16 @@ struct dCcMassS_Obj { /* 800855C8 */ dCcMassS_Obj(); }; -struct cM3dGCps { - /* 8026EF88 */ cM3dGCps(); - /* 8026EFA4 */ ~cM3dGCps(); - /* 8026F080 */ void SetCps(cM3dGCps const&); +struct dCcMassS_HitInf { + /* 80085334 */ void ClearPointer(); }; struct Vec {}; -struct dCcMassS_HitInf { - /* 80085334 */ void ClearPointer(); +struct cM3dGCps { + /* 8026EF88 */ cM3dGCps(); + /* 8026EFA4 */ ~cM3dGCps(); + /* 8026F080 */ void SetCps(cM3dGCps const&); }; struct dCcMassS_Mng { @@ -115,16 +115,6 @@ extern "C" void GetCamTopPos__12dCcMassS_MngFP3Vec(); void cM_rndF(f32); void operator delete(void*); -extern "C" extern void* __vt__12dCcMassS_Obj[3]; -extern "C" extern void* __vt__15cCcD_DivideArea[3]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__15cCcD_DivideInfo[3]; -extern "C" extern void* __vt__12dCcMassS_Mng[3 + 1 /* padding */]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void __dt__12dCcMassS_ObjFv(); extern "C" void Set__15cCcD_DivideInfoFUlUlUl(); @@ -261,7 +251,7 @@ asm dCcMassS_Obj::dCcMassS_Obj() { /* ############################################################################################## */ /* 80452764-80452768 0004+00 s=2 e=0 z=0 None .sdata2 @3724 */ -SECTION_SDATA2 static u32 lit_3724 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_3724 = -1000000000.0f; /* 800855E4-80085630 004C+00 s=1 e=1 z=0 None .text Ct__12dCcMassS_MngFv */ #pragma push @@ -285,7 +275,7 @@ asm void dCcMassS_Mng::SetAttr(f32 param_0, f32 param_1, u8 param_2, u8 param_3) /* ############################################################################################## */ /* 80452768-8045276C 0004+00 s=1 e=0 z=0 None .sdata2 @3780 */ -SECTION_SDATA2 static u32 lit_3780 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_3780 = 1000000000.0f; /* 80085690-800858AC 021C+00 s=0 e=1 z=1 None .text Prepare__12dCcMassS_MngFv */ #pragma push @@ -299,10 +289,10 @@ asm void dCcMassS_Mng::Prepare() { /* ############################################################################################## */ /* 8045276C-80452770 0004+00 s=2 e=0 z=0 None .sdata2 @3899 */ -SECTION_SDATA2 static u32 lit_3899 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3899 = 1.0f; /* 80452770-80452774 0004+00 s=1 e=0 z=0 None .sdata2 @3900 */ -SECTION_SDATA2 static u32 lit_3900 = 0x41A00000; +SECTION_SDATA2 static f32 lit_3900 = 20.0f; /* 800858AC-80085CF0 0444+00 s=0 e=0 z=2 None .text * Chk__12dCcMassS_MngFP4cXyzPP10fopAc_ac_cP15dCcMassS_HitInf */ @@ -327,7 +317,7 @@ asm void dCcMassS_Mng::Clear() { /* ############################################################################################## */ /* 80452774-80452778 0004+00 s=1 e=0 z=0 None .sdata2 @3941 */ -SECTION_SDATA2 static u32 lit_3941 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3941 = 0.5f; /* 80085D98-80085E6C 00D4+00 s=0 e=4 z=7 None .text Set__12dCcMassS_MngFP8cCcD_ObjUc */ #pragma push diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp index 71f35f30fc5..35293b1b701 100644 --- a/src/d/cc/d_cc_s.cpp +++ b/src/d/cc/d_cc_s.cpp @@ -29,28 +29,28 @@ struct dJntCol_c { /* 80036C44 */ void getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const; }; +struct cCcD_GStts {}; + struct cCcD_ShapeAttr { struct Shape {}; }; +struct cCcD_GObjInf {}; + +struct cCcD_Obj { + /* 80263A48 */ void GetAc(); +}; + struct cCcD_Stts { /* 80263934 */ void PlusCcMove(f32, f32, f32); /* 80263970 */ void PlusDmg(int); }; -struct cCcD_GObjInf {}; - -struct dCcD_GStts {}; - struct dCcD_GObjInf { /* 800843DC */ void ChkAtNoGuard(); }; -struct cCcD_Obj { - /* 80263A48 */ void GetAc(); -}; - -struct cCcD_GStts {}; +struct dCcD_GStts {}; struct dCcS { /* 8002FF40 */ ~dCcS(); @@ -142,8 +142,6 @@ struct Vec {}; // Forward References: // -extern "C" extern void* __vt__4dCcS[13]; - extern "C" void Ct__4dCcSFv(); extern "C" void Dt__4dCcSFv(); extern "C" void ChkShieldFrontRange__4dCcSFP8cCcD_ObjP8cCcD_ObjiPC4cXyz(); @@ -180,16 +178,6 @@ extern "C" extern void* __vt__4dCcS[13]; void cM3d_CalcVecZAngle(Vec const&, csXyz*); void cLib_distanceAngleS(s16, s16); void operator delete(void*); -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__15cCcD_DivideInfo[3]; -extern "C" extern void* __vt__8cM3dGSph[3]; -extern "C" extern void* __vt__12cCcD_SphAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 BaseZ__4cXyz[12]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void ZXYrotS__14mDoMtx_stack_cFRC5csXyz(); extern "C" void __dt__4dCcSFv(); @@ -488,7 +476,7 @@ SECTION_DATA static u8 rank_tbl[121 + 3 /* padding */] = { }; /* 8045277C-80452780 0004+00 s=1 e=0 z=0 None .sdata2 @3924 */ -SECTION_SDATA2 static u32 lit_3924 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_3924 = 1.0f / 100.0f; /* 80452780-80452788 0004+04 s=2 e=0 z=0 None .sdata2 @3925 */ SECTION_SDATA2 static f32 lit_3925[1 + 1 /* padding */] = { @@ -498,9 +486,7 @@ SECTION_SDATA2 static f32 lit_3925[1 + 1 /* padding */] = { }; /* 80452788-80452790 0008+00 s=1 e=0 z=0 None .sdata2 @3927 */ -SECTION_SDATA2 static u8 lit_3927[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3927 = 4503599627370496.0 /* cast u32 to float */; /* 8008640C-80086754 0348+00 s=1 e=0 z=0 None .text * SetPosCorrect__4dCcSFP8cCcD_ObjP4cXyzP8cCcD_ObjP4cXyzf */ diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/cc/d_cc_uty.cpp index a4cad09779b..81a1ce4d5f1 100644 --- a/src/d/cc/d_cc_uty.cpp +++ b/src/d/cc/d_cc_uty.cpp @@ -60,9 +60,6 @@ extern "C" bool checkCutJumpCancelTurn__9daPy_py_cCFv(); void dCcD_GetGObjInf(cCcD_Obj*); void cM_atan2s(f32, f32); void cM_rndFX(f32); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80451124[4]; extern "C" void getHitSeID__12dCcD_GObjInfFUci(); extern "C" void dCcD_GetGObjInf__FP8cCcD_Obj(); @@ -174,27 +171,17 @@ asm void at_power_check(dCcU_AtInfo* param_0) { /* ############################################################################################## */ /* 80452798-804527A0 0004+04 s=1 e=0 z=0 None .sdata2 @4212 */ -SECTION_SDATA2 static u8 lit_4212[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_4212[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 804527A0-804527A8 0008+00 s=1 e=0 z=0 None .sdata2 @4213 */ -SECTION_SDATA2 static u8 lit_4213[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4213 = 0.5; /* 804527A8-804527B0 0008+00 s=1 e=0 z=0 None .sdata2 @4214 */ -SECTION_SDATA2 static u8 lit_4214[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4214 = 3.0; /* 804527B0-804527B8 0008+00 s=1 e=0 z=0 None .sdata2 @4215 */ SECTION_SDATA2 static u8 lit_4215[8] = { @@ -202,10 +189,10 @@ SECTION_SDATA2 static u8 lit_4215[8] = { }; /* 804527B8-804527BC 0004+00 s=1 e=0 z=0 None .sdata2 @4216 */ -SECTION_SDATA2 static u32 lit_4216 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4216 = 100.0f; /* 804527BC-804527C0 0004+00 s=1 e=0 z=0 None .sdata2 @4217 */ -SECTION_SDATA2 static u32 lit_4217 = 0x457A0000; +SECTION_SDATA2 static f32 lit_4217 = 4000.0f; /* 804527C0-804527C8 0004+04 s=1 e=0 z=0 None .sdata2 @4218 */ SECTION_SDATA2 static f32 lit_4218[1 + 1 /* padding */] = { diff --git a/src/d/com/d_com_inf_actor.cpp b/src/d/com/d_com_inf_actor.cpp index 36e02b50753..de1c2090d10 100644 --- a/src/d/com/d_com_inf_actor.cpp +++ b/src/d/com/d_com_inf_actor.cpp @@ -14,9 +14,6 @@ extern "C" extern u8 g_dComIfAc_gameInfo[8]; extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; -extern "C" extern u8 g_dComIfAc_gameInfo[8]; -extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; - // // External References: // diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index e755e98ec92..ce63bbe1d4a 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -509,19 +509,6 @@ void dComIfGs_offVisitedRoom(int); void dComIfGs_isVisitedRoom(int); void dComIfGs_staffroll_next_go(); void dComIfGs_staffroll_next_go_check(); -extern "C" extern char const* const d_com_d_com_inf_game__stringBase0; -extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3]; -extern "C" extern void* __vt__12dCcMassS_Obj[3]; -extern "C" extern void* __vt__15cCcD_DivideArea[3]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern void* __vt__8cM3dGAab[3]; -extern "C" extern void* __vt__15cCcD_DivideInfo[3]; -extern "C" extern void* __vt__12dCcMassS_Mng[3 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u32 g_blackColor; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 g_saftyWhiteColor; extern "C" void ct__14dComIfG_play_cFv(); extern "C" void init__14dComIfG_play_cFv(); @@ -740,29 +727,6 @@ void dMenuFmap_getStartStageName(void*); void cPhs_Handler(request_of_phase_process_class*, int (**)(void*), void*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__16dStage_stageDt_c[93]; -extern "C" extern void* __vt__11dStage_dt_c[93]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__19dAttDraw_CallBack_c[3]; -extern "C" extern void* __vt__11dAttParam_c[3 + 1 /* padding */]; -extern "C" extern void* __vt__4dBgS[5]; -extern "C" extern void* __vt__4cBgS[5]; -extern "C" extern void* __vt__11cBgS_ChkElm[4]; -extern "C" extern void* __vt__4dCcS[13]; -extern "C" extern void* __vt__12cCcD_CylAttr[25]; -extern "C" extern void* __vt__12cCcD_CpsAttr[25]; -extern "C" extern void* __vt__14cCcD_ShapeAttr[22]; -extern "C" extern void* __vt__4cCcS[12]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); extern "C" void OSReport_Error(); @@ -1455,7 +1419,7 @@ asm void dComIfGp_getReverb(int param_0) { /* ############################################################################################## */ /* 80451D00-80451D04 0004+00 s=2 e=0 z=0 None .sdata2 @5090 */ -SECTION_SDATA2 static u32 lit_5090 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_5090 = -1000000000.0f; /* 8002D0B4-8002D1AC 00F8+00 s=0 e=3 z=34 None .text * dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj */ @@ -1851,9 +1815,7 @@ SECTION_SDATA2 static f32 lit_6335[1 + 1 /* padding */] = { }; /* 80451D10-80451D18 0008+00 s=1 e=0 z=0 None .sdata2 @6337 */ -SECTION_SDATA2 static u8 lit_6337[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6337 = 4503601774854144.0 /* cast s32 to float */; /* 8002E22C-8002E2DC 00B0+00 s=1 e=0 z=0 None .text dComIfGp_createSubExpHeap2D__Fv */ #pragma push @@ -2013,10 +1975,10 @@ asm void dComIfG_getTrigA(u32 param_0) { /* ############################################################################################## */ /* 80451D18-80451D1C 0004+00 s=1 e=0 z=0 None .sdata2 @6980 */ -SECTION_SDATA2 static u32 lit_6980 = 0xC7B05E00; +SECTION_SDATA2 static f32 lit_6980 = -90300.0f; /* 80451D1C-80451D20 0004+00 s=1 e=0 z=0 None .sdata2 @6981 */ -SECTION_SDATA2 static u32 lit_6981 = 0x474A5800; +SECTION_SDATA2 static f32 lit_6981 = 51800.0f; /* 8002E9F0-8002EC54 0264+00 s=0 e=1 z=0 None .text dComIfGp_calcNowRegion__Fv */ #pragma push @@ -2403,9 +2365,7 @@ asm void dComIfGs_shake_kandelaar_check() { /* ############################################################################################## */ /* 80451D20-80451D28 0008+00 s=1 e=0 z=0 None .sdata2 @7580 */ -SECTION_SDATA2 static u8 lit_7580[8] = { - 0x3F, 0xE3, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, -}; +SECTION_SDATA2 static f64 lit_7580 = 0.6; /* 8002FA54-8002FA84 0030+00 s=0 e=4 z=96 None .text dComIfGs_wolfeye_effect_check__Fv */ #pragma push diff --git a/src/d/com/d_com_static.cpp b/src/d/com/d_com_static.cpp index 9c24bc7612c..39e6d3d1aa8 100644 --- a/src/d/com/d_com_static.cpp +++ b/src/d/com/d_com_static.cpp @@ -129,35 +129,6 @@ void daNpcKakashi_setSwdTutorialResult(bool); void daNpcKakashi_getSuccessCount(); void daNpcKakashi_incSuccessCount(); void daNpcKakashi_clrSuccessCount(); -extern "C" extern char const* const d_com_d_com_static__stringBase0; -extern "C" extern u8 mRoom__7daSus_c[256]; -extern "C" extern u8 m_entryModel__10daMirror_c[12]; -extern "C" extern u8 m_deleteRoom__15dGrass_packet_c[12]; -extern "C" extern u8 m_deleteRoom__16dFlower_packet_c[12]; -extern "C" extern u8 struct_80450D88[4]; -extern "C" extern u8 struct_80450D8C[4]; -extern "C" extern u8 m_aim_rate__8daYkgr_c[4]; -extern "C" extern u8 m_path__8daYkgr_c[4]; -extern "C" extern u8 m_emitter__8daYkgr_c[4]; -extern "C" extern u8 m_top__13daTagStream_c[4]; -extern "C" extern u8 m_myObj__10daMirror_c[4]; -extern "C" extern u8 m_myObj__9daGrass_c[4]; -extern "C" extern u8 m_grass__9daGrass_c[4]; -extern "C" extern u8 m_flower__9daGrass_c[4]; -extern "C" extern u8 m_myObj__6daMP_c[4]; -extern "C" extern u8 mTagMagne__12daTagMagne_c[4]; -extern "C" extern u8 struct_80450DC0[4]; -extern "C" extern u8 pad_80450DD1[4]; -extern "C" extern void* M_dir_base__Q212daObjMovebox5Act_c[2]; -extern "C" extern u32 OPEN_SIZE__7daDsh_c; -extern "C" extern u32 OPEN_ACCEL__7daDsh_c; -extern "C" extern u32 OPEN_SPEED__7daDsh_c; -extern "C" extern u32 OPEN_BOUND_SPEED__7daDsh_c; -extern "C" extern u32 OPEN_BOUND_RATIO__7daDsh_c; -extern "C" extern u32 CLOSE_ACCEL__7daDsh_c; -extern "C" extern u32 CLOSE_SPEED__7daDsh_c; -extern "C" extern u32 CLOSE_BOUND_SPEED__7daDsh_c; -extern "C" extern u32 CLOSE_BOUND_RATIO__7daDsh_c; extern "C" void set__Q27daSus_c6data_cFScRC4cXyzRC4cXyzUcUcUc(); extern "C" void reset__Q27daSus_c6data_cFv(); @@ -250,9 +221,6 @@ void mDoMch_Create(); void fopAcM_delete(fopAc_ac_c*); void fpoAcM_relativePos(fopAc_ac_c const*, cXyz const*, cXyz*); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 m_status__7dDemo_c[4]; extern "C" void __dt__4cXyzFv(); extern "C" void mDoMch_Create__Fv(); diff --git a/src/d/d_att_dist.cpp b/src/d/d_att_dist.cpp index 91192d766e5..a0149ae952d 100644 --- a/src/d/d_att_dist.cpp +++ b/src/d/d_att_dist.cpp @@ -13,8 +13,6 @@ extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; - // // External References: // diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 777f0d3bf0a..064f0359179 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -63,6 +63,12 @@ struct dRes_control_c { /* 8003C2EC */ void getRes(char const*, s32, dRes_info_c*, int); }; +struct Vec {}; + +struct cXyz { + /* 80266B34 */ void operator-(Vec const&) const; +}; + struct cSAngle { /* 80270F68 */ cSAngle(cSAngle const&); /* 80270F98 */ cSAngle(s16); @@ -70,12 +76,6 @@ struct cSAngle { /* 80271228 */ void operator-(s16) const; }; -struct Vec {}; - -struct cXyz { - /* 80266B34 */ void operator-(Vec const&) const; -}; - struct dAttention_c { /* 80070198 */ dAttention_c(fopAc_ac_c*, u32); /* 80070774 */ ~dAttention_c(); @@ -205,12 +205,6 @@ static void distace_angle_adjust(f32, s16, f32); static void check_distace(cXyz*, s16, cXyz*, f32, f32, f32, f32); static void select_attention(fopAc_ac_c*, void*); static void sound_attention(fopAc_ac_c*, void*); -extern "C" extern char const* const d_d_attention__stringBase0; -extern "C" extern void* __vt__19dAttDraw_CallBack_c[3]; -extern "C" extern void* __vt__11dAttParam_c[3 + 1 /* padding */]; -extern "C" extern u8 pad_8045067A[4]; -extern "C" extern u8 data_80450680[8]; -extern "C" extern u8 data_80450688[8]; extern "C" static void func_80070018(); extern "C" void __ct__11dAttParam_cFl(); @@ -305,17 +299,6 @@ void fopAcIt_Judge(void* (*)(void*, void*), void*); void fopAcM_searchActorDistance(fopAc_ac_c const*, fopAc_ac_c const*); void fpcSch_JudgeByID(void*, void*); void operator delete(void*); -extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3]; -extern "C" extern u8 dist_table__12dAttention_c[6552]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 data_80450F58[8]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memcpy(); extern "C" void play__14mDoExt_baseAnmFv(); @@ -464,34 +447,34 @@ SECTION_DATA void* __vt__11dAttParam_c[3 + 1 /* padding */] = { }; /* 80452628-8045262C 0004+00 s=1 e=0 z=0 None .sdata2 @4061 */ -SECTION_SDATA2 static u32 lit_4061 = 0x42340000; +SECTION_SDATA2 static f32 lit_4061 = 45.0f; /* 8045262C-80452630 0004+00 s=1 e=0 z=0 None .sdata2 @4062 */ -SECTION_SDATA2 static u32 lit_4062 = 0x41F00000; +SECTION_SDATA2 static f32 lit_4062 = 30.0f; /* 80452630-80452634 0004+00 s=1 e=0 z=0 None .sdata2 @4063 */ -SECTION_SDATA2 static u32 lit_4063 = 0x42B40000; +SECTION_SDATA2 static f32 lit_4063 = 90.0f; /* 80452634-80452638 0004+00 s=2 e=0 z=0 None .sdata2 @4064 */ -SECTION_SDATA2 static u32 lit_4064 = 0xBF666666; +SECTION_SDATA2 static f32 lit_4064 = -9.0f / 10.0f; /* 80452638-8045263C 0004+00 s=1 e=0 z=0 None .sdata2 @4065 */ -SECTION_SDATA2 static u32 lit_4065 = 0x453B8000; +SECTION_SDATA2 static f32 lit_4065 = 3000.0f; /* 8045263C-80452640 0004+00 s=1 e=0 z=0 None .sdata2 @4066 */ -SECTION_SDATA2 static u32 lit_4066 = 0x447A0000; +SECTION_SDATA2 static f32 lit_4066 = 1000.0f; /* 80452640-80452644 0004+00 s=1 e=0 z=0 None .sdata2 @4067 */ -SECTION_SDATA2 static u32 lit_4067 = 0x40C00000; +SECTION_SDATA2 static f32 lit_4067 = 6.0f; /* 80452644-80452648 0004+00 s=1 e=0 z=0 None .sdata2 @4068 */ -SECTION_SDATA2 static u32 lit_4068 = 0x40900000; +SECTION_SDATA2 static f32 lit_4068 = 4.5f; /* 80452648-8045264C 0004+00 s=1 e=0 z=0 None .sdata2 @4069 */ -SECTION_SDATA2 static u32 lit_4069 = 0x41600000; +SECTION_SDATA2 static f32 lit_4069 = 14.0f; /* 8045264C-80452650 0004+00 s=1 e=0 z=0 None .sdata2 @4070 */ -SECTION_SDATA2 static u32 lit_4070 = 0x41200000; +SECTION_SDATA2 static f32 lit_4070 = 10.0f; /* 80452650-80452654 0004+00 s=12 e=0 z=0 None .sdata2 @4071 */ SECTION_SDATA2 static u8 lit_4071[4] = { @@ -502,10 +485,10 @@ SECTION_SDATA2 static u8 lit_4071[4] = { }; /* 80452654-80452658 0004+00 s=1 e=0 z=0 None .sdata2 @4072 */ -SECTION_SDATA2 static u32 lit_4072 = 0x3FD9999A; +SECTION_SDATA2 static f32 lit_4072 = 17.0f / 10.0f; /* 80452658-8045265C 0004+00 s=10 e=0 z=0 None .sdata2 @4073 */ -SECTION_SDATA2 static u32 lit_4073 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4073 = 1.0f; /* 80070038-80070110 00D8+00 s=1 e=0 z=0 None .text __ct__11dAttParam_cFl */ #pragma push @@ -529,10 +512,10 @@ asm dAttParam_c::~dAttParam_c() { /* ############################################################################################## */ /* 8045265C-80452660 0004+00 s=1 e=0 z=0 None .sdata2 @4084 */ -SECTION_SDATA2 static u32 lit_4084 = 0x437A0000; +SECTION_SDATA2 static f32 lit_4084 = 250.0f; /* 80452660-80452664 0004+00 s=1 e=0 z=0 None .sdata2 @4085 */ -SECTION_SDATA2 static u32 lit_4085 = 0x40000000; +SECTION_SDATA2 static f32 lit_4085 = 2.0f; /* 80070158-80070178 0020+00 s=1 e=0 z=0 None .text __ct__15dAttDrawParam_cFv */ #pragma push @@ -546,7 +529,7 @@ asm dAttDrawParam_c::dAttDrawParam_c() { /* ############################################################################################## */ /* 80452664-80452668 0004+00 s=1 e=0 z=0 None .sdata2 @4092 */ -SECTION_SDATA2 static u32 lit_4092 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4092 = 3.0f / 5.0f; /* 80070178-80070198 0020+00 s=1 e=0 z=0 None .text * execute__19dAttDraw_CallBack_cFUsP16J3DTransformInfo */ @@ -685,9 +668,7 @@ SECTION_SDATA2 static f32 lit_4448[1 + 1 /* padding */] = { }; /* 80452670-80452678 0008+00 s=3 e=0 z=0 None .sdata2 @4450 */ -SECTION_SDATA2 static u8 lit_4450[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4450 = 4503601774854144.0 /* cast s32 to float */; /* 80070BF4-80070C40 004C+00 s=2 e=0 z=0 None .text distace_weight__Ffsf */ #pragma push @@ -711,14 +692,10 @@ asm static void distace_angle_adjust(f32 param_0, s16 param_1, f32 param_2) { /* ############################################################################################## */ /* 80452678-80452680 0008+00 s=3 e=0 z=0 None .sdata2 @4514 */ -SECTION_SDATA2 static u8 lit_4514[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4514 = 0.5; /* 80452680-80452688 0008+00 s=3 e=0 z=0 None .sdata2 @4515 */ -SECTION_SDATA2 static u8 lit_4515[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4515 = 3.0; /* 80452688-80452690 0008+00 s=3 e=0 z=0 None .sdata2 @4516 */ SECTION_SDATA2 static u8 lit_4516[8] = { @@ -738,10 +715,10 @@ asm static void check_distace(cXyz* param_0, s16 param_1, cXyz* param_2, f32 par /* ############################################################################################## */ /* 80452690-80452694 0004+00 s=3 e=0 z=0 None .sdata2 @4562 */ -SECTION_SDATA2 static u32 lit_4562 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4562 = -1.0f; /* 80452694-80452698 0004+00 s=3 e=0 z=0 None .sdata2 @4563 */ -SECTION_SDATA2 static u32 lit_4563 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4563 = 0.5f; /* 80070E90-800710C0 0230+00 s=2 e=0 z=0 None .text * calcWeight__12dAttention_cFiP10fopAc_ac_cfssPUl */ @@ -901,10 +878,10 @@ asm static void sound_attention(fopAc_ac_c* param_0, void* param_1) { /* ############################################################################################## */ /* 80452698-8045269C 0004+00 s=1 e=0 z=0 None .sdata2 @5137 */ -SECTION_SDATA2 static u32 lit_5137 = 0x461C4000; +SECTION_SDATA2 static f32 lit_5137 = 10000.0f; /* 8045269C-804526A0 0004+00 s=1 e=0 z=0 None .sdata2 @5138 */ -SECTION_SDATA2 static u32 lit_5138 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_5138 = 1.0f / 10.0f; /* 80071DEC-80071E84 0098+00 s=1 e=0 z=0 None .text runSoundProc__12dAttention_cFv */ #pragma push @@ -1041,9 +1018,7 @@ SECTION_SDATA2 static f32 lit_5668[1 + 1 /* padding */] = { }; /* 804526A8-804526B0 0008+00 s=1 e=0 z=0 None .sdata2 @5670 */ -SECTION_SDATA2 static u8 lit_5670[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5670 = 4503599627370496.0 /* cast u32 to float */; /* 80073004-800732AC 02A8+00 s=1 e=0 z=0 None .text alphaAnm__10dAttDraw_cFv */ #pragma push @@ -1063,10 +1038,10 @@ void J3DTevBlock::setTevKColor(u32 param_0, J3DGXColor const* param_1) { /* ############################################################################################## */ /* 804526B0-804526B4 0004+00 s=1 e=0 z=0 None .sdata2 @5784 */ -SECTION_SDATA2 static u32 lit_5784 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_5784 = 0.01745329238474369f; /* 804526B4-804526B8 0004+00 s=1 e=0 z=0 None .sdata2 @5785 */ -SECTION_SDATA2 static u32 lit_5785 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_5785 = -100.0f; /* 800732B0-8007353C 028C+00 s=1 e=0 z=0 None .text draw__10dAttDraw_cFR4cXyzPA4_f */ #pragma push diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 4a013e43c32..34386e057e2 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -63,8 +63,6 @@ struct J2DScreen { // Forward References: // -extern "C" extern char const* const d_d_bright_check__stringBase0; - extern "C" void __ct__14dBrightCheck_cFP10JKRArchive(); extern "C" void __dt__14dBrightCheck_cFv(); extern "C" void screenSet__14dBrightCheck_cFv(); @@ -85,10 +83,6 @@ void mDoExt_getMesgFont(); void mDoExt_getRubyFont(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void mDoExt_getRubyFont__Fv(); @@ -254,7 +248,7 @@ void dBrightCheck_c::modeWait() { /* ############################################################################################## */ /* 80453A04-80453A08 0004+00 s=1 e=0 z=0 None .sdata2 @3821 */ -SECTION_SDATA2 static u32 lit_3821 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3821 = 1.0f; /* 80453A08-80453A10 0004+04 s=1 e=0 z=0 None .sdata2 @3822 */ SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = { diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index 92f349c127a..7f479e1a22d 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -41,10 +41,10 @@ struct dCamParam_c { /* 80088620 */ void SearchStyle(u32); }; -struct cSAngle {}; - struct cXyz {}; +struct cSAngle {}; + struct dCamMath { /* 8008813C */ void rationalBezierRatio(f32, f32); /* 80088284 */ void zoomFovy(f32, f32); @@ -68,8 +68,6 @@ struct cDegree { // Forward References: // -extern "C" extern char const* const d_d_cam_param__stringBase0; - extern "C" void rationalBezierRatio__8dCamMathFff(); extern "C" void zoomFovy__8dCamMathFff(); extern "C" void __dt__7cDegreeFv(); @@ -99,7 +97,6 @@ void mDoMtx_YrotS(f32 (*)[4], s16); void dCam_getBody(); void cM_atan2f(f32, f32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoMtx_XrotS__FPA4_fs(); extern "C" void mDoMtx_YrotS__FPA4_fs(); @@ -121,37 +118,23 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; /* ############################################################################################## */ /* 804527C8-804527D0 0004+04 s=2 e=0 z=0 None .sdata2 @3769 */ -SECTION_SDATA2 static u8 lit_3769[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3769[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 804527D0-804527D8 0008+00 s=1 e=0 z=0 None .sdata2 @3770 */ -SECTION_SDATA2 static u8 lit_3770[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3770 = 1.0; /* 804527D8-804527E0 0008+00 s=1 e=0 z=0 None .sdata2 @3771 */ -SECTION_SDATA2 static u8 lit_3771[8] = { - 0xBF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3771 = -1.0; /* 804527E0-804527E8 0008+00 s=1 e=0 z=0 None .sdata2 @3772 */ -SECTION_SDATA2 static u8 lit_3772[8] = { - 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3772 = 2.0; /* 804527E8-804527F0 0008+00 s=1 e=0 z=0 None .sdata2 @3773 */ -SECTION_SDATA2 static u8 lit_3773[8] = { - 0x40, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3773 = 4.0; /* 804527F0-804527F8 0008+00 s=1 e=0 z=0 None .sdata2 @3774 */ SECTION_SDATA2 static u8 lit_3774[8] = { @@ -159,19 +142,13 @@ SECTION_SDATA2 static u8 lit_3774[8] = { }; /* 804527F8-80452800 0008+00 s=1 e=0 z=0 None .sdata2 @3775 */ -SECTION_SDATA2 static u8 lit_3775[8] = { - 0x3E, 0x7A, 0xD7, 0xF2, 0x9A, 0xBC, 0xAF, 0x48, -}; +SECTION_SDATA2 static f64 lit_3775 = 1e-07; /* 80452800-80452808 0008+00 s=1 e=0 z=0 None .sdata2 @3776 */ -SECTION_SDATA2 static u8 lit_3776[8] = { - 0xBE, 0x7A, 0xD7, 0xF2, 0x9A, 0xBC, 0xAF, 0x48, -}; +SECTION_SDATA2 static f64 lit_3776 = -1e-07; /* 80452808-80452810 0008+00 s=1 e=0 z=0 None .sdata2 @3777 */ -SECTION_SDATA2 static u8 lit_3777[8] = { - 0x3E, 0x7A, 0xD7, 0xF2, 0xA0, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3777 = 1.0000000116860974e-07; /* 8008813C-80088284 0148+00 s=0 e=12 z=0 None .text rationalBezierRatio__8dCamMathFff */ #pragma push @@ -185,10 +162,10 @@ asm void dCamMath::rationalBezierRatio(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 80452810-80452814 0004+00 s=2 e=0 z=0 None .sdata2 @3791 */ -SECTION_SDATA2 static u32 lit_3791 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3791 = 1.0f; /* 80452814-80452818 0004+00 s=1 e=0 z=0 None .sdata2 @3807 */ -SECTION_SDATA2 static u32 lit_3807 = 0x42652EE0; +SECTION_SDATA2 static f32 lit_3807 = 57.2957763671875f; /* 80088284-800882E0 005C+00 s=0 e=1 z=0 None .text zoomFovy__8dCamMathFff */ #pragma push @@ -266,10 +243,10 @@ SECTION_DATA static void* __vt__9dCstick_c[3 + 1 /* padding */] = { }; /* 80452818-8045281C 0004+00 s=3 e=0 z=0 None .sdata2 @3991 */ -SECTION_SDATA2 static u32 lit_3991 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_3991 = 1.0f / 5.0f; /* 8045281C-80452820 0004+00 s=1 e=0 z=0 None .sdata2 @3992 */ -SECTION_SDATA2 static u32 lit_3992 = 0x3F733333; +SECTION_SDATA2 static f32 lit_3992 = 19.0f / 20.0f; /* 80088434-8008845C 0028+00 s=1 e=0 z=0 None .text __ct__9dCstick_cFv */ #pragma push @@ -288,46 +265,46 @@ bool dCstick_c::Shift(u32 param_0) { /* ############################################################################################## */ /* 80452820-80452824 0004+00 s=1 e=0 z=0 None .sdata2 @4001 */ -SECTION_SDATA2 static u32 lit_4001 = 0x42000000; +SECTION_SDATA2 static f32 lit_4001 = 32.0f; /* 80452824-80452828 0004+00 s=2 e=0 z=0 None .sdata2 @4002 */ -SECTION_SDATA2 static u32 lit_4002 = 0x41C80000; +SECTION_SDATA2 static f32 lit_4002 = 25.0f; /* 80452828-8045282C 0004+00 s=2 e=0 z=0 None .sdata2 @4003 */ -SECTION_SDATA2 static u32 lit_4003 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_4003 = 2.0f / 5.0f; /* 8045282C-80452830 0004+00 s=1 e=0 z=0 None .sdata2 @4004 */ -SECTION_SDATA2 static u32 lit_4004 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4004 = 3.0f / 5.0f; /* 80452830-80452834 0004+00 s=1 e=0 z=0 None .sdata2 @4005 */ -SECTION_SDATA2 static u32 lit_4005 = 0x40400000; +SECTION_SDATA2 static f32 lit_4005 = 3.0f; /* 80452834-80452838 0004+00 s=2 e=0 z=0 None .sdata2 @4006 */ -SECTION_SDATA2 static u32 lit_4006 = 0x41700000; +SECTION_SDATA2 static f32 lit_4006 = 15.0f; /* 80452838-8045283C 0004+00 s=2 e=0 z=0 None .sdata2 @4007 */ -SECTION_SDATA2 static u32 lit_4007 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4007 = 0.5f; /* 8045283C-80452840 0004+00 s=2 e=0 z=0 None .sdata2 @4008 */ -SECTION_SDATA2 static u32 lit_4008 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_4008 = 3.0f / 10.0f; /* 80452840-80452844 0004+00 s=2 e=0 z=0 None .sdata2 @4009 */ -SECTION_SDATA2 static u32 lit_4009 = 0x41200000; +SECTION_SDATA2 static f32 lit_4009 = 10.0f; /* 80452844-80452848 0004+00 s=2 e=0 z=0 None .sdata2 @4010 */ -SECTION_SDATA2 static u32 lit_4010 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4010 = 1.0f / 10.0f; /* 80452848-8045284C 0004+00 s=2 e=0 z=0 None .sdata2 @4011 */ -SECTION_SDATA2 static u32 lit_4011 = 0x3F400000; +SECTION_SDATA2 static f32 lit_4011 = 0.75f; /* 8045284C-80452850 0004+00 s=2 e=0 z=0 None .sdata2 @4012 */ -SECTION_SDATA2 static u32 lit_4012 = 0x42A00000; +SECTION_SDATA2 static f32 lit_4012 = 80.0f; /* 80452850-80452854 0004+00 s=1 e=0 z=0 None .sdata2 @4013 */ -SECTION_SDATA2 static u32 lit_4013 = 0x3DA3D70A; +SECTION_SDATA2 static f32 lit_4013 = 2.0f / 25.0f; /* 80452854-80452858 0004+00 s=2 e=0 z=0 None .sdata2 @4014 */ -SECTION_SDATA2 static u32 lit_4014 = 0x42F00000; +SECTION_SDATA2 static f32 lit_4014 = 120.0f; /* 80088464-800884F0 008C+00 s=1 e=0 z=0 None .text __ct__11dCamBGChk_cFv */ #pragma push @@ -391,73 +368,73 @@ asm void dCamParam_c::SearchStyle(u32 param_0) { /* ############################################################################################## */ /* 80452858-8045285C 0004+00 s=1 e=0 z=0 None .sdata2 @4058 */ -SECTION_SDATA2 static u32 lit_4058 = 0x3E800000; +SECTION_SDATA2 static f32 lit_4058 = 0.25f; /* 8045285C-80452860 0004+00 s=1 e=0 z=0 None .sdata2 @4119 */ -SECTION_SDATA2 static u32 lit_4119 = 0x47C35000; +SECTION_SDATA2 static f32 lit_4119 = 100000.0f; /* 80452860-80452864 0004+00 s=1 e=0 z=0 None .sdata2 @4120 */ -SECTION_SDATA2 static u32 lit_4120 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4120 = 1.0f / 20.0f; /* 80452864-80452868 0004+00 s=1 e=0 z=0 None .sdata2 @4121 */ -SECTION_SDATA2 static u32 lit_4121 = 0xC2700000; +SECTION_SDATA2 static f32 lit_4121 = -60.0f; /* 80452868-8045286C 0004+00 s=1 e=0 z=0 None .sdata2 @4122 */ -SECTION_SDATA2 static u32 lit_4122 = 0x3EA8F5C3; +SECTION_SDATA2 static f32 lit_4122 = 33.0f / 100.0f; /* 8045286C-80452870 0004+00 s=1 e=0 z=0 None .sdata2 @4123 */ -SECTION_SDATA2 static u32 lit_4123 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_4123 = 1.0f / 50.0f; /* 80452870-80452874 0004+00 s=1 e=0 z=0 None .sdata2 @4124 */ -SECTION_SDATA2 static u32 lit_4124 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4124 = 100.0f; /* 80452874-80452878 0004+00 s=1 e=0 z=0 None .sdata2 @4125 */ -SECTION_SDATA2 static u32 lit_4125 = 0x3E8F5C29; +SECTION_SDATA2 static f32 lit_4125 = 7.0f / 25.0f; /* 80452878-8045287C 0004+00 s=1 e=0 z=0 None .sdata2 @4126 */ -SECTION_SDATA2 static u32 lit_4126 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_4126 = 3.0f / 20.0f; /* 8045287C-80452880 0004+00 s=1 e=0 z=0 None .sdata2 @4127 */ -SECTION_SDATA2 static u32 lit_4127 = 0x3BA3D70A; +SECTION_SDATA2 static f32 lit_4127 = 0.004999999888241291f; /* 80452880-80452884 0004+00 s=1 e=0 z=0 None .sdata2 @4128 */ -SECTION_SDATA2 static u32 lit_4128 = 0x3D75C28F; +SECTION_SDATA2 static f32 lit_4128 = 3.0f / 50.0f; /* 80452884-80452888 0004+00 s=1 e=0 z=0 None .sdata2 @4129 */ -SECTION_SDATA2 static u32 lit_4129 = 0x428C0000; +SECTION_SDATA2 static f32 lit_4129 = 70.0f; /* 80452888-8045288C 0004+00 s=1 e=0 z=0 None .sdata2 @4130 */ -SECTION_SDATA2 static u32 lit_4130 = 0x42700000; +SECTION_SDATA2 static f32 lit_4130 = 60.0f; /* 8045288C-80452890 0004+00 s=1 e=0 z=0 None .sdata2 @4131 */ -SECTION_SDATA2 static u32 lit_4131 = 0x420C0000; +SECTION_SDATA2 static f32 lit_4131 = 35.0f; /* 80452890-80452894 0004+00 s=1 e=0 z=0 None .sdata2 @4132 */ -SECTION_SDATA2 static u32 lit_4132 = 0x42820000; +SECTION_SDATA2 static f32 lit_4132 = 65.0f; /* 80452894-80452898 0004+00 s=1 e=0 z=0 None .sdata2 @4133 */ -SECTION_SDATA2 static u32 lit_4133 = 0x41F00000; +SECTION_SDATA2 static f32 lit_4133 = 30.0f; /* 80452898-8045289C 0004+00 s=1 e=0 z=0 None .sdata2 @4134 */ -SECTION_SDATA2 static u32 lit_4134 = 0x41D80000; +SECTION_SDATA2 static f32 lit_4134 = 27.0f; /* 8045289C-804528A0 0004+00 s=1 e=0 z=0 None .sdata2 @4135 */ -SECTION_SDATA2 static u32 lit_4135 = 0x42340000; +SECTION_SDATA2 static f32 lit_4135 = 45.0f; /* 804528A0-804528A4 0004+00 s=1 e=0 z=0 None .sdata2 @4136 */ -SECTION_SDATA2 static u32 lit_4136 = 0x455AC000; +SECTION_SDATA2 static f32 lit_4136 = 3500.0f; /* 804528A4-804528A8 0004+00 s=1 e=0 z=0 None .sdata2 @4137 */ -SECTION_SDATA2 static u32 lit_4137 = 0x40800000; +SECTION_SDATA2 static f32 lit_4137 = 4.0f; /* 804528A8-804528AC 0004+00 s=1 e=0 z=0 None .sdata2 @4138 */ -SECTION_SDATA2 static u32 lit_4138 = 0x44960000; +SECTION_SDATA2 static f32 lit_4138 = 1200.0f; /* 804528AC-804528B0 0004+00 s=1 e=0 z=0 None .sdata2 @4139 */ -SECTION_SDATA2 static u32 lit_4139 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_4139 = 17.0f / 20.0f; /* 804528B0-804528B4 0004+00 s=1 e=0 z=0 None .sdata2 @4140 */ -SECTION_SDATA2 static u32 lit_4140 = 0x42480000; +SECTION_SDATA2 static f32 lit_4140 = 50.0f; /* 80088668-800888B8 0250+00 s=0 e=1 z=0 None .text __ct__11dCamSetup_cFv */ #pragma push @@ -481,7 +458,7 @@ asm dCamSetup_c::~dCamSetup_c() { /* ############################################################################################## */ /* 804528B4-804528B8 0004+00 s=1 e=0 z=0 None .sdata2 @4173 */ -SECTION_SDATA2 static u32 lit_4173 = 0x43360B61; +SECTION_SDATA2 static f32 lit_4173 = 182.04444885253906f; /* 80088918-80088988 0070+00 s=0 e=1 z=0 None .text CheckLatitudeRange__11dCamSetup_cFPs */ #pragma push diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index e3993cd195b..e7a2a7c9b52 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -187,8 +187,16 @@ struct dCcMassS_Mng { /* 80085EB8 */ void GetCamTopPos(Vec*); }; +struct dBgS_LinChk { + /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); +}; + struct camera_class {}; +struct dCamMapToolData { + /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8); +}; + struct cSAngle { /* 80030510 */ ~cSAngle(); /* 80271004 */ void Val(s16); @@ -221,14 +229,6 @@ struct cSAngle { /* 802712B4 */ void operator*=(f32); }; -struct dBgS_LinChk { - /* 80077D64 */ void Set(cXyz const*, cXyz const*, fopAc_ac_c const*); -}; - -struct dCamMapToolData { - /* 8015FEB8 */ void Set(s32, s32, fopAc_ac_c*, u16, u8); -}; - struct dCamera_c { struct dCamInfo_c { /* 8018291C */ dCamInfo_c(); @@ -648,10 +648,6 @@ static void dComIfG_Bgsp(); static void JMAFastSqrt(f32); static void dComIfGp_evmng_cameraPlay(); static void fopAcM_GetParam(void const*); -extern "C" extern char const* const d_d_camera__stringBase0; -extern "C" extern u8 engine_tbl__9dCamera_c[240]; -extern "C" extern void* g_profile_CAMERA[17]; -extern "C" extern void* g_profile_CAMERA2[17 + 6 /* padding */]; extern "C" static void func_8015FA2C(); extern "C" static void func_8015FA4C(); @@ -937,36 +933,6 @@ void cM3d_2PlaneLinePosNearPos(cM3dGPla const&, cM3dGPla const&, Vec const*, Vec void operator+(s16, cSAngle const&); void operator-(s16, cSAngle const&); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* g_fopCam_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopVw_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__8cM3dGLin[3]; -extern "C" extern void* __vt__8cM3dGSph[3]; -extern "C" extern void* __vt__18dDlst_effectLine_c[3]; -extern "C" extern void* __vt__14dBgS_CamGndChk[12]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 stopStatus__10fopAc_ac_c[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_object__7dDemo_c[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 _0__7cSAngle[2 + 2 /* padding */]; -extern "C" extern u8 _90__7cSAngle[2 + 2 /* padding */]; -extern "C" extern u8 _180__7cSAngle[2 + 2 /* padding */]; -extern "C" extern u8 _270__7cSAngle[2 + 6 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void onBlure__13mDoGph_gInf_cFv(); extern "C" void onBlure__13mDoGph_gInf_cFPA4_Cf(); @@ -1338,9 +1304,7 @@ SECTION_SDATA2 static f32 lit_4445[1 + 1 /* padding */] = { }; /* 80453698-804536A0 0008+00 s=20 e=0 z=0 None .sdata2 @4448 */ -SECTION_SDATA2 static u8 lit_4448[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4448 = 4503601774854144.0 /* cast s32 to float */; /* 8015FBF8-8015FEB8 02C0+00 s=1 e=0 z=0 None .text * relationalPos2__22@unnamed@d_camera_cpp@FP10fopAc_ac_cP10fopAc_ac_cP4cXyzf7cSAngle */ @@ -2211,25 +2175,25 @@ SECTION_SDATA2 static u8 lit_5656[4] = { }; /* 804536A4-804536A8 0004+00 s=1 e=0 z=0 None .sdata2 @5657 */ -SECTION_SDATA2 static u32 lit_5657 = 0x46FFFE00; +SECTION_SDATA2 static f32 lit_5657 = 32767.0f; /* 804536A8-804536AC 0004+00 s=26 e=0 z=0 None .sdata2 @5658 */ -SECTION_SDATA2 static u32 lit_5658 = 0x3F800000; +SECTION_SDATA2 static f32 lit_5658 = 1.0f; /* 804536AC-804536B0 0004+00 s=6 e=0 z=0 None .sdata2 @5659 */ -SECTION_SDATA2 static u32 lit_5659 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_5659 = -1000000000.0f; /* 804536B0-804536B4 0004+00 s=4 e=0 z=0 None .sdata2 @5660 */ -SECTION_SDATA2 static u32 lit_5660 = 0xC1A00000; +SECTION_SDATA2 static f32 lit_5660 = -20.0f; /* 804536B4-804536B8 0004+00 s=6 e=0 z=0 None .sdata2 @5661 */ -SECTION_SDATA2 static u32 lit_5661 = 0x43960000; +SECTION_SDATA2 static f32 lit_5661 = 300.0f; /* 804536B8-804536BC 0004+00 s=9 e=0 z=0 None .sdata2 @5662 */ -SECTION_SDATA2 static u32 lit_5662 = 0x42700000; +SECTION_SDATA2 static f32 lit_5662 = 60.0f; /* 804536BC-804536C0 0004+00 s=2 e=0 z=0 None .sdata2 @5663 */ -SECTION_SDATA2 static u32 lit_5663 = 0x42AA0000; +SECTION_SDATA2 static f32 lit_5663 = 85.0f; /* 80160470-801614AC 103C+00 s=1 e=0 z=0 None .text * initialize__9dCamera_cFP12camera_classP10fopAc_ac_cUlUl */ @@ -2333,14 +2297,10 @@ asm void dCamera_c::initMonitor() { /* ############################################################################################## */ /* 804536C8-804536D0 0008+00 s=7 e=0 z=0 None .sdata2 @6177 */ -SECTION_SDATA2 static u8 lit_6177[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6177 = 0.5; /* 804536D0-804536D8 0008+00 s=7 e=0 z=0 None .sdata2 @6178 */ -SECTION_SDATA2 static u8 lit_6178[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6178 = 3.0; /* 804536D8-804536E0 0008+00 s=7 e=0 z=0 None .sdata2 @6179 */ SECTION_SDATA2 static u8 lit_6179[8] = { @@ -2348,7 +2308,7 @@ SECTION_SDATA2 static u8 lit_6179[8] = { }; /* 804536E0-804536E4 0004+00 s=8 e=0 z=0 None .sdata2 @6180 */ -SECTION_SDATA2 static u32 lit_6180 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_6180 = 1.0f / 100.0f; /* 80161E34-80162088 0254+00 s=1 e=0 z=0 None .text updateMonitor__9dCamera_cFv */ #pragma push @@ -2377,10 +2337,10 @@ void dCamera_c::infoReport() { /* ############################################################################################## */ /* 804536E4-804536E8 0004+00 s=12 e=0 z=0 None .sdata2 @6629 */ -SECTION_SDATA2 static u32 lit_6629 = 0x41200000; +SECTION_SDATA2 static f32 lit_6629 = 10.0f; /* 804536E8-804536EC 0004+00 s=9 e=0 z=0 None .sdata2 @6630 */ -SECTION_SDATA2 static u32 lit_6630 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_6630 = 1.0f / 20.0f; /* 801622B4-80162D38 0A84+00 s=1 e=0 z=0 None .text Run__9dCamera_cFv */ #pragma push @@ -2444,7 +2404,7 @@ asm void dCamera_c::SetTrimTypeForce(s32 param_0) { /* ############################################################################################## */ /* 804536EC-804536F0 0004+00 s=5 e=0 z=0 None .sdata2 @6766 */ -SECTION_SDATA2 static u32 lit_6766 = 0x3E800000; +SECTION_SDATA2 static f32 lit_6766 = 0.25f; /* 80163034-80163154 0120+00 s=1 e=0 z=0 None .text CalcTrimSize__9dCamera_cFv */ #pragma push @@ -2645,7 +2605,7 @@ asm void dCamera_c::popInfo(dCamera_c::dCamInfo_c* param_0) { /* ############################################################################################## */ /* 804536F0-804536F4 0004+00 s=2 e=0 z=0 None .sdata2 @7609 */ -SECTION_SDATA2 static u32 lit_7609 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_7609 = 11.0f / 10.0f; /* 80164D2C-80164D6C 0040+00 s=4 e=0 z=0 None .text heightOf__9dCamera_cFP10fopAc_ac_c */ #pragma push @@ -2712,31 +2672,31 @@ asm void dCamera_c::pointInSight(cXyz* param_0) { /* ############################################################################################## */ /* 804536F4-804536F8 0004+00 s=1 e=0 z=0 None .sdata2 @8015 */ -SECTION_SDATA2 static u32 lit_8015 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_8015 = 0.01745329238474369f; /* 804536F8-804536FC 0004+00 s=9 e=0 z=0 None .sdata2 @8016 */ -SECTION_SDATA2 static u32 lit_8016 = 0x40000000; +SECTION_SDATA2 static f32 lit_8016 = 2.0f; /* 804536FC-80453700 0004+00 s=3 e=0 z=0 None .sdata2 @8017 */ -SECTION_SDATA2 static u32 lit_8017 = 0x43E00000; +SECTION_SDATA2 static f32 lit_8017 = 448.0f; /* 80453700-80453704 0004+00 s=3 e=0 z=0 None .sdata2 @8018 */ -SECTION_SDATA2 static u32 lit_8018 = 0x3F733333; +SECTION_SDATA2 static f32 lit_8018 = 19.0f / 20.0f; /* 80453704-80453708 0004+00 s=1 e=0 z=0 None .sdata2 @8019 */ -SECTION_SDATA2 static u32 lit_8019 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_8019 = 17.0f / 20.0f; /* 80453708-8045370C 0004+00 s=3 e=0 z=0 None .sdata2 @8020 */ -SECTION_SDATA2 static u32 lit_8020 = 0x44180000; +SECTION_SDATA2 static f32 lit_8020 = 608.0f; /* 8045370C-80453710 0004+00 s=11 e=0 z=0 None .sdata2 @8021 */ -SECTION_SDATA2 static u32 lit_8021 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_8021 = 1.0f / 10.0f; /* 80453710-80453714 0004+00 s=6 e=0 z=0 None .sdata2 @8022 */ -SECTION_SDATA2 static u32 lit_8022 = 0x43480000; +SECTION_SDATA2 static f32 lit_8022 = 200.0f; /* 80453714-80453718 0004+00 s=5 e=0 z=0 None .sdata2 @8023 */ -SECTION_SDATA2 static u32 lit_8023 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_8023 = 1.0f / 5.0f; /* 80165238-801657EC 05B4+00 s=3 e=0 z=0 None .text * radiusActorInSight__9dCamera_cFP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyzfsf */ @@ -2794,7 +2754,7 @@ asm void dCamera_c::lineBGCheck(cXyz* param_0, cXyz* param_1, u32 param_2) { /* ############################################################################################## */ /* 80453718-8045371C 0004+00 s=7 e=0 z=0 None .sdata2 @8127 */ -SECTION_SDATA2 static u32 lit_8127 = 0x41F00000; +SECTION_SDATA2 static f32 lit_8127 = 30.0f; /* 80165B60-80165C08 00A8+00 s=1 e=0 z=0 None .text * lineCollisionCheckBush__9dCamera_cFP4cXyzP4cXyz */ @@ -2809,7 +2769,7 @@ asm void dCamera_c::lineCollisionCheckBush(cXyz* param_0, cXyz* param_1) { /* ############################################################################################## */ /* 8045371C-80453720 0004+00 s=1 e=0 z=0 None .sdata2 @8163 */ -SECTION_SDATA2 static u32 lit_8163 = 0xB8D1B717; +SECTION_SDATA2 static f32 lit_8163 = -9.999999747378752e-05f; /* 80165C08-80165CE0 00D8+00 s=1 e=0 z=0 None .text * sph_chk_callback__FP11dBgS_SphChkP10cBgD_Vtx_tiiiP8cM3dGPlaPv */ @@ -2866,10 +2826,10 @@ asm void dCamera_c::setView(f32 param_0, f32 param_1, f32 param_2, f32 param_3) /* ############################################################################################## */ /* 80453720-80453724 0004+00 s=3 e=0 z=0 None .sdata2 @8529 */ -SECTION_SDATA2 static u32 lit_8529 = 0x43360B61; +SECTION_SDATA2 static f32 lit_8529 = 182.04444885253906f; /* 80453724-80453728 0004+00 s=12 e=0 z=0 None .sdata2 @8530 */ -SECTION_SDATA2 static u32 lit_8530 = 0x3F400000; +SECTION_SDATA2 static f32 lit_8530 = 0.75f; /* 8016608C-80166764 06D8+00 s=1 e=0 z=0 None .text forwardCheckAngle__9dCamera_cFv */ #pragma push @@ -2895,51 +2855,49 @@ static u8 prev_plat2[4]; static u8 data_80451030[4]; /* 80453728-8045372C 0004+00 s=4 e=0 z=0 None .sdata2 @9395 */ -SECTION_SDATA2 static u32 lit_9395 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_9395 = 3.0f / 10.0f; /* 8045372C-80453730 0004+00 s=2 e=0 z=0 None .sdata2 @9396 */ -SECTION_SDATA2 static u32 lit_9396 = 0x38D1B717; +SECTION_SDATA2 static f32 lit_9396 = 9.999999747378752e-05f; /* 80453730-80453734 0004+00 s=3 e=0 z=0 None .sdata2 @9397 */ -SECTION_SDATA2 static u32 lit_9397 = 0x3F333333; +SECTION_SDATA2 static f32 lit_9397 = 7.0f / 10.0f; /* 80453734-80453738 0004+00 s=10 e=0 z=0 None .sdata2 @9398 */ -SECTION_SDATA2 static u32 lit_9398 = 0x42200000; +SECTION_SDATA2 static f32 lit_9398 = 40.0f; /* 80453738-8045373C 0004+00 s=6 e=0 z=0 None .sdata2 @9399 */ -SECTION_SDATA2 static u32 lit_9399 = 0x42C80000; +SECTION_SDATA2 static f32 lit_9399 = 100.0f; /* 8045373C-80453740 0004+00 s=2 e=0 z=0 None .sdata2 @9400 */ -SECTION_SDATA2 static u32 lit_9400 = 0x3EA8F5C3; +SECTION_SDATA2 static f32 lit_9400 = 33.0f / 100.0f; /* 80453740-80453744 0004+00 s=2 e=0 z=0 None .sdata2 @9401 */ -SECTION_SDATA2 static u32 lit_9401 = 0x3DA3D70A; +SECTION_SDATA2 static f32 lit_9401 = 2.0f / 25.0f; /* 80453744-80453748 0004+00 s=1 e=0 z=0 None .sdata2 @9402 */ -SECTION_SDATA2 static u32 lit_9402 = 0xBF000000; +SECTION_SDATA2 static f32 lit_9402 = -0.5f; /* 80453748-8045374C 0004+00 s=1 e=0 z=0 None .sdata2 @9403 */ -SECTION_SDATA2 static u32 lit_9403 = 0x40C00000; +SECTION_SDATA2 static f32 lit_9403 = 6.0f; /* 8045374C-80453750 0004+00 s=2 e=0 z=0 None .sdata2 @9404 */ -SECTION_SDATA2 static u32 lit_9404 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_9404 = 1.5f; /* 80453750-80453754 0004+00 s=9 e=0 z=0 None .sdata2 @9405 */ -SECTION_SDATA2 static u32 lit_9405 = 0x40A00000; +SECTION_SDATA2 static f32 lit_9405 = 5.0f; /* 80453754-80453758 0004+00 s=6 e=0 z=0 None .sdata2 @9406 */ -SECTION_SDATA2 static u32 lit_9406 = 0x42A00000; +SECTION_SDATA2 static f32 lit_9406 = 80.0f; /* 80453758-8045375C 0004+00 s=2 e=0 z=0 None .sdata2 @9407 */ -SECTION_SDATA2 static u32 lit_9407 = 0x40400000; +SECTION_SDATA2 static f32 lit_9407 = 3.0f; /* 8045375C-80453760 0004+00 s=1 e=0 z=0 None .sdata2 @9408 */ -SECTION_SDATA2 static u32 lit_9408 = 0xC0400000; +SECTION_SDATA2 static f32 lit_9408 = -3.0f; /* 80453760-80453768 0008+00 s=6 e=0 z=0 None .sdata2 @9410 */ -SECTION_SDATA2 static u8 lit_9410[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_9410 = 4503599627370496.0 /* cast u32 to float */; /* 80166764-80167BBC 1458+00 s=1 e=0 z=0 None .text bumpCheck__9dCamera_cFUl */ #pragma push @@ -3029,7 +2987,7 @@ asm void dCamera_c::getWaterSurfaceHeight(cXyz* param_0) { /* ############################################################################################## */ /* 80453768-8045376C 0004+00 s=8 e=0 z=0 None .sdata2 @9788 */ -SECTION_SDATA2 static u32 lit_9788 = 0x41A00000; +SECTION_SDATA2 static f32 lit_9788 = 20.0f; /* 80167FEC-80168744 0758+00 s=3 e=0 z=0 None .text checkGroundInfo__9dCamera_cFv */ #pragma push @@ -3055,103 +3013,103 @@ static u8 struct_80451038[4]; static u8 struct_8045103C[4]; /* 8045376C-80453770 0004+00 s=3 e=0 z=0 None .sdata2 @10550 */ -SECTION_SDATA2 static u32 lit_10550 = 0x3F666666; +SECTION_SDATA2 static f32 lit_10550 = 9.0f / 10.0f; /* 80453770-80453774 0004+00 s=2 e=0 z=0 None .sdata2 @10551 */ -SECTION_SDATA2 static u32 lit_10551 = 0xC2960000; +SECTION_SDATA2 static f32 lit_10551 = -75.0f; /* 80453774-80453778 0004+00 s=2 e=0 z=0 None .sdata2 @10552 */ -SECTION_SDATA2 static u32 lit_10552 = 0x42960000; +SECTION_SDATA2 static f32 lit_10552 = 75.0f; /* 80453778-8045377C 0004+00 s=1 e=0 z=0 None .sdata2 @10553 */ -SECTION_SDATA2 static u32 lit_10553 = 0x41B00000; +SECTION_SDATA2 static f32 lit_10553 = 22.0f; /* 8045377C-80453780 0004+00 s=2 e=0 z=0 None .sdata2 @10554 */ -SECTION_SDATA2 static u32 lit_10554 = 0x44098000; +SECTION_SDATA2 static f32 lit_10554 = 550.0f; /* 80453780-80453784 0004+00 s=2 e=0 z=0 None .sdata2 @10555 */ -SECTION_SDATA2 static u32 lit_10555 = 0xC28C0000; +SECTION_SDATA2 static f32 lit_10555 = -70.0f; /* 80453784-80453788 0004+00 s=3 e=0 z=0 None .sdata2 @10556 */ -SECTION_SDATA2 static u32 lit_10556 = 0x42B40000; +SECTION_SDATA2 static f32 lit_10556 = 90.0f; /* 80453788-8045378C 0004+00 s=6 e=0 z=0 None .sdata2 @10557 */ -SECTION_SDATA2 static u32 lit_10557 = 0x42480000; +SECTION_SDATA2 static f32 lit_10557 = 50.0f; /* 8045378C-80453790 0004+00 s=3 e=0 z=0 None .sdata2 @10558 */ -SECTION_SDATA2 static u32 lit_10558 = 0xC1F00000; +SECTION_SDATA2 static f32 lit_10558 = -30.0f; /* 80453790-80453794 0004+00 s=4 e=0 z=0 None .sdata2 @10559 */ -SECTION_SDATA2 static u32 lit_10559 = 0xC2A00000; +SECTION_SDATA2 static f32 lit_10559 = -80.0f; /* 80453794-80453798 0004+00 s=3 e=0 z=0 None .sdata2 @10560 */ -SECTION_SDATA2 static u32 lit_10560 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_10560 = 3.0f / 20.0f; /* 80453798-8045379C 0004+00 s=3 e=0 z=0 None .sdata2 @10561 */ -SECTION_SDATA2 static u32 lit_10561 = 0xC2700000; +SECTION_SDATA2 static f32 lit_10561 = -60.0f; /* 8045379C-804537A0 0004+00 s=2 e=0 z=0 None .sdata2 @10562 */ -SECTION_SDATA2 static u32 lit_10562 = 0xBE4CCCCD; +SECTION_SDATA2 static f32 lit_10562 = -1.0f / 5.0f; /* 804537A0-804537A4 0004+00 s=2 e=0 z=0 None .sdata2 @10563 */ -SECTION_SDATA2 static u32 lit_10563 = 0x3D23D70A; +SECTION_SDATA2 static f32 lit_10563 = 1.0f / 25.0f; /* 804537A4-804537A8 0004+00 s=3 e=0 z=0 None .sdata2 @10564 */ -SECTION_SDATA2 static u32 lit_10564 = 0xC2340000; +SECTION_SDATA2 static f32 lit_10564 = -45.0f; /* 804537A8-804537AC 0004+00 s=3 e=0 z=0 None .sdata2 @10565 */ -SECTION_SDATA2 static u32 lit_10565 = 0x42340000; +SECTION_SDATA2 static f32 lit_10565 = 45.0f; /* 804537AC-804537B0 0004+00 s=2 e=0 z=0 None .sdata2 @10566 */ -SECTION_SDATA2 static u32 lit_10566 = 0x3D75C28F; +SECTION_SDATA2 static f32 lit_10566 = 3.0f / 50.0f; /* 804537B0-804537B4 0004+00 s=2 e=0 z=0 None .sdata2 @10567 */ -SECTION_SDATA2 static u32 lit_10567 = 0x47C35000; +SECTION_SDATA2 static f32 lit_10567 = 100000.0f; /* 804537B4-804537B8 0004+00 s=1 e=0 z=0 None .sdata2 @10568 */ -SECTION_SDATA2 static u32 lit_10568 = 0x40200000; +SECTION_SDATA2 static f32 lit_10568 = 2.5f; /* 804537B8-804537BC 0004+00 s=5 e=0 z=0 None .sdata2 @10569 */ -SECTION_SDATA2 static u32 lit_10569 = 0x41000000; +SECTION_SDATA2 static f32 lit_10569 = 8.0f; /* 804537BC-804537C0 0004+00 s=2 e=0 z=0 None .sdata2 @10570 */ -SECTION_SDATA2 static u32 lit_10570 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_10570 = 6.0f / 5.0f; /* 804537C0-804537C4 0004+00 s=1 e=0 z=0 None .sdata2 @10571 */ -SECTION_SDATA2 static u32 lit_10571 = 0x3BCCCCCD; +SECTION_SDATA2 static f32 lit_10571 = 0.0062500000931322575f; /* 804537C4-804537C8 0004+00 s=1 e=0 z=0 None .sdata2 @10572 */ -SECTION_SDATA2 static u32 lit_10572 = 0x400CCCCD; +SECTION_SDATA2 static f32 lit_10572 = 11.0f / 5.0f; /* 804537C8-804537CC 0004+00 s=1 e=0 z=0 None .sdata2 @10573 */ -SECTION_SDATA2 static u32 lit_10573 = 0xBDCCCCCD; +SECTION_SDATA2 static f32 lit_10573 = -1.0f / 10.0f; /* 804537CC-804537D0 0004+00 s=6 e=0 z=0 None .sdata2 @10574 */ -SECTION_SDATA2 static u32 lit_10574 = 0x41700000; +SECTION_SDATA2 static f32 lit_10574 = 15.0f; /* 804537D0-804537D4 0004+00 s=3 e=0 z=0 None .sdata2 @10575 */ -SECTION_SDATA2 static u32 lit_10575 = 0x3FA00000; +SECTION_SDATA2 static f32 lit_10575 = 1.25f; /* 804537D4-804537D8 0004+00 s=1 e=0 z=0 None .sdata2 @10576 */ -SECTION_SDATA2 static u32 lit_10576 = 0x3EB33333; +SECTION_SDATA2 static f32 lit_10576 = 7.0f / 20.0f; /* 804537D8-804537DC 0004+00 s=3 e=0 z=0 None .sdata2 @10577 */ -SECTION_SDATA2 static u32 lit_10577 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_10577 = 2.0f / 5.0f; /* 804537DC-804537E0 0004+00 s=1 e=0 z=0 None .sdata2 @10578 */ -SECTION_SDATA2 static u32 lit_10578 = 0x43FA0000; +SECTION_SDATA2 static f32 lit_10578 = 500.0f; /* 804537E0-804537E4 0004+00 s=1 e=0 z=0 None .sdata2 @10579 */ -SECTION_SDATA2 static u32 lit_10579 = 0x3F0CCCCD; +SECTION_SDATA2 static f32 lit_10579 = 11.0f / 20.0f; /* 804537E4-804537E8 0004+00 s=1 e=0 z=0 None .sdata2 @10580 */ -SECTION_SDATA2 static u32 lit_10580 = 0x41600000; +SECTION_SDATA2 static f32 lit_10580 = 14.0f; /* 804537E8-804537EC 0004+00 s=5 e=0 z=0 None .sdata2 @10581 */ -SECTION_SDATA2 static u32 lit_10581 = 0x43340000; +SECTION_SDATA2 static f32 lit_10581 = 180.0f; /* 804537EC-804537F0 0004+00 s=4 e=0 z=0 None .sdata2 @10582 */ -SECTION_SDATA2 static u32 lit_10582 = 0xC2480000; +SECTION_SDATA2 static f32 lit_10582 = -50.0f; /* 80168744-8016C25C 3B18+00 s=3 e=0 z=0 None .text chaseCamera__9dCamera_cFl */ #pragma push @@ -3240,31 +3198,31 @@ extern "C" asm static void func_8016C368() { /* ############################################################################################## */ /* 804537F0-804537F4 0004+00 s=4 e=0 z=0 None .sdata2 @11167 */ -SECTION_SDATA2 static u32 lit_11167 = 0xC1200000; +SECTION_SDATA2 static f32 lit_11167 = -10.0f; /* 804537F4-804537F8 0004+00 s=3 e=0 z=0 None .sdata2 @11168 */ -SECTION_SDATA2 static u32 lit_11168 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_11168 = 4.0f / 5.0f; /* 804537F8-804537FC 0004+00 s=1 e=0 z=0 None .sdata2 @11169 */ -SECTION_SDATA2 static u32 lit_11169 = 0x437A0000; +SECTION_SDATA2 static f32 lit_11169 = 250.0f; /* 804537FC-80453800 0004+00 s=1 e=0 z=0 None .sdata2 @11170 */ -SECTION_SDATA2 static u32 lit_11170 = 0xC2B40000; +SECTION_SDATA2 static f32 lit_11170 = -90.0f; /* 80453800-80453804 0004+00 s=3 e=0 z=0 None .sdata2 @11171 */ -SECTION_SDATA2 static u32 lit_11171 = 0x41C80000; +SECTION_SDATA2 static f32 lit_11171 = 25.0f; /* 80453804-80453808 0004+00 s=1 e=0 z=0 None .sdata2 @11172 */ -SECTION_SDATA2 static u32 lit_11172 = 0x40F00000; +SECTION_SDATA2 static f32 lit_11172 = 7.5f; /* 80453808-8045380C 0004+00 s=3 e=0 z=0 None .sdata2 @11173 */ -SECTION_SDATA2 static u32 lit_11173 = 0xC1700000; +SECTION_SDATA2 static f32 lit_11173 = -15.0f; /* 8045380C-80453810 0004+00 s=2 e=0 z=0 None .sdata2 @11174 */ -SECTION_SDATA2 static u32 lit_11174 = 0x438C0000; +SECTION_SDATA2 static f32 lit_11174 = 280.0f; /* 80453810-80453814 0004+00 s=1 e=0 z=0 None .sdata2 @11175 */ -SECTION_SDATA2 static u32 lit_11175 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_11175 = 1.0f / 50.0f; /* 8016C384-8016E410 208C+00 s=1 e=0 z=0 None .text lockonCamera__9dCamera_cFl */ #pragma push @@ -3323,94 +3281,94 @@ asm void dCamera_c::getMsgCmdCut(s32 param_0) { /* ############################################################################################## */ /* 80453814-80453818 0004+00 s=1 e=0 z=0 None .sdata2 @12268 */ -SECTION_SDATA2 static u32 lit_12268 = 0x4479F99A; +SECTION_SDATA2 static f32 lit_12268 = 999.9000244140625f; /* 80453818-8045381C 0004+00 s=1 e=0 z=0 None .sdata2 @12269 */ -SECTION_SDATA2 static u32 lit_12269 = 0x43820000; +SECTION_SDATA2 static f32 lit_12269 = 260.0f; /* 8045381C-80453820 0004+00 s=1 e=0 z=0 None .sdata2 @12270 */ -SECTION_SDATA2 static u32 lit_12270 = 0x43520000; +SECTION_SDATA2 static f32 lit_12270 = 210.0f; /* 80453820-80453824 0004+00 s=1 e=0 z=0 None .sdata2 @12271 */ -SECTION_SDATA2 static u32 lit_12271 = 0x42400000; +SECTION_SDATA2 static f32 lit_12271 = 48.0f; /* 80453824-80453828 0004+00 s=1 e=0 z=0 None .sdata2 @12272 */ -SECTION_SDATA2 static u32 lit_12272 = 0x42B00000; +SECTION_SDATA2 static f32 lit_12272 = 88.0f; /* 80453828-8045382C 0004+00 s=1 e=0 z=0 None .sdata2 @12273 */ -SECTION_SDATA2 static u32 lit_12273 = 0xC3340000; +SECTION_SDATA2 static f32 lit_12273 = -180.0f; /* 8045382C-80453830 0004+00 s=1 e=0 z=0 None .sdata2 @12274 */ -SECTION_SDATA2 static u32 lit_12274 = 0x43B40000; +SECTION_SDATA2 static f32 lit_12274 = 360.0f; /* 80453830-80453834 0004+00 s=1 e=0 z=0 None .sdata2 @12275 */ -SECTION_SDATA2 static u32 lit_12275 = 0x420C0000; +SECTION_SDATA2 static f32 lit_12275 = 35.0f; /* 80453834-80453838 0004+00 s=1 e=0 z=0 None .sdata2 @12276 */ -SECTION_SDATA2 static u32 lit_12276 = 0xC2200000; +SECTION_SDATA2 static f32 lit_12276 = -40.0f; /* 80453838-8045383C 0004+00 s=2 e=0 z=0 None .sdata2 @12277 */ -SECTION_SDATA2 static u32 lit_12277 = 0x425C0000; +SECTION_SDATA2 static f32 lit_12277 = 55.0f; /* 8045383C-80453840 0004+00 s=2 e=0 z=0 None .sdata2 @12278 */ -SECTION_SDATA2 static u32 lit_12278 = 0x428C0000; +SECTION_SDATA2 static f32 lit_12278 = 70.0f; /* 80453840-80453844 0004+00 s=3 e=0 z=0 None .sdata2 @12279 */ -SECTION_SDATA2 static u32 lit_12279 = 0xC3480000; +SECTION_SDATA2 static f32 lit_12279 = -200.0f; /* 80453844-80453848 0004+00 s=1 e=0 z=0 None .sdata2 @12280 */ -SECTION_SDATA2 static u32 lit_12280 = 0x430C0000; +SECTION_SDATA2 static f32 lit_12280 = 140.0f; /* 80453848-8045384C 0004+00 s=1 e=0 z=0 None .sdata2 @12281 */ -SECTION_SDATA2 static u32 lit_12281 = 0x42DC0000; +SECTION_SDATA2 static f32 lit_12281 = 110.0f; /* 8045384C-80453850 0004+00 s=1 e=0 z=0 None .sdata2 @12282 */ -SECTION_SDATA2 static u32 lit_12282 = 0x42FA0000; +SECTION_SDATA2 static f32 lit_12282 = 125.0f; /* 80453850-80453854 0004+00 s=1 e=0 z=0 None .sdata2 @12283 */ -SECTION_SDATA2 static u32 lit_12283 = 0x42980000; +SECTION_SDATA2 static f32 lit_12283 = 76.0f; /* 80453854-80453858 0004+00 s=1 e=0 z=0 None .sdata2 @12284 */ -SECTION_SDATA2 static u32 lit_12284 = 0x433E0000; +SECTION_SDATA2 static f32 lit_12284 = 190.0f; /* 80453858-8045385C 0004+00 s=3 e=0 z=0 None .sdata2 @12285 */ -SECTION_SDATA2 static u32 lit_12285 = 0x42F00000; +SECTION_SDATA2 static f32 lit_12285 = 120.0f; /* 8045385C-80453860 0004+00 s=2 e=0 z=0 None .sdata2 @12286 */ -SECTION_SDATA2 static u32 lit_12286 = 0xC0A00000; +SECTION_SDATA2 static f32 lit_12286 = -5.0f; /* 80453860-80453864 0004+00 s=1 e=0 z=0 None .sdata2 @12287 */ -SECTION_SDATA2 static u32 lit_12287 = 0xC20C0000; +SECTION_SDATA2 static f32 lit_12287 = -35.0f; /* 80453864-80453868 0004+00 s=1 e=0 z=0 None .sdata2 @12288 */ -SECTION_SDATA2 static u32 lit_12288 = 0x3EE66666; +SECTION_SDATA2 static f32 lit_12288 = 9.0f / 20.0f; /* 80453868-8045386C 0004+00 s=1 e=0 z=0 None .sdata2 @12289 */ -SECTION_SDATA2 static u32 lit_12289 = 0x42820000; +SECTION_SDATA2 static f32 lit_12289 = 65.0f; /* 8045386C-80453870 0004+00 s=2 e=0 z=0 None .sdata2 @12290 */ -SECTION_SDATA2 static u32 lit_12290 = 0x43C80000; +SECTION_SDATA2 static f32 lit_12290 = 400.0f; /* 80453870-80453874 0004+00 s=1 e=0 z=0 None .sdata2 @12291 */ -SECTION_SDATA2 static u32 lit_12291 = 0x42880000; +SECTION_SDATA2 static f32 lit_12291 = 68.0f; /* 80453874-80453878 0004+00 s=1 e=0 z=0 None .sdata2 @12292 */ -SECTION_SDATA2 static u32 lit_12292 = 0x443B8000; +SECTION_SDATA2 static f32 lit_12292 = 750.0f; /* 80453878-8045387C 0004+00 s=1 e=0 z=0 None .sdata2 @12293 */ -SECTION_SDATA2 static u32 lit_12293 = 0x42680000; +SECTION_SDATA2 static f32 lit_12293 = 58.0f; /* 8045387C-80453880 0004+00 s=2 e=0 z=0 None .sdata2 @12294 */ -SECTION_SDATA2 static u32 lit_12294 = 0x43200000; +SECTION_SDATA2 static f32 lit_12294 = 160.0f; /* 80453880-80453884 0004+00 s=1 e=0 z=0 None .sdata2 @12295 */ -SECTION_SDATA2 static u32 lit_12295 = 0x42BE0000; +SECTION_SDATA2 static f32 lit_12295 = 95.0f; /* 80453884-80453888 0004+00 s=3 e=0 z=0 None .sdata2 @12296 */ -SECTION_SDATA2 static u32 lit_12296 = 0xC3160000; +SECTION_SDATA2 static f32 lit_12296 = -150.0f; /* 80453888-8045388C 0004+00 s=1 e=0 z=0 None .sdata2 @12297 */ -SECTION_SDATA2 static u32 lit_12297 = 0x3E8F5C29; +SECTION_SDATA2 static f32 lit_12297 = 7.0f / 25.0f; /* 8016E4F4-80174E18 6924+00 s=2 e=0 z=0 None .text talktoCamera__9dCamera_cFl */ #pragma push @@ -3470,22 +3428,22 @@ asm void dCamera_c::SaveZoomRatio() { /* ############################################################################################## */ /* 8045388C-80453890 0004+00 s=1 e=0 z=0 None .sdata2 @12864 */ -SECTION_SDATA2 static u32 lit_12864 = 0x43870000; +SECTION_SDATA2 static f32 lit_12864 = 270.0f; /* 80453890-80453894 0004+00 s=1 e=0 z=0 None .sdata2 @12865 */ -SECTION_SDATA2 static u32 lit_12865 = 0x41980000; +SECTION_SDATA2 static f32 lit_12865 = 19.0f; /* 80453894-80453898 0004+00 s=1 e=0 z=0 None .sdata2 @12866 */ -SECTION_SDATA2 static u32 lit_12866 = 0x43160000; +SECTION_SDATA2 static f32 lit_12866 = 150.0f; /* 80453898-8045389C 0004+00 s=1 e=0 z=0 None .sdata2 @12867 */ -SECTION_SDATA2 static u32 lit_12867 = 0xBC23D70A; +SECTION_SDATA2 static f32 lit_12867 = -1.0f / 100.0f; /* 8045389C-804538A0 0004+00 s=5 e=0 z=0 None .sdata2 @12868 */ -SECTION_SDATA2 static u32 lit_12868 = 0xBF800000; +SECTION_SDATA2 static f32 lit_12868 = -1.0f; /* 804538A0-804538A4 0004+00 s=1 e=0 z=0 None .sdata2 @12869 */ -SECTION_SDATA2 static u32 lit_12869 = 0xC3FF8000; +SECTION_SDATA2 static f32 lit_12869 = -511.0f; /* 80174ED4-80176074 11A0+00 s=1 e=0 z=0 None .text subjectCamera__9dCamera_cFl */ #pragma push @@ -3499,7 +3457,7 @@ asm void dCamera_c::subjectCamera(s32 param_0) { /* ############################################################################################## */ /* 804538A4-804538A8 0004+00 s=3 e=0 z=0 None .sdata2 @13132 */ -SECTION_SDATA2 static u32 lit_13132 = 0x40800000; +SECTION_SDATA2 static f32 lit_13132 = 4.0f; /* 80176074-801767F8 0784+00 s=1 e=0 z=0 None .text magneCamera__9dCamera_cFl */ #pragma push @@ -3513,7 +3471,7 @@ asm void dCamera_c::magneCamera(s32 param_0) { /* ############################################################################################## */ /* 804538A8-804538AC 0004+00 s=1 e=0 z=0 None .sdata2 @13314 */ -SECTION_SDATA2 static u32 lit_13314 = 0x3F7FBE77; +SECTION_SDATA2 static f32 lit_13314 = 0.9990000128746033f; /* 801767F8-80176DF0 05F8+00 s=1 e=0 z=0 None .text colosseumCamera__9dCamera_cFl */ #pragma push @@ -3537,7 +3495,7 @@ bool dCamera_c::test2Camera(s32 param_0) { /* ############################################################################################## */ /* 804538AC-804538B0 0004+00 s=2 e=0 z=0 None .sdata2 @13673 */ -SECTION_SDATA2 static u32 lit_13673 = 0x3CCCCCCD; +SECTION_SDATA2 static f32 lit_13673 = 1.0f / 40.0f; /* 80176E00-80178E50 2050+00 s=1 e=0 z=0 None .text towerCamera__9dCamera_cFl */ #pragma push @@ -3551,22 +3509,22 @@ asm void dCamera_c::towerCamera(s32 param_0) { /* ############################################################################################## */ /* 804538B0-804538B4 0004+00 s=1 e=0 z=0 None .sdata2 @14059 */ -SECTION_SDATA2 static u32 lit_14059 = 0xC3200000; +SECTION_SDATA2 static f32 lit_14059 = -160.0f; /* 804538B4-804538B8 0004+00 s=1 e=0 z=0 None .sdata2 @14060 */ -SECTION_SDATA2 static u32 lit_14060 = 0x432A0000; +SECTION_SDATA2 static f32 lit_14060 = 170.0f; /* 804538B8-804538BC 0004+00 s=2 e=0 z=0 None .sdata2 @14061 */ -SECTION_SDATA2 static u32 lit_14061 = 0xC2F00000; +SECTION_SDATA2 static f32 lit_14061 = -120.0f; /* 804538BC-804538C0 0004+00 s=1 e=0 z=0 None .sdata2 @14062 */ -SECTION_SDATA2 static u32 lit_14062 = 0xC3700000; +SECTION_SDATA2 static f32 lit_14062 = -240.0f; /* 804538C0-804538C4 0004+00 s=1 e=0 z=0 None .sdata2 @14063 */ -SECTION_SDATA2 static u32 lit_14063 = 0x43AA0000; +SECTION_SDATA2 static f32 lit_14063 = 340.0f; /* 804538C4-804538C8 0004+00 s=2 e=0 z=0 None .sdata2 @14064 */ -SECTION_SDATA2 static u32 lit_14064 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_14064 = -100.0f; /* 80178E50-80179590 0740+00 s=1 e=0 z=0 None .text hookshotCamera__9dCamera_cFl */ #pragma push @@ -3626,46 +3584,46 @@ static u8 struct_80451048[4]; static u8 LatMax[2 + 2 /* padding */]; /* 804538C8-804538CC 0004+00 s=1 e=0 z=0 None .sdata2 @15474 */ -SECTION_SDATA2 static u32 lit_15474 = 0x44960000; +SECTION_SDATA2 static f32 lit_15474 = 1200.0f; /* 804538CC-804538D0 0004+00 s=1 e=0 z=0 None .sdata2 @15475 */ -SECTION_SDATA2 static u32 lit_15475 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_15475 = 3.0f / 5.0f; /* 804538D0-804538D4 0004+00 s=1 e=0 z=0 None .sdata2 @15476 */ -SECTION_SDATA2 static u32 lit_15476 = 0x44480000; +SECTION_SDATA2 static f32 lit_15476 = 800.0f; /* 804538D4-804538D8 0004+00 s=1 e=0 z=0 None .sdata2 @15477 */ -SECTION_SDATA2 static u32 lit_15477 = 0x41E00000; +SECTION_SDATA2 static f32 lit_15477 = 28.0f; /* 804538D8-804538DC 0004+00 s=2 e=0 z=0 None .sdata2 @15478 */ -SECTION_SDATA2 static u32 lit_15478 = 0x43A00000; +SECTION_SDATA2 static f32 lit_15478 = 320.0f; /* 804538DC-804538E0 0004+00 s=1 e=0 z=0 None .sdata2 @15479 */ -SECTION_SDATA2 static u32 lit_15479 = 0x45BB8000; +SECTION_SDATA2 static f32 lit_15479 = 6000.0f; /* 804538E0-804538E4 0004+00 s=1 e=0 z=0 None .sdata2 @15480 */ -SECTION_SDATA2 static u32 lit_15480 = 0x447A0000; +SECTION_SDATA2 static f32 lit_15480 = 1000.0f; /* 804538E4-804538E8 0004+00 s=1 e=0 z=0 None .sdata2 @15481 */ -SECTION_SDATA2 static u32 lit_15481 = 0x41B80000; +SECTION_SDATA2 static f32 lit_15481 = 23.0f; /* 804538E8-804538EC 0004+00 s=1 e=0 z=0 None .sdata2 @15482 */ -SECTION_SDATA2 static u32 lit_15482 = 0x44430000; +SECTION_SDATA2 static f32 lit_15482 = 780.0f; /* 804538EC-804538F0 0004+00 s=1 e=0 z=0 None .sdata2 @15483 */ -SECTION_SDATA2 static u32 lit_15483 = 0x449C4000; +SECTION_SDATA2 static f32 lit_15483 = 1250.0f; /* 804538F0-804538F4 0004+00 s=1 e=0 z=0 None .sdata2 @15484 */ -SECTION_SDATA2 static u32 lit_15484 = 0x42080000; +SECTION_SDATA2 static f32 lit_15484 = 34.0f; /* 804538F4-804538F8 0004+00 s=1 e=0 z=0 None .sdata2 @15485 */ -SECTION_SDATA2 static u32 lit_15485 = 0x44610000; +SECTION_SDATA2 static f32 lit_15485 = 900.0f; /* 804538F8-804538FC 0004+00 s=1 e=0 z=0 None .sdata2 @15486 */ -SECTION_SDATA2 static u32 lit_15486 = 0x3F866667; +SECTION_SDATA2 static f32 lit_15486 = 1.0500000715255737f; /* 804538FC-80453900 0004+00 s=1 e=0 z=0 None .sdata2 @15487 */ -SECTION_SDATA2 static u32 lit_15487 = 0x3F933334; +SECTION_SDATA2 static f32 lit_15487 = 1.1500000953674316f; /* 8017ADC0-8017D934 2B74+00 s=1 e=0 z=0 None .text rideCamera__9dCamera_cFl */ #pragma push @@ -3695,10 +3653,10 @@ bool dCamera_c::manualCamera(s32 param_0) { /* ############################################################################################## */ /* 80453900-80453904 0004+00 s=1 e=0 z=0 None .sdata2 @15772 */ -SECTION_SDATA2 static u32 lit_15772 = 0xBF400000; +SECTION_SDATA2 static f32 lit_15772 = -0.75f; /* 80453904-80453908 0004+00 s=1 e=0 z=0 None .sdata2 @15773 */ -SECTION_SDATA2 static u32 lit_15773 = 0x3FAAAAAB; +SECTION_SDATA2 static f32 lit_15773 = 4.0f / 3.0f; /* 8017D97C-8017DFAC 0630+00 s=1 e=0 z=0 None .text observeCamera__9dCamera_cFl */ #pragma push @@ -3857,13 +3815,13 @@ asm void dCamera_c::Reset() { /* ############################################################################################## */ /* 80453908-8045390C 0004+00 s=1 e=0 z=0 None .sdata2 @17253 */ -SECTION_SDATA2 static u32 lit_17253 = 0x3EDC28F6; +SECTION_SDATA2 static f32 lit_17253 = 43.0f / 100.0f; /* 8045390C-80453910 0004+00 s=1 e=0 z=0 None .sdata2 @17254 */ -SECTION_SDATA2 static u32 lit_17254 = 0x3D3851EC; +SECTION_SDATA2 static f32 lit_17254 = 0.04500000178813934f; /* 80453910-80453914 0004+00 s=1 e=0 z=0 None .sdata2 @17255 */ -SECTION_SDATA2 static u32 lit_17255 = 0x3DF5C28F; +SECTION_SDATA2 static f32 lit_17255 = 3.0f / 25.0f; /* 80180D24-80181000 02DC+00 s=2 e=0 z=0 None .text shakeCamera__9dCamera_cFv */ #pragma push @@ -3968,7 +3926,7 @@ asm void dCamera_c::SetBlureActor(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80453918-8045391C 0004+00 s=1 e=0 z=0 None .sdata2 @17392 */ -SECTION_SDATA2 static u32 lit_17392 = 0x43660000; +SECTION_SDATA2 static f32 lit_17392 = 230.0f; /* 80181280-80181490 0210+00 s=2 e=0 z=0 None .text blureCamera__9dCamera_cFv */ #pragma push @@ -4083,7 +4041,7 @@ asm void dCam_getBody() { /* ############################################################################################## */ /* 8045391C-80453920 0004+00 s=2 e=0 z=0 None .sdata2 @17525 */ -SECTION_SDATA2 static u32 lit_17525 = 0x3FADB6DB; +SECTION_SDATA2 static f32 lit_17525 = 19.0f / 14.0f; /* 80181664-80181708 00A4+00 s=1 e=0 z=0 None .text preparation__FP20camera_process_class */ #pragma push @@ -4178,7 +4136,7 @@ asm static void init_phase1(camera_class* param_0) { /* ############################################################################################## */ /* 80453920-80453924 0004+00 s=1 e=0 z=0 None .sdata2 @17948 */ -SECTION_SDATA2 static u32 lit_17948 = 0x481C4000; +SECTION_SDATA2 static f32 lit_17948 = 160000.0f; /* 80182260-80182454 01F4+00 s=1 e=0 z=0 None .text init_phase2__FP12camera_class */ #pragma push @@ -4217,7 +4175,7 @@ static bool is_camera_delete(void* param_0) { /* ############################################################################################## */ /* 80453924-80453928 0004+00 s=1 e=0 z=0 None .sdata2 @17979 */ -SECTION_SDATA2 static u32 lit_17979 = 0x43700000; +SECTION_SDATA2 static f32 lit_17979 = 240.0f; /* 801824C8-80182560 0098+00 s=1 e=0 z=0 None .text Init__14dCamForcusLineFv */ #pragma push diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index cd41211a347..5d2b81a4e07 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -17,10 +17,10 @@ struct mDoGph_gInf_c { /* 80007FD8 */ void fadeOut(f32, _GXColor&); }; -struct Vec {}; - struct J3DAnmTransform {}; +struct Vec {}; + struct mDoExt_McaMorf { /* 8001037C */ void setAnm(J3DAnmTransform*, int, f32, f32, f32, f32, void*); /* 800105C8 */ void play(Vec*, u32, s8); @@ -46,12 +46,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz { /* 80009184 */ ~cXyz(); }; +struct csXyz {}; + struct dKy_tevstr_c {}; struct dPa_control_c { @@ -368,18 +368,6 @@ static void dDemo_getJaiPointer(char const*, u32, int, u16*); void dDemo_setDemoData(fopAc_ac_c*, u8, mDoExt_McaMorf*, char const*, int, u16*, u32, s8); static void branchFile(char const*); static void getView(); -extern "C" extern char const* const d_d_demo__stringBase0; -extern "C" extern void* __vt__17jmessage_tControl[3]; -extern "C" extern void* __vt__Q27JStudio13TCreateObject[4]; -extern "C" extern void* __vt__Q27JStudio16TAdaptor_message[9]; -extern "C" extern u16 m_branchId__7dDemo_c[1 + 3 /* padding */]; -extern "C" extern u8 m_control__7dDemo_c[4]; -extern "C" extern u8 m_mesgControl__7dDemo_c[4]; -extern "C" extern u8 m_object__7dDemo_c[4]; -extern "C" extern u8 m_frame__7dDemo_c[4]; -extern "C" extern u8 m_frameNoMsg__7dDemo_c[4]; -extern "C" extern u8 m_mode__7dDemo_c[4]; -extern "C" extern u8 m_status__7dDemo_c[4]; extern "C" static void func_80037DE4(); extern "C" static void func_80037E44(); @@ -493,29 +481,6 @@ void fpcSch_JudgeByID(void*, void*); void dComIfGs_staffroll_next_go_check(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__Q26JStage6TActor[35 + 1 /* padding */]; -extern "C" extern void* __vt__Q26JStage13TAmbientLight[17 + 1 /* padding */]; -extern "C" extern void* __vt__Q26JStage7TCamera[37 + 1 /* padding */]; -extern "C" extern void* __vt__Q26JStage4TFog[23 + 1 /* padding */]; -extern "C" extern void* __vt__Q26JStage6TLight[27 + 1 /* padding */]; -extern "C" extern void* __vt__Q26JStage7TObject[15 + 1 /* padding */]; -extern "C" extern void* __vt__Q26JStage7TSystem[20]; -extern "C" extern void* __vt__Q37JStudio3ctb8TFactory[5]; -extern "C" extern void* __vt__Q37JStudio3fvb8TFactory[5]; -extern "C" extern void* __vt__Q27JStudio8TFactory[5]; -extern "C" extern void* __vt__Q27JStudio8TAdaptor[8]; -extern "C" extern void* __vt__Q37JStudio3stb8TFactory[5]; -extern "C" extern void* __vt__Q214JStudio_JStage13TCreateObject[4]; -extern "C" extern void* __vt__Q215JStudio_JAudio213TCreateObject[4]; -extern "C" extern void* __vt__Q217JStudio_JParticle13TCreateObject[6]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u32 g_blackColor; -extern "C" extern u32 __float_max; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mEmitterMng__13dPa_control_c[4]; extern "C" void OSReport_Error(); extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); @@ -960,7 +925,7 @@ SECTION_SDATA2 static u8 lit_4040[4] = { }; /* 80451DB4-80451DB8 0004+00 s=6 e=0 z=0 None .sdata2 @4041 */ -SECTION_SDATA2 static u32 lit_4041 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4041 = 1.0f; /* 80038020-80038098 0078+00 s=1 e=0 z=0 None .text __ct__13dDemo_actor_cFv */ #pragma push @@ -1004,9 +969,7 @@ asm void dDemo_actor_c::setActor(fopAc_ac_c* param_0) { /* ############################################################################################## */ /* 80451DB8-80451DC0 0008+00 s=4 e=0 z=0 None .sdata2 @4127 */ -SECTION_SDATA2 static u8 lit_4127[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4127 = 4503601774854144.0 /* cast s32 to float */; /* 8003819C-80038338 019C+00 s=1 e=1 z=1 None .text getPrm_Morf__13dDemo_actor_cFv */ #pragma push @@ -1106,7 +1069,7 @@ asm static void dDemo_getJaiPointer(char const* param_0, u32 param_1, int param_ /* ############################################################################################## */ /* 80451DC0-80451DC4 0004+00 s=1 e=0 z=0 None .sdata2 @4152 */ -SECTION_SDATA2 static u32 lit_4152 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4152 = -1.0f; /* 80038518-800387A8 0290+00 s=0 e=0 z=2 None .text * dDemo_setDemoData__FP10fopAc_ac_cUcP14mDoExt_McaMorfPCciPUsUlSc */ @@ -1165,10 +1128,10 @@ asm void dDemo_actor_c::JSGSetData(u32 param_0, void const* param_1, u32 param_2 /* ############################################################################################## */ /* 80451DC4-80451DC8 0004+00 s=1 e=0 z=0 None .sdata2 @4553 */ -SECTION_SDATA2 static u32 lit_4553 = 0xF49DC5AE; +SECTION_SDATA2 static f32 lit_4553 = -1.0000000331813535e+32f; /* 80451DC8-80451DCC 0004+00 s=1 e=0 z=0 None .sdata2 @4554 */ -SECTION_SDATA2 static u32 lit_4554 = 0x749DC5AE; +SECTION_SDATA2 static f32 lit_4554 = 1.0000000331813535e+32f; /* 80038920-80038980 0060+00 s=1 e=0 z=0 None .text JSGSetTranslation__13dDemo_actor_cFRC3Vec */ @@ -1193,7 +1156,7 @@ asm void dDemo_actor_c::JSGSetScaling(Vec const& param_0) { /* ############################################################################################## */ /* 80451DCC-80451DD0 0004+00 s=1 e=0 z=0 None .sdata2 @4567 */ -SECTION_SDATA2 static u32 lit_4567 = 0x43360B61; +SECTION_SDATA2 static f32 lit_4567 = 182.04444885253906f; /* 800389A8-80038A0C 0064+00 s=1 e=0 z=0 None .text JSGSetRotation__13dDemo_actor_cFRC3Vec */ #pragma push @@ -1323,7 +1286,7 @@ asm void dDemo_camera_c::JSGSetProjectionFar(f32 param_0) { /* ############################################################################################## */ /* 80451DD0-80451DD4 0004+00 s=1 e=0 z=0 None .sdata2 @4642 */ -SECTION_SDATA2 static u32 lit_4642 = 0x42700000; +SECTION_SDATA2 static f32 lit_4642 = 60.0f; /* 80038B54-80038B88 0034+00 s=1 e=0 z=0 None .text JSGGetProjectionFovy__14dDemo_camera_cCFv */ @@ -1349,7 +1312,7 @@ asm void dDemo_camera_c::JSGSetProjectionFovy(f32 param_0) { /* ############################################################################################## */ /* 80451DD4-80451DD8 0004+00 s=1 e=0 z=0 None .sdata2 @4655 */ -SECTION_SDATA2 static u32 lit_4655 = 0x3FADB6DB; +SECTION_SDATA2 static f32 lit_4655 = 19.0f / 14.0f; /* 80038B9C-80038BD0 0034+00 s=1 e=0 z=0 None .text JSGGetProjectionAspect__14dDemo_camera_cCFv */ @@ -1727,9 +1690,7 @@ asm void dDemo_system_c::JSGFindObject(JStage::TObject** param_0, char const* pa /* ############################################################################################## */ /* 80451DE0-80451DE8 0008+00 s=1 e=0 z=0 None .sdata2 @5123 */ -SECTION_SDATA2 static u8 lit_5123[8] = { - 0x3F, 0xA1, 0x11, 0x11, 0x20, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5123 = 0.03333333507180214; /* 80039678-80039910 0298+00 s=0 e=1 z=0 None .text create__7dDemo_cFv */ #pragma push diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index f95a6ac5521..142ce471aeb 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -32,8 +32,6 @@ struct dDlst_shadowTri_c { /* 80056344 */ dDlst_shadowTri_c(); }; -struct _GXTexObj {}; - struct Vec {}; struct cXyz { @@ -44,6 +42,8 @@ struct cXyz { /* 802670AC */ void isZero() const; }; +struct _GXTexObj {}; + struct dDlst_shadowSimple_c { /* 8005520C */ void draw(); /* 800553EC */ void set(cXyz*, f32, f32, cXyz*, s16, f32, _GXTexObj*); @@ -95,10 +95,12 @@ struct dDlst_peekZ_c { /* 80056080 */ void peekData(); }; -struct dDlst_base_c {}; - struct J3DPacket {}; +struct _GXColor {}; + +struct dDlst_base_c {}; + struct J3DDrawBuffer { /* 80324F08 */ void initialize(); /* 80324F70 */ void allocBuffer(u32); @@ -108,8 +110,6 @@ struct J3DDrawBuffer { /* 803254AC */ void draw() const; }; -struct _GXColor {}; - struct dDlst_list_c { /* 800560F0 */ dDlst_list_c(); /* 80056390 */ void init(); @@ -259,27 +259,6 @@ static void J3DDrawBuffer__create(u32); static void psdRealCallBack(cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*); static void realPolygonCheck(cXyz*, f32, f32, cXyz*, dDlst_shadowPoly_c*); static void setkankyoShadow(dKy_tevstr_c*, f32*); -extern "C" extern char const* const d_d_drawlist__stringBase0; -extern "C" extern u8 l_frontZMat[60 + 4 /* padding */]; -extern "C" extern u8 l_frontNoZSubMat[42 + 2 /* padding */]; -extern "C" extern u8 l_shadowVolDL[59 + 5 /* padding */]; -extern "C" extern u8 l_shadowVolMat[90 + 6 /* padding */]; -extern "C" extern u8 data_803A8D9C[48]; -extern "C" extern void* __vt__18dDlst_effectLine_c[3]; -extern "C" extern void* __vt__10J2DAnmBase[4]; -extern "C" extern void* __vt__11dDlst_blo_c[3]; -extern "C" extern void* __vt__10dDlst_2D_c[3]; -extern "C" extern void* __vt__12dDlst_2DMt_c[3]; -extern "C" extern void* __vt__11dDlst_2Dm_c[3]; -extern "C" extern void* __vt__11dDlst_2DM_c[3 + 3 /* padding */]; -extern "C" extern void* __vt__11dDlst_2DT_c[3]; -extern "C" extern void* __vt__15dDlst_2DPoint_c[3]; -extern "C" extern void* __vt__14dDlst_2DQuad_c[3]; -extern "C" extern void* __vt__13dDlst_2DTri_c[3]; -extern "C" extern u8 mSimpleTexObj__21dDlst_shadowControl_c[32]; -extern "C" extern u8 data_80450ED0[4]; -extern "C" extern f32 mWipeRate__12dDlst_list_c; -extern "C" extern u8 data_80450EE0[8]; extern "C" void setViewPort__14dDlst_window_cFffffff(); extern "C" void setScissor__14dDlst_window_cFffff(); @@ -395,27 +374,6 @@ void cLib_chaseUC(u8*, u8, u8); void* operator new(u32); void* operator new[](u32, int); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* __vt__26mDoExt_3DlineMatSortPacket[5]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_envHIO[68]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 mBackColor__13mDoGph_gInf_c[4]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u32 g_blackColor; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; -extern "C" extern f32 mSystemFar__14mDoLib_clipper; -extern "C" extern f32 mFovyRate__14mDoLib_clipper; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void __dt__4cXyzFv(); extern "C" void mDoMtx_YrotM__FPA4_fs(); @@ -624,33 +582,23 @@ SECTION_SDATA static u8 l_color_4033[4] = { }; /* 80452008-8045200C 0004+00 s=4 e=0 z=0 None .sdata2 @4072 */ -SECTION_SDATA2 static u32 lit_4072 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4072 = 0.5f; /* 8045200C-80452010 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */ -SECTION_SDATA2 static u32 lit_4073 = 0x47000000; +SECTION_SDATA2 static f32 lit_4073 = 32768.0f; /* 80452010-80452018 0004+04 s=10 e=0 z=0 None .sdata2 @4074 */ -SECTION_SDATA2 static u8 lit_4074[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_4074[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80452018-80452020 0008+00 s=8 e=0 z=0 None .sdata2 @4076 */ -SECTION_SDATA2 static u8 lit_4076[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4076 = 4503599627370496.0 /* cast u32 to float */; /* 80452020-80452028 0008+00 s=5 e=0 z=0 None .sdata2 @4079 */ -SECTION_SDATA2 static u8 lit_4079[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4079 = 4503601774854144.0 /* cast s32 to float */; /* 80051F98-80052354 03BC+00 s=1 e=0 z=0 None .text draw__11dDlst_2DT_cFv */ #pragma push @@ -664,7 +612,7 @@ asm void dDlst_2DT_c::draw() { /* ############################################################################################## */ /* 80452028-8045202C 0004+00 s=10 e=0 z=0 None .sdata2 @4270 */ -SECTION_SDATA2 static u32 lit_4270 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4270 = 1.0f; /* 80052354-80052B00 07AC+00 s=1 e=0 z=0 None .text draw__12dDlst_2DT2_cFv */ #pragma push @@ -2332,7 +2280,7 @@ asm void dDlst_2DT2_c::init(ResTIMG* param_0, f32 param_1, f32 param_2, f32 para /* ############################################################################################## */ /* 80452030-80452034 0004+00 s=2 e=0 z=0 None .sdata2 @4360 */ -SECTION_SDATA2 static u32 lit_4360 = 0x43800000; +SECTION_SDATA2 static f32 lit_4360 = 256.0f; /* 80052C58-8005312C 04D4+00 s=1 e=0 z=0 None .text draw__11dDlst_2DM_cFv */ #pragma push @@ -2484,18 +2432,16 @@ asm void cM_rnd_c::init(int param_0, int param_1, int param_2) { /* ############################################################################################## */ /* 80452034-80452038 0004+00 s=1 e=0 z=0 None .sdata2 @4791 */ -SECTION_SDATA2 static u32 lit_4791 = 0x46ECE600; +SECTION_SDATA2 static f32 lit_4791 = 30323.0f; /* 80452038-8045203C 0004+00 s=1 e=0 z=0 None .sdata2 @4792 */ -SECTION_SDATA2 static u32 lit_4792 = 0x46EC7A00; +SECTION_SDATA2 static f32 lit_4792 = 30269.0f; /* 8045203C-80452040 0004+00 s=1 e=0 z=0 None .sdata2 @4793 */ -SECTION_SDATA2 static u32 lit_4793 = 0x46ECC600; +SECTION_SDATA2 static f32 lit_4793 = 30307.0f; /* 80452040-80452048 0008+00 s=1 e=0 z=0 None .sdata2 @4794 */ -SECTION_SDATA2 static u8 lit_4794[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4794 = 1.0; /* 80053CEC-80053DE0 00F4+00 s=2 e=0 z=0 None .text get__8cM_rnd_cFv */ #pragma push @@ -2519,7 +2465,7 @@ asm void cM_rnd_c::getF(f32 param_0) { /* ############################################################################################## */ /* 80452048-8045204C 0004+00 s=5 e=0 z=0 None .sdata2 @4806 */ -SECTION_SDATA2 static u32 lit_4806 = 0x40000000; +SECTION_SDATA2 static f32 lit_4806 = 2.0f; /* 80053E18-80053E60 0048+00 s=1 e=0 z=0 None .text getFX__8cM_rnd_cFf */ #pragma push @@ -2543,7 +2489,7 @@ asm void cM_rnd_c::getValue(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 8045204C-80452050 0004+00 s=1 e=0 z=0 None .sdata2 @4876 */ -SECTION_SDATA2 static u32 lit_4876 = 0x46FFFE00; +SECTION_SDATA2 static f32 lit_4876 = 32767.0f; /* 80053E9C-800541F4 0358+00 s=1 e=0 z=0 None .text draw__18dDlst_effectLine_cFv */ #pragma push @@ -2641,10 +2587,10 @@ asm void dDlst_shadowReal_c::draw() { /* ############################################################################################## */ /* 80452050-80452054 0004+00 s=1 e=0 z=0 None .sdata2 @5061 */ -SECTION_SDATA2 static u32 lit_5061 = 0xBE4CCCCD; +SECTION_SDATA2 static f32 lit_5061 = -1.0f / 5.0f; /* 80452054-80452058 0004+00 s=1 e=0 z=0 None .sdata2 @5062 */ -SECTION_SDATA2 static u32 lit_5062 = 0xC2B40000; +SECTION_SDATA2 static f32 lit_5062 = -90.0f; /* 80054688-80054854 01CC+00 s=1 e=0 z=0 None .text * psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla */ @@ -2660,16 +2606,16 @@ asm static void psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int /* ############################################################################################## */ /* 80452058-8045205C 0004+00 s=1 e=0 z=0 None .sdata2 @5127 */ -SECTION_SDATA2 static u32 lit_5127 = 0x3B03126F; +SECTION_SDATA2 static f32 lit_5127 = 0.0020000000949949026f; /* 8045205C-80452060 0004+00 s=1 e=0 z=0 None .sdata2 @5128 */ -SECTION_SDATA2 static u32 lit_5128 = 0x42F00000; +SECTION_SDATA2 static f32 lit_5128 = 120.0f; /* 80452060-80452064 0004+00 s=1 e=0 z=0 None .sdata2 @5129 */ -SECTION_SDATA2 static u32 lit_5129 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_5129 = 3.0f / 20.0f; /* 80452064-80452068 0004+00 s=3 e=0 z=0 None .sdata2 @5130 */ -SECTION_SDATA2 static u32 lit_5130 = 0x461C4000; +SECTION_SDATA2 static f32 lit_5130 = 10000.0f; /* 80054854-80054A6C 0218+00 s=1 e=0 z=0 None .text * realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c */ @@ -2695,10 +2641,10 @@ asm ShdwDrawPoly_c::~ShdwDrawPoly_c() { /* ############################################################################################## */ /* 80452068-8045206C 0004+00 s=1 e=0 z=0 None .sdata2 @5155 */ -SECTION_SDATA2 static u32 lit_5155 = 0x41700000; +SECTION_SDATA2 static f32 lit_5155 = 15.0f; /* 8045206C-80452070 0004+00 s=1 e=0 z=0 None .sdata2 @5156 */ -SECTION_SDATA2 static u32 lit_5156 = 0x3F266666; +SECTION_SDATA2 static f32 lit_5156 = 13.0f / 20.0f; /* 80054ACC-80054BD0 0104+00 s=2 e=0 z=0 None .text setkankyoShadow__FP12dKy_tevstr_cPf */ #pragma push @@ -2712,10 +2658,10 @@ asm static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) { /* ############################################################################################## */ /* 80452070-80452074 0004+00 s=1 e=0 z=0 None .sdata2 @5267 */ -SECTION_SDATA2 static u32 lit_5267 = 0x42480000; +SECTION_SDATA2 static f32 lit_5267 = 50.0f; /* 80452074-80452078 0004+00 s=1 e=0 z=0 None .sdata2 @5268 */ -SECTION_SDATA2 static u32 lit_5268 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_5268 = 4.0f / 5.0f; /* 80452078-80452080 0004+04 s=1 e=0 z=0 None .sdata2 @5269 */ SECTION_SDATA2 static f32 lit_5269[1 + 1 /* padding */] = { @@ -2725,14 +2671,10 @@ SECTION_SDATA2 static f32 lit_5269[1 + 1 /* padding */] = { }; /* 80452080-80452088 0008+00 s=1 e=0 z=0 None .sdata2 @5270 */ -SECTION_SDATA2 static u8 lit_5270[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5270 = 0.5; /* 80452088-80452090 0008+00 s=1 e=0 z=0 None .sdata2 @5271 */ -SECTION_SDATA2 static u8 lit_5271[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5271 = 3.0; /* 80452090-80452098 0008+00 s=1 e=0 z=0 None .sdata2 @5272 */ SECTION_SDATA2 static u8 lit_5272[8] = { @@ -2740,13 +2682,13 @@ SECTION_SDATA2 static u8 lit_5272[8] = { }; /* 80452098-8045209C 0004+00 s=1 e=0 z=0 None .sdata2 @5273 */ -SECTION_SDATA2 static u32 lit_5273 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_5273 = 2.0f / 5.0f; /* 8045209C-804520A0 0004+00 s=1 e=0 z=0 None .sdata2 @5274 */ -SECTION_SDATA2 static u32 lit_5274 = 0xBF800000; +SECTION_SDATA2 static f32 lit_5274 = -1.0f; /* 804520A0-804520A4 0004+00 s=1 e=0 z=0 None .sdata2 @5275 */ -SECTION_SDATA2 static u32 lit_5275 = 0xBF000000; +SECTION_SDATA2 static f32 lit_5275 = -0.5f; /* 80054BD0-80055028 0458+00 s=1 e=0 z=0 None .text * setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c */ @@ -2803,16 +2745,16 @@ asm void dDlst_shadowSimple_c::draw() { /* ############################################################################################## */ /* 804520A4-804520A8 0004+00 s=1 e=0 z=0 None .sdata2 @5375 */ -SECTION_SDATA2 static u32 lit_5375 = 0xC37F0000; +SECTION_SDATA2 static f32 lit_5375 = -255.0f; /* 804520A8-804520AC 0004+00 s=1 e=0 z=0 None .sdata2 @5376 */ -SECTION_SDATA2 static u32 lit_5376 = 0x3A378034; +SECTION_SDATA2 static f32 lit_5376 = 0.000699999975040555f; /* 804520AC-804520B0 0004+00 s=1 e=0 z=0 None .sdata2 @5377 */ -SECTION_SDATA2 static u32 lit_5377 = 0x3FB33333; +SECTION_SDATA2 static f32 lit_5377 = 7.0f / 5.0f; /* 804520B0-804520B4 0004+00 s=1 e=0 z=0 None .sdata2 @5378 */ -SECTION_SDATA2 static u32 lit_5378 = 0x41800000; +SECTION_SDATA2 static f32 lit_5378 = 16.0f; /* 800553EC-80055684 0298+00 s=1 e=0 z=0 None .text * set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj */ @@ -2890,13 +2832,13 @@ asm void dDlst_shadowControl_c::draw(f32 (*param_0)[4]) { /* ############################################################################################## */ /* 804520B8-804520BC 0004+00 s=1 e=0 z=0 None .sdata2 @5551 */ -SECTION_SDATA2 static u32 lit_5551 = 0x3B449BA6; +SECTION_SDATA2 static f32 lit_5551 = 0.003000000026077032f; /* 804520BC-804520C0 0004+00 s=1 e=0 z=0 None .sdata2 @5552 */ -SECTION_SDATA2 static u32 lit_5552 = 0xC47A0000; +SECTION_SDATA2 static f32 lit_5552 = -1000.0f; /* 804520C0-804520C4 0004+00 s=1 e=0 z=0 None .sdata2 @5553 */ -SECTION_SDATA2 static u32 lit_5553 = 0x3A83126F; +SECTION_SDATA2 static f32 lit_5553 = 0.0010000000474974513f; /* 80055C74-80055F1C 02A8+00 s=0 e=1 z=1 None .text * setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c */ @@ -3146,7 +3088,7 @@ asm void dDlst_list_c::reset() { /* ############################################################################################## */ /* 804520CC-804520D0 0004+00 s=1 e=0 z=0 None .sdata2 @5747 */ -SECTION_SDATA2 static u32 lit_5747 = 0x461C3C00; +SECTION_SDATA2 static f32 lit_5747 = 9999.0f; /* 800565EC-800566D4 00E8+00 s=0 e=2 z=0 None .text * entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz */ @@ -3256,13 +3198,13 @@ f32 mWipeRate__12dDlst_list_c; static f32 mWipeSpeed__12dDlst_list_c[1 + 1 /* padding */]; /* 804520D0-804520D4 0004+00 s=1 e=0 z=0 None .sdata2 @5809 */ -SECTION_SDATA2 static u32 lit_5809 = 0x44180000; +SECTION_SDATA2 static f32 lit_5809 = 608.0f; /* 804520D4-804520D8 0004+00 s=1 e=0 z=0 None .sdata2 @5810 */ -SECTION_SDATA2 static u32 lit_5810 = 0x43E00000; +SECTION_SDATA2 static f32 lit_5810 = 448.0f; /* 804520D8-804520DC 0004+00 s=1 e=0 z=0 None .sdata2 @5811 */ -SECTION_SDATA2 static u32 lit_5811 = 0x401BE76D; +SECTION_SDATA2 static f32 lit_5811 = 2.436000108718872f; /* 8005681C-800568D8 00BC+00 s=1 e=0 z=0 None .text wipeIn__12dDlst_list_cFfR8_GXColor */ #pragma push @@ -3286,7 +3228,7 @@ asm void dDlst_list_c::wipeIn(f32 param_0) { /* ############################################################################################## */ /* 804520DC-804520E0 0004+00 s=1 e=0 z=0 None .sdata2 @5838 */ -SECTION_SDATA2 static u32 lit_5838 = 0x3F9BE76D; +SECTION_SDATA2 static f32 lit_5838 = 1.218000054359436f; /* 80056900-800569A0 00A0+00 s=0 e=1 z=0 None .text calcWipe__12dDlst_list_cFv */ #pragma push diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index e24cd47f16b..148a3f117c5 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -64,8 +64,6 @@ static void dEnvSe_Execute(dEnvSe_c*); static bool dEnvSe_IsDelete(dEnvSe_c*); static bool dEnvSe_Delete(dEnvSe_c*); static void dEnvSe_Create(dEnvSe_c*); -extern "C" extern char const* const d_d_envse__stringBase0; -extern "C" extern void* g_profile_ENVSE[10 + 1 /* padding */]; extern "C" static bool dEnvSe_Draw__FP8dEnvSe_c(); extern "C" static void dEnvSe_getNearPathPos__FP4cXyzP4cXyzP5dPath(); @@ -86,13 +84,6 @@ void dComIfGp_getReverb(int); void dPath_GetRoomPath(int, int); void dPath_GetNextRoomPath(dPath const*, int); void cM3d_Len3dSqPntAndSegLine(cM3dGLin const*, Vec const*, Vec*, f32*); -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__8cM3dGLin[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; extern "C" void getStatusRoomDt__20dStage_roomControl_cFi(); extern "C" void dComIfGp_getReverb__Fi(); diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 4115ac4ae34..e77db757d2d 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -83,7 +83,6 @@ struct J2DOrthoGraph { static void messageSet(u32, bool); static void drawCapture(u8); -extern "C" extern char const* const d_d_error_msg__stringBase0; extern "C" static void messageSet__FUlb(); extern "C" void draw__14dDvdErrorMsg_cFl(); @@ -100,21 +99,6 @@ void mDoAud_resetRecover(); void mDoGph_drawFilterQuad(s8, s8); void mDoRst_reset(int, u32, int); void cLib_chaseUC(u8*, u8, u8); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; -extern "C" extern u8 mFrameBufferTexObj__13mDoGph_gInf_c[32]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u8 data_80450688[8]; -extern "C" extern u8 struct_80450BB8[4]; -extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450FB0[8]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport_Error(); extern "C" void mDoAud_resetRecover__Fv(); @@ -18841,36 +18825,34 @@ SECTION_SDATA2 static u8 lit_3758[4] = { }; /* 80452C1C-80452C20 0004+00 s=2 e=0 z=0 None .sdata2 @3759 */ -SECTION_SDATA2 static u32 lit_3759 = 0x44180000; +SECTION_SDATA2 static f32 lit_3759 = 608.0f; /* 80452C20-80452C24 0004+00 s=1 e=0 z=0 None .sdata2 @3760 */ -SECTION_SDATA2 static u32 lit_3760 = 0x43480000; +SECTION_SDATA2 static f32 lit_3760 = 200.0f; /* 80452C24-80452C28 0004+00 s=2 e=0 z=0 None .sdata2 @3761 */ -SECTION_SDATA2 static u32 lit_3761 = 0x43E00000; +SECTION_SDATA2 static f32 lit_3761 = 448.0f; /* 80452C28-80452C2C 0004+00 s=1 e=0 z=0 None .sdata2 @3762 */ -SECTION_SDATA2 static u32 lit_3762 = 0x41B80000; +SECTION_SDATA2 static f32 lit_3762 = 23.0f; /* 80452C2C-80452C30 0004+00 s=1 e=0 z=0 None .sdata2 @3763 */ -SECTION_SDATA2 static u32 lit_3763 = 0x41B00000; +SECTION_SDATA2 static f32 lit_3763 = 22.0f; /* 80452C30-80452C34 0004+00 s=3 e=0 z=0 None .sdata2 @3764 */ -SECTION_SDATA2 static u32 lit_3764 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3764 = 1.0f; /* 80452C34-80452C38 0004+00 s=1 e=0 z=0 None .sdata2 @3765 */ -SECTION_SDATA2 static u32 lit_3765 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3765 = 0.5f; /* 80452C38-80452C3C 0004+00 s=1 e=0 z=0 None .sdata2 @3766 */ -SECTION_SDATA2 static u32 lit_3766 = 0x40000000; +SECTION_SDATA2 static f32 lit_3766 = 2.0f; /* 80452C3C-80452C40 0004+00 s=2 e=0 z=0 None .sdata2 @3767 */ -SECTION_SDATA2 static u32 lit_3767 = 0x41200000; +SECTION_SDATA2 static f32 lit_3767 = 10.0f; /* 80452C40-80452C48 0008+00 s=1 e=0 z=0 None .sdata2 @3769 */ -SECTION_SDATA2 static u8 lit_3769[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3769 = 4503601774854144.0 /* cast s32 to float */; /* 8009CB88-8009D194 060C+00 s=1 e=0 z=0 None .text messageSet__FUlb */ #pragma push diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index f68c5f60adb..42b5e25e6a5 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -207,11 +207,6 @@ struct cBgS { static void dComIfGp_saveCameraPosition(int, cXyz*, cXyz*, f32, s16); void fopAcM_GetID(void const*); -extern "C" extern u8 const lit_5985[28]; -extern "C" extern u8 const lit_5986[28]; -extern "C" extern u8 const lit_5987[20]; -extern "C" extern u8 const lit_5988[20]; -extern "C" extern char const* const d_d_ev_camera__stringBase0; extern "C" static void func_800889F8(); extern "C" void StartEventCamera__9dCamera_cFiie(); @@ -309,18 +304,6 @@ void cM_rndFX(f32); void cM3d_Len3dSqPntAndSegLine(cM3dGLin const*, Vec const*, Vec*, f32*); void operator+(s16, cSAngle const&); void operator delete(void*); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern u8 engine_tbl__9dCamera_c[240]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_object__7dDemo_c[4]; -extern "C" extern u8 struct_80450F88[8]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 _0__7cSAngle[2 + 2 /* padding */]; -extern "C" extern u8 _90__7cSAngle[2 + 2 /* padding */]; extern "C" void __dt__4cXyzFv(); extern "C" void mDoLib_project__FP3VecP3Vec(); @@ -811,27 +794,17 @@ static u8 lit_4202[12]; static u8 data_804253B4[12]; /* 804528B8-804528C0 0004+04 s=16 e=0 z=0 None .sdata2 @5141 */ -SECTION_SDATA2 static u8 lit_5141[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_5141[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 804528C0-804528C8 0008+00 s=3 e=0 z=0 None .sdata2 @5142 */ -SECTION_SDATA2 static u8 lit_5142[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5142 = 0.5; /* 804528C8-804528D0 0008+00 s=3 e=0 z=0 None .sdata2 @5143 */ -SECTION_SDATA2 static u8 lit_5143[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5143 = 3.0; /* 804528D0-804528D8 0008+00 s=3 e=0 z=0 None .sdata2 @5144 */ SECTION_SDATA2 static u8 lit_5144[8] = { @@ -839,7 +812,7 @@ SECTION_SDATA2 static u8 lit_5144[8] = { }; /* 804528D8-804528DC 0004+00 s=5 e=0 z=0 None .sdata2 @5145 */ -SECTION_SDATA2 static u32 lit_5145 = 0x43360B61; +SECTION_SDATA2 static f32 lit_5145 = 182.04444885253906f; /* 800897E8-8008A510 0D28+00 s=0 e=1 z=0 None .text fixedFrameEvCamera__9dCamera_cFv */ #pragma push @@ -853,7 +826,7 @@ asm void dCamera_c::fixedFrameEvCamera() { /* ############################################################################################## */ /* 804528DC-804528E0 0004+00 s=10 e=0 z=0 None .sdata2 @5346 */ -SECTION_SDATA2 static u32 lit_5346 = 0x3F800000; +SECTION_SDATA2 static f32 lit_5346 = 1.0f; /* 8008A510-8008A974 0464+00 s=0 e=1 z=0 None .text stokerEvCamera__9dCamera_cFv */ #pragma push @@ -874,9 +847,7 @@ SECTION_SDATA2 static f32 lit_5844[1 + 1 /* padding */] = { }; /* 804528E8-804528F0 0008+00 s=7 e=0 z=0 None .sdata2 @5846 */ -SECTION_SDATA2 static u8 lit_5846[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5846 = 4503599627370496.0 /* cast u32 to float */; /* 8008A974-8008B9B0 103C+00 s=0 e=1 z=0 None .text rollingEvCamera__9dCamera_cFv */ #pragma push @@ -910,9 +881,7 @@ SECTION_SDATA2 static f32 lit_5959[1 + 1 /* padding */] = { }; /* 804528F8-80452900 0008+00 s=10 e=0 z=0 None .sdata2 @5962 */ -SECTION_SDATA2 static u8 lit_5962[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5962 = 4503601774854144.0 /* cast s32 to float */; /* 8008B9B0-8008BE2C 047C+00 s=0 e=1 z=0 None .text fixedPositionEvCamera__9dCamera_cFv */ #pragma push @@ -956,10 +925,10 @@ asm void dCamera_c::uniformAcceleEvCamera() { /* ############################################################################################## */ /* 80452900-80452904 0004+00 s=1 e=0 z=0 None .sdata2 @6682 */ -SECTION_SDATA2 static u32 lit_6682 = 0x43B40000; +SECTION_SDATA2 static f32 lit_6682 = 360.0f; /* 80452904-80452908 0004+00 s=1 e=0 z=0 None .sdata2 @6683 */ -SECTION_SDATA2 static u32 lit_6683 = 0xC3B40000; +SECTION_SDATA2 static f32 lit_6683 = -360.0f; /* 8008BE98-8008E750 28B8+00 s=3 e=0 z=0 None .text transEvCamera__9dCamera_cFi */ #pragma push @@ -1040,46 +1009,46 @@ static u8 lit_6756[12]; static u8 DefaultGap_6755[12]; /* 80452908-8045290C 0004+00 s=2 e=0 z=0 None .sdata2 @7334 */ -SECTION_SDATA2 static u32 lit_7334 = 0x443B8000; +SECTION_SDATA2 static f32 lit_7334 = 750.0f; /* 8045290C-80452910 0004+00 s=1 e=0 z=0 None .sdata2 @7335 */ -SECTION_SDATA2 static u32 lit_7335 = 0x43C80000; +SECTION_SDATA2 static f32 lit_7335 = 400.0f; /* 80452910-80452914 0004+00 s=2 e=0 z=0 None .sdata2 @7336 */ -SECTION_SDATA2 static u32 lit_7336 = 0x44BB8000; +SECTION_SDATA2 static f32 lit_7336 = 1500.0f; /* 80452914-80452918 0004+00 s=1 e=0 z=0 None .sdata2 @7337 */ -SECTION_SDATA2 static u32 lit_7337 = 0x42780000; +SECTION_SDATA2 static f32 lit_7337 = 62.0f; /* 80452918-8045291C 0004+00 s=1 e=0 z=0 None .sdata2 @7338 */ -SECTION_SDATA2 static u32 lit_7338 = 0x43330000; +SECTION_SDATA2 static f32 lit_7338 = 179.0f; /* 8045291C-80452920 0004+00 s=6 e=0 z=0 None .sdata2 @7339 */ -SECTION_SDATA2 static u32 lit_7339 = 0x41200000; +SECTION_SDATA2 static f32 lit_7339 = 10.0f; /* 80452920-80452924 0004+00 s=4 e=0 z=0 None .sdata2 @7340 */ -SECTION_SDATA2 static u32 lit_7340 = 0x40A00000; +SECTION_SDATA2 static f32 lit_7340 = 5.0f; /* 80452924-80452928 0004+00 s=4 e=0 z=0 None .sdata2 @7341 */ -SECTION_SDATA2 static u32 lit_7341 = 0xC0A00000; +SECTION_SDATA2 static f32 lit_7341 = -5.0f; /* 80452928-8045292C 0004+00 s=5 e=0 z=0 None .sdata2 @7342 */ -SECTION_SDATA2 static u32 lit_7342 = 0x42F00000; +SECTION_SDATA2 static f32 lit_7342 = 120.0f; /* 8045292C-80452930 0004+00 s=2 e=0 z=0 None .sdata2 @7343 */ -SECTION_SDATA2 static u32 lit_7343 = 0xC1000000; +SECTION_SDATA2 static f32 lit_7343 = -8.0f; /* 80452930-80452934 0004+00 s=2 e=0 z=0 None .sdata2 @7344 */ -SECTION_SDATA2 static u32 lit_7344 = 0x41000000; +SECTION_SDATA2 static f32 lit_7344 = 8.0f; /* 80452934-80452938 0004+00 s=6 e=0 z=0 None .sdata2 @7345 */ -SECTION_SDATA2 static u32 lit_7345 = 0x428C0000; +SECTION_SDATA2 static f32 lit_7345 = 70.0f; /* 80452938-8045293C 0004+00 s=1 e=0 z=0 None .sdata2 @7346 */ -SECTION_SDATA2 static u32 lit_7346 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_7346 = 1.0f / 10.0f; /* 8045293C-80452940 0004+00 s=6 e=0 z=0 None .sdata2 @7347 */ -SECTION_SDATA2 static u32 lit_7347 = 0x41F00000; +SECTION_SDATA2 static f32 lit_7347 = 30.0f; /* 8008E938-8008FA58 1120+00 s=0 e=1 z=0 None .text watchActorEvCamera__9dCamera_cFv */ #pragma push @@ -1103,7 +1072,7 @@ asm void cSGlobe::V(cSAngle const& param_0) { /* ############################################################################################## */ /* 80452940-80452944 0004+00 s=5 e=0 z=0 None .sdata2 @7357 */ -SECTION_SDATA2 static u32 lit_7357 = 0x41700000; +SECTION_SDATA2 static f32 lit_7357 = 15.0f; /* 8008FA94-8008FAE8 0054+00 s=7 e=0 z=0 None .text * lineCollisionCheck__25@unnamed@d_ev_camera_cpp@F4cXyz4cXyzP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_c @@ -1166,151 +1135,151 @@ asm void dCamera_c::styleEvCamera() { /* ############################################################################################## */ /* 80452944-80452948 0004+00 s=4 e=0 z=0 None .sdata2 @8178 */ -SECTION_SDATA2 static u32 lit_8178 = 0xC2340000; +SECTION_SDATA2 static f32 lit_8178 = -45.0f; /* 80452948-8045294C 0004+00 s=2 e=0 z=0 None .sdata2 @8179 */ -SECTION_SDATA2 static u32 lit_8179 = 0x42AA0000; +SECTION_SDATA2 static f32 lit_8179 = 85.0f; /* 8045294C-80452950 0004+00 s=4 e=0 z=0 None .sdata2 @8180 */ -SECTION_SDATA2 static u32 lit_8180 = 0xC2480000; +SECTION_SDATA2 static f32 lit_8180 = -50.0f; /* 80452950-80452954 0004+00 s=4 e=0 z=0 None .sdata2 @8181 */ -SECTION_SDATA2 static u32 lit_8181 = 0x43250000; +SECTION_SDATA2 static f32 lit_8181 = 165.0f; /* 80452954-80452958 0004+00 s=1 e=0 z=0 None .sdata2 @8182 */ -SECTION_SDATA2 static u32 lit_8182 = 0x42900000; +SECTION_SDATA2 static f32 lit_8182 = 72.0f; /* 80452958-8045295C 0004+00 s=1 e=0 z=0 None .sdata2 @8183 */ -SECTION_SDATA2 static u32 lit_8183 = 0xC2800000; +SECTION_SDATA2 static f32 lit_8183 = -64.0f; /* 8045295C-80452960 0004+00 s=6 e=0 z=0 None .sdata2 @8184 */ -SECTION_SDATA2 static u32 lit_8184 = 0x42700000; +SECTION_SDATA2 static f32 lit_8184 = 60.0f; /* 80452960-80452964 0004+00 s=4 e=0 z=0 None .sdata2 @8185 */ -SECTION_SDATA2 static u32 lit_8185 = 0xC1A00000; +SECTION_SDATA2 static f32 lit_8185 = -20.0f; /* 80452964-80452968 0004+00 s=4 e=0 z=0 None .sdata2 @8186 */ -SECTION_SDATA2 static u32 lit_8186 = 0x42340000; +SECTION_SDATA2 static f32 lit_8186 = 45.0f; /* 80452968-8045296C 0004+00 s=6 e=0 z=0 None .sdata2 @8187 */ -SECTION_SDATA2 static u32 lit_8187 = 0x42200000; +SECTION_SDATA2 static f32 lit_8187 = 40.0f; /* 8045296C-80452970 0004+00 s=6 e=0 z=0 None .sdata2 @8188 */ -SECTION_SDATA2 static u32 lit_8188 = 0xC28C0000; +SECTION_SDATA2 static f32 lit_8188 = -70.0f; /* 80452970-80452974 0004+00 s=3 e=0 z=0 None .sdata2 @8189 */ -SECTION_SDATA2 static u32 lit_8189 = 0x42DC0000; +SECTION_SDATA2 static f32 lit_8189 = 110.0f; /* 80452974-80452978 0004+00 s=4 e=0 z=0 None .sdata2 @8190 */ -SECTION_SDATA2 static u32 lit_8190 = 0xC1200000; +SECTION_SDATA2 static f32 lit_8190 = -10.0f; /* 80452978-8045297C 0004+00 s=2 e=0 z=0 None .sdata2 @8191 */ -SECTION_SDATA2 static u32 lit_8191 = 0xC2F00000; +SECTION_SDATA2 static f32 lit_8191 = -120.0f; /* 8045297C-80452980 0004+00 s=3 e=0 z=0 None .sdata2 @8192 */ -SECTION_SDATA2 static u32 lit_8192 = 0x43020000; +SECTION_SDATA2 static f32 lit_8192 = 130.0f; /* 80452980-80452984 0004+00 s=2 e=0 z=0 None .sdata2 @8193 */ -SECTION_SDATA2 static u32 lit_8193 = 0x420C0000; +SECTION_SDATA2 static f32 lit_8193 = 35.0f; /* 80452984-80452988 0004+00 s=5 e=0 z=0 None .sdata2 @8194 */ -SECTION_SDATA2 static u32 lit_8194 = 0x43200000; +SECTION_SDATA2 static f32 lit_8194 = 160.0f; /* 80452988-8045298C 0004+00 s=3 e=0 z=0 None .sdata2 @8195 */ -SECTION_SDATA2 static u32 lit_8195 = 0x42D20000; +SECTION_SDATA2 static f32 lit_8195 = 105.0f; /* 8045298C-80452990 0004+00 s=2 e=0 z=0 None .sdata2 @8196 */ -SECTION_SDATA2 static u32 lit_8196 = 0xC2820000; +SECTION_SDATA2 static f32 lit_8196 = -65.0f; /* 80452990-80452994 0004+00 s=1 e=0 z=0 None .sdata2 @8197 */ -SECTION_SDATA2 static u32 lit_8197 = 0x43480000; +SECTION_SDATA2 static f32 lit_8197 = 200.0f; /* 80452994-80452998 0004+00 s=3 e=0 z=0 None .sdata2 @8198 */ -SECTION_SDATA2 static u32 lit_8198 = 0x42C80000; +SECTION_SDATA2 static f32 lit_8198 = 100.0f; /* 80452998-8045299C 0004+00 s=4 e=0 z=0 None .sdata2 @8199 */ -SECTION_SDATA2 static u32 lit_8199 = 0xC2700000; +SECTION_SDATA2 static f32 lit_8199 = -60.0f; /* 8045299C-804529A0 0004+00 s=3 e=0 z=0 None .sdata2 @8200 */ -SECTION_SDATA2 static u32 lit_8200 = 0xC2A00000; +SECTION_SDATA2 static f32 lit_8200 = -80.0f; /* 804529A0-804529A4 0004+00 s=2 e=0 z=0 None .sdata2 @8201 */ -SECTION_SDATA2 static u32 lit_8201 = 0x41C80000; +SECTION_SDATA2 static f32 lit_8201 = 25.0f; /* 804529A4-804529A8 0004+00 s=1 e=0 z=0 None .sdata2 @8202 */ -SECTION_SDATA2 static u32 lit_8202 = 0x41400000; +SECTION_SDATA2 static f32 lit_8202 = 12.0f; /* 804529A8-804529AC 0004+00 s=1 e=0 z=0 None .sdata2 @8203 */ -SECTION_SDATA2 static u32 lit_8203 = 0xC30C0000; +SECTION_SDATA2 static f32 lit_8203 = -140.0f; /* 804529AC-804529B0 0004+00 s=2 e=0 z=0 None .sdata2 @8204 */ -SECTION_SDATA2 static u32 lit_8204 = 0x433E0000; +SECTION_SDATA2 static f32 lit_8204 = 190.0f; /* 804529B0-804529B4 0004+00 s=2 e=0 z=0 None .sdata2 @8205 */ -SECTION_SDATA2 static u32 lit_8205 = 0xC3160000; +SECTION_SDATA2 static f32 lit_8205 = -150.0f; /* 804529B4-804529B8 0004+00 s=5 e=0 z=0 None .sdata2 @8206 */ -SECTION_SDATA2 static u32 lit_8206 = 0x41A00000; +SECTION_SDATA2 static f32 lit_8206 = 20.0f; /* 804529B8-804529BC 0004+00 s=2 e=0 z=0 None .sdata2 @8207 */ -SECTION_SDATA2 static u32 lit_8207 = 0xC2960000; +SECTION_SDATA2 static f32 lit_8207 = -75.0f; /* 804529BC-804529C0 0004+00 s=3 e=0 z=0 None .sdata2 @8208 */ -SECTION_SDATA2 static u32 lit_8208 = 0x42E60000; +SECTION_SDATA2 static f32 lit_8208 = 115.0f; /* 804529C0-804529C4 0004+00 s=3 e=0 z=0 None .sdata2 @8209 */ -SECTION_SDATA2 static u32 lit_8209 = 0xC2200000; +SECTION_SDATA2 static f32 lit_8209 = -40.0f; /* 804529C4-804529C8 0004+00 s=1 e=0 z=0 None .sdata2 @8210 */ -SECTION_SDATA2 static u32 lit_8210 = 0x43070000; +SECTION_SDATA2 static f32 lit_8210 = 135.0f; /* 804529C8-804529CC 0004+00 s=3 e=0 z=0 None .sdata2 @8211 */ -SECTION_SDATA2 static u32 lit_8211 = 0x430C0000; +SECTION_SDATA2 static f32 lit_8211 = 140.0f; /* 804529CC-804529D0 0004+00 s=3 e=0 z=0 None .sdata2 @8212 */ -SECTION_SDATA2 static u32 lit_8212 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_8212 = -100.0f; /* 804529D0-804529D4 0004+00 s=1 e=0 z=0 None .sdata2 @8213 */ -SECTION_SDATA2 static u32 lit_8213 = 0x42E00000; +SECTION_SDATA2 static f32 lit_8213 = 112.0f; /* 804529D4-804529D8 0004+00 s=3 e=0 z=0 None .sdata2 @8214 */ -SECTION_SDATA2 static u32 lit_8214 = 0x43160000; +SECTION_SDATA2 static f32 lit_8214 = 150.0f; /* 804529D8-804529DC 0004+00 s=3 e=0 z=0 None .sdata2 @8215 */ -SECTION_SDATA2 static u32 lit_8215 = 0x42820000; +SECTION_SDATA2 static f32 lit_8215 = 65.0f; /* 804529DC-804529E0 0004+00 s=2 e=0 z=0 None .sdata2 @8216 */ -SECTION_SDATA2 static u32 lit_8216 = 0x43340000; +SECTION_SDATA2 static f32 lit_8216 = 180.0f; /* 804529E0-804529E4 0004+00 s=2 e=0 z=0 None .sdata2 @8217 */ -SECTION_SDATA2 static u32 lit_8217 = 0xC3480000; +SECTION_SDATA2 static f32 lit_8217 = -200.0f; /* 804529E4-804529E8 0004+00 s=7 e=0 z=0 None .sdata2 @8218 */ -SECTION_SDATA2 static u32 lit_8218 = 0x42480000; +SECTION_SDATA2 static f32 lit_8218 = 50.0f; /* 804529E8-804529EC 0004+00 s=1 e=0 z=0 None .sdata2 @8219 */ -SECTION_SDATA2 static u32 lit_8219 = 0x43660000; +SECTION_SDATA2 static f32 lit_8219 = 230.0f; /* 804529EC-804529F0 0004+00 s=1 e=0 z=0 None .sdata2 @8220 */ -SECTION_SDATA2 static u32 lit_8220 = 0x3F666666; +SECTION_SDATA2 static f32 lit_8220 = 9.0f / 10.0f; /* 804529F0-804529F4 0004+00 s=2 e=0 z=0 None .sdata2 @8221 */ -SECTION_SDATA2 static u32 lit_8221 = 0x42960000; +SECTION_SDATA2 static f32 lit_8221 = 75.0f; /* 804529F4-804529F8 0004+00 s=1 e=0 z=0 None .sdata2 @8222 */ -SECTION_SDATA2 static u32 lit_8222 = 0x3BA3D70A; +SECTION_SDATA2 static f32 lit_8222 = 0.004999999888241291f; /* 804529F8-804529FC 0004+00 s=4 e=0 z=0 None .sdata2 @8223 */ -SECTION_SDATA2 static u32 lit_8223 = 0x425C0000; +SECTION_SDATA2 static f32 lit_8223 = 55.0f; /* 804529FC-80452A00 0004+00 s=1 e=0 z=0 None .sdata2 @8224 */ -SECTION_SDATA2 static u32 lit_8224 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_8224 = 1.0f / 50.0f; /* 80452A00-80452A04 0004+00 s=3 e=0 z=0 None .sdata2 @8225 */ -SECTION_SDATA2 static u32 lit_8225 = 0x43AF0000; +SECTION_SDATA2 static f32 lit_8225 = 350.0f; /* 80452A04-80452A08 0004+00 s=2 e=0 z=0 None .sdata2 @8226 */ -SECTION_SDATA2 static u32 lit_8226 = 0x3F7AE148; +SECTION_SDATA2 static f32 lit_8226 = 49.0f / 50.0f; /* 80090514-80091468 0F54+00 s=0 e=1 z=0 None .text gameOverEvCamera__9dCamera_cFv */ #pragma push @@ -1358,100 +1327,100 @@ SECTION_DATA static void* lit_8754[30] = { }; /* 80452A08-80452A0C 0004+00 s=1 e=0 z=0 None .sdata2 @8722 */ -SECTION_SDATA2 static u32 lit_8722 = 0x43570000; +SECTION_SDATA2 static f32 lit_8722 = 215.0f; /* 80452A0C-80452A10 0004+00 s=1 e=0 z=0 None .sdata2 @8723 */ -SECTION_SDATA2 static u32 lit_8723 = 0xC1D00000; +SECTION_SDATA2 static f32 lit_8723 = -26.0f; /* 80452A10-80452A14 0004+00 s=2 e=0 z=0 None .sdata2 @8724 */ -SECTION_SDATA2 static u32 lit_8724 = 0x42A00000; +SECTION_SDATA2 static f32 lit_8724 = 80.0f; /* 80452A14-80452A18 0004+00 s=1 e=0 z=0 None .sdata2 @8725 */ -SECTION_SDATA2 static u32 lit_8725 = 0xC0800000; +SECTION_SDATA2 static f32 lit_8725 = -4.0f; /* 80452A18-80452A1C 0004+00 s=1 e=0 z=0 None .sdata2 @8726 */ -SECTION_SDATA2 static u32 lit_8726 = 0x41E00000; +SECTION_SDATA2 static f32 lit_8726 = 28.0f; /* 80452A1C-80452A20 0004+00 s=1 e=0 z=0 None .sdata2 @8727 */ -SECTION_SDATA2 static u32 lit_8727 = 0x435C0000; +SECTION_SDATA2 static f32 lit_8727 = 220.0f; /* 80452A20-80452A24 0004+00 s=2 e=0 z=0 None .sdata2 @8728 */ -SECTION_SDATA2 static u32 lit_8728 = 0xC1700000; +SECTION_SDATA2 static f32 lit_8728 = -15.0f; /* 80452A24-80452A28 0004+00 s=2 e=0 z=0 None .sdata2 @8729 */ -SECTION_SDATA2 static u32 lit_8729 = 0x43700000; +SECTION_SDATA2 static f32 lit_8729 = 240.0f; /* 80452A28-80452A2C 0004+00 s=1 e=0 z=0 None .sdata2 @8730 */ -SECTION_SDATA2 static u32 lit_8730 = 0x43BE0000; +SECTION_SDATA2 static f32 lit_8730 = 380.0f; /* 80452A2C-80452A30 0004+00 s=1 e=0 z=0 None .sdata2 @8731 */ -SECTION_SDATA2 static u32 lit_8731 = 0x43E10000; +SECTION_SDATA2 static f32 lit_8731 = 450.0f; /* 80452A30-80452A34 0004+00 s=1 e=0 z=0 None .sdata2 @8732 */ -SECTION_SDATA2 static u32 lit_8732 = 0xC36B0000; +SECTION_SDATA2 static f32 lit_8732 = -235.0f; /* 80452A34-80452A38 0004+00 s=1 e=0 z=0 None .sdata2 @8733 */ -SECTION_SDATA2 static u32 lit_8733 = 0xC30E0000; +SECTION_SDATA2 static f32 lit_8733 = -142.0f; /* 80452A38-80452A3C 0004+00 s=1 e=0 z=0 None .sdata2 @8734 */ -SECTION_SDATA2 static u32 lit_8734 = 0x43EB0000; +SECTION_SDATA2 static f32 lit_8734 = 470.0f; /* 80452A3C-80452A40 0004+00 s=3 e=0 z=0 None .sdata2 @8735 */ -SECTION_SDATA2 static u32 lit_8735 = 0xC3820000; +SECTION_SDATA2 static f32 lit_8735 = -260.0f; /* 80452A40-80452A44 0004+00 s=1 e=0 z=0 None .sdata2 @8736 */ -SECTION_SDATA2 static u32 lit_8736 = 0xC2840000; +SECTION_SDATA2 static f32 lit_8736 = -66.0f; /* 80452A44-80452A48 0004+00 s=1 e=0 z=0 None .sdata2 @8737 */ -SECTION_SDATA2 static u32 lit_8737 = 0x43C30000; +SECTION_SDATA2 static f32 lit_8737 = 390.0f; /* 80452A48-80452A4C 0004+00 s=1 e=0 z=0 None .sdata2 @8738 */ -SECTION_SDATA2 static u32 lit_8738 = 0x42600000; +SECTION_SDATA2 static f32 lit_8738 = 56.0f; /* 80452A4C-80452A50 0004+00 s=1 e=0 z=0 None .sdata2 @8739 */ -SECTION_SDATA2 static u32 lit_8739 = 0xC1800000; +SECTION_SDATA2 static f32 lit_8739 = -16.0f; /* 80452A50-80452A54 0004+00 s=1 e=0 z=0 None .sdata2 @8740 */ -SECTION_SDATA2 static u32 lit_8740 = 0x41600000; +SECTION_SDATA2 static f32 lit_8740 = 14.0f; /* 80452A54-80452A58 0004+00 s=2 e=0 z=0 None .sdata2 @8741 */ -SECTION_SDATA2 static u32 lit_8741 = 0xC1900000; +SECTION_SDATA2 static f32 lit_8741 = -18.0f; /* 80452A58-80452A5C 0004+00 s=3 e=0 z=0 None .sdata2 @8742 */ -SECTION_SDATA2 static u32 lit_8742 = 0xC1400000; +SECTION_SDATA2 static f32 lit_8742 = -12.0f; /* 80452A5C-80452A60 0004+00 s=1 e=0 z=0 None .sdata2 @8743 */ -SECTION_SDATA2 static u32 lit_8743 = 0xC3000000; +SECTION_SDATA2 static f32 lit_8743 = -128.0f; /* 80452A60-80452A64 0004+00 s=2 e=0 z=0 None .sdata2 @8744 */ -SECTION_SDATA2 static u32 lit_8744 = 0xC1E00000; +SECTION_SDATA2 static f32 lit_8744 = -28.0f; /* 80452A64-80452A68 0004+00 s=1 e=0 z=0 None .sdata2 @8745 */ -SECTION_SDATA2 static u32 lit_8745 = 0x432C0000; +SECTION_SDATA2 static f32 lit_8745 = 172.0f; /* 80452A68-80452A6C 0004+00 s=1 e=0 z=0 None .sdata2 @8746 */ -SECTION_SDATA2 static u32 lit_8746 = 0x42680000; +SECTION_SDATA2 static f32 lit_8746 = 58.0f; /* 80452A6C-80452A70 0004+00 s=2 e=0 z=0 None .sdata2 @8747 */ -SECTION_SDATA2 static u32 lit_8747 = 0xC1C80000; +SECTION_SDATA2 static f32 lit_8747 = -25.0f; /* 80452A70-80452A74 0004+00 s=1 e=0 z=0 None .sdata2 @8748 */ -SECTION_SDATA2 static u32 lit_8748 = 0xC2600000; +SECTION_SDATA2 static f32 lit_8748 = -56.0f; /* 80452A74-80452A78 0004+00 s=1 e=0 z=0 None .sdata2 @8749 */ -SECTION_SDATA2 static u32 lit_8749 = 0xC2580000; +SECTION_SDATA2 static f32 lit_8749 = -54.0f; /* 80452A78-80452A7C 0004+00 s=2 e=0 z=0 None .sdata2 @8750 */ -SECTION_SDATA2 static u32 lit_8750 = 0x42D80000; +SECTION_SDATA2 static f32 lit_8750 = 108.0f; /* 80452A7C-80452A80 0004+00 s=1 e=0 z=0 None .sdata2 @8751 */ -SECTION_SDATA2 static u32 lit_8751 = 0xC29C0000; +SECTION_SDATA2 static f32 lit_8751 = -78.0f; /* 80452A80-80452A84 0004+00 s=3 e=0 z=0 None .sdata2 @8752 */ -SECTION_SDATA2 static u32 lit_8752 = 0xC1F00000; +SECTION_SDATA2 static f32 lit_8752 = -30.0f; /* 80452A84-80452A88 0004+00 s=1 e=0 z=0 None .sdata2 @8753 */ -SECTION_SDATA2 static u32 lit_8753 = 0xC3200000; +SECTION_SDATA2 static f32 lit_8753 = -160.0f; /* 80091468-8009236C 0F04+00 s=1 e=1 z=0 None .text tactEvCamera__9dCamera_cFv */ #pragma push @@ -1512,145 +1481,145 @@ asm void dCamera_c::loadEvCamera() { /* ############################################################################################## */ /* 80452A88-80452A8C 0004+00 s=1 e=0 z=0 None .sdata2 @9395 */ -SECTION_SDATA2 static u32 lit_9395 = 0x42800000; +SECTION_SDATA2 static f32 lit_9395 = 64.0f; /* 80452A8C-80452A90 0004+00 s=1 e=0 z=0 None .sdata2 @9396 */ -SECTION_SDATA2 static u32 lit_9396 = 0x42EC0000; +SECTION_SDATA2 static f32 lit_9396 = 118.0f; /* 80452A90-80452A94 0004+00 s=1 e=0 z=0 None .sdata2 @9397 */ -SECTION_SDATA2 static u32 lit_9397 = 0xC2000000; +SECTION_SDATA2 static f32 lit_9397 = -32.0f; /* 80452A94-80452A98 0004+00 s=1 e=0 z=0 None .sdata2 @9398 */ -SECTION_SDATA2 static u32 lit_9398 = 0xC2500000; +SECTION_SDATA2 static f32 lit_9398 = -52.0f; /* 80452A98-80452A9C 0004+00 s=1 e=0 z=0 None .sdata2 @9399 */ -SECTION_SDATA2 static u32 lit_9399 = 0x42080000; +SECTION_SDATA2 static f32 lit_9399 = 34.0f; /* 80452A9C-80452AA0 0004+00 s=1 e=0 z=0 None .sdata2 @9400 */ -SECTION_SDATA2 static u32 lit_9400 = 0x42E80000; +SECTION_SDATA2 static f32 lit_9400 = 116.0f; /* 80452AA0-80452AA4 0004+00 s=1 e=0 z=0 None .sdata2 @9401 */ -SECTION_SDATA2 static u32 lit_9401 = 0x42B00000; +SECTION_SDATA2 static f32 lit_9401 = 88.0f; /* 80452AA4-80452AA8 0004+00 s=1 e=0 z=0 None .sdata2 @9402 */ -SECTION_SDATA2 static u32 lit_9402 = 0xC2040000; +SECTION_SDATA2 static f32 lit_9402 = -33.0f; /* 80452AA8-80452AAC 0004+00 s=1 e=0 z=0 None .sdata2 @9403 */ -SECTION_SDATA2 static u32 lit_9403 = 0xC25C0000; +SECTION_SDATA2 static f32 lit_9403 = -55.0f; /* 80452AAC-80452AB0 0004+00 s=1 e=0 z=0 None .sdata2 @9404 */ -SECTION_SDATA2 static u32 lit_9404 = 0x41800000; +SECTION_SDATA2 static f32 lit_9404 = 16.0f; /* 80452AB0-80452AB4 0004+00 s=1 e=0 z=0 None .sdata2 @9405 */ -SECTION_SDATA2 static u32 lit_9405 = 0x42500000; +SECTION_SDATA2 static f32 lit_9405 = 52.0f; /* 80452AB4-80452AB8 0004+00 s=3 e=0 z=0 None .sdata2 @9406 */ -SECTION_SDATA2 static u32 lit_9406 = 0xC2AA0000; +SECTION_SDATA2 static f32 lit_9406 = -85.0f; /* 80452AB8-80452ABC 0004+00 s=1 e=0 z=0 None .sdata2 @9407 */ -SECTION_SDATA2 static u32 lit_9407 = 0xC2BE0000; +SECTION_SDATA2 static f32 lit_9407 = -95.0f; /* 80452ABC-80452AC0 0004+00 s=1 e=0 z=0 None .sdata2 @9408 */ -SECTION_SDATA2 static u32 lit_9408 = 0x42B80000; +SECTION_SDATA2 static f32 lit_9408 = 92.0f; /* 80452AC0-80452AC4 0004+00 s=1 e=0 z=0 None .sdata2 @9409 */ -SECTION_SDATA2 static u32 lit_9409 = 0x431B0000; +SECTION_SDATA2 static f32 lit_9409 = 155.0f; /* 80452AC4-80452AC8 0004+00 s=2 e=0 z=0 None .sdata2 @9410 */ -SECTION_SDATA2 static u32 lit_9410 = 0xC1D80000; +SECTION_SDATA2 static f32 lit_9410 = -27.0f; /* 80452AC8-80452ACC 0004+00 s=1 e=0 z=0 None .sdata2 @9411 */ -SECTION_SDATA2 static u32 lit_9411 = 0xC2B40000; +SECTION_SDATA2 static f32 lit_9411 = -90.0f; /* 80452ACC-80452AD0 0004+00 s=1 e=0 z=0 None .sdata2 @9412 */ -SECTION_SDATA2 static u32 lit_9412 = 0xC2880000; +SECTION_SDATA2 static f32 lit_9412 = -68.0f; /* 80452AD0-80452AD4 0004+00 s=1 e=0 z=0 None .sdata2 @9413 */ -SECTION_SDATA2 static u32 lit_9413 = 0x42E40000; +SECTION_SDATA2 static f32 lit_9413 = 114.0f; /* 80452AD4-80452AD8 0004+00 s=1 e=0 z=0 None .sdata2 @9414 */ -SECTION_SDATA2 static u32 lit_9414 = 0xC2DC0000; +SECTION_SDATA2 static f32 lit_9414 = -110.0f; /* 80452AD8-80452ADC 0004+00 s=1 e=0 z=0 None .sdata2 @9415 */ -SECTION_SDATA2 static u32 lit_9415 = 0x41F1ED91; +SECTION_SDATA2 static f32 lit_9415 = 30.240999221801758f; /* 80452ADC-80452AE0 0004+00 s=1 e=0 z=0 None .sdata2 @9416 */ -SECTION_SDATA2 static u32 lit_9416 = 0x414A72B0; +SECTION_SDATA2 static f32 lit_9416 = 12.652999877929688f; /* 80452AE0-80452AE4 0004+00 s=1 e=0 z=0 None .sdata2 @9417 */ -SECTION_SDATA2 static u32 lit_9417 = 0x415F3333; +SECTION_SDATA2 static f32 lit_9417 = 13.949999809265137f; /* 80452AE4-80452AE8 0004+00 s=1 e=0 z=0 None .sdata2 @9418 */ -SECTION_SDATA2 static u32 lit_9418 = 0x41BD1CAC; +SECTION_SDATA2 static f32 lit_9418 = 23.638999938964844f; /* 80452AE8-80452AEC 0004+00 s=1 e=0 z=0 None .sdata2 @9419 */ -SECTION_SDATA2 static u32 lit_9419 = 0x42C145A2; +SECTION_SDATA2 static f32 lit_9419 = 96.63600158691406f; /* 80452AEC-80452AF0 0004+00 s=1 e=0 z=0 None .sdata2 @9420 */ -SECTION_SDATA2 static u32 lit_9420 = 0x426545A2; +SECTION_SDATA2 static f32 lit_9420 = 57.31800079345703f; /* 80452AF0-80452AF4 0004+00 s=1 e=0 z=0 None .sdata2 @9421 */ -SECTION_SDATA2 static u32 lit_9421 = 0xC0365604; +SECTION_SDATA2 static f32 lit_9421 = -2.8489999771118164f; /* 80452AF4-80452AF8 0004+00 s=1 e=0 z=0 None .sdata2 @9422 */ -SECTION_SDATA2 static u32 lit_9422 = 0x42C1472B; +SECTION_SDATA2 static f32 lit_9422 = 96.63899993896484f; /* 80452AF8-80452AFC 0004+00 s=1 e=0 z=0 None .sdata2 @9423 */ -SECTION_SDATA2 static u32 lit_9423 = 0x422B0312; +SECTION_SDATA2 static f32 lit_9423 = 42.75299835205078f; /* 80452AFC-80452B00 0004+00 s=2 e=0 z=0 None .sdata2 @9424 */ -SECTION_SDATA2 static u32 lit_9424 = 0xC3020000; +SECTION_SDATA2 static f32 lit_9424 = -130.0f; /* 80452B00-80452B04 0004+00 s=1 e=0 z=0 None .sdata2 @9425 */ -SECTION_SDATA2 static u32 lit_9425 = 0xC3D20000; +SECTION_SDATA2 static f32 lit_9425 = -420.0f; /* 80452B04-80452B08 0004+00 s=1 e=0 z=0 None .sdata2 @9426 */ -SECTION_SDATA2 static u32 lit_9426 = 0xC3C80000; +SECTION_SDATA2 static f32 lit_9426 = -400.0f; /* 80452B08-80452B0C 0004+00 s=1 e=0 z=0 None .sdata2 @9427 */ -SECTION_SDATA2 static u32 lit_9427 = 0x42BE0000; +SECTION_SDATA2 static f32 lit_9427 = 95.0f; /* 80452B0C-80452B10 0004+00 s=1 e=0 z=0 None .sdata2 @9428 */ -SECTION_SDATA2 static u32 lit_9428 = 0xC3750000; +SECTION_SDATA2 static f32 lit_9428 = -245.0f; /* 80452B10-80452B14 0004+00 s=1 e=0 z=0 None .sdata2 @9429 */ -SECTION_SDATA2 static u32 lit_9429 = 0xC2680000; +SECTION_SDATA2 static f32 lit_9429 = -58.0f; /* 80452B14-80452B18 0004+00 s=1 e=0 z=0 None .sdata2 @9430 */ -SECTION_SDATA2 static u32 lit_9430 = 0xC37A0000; +SECTION_SDATA2 static f32 lit_9430 = -250.0f; /* 80452B18-80452B1C 0004+00 s=1 e=0 z=0 None .sdata2 @9431 */ -SECTION_SDATA2 static u32 lit_9431 = 0xC2D20000; +SECTION_SDATA2 static f32 lit_9431 = -105.0f; /* 80452B1C-80452B20 0004+00 s=1 e=0 z=0 None .sdata2 @9432 */ -SECTION_SDATA2 static u32 lit_9432 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_9432 = 1.5f; /* 80452B20-80452B24 0004+00 s=1 e=0 z=0 None .sdata2 @9433 */ -SECTION_SDATA2 static u32 lit_9433 = 0x423C0000; +SECTION_SDATA2 static f32 lit_9433 = 47.0f; /* 80452B24-80452B28 0004+00 s=1 e=0 z=0 None .sdata2 @9434 */ -SECTION_SDATA2 static u32 lit_9434 = 0x42E20000; +SECTION_SDATA2 static f32 lit_9434 = 113.0f; /* 80452B28-80452B2C 0004+00 s=1 e=0 z=0 None .sdata2 @9435 */ -SECTION_SDATA2 static u32 lit_9435 = 0x42C00000; +SECTION_SDATA2 static f32 lit_9435 = 96.0f; /* 80452B2C-80452B30 0004+00 s=1 e=0 z=0 None .sdata2 @9436 */ -SECTION_SDATA2 static u32 lit_9436 = 0x42180000; +SECTION_SDATA2 static f32 lit_9436 = 38.0f; /* 80452B30-80452B34 0004+00 s=1 e=0 z=0 None .sdata2 @9437 */ -SECTION_SDATA2 static u32 lit_9437 = 0x42A40000; +SECTION_SDATA2 static f32 lit_9437 = 82.0f; /* 80452B34-80452B38 0004+00 s=1 e=0 z=0 None .sdata2 @9438 */ -SECTION_SDATA2 static u32 lit_9438 = 0x43AA0000; +SECTION_SDATA2 static f32 lit_9438 = 340.0f; /* 80452B38-80452B3C 0004+00 s=1 e=0 z=0 None .sdata2 @9439 */ -SECTION_SDATA2 static u32 lit_9439 = 0xC2E60000; +SECTION_SDATA2 static f32 lit_9439 = -115.0f; /* 80452B3C-80452B40 0004+00 s=1 e=0 z=0 None .sdata2 @9440 */ -SECTION_SDATA2 static u32 lit_9440 = 0x43870000; +SECTION_SDATA2 static f32 lit_9440 = 270.0f; /* 80452B40-80452B44 0004+00 s=2 e=0 z=0 None .sdata2 @9441 */ -SECTION_SDATA2 static u32 lit_9441 = 0x43960000; +SECTION_SDATA2 static f32 lit_9441 = 300.0f; /* 800929AC-800937AC 0E00+00 s=0 e=1 z=0 None .text useItem0EvCamera__9dCamera_cFv */ #pragma push @@ -1664,16 +1633,16 @@ asm void dCamera_c::useItem0EvCamera() { /* ############################################################################################## */ /* 80452B44-80452B48 0004+00 s=2 e=0 z=0 None .sdata2 @9798 */ -SECTION_SDATA2 static u32 lit_9798 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_9798 = 1.0f / 20.0f; /* 80452B48-80452B4C 0004+00 s=1 e=0 z=0 None .sdata2 @9799 */ -SECTION_SDATA2 static u32 lit_9799 = 0x42B40000; +SECTION_SDATA2 static f32 lit_9799 = 90.0f; /* 80452B4C-80452B50 0004+00 s=1 e=0 z=0 None .sdata2 @9800 */ -SECTION_SDATA2 static u32 lit_9800 = 0xC3340000; +SECTION_SDATA2 static f32 lit_9800 = -180.0f; /* 80452B50-80452B54 0004+00 s=1 e=0 z=0 None .sdata2 @9801 */ -SECTION_SDATA2 static u32 lit_9801 = 0x432A0000; +SECTION_SDATA2 static f32 lit_9801 = 170.0f; /* 800937AC-80094240 0A94+00 s=0 e=1 z=0 None .text useItem1EvCamera__9dCamera_cFv */ #pragma push @@ -1687,31 +1656,31 @@ asm void dCamera_c::useItem1EvCamera() { /* ############################################################################################## */ /* 80452B54-80452B58 0004+00 s=1 e=0 z=0 None .sdata2 @10118 */ -SECTION_SDATA2 static u32 lit_10118 = 0x42000000; +SECTION_SDATA2 static f32 lit_10118 = 32.0f; /* 80452B58-80452B5C 0004+00 s=1 e=0 z=0 None .sdata2 @10119 */ -SECTION_SDATA2 static u32 lit_10119 = 0x42A80000; +SECTION_SDATA2 static f32 lit_10119 = 84.0f; /* 80452B5C-80452B60 0004+00 s=1 e=0 z=0 None .sdata2 @10120 */ -SECTION_SDATA2 static u32 lit_10120 = 0x43060000; +SECTION_SDATA2 static f32 lit_10120 = 134.0f; /* 80452B60-80452B64 0004+00 s=1 e=0 z=0 None .sdata2 @10121 */ -SECTION_SDATA2 static u32 lit_10121 = 0x41880000; +SECTION_SDATA2 static f32 lit_10121 = 17.0f; /* 80452B64-80452B68 0004+00 s=1 e=0 z=0 None .sdata2 @10122 */ -SECTION_SDATA2 static u32 lit_10122 = 0x43000000; +SECTION_SDATA2 static f32 lit_10122 = 128.0f; /* 80452B68-80452B6C 0004+00 s=1 e=0 z=0 None .sdata2 @10123 */ -SECTION_SDATA2 static u32 lit_10123 = 0xC2780000; +SECTION_SDATA2 static f32 lit_10123 = -62.0f; /* 80452B6C-80452B70 0004+00 s=1 e=0 z=0 None .sdata2 @10124 */ -SECTION_SDATA2 static u32 lit_10124 = 0xC2A80000; +SECTION_SDATA2 static f32 lit_10124 = -84.0f; /* 80452B70-80452B74 0004+00 s=1 e=0 z=0 None .sdata2 @10125 */ -SECTION_SDATA2 static u32 lit_10125 = 0xC3240000; +SECTION_SDATA2 static f32 lit_10125 = -164.0f; /* 80452B74-80452B78 0004+00 s=1 e=0 z=0 None .sdata2 @10126 */ -SECTION_SDATA2 static u32 lit_10126 = 0xC35C0000; +SECTION_SDATA2 static f32 lit_10126 = -220.0f; /* 80094240-80094A70 0830+00 s=0 e=1 z=0 None .text getItemEvCamera__9dCamera_cFv */ #pragma push @@ -1725,25 +1694,25 @@ asm void dCamera_c::getItemEvCamera() { /* ############################################################################################## */ /* 80452B78-80452B7C 0004+00 s=1 e=0 z=0 None .sdata2 @10278 */ -SECTION_SDATA2 static u32 lit_10278 = 0x3F000000; +SECTION_SDATA2 static f32 lit_10278 = 0.5f; /* 80452B7C-80452B80 0004+00 s=1 e=0 z=0 None .sdata2 @10279 */ -SECTION_SDATA2 static u32 lit_10279 = 0x3F7D70A4; +SECTION_SDATA2 static f32 lit_10279 = 99.0f / 100.0f; /* 80452B80-80452B84 0004+00 s=1 e=0 z=0 None .sdata2 @10280 */ -SECTION_SDATA2 static u32 lit_10280 = 0x3F2147AE; +SECTION_SDATA2 static f32 lit_10280 = 63.0f / 100.0f; /* 80452B84-80452B88 0004+00 s=1 e=0 z=0 None .sdata2 @10281 */ -SECTION_SDATA2 static u32 lit_10281 = 0x3F333333; +SECTION_SDATA2 static f32 lit_10281 = 7.0f / 10.0f; /* 80452B88-80452B8C 0004+00 s=1 e=0 z=0 None .sdata2 @10282 */ -SECTION_SDATA2 static u32 lit_10282 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_10282 = 11.0f / 10.0f; /* 80452B8C-80452B90 0004+00 s=1 e=0 z=0 None .sdata2 @10283 */ -SECTION_SDATA2 static u32 lit_10283 = 0x3DB851EC; +SECTION_SDATA2 static f32 lit_10283 = 9.0f / 100.0f; /* 80452B90-80452B94 0004+00 s=1 e=0 z=0 None .sdata2 @10284 */ -SECTION_SDATA2 static u32 lit_10284 = 0x3E3851EC; +SECTION_SDATA2 static f32 lit_10284 = 9.0f / 50.0f; /* 80094A70-80095010 05A0+00 s=0 e=1 z=0 None .text possessedEvCamera__9dCamera_cFv */ #pragma push @@ -1757,7 +1726,7 @@ asm void dCamera_c::possessedEvCamera() { /* ############################################################################################## */ /* 80452B94-80452B98 0004+00 s=1 e=0 z=0 None .sdata2 @10437 */ -SECTION_SDATA2 static u32 lit_10437 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_10437 = 1.0f / 100.0f; /* 80095010-8009544C 043C+00 s=0 e=1 z=0 None .text fixedFramesEvCamera__9dCamera_cFv */ #pragma push @@ -1787,13 +1756,13 @@ static u8 lit_10516[12]; static f32 DefaultGap_10515[3]; /* 80452B98-80452B9C 0004+00 s=1 e=0 z=0 None .sdata2 @10780 */ -SECTION_SDATA2 static u32 lit_10780 = 0xBDCCCCCD; +SECTION_SDATA2 static f32 lit_10780 = -1.0f / 10.0f; /* 80452B9C-80452BA0 0004+00 s=1 e=0 z=0 None .sdata2 @10781 */ -SECTION_SDATA2 static u32 lit_10781 = 0x461C4000; +SECTION_SDATA2 static f32 lit_10781 = 10000.0f; /* 80452BA0-80452BA4 0004+00 s=1 e=0 z=0 None .sdata2 @10782 */ -SECTION_SDATA2 static u32 lit_10782 = 0x3E800000; +SECTION_SDATA2 static f32 lit_10782 = 0.25f; /* 800956E4-80095E7C 0798+00 s=0 e=1 z=0 None .text twoActor0EvCamera__9dCamera_cFv */ #pragma push @@ -1817,7 +1786,7 @@ asm void dCamera_c::peepHoleEvCamera() { /* ############################################################################################## */ /* 80452BA4-80452BA8 0004+00 s=1 e=0 z=0 None .sdata2 @11068 */ -SECTION_SDATA2 static u32 lit_11068 = 0x43750000; +SECTION_SDATA2 static f32 lit_11068 = 245.0f; /* 80095FD0-800965AC 05DC+00 s=0 e=1 z=0 None .text digHoleEvCamera__9dCamera_cFv */ #pragma push @@ -1831,28 +1800,28 @@ asm void dCamera_c::digHoleEvCamera() { /* ############################################################################################## */ /* 80452BA8-80452BAC 0004+00 s=1 e=0 z=0 None .sdata2 @11415 */ -SECTION_SDATA2 static u32 lit_11415 = 0x438C0000; +SECTION_SDATA2 static f32 lit_11415 = 280.0f; /* 80452BAC-80452BB0 0004+00 s=1 e=0 z=0 None .sdata2 @11416 */ -SECTION_SDATA2 static u32 lit_11416 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_11416 = 4.0f / 5.0f; /* 80452BB0-80452BB4 0004+00 s=1 e=0 z=0 None .sdata2 @11417 */ -SECTION_SDATA2 static u32 lit_11417 = 0xBF800000; +SECTION_SDATA2 static f32 lit_11417 = -1.0f; /* 80452BB4-80452BB8 0004+00 s=1 e=0 z=0 None .sdata2 @11418 */ -SECTION_SDATA2 static u32 lit_11418 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_11418 = 1.0f / 5.0f; /* 80452BB8-80452BBC 0004+00 s=1 e=0 z=0 None .sdata2 @11419 */ -SECTION_SDATA2 static u32 lit_11419 = 0xC0200000; +SECTION_SDATA2 static f32 lit_11419 = -2.5f; /* 80452BBC-80452BC0 0004+00 s=1 e=0 z=0 None .sdata2 @11420 */ -SECTION_SDATA2 static u32 lit_11420 = 0x40900000; +SECTION_SDATA2 static f32 lit_11420 = 4.5f; /* 80452BC0-80452BC4 0004+00 s=1 e=0 z=0 None .sdata2 @11421 */ -SECTION_SDATA2 static u32 lit_11421 = 0x3F400000; +SECTION_SDATA2 static f32 lit_11421 = 0.75f; /* 80452BC4-80452BC8 0004+00 s=1 e=0 z=0 None .sdata2 @11422 */ -SECTION_SDATA2 static u32 lit_11422 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_11422 = 2.0f / 5.0f; /* 800965AC-80096EDC 0930+00 s=0 e=1 z=0 None .text hintTalkEvCamera__9dCamera_cFv */ #pragma push diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index e6171376704..3469127f81d 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -32,11 +32,6 @@ struct JUTNameTab { // Forward References: // -extern "C" extern char const* const d_d_eye_hl__stringBase0; -extern "C" extern u8 struct_80450FB0[8]; -extern "C" extern u8 struct_80450FB8[4]; -extern "C" extern u8 struct_80450FBC[4]; - extern "C" void entry__8dEyeHL_cFP12J3DModelDataPCc(); extern "C" void remove__8dEyeHL_cFv(); extern "C" void update__12dEyeHL_mng_cFv(); @@ -51,9 +46,6 @@ extern "C" extern u8 struct_80450FBC[4]; // External References: // -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_envHIO[68]; - extern "C" void OSReport_Error(); extern "C" void getName__10JUTNameTabCFUs(); extern "C" void _savegpr_27(); @@ -101,10 +93,10 @@ asm void dEyeHL_c::remove() { static u8 m_obj__12dEyeHL_mng_c[4 + 4 /* padding */]; /* 80452C10-80452C14 0004+00 s=1 e=0 z=0 None .sdata2 @3862 */ -SECTION_SDATA2 static u32 lit_3862 = 0x40000000; +SECTION_SDATA2 static f32 lit_3862 = 2.0f; /* 80452C14-80452C18 0004+00 s=1 e=0 z=0 None .sdata2 @3863 */ -SECTION_SDATA2 static u32 lit_3863 = 0x42340000; +SECTION_SDATA2 static f32 lit_3863 = 45.0f; /* 8009CA48-8009CB14 00CC+00 s=0 e=1 z=0 None .text update__12dEyeHL_mng_cFv */ #pragma push diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 736b324f25f..9c0fc4778f9 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -159,9 +159,6 @@ static void dGameover_Delete(dGameover_c*); static void dGameover_Create(msg_class*); void d_GameOver_Create(u8); void d_GameOver_Delete(unsigned int&); -extern "C" extern char const* const d_d_gameover__stringBase0; -extern "C" extern void* g_profile_GAMEOVER[10]; -extern "C" extern void* __vt__12dMenu_save_c[3 + 3 /* padding */]; extern "C" void draw__24dDlst_Gameover_CAPTURE_cFv(); extern "C" void __ct__10dGov_HIO_cFv(); @@ -222,27 +219,6 @@ void dComIfGp_offHeapLockFlag(int); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__14mDoHIO_entry_c[3]; -extern "C" extern void* __vt__16dDlst_MenuSave_c[4]; -extern "C" extern void* __vt__23dDlst_MenuSaveExplain_c[4 + 18 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mFadeColor__13mDoGph_gInf_c[4]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u32 g_blackColor; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" extern u8 mZbufferTex__13mDoGph_gInf_c[4]; -extern "C" extern f32 mFadeRate__13mDoGph_gInf_c; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 g_menuHIO[8]; -extern "C" extern u8 sManager__10JFWDisplay[4]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getSubFont__Fv(); @@ -357,10 +333,10 @@ SECTION_SDATA2 static u8 lit_3868[4] = { }; /* 80453B84-80453B88 0004+00 s=6 e=0 z=0 None .sdata2 @3869 */ -SECTION_SDATA2 static u32 lit_3869 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3869 = 1.0f; /* 80453B88-80453B8C 0004+00 s=1 e=0 z=0 None .sdata2 @3870 */ -SECTION_SDATA2 static u32 lit_3870 = 0x41200000; +SECTION_SDATA2 static f32 lit_3870 = 10.0f; /* 8019ACF8-8019AFE0 02E8+00 s=1 e=0 z=0 None .text draw__24dDlst_Gameover_CAPTURE_cFv */ #pragma push @@ -579,10 +555,10 @@ SECTION_DATA static void* __vt__10dGov_HIO_c[3 + 3 /* padding */] = { }; /* 80453B8C-80453B90 0004+00 s=1 e=0 z=0 None .sdata2 @3878 */ -SECTION_SDATA2 static u32 lit_3878 = 0x402CCCCD; +SECTION_SDATA2 static f32 lit_3878 = 27.0f / 10.0f; /* 80453B90-80453B94 0004+00 s=1 e=0 z=0 None .sdata2 @3879 */ -SECTION_SDATA2 static u32 lit_3879 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_3879 = 1.0f / 5.0f; /* 8019AFE0-8019B044 0064+00 s=1 e=0 z=0 None .text __ct__10dGov_HIO_cFv */ #pragma push @@ -722,12 +698,10 @@ asm void dGameover_c::demoFadeOut_init() { /* ############################################################################################## */ /* 80453B94-80453B98 0004+00 s=1 e=0 z=0 None .sdata2 @4069 */ -SECTION_SDATA2 static u32 lit_4069 = 0x44610000; +SECTION_SDATA2 static f32 lit_4069 = 900.0f; /* 80453B98-80453BA0 0008+00 s=1 e=0 z=0 None .sdata2 @4071 */ -SECTION_SDATA2 static u8 lit_4071[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4071 = 4503601774854144.0 /* cast s32 to float */; /* 8019B4E4-8019B560 007C+00 s=1 e=0 z=0 None .text demoFadeOut_proc__11dGameover_cFv */ #pragma push @@ -816,10 +790,10 @@ asm void dGameover_c::_delete() { /* ############################################################################################## */ /* 80453BA0-80453BA4 0004+00 s=1 e=0 z=0 None .sdata2 @4290 */ -SECTION_SDATA2 static u32 lit_4290 = 0x43F30000; +SECTION_SDATA2 static f32 lit_4290 = 486.0f; /* 80453BA4-80453BA8 0004+00 s=1 e=0 z=0 None .sdata2 @4291 */ -SECTION_SDATA2 static u32 lit_4291 = 0x44250000; +SECTION_SDATA2 static f32 lit_4291 = 660.0f; /* 8019B940-8019BBFC 02BC+00 s=1 e=0 z=0 None .text * __ct__24dDlst_GameOverScrnDraw_cFP10JKRArchive */ @@ -844,7 +818,7 @@ asm dDlst_GameOverScrnDraw_c::~dDlst_GameOverScrnDraw_c() { /* ############################################################################################## */ /* 80453BA8-80453BAC 0004+00 s=1 e=0 z=0 None .sdata2 @4316 */ -SECTION_SDATA2 static u32 lit_4316 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4316 = 255.0f; /* 8019BCB0-8019BCF4 0044+00 s=3 e=0 z=0 None .text setBackAlpha__24dDlst_GameOverScrnDraw_cFf */ @@ -865,13 +839,13 @@ static u8 lit_3882[12]; static u8 l_HIO[28]; /* 80453BAC-80453BB0 0004+00 s=1 e=0 z=0 None .sdata2 @4374 */ -SECTION_SDATA2 static u32 lit_4374 = 0x44180000; +SECTION_SDATA2 static f32 lit_4374 = 608.0f; /* 80453BB0-80453BB4 0004+00 s=1 e=0 z=0 None .sdata2 @4375 */ -SECTION_SDATA2 static u32 lit_4375 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4375 = 448.0f; /* 80453BB4-80453BB8 0004+00 s=1 e=0 z=0 None .sdata2 @4376 */ -SECTION_SDATA2 static u32 lit_4376 = 0x43980000; +SECTION_SDATA2 static f32 lit_4376 = 304.0f; /* 80453BB8-80453BC0 0004+04 s=1 e=0 z=0 None .sdata2 @4377 */ SECTION_SDATA2 static f32 lit_4377[1 + 1 /* padding */] = { diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index 4ca549dd3c6..56a424a46c0 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -53,8 +53,6 @@ struct Vec {}; // Forward References: // -extern "C" extern char const* const d_d_insect__stringBase0; - extern "C" void __ct__9dInsect_cFv(); extern "C" void Insect_GetDemoMain__9dInsect_cFv(); extern "C" void CalcZBuffer__9dInsect_cFf(); @@ -71,8 +69,6 @@ void fopAcM_orderItemEvent(fopAc_ac_c*, u16, u16); void fopAcM_createItemForTrBoxDemo(cXyz const*, int, int, int, csXyz const*, cXyz const*); void fopAcM_createItem(cXyz const*, int, int, int, csXyz const*, cXyz const*, int); void fopAcM_cancelCarryNow(fopAc_ac_c*); -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoLib_project__FP3VecP3Vec(); extern "C" void mDoLib_pos2camera__FP3VecP3Vec(); @@ -136,7 +132,7 @@ asm void dInsect_c::Insect_GetDemoMain() { /* ############################################################################################## */ /* 804535E0-804535E4 0004+00 s=1 e=0 z=0 None .sdata2 @3871 */ -SECTION_SDATA2 static u32 lit_3871 = 0x41A00000; +SECTION_SDATA2 static f32 lit_3871 = 20.0f; /* 804535E4-804535E8 0004+00 s=1 e=0 z=0 None .sdata2 @3872 */ SECTION_SDATA2 static u8 lit_3872[4] = { @@ -147,16 +143,16 @@ SECTION_SDATA2 static u8 lit_3872[4] = { }; /* 804535E8-804535EC 0004+00 s=1 e=0 z=0 None .sdata2 @3873 */ -SECTION_SDATA2 static u32 lit_3873 = 0x44180000; +SECTION_SDATA2 static f32 lit_3873 = 608.0f; /* 804535EC-804535F0 0004+00 s=1 e=0 z=0 None .sdata2 @3874 */ -SECTION_SDATA2 static u32 lit_3874 = 0x43E00000; +SECTION_SDATA2 static f32 lit_3874 = 448.0f; /* 804535F0-804535F4 0004+00 s=1 e=0 z=0 None .sdata2 @3875 */ -SECTION_SDATA2 static u32 lit_3875 = 0xC1200000; +SECTION_SDATA2 static f32 lit_3875 = -10.0f; /* 804535F4-804535F8 0004+00 s=1 e=0 z=0 None .sdata2 @3876 */ -SECTION_SDATA2 static u32 lit_3876 = 0x4B7FFFFF; +SECTION_SDATA2 static f32 lit_3876 = 16777215.0f; /* 804535F8-80453600 0004+04 s=1 e=0 z=0 None .sdata2 @3877 */ SECTION_SDATA2 static f32 lit_3877[1 + 1 /* padding */] = { diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 67d1f3f4e3b..3bb776ec543 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -460,8 +460,6 @@ void isHeart(u8); void isInsect(u8); void check_itemno(int); static void addBombCount(u8, u8); -extern "C" extern char const* const d_d_item__stringBase0; -extern "C" extern u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; extern "C" void execItemGet__FUc(); extern "C" void checkItemGet__FUci(); @@ -860,9 +858,6 @@ void dComIfGs_setSelectEquipClothes(u8); void dComIfGs_setSelectEquipSword(u8); void dComIfGs_setSelectEquipShield(u8); void dMeter2Info_setSword(u8, bool); -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void setItemBombNumCount__14dComIfG_play_cFUcs(); extern "C" void getLayerNo__14dComIfG_play_cFi(); @@ -1455,7 +1450,7 @@ asm void checkItemGet(u8 param_0, int param_1) { /* ############################################################################################## */ /* 80452BD8-80452BDC 0004+00 s=1 e=0 z=0 None .sdata2 @3655 */ -SECTION_SDATA2 static u32 lit_3655 = 0x40800000; +SECTION_SDATA2 static f32 lit_3655 = 4.0f; /* 80097F2C-80097F50 0024+00 s=1 e=0 z=0 None .text item_func_HEART__Fv */ #pragma push @@ -1724,7 +1719,7 @@ static void item_func_BOMB_INSECT_30() { /* ############################################################################################## */ /* 80452BDC-80452BE0 0004+00 s=1 e=0 z=0 None .sdata2 @3794 */ -SECTION_SDATA2 static u32 lit_3794 = 0x42000000; +SECTION_SDATA2 static f32 lit_3794 = 32.0f; /* 8009825C-80098280 0024+00 s=1 e=0 z=0 None .text item_func_RECOVER_FAILY__Fv */ #pragma push @@ -1763,9 +1758,7 @@ asm static void item_func_KAKERA_HEART() { /* ############################################################################################## */ /* 80452BE0-80452BE8 0008+00 s=1 e=0 z=0 None .sdata2 @3828 */ -SECTION_SDATA2 static u8 lit_3828[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3828 = 4503599627370496.0 /* cast u32 to float */; /* 800982B4-80098344 0090+00 s=1 e=0 z=0 None .text item_func_UTUWA_HEART__Fv */ #pragma push diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 39267477f8a..ef42ff5b9dd 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -16,11 +16,6 @@ extern "C" extern void* item_resource__10dItem_data[1530]; extern "C" extern void* field_item_res__10dItem_data[1020]; extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; -extern "C" extern char const* const d_d_item_data__stringBase0; -extern "C" extern void* item_resource__10dItem_data[1530]; -extern "C" extern void* field_item_res__10dItem_data[1020]; -extern "C" extern u8 item_info__10dItem_data[1020 + 4 /* padding */]; - // // External References: // diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index 86fe06d3efd..4bfb95b0694 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -11,8 +11,6 @@ // Types: // -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -25,6 +23,8 @@ struct cXyz { /* 80267150 */ void atan2sY_XZ() const; }; +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CD9C */ void transM(f32, f32, f32); @@ -35,13 +35,13 @@ struct fopAc_ac_c {}; struct J3DModel {}; +struct dJntColData_c {}; + struct cM3dGLin { /* 80036A5C */ ~cM3dGLin(); /* 8026F2E8 */ void SetStartEnd(cXyz const&, cXyz const&); }; -struct dJntColData_c {}; - struct dJntCol_c { /* 80035C8C */ dJntCol_c(); /* 80035CA0 */ void init(fopAc_ac_c*, dJntColData_c const*, J3DModel*, int); @@ -70,9 +70,6 @@ struct cM3dGCyl { // Forward References: // -extern "C" extern void* __vt__8cM3dGLin[3]; -extern "C" extern void* __vt__8cM3dGSph[3]; - extern "C" void __ct__9dJntCol_cFv(); extern "C" void init__9dJntCol_cFP10fopAc_ac_cPC13dJntColData_cP8J3DModeli(); extern "C" void setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz(); @@ -99,12 +96,6 @@ void cM3d_Cross_CylLin(cM3dGCyl const*, cM3dGLin const*, Vec*, Vec*); void cM3d_lineVsPosSuisenCross(cM3dGLin const*, Vec const*, Vec*); void cM3d_lineVsPosSuisenCross(Vec const&, Vec const&, Vec const&, Vec*); void operator delete(void*); -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__8cM3dGCyl[3]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 BaseZ__4cXyz[12]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); @@ -181,7 +172,7 @@ asm void dJntCol_c::init(fopAc_ac_c* param_0, dJntColData_c const* param_1, J3DM /* ############################################################################################## */ /* 80451D60-80451D64 0004+00 s=1 e=0 z=0 None .sdata2 @3655 */ -SECTION_SDATA2 static u32 lit_3655 = 0x43FA0000; +SECTION_SDATA2 static f32 lit_3655 = 500.0f; /* 80035CC8-80035DC8 0100+00 s=2 e=0 z=0 None .text * setNowLine__9dJntCol_cFP8cM3dGLinPC4cXyzPC5csXyzP4cXyz */ @@ -211,30 +202,20 @@ SECTION_DATA void* __vt__8cM3dGSph[3] = { }; /* 80451D64-80451D68 0004+00 s=1 e=0 z=0 None .sdata2 @4141 */ -SECTION_SDATA2 static u32 lit_4141 = 0xCB189680; +SECTION_SDATA2 static f32 lit_4141 = -10000000.0f; /* 80451D68-80451D70 0004+04 s=2 e=0 z=0 None .sdata2 @4142 */ -SECTION_SDATA2 static u8 lit_4142[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_4142[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80451D70-80451D78 0008+00 s=2 e=0 z=0 None .sdata2 @4143 */ -SECTION_SDATA2 static u8 lit_4143[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4143 = 0.5; /* 80451D78-80451D80 0008+00 s=2 e=0 z=0 None .sdata2 @4144 */ -SECTION_SDATA2 static u8 lit_4144[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4144 = 3.0; /* 80451D80-80451D88 0008+00 s=2 e=0 z=0 None .sdata2 @4145 */ SECTION_SDATA2 static u8 lit_4145[8] = { @@ -242,16 +223,16 @@ SECTION_SDATA2 static u8 lit_4145[8] = { }; /* 80451D88-80451D8C 0004+00 s=1 e=0 z=0 None .sdata2 @4146 */ -SECTION_SDATA2 static u32 lit_4146 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_4146 = 1.0f / 100.0f; /* 80451D8C-80451D90 0004+00 s=2 e=0 z=0 None .sdata2 @4147 */ -SECTION_SDATA2 static u32 lit_4147 = 0x38D1B717; +SECTION_SDATA2 static f32 lit_4147 = 9.999999747378752e-05f; /* 80451D90-80451D94 0004+00 s=1 e=0 z=0 None .sdata2 @4148 */ -SECTION_SDATA2 static u32 lit_4148 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4148 = 0.5f; /* 80451D94-80451D98 0004+00 s=1 e=0 z=0 None .sdata2 @4149 */ -SECTION_SDATA2 static u32 lit_4149 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4149 = 1.0f; /* 80035DC8-80036A5C 0C94+00 s=2 e=0 z=0 None .text * searchNearPos__9dJntCol_cCFPC8cM3dGLinPC4cXyzP4cXyzi */ diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index 61e633bba16..3c8190d4ecd 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -80,8 +80,6 @@ static void dkWmark_Create(kankyo_class*); static void dkWmark_Delete(dkWmark_c*); static void dkWmark_Execute(dkWmark_c*); static void dkWmark_Draw(dkWmark_c*); -extern "C" extern char const* const d_d_k_wmark__stringBase0; -extern "C" extern void* g_profile_WMARK[10 + 1 /* padding */]; extern "C" static void dkWmark_Create__FP12kankyo_class(); extern "C" void __dt__9dkWmark_cFv(); @@ -107,20 +105,6 @@ void fopKyM_Delete(void*); void dKy_tevstr_init(dKy_tevstr_c*, s8, u8); void cM_atan2s(f32, f32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 struct_80450D64[4]; extern "C" void __dt__4cXyzFv(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); @@ -200,13 +184,13 @@ static u8 m_nowID__9dkWmark_c[4]; static u8 data_80451134[4]; /* 80454FB0-80454FB4 0004+00 s=1 e=0 z=0 None .sdata2 @3718 */ -SECTION_SDATA2 static u32 lit_3718 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_3718 = 11.0f / 10.0f; /* 80454FB4-80454FB8 0004+00 s=2 e=0 z=0 None .sdata2 @3719 */ -SECTION_SDATA2 static u32 lit_3719 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3719 = 1.0f; /* 80454FB8-80454FBC 0004+00 s=1 e=0 z=0 None .sdata2 @3720 */ -SECTION_SDATA2 static u32 lit_3720 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_3720 = 3.0f / 5.0f; /* 8026141C-80261640 0224+00 s=1 e=0 z=0 None .text dkWmark_Create__FP12kankyo_class */ #pragma push @@ -240,30 +224,20 @@ asm static void dkWmark_Delete(dkWmark_c* param_0) { /* ############################################################################################## */ /* 80454FBC-80454FC0 0004+00 s=1 e=0 z=0 None .sdata2 @3844 */ -SECTION_SDATA2 static u32 lit_3844 = 0x42C80000; +SECTION_SDATA2 static f32 lit_3844 = 100.0f; /* 80454FC0-80454FC8 0004+04 s=2 e=0 z=0 None .sdata2 @3845 */ -SECTION_SDATA2 static u8 lit_3845[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3845[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80454FC8-80454FD0 0008+00 s=1 e=0 z=0 None .sdata2 @3846 */ -SECTION_SDATA2 static u8 lit_3846[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3846 = 0.5; /* 80454FD0-80454FD8 0008+00 s=1 e=0 z=0 None .sdata2 @3847 */ -SECTION_SDATA2 static u8 lit_3847[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3847 = 3.0; /* 80454FD8-80454FE0 0008+00 s=1 e=0 z=0 None .sdata2 @3848 */ SECTION_SDATA2 static u8 lit_3848[8] = { @@ -282,7 +256,7 @@ asm void dkWmark_c::setMatrix() { /* ############################################################################################## */ /* 80454FE0-80454FE4 0004+00 s=1 e=0 z=0 None .sdata2 @3873 */ -SECTION_SDATA2 static u32 lit_3873 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_3873 = 1.0f / 50.0f; /* 80261964-80261A18 00B4+00 s=1 e=0 z=0 None .text dkWmark_Execute__FP9dkWmark_c */ #pragma push @@ -296,12 +270,10 @@ asm static void dkWmark_Execute(dkWmark_c* param_0) { /* ############################################################################################## */ /* 80454FE4-80454FE8 0004+00 s=1 e=0 z=0 None .sdata2 @3906 */ -SECTION_SDATA2 static u32 lit_3906 = 0x42480000; +SECTION_SDATA2 static f32 lit_3906 = 50.0f; /* 80454FE8-80454FF0 0008+00 s=1 e=0 z=0 None .sdata2 @3908 */ -SECTION_SDATA2 static u8 lit_3908[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3908 = 4503599627370496.0 /* cast u32 to float */; /* 80261A18-80261B54 013C+00 s=1 e=0 z=0 None .text dkWmark_Draw__FP9dkWmark_c */ #pragma push diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index d7440f35037..35d20ac8fe9 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -111,7 +111,6 @@ static void dkWpillar_Create(kankyo_class*); static void dkWpillar_Delete(dkWpillar_c*); static void dkWpillar_Execute(dkWpillar_c*); static void dkWpillar_Draw(dkWpillar_c*); -extern "C" extern void* g_profile_WPILLAR[10 + 1 /* padding */]; extern "C" void create__11dkWpillar_cFv(); extern "C" static void dkWpillar_Create__FP12kankyo_class(); @@ -137,17 +136,6 @@ void fopAcM_getWaterY(cXyz const*, f32*); void fopKyM_Delete(void*); void dKy_tevstr_init(dKy_tevstr_c*, s8, u8); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern f32 lit_2762[1 + 1 /* padding */]; extern "C" void play__14mDoExt_baseAnmFv(); extern "C" void init__13mDoExt_btkAnmFP16J3DMaterialTableP19J3DAnmTextureSRTKeyiifss(); @@ -213,13 +201,13 @@ SECTION_SDATA2 static u8 l_arcName[7 + 1 /* padding */] = { }; /* 80454FF8-80454FFC 0004+00 s=1 e=0 z=0 None .sdata2 @3838 */ -SECTION_SDATA2 static u32 lit_3838 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3838 = 1.0f; /* 80454FFC-80455000 0004+00 s=1 e=0 z=0 None .sdata2 @3839 */ -SECTION_SDATA2 static u32 lit_3839 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3839 = 0.5f; /* 80455000-80455004 0004+00 s=1 e=0 z=0 None .sdata2 @3840 */ -SECTION_SDATA2 static u32 lit_3840 = 0x3E800000; +SECTION_SDATA2 static f32 lit_3840 = 0.25f; /* 80261B54-80261F04 03B0+00 s=1 e=0 z=0 None .text create__11dkWpillar_cFv */ #pragma push diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index 60cef996a0a..1ee99a92733 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -50,8 +50,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_d_kantera_icon_meter__stringBase0; - extern "C" void __ct__15dKantera_icon_cFv(); extern "C" void __dt__15dKantera_icon_cFv(); extern "C" void initiate__15dKantera_icon_cFv(); @@ -70,9 +68,6 @@ extern "C" extern char const* const d_d_kantera_icon_meter__stringBase0; void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); @@ -187,9 +182,7 @@ SECTION_SDATA2 static f32 lit_3759[1 + 1 /* padding */] = { }; /* 80453F00-80453F08 0008+00 s=1 e=0 z=0 None .sdata2 @3761 */ -SECTION_SDATA2 static u8 lit_3761[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3761 = 4503599627370496.0 /* cast u32 to float */; /* 801AEC44-801AECB8 0074+00 s=0 e=4 z=0 None .text setNowGauge__15dKantera_icon_cFUsUs */ #pragma push @@ -203,16 +196,10 @@ asm void dKantera_icon_c::setNowGauge(u16 param_0, u16 param_1) { /* ############################################################################################## */ /* 80453F08-80453F10 0004+04 s=1 e=0 z=0 None .sdata2 @3776 */ -SECTION_SDATA2 static u8 lit_3776[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3776[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 801AECB8-801AED1C 0064+00 s=1 e=0 z=0 None .text draw__19dDlst_KanteraIcon_cFv */ diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 9dd55ddda44..b9f703a9d5f 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -69,8 +69,6 @@ static void dThunder_Execute(dThunder_c*); static bool dThunder_IsDelete(dThunder_c*); static void dThunder_Delete(dThunder_c*); static void dThunder_Create(kankyo_class*); -extern "C" extern char const* const d_d_ky_thunder__stringBase0; -extern "C" extern void* g_profile_KY_THUNDER[10 + 1 /* padding */]; extern "C" void createHeap__10dThunder_cFv(); extern "C" void adjustHeap__10dThunder_cFv(); @@ -103,18 +101,6 @@ void cM_rndF(f32); void cM_rndFX(f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void cLib_targetAngleY(Vec const*, Vec const*); -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 struct_80451070[8]; extern "C" void __dt__4cXyzFv(); extern "C" void mDoMtx_XrotM__FPA4_fs(); @@ -208,13 +194,13 @@ SECTION_SDATA2 static u8 lit_3882[4] = { }; /* 80453E74-80453E78 0004+00 s=1 e=0 z=0 None .sdata2 @3883 */ -SECTION_SDATA2 static u32 lit_3883 = 0x42200000; +SECTION_SDATA2 static f32 lit_3883 = 40.0f; /* 80453E78-80453E7C 0004+00 s=1 e=0 z=0 None .sdata2 @3884 */ -SECTION_SDATA2 static u32 lit_3884 = 0xC37A0000; +SECTION_SDATA2 static f32 lit_3884 = -250.0f; /* 80453E7C-80453E80 0004+00 s=3 e=0 z=0 None .sdata2 @3885 */ -SECTION_SDATA2 static u32 lit_3885 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3885 = 1.0f; /* 801AE000-801AE19C 019C+00 s=1 e=0 z=0 None .text dThunder_Draw__FP10dThunder_c */ #pragma push @@ -228,25 +214,25 @@ asm static void dThunder_Draw(dThunder_c* param_0) { /* ############################################################################################## */ /* 80453E80-80453E84 0004+00 s=2 e=0 z=0 None .sdata2 @3923 */ -SECTION_SDATA2 static u32 lit_3923 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_3923 = 1.0f / 10.0f; /* 80453E84-80453E88 0004+00 s=1 e=0 z=0 None .sdata2 @3924 */ -SECTION_SDATA2 static u32 lit_3924 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_3924 = 1.0f / 20.0f; /* 80453E88-80453E8C 0004+00 s=1 e=0 z=0 None .sdata2 @3925 */ -SECTION_SDATA2 static u32 lit_3925 = 0x3C8B4396; +SECTION_SDATA2 static f32 lit_3925 = 0.017000000923871994f; /* 80453E8C-80453E90 0004+00 s=1 e=0 z=0 None .sdata2 @3926 */ -SECTION_SDATA2 static u32 lit_3926 = 0x3727C5AC; +SECTION_SDATA2 static f32 lit_3926 = 9.999999747378752e-06f; /* 80453E90-80453E94 0004+00 s=1 e=0 z=0 None .sdata2 @3927 */ -SECTION_SDATA2 static u32 lit_3927 = 0x42700000; +SECTION_SDATA2 static f32 lit_3927 = 60.0f; /* 80453E94-80453E98 0004+00 s=1 e=0 z=0 None .sdata2 @3928 */ -SECTION_SDATA2 static u32 lit_3928 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_3928 = 1.0f / 100.0f; /* 80453E98-80453E9C 0004+00 s=1 e=0 z=0 None .sdata2 @3929 */ -SECTION_SDATA2 static u32 lit_3929 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_3929 = 1.0f / 50.0f; /* 801AE19C-801AE374 01D8+00 s=1 e=0 z=0 None .text dThunder_Execute__FP10dThunder_c */ #pragma push @@ -295,37 +281,37 @@ SECTION_DEAD static char const* const pad_80394F4E = "\0"; #pragma pop /* 80453E9C-80453EA0 0004+00 s=1 e=0 z=0 None .sdata2 @4079 */ -SECTION_SDATA2 static u32 lit_4079 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4079 = 0.5f; /* 80453EA0-80453EA4 0004+00 s=1 e=0 z=0 None .sdata2 @4080 */ -SECTION_SDATA2 static u32 lit_4080 = 0x3E800000; +SECTION_SDATA2 static f32 lit_4080 = 0.25f; /* 80453EA4-80453EA8 0004+00 s=1 e=0 z=0 None .sdata2 @4081 */ -SECTION_SDATA2 static u32 lit_4081 = 0x41600000; +SECTION_SDATA2 static f32 lit_4081 = 14.0f; /* 80453EA8-80453EAC 0004+00 s=1 e=0 z=0 None .sdata2 @4082 */ -SECTION_SDATA2 static u32 lit_4082 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4082 = 20.0f; /* 80453EAC-80453EB0 0004+00 s=1 e=0 z=0 None .sdata2 @4083 */ -SECTION_SDATA2 static u32 lit_4083 = 0x476A6000; +SECTION_SDATA2 static f32 lit_4083 = 60000.0f; /* 80453EB0-80453EB4 0004+00 s=1 e=0 z=0 None .sdata2 @4084 */ -SECTION_SDATA2 static u32 lit_4084 = 0xC59C4000; +SECTION_SDATA2 static f32 lit_4084 = -5000.0f; /* 80453EB4-80453EB8 0004+00 s=1 e=0 z=0 None .sdata2 @4085 */ -SECTION_SDATA2 static u32 lit_4085 = 0x44FA0000; +SECTION_SDATA2 static f32 lit_4085 = 2000.0f; /* 80453EB8-80453EBC 0004+00 s=1 e=0 z=0 None .sdata2 @4086 */ -SECTION_SDATA2 static u32 lit_4086 = 0x41C00000; +SECTION_SDATA2 static f32 lit_4086 = 24.0f; /* 80453EBC-80453EC0 0004+00 s=1 e=0 z=0 None .sdata2 @4087 */ -SECTION_SDATA2 static u32 lit_4087 = 0x451C4000; +SECTION_SDATA2 static f32 lit_4087 = 2500.0f; /* 80453EC0-80453EC4 0004+00 s=1 e=0 z=0 None .sdata2 @4088 */ -SECTION_SDATA2 static u32 lit_4088 = 0x45BB8000; +SECTION_SDATA2 static f32 lit_4088 = 6000.0f; /* 80453EC4-80453EC8 0004+00 s=1 e=0 z=0 None .sdata2 @4089 */ -SECTION_SDATA2 static u32 lit_4089 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_4089 = 3.0f / 20.0f; /* 80453EC8-80453ED0 0004+04 s=1 e=0 z=0 None .sdata2 @4090 */ SECTION_SDATA2 static f32 lit_4090[1 + 1 /* padding */] = { @@ -335,33 +321,31 @@ SECTION_SDATA2 static f32 lit_4090[1 + 1 /* padding */] = { }; /* 80453ED0-80453ED8 0008+00 s=1 e=0 z=0 None .sdata2 @4091 */ -SECTION_SDATA2 static u8 lit_4091[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4091 = 0.5; /* 80453ED8-80453EDC 0004+00 s=1 e=0 z=0 None .sdata2 @4092 */ -SECTION_SDATA2 static u32 lit_4092 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4092 = -1.0f; /* 80453EDC-80453EE0 0004+00 s=1 e=0 z=0 None .sdata2 @4093 */ -SECTION_SDATA2 static u32 lit_4093 = 0x47C35000; +SECTION_SDATA2 static f32 lit_4093 = 100000.0f; /* 80453EE0-80453EE4 0004+00 s=1 e=0 z=0 None .sdata2 @4094 */ -SECTION_SDATA2 static u32 lit_4094 = 0x46996600; +SECTION_SDATA2 static f32 lit_4094 = 19635.0f; /* 80453EE4-80453EE8 0004+00 s=1 e=0 z=0 None .sdata2 @4095 */ -SECTION_SDATA2 static u32 lit_4095 = 0x43820000; +SECTION_SDATA2 static f32 lit_4095 = 260.0f; /* 80453EE8-80453EEC 0004+00 s=1 e=0 z=0 None .sdata2 @4096 */ -SECTION_SDATA2 static u32 lit_4096 = 0x458F8000; +SECTION_SDATA2 static f32 lit_4096 = 4592.0f; /* 80453EEC-80453EF0 0004+00 s=1 e=0 z=0 None .sdata2 @4097 */ -SECTION_SDATA2 static u32 lit_4097 = 0x44BC6000; +SECTION_SDATA2 static f32 lit_4097 = 1507.0f; /* 80453EF0-80453EF4 0004+00 s=1 e=0 z=0 None .sdata2 @4098 */ -SECTION_SDATA2 static u32 lit_4098 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4098 = 100.0f; /* 80453EF4-80453EF8 0004+00 s=1 e=0 z=0 None .sdata2 @4099 */ -SECTION_SDATA2 static u32 lit_4099 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_4099 = 3.0f / 10.0f; /* 801AE458-801AE938 04E0+00 s=1 e=0 z=0 None .text create__10dThunder_cFv */ #pragma push diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index f6607299df2..8059d5a87b8 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -30,8 +30,6 @@ static void dKyeff_Execute(dKyeff_c*); static bool dKyeff_IsDelete(dKyeff_c*); static void dKyeff_Delete(dKyeff_c*); static void dKyeff_Create(kankyo_class*); -extern "C" extern char const* const d_d_kyeff__stringBase0; -extern "C" extern void* g_profile_KYEFF[10 + 1 /* padding */]; extern "C" static void dKyeff_Draw__FP8dKyeff_c(); extern "C" void execute__8dKyeff_cFv(); @@ -52,11 +50,6 @@ void dKyw_wether_move(); void dKyw_wether_move_draw(); void dKyw_wether_draw(); void dKy_FiveSenses_fullthrottle_dark(); -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; extern "C" void dKyw_wether_init__Fv(); extern "C" void dKyw_wether_delete__Fv(); @@ -143,18 +136,16 @@ SECTION_SDATA2 static u8 lit_3804[4] = { }; /* 80453E5C-80453E60 0004+00 s=1 e=0 z=0 None .sdata2 @3805 */ -SECTION_SDATA2 static u32 lit_3805 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3805 = 1.0f; /* 80453E60-80453E68 0008+00 s=1 e=0 z=0 None .sdata2 @3812 */ -SECTION_SDATA2 static u8 lit_3812[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3812 = 4503601774854144.0 /* cast s32 to float */; /* 80453E68-80453E6C 0004+00 s=1 e=0 z=0 None .sdata2 @3843 */ -SECTION_SDATA2 static u32 lit_3843 = 0x3F333333; +SECTION_SDATA2 static f32 lit_3843 = 7.0f / 10.0f; /* 80453E6C-80453E70 0004+00 s=1 e=0 z=0 None .sdata2 @3844 */ -SECTION_SDATA2 static u32 lit_3844 = 0x41700000; +SECTION_SDATA2 static f32 lit_3844 = 15.0f; /* 801ADE00-801ADEA0 00A0+00 s=1 e=0 z=0 None .text dKyeff_Create__FP12kankyo_class */ #pragma push diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index c3f3d51cefd..812abea9112 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -26,7 +26,6 @@ static void dKyeff2_Execute(dKyeff2_c*); static bool dKyeff2_IsDelete(dKyeff2_c*); static void dKyeff2_Delete(dKyeff2_c*); static void dKyeff2_Create(kankyo_class*); -extern "C" extern void* g_profile_KYEFF2[10 + 1 /* padding */]; extern "C" static void dKyeff2_Draw__FP9dKyeff2_c(); extern "C" void execute__9dKyeff2_cFv(); @@ -44,8 +43,6 @@ void dKyw_wether_init2(); void dKyw_wether_delete2(); void dKyw_wether_move_draw2(); void dKyw_wether_draw2(); -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" void dKyw_wether_init2__Fv(); extern "C" void dKyw_wether_delete2__Fv(); diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index 4f6e1d85696..46007027921 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -72,10 +72,6 @@ struct CSTControl { void dLib_getEventSwitchNo(int); void dLib_checkActorInRectangle(fopAc_ac_c*, fopAc_ac_c*, cXyz const*, cXyz const*); void dLib_getExpandSizeFromAramArchive(JKRAramArchive*, char const*); -extern "C" extern u8 ZeroQuat[16]; -extern "C" extern void* __vt__10CSTControl[4]; -extern "C" extern void* __vt__9STControl[4]; -extern "C" extern u8 struct_80450DF0[8]; extern "C" void __ct__9STControlFssssffss(); extern "C" void setWaitParm__9STControlFssssffss(); @@ -107,9 +103,6 @@ extern "C" extern u8 struct_80450DF0[8]; // void mDoMtx_YrotS(f32 (*)[4], s16); -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void searchMapEventData__14dEvt_control_cFUc(); diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index 0b0a4ad52a5..eea02f17853 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -51,8 +51,6 @@ struct J3DPacket { // Forward References: // -extern "C" extern void* __vt__6dMdl_c[5 + 1 /* padding */]; - extern "C" void draw__6dMdl_cFv(); extern "C" void create__6dMdl_cFP12J3DModelDataUsP12dKy_tevstr_c(); extern "C" void entryObj__6dMdl_cFP10dMdl_obj_c(); @@ -75,12 +73,6 @@ void dKy_setLight_again(); void dKy_GxFog_tevstr_set(dKy_tevstr_c*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void dKy_setLight_nowroom_actor__FP12dKy_tevstr_c(); extern "C" void dKy_setLight_again__Fv(); diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 99576193a15..652ecb8503b 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -139,8 +139,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_d_name__stringBase0; - extern "C" void __ct__9dNm_HIO_cFv(); extern "C" void __ct__7dName_cFP7J2DPane(); extern "C" void __dt__7dName_cFv(); @@ -198,10 +196,6 @@ void fopMsgM_messageGet(char*, u32); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void mDoExt_removeMesgFont__Fv(); @@ -1250,10 +1244,10 @@ SECTION_DATA static void* __vt__9dNm_HIO_c[3] = { }; /* 80454DB0-80454DB4 0004+00 s=1 e=0 z=0 None .sdata2 @3665 */ -SECTION_SDATA2 static u32 lit_3665 = 0x3FA66666; +SECTION_SDATA2 static f32 lit_3665 = 13.0f / 10.0f; /* 80454DB4-80454DB8 0004+00 s=1 e=0 z=0 None .sdata2 @3666 */ -SECTION_SDATA2 static u32 lit_3666 = 0x3FB33333; +SECTION_SDATA2 static f32 lit_3666 = 7.0f / 5.0f; /* 8024E3E0-8024E408 0028+00 s=1 e=0 z=0 None .text __ct__9dNm_HIO_cFv */ #pragma push @@ -1293,10 +1287,10 @@ static u8 lit_3660[12]; static u8 g_nmHIO[20]; /* 80454DB8-80454DBC 0004+00 s=1 e=0 z=0 None .sdata2 @3755 */ -SECTION_SDATA2 static u32 lit_3755 = 0x3F666666; +SECTION_SDATA2 static f32 lit_3755 = 9.0f / 10.0f; /* 80454DBC-80454DC0 0004+00 s=1 e=0 z=0 None .sdata2 @3756 */ -SECTION_SDATA2 static u32 lit_3756 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3756 = 0.5f; /* 8024E62C-8024E6D4 00A8+00 s=1 e=0 z=0 None .text _create__7dName_cFv */ #pragma push @@ -1330,7 +1324,7 @@ asm void dName_c::initial() { /* ############################################################################################## */ /* 80454DC0-80454DC4 0004+00 s=16 e=0 z=0 None .sdata2 @3820 */ -SECTION_SDATA2 static u32 lit_3820 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3820 = 1.0f; /* 8024E7EC-8024E9A0 01B4+00 s=0 e=2 z=0 None .text showIcon__7dName_cFv */ #pragma push @@ -1344,7 +1338,7 @@ asm void dName_c::showIcon() { /* ############################################################################################## */ /* 80454DC4-80454DC8 0004+00 s=6 e=0 z=0 None .sdata2 @3886 */ -SECTION_SDATA2 static u32 lit_3886 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3886 = -1.0f; /* 8024E9A0-8024EC10 0270+00 s=0 e=2 z=0 None .text _move__7dName_cFv */ #pragma push @@ -1378,9 +1372,7 @@ asm void dName_c::playNameSet(int param_0) { /* ############################################################################################## */ /* 80454DC8-80454DD0 0008+00 s=1 e=0 z=0 None .sdata2 @3936 */ -SECTION_SDATA2 static u8 lit_3936[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3936 = 4503601774854144.0 /* cast s32 to float */; /* 8024EC84-8024ED48 00C4+00 s=1 e=0 z=0 None .text cursorAnm__7dName_cFv */ #pragma push @@ -1648,13 +1640,13 @@ asm void dName_c::_draw() { /* ############################################################################################## */ /* 80454DD4-80454DD8 0004+00 s=1 e=0 z=0 None .sdata2 @4722 */ -SECTION_SDATA2 static u32 lit_4722 = 0x3F51EB85; +SECTION_SDATA2 static f32 lit_4722 = 41.0f / 50.0f; /* 80454DD8-80454DDC 0004+00 s=1 e=0 z=0 None .sdata2 @4723 */ -SECTION_SDATA2 static u32 lit_4723 = 0x3F451EB8; +SECTION_SDATA2 static f32 lit_4723 = 77.0f / 100.0f; /* 80454DDC-80454DE0 0004+00 s=1 e=0 z=0 None .sdata2 @4724 */ -SECTION_SDATA2 static u32 lit_4724 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4724 = 1.0f / 20.0f; /* 80454DE0-80454DE8 0004+04 s=1 e=0 z=0 None .sdata2 @4725 */ SECTION_SDATA2 static f32 lit_4725[1 + 1 /* padding */] = { diff --git a/src/d/d_npc_lib.cpp b/src/d/d_npc_lib.cpp index 735714de984..3089e3b7bd2 100644 --- a/src/d/d_npc_lib.cpp +++ b/src/d/d_npc_lib.cpp @@ -11,12 +11,6 @@ // Types: // -struct csXyz { - /* 80018BD0 */ ~csXyz(); - /* 80112C80 */ csXyz(); - /* 8026745C */ void operator+=(csXyz&); -}; - struct Vec {}; struct cXyz { @@ -27,6 +21,12 @@ struct cXyz { /* 802670AC */ void isZero() const; }; +struct csXyz { + /* 80018BD0 */ ~csXyz(); + /* 80112C80 */ csXyz(); + /* 8026745C */ void operator+=(csXyz&); +}; + struct mDoMtx_stack_c { /* 8000CD64 */ void transS(cXyz const&); /* 8000CE9C */ void XYZrotS(csXyz const&); @@ -67,10 +67,6 @@ extern "C" void __dt__16dNpcLib_lookat_cFv(); void cM_atan2s(f32, f32); void operator delete(void*); -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 Zero__5csXyz[4]; -extern "C" extern u8 data_80451164[4]; extern "C" void __dt__4cXyzFv(); extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); @@ -148,17 +144,13 @@ SECTION_SDATA2 static u8 lit_3864[4] = { }; /* 80454DEC-80454DF0 0004+00 s=1 e=0 z=0 None .sdata2 @3865 */ -SECTION_SDATA2 static u32 lit_3865 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3865 = 1.0f; /* 80454DF0-80454DF8 0008+00 s=2 e=0 z=0 None .sdata2 @3866 */ -SECTION_SDATA2 static u8 lit_3866[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3866 = 0.5; /* 80454DF8-80454E00 0008+00 s=2 e=0 z=0 None .sdata2 @3867 */ -SECTION_SDATA2 static u8 lit_3867[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3867 = 3.0; /* 80454E00-80454E08 0008+00 s=2 e=0 z=0 None .sdata2 @3868 */ SECTION_SDATA2 static u8 lit_3868[8] = { @@ -173,9 +165,7 @@ SECTION_SDATA2 static f32 lit_3869[1 + 1 /* padding */] = { }; /* 80454E10-80454E18 0008+00 s=2 e=0 z=0 None .sdata2 @3873 */ -SECTION_SDATA2 static u8 lit_3873[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3873 = 4503601774854144.0 /* cast s32 to float */; /* 80251534-80251B60 062C+00 s=0 e=0 z=2 None .text * action__16dNpcLib_lookat_cF4cXyz4cXyzP10fopAc_ac_cPA4_fi */ diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index 3dcc486dd22..4f044835dde 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -49,8 +49,6 @@ extern "C" void dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi(); // External References: // -extern "C" extern u8 g_dComIfG_gameInfo[122384]; - extern "C" void getStatusRoomDt__20dStage_roomControl_cFi(); extern "C" void isSwitch__10dSv_info_cCFii(); extern "C" void GetRoomPathId__4dBgSFRC13cBgS_PolyInfo(); @@ -96,16 +94,10 @@ asm void dPath_GetNextRoomPath(dPath const* param_0, int param_1) { /* ############################################################################################## */ /* 80452000-80452008 0004+04 s=1 e=0 z=0 None .sdata2 @3685 */ -SECTION_SDATA2 static u8 lit_3685[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3685[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 8005195C-80051AC0 0164+00 s=0 e=1 z=4 None .text diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index ca2ebf272da..de7709dce79 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -204,12 +204,6 @@ static void addWarpMaterial(J3DModelData*); static void getArcHeader(JKRArchive*); static void myGetMemBlockSize(void*); static void myGetMemBlockSize0(void*); -extern "C" extern char const* const d_d_resorce__stringBase0; -extern "C" extern void* __vt__10J3DAnmBase[4]; -extern "C" extern void* __vt__15J3DAnmTransform[5]; -extern "C" extern void* __vt__18mDoExt_transAnmBas[5]; -extern "C" extern void* __vt__18J3DAnmTransformKey[5]; -extern "C" extern void* __vt__11J3DTexNoAnm[3]; extern "C" void __ct__11dRes_info_cFv(); extern "C" void __dt__11dRes_info_cFv(); @@ -288,15 +282,6 @@ void mDoExt_resIDToIndex(JKRArchive*, u16); void* operator new(u32); void* operator new[](u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 mZbufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 j3dDefaultTevSwapMode[4]; extern "C" void OSReport_Error(); extern "C" void OSReport_Warning(); @@ -861,9 +846,7 @@ asm void dRes_info_c::dump_long(dRes_info_c* param_0, int param_1) { /* ############################################################################################## */ /* 80451DF8-80451E00 0008+00 s=1 e=0 z=0 None .sdata2 @4277 */ -SECTION_SDATA2 static u8 lit_4277[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4277 = 4503601774854144.0 /* cast s32 to float */; /* 80451E00-80451E08 0004+04 s=1 e=0 z=0 None .sdata2 @4333 */ SECTION_SDATA2 static f32 lit_4333[1 + 1 /* padding */] = { diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 01e6879dc46..93ca7de8a2f 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -50,9 +50,6 @@ struct J2DPicture { // Forward References: // -extern "C" extern char const* const d_d_scope__stringBase0; -extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */]; - extern "C" void __ct__8dScope_cFUc(); extern "C" void __ct__Q28JUtility6TColorFv(); extern "C" void __dt__8dScope_cFv(); @@ -82,9 +79,6 @@ extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */]; void* operator new(u32); void operator delete(void*); void J2DDrawLine(f32, f32, f32, f32, JUtility::TColor, int); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; extern "C" void* __nw__FUl(); extern "C" void __dl__FPv(); @@ -205,7 +199,7 @@ SECTION_DATA void* __vt__11dMeterSub_c[8 + 3 /* padding */] = { }; /* 80453A10-80453A14 0004+00 s=4 e=0 z=0 None .sdata2 @3756 */ -SECTION_SDATA2 static u32 lit_3756 = 0x40400000; +SECTION_SDATA2 static f32 lit_3756 = 3.0f; /* 80453A14-80453A18 0004+00 s=4 e=0 z=0 None .sdata2 @3757 */ SECTION_SDATA2 static u8 lit_3757[4] = { @@ -216,9 +210,7 @@ SECTION_SDATA2 static u8 lit_3757[4] = { }; /* 80453A18-80453A20 0008+00 s=1 e=0 z=0 None .sdata2 @3759 */ -SECTION_SDATA2 static u8 lit_3759[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3759 = 4503599627370496.0 /* cast u32 to float */; /* 80193690-80193960 02D0+00 s=0 e=1 z=0 None .text __ct__8dScope_cFUc */ #pragma push @@ -262,19 +254,19 @@ asm void dScope_c::_execute(u32 param_0) { /* ############################################################################################## */ /* 80453A20-80453A24 0004+00 s=1 e=0 z=0 None .sdata2 @3879 */ -SECTION_SDATA2 static u32 lit_3879 = 0x437F0000; +SECTION_SDATA2 static f32 lit_3879 = 255.0f; /* 80453A24-80453A28 0004+00 s=1 e=0 z=0 None .sdata2 @3880 */ -SECTION_SDATA2 static u32 lit_3880 = 0x43980000; +SECTION_SDATA2 static f32 lit_3880 = 304.0f; /* 80453A28-80453A2C 0004+00 s=1 e=0 z=0 None .sdata2 @3881 */ -SECTION_SDATA2 static u32 lit_3881 = 0x43E00000; +SECTION_SDATA2 static f32 lit_3881 = 448.0f; /* 80453A2C-80453A30 0004+00 s=1 e=0 z=0 None .sdata2 @3882 */ -SECTION_SDATA2 static u32 lit_3882 = 0x43600000; +SECTION_SDATA2 static f32 lit_3882 = 224.0f; /* 80453A30-80453A34 0004+00 s=1 e=0 z=0 None .sdata2 @3883 */ -SECTION_SDATA2 static u32 lit_3883 = 0x44180000; +SECTION_SDATA2 static f32 lit_3883 = 608.0f; /* 80193C68-80193FA0 0338+00 s=1 e=0 z=0 None .text draw__8dScope_cFv */ #pragma push @@ -308,18 +300,16 @@ asm void dScope_c::open_init() { /* ############################################################################################## */ /* 80453A34-80453A38 0004+00 s=2 e=0 z=0 None .sdata2 @3902 */ -SECTION_SDATA2 static u32 lit_3902 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_3902 = 1.5f; /* 80453A38-80453A3C 0004+00 s=2 e=0 z=0 None .sdata2 @3903 */ -SECTION_SDATA2 static u32 lit_3903 = 0x40A00000; +SECTION_SDATA2 static f32 lit_3903 = 5.0f; /* 80453A3C-80453A40 0004+00 s=2 e=0 z=0 None .sdata2 @3904 */ -SECTION_SDATA2 static u32 lit_3904 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3904 = 1.0f; /* 80453A40-80453A48 0008+00 s=2 e=0 z=0 None .sdata2 @3906 */ -SECTION_SDATA2 static u8 lit_3906[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3906 = 4503601774854144.0 /* cast s32 to float */; /* 80193FD0-80194048 0078+00 s=1 e=0 z=0 None .text open_proc__8dScope_cFv */ #pragma push diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index 47d880b3153..21839827ffe 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -88,8 +88,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_d_select_cursor__stringBase0; - extern "C" void __ct__19dSelect_cursorHIO_cFv(); extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive(); extern "C" void __dt__16dSelect_cursor_cFv(); @@ -117,11 +115,6 @@ extern "C" extern char const* const d_d_select_cursor__stringBase0; void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__10J2DAnmBase[4]; -extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */]; -extern "C" extern void* __vt__18J2DAnmTransformKey[6]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void animation__14dSelect_icon_cFv(); extern "C" void setAlpha__14dSelect_icon_cFUc(); @@ -288,10 +281,10 @@ SECTION_DATA static void* __vt__19dSelect_cursorHIO_c[3 + 1 /* padding */] = { }; /* 80453A48-80453A4C 0004+00 s=4 e=0 z=0 None .sdata2 @3673 */ -SECTION_SDATA2 static u32 lit_3673 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3673 = 1.0f; /* 80453A4C-80453A50 0004+00 s=1 e=0 z=0 None .sdata2 @3674 */ -SECTION_SDATA2 static u32 lit_3674 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_3674 = 3.0f / 10.0f; /* 801941E4-80194220 003C+00 s=1 e=0 z=0 None .text __ct__19dSelect_cursorHIO_cFv */ #pragma push @@ -345,12 +338,10 @@ asm void dSelect_cursor_c::draw() { /* ############################################################################################## */ /* 80453A54-80453A58 0004+00 s=3 e=0 z=0 None .sdata2 @4062 */ -SECTION_SDATA2 static u32 lit_4062 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4062 = 0.5f; /* 80453A58-80453A60 0008+00 s=3 e=0 z=0 None .sdata2 @4064 */ -SECTION_SDATA2 static u8 lit_4064[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4064 = 4503601774854144.0 /* cast s32 to float */; /* 80194CC0-801950F4 0434+00 s=1 e=0 z=0 None .text update__16dSelect_cursor_cFv */ #pragma push @@ -364,7 +355,7 @@ asm void dSelect_cursor_c::update() { /* ############################################################################################## */ /* 80453A60-80453A64 0004+00 s=1 e=0 z=0 None .sdata2 @4089 */ -SECTION_SDATA2 static u32 lit_4089 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4089 = -1.0f; /* 801950F4-801951B0 00BC+00 s=0 e=30 z=0 None .text setPos__16dSelect_cursor_cFffP7J2DPaneb */ @@ -410,7 +401,7 @@ asm void dSelect_cursor_c::setAlphaRate(f32 param_0) { /* ############################################################################################## */ /* 80453A64-80453A68 0004+00 s=2 e=0 z=0 None .sdata2 @4157 */ -SECTION_SDATA2 static u32 lit_4157 = 0x40A00000; +SECTION_SDATA2 static f32 lit_4157 = 5.0f; /* 80195330-801953CC 009C+00 s=0 e=1 z=0 None .text addAlpha__16dSelect_cursor_cFv */ #pragma push @@ -456,10 +447,10 @@ asm void dSelect_cursor_c::setBtk0Animation(J2DAnmTextureSRTKey* param_0) { /* ############################################################################################## */ /* 80453A68-80453A6C 0004+00 s=1 e=0 z=0 None .sdata2 @4237 */ -SECTION_SDATA2 static u32 lit_4237 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4237 = 20.0f; /* 80453A6C-80453A70 0004+00 s=1 e=0 z=0 None .sdata2 @4238 */ -SECTION_SDATA2 static u32 lit_4238 = 0x41200000; +SECTION_SDATA2 static f32 lit_4238 = 10.0f; /* 80195724-801958E0 01BC+00 s=1 e=0 z=0 None .text setCursorAnimation__16dSelect_cursor_cFv */ diff --git a/src/d/d_select_icon.cpp b/src/d/d_select_icon.cpp index 760ab2ee7a4..a746ca71a3c 100644 --- a/src/d/d_select_icon.cpp +++ b/src/d/d_select_icon.cpp @@ -80,22 +80,14 @@ asm dSi_HIO_c::dSi_HIO_c() { /* ############################################################################################## */ /* 80453A70-80453A78 0004+04 s=1 e=0 z=0 None .sdata2 @3740 */ -SECTION_SDATA2 static u8 lit_3740[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3740[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80453A78-80453A80 0008+00 s=1 e=0 z=0 None .sdata2 @3773 */ -SECTION_SDATA2 static u8 lit_3773[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3773 = 4503601774854144.0 /* cast s32 to float */; /* 80195A3C-80195B40 0104+00 s=0 e=1 z=0 None .text animation__14dSelect_icon_cFv */ #pragma push diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp index 70af8cbe335..383a2c268fb 100644 --- a/src/d/d_simple_model.cpp +++ b/src/d/d_simple_model.cpp @@ -80,11 +80,6 @@ void mDoExt_destroySolidHeap(JKRSolidHeap*); void mDoExt_restoreCurrentHeap(); void mDoExt_J3DModel__create(J3DModelData*, u32, u32); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); extern "C" void mDoExt_createSolidHeapFromGameToCurrent__FUlUl(); @@ -208,16 +203,10 @@ asm void dSmplMdl_draw_c::removeModel(J3DModelData* param_0, int param_1) { /* ############################################################################################## */ /* 80451F38-80451F40 0004+04 s=1 e=0 z=0 None .sdata2 @3763 */ -SECTION_SDATA2 static u8 lit_3763[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3763[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 800490EC-800491F4 0108+00 s=1 e=0 z=0 None .text create__12diff_model_cFP12J3DModelDataiUc diff --git a/src/d/d_spline_path.cpp b/src/d/d_spline_path.cpp index 6b03f482079..52f5561133b 100644 --- a/src/d/d_spline_path.cpp +++ b/src/d/d_spline_path.cpp @@ -52,9 +52,7 @@ extern "C" void PSVECAdd(); /* ############################################################################################## */ /* 80452BC8-80452BD0 0008+00 s=4 e=0 z=0 None .sdata2 @3632 */ -SECTION_SDATA2 static u8 lit_3632[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3632 = 4503601774854144.0 /* cast s32 to float */; /* 80097878-80097904 008C+00 s=0 e=7 z=0 None .text Init__14d2DBSplinePathFll */ #pragma push @@ -68,10 +66,10 @@ asm void d2DBSplinePath::Init(s32 param_0, s32 param_1) { /* ############################################################################################## */ /* 80452BD0-80452BD4 0004+00 s=3 e=0 z=0 None .sdata2 @3684 */ -SECTION_SDATA2 static u32 lit_3684 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3684 = 1.0f; /* 80452BD4-80452BD8 0004+00 s=3 e=0 z=0 None .sdata2 @3685 */ -SECTION_SDATA2 static u32 lit_3685 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3685 = 0.5f; /* 80097904-80097A6C 0168+00 s=0 e=5 z=0 None .text Step__14d2DBSplinePathFv */ #pragma push diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index a3d4f636600..73b91d457e4 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -97,32 +97,32 @@ struct dStage_startStage_c { /* 8002419C */ void set(char const*, s8, s16, s8); }; -struct dStage_dPath_c {}; - -struct dStage_FileList2_dt_c {}; - -struct dStage_SoundInfo_c {}; - -struct dStage_MemoryMap_c {}; - struct dStage_MapEventInfo_c {}; -struct dStage_Elst_c {}; - -struct dStage_dPnt_c {}; - -struct dStage_FloorInfo_c {}; - -struct dStage_MemoryConfig_c {}; - -struct dStage_DMap_c {}; +struct dStage_dPath_c {}; struct dStage_FileList_dt_c {}; -struct dStage_Lbnk_c {}; +struct dStage_MemoryMap_c {}; + +struct dStage_dPnt_c {}; struct dStage_Multi_c {}; +struct dStage_MemoryConfig_c {}; + +struct dStage_FloorInfo_c {}; + +struct dStage_FileList2_dt_c {}; + +struct dStage_DMap_c {}; + +struct dStage_Lbnk_c {}; + +struct dStage_Elst_c {}; + +struct dStage_SoundInfo_c {}; + struct dStage_stageDt_c { /* 8002483C */ void getStagInfo() const; /* 80024C1C */ void init(); @@ -505,17 +505,6 @@ void dStage_changeSceneExitId(cBgS_PolyInfo&, f32, u32, s8, s16); void dStage_changeScene(int, f32, u32, s8, s16, int); void dStage_changeScene4Event(int, s8, int, bool, f32, u32, s16, int); void dStage_restartRoom(u32, u32, int); -extern "C" extern char const* const d_d_stage__stringBase0; -extern "C" extern void* __vt__16dStage_stageDt_c[93]; -extern "C" extern void* __vt__11dStage_dt_c[93]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 mProcID__20dStage_roomControl_c[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 data_80450D68[4]; -extern "C" extern u8 mArcBankName__20dStage_roomControl_c[4]; -extern "C" extern u8 mArcBankData__20dStage_roomControl_c[4]; -extern "C" extern u8 pad_80450D7C[4]; extern "C" void set__18dStage_nextStage_cFPCcScsScScUc(); extern "C" static void dStage_SetErrorRoom__Fv(); @@ -850,11 +839,6 @@ void dKy_set_nexttime(f32); void* operator new[](u32, JKRHeap*, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */]; -extern "C" extern u8 data_804505F0[8]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; extern "C" void OSReport(); extern "C" void OSReport_Error(); @@ -3196,12 +3180,10 @@ asm void dStage_changeSceneExitId(cBgS_PolyInfo& param_0, f32 param_1, u32 param /* ############################################################################################## */ /* 80451C94-80451C98 0004+00 s=2 e=0 z=0 None .sdata2 @5315 */ -SECTION_SDATA2 static u32 lit_5315 = 0x41700000; +SECTION_SDATA2 static f32 lit_5315 = 15.0f; /* 80451C98-80451CA0 0008+00 s=2 e=0 z=0 None .sdata2 @5317 */ -SECTION_SDATA2 static u8 lit_5317[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5317 = 4503601774854144.0 /* cast s32 to float */; /* 80027170-800272E0 0170+00 s=1 e=10 z=63 None .text dStage_changeScene__FifUlScsi */ #pragma push diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 7350d365728..d4c073a0818 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -186,8 +186,6 @@ void dTimer_getRestTimeMs(); void dTimer_show(); void dTimer_hide(); void dTimer_isReadyFlag(); -extern "C" extern char const* const d_d_timer__stringBase0; -extern "C" extern void* g_profile_TIMER[10]; extern "C" void _create__8dTimer_cFv(); extern "C" void _execute__8dTimer_cFv(); @@ -269,13 +267,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cM_rndFX(f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -379,7 +370,7 @@ SECTION_SDATA2 static u8 lit_3919[4] = { }; /* 80454F44-80454F48 0004+00 s=2 e=0 z=0 None .sdata2 @3920 */ -SECTION_SDATA2 static u32 lit_3920 = 0x43110000; +SECTION_SDATA2 static f32 lit_3920 = 145.0f; /* 8025CA0C-8025CF04 04F8+00 s=1 e=0 z=0 None .text _create__8dTimer_cFv */ #pragma push @@ -393,7 +384,7 @@ asm void dTimer_c::_create() { /* ############################################################################################## */ /* 80454F48-80454F4C 0004+00 s=3 e=0 z=0 None .sdata2 @4050 */ -SECTION_SDATA2 static u32 lit_4050 = 0x41C80000; +SECTION_SDATA2 static f32 lit_4050 = 25.0f; /* 8025CF04-8025D33C 0438+00 s=1 e=0 z=0 None .text _execute__8dTimer_cFv */ #pragma push @@ -701,7 +692,7 @@ asm void dDlst_TimerScrnDraw_c::getNumber(int param_0) { /* ############################################################################################## */ /* 80454F4C-80454F50 0004+00 s=5 e=0 z=0 None .sdata2 @4124 */ -SECTION_SDATA2 static u32 lit_4124 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4124 = 1.0f; /* 80454F50-80454F58 0004+04 s=3 e=0 z=0 None .sdata2 @4125 */ SECTION_SDATA2 static f32 lit_4125[1 + 1 /* padding */] = { @@ -711,9 +702,7 @@ SECTION_SDATA2 static f32 lit_4125[1 + 1 /* padding */] = { }; /* 80454F58-80454F60 0008+00 s=7 e=0 z=0 None .sdata2 @4627 */ -SECTION_SDATA2 static u8 lit_4627[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4627 = 4503601774854144.0 /* cast s32 to float */; /* 8025EEF0-8025F180 0290+00 s=1 e=0 z=0 None .text setTimer__21dDlst_TimerScrnDraw_cFi */ #pragma push @@ -803,7 +792,7 @@ SECTION_SDATA2 static u8 animeFrame[6 + 2 /* padding */] = { }; /* 80454F68-80454F6C 0004+00 s=3 e=0 z=0 None .sdata2 @5094 */ -SECTION_SDATA2 static u32 lit_5094 = 0xC2480000; +SECTION_SDATA2 static f32 lit_5094 = -50.0f; /* 8025FB74-8025FF98 0424+00 s=1 e=0 z=0 None .text anime__21dDlst_TimerScrnDraw_cFv */ #pragma push @@ -817,7 +806,7 @@ asm void dDlst_TimerScrnDraw_c::anime() { /* ############################################################################################## */ /* 80454F6C-80454F70 0004+00 s=1 e=0 z=0 None .sdata2 @5143 */ -SECTION_SDATA2 static u32 lit_5143 = 0x42440000; +SECTION_SDATA2 static f32 lit_5143 = 49.0f; /* 8025FF98-802601E4 024C+00 s=1 e=0 z=0 None .text closeAnime__21dDlst_TimerScrnDraw_cFv */ #pragma push @@ -831,31 +820,31 @@ asm void dDlst_TimerScrnDraw_c::closeAnime() { /* ############################################################################################## */ /* 80454F70-80454F74 0004+00 s=3 e=0 z=0 None .sdata2 @5227 */ -SECTION_SDATA2 static u32 lit_5227 = 0x42200000; +SECTION_SDATA2 static f32 lit_5227 = 40.0f; /* 80454F74-80454F78 0004+00 s=2 e=0 z=0 None .sdata2 @5228 */ -SECTION_SDATA2 static u32 lit_5228 = 0x42700000; +SECTION_SDATA2 static f32 lit_5228 = 60.0f; /* 80454F78-80454F7C 0004+00 s=1 e=0 z=0 None .sdata2 @5229 */ -SECTION_SDATA2 static u32 lit_5229 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_5229 = -100.0f; /* 80454F7C-80454F80 0004+00 s=1 e=0 z=0 None .sdata2 @5230 */ -SECTION_SDATA2 static u32 lit_5230 = 0x42C80000; +SECTION_SDATA2 static f32 lit_5230 = 100.0f; /* 80454F80-80454F84 0004+00 s=1 e=0 z=0 None .sdata2 @5231 */ -SECTION_SDATA2 static u32 lit_5231 = 0x42960000; +SECTION_SDATA2 static f32 lit_5231 = 75.0f; /* 80454F84-80454F88 0004+00 s=1 e=0 z=0 None .sdata2 @5232 */ -SECTION_SDATA2 static u32 lit_5232 = 0xC2960000; +SECTION_SDATA2 static f32 lit_5232 = -75.0f; /* 80454F88-80454F8C 0004+00 s=1 e=0 z=0 None .sdata2 @5233 */ -SECTION_SDATA2 static u32 lit_5233 = 0x43480000; +SECTION_SDATA2 static f32 lit_5233 = 200.0f; /* 80454F8C-80454F90 0004+00 s=1 e=0 z=0 None .sdata2 @5234 */ -SECTION_SDATA2 static u32 lit_5234 = 0x43160000; +SECTION_SDATA2 static f32 lit_5234 = 150.0f; /* 80454F90-80454F94 0004+00 s=1 e=0 z=0 None .sdata2 @5235 */ -SECTION_SDATA2 static u32 lit_5235 = 0x41A00000; +SECTION_SDATA2 static f32 lit_5235 = 20.0f; /* 802601E4-80260574 0390+00 s=2 e=0 z=0 None .text createGetIn__21dDlst_TimerScrnDraw_cF4cXyz */ @@ -880,13 +869,13 @@ asm void dDlst_TimerScrnDraw_c::createStart(u16 param_0) { /* ############################################################################################## */ /* 80454F94-80454F98 0004+00 s=1 e=0 z=0 None .sdata2 @5325 */ -SECTION_SDATA2 static u32 lit_5325 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_5325 = 3.0f / 20.0f; /* 80454F98-80454F9C 0004+00 s=2 e=0 z=0 None .sdata2 @5326 */ -SECTION_SDATA2 static u32 lit_5326 = 0x3F000000; +SECTION_SDATA2 static f32 lit_5326 = 0.5f; /* 80454F9C-80454FA0 0004+00 s=1 e=0 z=0 None .sdata2 @5327 */ -SECTION_SDATA2 static u32 lit_5327 = 0x41900000; +SECTION_SDATA2 static f32 lit_5327 = 18.0f; /* 80260690-80260AA8 0418+00 s=1 e=0 z=0 None .text draw__21dDlst_TimerScrnDraw_cFv */ #pragma push @@ -988,16 +977,16 @@ asm void dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f3 /* ############################################################################################## */ /* 80454FA0-80454FA4 0004+00 s=1 e=0 z=0 None .sdata2 @5544 */ -SECTION_SDATA2 static u32 lit_5544 = 0x435D0000; +SECTION_SDATA2 static f32 lit_5544 = 221.0f; /* 80454FA4-80454FA8 0004+00 s=1 e=0 z=0 None .sdata2 @5545 */ -SECTION_SDATA2 static u32 lit_5545 = 0x43DB8000; +SECTION_SDATA2 static f32 lit_5545 = 439.0f; /* 80454FA8-80454FAC 0004+00 s=1 e=0 z=0 None .sdata2 @5546 */ -SECTION_SDATA2 static u32 lit_5546 = 0x42000000; +SECTION_SDATA2 static f32 lit_5546 = 32.0f; /* 80454FAC-80454FB0 0004+00 s=1 e=0 z=0 None .sdata2 @5547 */ -SECTION_SDATA2 static u32 lit_5547 = 0x43D18000; +SECTION_SDATA2 static f32 lit_5547 = 419.0f; /* 80261034-80261100 00CC+00 s=0 e=1 z=0 None .text dTimer_createStockTimer__Fv */ #pragma push diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index 27022d651c0..117e197eafc 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -57,8 +57,6 @@ struct dMapInfo_c { // Forward References: // -extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */]; - extern "C" void createWork__7dTres_cFv(); extern "C" void create__7dTres_cFv(); extern "C" void remove__7dTres_cFv(); @@ -83,10 +81,6 @@ extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */]; void mDoMtx_YrotS(f32 (*)[4], s16); void dPath_GetRoomPath(int, int); void* operator new[](u32); -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450680[8]; -extern "C" extern u32 __float_nan; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void isDungeonItem__12dSv_memBit_cCFi(); @@ -178,7 +172,7 @@ asm void dTres_c::addData(dTres_c::list_class* param_0, s8 param_1) { /* ############################################################################################## */ /* 80452BE8-80452BEC 0004+00 s=1 e=0 z=0 None .sdata2 @3839 */ -SECTION_SDATA2 static u32 lit_3839 = 0x43360B61; +SECTION_SDATA2 static f32 lit_3839 = 182.04444885253906f; /* 80452BEC-80452BF0 0004+00 s=1 e=0 z=0 None .sdata2 @3840 */ SECTION_SDATA2 static u8 lit_3840[4] = { @@ -189,14 +183,10 @@ SECTION_SDATA2 static u8 lit_3840[4] = { }; /* 80452BF0-80452BF8 0008+00 s=1 e=0 z=0 None .sdata2 @3841 */ -SECTION_SDATA2 static u8 lit_3841[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3841 = 0.5; /* 80452BF8-80452C00 0008+00 s=1 e=0 z=0 None .sdata2 @3842 */ -SECTION_SDATA2 static u8 lit_3842[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3842 = 3.0; /* 80452C00-80452C08 0008+00 s=1 e=0 z=0 None .sdata2 @3843 */ SECTION_SDATA2 static u8 lit_3843[8] = { @@ -204,9 +194,7 @@ SECTION_SDATA2 static u8 lit_3843[8] = { }; /* 80452C08-80452C10 0008+00 s=1 e=0 z=0 None .sdata2 @3845 */ -SECTION_SDATA2 static u8 lit_3845[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3845 = 4503601774854144.0 /* cast s32 to float */; /* 8009BE28-8009C168 0340+00 s=1 e=0 z=0 None .text checkTreasureBox__7dTres_cFPQ27dTres_c6data_s */ diff --git a/src/d/d_vib_pattern.cpp b/src/d/d_vib_pattern.cpp index e5752b2d2fa..373de132406 100644 --- a/src/d/d_vib_pattern.cpp +++ b/src/d/d_vib_pattern.cpp @@ -16,11 +16,6 @@ extern "C" extern u8 const CS_patt__12dVibration_c[88]; extern "C" extern u8 const MQ_patt__12dVibration_c[80]; extern "C" extern u8 const CQ_patt__12dVibration_c[80]; -extern "C" extern u8 const MS_patt__12dVibration_c[88]; -extern "C" extern u8 const CS_patt__12dVibration_c[88]; -extern "C" extern u8 const MQ_patt__12dVibration_c[80]; -extern "C" extern u8 const CQ_patt__12dVibration_c[80]; - // // External References: // diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index d42bcc1e412..4f91429ae72 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -56,8 +56,6 @@ struct JUTGamePad { // Forward References: // -extern "C" extern u8 data_80450F58[8]; - extern "C" static void func_8006F168(); extern "C" static void func_8006F184(); extern "C" static void func_8006F1A4(); @@ -82,12 +80,6 @@ extern "C" extern u8 data_80450F58[8]; void dCam_getBody(); void dKy_darkworld_check(); void cM_rnd(); -extern "C" extern u8 const MS_patt__12dVibration_c[88]; -extern "C" extern u8 const CS_patt__12dVibration_c[88]; -extern "C" extern u8 const MQ_patt__12dVibration_c[80]; -extern "C" extern u8 const CQ_patt__12dVibration_c[80]; -extern "C" extern u8 m_gamePad__8mDoCPd_c[16]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void checkVibration__19dSv_player_config_cCFv(); extern "C" void StartShake__9dCamera_cFlPUcl4cXyz(); @@ -152,9 +144,7 @@ extern "C" asm static void func_8006F1A4() { /* ############################################################################################## */ /* 80452620-80452628 0008+00 s=1 e=0 z=0 None .sdata2 @3756 */ -SECTION_SDATA2 static u8 lit_3756[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3756 = 4503601774854144.0 /* cast s32 to float */; /* 8006F1D8-8006F268 0090+00 s=1 e=0 z=0 None .text randombit__25@unnamed@d_vibration_cpp@Fll */ diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 428c0834369..8b6de2e92e9 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -153,7 +153,6 @@ void dEv_defaultSkipProc(void*, int); void dEv_defaultSkipZev(void*, int); void dEv_defaultSkipStb(void*, int); void dEv_noFinishSkipProc(void*, int); -extern "C" extern char const* const d_event_d_event__stringBase0; extern "C" static bool func_80041480(); extern "C" static void func_80041488(); @@ -229,15 +228,6 @@ void dComIfG_getStageRes(char const*); void dComIfG_getRoomArcName(int); void dComIfGs_onVisitedRoom(int); void dCam_getBody(); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* __vt__11dEvt_info_c[3 + 1 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_mode__7dDemo_c[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFf(); extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); @@ -364,7 +354,7 @@ asm void dEvt_control_c::order(u16 param_0, u16 param_1, u16 param_2, u16 param_ /* ############################################################################################## */ /* 80451EC0-80451EC4 0004+00 s=1 e=0 z=0 None .sdata2 @4361 */ -SECTION_SDATA2 static u32 lit_4361 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4361 = 1.0f; /* 80041804-80041934 0130+00 s=5 e=0 z=0 None .text setParam__14dEvt_control_cFP12dEvt_order_c */ @@ -696,7 +686,7 @@ asm void dEvt_control_c::offSkipFade() { /* ############################################################################################## */ /* 80451EC4-80451EC8 0004+00 s=1 e=0 z=0 None .sdata2 @4904 */ -SECTION_SDATA2 static u32 lit_4904 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4904 = 1.0f / 10.0f; /* 800429D4-80042BBC 01E8+00 s=1 e=0 z=0 None .text skipper__14dEvt_control_cFv */ #pragma push @@ -710,7 +700,7 @@ asm void dEvt_control_c::skipper() { /* ############################################################################################## */ /* 80451EC8-80451ECC 0004+00 s=1 e=0 z=0 None .sdata2 @5013 */ -SECTION_SDATA2 static u32 lit_5013 = 0xBD4CCCCD; +SECTION_SDATA2 static f32 lit_5013 = -1.0f / 20.0f; /* 80042BBC-80042FA8 03EC+00 s=0 e=1 z=0 None .text Step__14dEvt_control_cFv */ #pragma push diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp index a93aa31b36a..8b83492d613 100644 --- a/src/d/event/d_event_data.cpp +++ b/src/d/event/d_event_data.cpp @@ -141,7 +141,6 @@ static void getTelopNo(char const*); static void getTelopNo(); static void getStartTelopNo(); static void dEvDt_Next_Stage(int, int); -extern "C" extern char const* const d_event_d_event_data__stringBase0; extern "C" static void getTelopNo__FPCc(); extern "C" static void getTelopNo__Fv(); @@ -195,17 +194,6 @@ void d_GameOver_Delete(unsigned int&); void dKy_set_nexttime(f32); void dKy_instant_timechg(f32); void dKy_instant_rainchg(); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern f32 mFadeRate__13mDoGph_gInf_c; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_control__7dDemo_c[4]; -extern "C" extern u8 m_frameNoMsg__7dDemo_c[4]; -extern "C" extern u8 m_mode__7dDemo_c[4]; -extern "C" extern f32 mWipeRate__12dDlst_list_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void fadeOut__13mDoGph_gInf_cFf(); @@ -441,12 +429,10 @@ SECTION_SDATA2 static u8 lit_4264[4] = { }; /* 80451ED4-80451ED8 0004+00 s=2 e=0 z=0 None .sdata2 @4265 */ -SECTION_SDATA2 static u32 lit_4265 = 0x41700000; +SECTION_SDATA2 static f32 lit_4265 = 15.0f; /* 80451ED8-80451EE0 0008+00 s=1 e=0 z=0 None .sdata2 @4267 */ -SECTION_SDATA2 static u8 lit_4267[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4267 = 4503601774854144.0 /* cast s32 to float */; /* 80043A14-80043D60 034C+00 s=1 e=0 z=0 None .text dEvDt_Next_Stage__Fii */ #pragma push @@ -608,9 +594,7 @@ SECTION_SDATA2 static f32 lit_4460[1 + 1 /* padding */] = { }; /* 80451EE8-80451EF0 0008+00 s=1 e=0 z=0 None .sdata2 @4461 */ -SECTION_SDATA2 static u8 lit_4461[8] = { - 0x40, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4461 = 24.0; /* 80044190-80044324 0194+00 s=1 e=0 z=0 None .text specialProcLight__12dEvDtStaff_cFv */ #pragma push @@ -634,10 +618,10 @@ asm void dEvDtStaff_c::specialProcMessage() { /* ############################################################################################## */ /* 80451EF0-80451EF4 0004+00 s=4 e=0 z=0 None .sdata2 @4668 */ -SECTION_SDATA2 static u32 lit_4668 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4668 = 1.0f; /* 80451EF4-80451EF8 0004+00 s=2 e=0 z=0 None .sdata2 @4669 */ -SECTION_SDATA2 static u32 lit_4669 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4669 = -1.0f; /* 80044A58-80044CB8 0260+00 s=1 e=0 z=0 None .text specialProcSound__12dEvDtStaff_cFv */ #pragma push @@ -671,7 +655,7 @@ asm void dEvDtStaff_c::specialProcDirector() { /* ############################################################################################## */ /* 80451EF8-80451EFC 0004+00 s=1 e=0 z=0 None .sdata2 @5057 */ -SECTION_SDATA2 static u32 lit_5057 = 0x41200000; +SECTION_SDATA2 static f32 lit_5057 = 10.0f; /* 80045878-80045AFC 0284+00 s=1 e=0 z=0 None .text specialProcPackage__12dEvDtStaff_cFv */ #pragma push @@ -695,7 +679,7 @@ asm void dEvDtStaff_c::specialProcTimekeeper() { /* ############################################################################################## */ /* 80451EFC-80451F00 0004+00 s=1 e=0 z=0 None .sdata2 @5200 */ -SECTION_SDATA2 static u32 lit_5200 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_5200 = 4.0f / 5.0f; /* 80045C34-800460A8 0474+00 s=1 e=0 z=0 None .text specialProcEffect__12dEvDtStaff_cFv */ #pragma push diff --git a/src/d/event/d_event_lib.cpp b/src/d/event/d_event_lib.cpp index 7498c23aab9..b969925bc3a 100644 --- a/src/d/event/d_event_lib.cpp +++ b/src/d/event/d_event_lib.cpp @@ -62,7 +62,6 @@ extern "C" void __sinit_d_event_lib_cpp(); void fopAcM_orderOtherEventId(fopAc_ac_c*, s16, u8, u16, u16, u16); void fopAcM_orderMapToolEvent(fopAc_ac_c*, u8, s16, u16, u16, u16); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); extern "C" void fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs(); diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp index fecf0bcf46b..d501a545a08 100644 --- a/src/d/event/d_event_manager.cpp +++ b/src/d/event/d_event_manager.cpp @@ -41,14 +41,14 @@ struct dEvt_control_c { /* 800436F4 */ void setPtD(void*); }; +struct dEvDtData_c {}; + struct Vec {}; struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; -struct dEvDtData_c {}; - struct dEvDtStaff_c { /* 80044134 */ void init(); }; @@ -148,7 +148,6 @@ static void allOffObjectCallBack(fopAc_ac_c*, void*); static void dEvmng_strcmp(char const*, char*); static void findShutterCallBack(fopAc_ac_c*, void*); static void dEv_talkman_get_action(int); -extern "C" extern char const* const d_event_d_event_manager__stringBase0; extern "C" void init__18dEvent_exception_cFv(); extern "C" void setStartDemo__18dEvent_exception_cFi(); @@ -220,12 +219,6 @@ void dEv_defaultSkipProc(void*, int); void dEv_defaultSkipZev(void*, int); void dEv_defaultSkipStb(void*, int); void dCam_getBody(); -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); extern "C" void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(); @@ -576,27 +569,17 @@ asm void dEvent_manager_c::endProc(s16 param_0, int param_1) { /* ############################################################################################## */ /* 80451F00-80451F08 0004+04 s=1 e=0 z=0 None .sdata2 @4398 */ -SECTION_SDATA2 static u8 lit_4398[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_4398[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80451F08-80451F10 0008+00 s=1 e=0 z=0 None .sdata2 @4399 */ -SECTION_SDATA2 static u8 lit_4399[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4399 = 0.5; /* 80451F10-80451F18 0008+00 s=1 e=0 z=0 None .sdata2 @4400 */ -SECTION_SDATA2 static u8 lit_4400[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4400 = 3.0; /* 80451F18-80451F20 0008+00 s=1 e=0 z=0 None .sdata2 @4401 */ SECTION_SDATA2 static u8 lit_4401[8] = { @@ -604,13 +587,13 @@ SECTION_SDATA2 static u8 lit_4401[8] = { }; /* 80451F20-80451F24 0004+00 s=1 e=0 z=0 None .sdata2 @4402 */ -SECTION_SDATA2 static u32 lit_4402 = 0x43340000; +SECTION_SDATA2 static f32 lit_4402 = 180.0f; /* 80451F24-80451F28 0004+00 s=1 e=0 z=0 None .sdata2 @4403 */ -SECTION_SDATA2 static u32 lit_4403 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4403 = 1.0f; /* 80451F28-80451F2C 0004+00 s=1 e=0 z=0 None .sdata2 @4404 */ -SECTION_SDATA2 static u32 lit_4404 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4404 = -1.0f; /* 80046E64-800473FC 0598+00 s=0 e=1 z=0 None .text Sequencer__16dEvent_manager_cFv */ #pragma push @@ -914,10 +897,10 @@ asm void dEvent_manager_c::getRunEventName() { /* ############################################################################################## */ /* 80451F2C-80451F30 0004+00 s=1 e=0 z=0 None .sdata2 @5025 */ -SECTION_SDATA2 static u32 lit_5025 = 0x41200000; +SECTION_SDATA2 static f32 lit_5025 = 10.0f; /* 80451F30-80451F34 0004+00 s=1 e=0 z=0 None .sdata2 @5026 */ -SECTION_SDATA2 static u32 lit_5026 = 0xC1200000; +SECTION_SDATA2 static f32 lit_5026 = -10.0f; /* 8004846C-80048520 00B4+00 s=1 e=0 z=0 None .text findShutterCallBack__FP10fopAc_ac_cPv */ #pragma push @@ -931,7 +914,7 @@ asm static void findShutterCallBack(fopAc_ac_c* param_0, void* param_1) { /* ############################################################################################## */ /* 80451F34-80451F38 0004+00 s=1 e=0 z=0 None .sdata2 @5055 */ -SECTION_SDATA2 static u32 lit_5055 = 0x42C80000; +SECTION_SDATA2 static f32 lit_5055 = 100.0f; /* 80048520-80048618 00F8+00 s=1 e=0 z=0 None .text specialCast_Shutter__16dEvent_manager_cFsi */ diff --git a/src/d/file/d_file_sel_info.cpp b/src/d/file/d_file_sel_info.cpp index 26f2d7c529e..66c20342db2 100644 --- a/src/d/file/d_file_sel_info.cpp +++ b/src/d/file/d_file_sel_info.cpp @@ -68,8 +68,6 @@ struct CPaneMgrAlpha { // Forward References: // -extern "C" extern char const* const d_file_d_file_sel_info__stringBase0; - extern "C" void __ct__12dFile_info_cFP10JKRArchiveUc(); extern "C" void __dt__12dFile_info_cFv(); extern "C" void screenSet__12dFile_info_cFv(); @@ -93,9 +91,6 @@ void mDoExt_getMesgFont(); void mDoExt_removeMesgFont(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void mDoExt_removeMesgFont__Fv(); @@ -326,7 +321,7 @@ asm void dFile_info_c::_draw() { /* ############################################################################################## */ /* 804539F8-804539FC 0004+00 s=1 e=0 z=0 None .sdata2 @4000 */ -SECTION_SDATA2 static u32 lit_4000 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4000 = 1.0f; /* 804539FC-80453A00 0004+00 s=1 e=0 z=0 None .sdata2 @4001 */ SECTION_SDATA2 static u8 lit_4001[4] = { diff --git a/src/d/file/d_file_sel_warning.cpp b/src/d/file/d_file_sel_warning.cpp index 07dbe5c4e44..93459f90412 100644 --- a/src/d/file/d_file_sel_warning.cpp +++ b/src/d/file/d_file_sel_warning.cpp @@ -16,12 +16,12 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; +struct JKRArchive {}; + struct JUtility { struct TColor {}; }; -struct JKRArchive {}; - struct dFile_warning_c { /* 80191BAC */ dFile_warning_c(JKRArchive*, u8); /* 80191C18 */ ~dFile_warning_c(); @@ -89,8 +89,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_file_d_file_sel_warning__stringBase0; - extern "C" void __ct__15dFile_warning_cFP10JKRArchiveUc(); extern "C" void __dt__15dFile_warning_cFv(); extern "C" void screenSet__15dFile_warning_cFv(); @@ -120,8 +118,6 @@ void mDoExt_getMesgFont(); void mDoExt_removeMesgFont(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void mDoExt_removeMesgFont__Fv(); @@ -260,7 +256,7 @@ SECTION_SDATA2 static void* data_804539E8 = (void*)(((char*)&d_file_d_file_sel_warning__stringBase0) + 0x69); /* 804539EC-804539F0 0004+00 s=2 e=0 z=0 None .sdata2 @3799 */ -SECTION_SDATA2 static u32 lit_3799 = 0x45321000; +SECTION_SDATA2 static f32 lit_3799 = 2849.0f; /* 80191CF4-80191F18 0224+00 s=1 e=0 z=0 None .text screenSet__15dFile_warning_cFv */ #pragma push @@ -299,9 +295,7 @@ asm void dFile_warning_c::modeMove() { /* ############################################################################################## */ /* 804539F0-804539F8 0008+00 s=3 e=0 z=0 None .sdata2 @3868 */ -SECTION_SDATA2 static u8 lit_3868[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3868 = 4503601774854144.0 /* cast s32 to float */; /* 80191FD4-801920B8 00E4+00 s=1 e=0 z=0 None .text baseMoveAnm__15dFile_warning_cFv */ #pragma push diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp index e2e86acacc0..4e1ed9f0009 100644 --- a/src/d/file/d_file_select.cpp +++ b/src/d/file/d_file_select.cpp @@ -93,10 +93,10 @@ struct dSelect_cursor_c { /* 801952A0 */ void setAlphaRate(f32); }; -struct dKy_tevstr_c {}; - struct cXyz {}; +struct dKy_tevstr_c {}; + struct dScnKy_env_light_c { /* 801A37C4 */ void settingTevStruct(int, cXyz*, dKy_tevstr_c*); /* 801A4DA0 */ void setLightTevColorType_MAJI(J3DModelData*, dKy_tevstr_c*); @@ -110,6 +110,8 @@ struct dName_c { /* 80250560 */ void _draw(); }; +struct COutFont_c {}; + struct JUtility { struct TColor {}; }; @@ -123,8 +125,6 @@ struct J2DTextBox { struct JUTFont {}; -struct COutFont_c {}; - struct dMsgString_c { /* 80191B6C */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 80249C20 */ dMsgString_c(); @@ -530,14 +530,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_file_d_file_select__stringBase0; -extern "C" extern void* lit_7799[3]; -extern "C" extern void* lit_7801[3]; -extern "C" extern void* lit_7803[3]; -extern "C" extern void* lit_7808[3]; -extern "C" extern void* __vt__15J2DAnmTransform[5 + 4 /* padding */]; -extern "C" extern void* __vt__10JUTNameTab[3]; - extern "C" void __ct__9dFs_HIO_cFv(); extern "C" void __ct__14dFile_select_cFP10JKRArchive(); extern "C" void __dt__14dFile_select_cFv(); @@ -763,30 +755,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cAPICPad_ANY_BUTTON(u32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__10J2DAnmBase[4]; -extern "C" extern void* __vt__15J2DAnmTevRegKey[4]; -extern "C" extern void* __vt__19J2DAnmTextureSRTKey[4]; -extern "C" extern void* __vt__11J2DAnmColor[5]; -extern "C" extern void* __vt__8J3DModel[9]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_mDoMemCd_control[8192]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mFadeColor__13mDoGph_gInf_c[4]; -extern "C" extern u32 g_blackColor; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memcpy(); extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); @@ -2076,7 +2044,7 @@ SECTION_DATA static void* __vt__9dFs_HIO_c[3 + 1 /* padding */] = { }; /* 80453928-8045392C 0004+00 s=1 e=0 z=0 None .sdata2 @3812 */ -SECTION_SDATA2 static u32 lit_3812 = 0x3F8E147B; +SECTION_SDATA2 static f32 lit_3812 = 111.0f / 100.0f; /* 801835F8-8018366C 0074+00 s=1 e=0 z=0 None .text __ct__9dFs_HIO_cFv */ #pragma push @@ -2156,7 +2124,7 @@ static u8 lit_3807[12]; static u8 g_fsHIO[36]; /* 8045392C-80453930 0004+00 s=1 e=0 z=0 None .sdata2 @4165 */ -SECTION_SDATA2 static u32 lit_4165 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4165 = 9.0f / 10.0f; /* 80453930-80453938 0004+04 s=5 e=0 z=0 None .sdata2 @4166 */ SECTION_SDATA2 static f32 lit_4166[1 + 1 /* padding */] = { @@ -2187,9 +2155,7 @@ asm void dFile_select_c::_move() { /* ############################################################################################## */ /* 80453938-80453940 0008+00 s=34 e=0 z=0 None .sdata2 @4342 */ -SECTION_SDATA2 static u8 lit_4342[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4342 = 4503601774854144.0 /* cast s32 to float */; /* 80184664-801848A0 023C+00 s=1 e=0 z=0 None .text selFileWakuAnm__14dFile_select_cFv */ #pragma push @@ -2275,10 +2241,10 @@ asm void dFile_select_c::selectDataBaseMoveAnm() { /* ############################################################################################## */ /* 80453940-80453944 0004+00 s=38 e=0 z=0 None .sdata2 @4611 */ -SECTION_SDATA2 static u32 lit_4611 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4611 = 1.0f; /* 80453944-80453948 0004+00 s=19 e=0 z=0 None .sdata2 @4612 */ -SECTION_SDATA2 static u32 lit_4612 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4612 = -1.0f; /* 80184E38-80185040 0208+00 s=1 e=0 z=0 None .text dataSelectInAnmSet__14dFile_select_cFv */ #pragma push @@ -2578,7 +2544,7 @@ asm void dFile_select_c::nameToDataSelectMove() { /* ############################################################################################## */ /* 8045394C-80453950 0004+00 s=4 e=0 z=0 None .sdata2 @5472 */ -SECTION_SDATA2 static u32 lit_5472 = 0x437F0000; +SECTION_SDATA2 static f32 lit_5472 = 255.0f; /* 80453950-80453958 0004+04 s=4 e=0 z=0 None .sdata2 @5473 */ SECTION_SDATA2 static f32 lit_5473[1 + 1 /* padding */] = { @@ -2588,9 +2554,7 @@ SECTION_SDATA2 static f32 lit_5473[1 + 1 /* padding */] = { }; /* 80453958-80453960 0008+00 s=4 e=0 z=0 None .sdata2 @5475 */ -SECTION_SDATA2 static u8 lit_5475[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5475 = 4503599627370496.0 /* cast u32 to float */; /* 8018759C-801876A0 0104+00 s=1 e=0 z=0 None .text nameInputFade__14dFile_select_cFv */ #pragma push @@ -2674,10 +2638,10 @@ asm void dFile_select_c::backSelectMove() { /* ############################################################################################## */ /* 80453960-80453964 0004+00 s=1 e=0 z=0 None .sdata2 @5614 */ -SECTION_SDATA2 static u32 lit_5614 = 0x42C60000; +SECTION_SDATA2 static f32 lit_5614 = 99.0f; /* 80453964-80453968 0004+00 s=1 e=0 z=0 None .sdata2 @5615 */ -SECTION_SDATA2 static u32 lit_5615 = 0x42DA0000; +SECTION_SDATA2 static f32 lit_5615 = 109.0f; /* 80187BE8-80187DB8 01D0+00 s=6 e=0 z=0 None .text copySelMoveAnmInitSet__14dFile_select_cFii */ @@ -2841,13 +2805,13 @@ asm void dFile_select_c::yesnoSelectMoveAnm() { /* ############################################################################################## */ /* 80453968-8045396C 0004+00 s=6 e=0 z=0 None .sdata2 @6069 */ -SECTION_SDATA2 static u32 lit_6069 = 0x3F75C28F; +SECTION_SDATA2 static f32 lit_6069 = 24.0f / 25.0f; /* 8045396C-80453970 0004+00 s=3 e=0 z=0 None .sdata2 @6070 */ -SECTION_SDATA2 static u32 lit_6070 = 0x3F570A3D; +SECTION_SDATA2 static f32 lit_6070 = 21.0f / 25.0f; /* 80453970-80453974 0004+00 s=3 e=0 z=0 None .sdata2 @6071 */ -SECTION_SDATA2 static u32 lit_6071 = 0x3D75C28F; +SECTION_SDATA2 static f32 lit_6071 = 3.0f / 50.0f; /* 8018912C-8018929C 0170+00 s=9 e=0 z=0 None .text yesnoCursorShow__14dFile_select_cFv */ #pragma push @@ -3087,46 +3051,46 @@ void dFile_select_c::nextModeWait() { /* ############################################################################################## */ /* 80453974-80453978 0004+00 s=1 e=0 z=0 None .sdata2 @6867 */ -SECTION_SDATA2 static u32 lit_6867 = 0x41C00000; +SECTION_SDATA2 static f32 lit_6867 = 24.0f; /* 80453978-8045397C 0004+00 s=1 e=0 z=0 None .sdata2 @6868 */ -SECTION_SDATA2 static u32 lit_6868 = 0x41A00000; +SECTION_SDATA2 static f32 lit_6868 = 20.0f; /* 8045397C-80453980 0004+00 s=1 e=0 z=0 None .sdata2 @6869 */ -SECTION_SDATA2 static u32 lit_6869 = 0x43DC0000; +SECTION_SDATA2 static f32 lit_6869 = 440.0f; /* 80453980-80453984 0004+00 s=1 e=0 z=0 None .sdata2 @6870 */ -SECTION_SDATA2 static u32 lit_6870 = 0x43460000; +SECTION_SDATA2 static f32 lit_6870 = 198.0f; /* 80453984-80453988 0004+00 s=1 e=0 z=0 None .sdata2 @6871 */ -SECTION_SDATA2 static u32 lit_6871 = 0x41A80000; +SECTION_SDATA2 static f32 lit_6871 = 21.0f; /* 80453988-8045398C 0004+00 s=3 e=0 z=0 None .sdata2 @6872 */ -SECTION_SDATA2 static u32 lit_6872 = 0x3F70A3D7; +SECTION_SDATA2 static f32 lit_6872 = 47.0f / 50.0f; /* 8045398C-80453990 0004+00 s=3 e=0 z=0 None .sdata2 @6873 */ -SECTION_SDATA2 static u32 lit_6873 = 0x3CF5C28F; +SECTION_SDATA2 static f32 lit_6873 = 3.0f / 100.0f; /* 80453990-80453994 0004+00 s=3 e=0 z=0 None .sdata2 @6874 */ -SECTION_SDATA2 static u32 lit_6874 = 0x3F333333; +SECTION_SDATA2 static f32 lit_6874 = 7.0f / 10.0f; /* 80453994-80453998 0004+00 s=1 e=0 z=0 None .sdata2 @6875 */ -SECTION_SDATA2 static u32 lit_6875 = 0x436E0000; +SECTION_SDATA2 static f32 lit_6875 = 238.0f; /* 80453998-8045399C 0004+00 s=1 e=0 z=0 None .sdata2 @6876 */ -SECTION_SDATA2 static u32 lit_6876 = 0x422C0000; +SECTION_SDATA2 static f32 lit_6876 = 43.0f; /* 8045399C-804539A0 0004+00 s=1 e=0 z=0 None .sdata2 @6877 */ -SECTION_SDATA2 static u32 lit_6877 = 0x44320000; +SECTION_SDATA2 static f32 lit_6877 = 712.0f; /* 804539A0-804539A4 0004+00 s=1 e=0 z=0 None .sdata2 @6878 */ -SECTION_SDATA2 static u32 lit_6878 = 0x43020000; +SECTION_SDATA2 static f32 lit_6878 = 130.0f; /* 804539A4-804539A8 0004+00 s=3 e=0 z=0 None .sdata2 @6879 */ -SECTION_SDATA2 static u32 lit_6879 = 0x44180000; +SECTION_SDATA2 static f32 lit_6879 = 608.0f; /* 804539A8-804539AC 0004+00 s=3 e=0 z=0 None .sdata2 @6880 */ -SECTION_SDATA2 static u32 lit_6880 = 0x43E00000; +SECTION_SDATA2 static f32 lit_6880 = 448.0f; /* 8018ADA0-8018BEE0 1140+00 s=1 e=0 z=0 None .text screenSet__14dFile_select_cFv */ #pragma push @@ -3196,7 +3160,7 @@ SECTION_SDATA static u8 l_msgNum[3 + 1 /* padding */] = { }; /* 804539AC-804539B0 0004+00 s=1 e=0 z=0 None .sdata2 @7146 */ -SECTION_SDATA2 static u32 lit_7146 = 0x4447C000; +SECTION_SDATA2 static f32 lit_7146 = 799.0f; /* 8018C8F4-8018CCD0 03DC+00 s=1 e=0 z=0 None .text screenSet3Menu__14dFile_select_cFv */ #pragma push @@ -3220,7 +3184,7 @@ asm void dFile_select_c::screenSetDetail() { /* ############################################################################################## */ /* 804539B0-804539B4 0004+00 s=1 e=0 z=0 None .sdata2 @7201 */ -SECTION_SDATA2 static u32 lit_7201 = 0x453B8000; +SECTION_SDATA2 static f32 lit_7201 = 3000.0f; /* 8018CE38-8018CF50 0118+00 s=2 e=0 z=0 None .text setWakuAnm__14dFile_select_cFv */ #pragma push @@ -4045,7 +4009,7 @@ asm void dFile_select3D_c::freeHeap() { /* ############################################################################################## */ /* 804539B4-804539B8 0004+00 s=1 e=0 z=0 None .sdata2 @8459 */ -SECTION_SDATA2 static u32 lit_8459 = 0x44340000; +SECTION_SDATA2 static f32 lit_8459 = 720.0f; /* 801904E4-801905A8 00C4+00 s=1 e=0 z=0 None .text _move__16dFile_select3D_cFv */ #pragma push @@ -4079,7 +4043,7 @@ asm void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char /* ############################################################################################## */ /* 804539B8-804539BC 0004+00 s=1 e=0 z=0 None .sdata2 @8608 */ -SECTION_SDATA2 static u32 lit_8608 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_8608 = 1.0f / 10.0f; /* 8019095C-80190A14 00B8+00 s=2 e=0 z=0 None .text set_mtx__16dFile_select3D_cFv */ #pragma push @@ -4133,7 +4097,7 @@ asm void dFile_select3D_c::createMirrorModel() { /* ############################################################################################## */ /* 804539BC-804539C0 0004+00 s=1 e=0 z=0 None .sdata2 @8978 */ -SECTION_SDATA2 static u32 lit_8978 = 0x40000000; +SECTION_SDATA2 static f32 lit_8978 = 2.0f; /* 804539C0-804539C8 0004+04 s=1 e=0 z=0 None .sdata2 @8979 */ SECTION_SDATA2 static f32 lit_8979[1 + 1 /* padding */] = { @@ -4143,12 +4107,10 @@ SECTION_SDATA2 static f32 lit_8979[1 + 1 /* padding */] = { }; /* 804539C8-804539D0 0008+00 s=1 e=0 z=0 None .sdata2 @8980 */ -SECTION_SDATA2 static u8 lit_8980[8] = { - 0x3F, 0xD9, 0x21, 0xFB, 0x60, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_8980 = 0.39269909262657166; /* 804539D0-804539D4 0004+00 s=1 e=0 z=0 None .sdata2 @8981 */ -SECTION_SDATA2 static u32 lit_8981 = 0x3FADB6DB; +SECTION_SDATA2 static f32 lit_8981 = 19.0f / 14.0f; /* 80190FE8-801910D4 00EC+00 s=1 e=0 z=0 None .text toItem3Dpos__16dFile_select3D_cFfffP4cXyz */ @@ -4163,7 +4125,7 @@ asm void dFile_select3D_c::toItem3Dpos(f32 param_0, f32 param_1, f32 param_2, cX /* ############################################################################################## */ /* 804539D4-804539D8 0004+00 s=1 e=0 z=0 None .sdata2 @8993 */ -SECTION_SDATA2 static u32 lit_8993 = 0xC47A0000; +SECTION_SDATA2 static f32 lit_8993 = -1000.0f; /* 801910D4-80191130 005C+00 s=1 e=0 z=0 None .text calcViewMtx__16dFile_select3D_cFPA4_f */ #pragma push diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp index eccacf66a25..5ee42f4d316 100644 --- a/src/d/kankyo/d_kankyo.cpp +++ b/src/d/kankyo/d_kankyo.cpp @@ -61,14 +61,6 @@ struct dStage_roomControl_c { /* 8019F780 */ void GetTimePass(); }; -struct dKy_tevstr_c {}; - -struct _GXColorS10 {}; - -struct J3DModelData { - /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); -}; - struct Vec {}; struct cXyz { @@ -78,6 +70,14 @@ struct cXyz { /* 80266B84 */ void operator*(f32) const; }; +struct dKy_tevstr_c {}; + +struct J3DModelData { + /* 8032600C */ void simpleCalcMaterial(u16, f32 (*)[4]); +}; + +struct _GXColorS10 {}; + struct dScnKy_env_light_c { /* 8019F2E8 */ dScnKy_env_light_c(); /* 8019F4FC */ void setDaytime(); @@ -396,11 +396,6 @@ void dKy_shadow_mode_reset(u8); void dKy_shadow_mode_check(u8); void dKy_bg_MAxx_proc(void*); static void dKankyo_DayProc(); -extern "C" extern char const* const d_kankyo_d_kankyo__stringBase0; -extern "C" extern void* g_profile_KANKYO[10]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 struct_80451070[8]; extern "C" static void dKy_WolfPowerup_AmbCol__FP11_GXColorS10(); extern "C" static void dKy_sense_pat_get__Fv(); @@ -646,23 +641,6 @@ void cLib_addCalc(f32*, f32, f32, f32, f32); void GFSetFog(_GXFogType, f32, f32, f32, f32, _GXColor); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern u8 const j3dDefaultMtx[48]; -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 m_bloom__13mDoGph_gInf_c[20]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); SECTION_INIT void memcpy(); @@ -1024,61 +1002,61 @@ SECTION_DATA static void* lit_4364[16] = { }; /* 80453BC0-80453BC4 0004+00 s=1 e=0 z=0 None .sdata2 @4345 */ -SECTION_SDATA2 static u32 lit_4345 = 0x443B8000; +SECTION_SDATA2 static f32 lit_4345 = 750.0f; /* 80453BC4-80453BC8 0004+00 s=1 e=0 z=0 None .sdata2 @4346 */ -SECTION_SDATA2 static u32 lit_4346 = 0x44DAC000; +SECTION_SDATA2 static f32 lit_4346 = 1750.0f; /* 80453BC8-80453BCC 0004+00 s=2 e=0 z=0 None .sdata2 @4347 */ -SECTION_SDATA2 static u32 lit_4347 = 0x459C4000; +SECTION_SDATA2 static f32 lit_4347 = 5000.0f; /* 80453BCC-80453BD0 0004+00 s=1 e=0 z=0 None .sdata2 @4348 */ -SECTION_SDATA2 static u32 lit_4348 = 0x471C4000; +SECTION_SDATA2 static f32 lit_4348 = 40000.0f; /* 80453BD0-80453BD4 0004+00 s=1 e=0 z=0 None .sdata2 @4349 */ -SECTION_SDATA2 static u32 lit_4349 = 0x457A0000; +SECTION_SDATA2 static f32 lit_4349 = 4000.0f; /* 80453BD4-80453BD8 0004+00 s=1 e=0 z=0 None .sdata2 @4350 */ -SECTION_SDATA2 static u32 lit_4350 = 0x463B8000; +SECTION_SDATA2 static f32 lit_4350 = 12000.0f; /* 80453BD8-80453BDC 0004+00 s=4 e=0 z=0 None .sdata2 @4351 */ -SECTION_SDATA2 static u32 lit_4351 = 0x43FA0000; +SECTION_SDATA2 static f32 lit_4351 = 500.0f; /* 80453BDC-80453BE0 0004+00 s=1 e=0 z=0 None .sdata2 @4352 */ -SECTION_SDATA2 static u32 lit_4352 = 0x450CA000; +SECTION_SDATA2 static f32 lit_4352 = 2250.0f; /* 80453BE0-80453BE4 0004+00 s=4 e=0 z=0 None .sdata2 @4353 */ -SECTION_SDATA2 static u32 lit_4353 = 0x447A0000; +SECTION_SDATA2 static f32 lit_4353 = 1000.0f; /* 80453BE4-80453BE8 0004+00 s=2 e=0 z=0 None .sdata2 @4354 */ -SECTION_SDATA2 static u32 lit_4354 = 0x44E10000; +SECTION_SDATA2 static f32 lit_4354 = 1800.0f; /* 80453BE8-80453BEC 0004+00 s=1 e=0 z=0 None .sdata2 @4355 */ -SECTION_SDATA2 static u32 lit_4355 = 0x452BE000; +SECTION_SDATA2 static f32 lit_4355 = 2750.0f; /* 80453BEC-80453BF0 0004+00 s=4 e=0 z=0 None .sdata2 @4356 */ -SECTION_SDATA2 static u32 lit_4356 = 0x44FA0000; +SECTION_SDATA2 static f32 lit_4356 = 2000.0f; /* 80453BF0-80453BF4 0004+00 s=2 e=0 z=0 None .sdata2 @4357 */ -SECTION_SDATA2 static u32 lit_4357 = 0x453B8000; +SECTION_SDATA2 static f32 lit_4357 = 3000.0f; /* 80453BF4-80453BF8 0004+00 s=4 e=0 z=0 None .sdata2 @4358 */ -SECTION_SDATA2 static u32 lit_4358 = 0x43960000; +SECTION_SDATA2 static f32 lit_4358 = 300.0f; /* 80453BF8-80453BFC 0004+00 s=1 e=0 z=0 None .sdata2 @4359 */ -SECTION_SDATA2 static u32 lit_4359 = 0x442F0000; +SECTION_SDATA2 static f32 lit_4359 = 700.0f; /* 80453BFC-80453C00 0004+00 s=4 e=0 z=0 None .sdata2 @4360 */ -SECTION_SDATA2 static u32 lit_4360 = 0x44BB8000; +SECTION_SDATA2 static f32 lit_4360 = 1500.0f; /* 80453C00-80453C04 0004+00 s=1 e=0 z=0 None .sdata2 @4361 */ -SECTION_SDATA2 static u32 lit_4361 = 0x449C4000; +SECTION_SDATA2 static f32 lit_4361 = 1250.0f; /* 80453C04-80453C08 0004+00 s=2 e=0 z=0 None .sdata2 @4362 */ -SECTION_SDATA2 static u32 lit_4362 = 0x479C4000; +SECTION_SDATA2 static f32 lit_4362 = 80000.0f; /* 80453C08-80453C0C 0004+00 s=1 e=0 z=0 None .sdata2 @4363 */ -SECTION_SDATA2 static u32 lit_4363 = 0x45947000; +SECTION_SDATA2 static f32 lit_4363 = 4750.0f; /* 8019CCDC-8019CE5C 0180+00 s=4 e=0 z=0 None .text dKy_WolfPowerup_FogNearFar__FPfPf */ #pragma push @@ -1100,14 +1078,10 @@ SECTION_SDATA2 static u8 lit_4409[4] = { }; /* 80453C10-80453C18 0008+00 s=12 e=0 z=0 None .sdata2 @4410 */ -SECTION_SDATA2 static u8 lit_4410[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4410 = 0.5; /* 80453C18-80453C20 0008+00 s=12 e=0 z=0 None .sdata2 @4411 */ -SECTION_SDATA2 static u8 lit_4411[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4411 = 3.0; /* 80453C20-80453C28 0008+00 s=12 e=0 z=0 None .sdata2 @4412 */ SECTION_SDATA2 static u8 lit_4412[8] = { @@ -1132,15 +1106,13 @@ static u8 lit_4112[12]; u8 g_env_light[4880]; /* 80453C28-80453C2C 0004+00 s=1 e=0 z=0 None .sdata2 @4441 */ -SECTION_SDATA2 static u32 lit_4441 = 0x3BB40000; +SECTION_SDATA2 static f32 lit_4441 = 0.0054931640625f; /* 80453C2C-80453C30 0004+00 s=13 e=0 z=0 None .sdata2 @4442 */ -SECTION_SDATA2 static u32 lit_4442 = 0x42B40000; +SECTION_SDATA2 static f32 lit_4442 = 90.0f; /* 80453C30-80453C38 0008+00 s=25 e=0 z=0 None .sdata2 @4444 */ -SECTION_SDATA2 static u8 lit_4444[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4444 = 4503601774854144.0 /* cast s32 to float */; /* 8019CFE4-8019D1A0 01BC+00 s=4 e=0 z=0 None .text dKy_twi_wolflight_set__Fi */ #pragma push @@ -1154,7 +1126,7 @@ asm static void dKy_twi_wolflight_set(int param_0) { /* ############################################################################################## */ /* 80453C38-80453C3C 0004+00 s=1 e=0 z=0 None .sdata2 @4477 */ -SECTION_SDATA2 static u32 lit_4477 = 0x42652EE0; +SECTION_SDATA2 static f32 lit_4477 = 57.2957763671875f; /* 8019D1A0-8019D2C4 0124+00 s=3 e=0 z=0 None .text dKy_lightdir_set__FffP3Vec */ #pragma push @@ -1179,31 +1151,31 @@ SECTION_DATA static void* lit_4511[7] = { }; /* 80453C3C-80453C40 0004+00 s=1 e=0 z=0 None .sdata2 @4502 */ -SECTION_SDATA2 static u32 lit_4502 = 0x40490FDB; +SECTION_SDATA2 static f32 lit_4502 = 3.1415927410125732f; /* 80453C40-80453C44 0004+00 s=3 e=0 z=0 None .sdata2 @4503 */ -SECTION_SDATA2 static u32 lit_4503 = 0x43340000; +SECTION_SDATA2 static f32 lit_4503 = 180.0f; /* 80453C44-80453C48 0004+00 s=2 e=0 z=0 None .sdata2 @4504 */ -SECTION_SDATA2 static u32 lit_4504 = 0xC47A0000; +SECTION_SDATA2 static f32 lit_4504 = -1000.0f; /* 80453C48-80453C4C 0004+00 s=36 e=0 z=0 None .sdata2 @4505 */ -SECTION_SDATA2 static u32 lit_4505 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4505 = 1.0f; /* 80453C4C-80453C50 0004+00 s=6 e=0 z=0 None .sdata2 @4506 */ -SECTION_SDATA2 static u32 lit_4506 = 0x40000000; +SECTION_SDATA2 static f32 lit_4506 = 2.0f; /* 80453C50-80453C54 0004+00 s=6 e=0 z=0 None .sdata2 @4507 */ -SECTION_SDATA2 static u32 lit_4507 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4507 = -1.0f; /* 80453C54-80453C58 0004+00 s=1 e=0 z=0 None .sdata2 @4508 */ -SECTION_SDATA2 static u32 lit_4508 = 0xC0800000; +SECTION_SDATA2 static f32 lit_4508 = -4.0f; /* 80453C58-80453C5C 0004+00 s=2 e=0 z=0 None .sdata2 @4509 */ -SECTION_SDATA2 static u32 lit_4509 = 0x40800000; +SECTION_SDATA2 static f32 lit_4509 = 4.0f; /* 80453C5C-80453C60 0004+00 s=1 e=0 z=0 None .sdata2 @4510 */ -SECTION_SDATA2 static u32 lit_4510 = 0xC0000000; +SECTION_SDATA2 static f32 lit_4510 = -2.0f; /* 8019D2C4-8019D44C 0188+00 s=3 e=0 z=0 None .text dKy_GXInitLightSpot__FP12J3DLightInfofUc */ @@ -1218,7 +1190,7 @@ asm static void dKy_GXInitLightSpot(J3DLightInfo* param_0, f32 param_1, u8 param /* ############################################################################################## */ /* 80453C60-80453C64 0004+00 s=8 e=0 z=0 None .sdata2 @4529 */ -SECTION_SDATA2 static u32 lit_4529 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4529 = 0.5f; /* 8019D44C-8019D520 00D4+00 s=2 e=0 z=0 None .text dKy_GXInitLightDistAttn__FP12J3DLightInfoffUc */ @@ -1327,13 +1299,13 @@ asm void dKy_get_parcent(f32 param_0, f32 param_1, f32 param_2) { /* ############################################################################################## */ /* 80453C64-80453C68 0004+00 s=4 e=0 z=0 None .sdata2 @4730 */ -SECTION_SDATA2 static u32 lit_4730 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4730 = 1.0f / 10.0f; /* 80453C68-80453C6C 0004+00 s=9 e=0 z=0 None .sdata2 @4731 */ -SECTION_SDATA2 static u32 lit_4731 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_4731 = 1.0f / 100.0f; /* 80453C6C-80453C70 0004+00 s=8 e=0 z=0 None .sdata2 @4732 */ -SECTION_SDATA2 static u32 lit_4732 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4732 = 255.0f; /* 8019D8CC-8019DD4C 0480+00 s=1 e=0 z=0 None .text dKy_FiveSenses_fullthrottle_dark_static1__Fv */ @@ -1358,10 +1330,10 @@ asm void dKy_FiveSenses_fullthrottle_dark() { /* ############################################################################################## */ /* 80453C70-80453C74 0004+00 s=4 e=0 z=0 None .sdata2 @4850 */ -SECTION_SDATA2 static u32 lit_4850 = 0x49742400; +SECTION_SDATA2 static f32 lit_4850 = 1000000.0f; /* 80453C74-80453C78 0004+00 s=1 e=0 z=0 None .sdata2 @4851 */ -SECTION_SDATA2 static u32 lit_4851 = 0x44480000; +SECTION_SDATA2 static f32 lit_4851 = 800.0f; /* 80453C78-80453C80 0004+04 s=3 e=0 z=0 None .sdata2 @4852 */ SECTION_SDATA2 static f32 lit_4852[1 + 1 /* padding */] = { @@ -1402,9 +1374,7 @@ asm static void dKy_light_influence_col(int param_0) { /* ############################################################################################## */ /* 80453C80-80453C88 0008+00 s=14 e=0 z=0 None .sdata2 @4964 */ -SECTION_SDATA2 static u8 lit_4964[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4964 = 4503599627370496.0 /* cast u32 to float */; /* 8019E430-8019E520 00F0+00 s=4 e=3 z=0 None .text dKy_light_influence_col__FP8_GXColorf */ #pragma push @@ -1448,7 +1418,7 @@ asm static void dKy_light_influence_distance(cXyz param_0, int param_1) { /* ############################################################################################## */ /* 80453C88-80453C8C 0004+00 s=2 e=0 z=0 None .sdata2 @5077 */ -SECTION_SDATA2 static u32 lit_5077 = 0x47C34FF3; +SECTION_SDATA2 static f32 lit_5077 = 99999.8984375f; /* 8019E694-8019E708 0074+00 s=2 e=0 z=0 None .text plight_init__Fv */ #pragma push @@ -1472,7 +1442,7 @@ asm static void darkmist_init() { /* ############################################################################################## */ /* 80453C8C-80453C90 0004+00 s=6 e=0 z=0 None .sdata2 @5106 */ -SECTION_SDATA2 static u32 lit_5106 = 0x43480000; +SECTION_SDATA2 static f32 lit_5106 = 200.0f; /* 8019E734-8019E854 0120+00 s=1 e=0 z=0 None .text plight_set__Fv */ #pragma push @@ -1512,16 +1482,16 @@ SECTION_DATA static u8 test_color_tbl[24] = { }; /* 80453C90-80453C94 0004+00 s=5 e=0 z=0 None .sdata2 @5191 */ -SECTION_SDATA2 static u32 lit_5191 = 0x3F7D70A4; +SECTION_SDATA2 static f32 lit_5191 = 99.0f / 100.0f; /* 80453C94-80453C98 0004+00 s=9 e=0 z=0 None .sdata2 @5192 */ -SECTION_SDATA2 static u32 lit_5192 = 0x42C80000; +SECTION_SDATA2 static f32 lit_5192 = 100.0f; /* 80453C98-80453C9C 0004+00 s=1 e=0 z=0 None .sdata2 @5193 */ -SECTION_SDATA2 static u32 lit_5193 = 0xC2B40000; +SECTION_SDATA2 static f32 lit_5193 = -90.0f; /* 80453C9C-80453CA0 0004+00 s=3 e=0 z=0 None .sdata2 @5194 */ -SECTION_SDATA2 static u32 lit_5194 = 0x3A83126F; +SECTION_SDATA2 static f32 lit_5194 = 0.0010000000474974513f; /* 8019E874-8019EAA0 022C+00 s=1 e=0 z=0 None .text dungeonlight_init__Fv */ #pragma push @@ -1555,22 +1525,22 @@ asm static void dKy_light_size_get(char const* param_0) { /* ############################################################################################## */ /* 80453CA0-80453CA4 0004+00 s=2 e=0 z=0 None .sdata2 @5344 */ -SECTION_SDATA2 static u32 lit_5344 = 0x3DE147AE; +SECTION_SDATA2 static f32 lit_5344 = 11.0f / 100.0f; /* 80453CA4-80453CA8 0004+00 s=1 e=0 z=0 None .sdata2 @5345 */ -SECTION_SDATA2 static u32 lit_5345 = 0xC37F0000; +SECTION_SDATA2 static f32 lit_5345 = -255.0f; /* 80453CA8-80453CAC 0004+00 s=3 e=0 z=0 None .sdata2 @5346 */ -SECTION_SDATA2 static u32 lit_5346 = 0x497423FE; +SECTION_SDATA2 static f32 lit_5346 = 999999.875f; /* 80453CAC-80453CB0 0004+00 s=7 e=0 z=0 None .sdata2 @5347 */ -SECTION_SDATA2 static u32 lit_5347 = 0x41700000; +SECTION_SDATA2 static f32 lit_5347 = 15.0f; /* 80453CB0-80453CB4 0004+00 s=3 e=0 z=0 None .sdata2 @5348 */ -SECTION_SDATA2 static u32 lit_5348 = 0x43B40000; +SECTION_SDATA2 static f32 lit_5348 = 360.0f; /* 80453CB4-80453CB8 0004+00 s=1 e=0 z=0 None .sdata2 @5349 */ -SECTION_SDATA2 static u32 lit_5349 = 0x3C449BA6; +SECTION_SDATA2 static f32 lit_5349 = 0.012000000104308128f; /* 8019EC98-8019F264 05CC+00 s=1 e=0 z=0 None .text envcolor_init__Fv */ #pragma push @@ -1584,7 +1554,7 @@ asm static void envcolor_init() { /* ############################################################################################## */ /* 80453CB8-80453CBC 0004+00 s=3 e=0 z=0 None .sdata2 @5365 */ -SECTION_SDATA2 static u32 lit_5365 = 0x42F00000; +SECTION_SDATA2 static f32 lit_5365 = 120.0f; /* 8019F264-8019F2E8 0084+00 s=1 e=1 z=0 None .text dKy_clear_game_init__Fv */ #pragma push @@ -1905,13 +1875,13 @@ LIGHT_INFLUENCE::LIGHT_INFLUENCE() { /* ############################################################################################## */ /* 80453CBC-80453CC0 0004+00 s=5 e=0 z=0 None .sdata2 @5554 */ -SECTION_SDATA2 static u32 lit_5554 = 0x42700000; +SECTION_SDATA2 static f32 lit_5554 = 60.0f; /* 80453CC0-80453CC4 0004+00 s=3 e=0 z=0 None .sdata2 @5555 */ -SECTION_SDATA2 static u32 lit_5555 = 0x43160000; +SECTION_SDATA2 static f32 lit_5555 = 150.0f; /* 80453CC4-80453CC8 0004+00 s=1 e=0 z=0 None .sdata2 @5556 */ -SECTION_SDATA2 static u32 lit_5556 = 0x43430000; +SECTION_SDATA2 static f32 lit_5556 = 195.0f; /* 8019F4FC-8019F780 0284+00 s=1 e=0 z=0 None .text setDaytime__18dScnKy_env_light_cFv */ #pragma push @@ -1935,22 +1905,22 @@ asm void dStage_roomControl_c::GetTimePass() { /* ############################################################################################## */ /* 80453CC8-80453CCC 0004+00 s=2 e=0 z=0 None .sdata2 @5613 */ -SECTION_SDATA2 static u32 lit_5613 = 0x43870000; +SECTION_SDATA2 static f32 lit_5613 = 270.0f; /* 80453CCC-80453CD0 0004+00 s=1 e=0 z=0 None .sdata2 @5614 */ -SECTION_SDATA2 static u32 lit_5614 = 0x42D20000; +SECTION_SDATA2 static f32 lit_5614 = 105.0f; /* 80453CD0-80453CD4 0004+00 s=3 e=0 z=0 None .sdata2 @5615 */ -SECTION_SDATA2 static u32 lit_5615 = 0x43E10000; +SECTION_SDATA2 static f32 lit_5615 = 450.0f; /* 80453CD4-80453CD8 0004+00 s=1 e=0 z=0 None .sdata2 @5616 */ -SECTION_SDATA2 static u32 lit_5616 = 0x43520000; +SECTION_SDATA2 static f32 lit_5616 = 210.0f; /* 80453CD8-80453CDC 0004+00 s=1 e=0 z=0 None .sdata2 @5617 */ -SECTION_SDATA2 static u32 lit_5617 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_5617 = 0.01745329238474369f; /* 80453CDC-80453CE0 0004+00 s=1 e=0 z=0 None .sdata2 @5618 */ -SECTION_SDATA2 static u32 lit_5618 = 0xC73B8000; +SECTION_SDATA2 static f32 lit_5618 = -48000.0f; /* 8019F788-8019FA08 0280+00 s=1 e=0 z=0 None .text setSunpos__18dScnKy_env_light_cFv */ #pragma push @@ -2044,10 +2014,10 @@ asm void dScnKy_env_light_c::getDarkDaytime() { /* ############################################################################################## */ /* 80453CE0-80453CE4 0004+00 s=1 e=0 z=0 None .sdata2 @5839 */ -SECTION_SDATA2 static u32 lit_5839 = 0x3D088889; +SECTION_SDATA2 static f32 lit_5839 = 1.0f / 30.0f; /* 80453CE4-80453CE8 0004+00 s=1 e=0 z=0 None .sdata2 @5840 */ -SECTION_SDATA2 static u32 lit_5840 = 0x3D888889; +SECTION_SDATA2 static f32 lit_5840 = 1.0f / 15.0f; /* 8019FBD4-801A0340 076C+00 s=5 e=0 z=0 None .text * setLight_palno_get__18dScnKy_env_light_cFPUcPUcPUcPUcPUcPUcPUcPUcPfPiPiPfPUc */ @@ -2083,37 +2053,37 @@ asm static void dKy_calc_color_set(_GXColorS10* param_0, color_RGB_class* param_ static u8 struct_80451068[8]; /* 80453CE8-80453CEC 0004+00 s=3 e=0 z=0 None .sdata2 @6032 */ -SECTION_SDATA2 static u32 lit_6032 = 0x47C35000; +SECTION_SDATA2 static f32 lit_6032 = 100000.0f; /* 80453CEC-80453CF0 0004+00 s=5 e=0 z=0 None .sdata2 @6033 */ -SECTION_SDATA2 static u32 lit_6033 = 0x3E800000; +SECTION_SDATA2 static f32 lit_6033 = 0.25f; /* 80453CF0-80453CF4 0004+00 s=2 e=0 z=0 None .sdata2 @6034 */ -SECTION_SDATA2 static u32 lit_6034 = 0x29E12E13; +SECTION_SDATA2 static f32 lit_6034 = 9.9999998245167e-14f; /* 80453CF4-80453CF8 0004+00 s=4 e=0 z=0 None .sdata2 @6035 */ -SECTION_SDATA2 static u32 lit_6035 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_6035 = 1.0f / 5.0f; /* 80453CF8-80453CFC 0004+00 s=3 e=0 z=0 None .sdata2 @6036 */ -SECTION_SDATA2 static u32 lit_6036 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_6036 = 4.0f / 5.0f; /* 80453CFC-80453D00 0004+00 s=3 e=0 z=0 None .sdata2 @6037 */ -SECTION_SDATA2 static u32 lit_6037 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_6037 = 2.0f / 5.0f; /* 80453D00-80453D04 0004+00 s=2 e=0 z=0 None .sdata2 @6038 */ -SECTION_SDATA2 static u32 lit_6038 = 0x3F266666; +SECTION_SDATA2 static f32 lit_6038 = 13.0f / 20.0f; /* 80453D04-80453D08 0004+00 s=1 e=0 z=0 None .sdata2 @6039 */ -SECTION_SDATA2 static u32 lit_6039 = 0x3F0CCCCD; +SECTION_SDATA2 static f32 lit_6039 = 11.0f / 20.0f; /* 80453D08-80453D0C 0004+00 s=4 e=0 z=0 None .sdata2 @6040 */ -SECTION_SDATA2 static u32 lit_6040 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_6040 = 1.0f / 20.0f; /* 80453D0C-80453D10 0004+00 s=1 e=0 z=0 None .sdata2 @6041 */ -SECTION_SDATA2 static u32 lit_6041 = 0x3BA3D70A; +SECTION_SDATA2 static f32 lit_6041 = 0.004999999888241291f; /* 80453D10-80453D14 0004+00 s=9 e=0 z=0 None .sdata2 @6042 */ -SECTION_SDATA2 static u32 lit_6042 = 0x358637BD; +SECTION_SDATA2 static f32 lit_6042 = 9.999999974752427e-07f; /* 801A040C-801A133C 0F30+00 s=1 e=0 z=0 None .text setLight__18dScnKy_env_light_cFv */ #pragma push @@ -2187,46 +2157,46 @@ asm static void cLib_addCalcU8(u8* param_0, u8 param_1, s16 param_2, s16 param_3 /* ############################################################################################## */ /* 80453D14-80453D18 0004+00 s=1 e=0 z=0 None .sdata2 @6761 */ -SECTION_SDATA2 static u32 lit_6761 = 0x42200000; +SECTION_SDATA2 static f32 lit_6761 = 40.0f; /* 80453D18-80453D1C 0004+00 s=1 e=0 z=0 None .sdata2 @6762 */ -SECTION_SDATA2 static u32 lit_6762 = 0xC4480000; +SECTION_SDATA2 static f32 lit_6762 = -800.0f; /* 80453D1C-80453D20 0004+00 s=1 e=0 z=0 None .sdata2 @6763 */ -SECTION_SDATA2 static u32 lit_6763 = 0xC2F00000; +SECTION_SDATA2 static f32 lit_6763 = -120.0f; /* 80453D20-80453D24 0004+00 s=2 e=0 z=0 None .sdata2 @6764 */ -SECTION_SDATA2 static u32 lit_6764 = 0x42A00000; +SECTION_SDATA2 static f32 lit_6764 = 80.0f; /* 80453D24-80453D28 0004+00 s=3 e=0 z=0 None .sdata2 @6765 */ -SECTION_SDATA2 static u32 lit_6765 = 0x461C4000; +SECTION_SDATA2 static f32 lit_6765 = 10000.0f; /* 80453D28-80453D2C 0004+00 s=3 e=0 z=0 None .sdata2 @6766 */ -SECTION_SDATA2 static u32 lit_6766 = 0x41200000; +SECTION_SDATA2 static f32 lit_6766 = 10.0f; /* 80453D2C-80453D30 0004+00 s=1 e=0 z=0 None .sdata2 @6767 */ -SECTION_SDATA2 static u32 lit_6767 = 0xC1A00000; +SECTION_SDATA2 static f32 lit_6767 = -20.0f; /* 80453D30-80453D34 0004+00 s=4 e=0 z=0 None .sdata2 @6768 */ -SECTION_SDATA2 static u32 lit_6768 = 0x38D1B717; +SECTION_SDATA2 static f32 lit_6768 = 9.999999747378752e-05f; /* 80453D34-80453D38 0004+00 s=3 e=0 z=0 None .sdata2 @6769 */ -SECTION_SDATA2 static u32 lit_6769 = 0x3F400000; +SECTION_SDATA2 static f32 lit_6769 = 0.75f; /* 80453D38-80453D3C 0004+00 s=1 e=0 z=0 None .sdata2 @6770 */ -SECTION_SDATA2 static u32 lit_6770 = 0x3E570A3D; +SECTION_SDATA2 static f32 lit_6770 = 21.0f / 100.0f; /* 80453D3C-80453D40 0004+00 s=1 e=0 z=0 None .sdata2 @6771 */ -SECTION_SDATA2 static u32 lit_6771 = 0xC20C0000; +SECTION_SDATA2 static f32 lit_6771 = -35.0f; /* 80453D40-80453D44 0004+00 s=2 e=0 z=0 None .sdata2 @6772 */ -SECTION_SDATA2 static u32 lit_6772 = 0x3727C5AC; +SECTION_SDATA2 static f32 lit_6772 = 9.999999747378752e-06f; /* 80453D44-80453D48 0004+00 s=1 e=0 z=0 None .sdata2 @6773 */ -SECTION_SDATA2 static u32 lit_6773 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_6773 = -100.0f; /* 80453D48-80453D4C 0004+00 s=1 e=0 z=0 None .sdata2 @6774 */ -SECTION_SDATA2 static u32 lit_6774 = 0x3D23D70A; +SECTION_SDATA2 static f32 lit_6774 = 1.0f / 25.0f; /* 801A2128-801A37C4 169C+00 s=2 e=0 z=0 None .text * settingTevStruct_plightcol_plus__18dScnKy_env_light_cFP4cXyzP12dKy_tevstr_c11_GXColorS1011_GXColorS10Uc @@ -2253,55 +2223,55 @@ u8 g_mEnvSeMgr[780]; static u8 lightStatusData[1856]; /* 80453D4C-80453D50 0004+00 s=1 e=0 z=0 None .sdata2 @7011 */ -SECTION_SDATA2 static u32 lit_7011 = 0x46EA6000; +SECTION_SDATA2 static f32 lit_7011 = 30000.0f; /* 80453D50-80453D54 0004+00 s=3 e=0 z=0 None .sdata2 @7012 */ -SECTION_SDATA2 static u32 lit_7012 = 0x3F7FFF58; +SECTION_SDATA2 static f32 lit_7012 = 0.9999899864196777f; /* 80453D54-80453D58 0004+00 s=1 e=0 z=0 None .sdata2 @7013 */ -SECTION_SDATA2 static u32 lit_7013 = 0xC3FA0000; +SECTION_SDATA2 static f32 lit_7013 = -500.0f; /* 80453D58-80453D5C 0004+00 s=1 e=0 z=0 None .sdata2 @7014 */ -SECTION_SDATA2 static u32 lit_7014 = 0xC6EA6000; +SECTION_SDATA2 static f32 lit_7014 = -30000.0f; /* 80453D5C-80453D60 0004+00 s=1 e=0 z=0 None .sdata2 @7015 */ -SECTION_SDATA2 static u32 lit_7015 = 0x4692E000; +SECTION_SDATA2 static f32 lit_7015 = 18800.0f; /* 80453D60-80453D64 0004+00 s=1 e=0 z=0 None .sdata2 @7016 */ -SECTION_SDATA2 static u32 lit_7016 = 0x46E29000; +SECTION_SDATA2 static f32 lit_7016 = 29000.0f; /* 80453D64-80453D68 0004+00 s=1 e=0 z=0 None .sdata2 @7017 */ -SECTION_SDATA2 static u32 lit_7017 = 0xC7108800; +SECTION_SDATA2 static f32 lit_7017 = -37000.0f; /* 80453D68-80453D6C 0004+00 s=1 e=0 z=0 None .sdata2 @7018 */ -SECTION_SDATA2 static u32 lit_7018 = 0x46610000; +SECTION_SDATA2 static f32 lit_7018 = 14400.0f; /* 80453D6C-80453D70 0004+00 s=1 e=0 z=0 None .sdata2 @7019 */ -SECTION_SDATA2 static u32 lit_7019 = 0x45EA6000; +SECTION_SDATA2 static f32 lit_7019 = 7500.0f; /* 80453D70-80453D74 0004+00 s=1 e=0 z=0 None .sdata2 @7020 */ -SECTION_SDATA2 static u32 lit_7020 = 0x4573C000; +SECTION_SDATA2 static f32 lit_7020 = 3900.0f; /* 80453D74-80453D78 0004+00 s=1 e=0 z=0 None .sdata2 @7021 */ -SECTION_SDATA2 static u32 lit_7021 = 0x468CA000; +SECTION_SDATA2 static f32 lit_7021 = 18000.0f; /* 80453D78-80453D7C 0004+00 s=1 e=0 z=0 None .sdata2 @7022 */ -SECTION_SDATA2 static u32 lit_7022 = 0xC5CB2000; +SECTION_SDATA2 static f32 lit_7022 = -6500.0f; /* 80453D7C-80453D80 0004+00 s=1 e=0 z=0 None .sdata2 @7023 */ -SECTION_SDATA2 static u32 lit_7023 = 0xC61C4000; +SECTION_SDATA2 static f32 lit_7023 = -10000.0f; /* 80453D80-80453D84 0004+00 s=1 e=0 z=0 None .sdata2 @7024 */ -SECTION_SDATA2 static u32 lit_7024 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_7024 = 3.0f / 10.0f; /* 80453D84-80453D88 0004+00 s=2 e=0 z=0 None .sdata2 @7025 */ -SECTION_SDATA2 static u32 lit_7025 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_7025 = 3.0f / 5.0f; /* 80453D88-80453D8C 0004+00 s=2 e=0 z=0 None .sdata2 @7026 */ -SECTION_SDATA2 static u32 lit_7026 = 0x3F666666; +SECTION_SDATA2 static f32 lit_7026 = 9.0f / 10.0f; /* 80453D8C-80453D90 0004+00 s=2 e=0 z=0 None .sdata2 @7027 */ -SECTION_SDATA2 static u32 lit_7027 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_7027 = 6.0f / 5.0f; /* 801A37C4-801A441C 0C58+00 s=2 e=14 z=515 None .text * settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c */ @@ -2322,10 +2292,10 @@ void dScnKy_env_light_c::setLightTevColorType(J3DModelData* param_0, dKy_tevstr_ /* ############################################################################################## */ /* 80453D90-80453D94 0004+00 s=1 e=0 z=0 None .sdata2 @7186 */ -SECTION_SDATA2 static u32 lit_7186 = 0x43390000; +SECTION_SDATA2 static f32 lit_7186 = 185.0f; /* 80453D94-80453D98 0004+00 s=1 e=0 z=0 None .sdata2 @7187 */ -SECTION_SDATA2 static u32 lit_7187 = 0x42BE0000; +SECTION_SDATA2 static f32 lit_7187 = 95.0f; /* 801A4420-801A4C08 07E8+00 s=2 e=0 z=0 None .text * setLightTevColorType_MAJI_sub__FP11J3DMaterialP12dKy_tevstr_ci */ @@ -2417,10 +2387,10 @@ SECTION_SDATA static u16 lightMask[1 + 1 /* padding */] = { SECTION_SDATA static void* lightStatusPt = (void*)&lightStatusData; /* 80453D98-80453D9C 0004+00 s=1 e=0 z=0 None .sdata2 @7365 */ -SECTION_SDATA2 static u32 lit_7365 = 0x42870000; +SECTION_SDATA2 static f32 lit_7365 = 67.5f; /* 80453D9C-80453DA0 0004+00 s=1 e=0 z=0 None .sdata2 @7366 */ -SECTION_SDATA2 static u32 lit_7366 = 0x43924000; +SECTION_SDATA2 static f32 lit_7366 = 292.5f; /* 801A516C-801A5288 011C+00 s=1 e=0 z=0 None .text SetBaseLight__18dScnKy_env_light_cFv */ #pragma push @@ -2466,10 +2436,10 @@ static u8 lit_7489[12]; static u8 S_old_camctr[12 + 4 /* padding */]; /* 80453DA0-80453DA4 0004+00 s=1 e=0 z=0 None .sdata2 @7608 */ -SECTION_SDATA2 static u32 lit_7608 = 0x3BABB44E; +SECTION_SDATA2 static f32 lit_7608 = 0.005239999853074551f; /* 80453DA4-80453DA8 0004+00 s=2 e=0 z=0 None .sdata2 @7609 */ -SECTION_SDATA2 static u32 lit_7609 = 0x420C0000; +SECTION_SDATA2 static f32 lit_7609 = 35.0f; /* 801A572C-801A5B6C 0440+00 s=0 e=1 z=0 None .text dKy_undwater_filter_draw__Fv */ #pragma push @@ -2926,7 +2896,7 @@ asm void dKy_SordFlush_set(cXyz param_0, int param_1) { /* ############################################################################################## */ /* 80453DA8-80453DAC 0004+00 s=3 e=0 z=0 None .sdata2 @8647 */ -SECTION_SDATA2 static u32 lit_8647 = 0x481C4000; +SECTION_SDATA2 static f32 lit_8647 = 160000.0f; /* 801A8538-801A85E8 00B0+00 s=1 e=0 z=0 None .text GxFogSet_Sub__FP8_GXColor */ #pragma push @@ -3170,25 +3140,25 @@ asm static void NewAmbColGet(_GXColorS10* param_0) { /* ############################################################################################## */ /* 80453DAC-80453DB0 0004+00 s=1 e=0 z=0 None .sdata2 @8975 */ -SECTION_SDATA2 static u32 lit_8975 = 0x42480000; +SECTION_SDATA2 static f32 lit_8975 = 50.0f; /* 80453DB0-80453DB4 0004+00 s=2 e=0 z=0 None .sdata2 @9254 */ -SECTION_SDATA2 static u32 lit_9254 = 0x438E8000; +SECTION_SDATA2 static f32 lit_9254 = 285.0f; /* 80453DB4-80453DB8 0004+00 s=1 e=0 z=0 None .sdata2 @9255 */ -SECTION_SDATA2 static u32 lit_9255 = 0x41880000; +SECTION_SDATA2 static f32 lit_9255 = 17.0f; /* 80453DB8-80453DBC 0004+00 s=1 e=0 z=0 None .sdata2 @9256 */ -SECTION_SDATA2 static u32 lit_9256 = 0x41A00000; +SECTION_SDATA2 static f32 lit_9256 = 20.0f; /* 80453DBC-80453DC0 0004+00 s=1 e=0 z=0 None .sdata2 @9257 */ -SECTION_SDATA2 static u32 lit_9257 = 0x433E0000; +SECTION_SDATA2 static f32 lit_9257 = 190.0f; /* 80453DC0-80453DC4 0004+00 s=1 e=0 z=0 None .sdata2 @9258 */ -SECTION_SDATA2 static u32 lit_9258 = 0x4CBEBC20; +SECTION_SDATA2 static f32 lit_9258 = 100000000.0f; /* 80453DC4-80453DC8 0004+00 s=1 e=0 z=0 None .sdata2 @9259 */ -SECTION_SDATA2 static u32 lit_9259 = 0x40A00000; +SECTION_SDATA2 static f32 lit_9259 = 5.0f; /* 801A8E20-801A9BE4 0DC4+00 s=2 e=0 z=0 None .text * dKy_ParticleColor_get_base__FP4cXyzP12dKy_tevstr_cP8_GXColorP8_GXColorP8_GXColorP8_GXColorf */ @@ -3254,10 +3224,10 @@ asm void dKy_BossSpotLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 para /* ############################################################################################## */ /* 80453DC8-80453DCC 0004+00 s=1 e=0 z=0 None .sdata2 @9676 */ -SECTION_SDATA2 static u32 lit_9676 = 0x43AF0000; +SECTION_SDATA2 static f32 lit_9676 = 350.0f; /* 80453DCC-80453DD0 0004+00 s=2 e=0 z=0 None .sdata2 @9677 */ -SECTION_SDATA2 static u32 lit_9677 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_9677 = 1.5f; /* 801AAC5C-801AAD50 00F4+00 s=0 e=1 z=0 None .text * dKy_WolfEyeLight_set__FP4cXyzfffP8_GXColorfUcUc */ @@ -3273,25 +3243,25 @@ asm void dKy_WolfEyeLight_set(cXyz* param_0, f32 param_1, f32 param_2, f32 param /* ############################################################################################## */ /* 80453DD0-80453DD4 0004+00 s=3 e=0 z=0 None .sdata2 @9722 */ -SECTION_SDATA2 static u32 lit_9722 = 0x44160000; +SECTION_SDATA2 static f32 lit_9722 = 600.0f; /* 80453DD4-80453DD8 0004+00 s=1 e=0 z=0 None .sdata2 @9723 */ -SECTION_SDATA2 static u32 lit_9723 = 0x3F880000; +SECTION_SDATA2 static f32 lit_9723 = 1.0625f; /* 80453DD8-80453DDC 0004+00 s=1 e=0 z=0 None .sdata2 @9724 */ -SECTION_SDATA2 static u32 lit_9724 = 0x3FD9999A; +SECTION_SDATA2 static f32 lit_9724 = 17.0f / 10.0f; /* 80453DDC-80453DE0 0004+00 s=1 e=0 z=0 None .sdata2 @9725 */ -SECTION_SDATA2 static u32 lit_9725 = 0x428C0000; +SECTION_SDATA2 static f32 lit_9725 = 70.0f; /* 80453DE0-80453DE4 0004+00 s=1 e=0 z=0 None .sdata2 @9726 */ -SECTION_SDATA2 static u32 lit_9726 = 0x40233334; +SECTION_SDATA2 static f32 lit_9726 = 2.5500001907348633f; /* 80453DE4-80453DE8 0004+00 s=1 e=0 z=0 None .sdata2 @9727 */ -SECTION_SDATA2 static u32 lit_9727 = 0x4059999A; +SECTION_SDATA2 static f32 lit_9727 = 17.0f / 5.0f; /* 80453DE8-80453DEC 0004+00 s=1 e=0 z=0 None .sdata2 @9728 */ -SECTION_SDATA2 static u32 lit_9728 = 0x42820000; +SECTION_SDATA2 static f32 lit_9728 = 65.0f; /* 801AAD50-801AB01C 02CC+00 s=1 e=0 z=0 None .text dKy_twilight_camelight_set__Fv */ #pragma push @@ -3305,13 +3275,13 @@ asm static void dKy_twilight_camelight_set() { /* ############################################################################################## */ /* 80453DEC-80453DF0 0004+00 s=1 e=0 z=0 None .sdata2 @9779 */ -SECTION_SDATA2 static u32 lit_9779 = 0x40E73334; +SECTION_SDATA2 static f32 lit_9779 = 7.225000381469727f; /* 80453DF0-80453DF4 0004+00 s=1 e=0 z=0 None .sdata2 @9780 */ -SECTION_SDATA2 static u32 lit_9780 = 0x41E00000; +SECTION_SDATA2 static f32 lit_9780 = 28.0f; /* 80453DF4-80453DF8 0004+00 s=1 e=0 z=0 None .sdata2 @9781 */ -SECTION_SDATA2 static u32 lit_9781 = 0x3FA00000; +SECTION_SDATA2 static f32 lit_9781 = 1.25f; /* 801AB01C-801AB270 0254+00 s=1 e=0 z=0 None .text dKy_WaterIn_Light_set__Fv */ #pragma push @@ -3520,10 +3490,10 @@ bool dKy_withwarp_capture_check() { /* ############################################################################################## */ /* 80453DF8-80453DFC 0004+00 s=1 e=0 z=0 None .sdata2 @10273 */ -SECTION_SDATA2 static u32 lit_10273 = 0x43C80000; +SECTION_SDATA2 static f32 lit_10273 = 400.0f; /* 80453DFC-80453E00 0004+00 s=1 e=0 z=0 None .sdata2 @10274 */ -SECTION_SDATA2 static u32 lit_10274 = 0x44180000; +SECTION_SDATA2 static f32 lit_10274 = 608.0f; /* 801AC2E8-801AC57C 0294+00 s=0 e=1 z=0 None .text dKy_depth_dist_set__FPv */ #pragma push @@ -3587,16 +3557,16 @@ asm void dKy_darkworld_Area_set(char const* param_0, int param_1) { /* ############################################################################################## */ /* 80453E00-80453E04 0004+00 s=1 e=0 z=0 None .sdata2 @10483 */ -SECTION_SDATA2 static u32 lit_10483 = 0x42100000; +SECTION_SDATA2 static f32 lit_10483 = 36.0f; /* 80453E04-80453E08 0004+00 s=1 e=0 z=0 None .sdata2 @10484 */ -SECTION_SDATA2 static u32 lit_10484 = 0x41E80000; +SECTION_SDATA2 static f32 lit_10484 = 29.0f; /* 80453E08-80453E0C 0004+00 s=1 e=0 z=0 None .sdata2 @10485 */ -SECTION_SDATA2 static u32 lit_10485 = 0x44C1C000; +SECTION_SDATA2 static f32 lit_10485 = 1550.0f; /* 80453E0C-80453E10 0004+00 s=1 e=0 z=0 None .sdata2 @10486 */ -SECTION_SDATA2 static u32 lit_10486 = 0x430C0000; +SECTION_SDATA2 static f32 lit_10486 = 140.0f; /* 801AC918-801ACCDC 03C4+00 s=1 e=0 z=0 None .text dKy_murky_set__FP11J3DMaterial */ #pragma push @@ -3656,52 +3626,52 @@ SECTION_SDATA static u8 l_alphaCompInfo[8] = { }; /* 80453E10-80453E14 0004+00 s=1 e=0 z=0 None .sdata2 @10916 */ -SECTION_SDATA2 static u32 lit_10916 = 0x43750000; +SECTION_SDATA2 static f32 lit_10916 = 245.0f; /* 80453E14-80453E18 0004+00 s=1 e=0 z=0 None .sdata2 @10917 */ -SECTION_SDATA2 static u32 lit_10917 = 0x42340000; +SECTION_SDATA2 static f32 lit_10917 = 45.0f; /* 80453E18-80453E1C 0004+00 s=1 e=0 z=0 None .sdata2 @10918 */ -SECTION_SDATA2 static u32 lit_10918 = 0xBC23D70A; +SECTION_SDATA2 static f32 lit_10918 = -1.0f / 100.0f; /* 80453E1C-80453E20 0004+00 s=1 e=0 z=0 None .sdata2 @10919 */ -SECTION_SDATA2 static u32 lit_10919 = 0x3EFAE148; +SECTION_SDATA2 static f32 lit_10919 = 49.0f / 100.0f; /* 80453E20-80453E24 0004+00 s=1 e=0 z=0 None .sdata2 @10920 */ -SECTION_SDATA2 static u32 lit_10920 = 0xBEFAE148; +SECTION_SDATA2 static f32 lit_10920 = -49.0f / 100.0f; /* 80453E24-80453E28 0004+00 s=1 e=0 z=0 None .sdata2 @10921 */ -SECTION_SDATA2 static u32 lit_10921 = 0x40333333; +SECTION_SDATA2 static f32 lit_10921 = 14.0f / 5.0f; /* 80453E28-80453E2C 0004+00 s=1 e=0 z=0 None .sdata2 @10922 */ -SECTION_SDATA2 static u32 lit_10922 = 0x432A0000; +SECTION_SDATA2 static f32 lit_10922 = 170.0f; /* 80453E2C-80453E30 0004+00 s=1 e=0 z=0 None .sdata2 @10923 */ -SECTION_SDATA2 static u32 lit_10923 = 0xC666C800; +SECTION_SDATA2 static f32 lit_10923 = -14770.0f; /* 80453E30-80453E34 0004+00 s=1 e=0 z=0 None .sdata2 @10924 */ -SECTION_SDATA2 static u32 lit_10924 = 0xC663A800; +SECTION_SDATA2 static f32 lit_10924 = -14570.0f; /* 80453E34-80453E38 0004+00 s=1 e=0 z=0 None .sdata2 @10925 */ -SECTION_SDATA2 static u32 lit_10925 = 0xC5B6E800; +SECTION_SDATA2 static f32 lit_10925 = -5853.0f; /* 80453E38-80453E3C 0004+00 s=1 e=0 z=0 None .sdata2 @10926 */ -SECTION_SDATA2 static u32 lit_10926 = 0xC45BC000; +SECTION_SDATA2 static f32 lit_10926 = -879.0f; /* 80453E3C-80453E40 0004+00 s=1 e=0 z=0 None .sdata2 @10927 */ -SECTION_SDATA2 static u32 lit_10927 = 0xBE4CCCCD; +SECTION_SDATA2 static f32 lit_10927 = -1.0f / 5.0f; /* 80453E40-80453E44 0004+00 s=1 e=0 z=0 None .sdata2 @10928 */ -SECTION_SDATA2 static u32 lit_10928 = 0x458CA000; +SECTION_SDATA2 static f32 lit_10928 = 4500.0f; /* 80453E44-80453E48 0004+00 s=1 e=0 z=0 None .sdata2 @10929 */ -SECTION_SDATA2 static u32 lit_10929 = 0x42960000; +SECTION_SDATA2 static f32 lit_10929 = 75.0f; /* 80453E48-80453E4C 0004+00 s=1 e=0 z=0 None .sdata2 @10930 */ -SECTION_SDATA2 static u32 lit_10930 = 0xBF4F5C29; +SECTION_SDATA2 static f32 lit_10930 = -81.0f / 100.0f; /* 80453E4C-80453E50 0004+00 s=1 e=0 z=0 None .sdata2 @10931 */ -SECTION_SDATA2 static u32 lit_10931 = 0x3F153F7D; +SECTION_SDATA2 static f32 lit_10931 = 0.5830000042915344f; /* 80453E50-80453E58 0004+04 s=1 e=0 z=0 None .sdata2 @10932 */ SECTION_SDATA2 static f32 lit_10932[1 + 1 /* padding */] = { diff --git a/src/d/kankyo/d_kankyo_data.cpp b/src/d/kankyo/d_kankyo_data.cpp index c8000ef9cdb..765751d3cb8 100644 --- a/src/d/kankyo/d_kankyo_data.cpp +++ b/src/d/kankyo/d_kankyo_data.cpp @@ -23,7 +23,6 @@ void dKyd_darkworld_tbl_getp(); void dKyd_light_size_tbl_getp(); void dKyd_light_tw_size_tbl_getp(); void dKyd_BloomInf_tbl_getp(int); -extern "C" extern char const* const d_kankyo_d_kankyo_data__stringBase0; extern "C" void dKyd_dmpalet_getp__Fv(); extern "C" void dKyd_dmpselect_getp__Fv(); @@ -45,8 +44,6 @@ extern "C" extern char const* const d_kankyo_d_kankyo_data__stringBase0; extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_env_light[4880]; - // // Declarations: // diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp index 849b45304d0..13e2b27c8a2 100644 --- a/src/d/kankyo/d_kankyo_rain.cpp +++ b/src/d/kankyo/d_kankyo_rain.cpp @@ -36,11 +36,6 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct csXyz { - /* 80018BD0 */ ~csXyz(); - /* 802673F4 */ csXyz(s16, s16, s16); -}; - struct Vec {}; struct cXyz { @@ -48,10 +43,15 @@ struct cXyz { /* 80266AE4 */ void operator+(Vec const&) const; }; -struct dKy_tevstr_c {}; +struct csXyz { + /* 80018BD0 */ ~csXyz(); + /* 802673F4 */ csXyz(s16, s16, s16); +}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004D4CC */ void set(u32, u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, @@ -194,7 +194,6 @@ void dKyr_evil_move(); static void dKyr_evil_draw2(f32 (*)[4], u8**); static void dKyr_near_bosslight_check(cXyz); void dKyr_evil_draw(f32 (*)[4], u8**); -extern "C" extern char const* const d_kankyo_d_kankyo_rain__stringBase0; extern "C" static void vectle_calc__FP10DOUBLE_POSP4cXyz(); extern "C" static void get_vectle_calc__FP4cXyzP4cXyzP4cXyz(); @@ -291,23 +290,6 @@ void cM_rndFX(f32); void cM3d_VectorProduct2d(f32, f32, f32, f32, f32, f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void* operator new(u32, int); -extern "C" extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */]; -extern "C" extern void* __vt__19dKankyo_star_Packet[5]; -extern "C" extern void* __vt__19dKankyo_snow_Packet[5]; -extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_mode__7dDemo_c[4]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void __dt__4cXyzFv(); extern "C" void mDoMtx_ZXYrotM__FPA4_fsss(); @@ -522,7 +504,7 @@ asm void dKyr_get_vectle_calc(cXyz* param_0, cXyz* param_1, cXyz* param_2) { /* ############################################################################################## */ /* 804521BC-804521C0 0004+00 s=4 e=0 z=0 None .sdata2 @3970 */ -SECTION_SDATA2 static u32 lit_3970 = 0x43480000; +SECTION_SDATA2 static f32 lit_3970 = 200.0f; /* 8005B780-8005B830 00B0+00 s=2 e=0 z=0 None .text dKy_set_eyevect_calc__FP12camera_classP3Vecff */ @@ -550,15 +532,13 @@ asm static void dKy_set_eyevect_calc2(camera_class* param_0, Vec* param_1, f32 p /* ############################################################################################## */ /* 804521C0-804521C4 0004+00 s=1 e=0 z=0 None .sdata2 @3992 */ -SECTION_SDATA2 static u32 lit_3992 = 0x3E000000; +SECTION_SDATA2 static f32 lit_3992 = 0.125f; /* 804521C4-804521C8 0004+00 s=9 e=0 z=0 None .sdata2 @3993 */ -SECTION_SDATA2 static u32 lit_3993 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_3993 = 1.0f / 100.0f; /* 804521C8-804521D0 0008+00 s=15 e=0 z=0 None .sdata2 @3995 */ -SECTION_SDATA2 static u8 lit_3995[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3995 = 4503601774854144.0 /* cast s32 to float */; /* 8005B92C-8005BA24 00F8+00 s=5 e=0 z=0 None .text * dKyr_set_btitex_common__FP9_GXTexObjP7ResTIMG11_GXTexMapID */ @@ -583,44 +563,40 @@ asm static void dKyr_set_btitex(_GXTexObj* param_0, ResTIMG* param_1) { /* ############################################################################################## */ /* 804521D0-804521D4 0004+00 s=4 e=0 z=0 None .sdata2 @4103 */ -SECTION_SDATA2 static u32 lit_4103 = 0x38D1B717; +SECTION_SDATA2 static f32 lit_4103 = 9.999999747378752e-05f; /* 804521D4-804521D8 0004+00 s=4 e=0 z=0 None .sdata2 @4104 */ -SECTION_SDATA2 static u32 lit_4104 = 0x457A0000; +SECTION_SDATA2 static f32 lit_4104 = 4000.0f; /* 804521D8-804521DC 0004+00 s=2 e=0 z=0 None .sdata2 @4105 */ -SECTION_SDATA2 static u32 lit_4105 = 0x43980000; +SECTION_SDATA2 static f32 lit_4105 = 304.0f; /* 804521DC-804521E0 0004+00 s=2 e=0 z=0 None .sdata2 @4106 */ -SECTION_SDATA2 static u32 lit_4106 = 0x43600000; +SECTION_SDATA2 static f32 lit_4106 = 224.0f; /* 804521E0-804521E4 0004+00 s=2 e=0 z=0 None .sdata2 @4107 */ -SECTION_SDATA2 static u32 lit_4107 = 0x3BB40000; +SECTION_SDATA2 static f32 lit_4107 = 0.0054931640625f; /* 804521E4-804521E8 0004+00 s=6 e=0 z=0 None .sdata2 @4108 */ -SECTION_SDATA2 static u32 lit_4108 = 0x43340000; +SECTION_SDATA2 static f32 lit_4108 = 180.0f; /* 804521E8-804521F0 0008+00 s=17 e=0 z=0 None .sdata2 @4109 */ -SECTION_SDATA2 static u8 lit_4109[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4109 = 0.5; /* 804521F0-804521F8 0008+00 s=17 e=0 z=0 None .sdata2 @4110 */ -SECTION_SDATA2 static u8 lit_4110[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4110 = 3.0; /* 804521F8-804521FC 0004+00 s=6 e=0 z=0 None .sdata2 @4111 */ -SECTION_SDATA2 static u32 lit_4111 = 0x437A0000; +SECTION_SDATA2 static f32 lit_4111 = 250.0f; /* 804521FC-80452200 0004+00 s=4 e=0 z=0 None .sdata2 @4112 */ -SECTION_SDATA2 static u32 lit_4112 = 0x44160000; +SECTION_SDATA2 static f32 lit_4112 = 600.0f; /* 80452200-80452204 0004+00 s=2 e=0 z=0 None .sdata2 @4113 */ -SECTION_SDATA2 static u32 lit_4113 = 0x42DC0000; +SECTION_SDATA2 static f32 lit_4113 = 110.0f; /* 80452204-80452208 0004+00 s=1 e=0 z=0 None .sdata2 @4114 */ -SECTION_SDATA2 static u32 lit_4114 = 0x45802000; +SECTION_SDATA2 static f32 lit_4114 = 4100.0f; /* 8005BA48-8005BED8 0490+00 s=0 e=1 z=0 None .text dKyr_lenzflare_move__Fv */ #pragma push @@ -634,10 +610,10 @@ asm void dKyr_lenzflare_move() { /* ############################################################################################## */ /* 80452208-8045220C 0004+00 s=3 e=0 z=0 None .sdata2 @4126 */ -SECTION_SDATA2 static u32 lit_4126 = 0x438E8000; +SECTION_SDATA2 static f32 lit_4126 = 285.0f; /* 8045220C-80452210 0004+00 s=1 e=0 z=0 None .sdata2 @4127 */ -SECTION_SDATA2 static u32 lit_4127 = 0x42870000; +SECTION_SDATA2 static f32 lit_4127 = 67.5f; /* 8005BED8-8005BF08 0030+00 s=1 e=0 z=0 None .text dKyr_moon_arrival_check__Fv */ #pragma push @@ -731,81 +707,79 @@ static u8 S_parcent_bak[4]; static u8 struct_80450EEC[4]; /* 80452210-80452214 0004+00 s=4 e=0 z=0 None .sdata2 @4353 */ -SECTION_SDATA2 static u32 lit_4353 = 0x45FA0000; +SECTION_SDATA2 static f32 lit_4353 = 8000.0f; /* 80452214-80452218 0004+00 s=26 e=0 z=0 None .sdata2 @4354 */ -SECTION_SDATA2 static u32 lit_4354 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4354 = 1.0f; /* 80452218-8045221C 0004+00 s=1 e=0 z=0 None .sdata2 @4355 */ -SECTION_SDATA2 static u32 lit_4355 = 0x429B0000; +SECTION_SDATA2 static f32 lit_4355 = 77.5f; /* 8045221C-80452220 0004+00 s=5 e=0 z=0 None .sdata2 @4356 */ -SECTION_SDATA2 static u32 lit_4356 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4356 = 1.0f / 20.0f; /* 80452220-80452224 0004+00 s=14 e=0 z=0 None .sdata2 @4357 */ -SECTION_SDATA2 static u32 lit_4357 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4357 = 1.0f / 10.0f; /* 80452224-80452228 0004+00 s=2 e=0 z=0 None .sdata2 @4358 */ -SECTION_SDATA2 static u32 lit_4358 = 0x3727C5AC; +SECTION_SDATA2 static f32 lit_4358 = 9.999999747378752e-06f; /* 80452228-8045222C 0004+00 s=2 e=0 z=0 None .sdata2 @4359 */ -SECTION_SDATA2 static u32 lit_4359 = 0x43E50000; +SECTION_SDATA2 static f32 lit_4359 = 458.0f; /* 8045222C-80452230 0004+00 s=2 e=0 z=0 None .sdata2 @4360 */ -SECTION_SDATA2 static u32 lit_4360 = 0x44180000; +SECTION_SDATA2 static f32 lit_4360 = 608.0f; /* 80452230-80452234 0004+00 s=3 e=0 z=0 None .sdata2 @4361 */ -SECTION_SDATA2 static u32 lit_4361 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_4361 = 1000000000.0f; /* 80452234-80452238 0004+00 s=1 e=0 z=0 None .sdata2 @4362 */ -SECTION_SDATA2 static u32 lit_4362 = 0x43E10000; +SECTION_SDATA2 static f32 lit_4362 = 450.0f; /* 80452238-8045223C 0004+00 s=10 e=0 z=0 None .sdata2 @4363 */ -SECTION_SDATA2 static u32 lit_4363 = 0x3A83126F; +SECTION_SDATA2 static f32 lit_4363 = 0.0010000000474974513f; /* 8045223C-80452240 0004+00 s=18 e=0 z=0 None .sdata2 @4364 */ -SECTION_SDATA2 static u32 lit_4364 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4364 = 0.5f; /* 80452240-80452244 0004+00 s=13 e=0 z=0 None .sdata2 @4365 */ -SECTION_SDATA2 static u32 lit_4365 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_4365 = 1.0f / 5.0f; /* 80452244-80452248 0004+00 s=11 e=0 z=0 None .sdata2 @4366 */ -SECTION_SDATA2 static u32 lit_4366 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_4366 = 3.0f / 10.0f; /* 80452248-8045224C 0004+00 s=8 e=0 z=0 None .sdata2 @4367 */ -SECTION_SDATA2 static u32 lit_4367 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_4367 = 4.0f / 5.0f; /* 8045224C-80452250 0004+00 s=12 e=0 z=0 None .sdata2 @4368 */ -SECTION_SDATA2 static u32 lit_4368 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4368 = 255.0f; /* 80452250-80452254 0004+00 s=2 e=0 z=0 None .sdata2 @4369 */ -SECTION_SDATA2 static u32 lit_4369 = 0x42B40000; +SECTION_SDATA2 static f32 lit_4369 = 90.0f; /* 80452254-80452258 0004+00 s=3 e=0 z=0 None .sdata2 @4370 */ -SECTION_SDATA2 static u32 lit_4370 = 0x42D20000; +SECTION_SDATA2 static f32 lit_4370 = 105.0f; /* 80452258-8045225C 0004+00 s=1 e=0 z=0 None .sdata2 @4371 */ -SECTION_SDATA2 static u32 lit_4371 = 0x43778000; +SECTION_SDATA2 static f32 lit_4371 = 247.5f; /* 8045225C-80452260 0004+00 s=1 e=0 z=0 None .sdata2 @4372 */ -SECTION_SDATA2 static u32 lit_4372 = 0x43870000; +SECTION_SDATA2 static f32 lit_4372 = 270.0f; /* 80452260-80452264 0004+00 s=1 e=0 z=0 None .sdata2 @4373 */ -SECTION_SDATA2 static u32 lit_4373 = 0xC5FA0000; +SECTION_SDATA2 static f32 lit_4373 = -8000.0f; /* 80452264-80452268 0004+00 s=2 e=0 z=0 None .sdata2 @4374 */ -SECTION_SDATA2 static u32 lit_4374 = 0x40C00000; +SECTION_SDATA2 static f32 lit_4374 = 6.0f; /* 80452268-8045226C 0004+00 s=1 e=0 z=0 None .sdata2 @4375 */ -SECTION_SDATA2 static u32 lit_4375 = 0x46EBA000; +SECTION_SDATA2 static f32 lit_4375 = 30160.0f; /* 8045226C-80452270 0004+00 s=1 e=0 z=0 None .sdata2 @4376 */ -SECTION_SDATA2 static u32 lit_4376 = 0x46A95C00; +SECTION_SDATA2 static f32 lit_4376 = 21678.0f; /* 80452270-80452278 0008+00 s=9 e=0 z=0 None .sdata2 @4379 */ -SECTION_SDATA2 static u8 lit_4379[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4379 = 4503599627370496.0 /* cast u32 to float */; /* 8005BF08-8005CC5C 0D54+00 s=0 e=1 z=0 None .text dKyr_sun_move__Fv */ #pragma push @@ -829,7 +803,7 @@ asm void dKyr_rain_init() { /* ############################################################################################## */ /* 80452278-8045227C 0004+00 s=1 e=0 z=0 None .sdata2 @4430 */ -SECTION_SDATA2 static u32 lit_4430 = 0xC4480000; +SECTION_SDATA2 static f32 lit_4430 = -800.0f; /* 8005CDA8-8005CDD0 0028+00 s=1 e=0 z=0 None .text rain_bg_chk__FP19dKankyo_rain_Packeti */ #pragma push @@ -843,10 +817,10 @@ asm static void rain_bg_chk(dKankyo_rain_Packet* param_0, int param_1) { /* ############################################################################################## */ /* 8045227C-80452280 0004+00 s=9 e=0 z=0 None .sdata2 @4467 */ -SECTION_SDATA2 static u32 lit_4467 = 0x42480000; +SECTION_SDATA2 static f32 lit_4467 = 50.0f; /* 80452280-80452284 0004+00 s=4 e=0 z=0 None .sdata2 @4468 */ -SECTION_SDATA2 static u32 lit_4468 = 0x461C4000; +SECTION_SDATA2 static f32 lit_4468 = 10000.0f; /* 8005CDD0-8005CF78 01A8+00 s=1 e=0 z=0 None .text overhead_bg_chk__Fv */ #pragma push @@ -870,121 +844,121 @@ asm static void forward_overhead_bg_chk(cXyz* param_0, f32 param_1) { /* ############################################################################################## */ /* 80452284-80452288 0004+00 s=1 e=0 z=0 None .sdata2 @5096 */ -SECTION_SDATA2 static u32 lit_5096 = 0xC0200000; +SECTION_SDATA2 static f32 lit_5096 = -2.5f; /* 80452288-8045228C 0004+00 s=6 e=0 z=0 None .sdata2 @5097 */ -SECTION_SDATA2 static u32 lit_5097 = 0x41200000; +SECTION_SDATA2 static f32 lit_5097 = 10.0f; /* 8045228C-80452290 0004+00 s=8 e=0 z=0 None .sdata2 @5098 */ -SECTION_SDATA2 static u32 lit_5098 = 0x41A00000; +SECTION_SDATA2 static f32 lit_5098 = 20.0f; /* 80452290-80452294 0004+00 s=6 e=0 z=0 None .sdata2 @5099 */ -SECTION_SDATA2 static u32 lit_5099 = 0x41700000; +SECTION_SDATA2 static f32 lit_5099 = 15.0f; /* 80452294-80452298 0004+00 s=5 e=0 z=0 None .sdata2 @5100 */ -SECTION_SDATA2 static u32 lit_5100 = 0x442F0000; +SECTION_SDATA2 static f32 lit_5100 = 700.0f; /* 80452298-8045229C 0004+00 s=2 e=0 z=0 None .sdata2 @5101 */ -SECTION_SDATA2 static u32 lit_5101 = 0x44AF0000; +SECTION_SDATA2 static f32 lit_5101 = 1400.0f; /* 8045229C-804522A0 0004+00 s=5 e=0 z=0 None .sdata2 @5102 */ -SECTION_SDATA2 static u32 lit_5102 = 0x44960000; +SECTION_SDATA2 static f32 lit_5102 = 1200.0f; /* 804522A0-804522A4 0004+00 s=1 e=0 z=0 None .sdata2 @5103 */ -SECTION_SDATA2 static u32 lit_5103 = 0x420E0000; +SECTION_SDATA2 static f32 lit_5103 = 35.5f; /* 804522A4-804522A8 0004+00 s=4 e=0 z=0 None .sdata2 @5104 */ -SECTION_SDATA2 static u32 lit_5104 = 0x44480000; +SECTION_SDATA2 static f32 lit_5104 = 800.0f; /* 804522A8-804522AC 0004+00 s=5 e=0 z=0 None .sdata2 @5105 */ -SECTION_SDATA2 static u32 lit_5105 = 0x43B40000; +SECTION_SDATA2 static f32 lit_5105 = 360.0f; /* 804522AC-804522B0 0004+00 s=4 e=0 z=0 None .sdata2 @5106 */ -SECTION_SDATA2 static u32 lit_5106 = 0x3DA3D70A; +SECTION_SDATA2 static f32 lit_5106 = 2.0f / 25.0f; /* 804522B0-804522B4 0004+00 s=2 e=0 z=0 None .sdata2 @5107 */ -SECTION_SDATA2 static u32 lit_5107 = 0xC0000000; +SECTION_SDATA2 static f32 lit_5107 = -2.0f; /* 804522B4-804522B8 0004+00 s=2 e=0 z=0 None .sdata2 @5108 */ -SECTION_SDATA2 static u32 lit_5108 = 0x44548000; +SECTION_SDATA2 static f32 lit_5108 = 850.0f; /* 804522B8-804522BC 0004+00 s=8 e=0 z=0 None .sdata2 @5109 */ -SECTION_SDATA2 static u32 lit_5109 = 0x42200000; +SECTION_SDATA2 static f32 lit_5109 = 40.0f; /* 804522BC-804522C0 0004+00 s=2 e=0 z=0 None .sdata2 @5110 */ -SECTION_SDATA2 static u32 lit_5110 = 0x44098000; +SECTION_SDATA2 static f32 lit_5110 = 550.0f; /* 804522C0-804522C4 0004+00 s=1 e=0 z=0 None .sdata2 @5111 */ -SECTION_SDATA2 static u32 lit_5111 = 0xC5278000; +SECTION_SDATA2 static f32 lit_5111 = -2680.0f; /* 804522C4-804522C8 0004+00 s=1 e=0 z=0 None .sdata2 @5112 */ -SECTION_SDATA2 static u32 lit_5112 = 0x45098000; +SECTION_SDATA2 static f32 lit_5112 = 2200.0f; /* 804522C8-804522CC 0004+00 s=2 e=0 z=0 None .sdata2 @5113 */ -SECTION_SDATA2 static u32 lit_5113 = 0x44C80000; +SECTION_SDATA2 static f32 lit_5113 = 1600.0f; /* 804522CC-804522D0 0004+00 s=1 e=0 z=0 None .sdata2 @5114 */ -SECTION_SDATA2 static u32 lit_5114 = 0x46D67A00; +SECTION_SDATA2 static f32 lit_5114 = 27453.0f; /* 804522D0-804522D4 0004+00 s=1 e=0 z=0 None .sdata2 @5115 */ -SECTION_SDATA2 static u32 lit_5115 = 0x46054000; +SECTION_SDATA2 static f32 lit_5115 = 8528.0f; /* 804522D4-804522D8 0004+00 s=1 e=0 z=0 None .sdata2 @5116 */ -SECTION_SDATA2 static u32 lit_5116 = 0x44A28000; +SECTION_SDATA2 static f32 lit_5116 = 1300.0f; /* 804522D8-804522DC 0004+00 s=2 e=0 z=0 None .sdata2 @5117 */ -SECTION_SDATA2 static u32 lit_5117 = 0x44898000; +SECTION_SDATA2 static f32 lit_5117 = 1100.0f; /* 804522DC-804522E0 0004+00 s=5 e=0 z=0 None .sdata2 @5118 */ -SECTION_SDATA2 static u32 lit_5118 = 0x42A00000; +SECTION_SDATA2 static f32 lit_5118 = 80.0f; /* 804522E0-804522E4 0004+00 s=6 e=0 z=0 None .sdata2 @5119 */ -SECTION_SDATA2 static u32 lit_5119 = 0x43FA0000; +SECTION_SDATA2 static f32 lit_5119 = 500.0f; /* 804522E4-804522E8 0004+00 s=1 e=0 z=0 None .sdata2 @5120 */ -SECTION_SDATA2 static u32 lit_5120 = 0xC3640000; +SECTION_SDATA2 static f32 lit_5120 = -228.0f; /* 804522E8-804522EC 0004+00 s=1 e=0 z=0 None .sdata2 @5121 */ -SECTION_SDATA2 static u32 lit_5121 = 0x4446C000; +SECTION_SDATA2 static f32 lit_5121 = 795.0f; /* 804522EC-804522F0 0004+00 s=4 e=0 z=0 None .sdata2 @5122 */ -SECTION_SDATA2 static u32 lit_5122 = 0x44BB8000; +SECTION_SDATA2 static f32 lit_5122 = 1500.0f; /* 804522F0-804522F4 0004+00 s=2 e=0 z=0 None .sdata2 @5123 */ -SECTION_SDATA2 static u32 lit_5123 = 0x459F6000; +SECTION_SDATA2 static f32 lit_5123 = 5100.0f; /* 804522F4-804522F8 0004+00 s=2 e=0 z=0 None .sdata2 @5124 */ -SECTION_SDATA2 static u32 lit_5124 = 0xC54B2000; +SECTION_SDATA2 static f32 lit_5124 = -3250.0f; /* 804522F8-804522FC 0004+00 s=3 e=0 z=0 None .sdata2 @5125 */ -SECTION_SDATA2 static u32 lit_5125 = 0xC2480000; +SECTION_SDATA2 static f32 lit_5125 = -50.0f; /* 804522FC-80452300 0004+00 s=2 e=0 z=0 None .sdata2 @5126 */ -SECTION_SDATA2 static u32 lit_5126 = 0xC528C000; +SECTION_SDATA2 static f32 lit_5126 = -2700.0f; /* 80452300-80452304 0004+00 s=2 e=0 z=0 None .sdata2 @5127 */ -SECTION_SDATA2 static u32 lit_5127 = 0x46761800; +SECTION_SDATA2 static f32 lit_5127 = 15750.0f; /* 80452304-80452308 0004+00 s=1 e=0 z=0 None .sdata2 @5128 */ -SECTION_SDATA2 static u32 lit_5128 = 0xC5660000; +SECTION_SDATA2 static f32 lit_5128 = -3680.0f; /* 80452308-8045230C 0004+00 s=1 e=0 z=0 None .sdata2 @5129 */ -SECTION_SDATA2 static u32 lit_5129 = 0xC63B1C00; +SECTION_SDATA2 static f32 lit_5129 = -11975.0f; /* 8045230C-80452310 0004+00 s=1 e=0 z=0 None .sdata2 @5130 */ -SECTION_SDATA2 static u32 lit_5130 = 0xC6248800; +SECTION_SDATA2 static f32 lit_5130 = -10530.0f; /* 80452310-80452314 0004+00 s=1 e=0 z=0 None .sdata2 @5131 */ -SECTION_SDATA2 static u32 lit_5131 = 0x45516000; +SECTION_SDATA2 static f32 lit_5131 = 3350.0f; /* 80452314-80452318 0004+00 s=1 e=0 z=0 None .sdata2 @5132 */ -SECTION_SDATA2 static u32 lit_5132 = 0xC64B8C00; +SECTION_SDATA2 static f32 lit_5132 = -13027.0f; /* 80452318-8045231C 0004+00 s=1 e=0 z=0 None .sdata2 @5133 */ -SECTION_SDATA2 static u32 lit_5133 = 0xC6329800; +SECTION_SDATA2 static f32 lit_5133 = -11430.0f; /* 8045231C-80452320 0004+00 s=1 e=0 z=0 None .sdata2 @5134 */ -SECTION_SDATA2 static u32 lit_5134 = 0x47102400; +SECTION_SDATA2 static f32 lit_5134 = 36900.0f; /* 8005D18C-8005E8B0 1724+00 s=0 e=1 z=0 None .text dKyr_rain_move__Fv */ #pragma push @@ -1008,103 +982,103 @@ asm static void d_krain_cut_turn_check() { /* ############################################################################################## */ /* 80452320-80452324 0004+00 s=1 e=0 z=0 None .sdata2 @5716 */ -SECTION_SDATA2 static u32 lit_5716 = 0xCCBEBC20; +SECTION_SDATA2 static f32 lit_5716 = -100000000.0f; /* 80452324-80452328 0004+00 s=2 e=0 z=0 None .sdata2 @5717 */ -SECTION_SDATA2 static u32 lit_5717 = 0x47C35000; +SECTION_SDATA2 static f32 lit_5717 = 100000.0f; /* 80452328-8045232C 0004+00 s=1 e=0 z=0 None .sdata2 @5718 */ -SECTION_SDATA2 static u32 lit_5718 = 0x40333333; +SECTION_SDATA2 static f32 lit_5718 = 14.0f / 5.0f; /* 8045232C-80452330 0004+00 s=1 e=0 z=0 None .sdata2 @5719 */ -SECTION_SDATA2 static u32 lit_5719 = 0xBF0CCCCD; +SECTION_SDATA2 static f32 lit_5719 = -11.0f / 20.0f; /* 80452330-80452334 0004+00 s=9 e=0 z=0 None .sdata2 @5720 */ -SECTION_SDATA2 static u32 lit_5720 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_5720 = 2.0f / 5.0f; /* 80452334-80452338 0004+00 s=6 e=0 z=0 None .sdata2 @5721 */ -SECTION_SDATA2 static u32 lit_5721 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_5721 = 1.5f; /* 80452338-8045233C 0004+00 s=4 e=0 z=0 None .sdata2 @5722 */ -SECTION_SDATA2 static u32 lit_5722 = 0x47800000; +SECTION_SDATA2 static f32 lit_5722 = 65536.0f; /* 8045233C-80452340 0004+00 s=5 e=0 z=0 None .sdata2 @5723 */ -SECTION_SDATA2 static u32 lit_5723 = 0x447A0000; +SECTION_SDATA2 static f32 lit_5723 = 1000.0f; /* 80452340-80452344 0004+00 s=1 e=0 z=0 None .sdata2 @5724 */ -SECTION_SDATA2 static u32 lit_5724 = 0xC7C39AF3; +SECTION_SDATA2 static f32 lit_5724 = -100149.8984375f; /* 80452344-80452348 0004+00 s=1 e=0 z=0 None .sdata2 @5725 */ -SECTION_SDATA2 static u32 lit_5725 = 0xC7C34FF3; +SECTION_SDATA2 static f32 lit_5725 = -99999.8984375f; /* 80452348-8045234C 0004+00 s=2 e=0 z=0 None .sdata2 @5726 */ -SECTION_SDATA2 static u32 lit_5726 = 0x40200000; +SECTION_SDATA2 static f32 lit_5726 = 2.5f; /* 8045234C-80452350 0004+00 s=7 e=0 z=0 None .sdata2 @5727 */ -SECTION_SDATA2 static u32 lit_5727 = 0x3E800000; +SECTION_SDATA2 static f32 lit_5727 = 0.25f; /* 80452350-80452354 0004+00 s=6 e=0 z=0 None .sdata2 @5728 */ -SECTION_SDATA2 static u32 lit_5728 = 0x40A00000; +SECTION_SDATA2 static f32 lit_5728 = 5.0f; /* 80452354-80452358 0004+00 s=7 e=0 z=0 None .sdata2 @5729 */ -SECTION_SDATA2 static u32 lit_5729 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_5729 = 3.0f / 5.0f; /* 80452358-8045235C 0004+00 s=2 e=0 z=0 None .sdata2 @5730 */ -SECTION_SDATA2 static u32 lit_5730 = 0x40400000; +SECTION_SDATA2 static f32 lit_5730 = 3.0f; /* 8045235C-80452360 0004+00 s=1 e=0 z=0 None .sdata2 @5731 */ -SECTION_SDATA2 static u32 lit_5731 = 0x40900000; +SECTION_SDATA2 static f32 lit_5731 = 4.5f; /* 80452360-80452364 0004+00 s=2 e=0 z=0 None .sdata2 @5732 */ -SECTION_SDATA2 static u32 lit_5732 = 0x3F400000; +SECTION_SDATA2 static f32 lit_5732 = 0.75f; /* 80452364-80452368 0004+00 s=2 e=0 z=0 None .sdata2 @5733 */ -SECTION_SDATA2 static u32 lit_5733 = 0x3CF5C28F; +SECTION_SDATA2 static f32 lit_5733 = 3.0f / 100.0f; /* 80452368-8045236C 0004+00 s=2 e=0 z=0 None .sdata2 @5734 */ -SECTION_SDATA2 static u32 lit_5734 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_5734 = 1.0f / 50.0f; /* 8045236C-80452370 0004+00 s=5 e=0 z=0 None .sdata2 @5735 */ -SECTION_SDATA2 static u32 lit_5735 = 0x43960000; +SECTION_SDATA2 static f32 lit_5735 = 300.0f; /* 80452370-80452374 0004+00 s=1 e=0 z=0 None .sdata2 @5736 */ -SECTION_SDATA2 static u32 lit_5736 = 0x45AF0000; +SECTION_SDATA2 static f32 lit_5736 = 5600.0f; /* 80452374-80452378 0004+00 s=3 e=0 z=0 None .sdata2 @5737 */ -SECTION_SDATA2 static u32 lit_5737 = 0x43020000; +SECTION_SDATA2 static f32 lit_5737 = 130.0f; /* 80452378-8045237C 0004+00 s=7 e=0 z=0 None .sdata2 @5738 */ -SECTION_SDATA2 static u32 lit_5738 = 0x40000000; +SECTION_SDATA2 static f32 lit_5738 = 2.0f; /* 8045237C-80452380 0004+00 s=4 e=0 z=0 None .sdata2 @5739 */ -SECTION_SDATA2 static u32 lit_5739 = 0x43C80000; +SECTION_SDATA2 static f32 lit_5739 = 400.0f; /* 80452380-80452384 0004+00 s=3 e=0 z=0 None .sdata2 @5740 */ -SECTION_SDATA2 static u32 lit_5740 = 0x41F00000; +SECTION_SDATA2 static f32 lit_5740 = 30.0f; /* 80452384-80452388 0004+00 s=3 e=0 z=0 None .sdata2 @5741 */ -SECTION_SDATA2 static u32 lit_5741 = 0x41100000; +SECTION_SDATA2 static f32 lit_5741 = 9.0f; /* 80452388-8045238C 0004+00 s=1 e=0 z=0 None .sdata2 @5742 */ -SECTION_SDATA2 static u32 lit_5742 = 0xC7C345F3; +SECTION_SDATA2 static f32 lit_5742 = -99979.8984375f; /* 8045238C-80452390 0004+00 s=1 e=0 z=0 None .sdata2 @5743 */ -SECTION_SDATA2 static u32 lit_5743 = 0x44834000; +SECTION_SDATA2 static f32 lit_5743 = 1050.0f; /* 80452390-80452394 0004+00 s=1 e=0 z=0 None .sdata2 @5744 */ -SECTION_SDATA2 static u32 lit_5744 = 0x45480000; +SECTION_SDATA2 static f32 lit_5744 = 3200.0f; /* 80452394-80452398 0004+00 s=1 e=0 z=0 None .sdata2 @5745 */ -SECTION_SDATA2 static u32 lit_5745 = 0x44D48000; +SECTION_SDATA2 static f32 lit_5745 = 1700.0f; /* 80452398-8045239C 0004+00 s=1 e=0 z=0 None .sdata2 @5746 */ -SECTION_SDATA2 static u32 lit_5746 = 0x452F0000; +SECTION_SDATA2 static f32 lit_5746 = 2800.0f; /* 8045239C-804523A0 0004+00 s=1 e=0 z=0 None .sdata2 @5747 */ -SECTION_SDATA2 static u32 lit_5747 = 0x444E4000; +SECTION_SDATA2 static f32 lit_5747 = 825.0f; /* 804523A0-804523A4 0004+00 s=3 e=0 z=0 None .sdata2 @5748 */ -SECTION_SDATA2 static u32 lit_5748 = 0x44FA0000; +SECTION_SDATA2 static f32 lit_5748 = 2000.0f; /* 8005E8F8-8005FBDC 12E4+00 s=0 e=1 z=0 None .text dKyr_housi_move__Fv */ #pragma push @@ -1128,31 +1102,31 @@ asm void dKyr_snow_init() { /* ############################################################################################## */ /* 804523A4-804523A8 0004+00 s=8 e=0 z=0 None .sdata2 @6355 */ -SECTION_SDATA2 static u32 lit_6355 = 0x42C80000; +SECTION_SDATA2 static f32 lit_6355 = 100.0f; /* 804523A8-804523AC 0004+00 s=2 e=0 z=0 None .sdata2 @6356 */ -SECTION_SDATA2 static u32 lit_6356 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_6356 = 6.0f / 5.0f; /* 804523AC-804523B0 0004+00 s=1 e=0 z=0 None .sdata2 @6357 */ -SECTION_SDATA2 static u32 lit_6357 = 0x40D00000; +SECTION_SDATA2 static f32 lit_6357 = 6.5f; /* 804523B0-804523B4 0004+00 s=3 e=0 z=0 None .sdata2 @6358 */ -SECTION_SDATA2 static u32 lit_6358 = 0x3EE66666; +SECTION_SDATA2 static f32 lit_6358 = 9.0f / 20.0f; /* 804523B4-804523B8 0004+00 s=1 e=0 z=0 None .sdata2 @6359 */ -SECTION_SDATA2 static u32 lit_6359 = 0x40A9999A; +SECTION_SDATA2 static f32 lit_6359 = 53.0f / 10.0f; /* 804523B8-804523BC 0004+00 s=2 e=0 z=0 None .sdata2 @6360 */ -SECTION_SDATA2 static u32 lit_6360 = 0x3EB33333; +SECTION_SDATA2 static f32 lit_6360 = 7.0f / 20.0f; /* 804523BC-804523C0 0004+00 s=2 e=0 z=0 None .sdata2 @6361 */ -SECTION_SDATA2 static u32 lit_6361 = 0x453B8000; +SECTION_SDATA2 static f32 lit_6361 = 3000.0f; /* 804523C0-804523C4 0004+00 s=1 e=0 z=0 None .sdata2 @6362 */ -SECTION_SDATA2 static u32 lit_6362 = 0x41DC0000; +SECTION_SDATA2 static f32 lit_6362 = 27.5f; /* 804523C4-804523C8 0004+00 s=1 e=0 z=0 None .sdata2 @6363 */ -SECTION_SDATA2 static u32 lit_6363 = 0x448FC000; +SECTION_SDATA2 static f32 lit_6363 = 1150.0f; /* 804523C8-804523D0 0004+04 s=1 e=0 z=0 None .sdata2 @6364 */ SECTION_SDATA2 static f32 lit_6364[1 + 1 /* padding */] = { @@ -1162,18 +1136,16 @@ SECTION_SDATA2 static f32 lit_6364[1 + 1 /* padding */] = { }; /* 804523D0-804523D8 0008+00 s=1 e=0 z=0 None .sdata2 @6365 */ -SECTION_SDATA2 static u8 lit_6365[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6365 = 1.0; /* 804523D8-804523DC 0004+00 s=1 e=0 z=0 None .sdata2 @6366 */ -SECTION_SDATA2 static u32 lit_6366 = 0xC3AA0000; +SECTION_SDATA2 static f32 lit_6366 = -340.0f; /* 804523DC-804523E0 0004+00 s=1 e=0 z=0 None .sdata2 @6367 */ -SECTION_SDATA2 static u32 lit_6367 = 0x46192000; +SECTION_SDATA2 static f32 lit_6367 = 9800.0f; /* 804523E0-804523E4 0004+00 s=2 e=0 z=0 None .sdata2 @6368 */ -SECTION_SDATA2 static u32 lit_6368 = 0x3EC28F5C; +SECTION_SDATA2 static f32 lit_6368 = 19.0f / 50.0f; /* 8005FD48-80061324 15DC+00 s=0 e=1 z=0 None .text dKyr_snow_move__Fv */ #pragma push @@ -1207,55 +1179,55 @@ asm void dKyr_star_move() { /* ############################################################################################## */ /* 804523E4-804523E8 0004+00 s=2 e=0 z=0 None .sdata2 @6720 */ -SECTION_SDATA2 static u32 lit_6720 = 0x3BA3D70A; +SECTION_SDATA2 static f32 lit_6720 = 0.004999999888241291f; /* 804523E8-804523EC 0004+00 s=7 e=0 z=0 None .sdata2 @6721 */ -SECTION_SDATA2 static u32 lit_6721 = 0x358637BD; +SECTION_SDATA2 static f32 lit_6721 = 9.999999974752427e-07f; /* 804523EC-804523F0 0004+00 s=1 e=0 z=0 None .sdata2 @6722 */ -SECTION_SDATA2 static u32 lit_6722 = 0xC3960000; +SECTION_SDATA2 static f32 lit_6722 = -300.0f; /* 804523F0-804523F4 0004+00 s=2 e=0 z=0 None .sdata2 @6723 */ -SECTION_SDATA2 static u32 lit_6723 = 0x477FFF00; +SECTION_SDATA2 static f32 lit_6723 = 65535.0f; /* 804523F4-804523F8 0004+00 s=1 e=0 z=0 None .sdata2 @6724 */ -SECTION_SDATA2 static u32 lit_6724 = 0x3CDD2F1C; +SECTION_SDATA2 static f32 lit_6724 = 0.027000002562999725f; /* 804523F8-804523FC 0004+00 s=1 e=0 z=0 None .sdata2 @6725 */ -SECTION_SDATA2 static u32 lit_6725 = 0x41B80000; +SECTION_SDATA2 static f32 lit_6725 = 23.0f; /* 804523FC-80452400 0004+00 s=5 e=0 z=0 None .sdata2 @6726 */ -SECTION_SDATA2 static u32 lit_6726 = 0x42F00000; +SECTION_SDATA2 static f32 lit_6726 = 120.0f; /* 80452400-80452404 0004+00 s=1 e=0 z=0 None .sdata2 @6727 */ -SECTION_SDATA2 static u32 lit_6727 = 0x44C08000; +SECTION_SDATA2 static f32 lit_6727 = 1540.0f; /* 80452404-80452408 0004+00 s=1 e=0 z=0 None .sdata2 @6728 */ -SECTION_SDATA2 static u32 lit_6728 = 0x44820000; +SECTION_SDATA2 static f32 lit_6728 = 1040.0f; /* 80452408-8045240C 0004+00 s=1 e=0 z=0 None .sdata2 @6729 */ -SECTION_SDATA2 static u32 lit_6729 = 0x42300000; +SECTION_SDATA2 static f32 lit_6729 = 44.0f; /* 8045240C-80452410 0004+00 s=1 e=0 z=0 None .sdata2 @6730 */ -SECTION_SDATA2 static u32 lit_6730 = 0x43CC0000; +SECTION_SDATA2 static f32 lit_6730 = 408.0f; /* 80452410-80452414 0004+00 s=2 e=0 z=0 None .sdata2 @6731 */ -SECTION_SDATA2 static u32 lit_6731 = 0x3DF5C28F; +SECTION_SDATA2 static f32 lit_6731 = 3.0f / 25.0f; /* 80452414-80452418 0004+00 s=1 e=0 z=0 None .sdata2 @6732 */ -SECTION_SDATA2 static u32 lit_6732 = 0x3E75C28F; +SECTION_SDATA2 static f32 lit_6732 = 6.0f / 25.0f; /* 80452418-8045241C 0004+00 s=1 e=0 z=0 None .sdata2 @6733 */ -SECTION_SDATA2 static u32 lit_6733 = 0x3EB851EC; +SECTION_SDATA2 static f32 lit_6733 = 9.0f / 25.0f; /* 8045241C-80452420 0004+00 s=2 e=0 z=0 None .sdata2 @6734 */ -SECTION_SDATA2 static u32 lit_6734 = 0x3DB851EC; +SECTION_SDATA2 static f32 lit_6734 = 9.0f / 100.0f; /* 80452420-80452424 0004+00 s=1 e=0 z=0 None .sdata2 @6735 */ -SECTION_SDATA2 static u32 lit_6735 = 0x3E051EB8; +SECTION_SDATA2 static f32 lit_6735 = 13.0f / 100.0f; /* 80452424-80452428 0004+00 s=2 e=0 z=0 None .sdata2 @6736 */ -SECTION_SDATA2 static u32 lit_6736 = 0x3F333333; +SECTION_SDATA2 static f32 lit_6736 = 7.0f / 10.0f; /* 80061438-800620AC 0C74+00 s=0 e=1 z=0 None .text cloud_shadow_move__Fv */ #pragma push @@ -1269,10 +1241,10 @@ asm void cloud_shadow_move() { /* ############################################################################################## */ /* 80452428-8045242C 0004+00 s=1 e=0 z=0 None .sdata2 @6947 */ -SECTION_SDATA2 static u32 lit_6947 = 0x451C4000; +SECTION_SDATA2 static f32 lit_6947 = 2500.0f; /* 8045242C-80452430 0004+00 s=1 e=0 z=0 None .sdata2 @6948 */ -SECTION_SDATA2 static u32 lit_6948 = 0x41C80000; +SECTION_SDATA2 static f32 lit_6948 = 25.0f; /* 80452430-80452438 0004+04 s=1 e=0 z=0 None .sdata2 @6949 */ SECTION_SDATA2 static f32 lit_6949[1 + 1 /* padding */] = { @@ -1282,24 +1254,22 @@ SECTION_SDATA2 static f32 lit_6949[1 + 1 /* padding */] = { }; /* 80452438-80452440 0008+00 s=1 e=0 z=0 None .sdata2 @6950 */ -SECTION_SDATA2 static u8 lit_6950[8] = { - 0x40, 0xCB, 0x58, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6950 = 14000.0; /* 80452440-80452444 0004+00 s=1 e=0 z=0 None .sdata2 @6951 */ -SECTION_SDATA2 static u32 lit_6951 = 0x466A6000; +SECTION_SDATA2 static f32 lit_6951 = 15000.0f; /* 80452444-80452448 0004+00 s=3 e=0 z=0 None .sdata2 @6952 */ -SECTION_SDATA2 static u32 lit_6952 = 0x459C4000; +SECTION_SDATA2 static f32 lit_6952 = 5000.0f; /* 80452448-8045244C 0004+00 s=1 e=0 z=0 None .sdata2 @6953 */ -SECTION_SDATA2 static u32 lit_6953 = 0x466BF000; +SECTION_SDATA2 static f32 lit_6953 = 15100.0f; /* 8045244C-80452450 0004+00 s=1 e=0 z=0 None .sdata2 @6954 */ -SECTION_SDATA2 static u32 lit_6954 = 0xBF333333; +SECTION_SDATA2 static f32 lit_6954 = -7.0f / 10.0f; /* 80452450-80452454 0004+00 s=1 e=0 z=0 None .sdata2 @6955 */ -SECTION_SDATA2 static u32 lit_6955 = 0x3CCCCCCD; +SECTION_SDATA2 static f32 lit_6955 = 1.0f / 40.0f; /* 800620AC-80062ADC 0A30+00 s=0 e=1 z=0 None .text vrkumo_move__Fv */ #pragma push @@ -1335,22 +1305,22 @@ SECTION_DATA static void* lit_7214[8] = { }; /* 80452454-80452458 0004+00 s=5 e=0 z=0 None .sdata2 @7208 */ -SECTION_SDATA2 static u32 lit_7208 = 0xBF800000; +SECTION_SDATA2 static f32 lit_7208 = -1.0f; /* 80452458-8045245C 0004+00 s=8 e=0 z=0 None .sdata2 @7209 */ -SECTION_SDATA2 static u32 lit_7209 = 0x42340000; +SECTION_SDATA2 static f32 lit_7209 = 45.0f; /* 8045245C-80452460 0004+00 s=2 e=0 z=0 None .sdata2 @7210 */ -SECTION_SDATA2 static u32 lit_7210 = 0xC0C90FDB; +SECTION_SDATA2 static f32 lit_7210 = -6.2831854820251465f; /* 80452460-80452464 0004+00 s=12 e=0 z=0 None .sdata2 @7211 */ -SECTION_SDATA2 static u32 lit_7211 = 0x3C8EFA35; +SECTION_SDATA2 static f32 lit_7211 = 0.01745329238474369f; /* 80452464-80452468 0004+00 s=2 e=0 z=0 None .sdata2 @7212 */ -SECTION_SDATA2 static u32 lit_7212 = 0x462BE000; +SECTION_SDATA2 static f32 lit_7212 = 11000.0f; /* 80452468-8045246C 0004+00 s=2 e=0 z=0 None .sdata2 @7213 */ -SECTION_SDATA2 static u32 lit_7213 = 0x40133333; +SECTION_SDATA2 static f32 lit_7213 = 23.0f / 10.0f; /* 80062B4C-80063670 0B24+00 s=2 e=0 z=0 None .text dKyr_draw_rev_moon__FPA4_fPPUc */ #pragma push @@ -1376,16 +1346,16 @@ SECTION_DATA static void* lit_7549[8] = { }; /* 8045246C-80452470 0004+00 s=2 e=0 z=0 None .sdata2 @7545 */ -SECTION_SDATA2 static u32 lit_7545 = 0x4573C000; +SECTION_SDATA2 static f32 lit_7545 = 3900.0f; /* 80452470-80452474 0004+00 s=2 e=0 z=0 None .sdata2 @7546 */ -SECTION_SDATA2 static u32 lit_7546 = 0x45FBA000; +SECTION_SDATA2 static f32 lit_7546 = 8052.0f; /* 80452474-80452478 0004+00 s=2 e=0 z=0 None .sdata2 @7547 */ -SECTION_SDATA2 static u32 lit_7547 = 0xC60DC000; +SECTION_SDATA2 static f32 lit_7547 = -9072.0f; /* 80452478-8045247C 0004+00 s=1 e=0 z=0 None .sdata2 @7548 */ -SECTION_SDATA2 static u32 lit_7548 = 0x45160000; +SECTION_SDATA2 static f32 lit_7548 = 2400.0f; /* 80063670-8006444C 0DDC+00 s=1 e=1 z=0 None .text dKyr_drawSun__FPA4_fP4cXyzR8_GXColorPPUc */ @@ -1406,43 +1376,43 @@ static u8 struct_80450EF0[4]; static u8 data_80450EF4[4]; /* 8045247C-80452480 0004+00 s=1 e=0 z=0 None .sdata2 @7882 */ -SECTION_SDATA2 static u32 lit_7882 = 0x4039999A; +SECTION_SDATA2 static f32 lit_7882 = 29.0f / 10.0f; /* 80452480-80452484 0004+00 s=2 e=0 z=0 None .sdata2 @7883 */ -SECTION_SDATA2 static u32 lit_7883 = 0x42080000; +SECTION_SDATA2 static f32 lit_7883 = 34.0f; /* 80452484-80452488 0004+00 s=1 e=0 z=0 None .sdata2 @7884 */ -SECTION_SDATA2 static u32 lit_7884 = 0x43200000; +SECTION_SDATA2 static f32 lit_7884 = 160.0f; /* 80452488-8045248C 0004+00 s=1 e=0 z=0 None .sdata2 @7885 */ -SECTION_SDATA2 static u32 lit_7885 = 0x3F5C28F6; +SECTION_SDATA2 static f32 lit_7885 = 43.0f / 50.0f; /* 8045248C-80452490 0004+00 s=1 e=0 z=0 None .sdata2 @7886 */ -SECTION_SDATA2 static u32 lit_7886 = 0x401D70A4; +SECTION_SDATA2 static f32 lit_7886 = 123.0f / 50.0f; /* 80452490-80452494 0004+00 s=2 e=0 z=0 None .sdata2 @7887 */ -SECTION_SDATA2 static u32 lit_7887 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_7887 = 11.0f / 10.0f; /* 80452494-80452498 0004+00 s=1 e=0 z=0 None .sdata2 @7888 */ -SECTION_SDATA2 static u32 lit_7888 = 0x3D23D70A; +SECTION_SDATA2 static f32 lit_7888 = 1.0f / 25.0f; /* 80452498-8045249C 0004+00 s=1 e=0 z=0 None .sdata2 @7889 */ -SECTION_SDATA2 static u32 lit_7889 = 0x3D99999A; +SECTION_SDATA2 static f32 lit_7889 = 3.0f / 40.0f; /* 8045249C-804524A0 0004+00 s=1 e=0 z=0 None .sdata2 @7890 */ -SECTION_SDATA2 static u32 lit_7890 = 0x3F6147AE; +SECTION_SDATA2 static f32 lit_7890 = 22.0f / 25.0f; /* 804524A0-804524A4 0004+00 s=1 e=0 z=0 None .sdata2 @7891 */ -SECTION_SDATA2 static u32 lit_7891 = 0x41F4CCCC; +SECTION_SDATA2 static f32 lit_7891 = 30.599998474121094f; /* 804524A4-804524A8 0004+00 s=4 e=0 z=0 None .sdata2 @7892 */ -SECTION_SDATA2 static u32 lit_7892 = 0x430C0000; +SECTION_SDATA2 static f32 lit_7892 = 140.0f; /* 804524A8-804524AC 0004+00 s=1 e=0 z=0 None .sdata2 @7893 */ -SECTION_SDATA2 static u32 lit_7893 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_7893 = 17.0f / 20.0f; /* 804524AC-804524B0 0004+00 s=2 e=0 z=0 None .sdata2 @7894 */ -SECTION_SDATA2 static u32 lit_7894 = 0x42700000; +SECTION_SDATA2 static f32 lit_7894 = 60.0f; /* 8006444C-8006562C 11E0+00 s=0 e=1 z=0 None .text * dKyr_drawLenzflare__FPA4_fP4cXyzR8_GXColorPPUc */ @@ -1478,19 +1448,19 @@ static u8 rot_7919[4]; static u8 struct_80450EFC[4]; /* 804524B0-804524B4 0004+00 s=2 e=0 z=0 None .sdata2 @8211 */ -SECTION_SDATA2 static u32 lit_8211 = 0x428C0000; +SECTION_SDATA2 static f32 lit_8211 = 70.0f; /* 804524B4-804524B8 0004+00 s=1 e=0 z=0 None .sdata2 @8212 */ -SECTION_SDATA2 static u32 lit_8212 = 0xBFC00000; +SECTION_SDATA2 static f32 lit_8212 = -1.5f; /* 804524B8-804524BC 0004+00 s=5 e=0 z=0 None .sdata2 @8213 */ -SECTION_SDATA2 static u32 lit_8213 = 0x43160000; +SECTION_SDATA2 static f32 lit_8213 = 150.0f; /* 804524BC-804524C0 0004+00 s=1 e=0 z=0 None .sdata2 @8214 */ -SECTION_SDATA2 static u32 lit_8214 = 0x43A00000; +SECTION_SDATA2 static f32 lit_8214 = 320.0f; /* 804524C0-804524C4 0004+00 s=1 e=0 z=0 None .sdata2 @8215 */ -SECTION_SDATA2 static u32 lit_8215 = 0x43F00000; +SECTION_SDATA2 static f32 lit_8215 = 480.0f; /* 8006562C-80066048 0A1C+00 s=0 e=1 z=0 None .text dKyr_drawRain__FPA4_fPPUc */ #pragma push @@ -1504,10 +1474,10 @@ asm void dKyr_drawRain(f32 (*param_0)[4], u8** param_1) { /* ############################################################################################## */ /* 804524C4-804524C8 0004+00 s=1 e=0 z=0 None .sdata2 @8360 */ -SECTION_SDATA2 static u32 lit_8360 = 0x45DAC000; +SECTION_SDATA2 static f32 lit_8360 = 7000.0f; /* 804524C8-804524CC 0004+00 s=1 e=0 z=0 None .sdata2 @8361 */ -SECTION_SDATA2 static u32 lit_8361 = 0x45610000; +SECTION_SDATA2 static f32 lit_8361 = 3600.0f; /* 80066048-8006653C 04F4+00 s=0 e=1 z=0 None .text dKyr_drawSibuki__FPA4_fPPUc */ #pragma push @@ -1533,37 +1503,37 @@ SECTION_SDATA2 static u32 lit_8393 = 0x323232FF; SECTION_SDATA2 static u32 lit_8394 = 0xFFD7F0FF; /* 804524D4-804524D8 0004+00 s=1 e=0 z=0 None .sdata2 @8917 */ -SECTION_SDATA2 static u32 lit_8917 = 0x41900000; +SECTION_SDATA2 static f32 lit_8917 = 18.0f; /* 804524D8-804524DC 0004+00 s=1 e=0 z=0 None .sdata2 @8918 */ -SECTION_SDATA2 static u32 lit_8918 = 0xBF000000; +SECTION_SDATA2 static f32 lit_8918 = -0.5f; /* 804524DC-804524E0 0004+00 s=1 e=0 z=0 None .sdata2 @8919 */ -SECTION_SDATA2 static u32 lit_8919 = 0x42F60000; +SECTION_SDATA2 static f32 lit_8919 = 123.0f; /* 804524E0-804524E4 0004+00 s=1 e=0 z=0 None .sdata2 @8920 */ -SECTION_SDATA2 static u32 lit_8920 = 0x41000000; +SECTION_SDATA2 static f32 lit_8920 = 8.0f; /* 804524E4-804524E8 0004+00 s=1 e=0 z=0 None .sdata2 @8921 */ -SECTION_SDATA2 static u32 lit_8921 = 0xBF666666; +SECTION_SDATA2 static f32 lit_8921 = -9.0f / 10.0f; /* 804524E8-804524EC 0004+00 s=1 e=0 z=0 None .sdata2 @8922 */ -SECTION_SDATA2 static u32 lit_8922 = 0x43550000; +SECTION_SDATA2 static f32 lit_8922 = 213.0f; /* 804524EC-804524F0 0004+00 s=1 e=0 z=0 None .sdata2 @8923 */ -SECTION_SDATA2 static u32 lit_8923 = 0x442B4000; +SECTION_SDATA2 static f32 lit_8923 = 685.0f; /* 804524F0-804524F4 0004+00 s=1 e=0 z=0 None .sdata2 @8924 */ -SECTION_SDATA2 static u32 lit_8924 = 0x43F18000; +SECTION_SDATA2 static f32 lit_8924 = 483.0f; /* 804524F4-804524F8 0004+00 s=1 e=0 z=0 None .sdata2 @8925 */ -SECTION_SDATA2 static u32 lit_8925 = 0x46FFFA00; +SECTION_SDATA2 static f32 lit_8925 = 32765.0f; /* 804524F8-804524FC 0004+00 s=1 e=0 z=0 None .sdata2 @8926 */ -SECTION_SDATA2 static u32 lit_8926 = 0xC6800000; +SECTION_SDATA2 static f32 lit_8926 = -16384.0f; /* 804524FC-80452500 0004+00 s=1 e=0 z=0 None .sdata2 @8927 */ -SECTION_SDATA2 static u32 lit_8927 = 0x46800000; +SECTION_SDATA2 static f32 lit_8927 = 16384.0f; /* 8006653C-80067488 0F4C+00 s=0 e=1 z=0 None .text dKyr_drawHousi__FPA4_fPPUc */ #pragma push @@ -1610,61 +1580,61 @@ SECTION_SDATA2 static u32 lit_8939 = 0xFFFFFFFF; SECTION_SDATA2 static u32 lit_8940 = 0xFFFFFFFF; /* 80452508-8045250C 0004+00 s=1 e=0 z=0 None .sdata2 @9384 */ -SECTION_SDATA2 static u32 lit_9384 = 0xC1A00000; +SECTION_SDATA2 static f32 lit_9384 = -20.0f; /* 8045250C-80452510 0004+00 s=1 e=0 z=0 None .sdata2 @9385 */ -SECTION_SDATA2 static u32 lit_9385 = 0x43328000; +SECTION_SDATA2 static f32 lit_9385 = 178.5f; /* 80452510-80452514 0004+00 s=1 e=0 z=0 None .sdata2 @9386 */ -SECTION_SDATA2 static u32 lit_9386 = 0x42FF0000; +SECTION_SDATA2 static f32 lit_9386 = 127.5f; /* 80452514-80452518 0004+00 s=3 e=0 z=0 None .sdata2 @9387 */ -SECTION_SDATA2 static u32 lit_9387 = 0x4433C000; +SECTION_SDATA2 static f32 lit_9387 = 719.0f; /* 80452518-8045251C 0004+00 s=1 e=0 z=0 None .sdata2 @9388 */ -SECTION_SDATA2 static u32 lit_9388 = 0x435C0000; +SECTION_SDATA2 static f32 lit_9388 = 220.0f; /* 8045251C-80452520 0004+00 s=1 e=0 z=0 None .sdata2 @9389 */ -SECTION_SDATA2 static u32 lit_9389 = 0x4501F000; +SECTION_SDATA2 static f32 lit_9389 = 2079.0f; /* 80452520-80452524 0004+00 s=1 e=0 z=0 None .sdata2 @9390 */ -SECTION_SDATA2 static u32 lit_9390 = 0x453C5000; +SECTION_SDATA2 static f32 lit_9390 = 3013.0f; /* 80452524-80452528 0004+00 s=1 e=0 z=0 None .sdata2 @9391 */ -SECTION_SDATA2 static u32 lit_9391 = 0x44580000; +SECTION_SDATA2 static f32 lit_9391 = 864.0f; /* 80452528-8045252C 0004+00 s=1 e=0 z=0 None .sdata2 @9392 */ -SECTION_SDATA2 static u32 lit_9392 = 0xC5BB8000; +SECTION_SDATA2 static f32 lit_9392 = -6000.0f; /* 8045252C-80452530 0004+00 s=1 e=0 z=0 None .sdata2 @9393 */ -SECTION_SDATA2 static u32 lit_9393 = 0xC5818800; +SECTION_SDATA2 static f32 lit_9393 = -4145.0f; /* 80452530-80452534 0004+00 s=1 e=0 z=0 None .sdata2 @9394 */ -SECTION_SDATA2 static u32 lit_9394 = 0xC5390000; +SECTION_SDATA2 static f32 lit_9394 = -2960.0f; /* 80452534-80452538 0004+00 s=1 e=0 z=0 None .sdata2 @9395 */ -SECTION_SDATA2 static u32 lit_9395 = 0xC45C0000; +SECTION_SDATA2 static f32 lit_9395 = -880.0f; /* 80452538-8045253C 0004+00 s=1 e=0 z=0 None .sdata2 @9396 */ -SECTION_SDATA2 static u32 lit_9396 = 0xC599C000; +SECTION_SDATA2 static f32 lit_9396 = -4920.0f; /* 8045253C-80452540 0004+00 s=1 e=0 z=0 None .sdata2 @9397 */ -SECTION_SDATA2 static u32 lit_9397 = 0xC4FA0000; +SECTION_SDATA2 static f32 lit_9397 = -2000.0f; /* 80452540-80452544 0004+00 s=1 e=0 z=0 None .sdata2 @9398 */ -SECTION_SDATA2 static u32 lit_9398 = 0x40800000; +SECTION_SDATA2 static f32 lit_9398 = 4.0f; /* 80452544-80452548 0004+00 s=1 e=0 z=0 None .sdata2 @9399 */ -SECTION_SDATA2 static u32 lit_9399 = 0x41600000; +SECTION_SDATA2 static f32 lit_9399 = 14.0f; /* 80452548-8045254C 0004+00 s=1 e=0 z=0 None .sdata2 @9400 */ -SECTION_SDATA2 static u32 lit_9400 = 0xC1C00000; +SECTION_SDATA2 static f32 lit_9400 = -24.0f; /* 8045254C-80452550 0004+00 s=1 e=0 z=0 None .sdata2 @9401 */ -SECTION_SDATA2 static u32 lit_9401 = 0x446E0000; +SECTION_SDATA2 static f32 lit_9401 = 952.0f; /* 80452550-80452554 0004+00 s=1 e=0 z=0 None .sdata2 @9402 */ -SECTION_SDATA2 static u32 lit_9402 = 0xC2500000; +SECTION_SDATA2 static f32 lit_9402 = -52.0f; /* 80067488-800685DC 1154+00 s=0 e=1 z=0 None .text dKyr_drawSnow__FPA4_fPPUc */ #pragma push @@ -1726,19 +1696,19 @@ static u8 rot_9421[4]; static u8 struct_80450F1C[4]; /* 80452554-80452558 0004+00 s=2 e=0 z=0 None .sdata2 @9833 */ -SECTION_SDATA2 static u32 lit_9833 = 0x3F266666; +SECTION_SDATA2 static f32 lit_9833 = 13.0f / 20.0f; /* 80452558-8045255C 0004+00 s=1 e=0 z=0 None .sdata2 @9834 */ -SECTION_SDATA2 static u32 lit_9834 = 0x3E8F5C29; +SECTION_SDATA2 static f32 lit_9834 = 7.0f / 25.0f; /* 8045255C-80452560 0004+00 s=1 e=0 z=0 None .sdata2 @9835 */ -SECTION_SDATA2 static u32 lit_9835 = 0x44070000; +SECTION_SDATA2 static f32 lit_9835 = 540.0f; /* 80452560-80452564 0004+00 s=1 e=0 z=0 None .sdata2 @9836 */ -SECTION_SDATA2 static u32 lit_9836 = 0x3D000000; +SECTION_SDATA2 static f32 lit_9836 = 0.03125f; /* 80452564-80452568 0004+00 s=1 e=0 z=0 None .sdata2 @9837 */ -SECTION_SDATA2 static u32 lit_9837 = 0x3BA237C3; +SECTION_SDATA2 static f32 lit_9837 = 0.004950494971126318f; /* 800685DC-8006950C 0F30+00 s=0 e=1 z=0 None .text dKyr_drawStar__FPA4_fPPUc */ #pragma push @@ -1767,10 +1737,10 @@ SECTION_SDATA2 static u32 lit_9851 = 0xFFFFFFFF; SECTION_SDATA2 static u32 lit_9852 = 0xFFFFFFFF; /* 80452574-80452578 0004+00 s=2 e=0 z=0 None .sdata2 @10030 */ -SECTION_SDATA2 static u32 lit_10030 = 0x3F0CCCCD; +SECTION_SDATA2 static f32 lit_10030 = 11.0f / 20.0f; /* 80452578-8045257C 0004+00 s=2 e=0 z=0 None .sdata2 @10031 */ -SECTION_SDATA2 static u32 lit_10031 = 0x3EFAE148; +SECTION_SDATA2 static f32 lit_10031 = 49.0f / 100.0f; /* 8006950C-8006A090 0B84+00 s=0 e=1 z=0 None .text drawCloudShadow__FPA4_fPPUc */ #pragma push @@ -1790,40 +1760,40 @@ static u8 howa_loop_cnt[4]; static u8 data_80450F2C[4]; /* 8045257C-80452580 0004+00 s=1 e=0 z=0 None .sdata2 @10593 */ -SECTION_SDATA2 static u32 lit_10593 = 0x43700000; +SECTION_SDATA2 static f32 lit_10593 = 240.0f; /* 80452580-80452584 0004+00 s=1 e=0 z=0 None .sdata2 @10594 */ -SECTION_SDATA2 static u32 lit_10594 = 0x2EDBE6FF; +SECTION_SDATA2 static f32 lit_10594 = 1.000000013351432e-10f; /* 80452584-80452588 0004+00 s=1 e=0 z=0 None .sdata2 @10595 */ -SECTION_SDATA2 static u32 lit_10595 = 0x3D800000; +SECTION_SDATA2 static f32 lit_10595 = 0.0625f; /* 80452588-8045258C 0004+00 s=1 e=0 z=0 None .sdata2 @10596 */ -SECTION_SDATA2 static u32 lit_10596 = 0x3F570A3D; +SECTION_SDATA2 static f32 lit_10596 = 21.0f / 25.0f; /* 8045258C-80452590 0004+00 s=1 e=0 z=0 None .sdata2 @10597 */ -SECTION_SDATA2 static u32 lit_10597 = 0x3F6B851F; +SECTION_SDATA2 static f32 lit_10597 = 23.0f / 25.0f; /* 80452590-80452594 0004+00 s=1 e=0 z=0 None .sdata2 @10598 */ -SECTION_SDATA2 static u32 lit_10598 = 0x3FF33333; +SECTION_SDATA2 static f32 lit_10598 = 19.0f / 10.0f; /* 80452594-80452598 0004+00 s=1 e=0 z=0 None .sdata2 @10599 */ -SECTION_SDATA2 static u32 lit_10599 = 0x41800000; +SECTION_SDATA2 static f32 lit_10599 = 16.0f; /* 80452598-8045259C 0004+00 s=2 e=0 z=0 None .sdata2 @10600 */ -SECTION_SDATA2 static u32 lit_10600 = 0x3F666666; +SECTION_SDATA2 static f32 lit_10600 = 9.0f / 10.0f; /* 8045259C-804525A0 0004+00 s=1 e=0 z=0 None .sdata2 @10601 */ -SECTION_SDATA2 static u32 lit_10601 = 0xC0800000; +SECTION_SDATA2 static f32 lit_10601 = -4.0f; /* 804525A0-804525A4 0004+00 s=1 e=0 z=0 None .sdata2 @10602 */ -SECTION_SDATA2 static u32 lit_10602 = 0x3F9AE148; +SECTION_SDATA2 static f32 lit_10602 = 121.0f / 100.0f; /* 804525A4-804525A8 0004+00 s=1 e=0 z=0 None .sdata2 @10603 */ -SECTION_SDATA2 static u32 lit_10603 = 0x44310000; +SECTION_SDATA2 static f32 lit_10603 = 708.0f; /* 804525A8-804525AC 0004+00 s=1 e=0 z=0 None .sdata2 @10604 */ -SECTION_SDATA2 static u32 lit_10604 = 0x440B8000; +SECTION_SDATA2 static f32 lit_10604 = 558.0f; /* 8006A090-8006B190 1100+00 s=0 e=1 z=0 None .text drawVrkumo__FPA4_fR8_GXColorPPUc */ #pragma push @@ -1847,28 +1817,28 @@ asm void dKyr_thunder_init() { /* ############################################################################################## */ /* 804525AC-804525B0 0004+00 s=1 e=0 z=0 None .sdata2 @10732 */ -SECTION_SDATA2 static u32 lit_10732 = 0x47AFC800; +SECTION_SDATA2 static f32 lit_10732 = 90000.0f; /* 804525B0-804525B4 0004+00 s=1 e=0 z=0 None .sdata2 @10733 */ -SECTION_SDATA2 static u32 lit_10733 = 0x3BE56042; +SECTION_SDATA2 static f32 lit_10733 = 0.007000000216066837f; /* 804525B4-804525B8 0004+00 s=1 e=0 z=0 None .sdata2 @10734 */ -SECTION_SDATA2 static u32 lit_10734 = 0x483EF000; +SECTION_SDATA2 static f32 lit_10734 = 195520.0f; /* 804525B8-804525BC 0004+00 s=1 e=0 z=0 None .sdata2 @10735 */ -SECTION_SDATA2 static u32 lit_10735 = 0x45969000; +SECTION_SDATA2 static f32 lit_10735 = 4818.0f; /* 804525BC-804525C0 0004+00 s=1 e=0 z=0 None .sdata2 @10736 */ -SECTION_SDATA2 static u32 lit_10736 = 0x44AD2000; +SECTION_SDATA2 static f32 lit_10736 = 1385.0f; /* 804525C0-804525C4 0004+00 s=1 e=0 z=0 None .sdata2 @10737 */ -SECTION_SDATA2 static u32 lit_10737 = 0x42960000; +SECTION_SDATA2 static f32 lit_10737 = 75.0f; /* 804525C4-804525C8 0004+00 s=1 e=0 z=0 None .sdata2 @10738 */ -SECTION_SDATA2 static u32 lit_10738 = 0xC2400000; +SECTION_SDATA2 static f32 lit_10738 = -48.0f; /* 804525C8-804525CC 0004+00 s=1 e=0 z=0 None .sdata2 @10739 */ -SECTION_SDATA2 static u32 lit_10739 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_10739 = 3.0f / 20.0f; /* 8006B1A8-8006B8DC 0734+00 s=0 e=1 z=0 None .text dKyr_thunder_move__Fv */ #pragma push @@ -1902,10 +1872,10 @@ asm void dKyr_odour_init() { /* ############################################################################################## */ /* 804525CC-804525D0 0004+00 s=1 e=0 z=0 None .sdata2 @10872 */ -SECTION_SDATA2 static u32 lit_10872 = 0x429C0000; +SECTION_SDATA2 static f32 lit_10872 = 78.0f; /* 804525D0-804525D4 0004+00 s=1 e=0 z=0 None .sdata2 @10873 */ -SECTION_SDATA2 static u32 lit_10873 = 0x3D75C28F; +SECTION_SDATA2 static f32 lit_10873 = 3.0f / 50.0f; /* 8006B924-8006BE0C 04E8+00 s=0 e=1 z=0 None .text dKyr_odour_move__Fv */ #pragma push @@ -1946,7 +1916,7 @@ asm void dKyr_mud_init() { /* ############################################################################################## */ /* 804525D4-804525D8 0004+00 s=1 e=0 z=0 None .sdata2 @11302 */ -SECTION_SDATA2 static u32 lit_11302 = 0x44408000; +SECTION_SDATA2 static f32 lit_11302 = 770.0f; /* 8006C85C-8006D01C 07C0+00 s=0 e=1 z=0 None .text dKyr_mud_move__Fv */ #pragma push @@ -1966,10 +1936,10 @@ static f32 rot_11307; static u8 data_80450F3C[4]; /* 804525D8-804525DC 0004+00 s=1 e=0 z=0 None .sdata2 @11508 */ -SECTION_SDATA2 static u32 lit_11508 = 0x3FA66666; +SECTION_SDATA2 static f32 lit_11508 = 13.0f / 10.0f; /* 804525DC-804525E0 0004+00 s=1 e=0 z=0 None .sdata2 @11509 */ -SECTION_SDATA2 static u32 lit_11509 = 0x41400000; +SECTION_SDATA2 static f32 lit_11509 = 12.0f; /* 8006D01C-8006D914 08F8+00 s=0 e=1 z=0 None .text dKyr_mud_draw__FPA4_fPPUc */ #pragma push @@ -2009,22 +1979,22 @@ static u8 rot_11586[4]; static u8 data_80450F44[4]; /* 804525E0-804525E4 0004+00 s=1 e=0 z=0 None .sdata2 @11882 */ -SECTION_SDATA2 static u32 lit_11882 = 0xC59C4000; +SECTION_SDATA2 static f32 lit_11882 = -5000.0f; /* 804525E4-804525E8 0004+00 s=2 e=0 z=0 None .sdata2 @11883 */ -SECTION_SDATA2 static u32 lit_11883 = 0x460CA000; +SECTION_SDATA2 static f32 lit_11883 = 9000.0f; /* 804525E8-804525EC 0004+00 s=2 e=0 z=0 None .sdata2 @11884 */ -SECTION_SDATA2 static u32 lit_11884 = 0x442C0000; +SECTION_SDATA2 static f32 lit_11884 = 688.0f; /* 804525EC-804525F0 0004+00 s=2 e=0 z=0 None .sdata2 @11885 */ -SECTION_SDATA2 static u32 lit_11885 = 0x44068000; +SECTION_SDATA2 static f32 lit_11885 = 538.0f; /* 804525F0-804525F4 0004+00 s=1 e=0 z=0 None .sdata2 @11886 */ -SECTION_SDATA2 static u32 lit_11886 = 0x431F0000; +SECTION_SDATA2 static f32 lit_11886 = 159.0f; /* 804525F4-804525F8 0004+00 s=1 e=0 z=0 None .sdata2 @11887 */ -SECTION_SDATA2 static u32 lit_11887 = 0x43070000; +SECTION_SDATA2 static f32 lit_11887 = 135.0f; /* 8006DA7C-8006E448 09CC+00 s=1 e=0 z=0 None .text dKyr_evil_draw2__FPA4_fPPUc */ #pragma push @@ -2038,7 +2008,7 @@ asm static void dKyr_evil_draw2(f32 (*param_0)[4], u8** param_1) { /* ############################################################################################## */ /* 804525F8-804525FC 0004+00 s=1 e=0 z=0 None .sdata2 @11953 */ -SECTION_SDATA2 static u32 lit_11953 = 0x4B189680; +SECTION_SDATA2 static f32 lit_11953 = 10000000.0f; /* 8006E448-8006E6B0 0268+00 s=1 e=0 z=0 None .text dKyr_near_bosslight_check__F4cXyz */ #pragma push @@ -2058,31 +2028,31 @@ static u8 rot_11958[4]; static u8 data_80450F4C[4]; /* 804525FC-80452600 0004+00 s=1 e=0 z=0 None .sdata2 @12252 */ -SECTION_SDATA2 static u32 lit_12252 = 0x428A0000; +SECTION_SDATA2 static f32 lit_12252 = 69.0f; /* 80452600-80452604 0004+00 s=1 e=0 z=0 None .sdata2 @12253 */ -SECTION_SDATA2 static u32 lit_12253 = 0x43090000; +SECTION_SDATA2 static f32 lit_12253 = 137.0f; /* 80452604-80452608 0004+00 s=1 e=0 z=0 None .sdata2 @12254 */ -SECTION_SDATA2 static u32 lit_12254 = 0x443B8000; +SECTION_SDATA2 static f32 lit_12254 = 750.0f; /* 80452608-8045260C 0004+00 s=1 e=0 z=0 None .sdata2 @12255 */ -SECTION_SDATA2 static u32 lit_12255 = 0x3FE66666; +SECTION_SDATA2 static f32 lit_12255 = 9.0f / 5.0f; /* 8045260C-80452610 0004+00 s=1 e=0 z=0 None .sdata2 @12256 */ -SECTION_SDATA2 static u32 lit_12256 = 0x43250000; +SECTION_SDATA2 static f32 lit_12256 = 165.0f; /* 80452610-80452614 0004+00 s=1 e=0 z=0 None .sdata2 @12257 */ -SECTION_SDATA2 static u32 lit_12257 = 0x431B0000; +SECTION_SDATA2 static f32 lit_12257 = 155.0f; /* 80452614-80452618 0004+00 s=1 e=0 z=0 None .sdata2 @12258 */ -SECTION_SDATA2 static u32 lit_12258 = 0xC53B8000; +SECTION_SDATA2 static f32 lit_12258 = -3000.0f; /* 80452618-8045261C 0004+00 s=1 e=0 z=0 None .sdata2 @12259 */ -SECTION_SDATA2 static u32 lit_12259 = 0x42FE0000; +SECTION_SDATA2 static f32 lit_12259 = 127.0f; /* 8045261C-80452620 0004+00 s=1 e=0 z=0 None .sdata2 @12260 */ -SECTION_SDATA2 static u32 lit_12260 = 0x42E60000; +SECTION_SDATA2 static f32 lit_12260 = 115.0f; /* 8006E6B0-8006F160 0AB0+00 s=0 e=1 z=0 None .text dKyr_evil_draw__FPA4_fPPUc */ #pragma push diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp index d8084e9266e..86f4cd725a5 100644 --- a/src/d/kankyo/d_kankyo_wether.cpp +++ b/src/d/kankyo/d_kankyo_wether.cpp @@ -27,8 +27,6 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; -struct csXyz {}; - struct Vec {}; struct cXyz { @@ -40,10 +38,12 @@ struct cXyz { /* 8026706C */ bool operator!=(Vec const&) const; }; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -253,9 +253,6 @@ void dKyw_custom_windpower(f32); void dKyw_evt_wind_set(s16, s16); void dKyw_evt_wind_set_go(); void dKyw_rain_set(int); -extern "C" extern char const* const d_kankyo_d_kankyo_wether__stringBase0; -extern "C" extern void* __vt__19dKankyo_star_Packet[5]; -extern "C" extern void* __vt__19dKankyo_snow_Packet[5]; extern "C" static void dKyw_setDrawPacketList__FP9J3DPacketi(); extern "C" static void dKyw_setDrawPacketListIndScreen__FP9J3DPacketi(); @@ -419,17 +416,6 @@ void cM_atan2s(f32, f32); void cLib_addCalc(f32*, f32, f32, f32, f32); void* operator new(u32, int); void operator delete(void*); -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_mEnvSeMgr[780]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 data_80450EE0[8]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void __dt__4cXyzFv(); extern "C" void __ct__4cXyzFv(); @@ -1105,7 +1091,7 @@ SECTION_SDATA2 static u8 lit_4378[4] = { }; /* 804520E4-804520E8 0004+00 s=11 e=0 z=0 None .sdata2 @4379 */ -SECTION_SDATA2 static u32 lit_4379 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4379 = 1.0f; /* 800574E0-800579EC 050C+00 s=0 e=1 z=0 None .text dKyw_wether_init__Fv */ #pragma push @@ -1389,10 +1375,10 @@ asm void dKyw_wether_move() { /* ############################################################################################## */ /* 804520E8-804520EC 0004+00 s=1 e=0 z=0 None .sdata2 @4610 */ -SECTION_SDATA2 static u32 lit_4610 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4610 = 255.0f; /* 804520EC-804520F0 0004+00 s=1 e=0 z=0 None .sdata2 @4611 */ -SECTION_SDATA2 static u32 lit_4611 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_4611 = 1000000000.0f; /* 80058318-80058894 057C+00 s=1 e=0 z=0 None .text wether_move_sun__Fv */ #pragma push @@ -1406,15 +1392,13 @@ asm static void wether_move_sun() { /* ############################################################################################## */ /* 804520F0-804520F4 0004+00 s=2 e=0 z=0 None .sdata2 @4668 */ -SECTION_SDATA2 static u32 lit_4668 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4668 = -1.0f; /* 804520F4-804520F8 0004+00 s=1 e=0 z=0 None .sdata2 @4669 */ -SECTION_SDATA2 static u32 lit_4669 = 0x42FA0000; +SECTION_SDATA2 static f32 lit_4669 = 125.0f; /* 804520F8-80452100 0008+00 s=2 e=0 z=0 None .sdata2 @4671 */ -SECTION_SDATA2 static u8 lit_4671[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4671 = 4503601774854144.0 /* cast s32 to float */; /* 80058894-80058B00 026C+00 s=1 e=0 z=0 None .text wether_move_rain__Fv */ #pragma push @@ -1438,40 +1422,40 @@ asm static void wether_move_snow() { /* ############################################################################################## */ /* 80452100-80452104 0004+00 s=1 e=0 z=0 None .sdata2 @4761 */ -SECTION_SDATA2 static u32 lit_4761 = 0x43A50000; +SECTION_SDATA2 static f32 lit_4761 = 330.0f; /* 80452104-80452108 0004+00 s=1 e=0 z=0 None .sdata2 @4762 */ -SECTION_SDATA2 static u32 lit_4762 = 0x42340000; +SECTION_SDATA2 static f32 lit_4762 = 45.0f; /* 80452108-8045210C 0004+00 s=1 e=0 z=0 None .sdata2 @4763 */ -SECTION_SDATA2 static u32 lit_4763 = 0x438E8000; +SECTION_SDATA2 static f32 lit_4763 = 285.0f; /* 8045210C-80452110 0004+00 s=1 e=0 z=0 None .sdata2 @4764 */ -SECTION_SDATA2 static u32 lit_4764 = 0x3CB60B61; +SECTION_SDATA2 static f32 lit_4764 = 1.0f / 45.0f; /* 80452110-80452114 0004+00 s=2 e=0 z=0 None .sdata2 @4765 */ -SECTION_SDATA2 static u32 lit_4765 = 0x42960000; +SECTION_SDATA2 static f32 lit_4765 = 75.0f; /* 80452114-80452118 0004+00 s=1 e=0 z=0 None .sdata2 @4766 */ -SECTION_SDATA2 static u32 lit_4766 = 0x3D088889; +SECTION_SDATA2 static f32 lit_4766 = 1.0f / 30.0f; /* 80452118-8045211C 0004+00 s=2 e=0 z=0 None .sdata2 @4767 */ -SECTION_SDATA2 static u32 lit_4767 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4767 = 0.5f; /* 8045211C-80452120 0004+00 s=2 e=0 z=0 None .sdata2 @4768 */ -SECTION_SDATA2 static u32 lit_4768 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4768 = 1.0f / 10.0f; /* 80452120-80452124 0004+00 s=3 e=0 z=0 None .sdata2 @4769 */ -SECTION_SDATA2 static u32 lit_4769 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_4769 = 1.0f / 100.0f; /* 80452124-80452128 0004+00 s=2 e=0 z=0 None .sdata2 @4770 */ -SECTION_SDATA2 static u32 lit_4770 = 0x358637BD; +SECTION_SDATA2 static f32 lit_4770 = 9.999999974752427e-07f; /* 80452128-8045212C 0004+00 s=1 e=0 z=0 None .sdata2 @4771 */ -SECTION_SDATA2 static u32 lit_4771 = 0x44960000; +SECTION_SDATA2 static f32 lit_4771 = 1200.0f; /* 8045212C-80452130 0004+00 s=1 e=0 z=0 None .sdata2 @4772 */ -SECTION_SDATA2 static u32 lit_4772 = 0x43FA0000; +SECTION_SDATA2 static f32 lit_4772 = 500.0f; /* 80058B8C-80058F18 038C+00 s=1 e=0 z=0 None .text wether_move_star__Fv */ #pragma push @@ -1521,43 +1505,43 @@ static u8 lit_4965[12]; static u8 r09o[12]; /* 80452130-80452134 0004+00 s=1 e=0 z=0 None .sdata2 @5181 */ -SECTION_SDATA2 static u32 lit_5181 = 0xC82FC800; +SECTION_SDATA2 static f32 lit_5181 = -180000.0f; /* 80452134-80452138 0004+00 s=1 e=0 z=0 None .sdata2 @5182 */ -SECTION_SDATA2 static u32 lit_5182 = 0x443B8000; +SECTION_SDATA2 static f32 lit_5182 = 750.0f; /* 80452138-8045213C 0004+00 s=1 e=0 z=0 None .sdata2 @5183 */ -SECTION_SDATA2 static u32 lit_5183 = 0xC8435000; +SECTION_SDATA2 static f32 lit_5183 = -200000.0f; /* 8045213C-80452140 0004+00 s=1 e=0 z=0 None .sdata2 @5184 */ -SECTION_SDATA2 static u32 lit_5184 = 0x3B449BA6; +SECTION_SDATA2 static f32 lit_5184 = 0.003000000026077032f; /* 80452140-80452144 0004+00 s=1 e=0 z=0 None .sdata2 @5185 */ -SECTION_SDATA2 static u32 lit_5185 = 0x33D6BF95; +SECTION_SDATA2 static f32 lit_5185 = 1.0000000116860974e-07f; /* 80452144-80452148 0004+00 s=1 e=0 z=0 None .sdata2 @5186 */ -SECTION_SDATA2 static u32 lit_5186 = 0x3DA3D70A; +SECTION_SDATA2 static f32 lit_5186 = 2.0f / 25.0f; /* 80452148-8045214C 0004+00 s=1 e=0 z=0 None .sdata2 @5187 */ -SECTION_SDATA2 static u32 lit_5187 = 0x3B03126F; +SECTION_SDATA2 static f32 lit_5187 = 0.0020000000949949026f; /* 8045214C-80452150 0004+00 s=1 e=0 z=0 None .sdata2 @5188 */ -SECTION_SDATA2 static u32 lit_5188 = 0x322BCC77; +SECTION_SDATA2 static f32 lit_5188 = 9.99999993922529e-09f; /* 80452150-80452154 0004+00 s=1 e=0 z=0 None .sdata2 @5189 */ -SECTION_SDATA2 static u32 lit_5189 = 0x40C00000; +SECTION_SDATA2 static f32 lit_5189 = 6.0f; /* 80452154-80452158 0004+00 s=1 e=0 z=0 None .sdata2 @5190 */ -SECTION_SDATA2 static u32 lit_5190 = 0x42600000; +SECTION_SDATA2 static f32 lit_5190 = 56.0f; /* 80452158-8045215C 0004+00 s=2 e=0 z=0 None .sdata2 @5191 */ -SECTION_SDATA2 static u32 lit_5191 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_5191 = 3.0f / 10.0f; /* 8045215C-80452160 0004+00 s=1 e=0 z=0 None .sdata2 @5192 */ -SECTION_SDATA2 static u32 lit_5192 = 0x46BFFE00; +SECTION_SDATA2 static f32 lit_5192 = 24575.0f; /* 80452160-80452164 0004+00 s=1 e=0 z=0 None .sdata2 @5193 */ -SECTION_SDATA2 static u32 lit_5193 = 0x3AB78034; +SECTION_SDATA2 static f32 lit_5193 = 0.00139999995008111f; /* 80059728-80059E38 0710+00 s=1 e=0 z=0 None .text wether_move_vrkumo__Fv */ #pragma push @@ -1631,13 +1615,13 @@ asm void dKyw_wether_draw2() { /* ############################################################################################## */ /* 80452164-80452168 0004+00 s=1 e=0 z=0 None .sdata2 @5361 */ -SECTION_SDATA2 static u32 lit_5361 = 0x42F00000; +SECTION_SDATA2 static f32 lit_5361 = 120.0f; /* 80452168-8045216C 0004+00 s=3 e=0 z=0 None .sdata2 @5362 */ -SECTION_SDATA2 static u32 lit_5362 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_5362 = 1.0f / 20.0f; /* 8045216C-80452170 0004+00 s=1 e=0 z=0 None .sdata2 @5363 */ -SECTION_SDATA2 static u32 lit_5363 = 0x3B23D70A; +SECTION_SDATA2 static f32 lit_5363 = 0.0024999999441206455f; /* 80452170-80452178 0004+04 s=1 e=0 z=0 None .sdata2 @5364 */ SECTION_SDATA2 static f32 lit_5364[1 + 1 /* padding */] = { @@ -1668,14 +1652,10 @@ asm static void dKyw_wind_init() { /* ############################################################################################## */ /* 80452178-80452180 0008+00 s=3 e=0 z=0 None .sdata2 @5524 */ -SECTION_SDATA2 static u8 lit_5524[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5524 = 0.5; /* 80452180-80452188 0008+00 s=3 e=0 z=0 None .sdata2 @5525 */ -SECTION_SDATA2 static u8 lit_5525[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5525 = 3.0; /* 80452188-80452190 0008+00 s=3 e=0 z=0 None .sdata2 @5526 */ SECTION_SDATA2 static u8 lit_5526[8] = { @@ -1683,19 +1663,19 @@ SECTION_SDATA2 static u8 lit_5526[8] = { }; /* 80452190-80452194 0004+00 s=1 e=0 z=0 None .sdata2 @5527 */ -SECTION_SDATA2 static u32 lit_5527 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_5527 = 3.0f / 5.0f; /* 80452194-80452198 0004+00 s=1 e=0 z=0 None .sdata2 @5528 */ -SECTION_SDATA2 static u32 lit_5528 = 0x3F666666; +SECTION_SDATA2 static f32 lit_5528 = 9.0f / 10.0f; /* 80452198-8045219C 0004+00 s=1 e=0 z=0 None .sdata2 @5529 */ -SECTION_SDATA2 static u32 lit_5529 = 0x40000000; +SECTION_SDATA2 static f32 lit_5529 = 2.0f; /* 8045219C-804521A0 0004+00 s=2 e=0 z=0 None .sdata2 @5530 */ -SECTION_SDATA2 static u32 lit_5530 = 0x3A83126F; +SECTION_SDATA2 static f32 lit_5530 = 0.0010000000474974513f; /* 804521A0-804521A4 0004+00 s=1 e=0 z=0 None .sdata2 @5531 */ -SECTION_SDATA2 static u32 lit_5531 = 0x3BA3D70A; +SECTION_SDATA2 static f32 lit_5531 = 0.004999999888241291f; /* 8005A5C0-8005AAE0 0520+00 s=0 e=2 z=0 None .text dKyw_wind_set__Fv */ #pragma push @@ -1751,7 +1731,7 @@ asm void dKyw_plight_collision_set(cXyz* param_0, s16 param_1, s16 param_2, f32 /* ############################################################################################## */ /* 804521A4-804521A8 0004+00 s=1 e=0 z=0 None .sdata2 @5630 */ -SECTION_SDATA2 static u32 lit_5630 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_5630 = 1.0f / 5.0f; /* 8005AC30-8005AD44 0114+00 s=1 e=0 z=0 None .text squal_proc__Fv */ #pragma push diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp index d84461050a8..904a51a8e2f 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); @@ -197,11 +197,6 @@ struct dDlst_base_c { // Forward References: // -extern "C" extern char const* const d_map_d_map__stringBase0; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16]; -extern "C" extern void* __vt__15dRenderingMap_c[23]; - extern "C" void getIconSize__15renderingAmap_cCFUc(); extern "C" void draw__15renderingAmap_cFv(); extern "C" void getDispType__15renderingAmap_cCFv(); @@ -284,23 +279,6 @@ void* operator new(u32, int); void* operator new[](u32, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__18dRenderingFDAmap_c[26]; -extern "C" extern void* __vt__11dDrawPath_c[16]; -extern "C" extern void* __vt__19renderingPlusDoor_c[41]; -extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47]; -extern "C" extern void* __vt__16renderingDAmap_c[38]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -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" void dComIfGp_isLightDropMapVisible__Fv(); extern "C" void isTbox__12dSv_memBit_cCFi(); @@ -408,10 +386,10 @@ asm void renderingAmap_c::getIconSize(u8 param_0) const { static u8 m_res__22dMap_HIO_prm_res_dst_s[4 + 4 /* padding */]; /* 80451CA0-80451CA4 0004+00 s=4 e=0 z=0 None .sdata2 @3745 */ -SECTION_SDATA2 static u32 lit_3745 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3745 = 0.5f; /* 80451CA4-80451CA8 0004+00 s=1 e=0 z=0 None .sdata2 @3746 */ -SECTION_SDATA2 static u32 lit_3746 = 0x47800000; +SECTION_SDATA2 static f32 lit_3746 = 65536.0f; /* 80451CA8-80451CB0 0004+04 s=1 e=0 z=0 None .sdata2 @3747 */ SECTION_SDATA2 static f32 lit_3747[1 + 1 /* padding */] = { @@ -421,14 +399,10 @@ SECTION_SDATA2 static f32 lit_3747[1 + 1 /* padding */] = { }; /* 80451CB0-80451CB8 0008+00 s=5 e=0 z=0 None .sdata2 @3749 */ -SECTION_SDATA2 static u8 lit_3749[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3749 = 4503599627370496.0 /* cast u32 to float */; /* 80451CB8-80451CC0 0008+00 s=4 e=0 z=0 None .sdata2 @3751 */ -SECTION_SDATA2 static u8 lit_3751[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3751 = 4503601774854144.0 /* cast s32 to float */; /* 800284D0-800288C4 03F4+00 s=2 e=0 z=0 None .text draw__15renderingAmap_cFv */ #pragma push @@ -883,7 +857,7 @@ bool dMap_c::isSpecialOutline() { /* ############################################################################################## */ /* 80451CE0-80451CE4 0004+00 s=4 e=0 z=0 None .sdata2 @4284 */ -SECTION_SDATA2 static u32 lit_4284 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4284 = 1.0f; /* 8002974C-800297A8 005C+00 s=1 e=0 z=0 None .text copyPalette__6dMap_cFv */ #pragma push @@ -1102,7 +1076,7 @@ asm void dMap_c::calcMapCenterXZ(int param_0, f32* param_1, f32* param_2) { /* ############################################################################################## */ /* 80451CE8-80451CEC 0004+00 s=1 e=0 z=0 None .sdata2 @4503 */ -SECTION_SDATA2 static u32 lit_4503 = 0x4628C000; +SECTION_SDATA2 static f32 lit_4503 = 10800.0f; /* 80029E1C-80029F84 0168+00 s=1 e=0 z=0 None .text calcMapCmPerTexel__6dMap_cFiPf */ #pragma push @@ -1186,19 +1160,19 @@ asm void dMap_c::isDrawRoomIcon(int param_0, int param_1) const { /* ############################################################################################## */ /* 80451CEC-80451CF0 0004+00 s=1 e=0 z=0 None .sdata2 @4688 */ -SECTION_SDATA2 static u32 lit_4688 = 0xC567E000; +SECTION_SDATA2 static f32 lit_4688 = -3710.0f; /* 80451CF0-80451CF4 0004+00 s=1 e=0 z=0 None .sdata2 @4689 */ -SECTION_SDATA2 static u32 lit_4689 = 0xC6AEFA00; +SECTION_SDATA2 static f32 lit_4689 = -22397.0f; /* 80451CF4-80451CF8 0004+00 s=1 e=0 z=0 None .sdata2 @4690 */ -SECTION_SDATA2 static u32 lit_4690 = 0x42700000; +SECTION_SDATA2 static f32 lit_4690 = 60.0f; /* 80451CF8-80451CFC 0004+00 s=1 e=0 z=0 None .sdata2 @4691 */ -SECTION_SDATA2 static u32 lit_4691 = 0x40A00000; +SECTION_SDATA2 static f32 lit_4691 = 5.0f; /* 80451CFC-80451D00 0004+00 s=1 e=0 z=0 None .sdata2 @4692 */ -SECTION_SDATA2 static u32 lit_4692 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4692 = 20.0f; /* 8002A32C-8002AB54 0828+00 s=1 e=1 z=0 None .text _move__6dMap_cFffif */ #pragma push diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index afbe565f866..4b8c7550b2b 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -78,11 +78,6 @@ struct _GXTexObj {}; // Forward References: // -extern "C" extern char const* const d_map_d_map_path__stringBase0; -extern "C" extern void* __vt__18dRenderingFDAmap_c[26]; -extern "C" extern void* __vt__11dDrawPath_c[16]; -extern "C" extern u8 m_texObjAgg__8dMpath_n[28]; - extern "C" void create__Q28dMpath_n18dTexObjAggregate_cFv(); extern "C" void remove__Q28dMpath_n18dTexObjAggregate_cFv(); extern "C" void rendering__11dDrawPath_cFPCQ211dDrawPath_c10line_class(); @@ -115,9 +110,6 @@ extern "C" extern u8 m_texObjAgg__8dMpath_n[28]; void mDoLib_setResTimgObj(ResTIMG const*, _GXTexObj*, u32, _GXTlutObj*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_clearColor[4]; extern "C" void mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj(); extern "C" void draw__12dDlst_base_cFv(); @@ -351,18 +343,16 @@ asm void dRenderingFDAmap_c::drawBack() const { /* ############################################################################################## */ /* 80451E0C-80451E10 0004+00 s=1 e=0 z=0 None .sdata2 @3846 */ -SECTION_SDATA2 static u32 lit_3846 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3846 = 1.0f; /* 80451E10-80451E14 0004+00 s=1 e=0 z=0 None .sdata2 @3847 */ -SECTION_SDATA2 static u32 lit_3847 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3847 = 0.5f; /* 80451E14-80451E18 0004+00 s=1 e=0 z=0 None .sdata2 @3848 */ -SECTION_SDATA2 static u32 lit_3848 = 0x461C4000; +SECTION_SDATA2 static f32 lit_3848 = 10000.0f; /* 80451E18-80451E20 0008+00 s=1 e=0 z=0 None .sdata2 @3850 */ -SECTION_SDATA2 static u8 lit_3850[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3850 = 4503599627370496.0 /* cast u32 to float */; /* 8003D188-8003D320 0198+00 s=1 e=8 z=0 None .text preRenderingMap__18dRenderingFDAmap_cFv */ #pragma push diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index cb07a17a305..f4f2c3169bc 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -174,22 +174,6 @@ struct dDlst_list_c { // Forward References: // -extern "C" extern void* __vt__19renderingPlusDoor_c[41]; -extern "C" extern void* __vt__28renderingPlusDoorAndCursor_c[47]; -extern "C" extern void* __vt__16renderingDAmap_c[38]; -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 mLayerList__8dMpath_c[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 mAllCenterX__8dMpath_c; -extern "C" extern f32 mAllCenterZ__8dMpath_c; -extern "C" extern f32 mAllSizeX__8dMpath_c; -extern "C" extern f32 mAllSizeZ__8dMpath_c; - extern "C" void chkGetCompass__10dMapInfo_nFv(); extern "C" void chkGetMap__10dMapInfo_nFv(); extern "C" void isVisitedRoom__10dMapInfo_nFi(); @@ -285,14 +269,6 @@ void dStage_GetKeepDoorInfo(); void dStage_GetRoomKeepDoorInfo(); void dComIfGs_isVisitedRoom(int); void* operator new(u32); -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 m_texObjAgg__8dMpath_n[28]; -extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */]; -extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_YrotS__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); @@ -493,7 +469,7 @@ asm void dMapInfo_n::getMapRestartAngleY() { /* ############################################################################################## */ /* 80451E2C-80451E30 0004+00 s=4 e=0 z=0 None .sdata2 @3887 */ -SECTION_SDATA2 static u32 lit_3887 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3887 = 0.5f; /* 8003F19C-8003F1F4 0058+00 s=0 e=1 z=0 None .text getRoomCenter__10dMapInfo_nFiPfPf */ #pragma push @@ -518,9 +494,7 @@ asm void dMapInfo_n::getRoomMinMaxXZ(int param_0, f32* param_1, f32* param_2, f3 /* ############################################################################################## */ /* 80451E30-80451E38 0008+00 s=1 e=0 z=0 None .sdata2 @3957 */ -SECTION_SDATA2 static u8 lit_3957[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3957 = 4503601774854144.0 /* cast s32 to float */; /* 8003F24C-8003F40C 01C0+00 s=2 e=0 z=0 None .text getFloorParameter__10dMapInfo_nFfPScPfPfPfPf */ @@ -767,9 +741,7 @@ asm void renderingDAmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param /* ############################################################################################## */ /* 80451E40-80451E48 0008+00 s=2 e=0 z=0 None .sdata2 @4211 */ -SECTION_SDATA2 static u8 lit_4211[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4211 = 4503599627370496.0 /* cast u32 to float */; /* 8003FD08-8003FD9C 0094+00 s=0 e=2 z=0 None .text entry__16renderingDAmap_cFfffiSc */ #pragma push @@ -849,13 +821,13 @@ asm void renderingDAmap_c::isDrawRoom(int param_0, int param_1) const { /* ############################################################################################## */ /* 80451E4C-80451E50 0004+00 s=1 e=0 z=0 None .sdata2 @4264 */ -SECTION_SDATA2 static u32 lit_4264 = 0xC59C4000; +SECTION_SDATA2 static f32 lit_4264 = -5000.0f; /* 80451E50-80451E54 0004+00 s=1 e=0 z=0 None .sdata2 @4265 */ -SECTION_SDATA2 static u32 lit_4265 = 0x459C4000; +SECTION_SDATA2 static f32 lit_4265 = 5000.0f; /* 80451E54-80451E58 0004+00 s=1 e=0 z=0 None .sdata2 @4266 */ -SECTION_SDATA2 static u32 lit_4266 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4266 = -1.0f; /* 8003FF14-8003FFC4 00B0+00 s=3 e=3 z=0 None .text preDrawPath__16renderingDAmap_cFv */ #pragma push @@ -1048,7 +1020,7 @@ SECTION_RODATA static u8 const l_100x100BoxVertexList[48] = { }; /* 80451E70-80451E74 0004+00 s=1 e=0 z=0 None .sdata2 @4484 */ -SECTION_SDATA2 static u32 lit_4484 = 0x40C00000; +SECTION_SDATA2 static f32 lit_4484 = 6.0f; /* 80040838-800409B4 017C+00 s=1 e=0 z=0 None .text * drawNormalDoorS__19renderingPlusDoor_cFPC21stage_tgsc_data_classiib */ @@ -1194,7 +1166,7 @@ SECTION_SDATA2 static u8 tboxNotStayColor_4542[4] = { }; /* 80451EA8-80451EAC 0004+00 s=2 e=0 z=0 None .sdata2 @4600 */ -SECTION_SDATA2 static u32 lit_4600 = 0x40000000; +SECTION_SDATA2 static f32 lit_4600 = 2.0f; /* 80040B00-80040E84 0384+00 s=1 e=0 z=0 None .text * drawTreasure__28renderingPlusDoorAndCursor_cFv */ diff --git a/src/d/map/d_map_path_fmap.cpp b/src/d/map/d_map_path_fmap.cpp index 34ca12680c6..9d74b075a77 100644 --- a/src/d/map/d_map_path_fmap.cpp +++ b/src/d/map/d_map_path_fmap.cpp @@ -95,8 +95,6 @@ struct dMenuFmapIconDisp_c { // Forward References: // -extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3]; - extern "C" void addTypeGroupData__26fmpTresTypeGroupDataList_cFUcPCQ27dTres_c6data_s(); extern "C" void isArrival__22dMenu_Fmap_room_data_cFv(); extern "C" void buildTresTypeGroup__22dMenu_Fmap_room_data_cFiii(); @@ -134,9 +132,6 @@ void dComIfGs_isStageSwitch(int, int); void dComIfGp_isLightDropMapVisible(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_max; extern "C" void dComIfGs_isStageTbox__Fii(); extern "C" void dComIfGs_isStageSwitch__Fii(); @@ -231,16 +226,10 @@ asm void dMenu_Fmap_stage_data_c::isArrival() { /* ############################################################################################## */ /* 80451E20-80451E28 0004+04 s=5 e=0 z=0 None .sdata2 @3894 */ -SECTION_SDATA2 static u8 lit_3894[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3894[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 8003D9D8-8003DB48 0170+00 s=1 e=0 z=0 None .text diff --git a/src/d/menu/d_menu_calibration.cpp b/src/d/menu/d_menu_calibration.cpp index 700184889b5..95d6ebff331 100644 --- a/src/d/menu/d_menu_calibration.cpp +++ b/src/d/menu/d_menu_calibration.cpp @@ -75,8 +75,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_calibration__stringBase0; - extern "C" void __dt__19dMenu_Calibration_cFv(); extern "C" void _move__19dMenu_Calibration_cFv(); extern "C" void _draw__19dMenu_Calibration_cFv(); @@ -108,11 +106,6 @@ extern "C" extern char const* const d_menu_d_menu_calibration__stringBase0; void dMeter2Info_set2DVibration(); void operator delete(void*); -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void setPos__16dSelect_cursor_cFffP7J2DPaneb(); extern "C" void setAlphaRate__16dSelect_cursor_cFf(); @@ -308,12 +301,10 @@ asm void dMenu_Calibration_c::step1_wait_init() { /* ############################################################################################## */ /* 80453F14-80453F18 0004+00 s=6 e=0 z=0 None .sdata2 @3885 */ -SECTION_SDATA2 static u32 lit_3885 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3885 = 1.0f; /* 80453F18-80453F20 0008+00 s=3 e=0 z=0 None .sdata2 @3887 */ -SECTION_SDATA2 static u8 lit_3887[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3887 = 4503601774854144.0 /* cast s32 to float */; /* 801AEF60-801AF084 0124+00 s=1 e=0 z=0 None .text step1_wait_move__19dMenu_Calibration_cFv */ diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp index 84b56478be6..3b70e950e7b 100644 --- a/src/d/menu/d_menu_collect.cpp +++ b/src/d/menu/d_menu_collect.cpp @@ -106,13 +106,7 @@ struct dMenu_save_c { /* 801F69B8 */ void _draw(); }; -struct STControl { - /* 8003219C */ void checkTrigger(); - /* 8003242C */ void checkLeftTrigger(); - /* 800324A8 */ void checkRightTrigger(); - /* 80032524 */ void checkUpTrigger(); - /* 800325A0 */ void checkDownTrigger(); -}; +struct CSTControl {}; struct JKRHeap { /* 802CE5CC */ void freeAll(); @@ -123,7 +117,13 @@ struct JKRExpHeap { /* 802CEE2C */ void create(u32, JKRHeap*, bool); }; -struct CSTControl {}; +struct STControl { + /* 8003219C */ void checkTrigger(); + /* 8003242C */ void checkLeftTrigger(); + /* 800324A8 */ void checkRightTrigger(); + /* 80032524 */ void checkUpTrigger(); + /* 800325A0 */ void checkDownTrigger(); +}; struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); @@ -403,9 +403,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_collect__stringBase0; -extern "C" extern u32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */]; - extern "C" void __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl(); extern "C" void __dt__17dMenu_Collect2D_cFv(); extern "C" void _create__17dMenu_Collect2D_cFv(); @@ -541,21 +538,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__8J3DModel[9]; -extern "C" extern void* __vt__14J3DMaterialAnm[4]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_XrotM__FPA4_fs(); extern "C" void mDoMtx_YrotM__FPA4_fs(); @@ -1370,7 +1352,7 @@ SECTION_SDATA2 static u8 lit_4481[4] = { }; /* 80453F2C-80453F30 0004+00 s=15 e=0 z=0 None .sdata2 @4482 */ -SECTION_SDATA2 static u32 lit_4482 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4482 = 1.0f; /* 801AFD48-801AFE34 00EC+00 s=1 e=0 z=0 None .text * __ct__17dMenu_Collect2D_cFP10JKRExpHeapP9STControlP10CSTControl */ @@ -1459,10 +1441,10 @@ asm void dMenu_Collect2D_c::isInsectIconVisible() { /* ############################################################################################## */ /* 80453F30-80453F34 0004+00 s=2 e=0 z=0 None .sdata2 @5173 */ -SECTION_SDATA2 static u32 lit_5173 = 0x3F000000; +SECTION_SDATA2 static f32 lit_5173 = 0.5f; /* 80453F34-80453F38 0004+00 s=2 e=0 z=0 None .sdata2 @5174 */ -SECTION_SDATA2 static u32 lit_5174 = 0xC47A0000; +SECTION_SDATA2 static f32 lit_5174 = -1000.0f; /* 801B074C-801B1C3C 14F0+00 s=1 e=0 z=0 None .text screenSet__17dMenu_Collect2D_cFv */ #pragma push @@ -1486,9 +1468,7 @@ asm void dMenu_Collect2D_c::animationSet() { /* ############################################################################################## */ /* 80453F38-80453F40 0008+00 s=2 e=0 z=0 None .sdata2 @5199 */ -SECTION_SDATA2 static u8 lit_5199[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5199 = 4503601774854144.0 /* cast s32 to float */; /* 801B1CE0-801B1EDC 01FC+00 s=1 e=0 z=0 None .text * btkAnimeLoop0__17dMenu_Collect2D_cFP19J2DAnmTextureSRTKey */ @@ -1503,15 +1483,13 @@ asm void dMenu_Collect2D_c::btkAnimeLoop0(J2DAnmTextureSRTKey* param_0) { /* ############################################################################################## */ /* 80453F40-80453F44 0004+00 s=1 e=0 z=0 None .sdata2 @5268 */ -SECTION_SDATA2 static u32 lit_5268 = 0x43160000; +SECTION_SDATA2 static f32 lit_5268 = 150.0f; /* 80453F44-80453F48 0004+00 s=1 e=0 z=0 None .sdata2 @5269 */ -SECTION_SDATA2 static u32 lit_5269 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_5269 = 1.0f / 5.0f; /* 80453F48-80453F50 0008+00 s=1 e=0 z=0 None .sdata2 @5271 */ -SECTION_SDATA2 static u8 lit_5271[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5271 = 4503599627370496.0 /* cast u32 to float */; /* 801B1EDC-801B1FAC 00D0+00 s=1 e=0 z=0 None .text setBackAlpha__17dMenu_Collect2D_cFv */ #pragma push @@ -1537,7 +1515,7 @@ SECTION_SDATA2 static u32 lit_5403 = 0x03030403; SECTION_SDATA2 static u32 data_80453F5C = 0x04030404; /* 80453F60-80453F64 0004+00 s=6 e=0 z=0 None .sdata2 @5531 */ -SECTION_SDATA2 static u32 lit_5531 = 0xBF800000; +SECTION_SDATA2 static f32 lit_5531 = -1.0f; /* 801B1FAC-801B27EC 0840+00 s=1 e=0 z=0 None .text cursorMove__17dMenu_Collect2D_cFv */ #pragma push @@ -1551,25 +1529,25 @@ asm void dMenu_Collect2D_c::cursorMove() { /* ############################################################################################## */ /* 80453F64-80453F68 0004+00 s=1 e=0 z=0 None .sdata2 @5611 */ -SECTION_SDATA2 static u32 lit_5611 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_5611 = 11.0f / 10.0f; /* 80453F68-80453F6C 0004+00 s=1 e=0 z=0 None .sdata2 @5612 */ -SECTION_SDATA2 static u32 lit_5612 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_5612 = 17.0f / 20.0f; /* 80453F6C-80453F70 0004+00 s=1 e=0 z=0 None .sdata2 @5613 */ -SECTION_SDATA2 static u32 lit_5613 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_5613 = 1.0f / 20.0f; /* 80453F70-80453F74 0004+00 s=1 e=0 z=0 None .sdata2 @5614 */ -SECTION_SDATA2 static u32 lit_5614 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_5614 = 3.0f / 5.0f; /* 80453F74-80453F78 0004+00 s=1 e=0 z=0 None .sdata2 @5615 */ -SECTION_SDATA2 static u32 lit_5615 = 0x3CF5C28F; +SECTION_SDATA2 static f32 lit_5615 = 3.0f / 100.0f; /* 80453F78-80453F7C 0004+00 s=1 e=0 z=0 None .sdata2 @5616 */ -SECTION_SDATA2 static u32 lit_5616 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_5616 = 1.0f / 10.0f; /* 80453F7C-80453F80 0004+00 s=1 e=0 z=0 None .sdata2 @5617 */ -SECTION_SDATA2 static u32 lit_5617 = 0x3F333333; +SECTION_SDATA2 static f32 lit_5617 = 7.0f / 10.0f; /* 801B27EC-801B2A74 0288+00 s=2 e=0 z=0 None .text cursorPosSet__17dMenu_Collect2D_cFv */ #pragma push @@ -2239,43 +2217,43 @@ asm void dMenu_Collect3D_c::_delete() { /* ############################################################################################## */ /* 80453F80-80453F84 0004+00 s=1 e=0 z=0 None .sdata2 @7324 */ -SECTION_SDATA2 static u32 lit_7324 = 0x42700000; +SECTION_SDATA2 static f32 lit_7324 = 60.0f; /* 80453F84-80453F88 0004+00 s=1 e=0 z=0 None .sdata2 @7325 */ -SECTION_SDATA2 static u32 lit_7325 = 0x44110000; +SECTION_SDATA2 static f32 lit_7325 = 580.0f; /* 80453F88-80453F8C 0004+00 s=1 e=0 z=0 None .sdata2 @7326 */ -SECTION_SDATA2 static u32 lit_7326 = 0x42B40000; +SECTION_SDATA2 static f32 lit_7326 = 90.0f; /* 80453F8C-80453F90 0004+00 s=1 e=0 z=0 None .sdata2 @7327 */ -SECTION_SDATA2 static u32 lit_7327 = 0x44098000; +SECTION_SDATA2 static f32 lit_7327 = 550.0f; /* 80453F90-80453F94 0004+00 s=1 e=0 z=0 None .sdata2 @7328 */ -SECTION_SDATA2 static u32 lit_7328 = 0x43E10000; +SECTION_SDATA2 static f32 lit_7328 = 450.0f; /* 80453F94-80453F98 0004+00 s=1 e=0 z=0 None .sdata2 @7329 */ -SECTION_SDATA2 static u32 lit_7329 = 0xC0400000; +SECTION_SDATA2 static f32 lit_7329 = -3.0f; /* 80453F98-80453F9C 0004+00 s=1 e=0 z=0 None .sdata2 @7330 */ -SECTION_SDATA2 static u32 lit_7330 = 0xC0A00000; +SECTION_SDATA2 static f32 lit_7330 = -5.0f; /* 80453F9C-80453FA0 0004+00 s=1 e=0 z=0 None .sdata2 @7331 */ -SECTION_SDATA2 static u32 lit_7331 = 0x41800000; +SECTION_SDATA2 static f32 lit_7331 = 16.0f; /* 80453FA0-80453FA4 0004+00 s=1 e=0 z=0 None .sdata2 @7332 */ -SECTION_SDATA2 static u32 lit_7332 = 0x41000000; +SECTION_SDATA2 static f32 lit_7332 = 8.0f; /* 80453FA4-80453FA8 0004+00 s=2 e=0 z=0 None .sdata2 @7333 */ -SECTION_SDATA2 static u32 lit_7333 = 0x40000000; +SECTION_SDATA2 static f32 lit_7333 = 2.0f; /* 80453FA8-80453FAC 0004+00 s=1 e=0 z=0 None .sdata2 @7334 */ -SECTION_SDATA2 static u32 lit_7334 = 0xC0800000; +SECTION_SDATA2 static f32 lit_7334 = -4.0f; /* 80453FAC-80453FB0 0004+00 s=1 e=0 z=0 None .sdata2 @7335 */ -SECTION_SDATA2 static u32 lit_7335 = 0xC1200000; +SECTION_SDATA2 static f32 lit_7335 = -10.0f; /* 80453FB0-80453FB4 0004+00 s=1 e=0 z=0 None .sdata2 @7336 */ -SECTION_SDATA2 static u32 lit_7336 = 0x44160000; +SECTION_SDATA2 static f32 lit_7336 = 600.0f; /* 801B66C8-801B696C 02A4+00 s=2 e=0 z=0 None .text _move__17dMenu_Collect3D_cFUcUc */ #pragma push @@ -2309,16 +2287,16 @@ asm void dMenu_Collect3D_c::setJ3D(char const* param_0, char const* param_1, cha /* ############################################################################################## */ /* 80453FB4-80453FB8 0004+00 s=1 e=0 z=0 None .sdata2 @7505 */ -SECTION_SDATA2 static u32 lit_7505 = 0xBDCCCCCD; +SECTION_SDATA2 static f32 lit_7505 = -1.0f / 10.0f; /* 80453FB8-80453FBC 0004+00 s=1 e=0 z=0 None .sdata2 @7506 */ -SECTION_SDATA2 static u32 lit_7506 = 0xBF19999A; +SECTION_SDATA2 static f32 lit_7506 = -3.0f / 5.0f; /* 80453FBC-80453FC0 0004+00 s=1 e=0 z=0 None .sdata2 @7507 */ -SECTION_SDATA2 static u32 lit_7507 = 0xBECCCCCD; +SECTION_SDATA2 static f32 lit_7507 = -2.0f / 5.0f; /* 80453FC0-80453FC4 0004+00 s=1 e=0 z=0 None .sdata2 @7508 */ -SECTION_SDATA2 static u32 lit_7508 = 0xBE99999A; +SECTION_SDATA2 static f32 lit_7508 = -3.0f / 10.0f; /* 801B6D30-801B6E70 0140+00 s=2 e=0 z=0 None .text set_mtx__17dMenu_Collect3D_cFv */ #pragma push @@ -2411,19 +2389,19 @@ SECTION_SDATA u32 mViewOffsetY__17dMenu_Collect3D_c[1 + 1 /* padding */] = { }; /* 80453FC4-80453FC8 0004+00 s=3 e=0 z=0 None .sdata2 @7944 */ -SECTION_SDATA2 static u32 lit_7944 = 0x44180000; +SECTION_SDATA2 static f32 lit_7944 = 608.0f; /* 80453FC8-80453FCC 0004+00 s=3 e=0 z=0 None .sdata2 @7945 */ -SECTION_SDATA2 static u32 lit_7945 = 0x43E00000; +SECTION_SDATA2 static f32 lit_7945 = 448.0f; /* 80453FCC-80453FD0 0004+00 s=2 e=0 z=0 None .sdata2 @7946 */ -SECTION_SDATA2 static u32 lit_7946 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_7946 = -100.0f; /* 80453FD0-80453FD4 0004+00 s=1 e=0 z=0 None .sdata2 @7947 */ -SECTION_SDATA2 static u32 lit_7947 = 0x42340000; +SECTION_SDATA2 static f32 lit_7947 = 45.0f; /* 80453FD4-80453FD8 0004+00 s=2 e=0 z=0 None .sdata2 @7948 */ -SECTION_SDATA2 static u32 lit_7948 = 0x3FADB6DB; +SECTION_SDATA2 static f32 lit_7948 = 19.0f / 14.0f; /* 80453FD8-80453FE0 0004+04 s=1 e=0 z=0 None .sdata2 @7949 */ SECTION_SDATA2 static f32 lit_7949[1 + 1 /* padding */] = { @@ -2444,9 +2422,7 @@ asm void dMenu_Collect3D_c::setupItem3D(f32 (*param_0)[4]) { /* ############################################################################################## */ /* 80453FE0-80453FE8 0008+00 s=1 e=0 z=0 None .sdata2 @7963 */ -SECTION_SDATA2 static u8 lit_7963[8] = { - 0x3F, 0xD9, 0x21, 0xFB, 0x60, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_7963 = 0.39269909262657166; /* 801B7660-801B774C 00EC+00 s=1 e=0 z=0 None .text toItem3Dpos__17dMenu_Collect3D_cFfffP4cXyz */ diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp index b6d964b78b0..b84d20e52ce 100644 --- a/src/d/menu/d_menu_dmap.cpp +++ b/src/d/menu/d_menu_dmap.cpp @@ -133,6 +133,10 @@ struct dMenu_StageMapCtrl_c { struct J2DOrthoGraph {}; +struct JKRExpHeap { + /* 802CEE2C */ void create(u32, JKRHeap*, bool); +}; + struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 8003219C */ void checkTrigger(); @@ -142,10 +146,6 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; -struct JKRExpHeap { - /* 802CEE2C */ void create(u32, JKRHeap*, bool); -}; - struct dMenu_ItemExplain_c { /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); /* 801DB470 */ void move(); @@ -330,8 +330,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_dmap__stringBase0; - extern "C" void __ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl(); extern "C" void mapScreenInit__14dMenu_DmapBg_cFv(); extern "C" void mapScreenAnime__14dMenu_DmapBg_cFv(); @@ -440,23 +438,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16]; -extern "C" extern void* __vt__15dRenderingMap_c[23]; -extern "C" extern void* __vt__18dRenderingFDAmap_c[26]; -extern "C" extern void* __vt__11dDrawPath_c[16]; -extern "C" extern void* __vt__19renderingPlusDoor_c[41]; -extern "C" extern void* __vt__16renderingDAmap_c[38]; -extern "C" extern void* __vt__19dMenu_DmapMapCtrl_c[10 + 51 /* padding */]; -extern "C" extern void* __vt__15renderingDmap_c[43 + 1 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern f32 mAllSizeX__8dMpath_c; -extern "C" extern f32 mAllSizeZ__8dMpath_c; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memset(); SECTION_INIT void memcpy(); @@ -1246,7 +1227,7 @@ SECTION_SDATA2 static u8 lit_3962[4] = { }; /* 80453FEC-80453FF0 0004+00 s=26 e=0 z=0 None .sdata2 @3963 */ -SECTION_SDATA2 static u32 lit_3963 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3963 = 1.0f; /* 801B7F20-801B8110 01F0+00 s=1 e=0 z=0 None .text * __ct__14dMenu_DmapBg_cFP10JKRExpHeapP9STControl */ @@ -1261,7 +1242,7 @@ asm dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* param_0, STControl* param_1) { /* ############################################################################################## */ /* 80453FF0-80453FF4 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */ -SECTION_SDATA2 static u32 lit_4073 = 0xC1700000; +SECTION_SDATA2 static f32 lit_4073 = -15.0f; /* 801B8110-801B884C 073C+00 s=1 e=0 z=0 None .text mapScreenInit__14dMenu_DmapBg_cFv */ #pragma push @@ -1275,12 +1256,10 @@ asm void dMenu_DmapBg_c::mapScreenInit() { /* ############################################################################################## */ /* 80453FF4-80453FF8 0004+00 s=2 e=0 z=0 None .sdata2 @4106 */ -SECTION_SDATA2 static u32 lit_4106 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_4106 = 2.0f / 5.0f; /* 80453FF8-80454000 0008+00 s=8 e=0 z=0 None .sdata2 @4108 */ -SECTION_SDATA2 static u8 lit_4108[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */; /* 801B884C-801B88F4 00A8+00 s=1 e=0 z=0 None .text mapScreenAnime__14dMenu_DmapBg_cFv */ #pragma push @@ -1314,7 +1293,7 @@ asm void dMenu_DmapBg_c::iconScaleAnmInit(f32 param_0, f32 param_1, u8 param_2) /* ############################################################################################## */ /* 80454000-80454004 0004+00 s=1 e=0 z=0 None .sdata2 @4133 */ -SECTION_SDATA2 static u32 lit_4133 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4133 = 1.0f / 20.0f; /* 801B8954-801B8A0C 00B8+00 s=2 e=0 z=0 None .text iconScaleAnm__14dMenu_DmapBg_cFv */ #pragma push @@ -1328,10 +1307,10 @@ asm void dMenu_DmapBg_c::iconScaleAnm() { /* ############################################################################################## */ /* 80454004-80454008 0004+00 s=1 e=0 z=0 None .sdata2 @4191 */ -SECTION_SDATA2 static u32 lit_4191 = 0x43200000; +SECTION_SDATA2 static f32 lit_4191 = 160.0f; /* 80454008-8045400C 0004+00 s=1 e=0 z=0 None .sdata2 @4192 */ -SECTION_SDATA2 static u32 lit_4192 = 0x43A08000; +SECTION_SDATA2 static f32 lit_4192 = 321.0f; /* 801B8A0C-801B8DE4 03D8+00 s=1 e=0 z=0 None .text buttonIconScreenInit__14dMenu_DmapBg_cFv */ @@ -1375,7 +1354,7 @@ static u8 player_py[4]; static u8 myclass__12dMenu_Dmap_c[4 + 4 /* padding */]; /* 8045400C-80454010 0004+00 s=7 e=0 z=0 None .sdata2 @4249 */ -SECTION_SDATA2 static u32 lit_4249 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4249 = 0.5f; /* 801B8F94-801B90BC 0128+00 s=1 e=0 z=0 None .text setCButtonString__14dMenu_DmapBg_cFUl */ #pragma push @@ -1419,16 +1398,16 @@ asm void dMenu_DmapBg_c::deleteExplain() { /* ############################################################################################## */ /* 80454010-80454014 0004+00 s=1 e=0 z=0 None .sdata2 @4312 */ -SECTION_SDATA2 static u32 lit_4312 = 0x3F733333; +SECTION_SDATA2 static f32 lit_4312 = 19.0f / 20.0f; /* 80454014-80454018 0004+00 s=7 e=0 z=0 None .sdata2 @4313 */ -SECTION_SDATA2 static u32 lit_4313 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4313 = 9.0f / 10.0f; /* 80454018-8045401C 0004+00 s=1 e=0 z=0 None .sdata2 @4314 */ -SECTION_SDATA2 static u32 lit_4314 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4314 = 1.0f / 10.0f; /* 8045401C-80454020 0004+00 s=1 e=0 z=0 None .sdata2 @4315 */ -SECTION_SDATA2 static u32 lit_4315 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4315 = 3.0f / 5.0f; /* 801B91DC-801B944C 0270+00 s=1 e=0 z=0 None .text baseScreenInit__14dMenu_DmapBg_cFv */ #pragma push @@ -1487,7 +1466,7 @@ asm void dMenu_DmapBg_c::setGoldAnimation(bool param_0) { /* ############################################################################################## */ /* 80454020-80454024 0004+00 s=3 e=0 z=0 None .sdata2 @4643 */ -SECTION_SDATA2 static u32 lit_4643 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4643 = 255.0f; /* 801BA7F0-801BA974 0184+00 s=3 e=0 z=0 None .text setGoldFrameAlphaRate__14dMenu_DmapBg_cFf */ @@ -1524,24 +1503,22 @@ asm void dMenu_DmapBg_c::decGoldFrameAlphaRate() { /* ############################################################################################## */ /* 80454024-80454028 0004+00 s=4 e=0 z=0 None .sdata2 @4784 */ -SECTION_SDATA2 static u32 lit_4784 = 0x44180000; +SECTION_SDATA2 static f32 lit_4784 = 608.0f; /* 80454028-8045402C 0004+00 s=4 e=0 z=0 None .sdata2 @4785 */ -SECTION_SDATA2 static u32 lit_4785 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4785 = 448.0f; /* 8045402C-80454030 0004+00 s=1 e=0 z=0 None .sdata2 @4786 */ -SECTION_SDATA2 static u32 lit_4786 = 0x40000000; +SECTION_SDATA2 static f32 lit_4786 = 2.0f; /* 80454030-80454034 0004+00 s=1 e=0 z=0 None .sdata2 @4787 */ -SECTION_SDATA2 static u32 lit_4787 = 0x3F333333; +SECTION_SDATA2 static f32 lit_4787 = 7.0f / 10.0f; /* 80454034-80454038 0004+00 s=1 e=0 z=0 None .sdata2 @4788 */ -SECTION_SDATA2 static u32 lit_4788 = 0xC20C0000; +SECTION_SDATA2 static f32 lit_4788 = -35.0f; /* 80454038-80454040 0008+00 s=2 e=0 z=0 None .sdata2 @4790 */ -SECTION_SDATA2 static u8 lit_4790[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4790 = 4503599627370496.0 /* cast u32 to float */; /* 801BAB10-801BB334 0824+00 s=1 e=0 z=0 None .text draw__14dMenu_DmapBg_cFv */ #pragma push @@ -1555,7 +1532,7 @@ asm void dMenu_DmapBg_c::draw() { /* ############################################################################################## */ /* 80454040-80454044 0004+00 s=1 e=0 z=0 None .sdata2 @4848 */ -SECTION_SDATA2 static u32 lit_4848 = 0x41CC0000; +SECTION_SDATA2 static f32 lit_4848 = 25.5f; /* 801BB334-801BB464 0130+00 s=1 e=0 z=0 None .text update__14dMenu_DmapBg_cFv */ #pragma push @@ -1584,10 +1561,10 @@ asm void dMenu_DmapBg_c::drawCursor() { /* ############################################################################################## */ /* 80454044-80454048 0004+00 s=3 e=0 z=0 None .sdata2 @4926 */ -SECTION_SDATA2 static u32 lit_4926 = 0xC4180000; +SECTION_SDATA2 static f32 lit_4926 = -608.0f; /* 80454048-8045404C 0004+00 s=3 e=0 z=0 None .sdata2 @4927 */ -SECTION_SDATA2 static u32 lit_4927 = 0xC3E00000; +SECTION_SDATA2 static f32 lit_4927 = -448.0f; /* 801BB498-801BB634 019C+00 s=0 e=1 z=0 None .text * __ct__12dMenu_Dmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUc */ @@ -1603,7 +1580,7 @@ asm dMenu_Dmap_c::dMenu_Dmap_c(JKRExpHeap* param_0, STControl* param_1, CSTContr /* ############################################################################################## */ /* 8045404C-80454050 0004+00 s=1 e=0 z=0 None .sdata2 @5277 */ -SECTION_SDATA2 static u32 lit_5277 = 0x40E00000; +SECTION_SDATA2 static f32 lit_5277 = 7.0f; /* 801BB634-801BC788 1154+00 s=1 e=0 z=0 None .text screenInit__12dMenu_Dmap_cFv */ #pragma push @@ -1617,7 +1594,7 @@ asm void dMenu_Dmap_c::screenInit() { /* ############################################################################################## */ /* 80454050-80454054 0004+00 s=2 e=0 z=0 None .sdata2 @5288 */ -SECTION_SDATA2 static u32 lit_5288 = 0x3BB40000; +SECTION_SDATA2 static f32 lit_5288 = 0.0054931640625f; /* 801BC788-801BC848 00C0+00 s=1 e=0 z=0 None .text getPlayerIconPos__12dMenu_Dmap_cFScf */ #pragma push @@ -1765,7 +1742,7 @@ asm void J2DPicture::insert(ResTIMG const* param_0, u8 param_1, f32 param_2) { /* ############################################################################################## */ /* 80454054-80454058 0004+00 s=1 e=0 z=0 None .sdata2 @6017 */ -SECTION_SDATA2 static u32 lit_6017 = 0x3F34B4B5; +SECTION_SDATA2 static f32 lit_6017 = 12.0f / 17.0f; /* 801BDDA4-801BDEF8 0154+00 s=0 e=1 z=0 None .text _move__12dMenu_Dmap_cFv */ #pragma push @@ -1799,10 +1776,10 @@ asm void dMenu_Dmap_c::mapBgAnime() { /* ############################################################################################## */ /* 80454058-8045405C 0004+00 s=2 e=0 z=0 None .sdata2 @6180 */ -SECTION_SDATA2 static u32 lit_6180 = 0x42C80000; +SECTION_SDATA2 static f32 lit_6180 = 100.0f; /* 8045405C-80454060 0004+00 s=7 e=0 z=0 None .sdata2 @6181 */ -SECTION_SDATA2 static u32 lit_6181 = 0xBF800000; +SECTION_SDATA2 static f32 lit_6181 = -1.0f; /* 801BDF6C-801BE328 03BC+00 s=1 e=0 z=0 None .text mapControl__12dMenu_Dmap_cFv */ #pragma push diff --git a/src/d/menu/d_menu_dmap_map.cpp b/src/d/menu/d_menu_dmap_map.cpp index bfcc89be066..bddfd41a2b4 100644 --- a/src/d/menu/d_menu_dmap_map.cpp +++ b/src/d/menu/d_menu_dmap_map.cpp @@ -45,6 +45,8 @@ struct renderingDmap_c { /* 801C263C */ bool isRendIcon() const; }; +struct Vec {}; + struct dDrawPath_c { struct line_class {}; @@ -62,8 +64,6 @@ struct dDrawPath_c { /* 8003CCC4 */ void drawPath(); }; -struct Vec {}; - struct renderingDAmap_c { /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16); /* 8003FD08 */ void entry(f32, f32, f32, int, s8); @@ -194,10 +194,6 @@ struct dMapInfo_c { // Forward References: // -extern "C" extern void* l_data[61]; -extern "C" extern void* __vt__19dMenu_DmapMapCtrl_c[10 + 51 /* padding */]; -extern "C" extern void* __vt__15renderingDmap_c[43 + 1 /* padding */]; - extern "C" void hasMap__15renderingDmap_cCFv(); extern "C" void isDrawIconSingle2__15renderingDmap_cCFPCQ27dTres_c6data_sbbi(); extern "C" void getPlayerCursorSize__15renderingDmap_cFv(); @@ -273,18 +269,6 @@ void fopMsgM_valueIncrease(int, int, u8); void* operator new(u32, int); void* operator new[](u32, int); void operator delete[](void*); -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mTypeGroupListAll__7dTres_c[204 + 4 /* padding */]; -extern "C" extern u32 __float_max; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 data_80450E58[4]; -extern "C" extern u8 data_80450E60[4]; -extern "C" extern u8 mLayerList__8dMpath_c[4]; -extern "C" extern f32 mAllCenterX__8dMpath_c; -extern "C" extern f32 mAllCenterZ__8dMpath_c; -extern "C" extern f32 mAllSizeX__8dMpath_c; -extern "C" extern f32 mAllSizeZ__8dMpath_c; extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); extern "C" void fopMsgM_valueIncrease__FiiUc(); @@ -552,7 +536,7 @@ asm void renderingDmap_c::getLineWidthZoomSmall(int param_0) { /* ############################################################################################## */ /* 80454094-80454098 0004+00 s=4 e=0 z=0 None .sdata2 @3837 */ -SECTION_SDATA2 static u32 lit_3837 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3837 = 0.5f; /* 801C0C10-801C0C48 0038+00 s=1 e=0 z=0 None .text getLineWidth__15renderingDmap_cFi */ #pragma push @@ -763,9 +747,7 @@ SECTION_SDATA2 static f32 lit_3946[1 + 1 /* padding */] = { }; /* 804540A0-804540A8 0008+00 s=2 e=0 z=0 None .sdata2 @3947 */ -SECTION_SDATA2 static u8 lit_3947[8] = { - 0x3F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3947 = 1.0; /* 801C0EE0-801C0F24 0044+00 s=0 e=2 z=0 None .text getMapBlendPer__20dMenu_StageMapCtrl_cCFv */ @@ -892,14 +874,10 @@ asm void dMenu_StageMapCtrl_c::setPlusNowStayFloorNo(s8 param_0, u8 param_1) { /* ############################################################################################## */ /* 804540A8-804540B0 0008+00 s=1 e=0 z=0 None .sdata2 @4168 */ -SECTION_SDATA2 static u8 lit_4168[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4168 = 4503601774854144.0 /* cast s32 to float */; /* 804540B0-804540B8 0008+00 s=2 e=0 z=0 None .sdata2 @4170 */ -SECTION_SDATA2 static u8 lit_4170[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4170 = 4503599627370496.0 /* cast u32 to float */; /* 801C12B4-801C1878 05C4+00 s=2 e=0 z=0 None .text moveFloor__20dMenu_StageMapCtrl_cFv */ #pragma push @@ -945,7 +923,7 @@ asm void dMenu_StageMapCtrl_c::zoomIn_init_proc() { /* ############################################################################################## */ /* 804540B8-804540BC 0004+00 s=1 e=0 z=0 None .sdata2 @4245 */ -SECTION_SDATA2 static u32 lit_4245 = 0x45610000; +SECTION_SDATA2 static f32 lit_4245 = 3600.0f; /* 801C18C0-801C1B14 0254+00 s=1 e=0 z=0 None .text * getZoomMinMaxCheck__19dMenu_DmapMapCtrl_cFPfPfPfPfPbPb */ @@ -972,10 +950,10 @@ asm void dMenu_DmapMapCtrl_c::calcZoomCenter(f32* param_0, f32* param_1) { /* ############################################################################################## */ /* 804540BC-804540C0 0004+00 s=1 e=0 z=0 None .sdata2 @4277 */ -SECTION_SDATA2 static u32 lit_4277 = 0x4628C000; +SECTION_SDATA2 static f32 lit_4277 = 10800.0f; /* 804540C0-804540C4 0004+00 s=1 e=0 z=0 None .sdata2 @4278 */ -SECTION_SDATA2 static u32 lit_4278 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_4278 = 1.5f; /* 801C1BA4-801C1C40 009C+00 s=1 e=0 z=0 None .text getZoomCmPerPixel__19dMenu_DmapMapCtrl_cFv */ @@ -1184,7 +1162,7 @@ asm void dMenu_DmapMapCtrl_c::isEnableZoomMove() const { /* ############################################################################################## */ /* 804540C4-804540C8 0004+00 s=1 e=0 z=0 None .sdata2 @4395 */ -SECTION_SDATA2 static u32 lit_4395 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_4395 = 1.0f / 100.0f; /* 801C205C-801C2198 013C+00 s=1 e=0 z=0 None .text zoomWait_proc__20dMenu_StageMapCtrl_cFv */ #pragma push @@ -1314,10 +1292,10 @@ static u8 m_zoomCenterMinZ__20dMenu_StageMapCtrl_c[4]; static u8 m_zoomCenterMaxZ__20dMenu_StageMapCtrl_c[4 + 4 /* padding */]; /* 804540C8-804540CC 0004+00 s=1 e=0 z=0 None .sdata2 @4460 */ -SECTION_SDATA2 static u32 lit_4460 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_4460 = 6.0f / 5.0f; /* 804540CC-804540D0 0004+00 s=1 e=0 z=0 None .sdata2 @4461 */ -SECTION_SDATA2 static u32 lit_4461 = 0x43900000; +SECTION_SDATA2 static f32 lit_4461 = 288.0f; /* 804540D0-804540D8 0004+04 s=1 e=0 z=0 None .sdata2 @4462 */ SECTION_SDATA2 static f32 lit_4462[1 + 1 /* padding */] = { diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp index f552eafeb5c..a28f94004e7 100644 --- a/src/d/menu/d_menu_fishing.cpp +++ b/src/d/menu/d_menu_fishing.cpp @@ -28,11 +28,11 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct STControl {}; +struct CSTControl {}; struct JKRExpHeap {}; -struct CSTControl {}; +struct STControl {}; struct dMenu_Fishing_c { /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*); @@ -92,8 +92,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_fishing__stringBase0; - extern "C" void __ct__15dMenu_Fishing_cFP10JKRExpHeapP9STControlP10CSTControl(); extern "C" void __dt__15dMenu_Fishing_cFv(); extern "C" void _create__15dMenu_Fishing_cFv(); @@ -126,12 +124,6 @@ void mDoExt_getSubFont(); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -274,10 +266,10 @@ SECTION_SDATA2 static u8 lit_3904[4] = { }; /* 8045410C-80454110 0004+00 s=1 e=0 z=0 None .sdata2 @3905 */ -SECTION_SDATA2 static u32 lit_3905 = 0x44180000; +SECTION_SDATA2 static f32 lit_3905 = 608.0f; /* 80454110-80454114 0004+00 s=1 e=0 z=0 None .sdata2 @3906 */ -SECTION_SDATA2 static u32 lit_3906 = 0x43E00000; +SECTION_SDATA2 static f32 lit_3906 = 448.0f; /* 801C514C-801C5204 00B8+00 s=1 e=1 z=0 None .text _draw__15dMenu_Fishing_cFv */ #pragma push @@ -435,12 +427,10 @@ SECTION_DEAD static char const* const pad_803960CD = "\0\0"; #pragma pop /* 80454114-80454118 0004+00 s=1 e=0 z=0 None .sdata2 @4010 */ -SECTION_SDATA2 static u32 lit_4010 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4010 = 1.0f; /* 80454118-80454120 0008+00 s=2 e=0 z=0 None .sdata2 @4012 */ -SECTION_SDATA2 static u8 lit_4012[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4012 = 4503601774854144.0 /* cast s32 to float */; /* 801C52E4-801C5470 018C+00 s=0 e=2 z=0 None .text _open__15dMenu_Fishing_cFv */ #pragma push diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp index 12c4b5e0011..534d0ddc1af 100644 --- a/src/d/menu/d_menu_fmap.cpp +++ b/src/d/menu/d_menu_fmap.cpp @@ -90,15 +90,15 @@ struct dMenu_Fmap_world_data_c { struct dMenu_Fmap_stage_data_c {}; -struct STControl { - /* 8003219C */ void checkTrigger(); -}; +struct CSTControl {}; struct JKRExpHeap { /* 802CEE2C */ void create(u32, JKRHeap*, bool); }; -struct CSTControl {}; +struct STControl { + /* 8003219C */ void checkTrigger(); +}; struct dMenu_Fmap_c { /* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8); @@ -335,7 +335,6 @@ struct JKRAramArchive {}; // void dMenuFmap_getStartStageName(void*); -extern "C" extern char const* const d_menu_d_menu_fmap__stringBase0; extern "C" void __ct__9dMf_HIO_cFv(); extern "C" void dMenuFmap_getStartStageName__FPv(); @@ -489,14 +488,6 @@ void dMeter2Info_set2DVibrationM(); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_destroyExpHeap__FP10JKRExpHeap(); extern "C" void create__24mDoDvdThd_mountArchive_cFPCcUcP7JKRHeap(); @@ -1201,10 +1192,10 @@ SECTION_DATA static void* __vt__9dMf_HIO_c[3 + 1 /* padding */] = { static u8 mMySelfPointer__9dMf_HIO_c[4]; /* 80454120-80454124 0004+00 s=1 e=0 z=0 None .sdata2 @3994 */ -SECTION_SDATA2 static u32 lit_3994 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_3994 = 1.0f / 5.0f; /* 80454124-80454128 0004+00 s=26 e=0 z=0 None .sdata2 @3995 */ -SECTION_SDATA2 static u32 lit_3995 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3995 = 1.0f; /* 801C65F8-801C662C 0034+00 s=1 e=0 z=0 None .text __ct__9dMf_HIO_cFv */ #pragma push @@ -1243,16 +1234,16 @@ SECTION_SDATA2 static u8 lit_4158[4] = { }; /* 8045412C-80454130 0004+00 s=3 e=0 z=0 None .sdata2 @4159 */ -SECTION_SDATA2 static u32 lit_4159 = 0xC4180000; +SECTION_SDATA2 static f32 lit_4159 = -608.0f; /* 80454130-80454134 0004+00 s=3 e=0 z=0 None .sdata2 @4160 */ -SECTION_SDATA2 static u32 lit_4160 = 0x44180000; +SECTION_SDATA2 static f32 lit_4160 = 608.0f; /* 80454134-80454138 0004+00 s=3 e=0 z=0 None .sdata2 @4161 */ -SECTION_SDATA2 static u32 lit_4161 = 0xC3E00000; +SECTION_SDATA2 static f32 lit_4161 = -448.0f; /* 80454138-8045413C 0004+00 s=3 e=0 z=0 None .sdata2 @4162 */ -SECTION_SDATA2 static u32 lit_4162 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4162 = 448.0f; /* 801C66E4-801C6AC8 03E4+00 s=0 e=1 z=0 None .text * __ct__12dMenu_Fmap_cFP10JKRExpHeapP9STControlP10CSTControlUcUcUcffUc */ @@ -1279,12 +1270,10 @@ asm dMenu_Fmap_c::~dMenu_Fmap_c() { /* ############################################################################################## */ /* 8045413C-80454140 0004+00 s=12 e=0 z=0 None .sdata2 @4353 */ -SECTION_SDATA2 static u32 lit_4353 = 0x41200000; +SECTION_SDATA2 static f32 lit_4353 = 10.0f; /* 80454140-80454148 0008+00 s=16 e=0 z=0 None .sdata2 @4358 */ -SECTION_SDATA2 static u8 lit_4358[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4358 = 4503601774854144.0 /* cast s32 to float */; /* 801C6D64-801C74A4 0740+00 s=1 e=0 z=0 None .text _create__12dMenu_Fmap_cFv */ #pragma push @@ -1309,13 +1298,13 @@ static u8 lit_3989[12]; static u8 g_fmHIO[20]; /* 80454148-8045414C 0004+00 s=1 e=0 z=0 None .sdata2 @4397 */ -SECTION_SDATA2 static u32 lit_4397 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_4397 = 2.0f / 5.0f; /* 8045414C-80454150 0004+00 s=2 e=0 z=0 None .sdata2 @4398 */ -SECTION_SDATA2 static u32 lit_4398 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4398 = 0.5f; /* 80454150-80454154 0004+00 s=1 e=0 z=0 None .sdata2 @4399 */ -SECTION_SDATA2 static u32 lit_4399 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4399 = 1.0f / 10.0f; /* 801C74A8-801C7650 01A8+00 s=0 e=1 z=0 None .text _move__12dMenu_Fmap_cFv */ #pragma push @@ -1339,7 +1328,7 @@ asm void dMenu_Fmap_c::_draw() { /* ############################################################################################## */ /* 80454154-80454158 0004+00 s=19 e=0 z=0 None .sdata2 @4541 */ -SECTION_SDATA2 static u32 lit_4541 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4541 = -1.0f; /* 801C77F0-801C7AFC 030C+00 s=0 e=1 z=0 None .text getNextStatus__12dMenu_Fmap_cFPUc */ #pragma push @@ -1437,10 +1426,10 @@ asm void dMenu_Fmap_c::region_map_init() { /* ############################################################################################## */ /* 80454158-8045415C 0004+00 s=2 e=0 z=0 None .sdata2 @4939 */ -SECTION_SDATA2 static u32 lit_4939 = 0x43980000; +SECTION_SDATA2 static f32 lit_4939 = 304.0f; /* 8045415C-80454160 0004+00 s=2 e=0 z=0 None .sdata2 @4940 */ -SECTION_SDATA2 static u32 lit_4940 = 0x43600000; +SECTION_SDATA2 static f32 lit_4940 = 224.0f; /* 801C8600-801C8B00 0500+00 s=1 e=0 z=0 None .text region_map_proc__12dMenu_Fmap_cFv */ #pragma push @@ -2215,7 +2204,7 @@ asm void dMenu_Fmap_c::setAreaNameZero() { /* ############################################################################################## */ /* 80454160-80454164 0004+00 s=1 e=0 z=0 None .sdata2 @6855 */ -SECTION_SDATA2 static u32 lit_6855 = 0x43FA0000; +SECTION_SDATA2 static f32 lit_6855 = 500.0f; /* 801CC8DC-801CCA70 0194+00 s=2 e=0 z=0 None .text portalWarpMapMove__12dMenu_Fmap_cFP9STControl */ @@ -2260,7 +2249,7 @@ asm void dMenu_Fmap_c::resetRoomDataBit() { /* ############################################################################################## */ /* 80454164-80454168 0004+00 s=2 e=0 z=0 None .sdata2 @6987 */ -SECTION_SDATA2 static u32 lit_6987 = 0x3BB40000; +SECTION_SDATA2 static f32 lit_6987 = 0.0054931640625f; /* 801CCB08-801CCD98 0290+00 s=2 e=0 z=0 None .text drawIcon__12dMenu_Fmap_cFfb */ #pragma push @@ -2434,7 +2423,7 @@ asm void dMenu_Fmap_c::drawDebugStage() { /* ############################################################################################## */ /* 80454168-8045416C 0004+00 s=1 e=0 z=0 None .sdata2 @7300 */ -SECTION_SDATA2 static u32 lit_7300 = 0xC2480000; +SECTION_SDATA2 static f32 lit_7300 = -50.0f; /* 801CD460-801CD5CC 016C+00 s=1 e=0 z=0 None .text arrowPosInit__12dMenu_Fmap_cFv */ #pragma push @@ -2448,7 +2437,7 @@ asm void dMenu_Fmap_c::arrowPosInit() { /* ############################################################################################## */ /* 8045416C-80454170 0004+00 s=2 e=0 z=0 None .sdata2 @7348 */ -SECTION_SDATA2 static u32 lit_7348 = 0xC1A00000; +SECTION_SDATA2 static f32 lit_7348 = -20.0f; /* 801CD5CC-801CD770 01A4+00 s=2 e=0 z=0 None .text tableArrowPosInit__12dMenu_Fmap_cFb */ #pragma push @@ -2462,10 +2451,10 @@ asm void dMenu_Fmap_c::tableArrowPosInit(bool param_0) { /* ############################################################################################## */ /* 80454170-80454174 0004+00 s=1 e=0 z=0 None .sdata2 @7356 */ -SECTION_SDATA2 static u32 lit_7356 = 0xC7169878; +SECTION_SDATA2 static f32 lit_7356 = -38552.46875f; /* 80454174-80454178 0004+00 s=1 e=0 z=0 None .sdata2 @7357 */ -SECTION_SDATA2 static u32 lit_7357 = 0x4716F797; +SECTION_SDATA2 static f32 lit_7357 = 38647.58984375f; /* 801CD770-801CD814 00A4+00 s=1 e=0 z=0 None .text yamibossArrowPosInit__12dMenu_Fmap_cFv */ #pragma push diff --git a/src/d/menu/d_menu_fmap2D.cpp b/src/d/menu/d_menu_fmap2D.cpp index cfd2724ecba..587a147772e 100644 --- a/src/d/menu/d_menu_fmap2D.cpp +++ b/src/d/menu/d_menu_fmap2D.cpp @@ -46,8 +46,6 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; -struct JKRExpHeap {}; - struct JGeometry { template struct TBox2 {}; @@ -68,6 +66,8 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; +struct JKRExpHeap {}; + struct CPaneMgrAlpha { /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); /* 80255608 */ void hide(); @@ -242,8 +242,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_fmap2D__stringBase0; - extern "C" void __ct__18dMenu_Fmap2DBack_cFv(); extern "C" void __dt__18dMenu_Fmap2DBack_cFv(); extern "C" void draw__18dMenu_Fmap2DBack_cFv(); @@ -357,14 +355,6 @@ void operator delete(void*); void J2DDrawLine(f32, f32, f32, f32, JUtility::TColor, int); void J2DFillBox(f32, f32, f32, f32, JUtility::TColor); void J2DDrawFrame(f32, f32, f32, f32, JUtility::TColor, u8); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -653,10 +643,10 @@ SECTION_SDATA2 static u8 lit_3970[4] = { }; /* 804541D4-804541D8 0004+00 s=14 e=0 z=0 None .sdata2 @3971 */ -SECTION_SDATA2 static u32 lit_3971 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3971 = 1.0f; /* 804541D8-804541DC 0004+00 s=2 e=0 z=0 None .sdata2 @3972 */ -SECTION_SDATA2 static u32 lit_3972 = 0x43B40000; +SECTION_SDATA2 static f32 lit_3972 = 360.0f; /* 801CF56C-801CFCDC 0770+00 s=0 e=1 z=0 None .text __ct__18dMenu_Fmap2DBack_cFv */ #pragma push @@ -680,30 +670,28 @@ asm dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() { /* ############################################################################################## */ /* 804541DC-804541E0 0004+00 s=6 e=0 z=0 None .sdata2 @4199 */ -SECTION_SDATA2 static u32 lit_4199 = 0x44180000; +SECTION_SDATA2 static f32 lit_4199 = 608.0f; /* 804541E0-804541E4 0004+00 s=5 e=0 z=0 None .sdata2 @4200 */ -SECTION_SDATA2 static u32 lit_4200 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4200 = 448.0f; /* 804541E4-804541E8 0004+00 s=4 e=0 z=0 None .sdata2 @4201 */ -SECTION_SDATA2 static u32 lit_4201 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4201 = 255.0f; /* 804541E8-804541EC 0004+00 s=18 e=0 z=0 None .sdata2 @4202 */ -SECTION_SDATA2 static u32 lit_4202 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4202 = 0.5f; /* 804541EC-804541F0 0004+00 s=2 e=0 z=0 None .sdata2 @4203 */ -SECTION_SDATA2 static u32 lit_4203 = 0x40000000; +SECTION_SDATA2 static f32 lit_4203 = 2.0f; /* 804541F0-804541F4 0004+00 s=5 e=0 z=0 None .sdata2 @4204 */ -SECTION_SDATA2 static u32 lit_4204 = 0x40400000; +SECTION_SDATA2 static f32 lit_4204 = 3.0f; /* 804541F4-804541F8 0004+00 s=6 e=0 z=0 None .sdata2 @4205 */ -SECTION_SDATA2 static u32 lit_4205 = 0x40C00000; +SECTION_SDATA2 static f32 lit_4205 = 6.0f; /* 804541F8-80454200 0008+00 s=4 e=0 z=0 None .sdata2 @4207 */ -SECTION_SDATA2 static u8 lit_4207[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4207 = 4503599627370496.0 /* cast u32 to float */; /* 801CFF34-801D0804 08D0+00 s=1 e=0 z=0 None .text draw__18dMenu_Fmap2DBack_cFv */ #pragma push @@ -1238,15 +1226,13 @@ asm void dMenu_Fmap2DBack_c::regionGridDraw() { /* ############################################################################################## */ /* 80454208-80454210 0008+00 s=8 e=0 z=0 None .sdata2 @4496 */ -SECTION_SDATA2 static u8 lit_4496[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4496 = 4503601774854144.0 /* cast s32 to float */; /* 80454210-80454214 0004+00 s=1 e=0 z=0 None .sdata2 @5133 */ -SECTION_SDATA2 static u32 lit_5133 = 0x80000000; +SECTION_SDATA2 static f32 lit_5133 = -0.0f; /* 80454214-80454218 0004+00 s=1 e=0 z=0 None .sdata2 @5134 */ -SECTION_SDATA2 static u32 lit_5134 = 0xC4180000; +SECTION_SDATA2 static f32 lit_5134 = -608.0f; /* 801D382C-801D38FC 00D0+00 s=1 e=0 z=0 None .text worldOriginDraw__18dMenu_Fmap2DBack_cFv */ #pragma push @@ -1301,10 +1287,10 @@ asm void dMenu_Fmap2DBack_c::calcBlink() { /* ############################################################################################## */ /* 80454218-8045421C 0004+00 s=1 e=0 z=0 None .sdata2 @5433 */ -SECTION_SDATA2 static u32 lit_5433 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_5433 = 2.0f / 5.0f; /* 8045421C-80454220 0004+00 s=1 e=0 z=0 None .sdata2 @5434 */ -SECTION_SDATA2 static u32 lit_5434 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_5434 = 1.0f / 10.0f; /* 801D4928-801D49E0 00B8+00 s=0 e=1 z=0 None .text calcBackAlpha__18dMenu_Fmap2DBack_cFb */ #pragma push @@ -1350,7 +1336,7 @@ asm void dMenu_Fmap2DBack_c::regionMapMove(STControl* param_0) { /* ############################################################################################## */ /* 80454220-80454224 0004+00 s=1 e=0 z=0 None .sdata2 @5568 */ -SECTION_SDATA2 static u32 lit_5568 = 0xBF800000; +SECTION_SDATA2 static f32 lit_5568 = -1.0f; /* 801D4E80-801D5334 04B4+00 s=0 e=1 z=0 None .text * stageMapMove__18dMenu_Fmap2DBack_cFP9STControlUcb */ @@ -1376,10 +1362,10 @@ asm void dMenu_Fmap2DBack_c::setAllAlphaRate(f32 param_0, bool param_1) { /* ############################################################################################## */ /* 80454224-80454228 0004+00 s=1 e=0 z=0 None .sdata2 @5632 */ -SECTION_SDATA2 static u32 lit_5632 = 0x43980000; +SECTION_SDATA2 static f32 lit_5632 = 304.0f; /* 80454228-8045422C 0004+00 s=1 e=0 z=0 None .sdata2 @5633 */ -SECTION_SDATA2 static u32 lit_5633 = 0x43600000; +SECTION_SDATA2 static f32 lit_5633 = 224.0f; /* 801D5388-801D564C 02C4+00 s=1 e=0 z=0 None .text drawDebugStageArea__18dMenu_Fmap2DBack_cFv */ @@ -1632,7 +1618,7 @@ asm void dMenu_Fmap2DTop_c::setArrowAlphaRatio(u8 param_0, f32 param_1) { /* ############################################################################################## */ /* 8045422C-80454230 0004+00 s=2 e=0 z=0 None .sdata2 @6309 */ -SECTION_SDATA2 static u32 lit_6309 = 0x40A00000; +SECTION_SDATA2 static f32 lit_6309 = 5.0f; /* 801D77C4-801D7858 0094+00 s=1 e=0 z=0 None .text * setAlphaAnimeMin__17dMenu_Fmap2DTop_cFP13CPaneMgrAlpha */ diff --git a/src/d/menu/d_menu_fmap_map.cpp b/src/d/menu/d_menu_fmap_map.cpp index 91a33274097..7b4db97edff 100644 --- a/src/d/menu/d_menu_fmap_map.cpp +++ b/src/d/menu/d_menu_fmap_map.cpp @@ -11,6 +11,12 @@ // Types: // +struct dMenu_Fmap_region_data_c { + /* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*); +}; + +struct dMenu_Fmap_world_data_c {}; + struct dDrawPath_c { struct group_class {}; @@ -28,12 +34,6 @@ struct dDrawPath_c { /* 8003CCC4 */ void drawPath(); }; -struct dMenu_Fmap_region_data_c { - /* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*); -}; - -struct dMenu_Fmap_world_data_c {}; - struct renderingFmap_c { struct palette_e {}; @@ -125,7 +125,6 @@ struct Vec {}; static void twoValueLineInterpolation(u8, u8, f32); static void twoColorLineInterporation(_GXColor const&, _GXColor const&, f32, _GXColor&); -extern "C" extern char const* const d_menu_d_menu_fmap_map__stringBase0; extern "C" static void twoValueLineInterpolation__FUcUcf(); extern "C" static void twoColorLineInterporation__FRC8_GXColorRC8_GXColorfR8_GXColor(); @@ -183,15 +182,6 @@ void* operator new(u32, int); void* operator new[](u32, int); void operator delete(void*); void operator delete[](void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__28dDrawPathWithNormalPattern_c[16]; -extern "C" extern void* __vt__15dRenderingMap_c[23]; -extern "C" extern void* __vt__18dRenderingFDAmap_c[26]; -extern "C" extern void* __vt__11dDrawPath_c[16]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 struct_80450D64[4]; extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs(); extern "C" void draw__12dDlst_base_cFv(); @@ -248,9 +238,7 @@ extern "C" extern u8 struct_80450D64[4]; /* ############################################################################################## */ /* 80454178-80454180 0008+00 s=3 e=0 z=0 None .sdata2 @3689 */ -SECTION_SDATA2 static u8 lit_3689[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3689 = 4503599627370496.0 /* cast u32 to float */; /* 801CE068-801CE0CC 0064+00 s=1 e=0 z=0 None .text twoValueLineInterpolation__FUcUcf */ #pragma push @@ -295,7 +283,7 @@ asm void renderingFmap_c::init(u8* param_0, u16 param_1, u16 param_2, u16 param_ /* ############################################################################################## */ /* 80454184-80454188 0004+00 s=3 e=0 z=0 None .sdata2 @3711 */ -SECTION_SDATA2 static u32 lit_3711 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3711 = 1.0f; /* 801CE188-801CE224 009C+00 s=1 e=0 z=0 None .text * entry__15renderingFmap_cFP23dMenu_Fmap_world_data_cifff */ @@ -382,13 +370,13 @@ asm void renderingFmap_c::getPointStagePathInnerNo(dMenu_Fmap_region_data_c* par /* ############################################################################################## */ /* 80454188-8045418C 0004+00 s=1 e=0 z=0 None .sdata2 @3769 */ -SECTION_SDATA2 static u32 lit_3769 = 0xC59C4000; +SECTION_SDATA2 static f32 lit_3769 = -5000.0f; /* 8045418C-80454190 0004+00 s=1 e=0 z=0 None .sdata2 @3770 */ -SECTION_SDATA2 static u32 lit_3770 = 0x459C4000; +SECTION_SDATA2 static f32 lit_3770 = 5000.0f; /* 80454190-80454194 0004+00 s=1 e=0 z=0 None .sdata2 @3771 */ -SECTION_SDATA2 static u32 lit_3771 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3771 = -1.0f; /* 801CE410-801CE4D4 00C4+00 s=2 e=0 z=0 None .text preDrawPath__15renderingFmap_cFv */ #pragma push @@ -684,10 +672,10 @@ SECTION_SDATA2 static u8 m_other__22dMfm_HIO_prm_res_src_s[1 + 3 /* padding */] }; /* 80454198-8045419C 0004+00 s=1 e=0 z=0 None .sdata2 @4104 */ -SECTION_SDATA2 static u32 lit_4104 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4104 = 0.5f; /* 8045419C-804541A0 0004+00 s=1 e=0 z=0 None .sdata2 @4105 */ -SECTION_SDATA2 static u32 lit_4105 = 0x47800000; +SECTION_SDATA2 static f32 lit_4105 = 65536.0f; /* 804541A0-804541A8 0004+04 s=1 e=0 z=0 None .sdata2 @4106 */ SECTION_SDATA2 static f32 lit_4106[1 + 1 /* padding */] = { @@ -697,9 +685,7 @@ SECTION_SDATA2 static f32 lit_4106[1 + 1 /* padding */] = { }; /* 804541A8-804541B0 0008+00 s=2 e=0 z=0 None .sdata2 @4108 */ -SECTION_SDATA2 static u8 lit_4108[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */; /* 801CEE94-801CF0B4 0220+00 s=1 e=0 z=0 None .text draw__15dMenu_FmapMap_cFv */ #pragma push @@ -750,7 +736,7 @@ SECTION_SDATA2 static u8 l_lineWidthPatData2[5 + 3 /* padding */] = { }; /* 804541C0-804541C4 0004+00 s=1 e=0 z=0 None .sdata2 @4152 */ -SECTION_SDATA2 static u32 lit_4152 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_4152 = 1.5f; /* 801CF12C-801CF1D4 00A8+00 s=1 e=0 z=0 None .text getLineWidth__15dMenu_FmapMap_cFi */ #pragma push diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp index 64be96712f6..b70113835ff 100644 --- a/src/d/menu/d_menu_insect.cpp +++ b/src/d/menu/d_menu_insect.cpp @@ -62,14 +62,14 @@ struct dMsgScrn3Select_c { struct JMSMesgEntry_c {}; -struct JUTFont {}; - struct ResTIMG {}; struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); }; +struct JUTFont {}; + struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); @@ -78,6 +78,10 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; +struct CSTControl {}; + +struct JKRExpHeap {}; + struct STControl { /* 8003219C */ void checkTrigger(); /* 8003242C */ void checkLeftTrigger(); @@ -86,10 +90,6 @@ struct STControl { /* 800325A0 */ void checkDownTrigger(); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct dMenu_Insect_c { /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8); /* 801D82F4 */ ~dMenu_Insect_c(); @@ -168,8 +168,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_insect__stringBase0; - extern "C" void __ct__14dMenu_Insect_cFP10JKRExpHeapP9STControlP10CSTControlUc(); extern "C" void __dt__14dMenu_Insect_cFv(); extern "C" void _create__14dMenu_Insect_cFv(); @@ -220,14 +218,6 @@ void dMeter2Info_set2DVibration(); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -502,13 +492,13 @@ SECTION_DATA static void* __vt__14dMenu_Insect_c[4 + 3 /* padding */] = { }; /* 80454238-8045423C 0004+00 s=6 e=0 z=0 None .sdata2 @3834 */ -SECTION_SDATA2 static u32 lit_3834 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3834 = 1.0f; /* 8045423C-80454240 0004+00 s=1 e=0 z=0 None .sdata2 @3835 */ -SECTION_SDATA2 static u32 lit_3835 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_3835 = 1.0f / 10.0f; /* 80454240-80454244 0004+00 s=1 e=0 z=0 None .sdata2 @3836 */ -SECTION_SDATA2 static u32 lit_3836 = 0x3F333333; +SECTION_SDATA2 static f32 lit_3836 = 7.0f / 10.0f; /* 80454244-80454248 0004+00 s=5 e=0 z=0 None .sdata2 @3837 */ SECTION_SDATA2 static u8 lit_3837[4] = { @@ -562,16 +552,16 @@ asm void dMenu_Insect_c::_move() { /* ############################################################################################## */ /* 80454248-8045424C 0004+00 s=1 e=0 z=0 None .sdata2 @3961 */ -SECTION_SDATA2 static u32 lit_3961 = 0x44180000; +SECTION_SDATA2 static f32 lit_3961 = 608.0f; /* 8045424C-80454250 0004+00 s=1 e=0 z=0 None .sdata2 @3962 */ -SECTION_SDATA2 static u32 lit_3962 = 0x43E00000; +SECTION_SDATA2 static f32 lit_3962 = 448.0f; /* 80454250-80454254 0004+00 s=1 e=0 z=0 None .sdata2 @3963 */ -SECTION_SDATA2 static u32 lit_3963 = 0x43160000; +SECTION_SDATA2 static f32 lit_3963 = 150.0f; /* 80454254-80454258 0004+00 s=1 e=0 z=0 None .sdata2 @3964 */ -SECTION_SDATA2 static u32 lit_3964 = 0x43F30000; +SECTION_SDATA2 static f32 lit_3964 = 486.0f; /* 80454258-80454260 0004+04 s=1 e=0 z=0 None .sdata2 @3965 */ SECTION_SDATA2 static f32 lit_3965[1 + 1 /* padding */] = { @@ -612,9 +602,7 @@ asm void dMenu_Insect_c::init() { /* ############################################################################################## */ /* 80454260-80454268 0008+00 s=2 e=0 z=0 None .sdata2 @4020 */ -SECTION_SDATA2 static u8 lit_4020[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4020 = 4503601774854144.0 /* cast s32 to float */; /* 801D894C-801D8B2C 01E0+00 s=0 e=3 z=0 None .text _open__14dMenu_Insect_cFv */ #pragma push @@ -648,7 +636,7 @@ asm void dMenu_Insect_c::wait_init() { /* ############################################################################################## */ /* 80454268-8045426C 0004+00 s=4 e=0 z=0 None .sdata2 @4089 */ -SECTION_SDATA2 static u32 lit_4089 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4089 = -1.0f; /* 801D8CCC-801D8E00 0134+00 s=1 e=0 z=0 None .text wait_move__14dMenu_Insect_cFv */ #pragma push @@ -662,7 +650,7 @@ asm void dMenu_Insect_c::wait_move() { /* ############################################################################################## */ /* 8045426C-80454270 0004+00 s=1 e=0 z=0 None .sdata2 @4135 */ -SECTION_SDATA2 static u32 lit_4135 = 0x42400000; +SECTION_SDATA2 static f32 lit_4135 = 48.0f; /* 80454270-80454278 0004+04 s=1 e=0 z=0 None .sdata2 @4136 */ SECTION_SDATA2 static f32 lit_4136[1 + 1 /* padding */] = { @@ -672,9 +660,7 @@ SECTION_SDATA2 static f32 lit_4136[1 + 1 /* padding */] = { }; /* 80454278-80454280 0008+00 s=1 e=0 z=0 None .sdata2 @4138 */ -SECTION_SDATA2 static u8 lit_4138[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4138 = 4503599627370496.0 /* cast u32 to float */; /* 801D8E00-801D91E4 03E4+00 s=1 e=0 z=0 None .text explain_open_init__14dMenu_Insect_cFv */ #pragma push diff --git a/src/d/menu/d_menu_item_explain.cpp b/src/d/menu/d_menu_item_explain.cpp index 7a07c2eecaa..0b570ab3426 100644 --- a/src/d/menu/d_menu_item_explain.cpp +++ b/src/d/menu/d_menu_item_explain.cpp @@ -50,10 +50,6 @@ struct dMsgScrn3Select_c { struct JMSMesgEntry_c {}; -struct JUTFont {}; - -struct ResTIMG {}; - struct JGeometry { template struct TBox2 {}; @@ -63,11 +59,15 @@ struct JGeometry { struct ResTLUT {}; +struct ResTIMG {}; + struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); }; +struct JUTFont {}; + struct dMeter2Info_c { /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*); /* 8021C7FC */ void getStringLength(JUTFont*, f32, f32, char*); @@ -75,18 +75,18 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; +struct JKRArchive {}; + struct J2DOrthoGraph {}; +struct JKRExpHeap {}; + struct STControl { /* 8003219C */ void checkTrigger(); /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; -struct JKRExpHeap {}; - -struct JKRArchive {}; - struct dMenu_ItemExplain_c { /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool); /* 801DAFF0 */ ~dMenu_ItemExplain_c(); @@ -174,8 +174,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_item_explain__stringBase0; - extern "C" void __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb(); extern "C" void __dt__19dMenu_ItemExplain_cFv(); extern "C" void move__19dMenu_ItemExplain_cFv(); @@ -215,12 +213,6 @@ void dMeter2Info_getNumberTextureName(int); void dMeter2Info_set2DVibration(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_ringHIO[344]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void dComIfGs_isDungeonItemWarp__Fi(); @@ -456,13 +448,13 @@ SECTION_SDATA2 static u8 lit_4062[4] = { }; /* 8045428C-80454290 0004+00 s=4 e=0 z=0 None .sdata2 @4063 */ -SECTION_SDATA2 static u32 lit_4063 = 0x43490000; +SECTION_SDATA2 static f32 lit_4063 = 201.0f; /* 80454290-80454294 0004+00 s=1 e=0 z=0 None .sdata2 @4064 */ -SECTION_SDATA2 static u32 lit_4064 = 0x41800000; +SECTION_SDATA2 static f32 lit_4064 = 16.0f; /* 80454294-80454298 0004+00 s=2 e=0 z=0 None .sdata2 @4065 */ -SECTION_SDATA2 static u32 lit_4065 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4065 = 0.5f; /* 80454298-804542A0 0004+04 s=1 e=0 z=0 None .sdata2 @4066 */ SECTION_SDATA2 static f32 lit_4066[1 + 1 /* padding */] = { @@ -472,9 +464,7 @@ SECTION_SDATA2 static f32 lit_4066[1 + 1 /* padding */] = { }; /* 804542A0-804542A8 0008+00 s=1 e=0 z=0 None .sdata2 @4068 */ -SECTION_SDATA2 static u8 lit_4068[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4068 = 4503601774854144.0 /* cast s32 to float */; /* 801DA754-801DAFF0 089C+00 s=0 e=2 z=0 None .text * __ct__19dMenu_ItemExplain_cFP10JKRExpHeapP10JKRArchiveP9STControlb */ @@ -510,19 +500,19 @@ asm void dMenu_ItemExplain_c::move() { /* ############################################################################################## */ /* 804542A8-804542AC 0004+00 s=1 e=0 z=0 None .sdata2 @4302 */ -SECTION_SDATA2 static u32 lit_4302 = 0x44180000; +SECTION_SDATA2 static f32 lit_4302 = 608.0f; /* 804542AC-804542B0 0004+00 s=1 e=0 z=0 None .sdata2 @4303 */ -SECTION_SDATA2 static u32 lit_4303 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4303 = 448.0f; /* 804542B0-804542B4 0004+00 s=5 e=0 z=0 None .sdata2 @4304 */ -SECTION_SDATA2 static u32 lit_4304 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4304 = -1.0f; /* 804542B4-804542B8 0004+00 s=1 e=0 z=0 None .sdata2 @4305 */ -SECTION_SDATA2 static u32 lit_4305 = 0x43F30000; +SECTION_SDATA2 static f32 lit_4305 = 486.0f; /* 804542B8-804542BC 0004+00 s=1 e=0 z=0 None .sdata2 @4306 */ -SECTION_SDATA2 static u32 lit_4306 = 0x43510000; +SECTION_SDATA2 static f32 lit_4306 = 209.0f; /* 801DB514-801DB744 0230+00 s=0 e=2 z=0 None .text draw__19dMenu_ItemExplain_cFP13J2DOrthoGraph */ @@ -537,13 +527,13 @@ asm void dMenu_ItemExplain_c::draw(J2DOrthoGraph* param_0) { /* ############################################################################################## */ /* 804542BC-804542C0 0004+00 s=2 e=0 z=0 None .sdata2 @4346 */ -SECTION_SDATA2 static u32 lit_4346 = 0x42400000; +SECTION_SDATA2 static f32 lit_4346 = 48.0f; /* 804542C0-804542C4 0004+00 s=1 e=0 z=0 None .sdata2 @4347 */ -SECTION_SDATA2 static u32 lit_4347 = 0x40A00000; +SECTION_SDATA2 static f32 lit_4347 = 5.0f; /* 804542C4-804542C8 0004+00 s=8 e=0 z=0 None .sdata2 @4348 */ -SECTION_SDATA2 static u32 lit_4348 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4348 = 1.0f; /* 801DB744-801DB818 00D4+00 s=1 e=0 z=0 None .text drawKantera__19dMenu_ItemExplain_cFv */ #pragma push @@ -577,10 +567,10 @@ asm void dMenu_ItemExplain_c::open_init() { /* ############################################################################################## */ /* 804542C8-804542CC 0004+00 s=1 e=0 z=0 None .sdata2 @4452 */ -SECTION_SDATA2 static u32 lit_4452 = 0x40000000; +SECTION_SDATA2 static f32 lit_4452 = 2.0f; /* 804542CC-804542D0 0004+00 s=1 e=0 z=0 None .sdata2 @4453 */ -SECTION_SDATA2 static u32 lit_4453 = 0x43160000; +SECTION_SDATA2 static f32 lit_4453 = 150.0f; /* 801DBAB4-801DBB50 009C+00 s=1 e=0 z=0 None .text open_proc__19dMenu_ItemExplain_cFv */ #pragma push @@ -710,7 +700,7 @@ asm void dMenu_ItemExplain_c::openExplainTx(u32 param_0, u32 param_1) { /* ############################################################################################## */ /* 804542D0-804542D4 0004+00 s=1 e=0 z=0 None .sdata2 @4820 */ -SECTION_SDATA2 static u32 lit_4820 = 0x40E00000; +SECTION_SDATA2 static f32 lit_4820 = 7.0f; /* 801DC7AC-801DC7FC 0050+00 s=1 e=2 z=0 None .text getAlphaRatio__19dMenu_ItemExplain_cFv */ #pragma push @@ -745,12 +735,10 @@ asm void dMenu_ItemExplain_c::getWarpMarkFlag() { /* ############################################################################################## */ /* 804542D4-804542D8 0004+00 s=1 e=0 z=0 None .sdata2 @4948 */ -SECTION_SDATA2 static u32 lit_4948 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4948 = 100.0f; /* 804542D8-804542E0 0008+00 s=1 e=0 z=0 None .sdata2 @4950 */ -SECTION_SDATA2 static u8 lit_4950[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4950 = 4503599627370496.0 /* cast u32 to float */; /* 801DCBBC-801DCC8C 00D0+00 s=2 e=0 z=0 None .text setScale__19dMenu_ItemExplain_cFv */ #pragma push diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 1818a64e1f3..3aea1fe309d 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -37,6 +37,8 @@ struct dSelect_cursor_c { /* 801952A0 */ void setAlphaRate(f32); }; +struct COutFont_c {}; + struct J2DTextBox { /* 801DFA28 */ void getWhite() const; /* 801DFA34 */ void getBlack() const; @@ -46,8 +48,6 @@ struct J2DTextBox { struct JUTFont {}; -struct COutFont_c {}; - struct dMsgString_c { /* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); @@ -77,15 +77,15 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; +struct CSTControl {}; + +struct JKRExpHeap {}; + struct STControl { /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct dMenu_Letter_c { /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*); /* 801DCF34 */ ~dMenu_Letter_c(); @@ -187,8 +187,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_letter__stringBase0; - extern "C" void __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl(); extern "C" void __dt__14dMenu_Letter_cFv(); extern "C" void _create__14dMenu_Letter_cFv(); @@ -253,14 +251,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 letter_data__12dMenu_Letter[512]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -503,7 +493,7 @@ SECTION_SDATA2 static u8 lit_3827[4] = { }; /* 804542E4-804542E8 0004+00 s=10 e=0 z=0 None .sdata2 @3828 */ -SECTION_SDATA2 static u32 lit_3828 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3828 = 1.0f; /* 801DCDC0-801DCF34 0174+00 s=0 e=2 z=0 None .text * __ct__14dMenu_Letter_cFP10JKRExpHeapP9STControlP10CSTControl */ @@ -528,16 +518,16 @@ asm dMenu_Letter_c::~dMenu_Letter_c() { /* ############################################################################################## */ /* 804542E8-804542EC 0004+00 s=1 e=0 z=0 None .sdata2 @3964 */ -SECTION_SDATA2 static u32 lit_3964 = 0x3F87AE14; +SECTION_SDATA2 static f32 lit_3964 = 53.0f / 50.0f; /* 804542EC-804542F0 0004+00 s=1 e=0 z=0 None .sdata2 @3965 */ -SECTION_SDATA2 static u32 lit_3965 = 0x3F666666; +SECTION_SDATA2 static f32 lit_3965 = 9.0f / 10.0f; /* 804542F0-804542F4 0004+00 s=1 e=0 z=0 None .sdata2 @3966 */ -SECTION_SDATA2 static u32 lit_3966 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_3966 = 1.0f / 50.0f; /* 804542F4-804542F8 0004+00 s=1 e=0 z=0 None .sdata2 @3967 */ -SECTION_SDATA2 static u32 lit_3967 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_3967 = 2.0f / 5.0f; /* 801DD36C-801DD474 0108+00 s=1 e=0 z=0 None .text _create__14dMenu_Letter_cFv */ #pragma push @@ -561,10 +551,10 @@ asm void dMenu_Letter_c::_move() { /* ############################################################################################## */ /* 804542F8-804542FC 0004+00 s=1 e=0 z=0 None .sdata2 @4054 */ -SECTION_SDATA2 static u32 lit_4054 = 0x44180000; +SECTION_SDATA2 static f32 lit_4054 = 608.0f; /* 804542FC-80454300 0004+00 s=1 e=0 z=0 None .sdata2 @4055 */ -SECTION_SDATA2 static u32 lit_4055 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4055 = 448.0f; /* 80454300-80454308 0004+04 s=3 e=0 z=0 None .sdata2 @4056 */ SECTION_SDATA2 static f32 lit_4056[1 + 1 /* padding */] = { @@ -574,9 +564,7 @@ SECTION_SDATA2 static f32 lit_4056[1 + 1 /* padding */] = { }; /* 80454308-80454310 0008+00 s=3 e=0 z=0 None .sdata2 @4058 */ -SECTION_SDATA2 static u8 lit_4058[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4058 = 4503599627370496.0 /* cast u32 to float */; /* 801DD50C-801DD934 0428+00 s=1 e=1 z=0 None .text _draw__14dMenu_Letter_cFv */ #pragma push @@ -778,9 +766,7 @@ SECTION_DEAD char const* const stringBase_80396E82 = "zelda_collect_soubi_do_ico #pragma pop /* 80454310-80454318 0008+00 s=7 e=0 z=0 None .sdata2 @4171 */ -SECTION_SDATA2 static u8 lit_4171[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4171 = 4503601774854144.0 /* cast s32 to float */; /* 801DDA74-801DDC98 0224+00 s=0 e=2 z=0 None .text _open__14dMenu_Letter_cFv */ #pragma push @@ -834,10 +820,10 @@ asm void dMenu_Letter_c::slide_right_init() { /* ############################################################################################## */ /* 80454318-8045431C 0004+00 s=3 e=0 z=0 None .sdata2 @4308 */ -SECTION_SDATA2 static u32 lit_4308 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4308 = 0.5f; /* 8045431C-80454320 0004+00 s=2 e=0 z=0 None .sdata2 @4309 */ -SECTION_SDATA2 static u32 lit_4309 = 0x42480000; +SECTION_SDATA2 static f32 lit_4309 = 50.0f; /* 80454320-80454328 0004+04 s=2 e=0 z=0 None .sdata2 @4310 */ SECTION_SDATA2 static f32 lit_4310[1 + 1 /* padding */] = { diff --git a/src/d/menu/d_menu_map_common.cpp b/src/d/menu/d_menu_map_common.cpp index 88ff153ef94..6f86ec0f45a 100644 --- a/src/d/menu/d_menu_map_common.cpp +++ b/src/d/menu/d_menu_map_common.cpp @@ -55,8 +55,6 @@ struct J2DPane { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_map_common__stringBase0; - extern "C" void __ct__16dMenuMapCommon_cFv(); extern "C" void __dt__16dMenuMapCommon_cFv(); extern "C" void initiate__16dMenuMapCommon_cFP10JKRArchive(); @@ -78,8 +76,6 @@ extern "C" extern char const* const d_menu_d_menu_map_common__stringBase0; void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_fmapHIO[1188]; extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive(); extern "C" void setScale__16dSelect_cursor_cFf(); @@ -202,7 +198,7 @@ SECTION_DEAD static char const* const pad_80395D8F = ""; #pragma pop /* 804540DC-804540E0 0004+00 s=7 e=0 z=0 None .sdata2 @3882 */ -SECTION_SDATA2 static u32 lit_3882 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3882 = 1.0f; /* 801C28D8-801C38E4 100C+00 s=0 e=2 z=0 None .text initiate__16dMenuMapCommon_cFP10JKRArchive */ @@ -217,16 +213,16 @@ asm void dMenuMapCommon_c::initiate(JKRArchive* param_0) { /* ############################################################################################## */ /* 804540E0-804540E4 0004+00 s=1 e=0 z=0 None .sdata2 @4010 */ -SECTION_SDATA2 static u32 lit_4010 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4010 = 255.0f; /* 804540E4-804540E8 0004+00 s=1 e=0 z=0 None .sdata2 @4011 */ -SECTION_SDATA2 static u32 lit_4011 = 0x3F124925; +SECTION_SDATA2 static f32 lit_4011 = 4.0f / 7.0f; /* 804540E8-804540EC 0004+00 s=3 e=0 z=0 None .sdata2 @4012 */ -SECTION_SDATA2 static u32 lit_4012 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4012 = 0.5f; /* 804540EC-804540F0 0004+00 s=1 e=0 z=0 None .sdata2 @4013 */ -SECTION_SDATA2 static u32 lit_4013 = 0x43340000; +SECTION_SDATA2 static f32 lit_4013 = 180.0f; /* 801C38E4-801C3EC4 05E0+00 s=0 e=2 z=0 None .text drawIcon__16dMenuMapCommon_cFffff */ #pragma push @@ -240,10 +236,10 @@ asm void dMenuMapCommon_c::drawIcon(f32 param_0, f32 param_1, f32 param_2, f32 p /* ############################################################################################## */ /* 804540F0-804540F4 0004+00 s=1 e=0 z=0 None .sdata2 @4072 */ -SECTION_SDATA2 static u32 lit_4072 = 0x3F17B426; +SECTION_SDATA2 static f32 lit_4072 = 16.0f / 27.0f; /* 804540F4-804540F8 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */ -SECTION_SDATA2 static u32 lit_4073 = 0x3ED097B4; +SECTION_SDATA2 static f32 lit_4073 = 11.0f / 27.0f; /* 801C3EC4-801C43A8 04E4+00 s=0 e=4 z=0 None .text iconScale__16dMenuMapCommon_cFifff */ #pragma push @@ -289,9 +285,7 @@ asm void dMenuMapCommon_c::setBlendRatio(u8 param_0, f32 param_1, f32 param_2) { /* ############################################################################################## */ /* 804540F8-80454100 0008+00 s=2 e=0 z=0 None .sdata2 @4119 */ -SECTION_SDATA2 static u8 lit_4119[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4119 = 4503601774854144.0 /* cast s32 to float */; /* 801C452C-801C4600 00D4+00 s=0 e=1 z=0 None .text blinkMove__16dMenuMapCommon_cFs */ #pragma push @@ -305,9 +299,7 @@ asm void dMenuMapCommon_c::blinkMove(s16 param_0) { /* ############################################################################################## */ /* 80454100-80454108 0008+00 s=1 e=0 z=0 None .sdata2 @4140 */ -SECTION_SDATA2 static u8 lit_4140[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4140 = 4503599627370496.0 /* cast u32 to float */; /* 801C4600-801C4738 0138+00 s=0 e=1 z=0 None .text moveLightDropAnime__16dMenuMapCommon_cFv */ diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp index 7a409713c9c..815b845c23d 100644 --- a/src/d/menu/d_menu_option.cpp +++ b/src/d/menu/d_menu_option.cpp @@ -240,10 +240,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern u8 const data_803974D8[32]; -extern "C" extern u8 const data_80397560[40]; -extern "C" extern char const* const d_menu_d_menu_option__stringBase0; - extern "C" void __ct__14dMenu_Option_cFP10JKRArchiveP9STControl(); extern "C" void __dt__14dMenu_Option_cFv(); extern "C" void _create__14dMenu_Option_cFv(); @@ -333,15 +329,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 m_gamePad__8mDoCPd_c[16]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sRumbleSupported__10JUTGamePad[4]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void mDoExt_getRubyFont__Fv(); @@ -1188,7 +1175,7 @@ SECTION_SDATA2 static u8 lit_4068[4] = { }; /* 80454330-80454334 0004+00 s=18 e=0 z=0 None .sdata2 @4069 */ -SECTION_SDATA2 static u32 lit_4069 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4069 = 1.0f; /* 801E205C-801E2C1C 0BC0+00 s=1 e=0 z=0 None .text _create__14dMenu_Option_cFv */ #pragma push @@ -1222,7 +1209,7 @@ asm void dMenu_Option_c::_move() { /* ############################################################################################## */ /* 80454334-80454338 0004+00 s=1 e=0 z=0 None .sdata2 @4442 */ -SECTION_SDATA2 static u32 lit_4442 = 0x44180000; +SECTION_SDATA2 static f32 lit_4442 = 608.0f; /* 80454338-80454340 0004+04 s=1 e=0 z=0 None .sdata2 @4443 */ SECTION_SDATA2 static f32 lit_4443[1 + 1 /* padding */] = { @@ -1232,9 +1219,7 @@ SECTION_SDATA2 static f32 lit_4443[1 + 1 /* padding */] = { }; /* 80454340-80454348 0008+00 s=1 e=0 z=0 None .sdata2 @4445 */ -SECTION_SDATA2 static u8 lit_4445[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4445 = 4503599627370496.0 /* cast u32 to float */; /* 801E36CC-801E38CC 0200+00 s=1 e=1 z=0 None .text _draw__14dMenu_Option_cFv */ #pragma push @@ -1248,16 +1233,16 @@ asm void dMenu_Option_c::_draw() { /* ############################################################################################## */ /* 80454348-8045434C 0004+00 s=1 e=0 z=0 None .sdata2 @4469 */ -SECTION_SDATA2 static u32 lit_4469 = 0x4089999A; +SECTION_SDATA2 static f32 lit_4469 = 43.0f / 10.0f; /* 8045434C-80454350 0004+00 s=1 e=0 z=0 None .sdata2 @4470 */ -SECTION_SDATA2 static u32 lit_4470 = 0xC0A00000; +SECTION_SDATA2 static f32 lit_4470 = -5.0f; /* 80454350-80454354 0004+00 s=5 e=0 z=0 None .sdata2 @4471 */ -SECTION_SDATA2 static u32 lit_4471 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4471 = 0.5f; /* 80454354-80454358 0004+00 s=11 e=0 z=0 None .sdata2 @4472 */ -SECTION_SDATA2 static u32 lit_4472 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4472 = -1.0f; /* 801E38CC-801E3A7C 01B0+00 s=1 e=0 z=0 None .text drawHaihai__14dMenu_Option_cFv */ #pragma push @@ -1301,9 +1286,7 @@ asm void dMenu_Option_c::checkRightTrigger() { /* ############################################################################################## */ /* 80454358-80454360 0008+00 s=8 e=0 z=0 None .sdata2 @4520 */ -SECTION_SDATA2 static u8 lit_4520[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4520 = 4503601774854144.0 /* cast s32 to float */; /* 801E3AEC-801E3B98 00AC+00 s=4 e=0 z=0 None .text setAnimation__14dMenu_Option_cFv */ #pragma push @@ -1407,7 +1390,7 @@ asm void dMenu_Option_c::change_init() { /* ############################################################################################## */ /* 80454360-80454364 0004+00 s=2 e=0 z=0 None .sdata2 @4862 */ -SECTION_SDATA2 static u32 lit_4862 = 0x40A00000; +SECTION_SDATA2 static f32 lit_4862 = 5.0f; /* 801E48E8-801E4B34 024C+00 s=1 e=0 z=0 None .text change_move__14dMenu_Option_cFv */ #pragma push @@ -1431,10 +1414,10 @@ asm void dMenu_Option_c::confirm_open_init() { /* ############################################################################################## */ /* 80454364-80454368 0004+00 s=2 e=0 z=0 None .sdata2 @4893 */ -SECTION_SDATA2 static u32 lit_4893 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_4893 = 2.0f / 5.0f; /* 80454368-8045436C 0004+00 s=2 e=0 z=0 None .sdata2 @4894 */ -SECTION_SDATA2 static u32 lit_4894 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4894 = 1.0f / 10.0f; /* 801E4C10-801E4CE4 00D4+00 s=1 e=0 z=0 None .text confirm_open_move__14dMenu_Option_cFv */ #pragma push @@ -1493,13 +1476,13 @@ asm void dMenu_Option_c::confirm_close_init() { /* ############################################################################################## */ /* 8045436C-80454370 0004+00 s=2 e=0 z=0 None .sdata2 @5026 */ -SECTION_SDATA2 static u32 lit_5026 = 0x3F8147AE; +SECTION_SDATA2 static f32 lit_5026 = 101.0f / 100.0f; /* 80454370-80454374 0004+00 s=2 e=0 z=0 None .sdata2 @5027 */ -SECTION_SDATA2 static u32 lit_5027 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_5027 = 17.0f / 20.0f; /* 80454374-80454378 0004+00 s=2 e=0 z=0 None .sdata2 @5028 */ -SECTION_SDATA2 static u32 lit_5028 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_5028 = 1.0f / 50.0f; /* 801E4FB0-801E51CC 021C+00 s=1 e=0 z=0 None .text confirm_close_move__14dMenu_Option_cFv */ #pragma push @@ -1813,7 +1796,7 @@ bool dMenu_Option_c::dpdMenuMove() { /* ############################################################################################## */ /* 80454378-8045437C 0004+00 s=1 e=0 z=0 None .sdata2 @6256 */ -SECTION_SDATA2 static u32 lit_6256 = 0x41200000; +SECTION_SDATA2 static f32 lit_6256 = 10.0f; /* 801E80B4-801E8210 015C+00 s=1 e=0 z=0 None .text paneResize__14dMenu_Option_cFUx */ #pragma push @@ -1879,13 +1862,13 @@ asm void dMenu_Option_c::yesnoSelectMoveAnm() { /* ############################################################################################## */ /* 8045437C-80454380 0004+00 s=1 e=0 z=0 None .sdata2 @6507 */ -SECTION_SDATA2 static u32 lit_6507 = 0x3F75C28F; +SECTION_SDATA2 static f32 lit_6507 = 24.0f / 25.0f; /* 80454380-80454384 0004+00 s=1 e=0 z=0 None .sdata2 @6508 */ -SECTION_SDATA2 static u32 lit_6508 = 0x3F570A3D; +SECTION_SDATA2 static f32 lit_6508 = 21.0f / 25.0f; /* 80454384-80454388 0004+00 s=1 e=0 z=0 None .sdata2 @6509 */ -SECTION_SDATA2 static u32 lit_6509 = 0x3D75C28F; +SECTION_SDATA2 static f32 lit_6509 = 3.0f / 50.0f; /* 801E8888-801E89F8 0170+00 s=2 e=0 z=0 None .text yesnoCursorShow__14dMenu_Option_cFv */ #pragma push diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp index e1ba60b3787..a6d7eb651f3 100644 --- a/src/d/menu/d_menu_ring.cpp +++ b/src/d/menu/d_menu_ring.cpp @@ -65,11 +65,11 @@ struct dMeter2Draw_c { JUtility::TColor, JUtility::TColor, f32, u8); }; -struct STControl {}; +struct CSTControl {}; struct JKRExpHeap {}; -struct CSTControl {}; +struct STControl {}; struct dMenu_Ring_c { /* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8); @@ -204,9 +204,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_ring__stringBase0; -extern "C" extern u8 pad_80454434[4]; - extern "C" void __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc(); extern "C" void __dt__12dMenu_Ring_cFv(); extern "C" void _create__12dMenu_Ring_cFv(); @@ -291,15 +288,6 @@ void* operator new[](u32); void operator delete(void*); void operator delete[](void*); void J2DDrawFrame(f32, f32, f32, f32, JUtility::TColor, u8); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* item_resource__10dItem_data[1530]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_ringHIO[344]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_nan; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void dComIfGs_setSelectItemIndex__FiUc(); @@ -606,31 +594,31 @@ SECTION_SDATA2 static u8 lit_4300[4] = { }; /* 8045438C-80454390 0004+00 s=3 e=0 z=0 None .sdata2 @4301 */ -SECTION_SDATA2 static u32 lit_4301 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4301 = 448.0f; /* 80454390-80454394 0004+00 s=3 e=0 z=0 None .sdata2 @4302 */ -SECTION_SDATA2 static u32 lit_4302 = 0xC3E00000; +SECTION_SDATA2 static f32 lit_4302 = -448.0f; /* 80454394-80454398 0004+00 s=3 e=0 z=0 None .sdata2 @4303 */ -SECTION_SDATA2 static u32 lit_4303 = 0x44180000; +SECTION_SDATA2 static f32 lit_4303 = 608.0f; /* 80454398-8045439C 0004+00 s=3 e=0 z=0 None .sdata2 @4304 */ -SECTION_SDATA2 static u32 lit_4304 = 0xC4180000; +SECTION_SDATA2 static f32 lit_4304 = -608.0f; /* 8045439C-804543A0 0004+00 s=18 e=0 z=0 None .sdata2 @4305 */ -SECTION_SDATA2 static u32 lit_4305 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4305 = 1.0f; /* 804543A0-804543A4 0004+00 s=2 e=0 z=0 None .sdata2 @4306 */ -SECTION_SDATA2 static u32 lit_4306 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4306 = 100.0f; /* 804543A4-804543A8 0004+00 s=5 e=0 z=0 None .sdata2 @4307 */ -SECTION_SDATA2 static u32 lit_4307 = 0x42400000; +SECTION_SDATA2 static f32 lit_4307 = 48.0f; /* 804543A8-804543AC 0004+00 s=4 e=0 z=0 None .sdata2 @4308 */ -SECTION_SDATA2 static u32 lit_4308 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4308 = 1.0f / 10.0f; /* 804543AC-804543B0 0004+00 s=4 e=0 z=0 None .sdata2 @4309 */ -SECTION_SDATA2 static u32 lit_4309 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4309 = 3.0f / 5.0f; /* 804543B0-804543B8 0004+04 s=7 e=0 z=0 None .sdata2 @4310 */ SECTION_SDATA2 static f32 lit_4310[1 + 1 /* padding */] = { @@ -640,9 +628,7 @@ SECTION_SDATA2 static f32 lit_4310[1 + 1 /* padding */] = { }; /* 804543B8-804543C0 0008+00 s=5 e=0 z=0 None .sdata2 @4312 */ -SECTION_SDATA2 static u8 lit_4312[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4312 = 4503599627370496.0 /* cast u32 to float */; /* 801E9118-801EA708 15F0+00 s=0 e=1 z=0 None .text * __ct__12dMenu_Ring_cFP10JKRExpHeapP9STControlP10CSTControlUc */ @@ -721,9 +707,7 @@ asm void dMenu_Ring_c::setKanteraPos(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 804543C8-804543D0 0008+00 s=6 e=0 z=0 None .sdata2 @4596 */ -SECTION_SDATA2 static u8 lit_4596[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4596 = 4503601774854144.0 /* cast s32 to float */; /* 801EB0A4-801EB2B4 0210+00 s=0 e=1 z=0 None .text isOpen__12dMenu_Ring_cFv */ #pragma push @@ -757,7 +741,7 @@ asm void dMenu_Ring_c::isClose() { /* ############################################################################################## */ /* 804543D0-804543D4 0004+00 s=1 e=0 z=0 None .sdata2 @4739 */ -SECTION_SDATA2 static u32 lit_4739 = 0x3F400000; +SECTION_SDATA2 static f32 lit_4739 = 0.75f; /* 801EB624-801EB8C0 029C+00 s=1 e=0 z=0 None .text getStickInfo__12dMenu_Ring_cFP9STControl */ @@ -783,10 +767,10 @@ asm void dMenu_Ring_c::calcStickAngle(STControl* param_0, u8 param_1) { /* ############################################################################################## */ /* 804543D4-804543D8 0004+00 s=2 e=0 z=0 None .sdata2 @4810 */ -SECTION_SDATA2 static u32 lit_4810 = 0x43980000; +SECTION_SDATA2 static f32 lit_4810 = 304.0f; /* 804543D8-804543DC 0004+00 s=2 e=0 z=0 None .sdata2 @4811 */ -SECTION_SDATA2 static u32 lit_4811 = 0x43600000; +SECTION_SDATA2 static f32 lit_4811 = 224.0f; /* 801EB960-801EBA38 00D8+00 s=1 e=0 z=0 None .text setRotate__12dMenu_Ring_cFv */ #pragma push @@ -884,19 +868,19 @@ asm void dMenu_Ring_c::setMixItem() { /* ############################################################################################## */ /* 804543E0-804543E4 0004+00 s=2 e=0 z=0 None .sdata2 @5366 */ -SECTION_SDATA2 static u32 lit_5366 = 0x41C00000; +SECTION_SDATA2 static f32 lit_5366 = 24.0f; /* 804543E4-804543E8 0004+00 s=3 e=0 z=0 None .sdata2 @5367 */ -SECTION_SDATA2 static u32 lit_5367 = 0x437F0000; +SECTION_SDATA2 static f32 lit_5367 = 255.0f; /* 804543E8-804543EC 0004+00 s=2 e=0 z=0 None .sdata2 @5368 */ -SECTION_SDATA2 static u32 lit_5368 = 0x41700000; +SECTION_SDATA2 static f32 lit_5368 = 15.0f; /* 804543EC-804543F0 0004+00 s=3 e=0 z=0 None .sdata2 @5369 */ -SECTION_SDATA2 static u32 lit_5369 = 0x41200000; +SECTION_SDATA2 static f32 lit_5369 = 10.0f; /* 804543F0-804543F4 0004+00 s=2 e=0 z=0 None .sdata2 @5370 */ -SECTION_SDATA2 static u32 lit_5370 = 0x3F23D70A; +SECTION_SDATA2 static f32 lit_5370 = 16.0f / 25.0f; /* 801ECB14-801ECF9C 0488+00 s=1 e=0 z=0 None .text drawItem__12dMenu_Ring_cFv */ #pragma push @@ -950,17 +934,13 @@ asm void dMenu_Ring_c::stick_move_init() { /* ############################################################################################## */ /* 804543F4-804543F8 0004+00 s=1 e=0 z=0 None .sdata2 @5648 */ -SECTION_SDATA2 static u32 lit_5648 = 0x428C0000; +SECTION_SDATA2 static f32 lit_5648 = 70.0f; /* 804543F8-80454400 0008+00 s=1 e=0 z=0 None .sdata2 @5649 */ -SECTION_SDATA2 static u8 lit_5649[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5649 = 0.5; /* 80454400-80454408 0008+00 s=1 e=0 z=0 None .sdata2 @5650 */ -SECTION_SDATA2 static u8 lit_5650[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5650 = 3.0; /* 80454408-80454410 0008+00 s=1 e=0 z=0 None .sdata2 @5651 */ SECTION_SDATA2 static u8 lit_5651[8] = { @@ -990,7 +970,7 @@ void dMenu_Ring_c::stick_explain_force_init() { /* ############################################################################################## */ /* 80454410-80454414 0004+00 s=2 e=0 z=0 None .sdata2 @5683 */ -SECTION_SDATA2 static u32 lit_5683 = 0x43160000; +SECTION_SDATA2 static f32 lit_5683 = 150.0f; /* 801ED93C-801EDA0C 00D0+00 s=1 e=0 z=0 None .text stick_explain_proc__12dMenu_Ring_cFv */ #pragma push @@ -1025,7 +1005,7 @@ asm void dMenu_Ring_c::setSelectItem(int param_0, u8 param_1) { /* ############################################################################################## */ /* 80454414-80454418 0004+00 s=1 e=0 z=0 None .sdata2 @5811 */ -SECTION_SDATA2 static u32 lit_5811 = 0x3FD9999A; +SECTION_SDATA2 static f32 lit_5811 = 17.0f / 10.0f; /* 801EDC98-801EDF2C 0294+00 s=1 e=0 z=0 None .text drawSelectItem__12dMenu_Ring_cFv */ #pragma push @@ -1099,7 +1079,7 @@ void dMenu_Ring_c::setCombineBomb(int param_0) { /* ############################################################################################## */ /* 80454418-8045441C 0004+00 s=1 e=0 z=0 None .sdata2 @6143 */ -SECTION_SDATA2 static u32 lit_6143 = 0x41800000; +SECTION_SDATA2 static f32 lit_6143 = 16.0f; /* 801EE648-801EEA84 043C+00 s=2 e=0 z=0 None .text drawNumber__12dMenu_Ring_cFiiff */ #pragma push @@ -1153,7 +1133,7 @@ asm void dMenu_Ring_c::isMixItemOff() { /* ############################################################################################## */ /* 8045441C-80454420 0004+00 s=1 e=0 z=0 None .sdata2 @6308 */ -SECTION_SDATA2 static u32 lit_6308 = 0x41900000; +SECTION_SDATA2 static f32 lit_6308 = 18.0f; /* 801EED84-801EEF14 0190+00 s=1 e=0 z=0 None .text setMixMessage__12dMenu_Ring_cFv */ #pragma push @@ -1207,7 +1187,7 @@ asm void dMenu_Ring_c::calcDistance(f32 param_0, f32 param_1, f32 param_2, f32 p /* ############################################################################################## */ /* 80454420-80454424 0004+00 s=1 e=0 z=0 None .sdata2 @6454 */ -SECTION_SDATA2 static u32 lit_6454 = 0x447A0000; +SECTION_SDATA2 static f32 lit_6454 = 1000.0f; /* 801EF1A0-801EF484 02E4+00 s=1 e=0 z=0 None .text clacEllipsePlotAverage__12dMenu_Ring_cFiff */ diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index bf46b7514c8..66207138c7f 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -311,10 +311,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_save__stringBase0; -extern "C" extern void* __vt__16dDlst_MenuSave_c[4]; -extern "C" extern void* __vt__23dDlst_MenuSaveExplain_c[4 + 18 /* padding */]; - extern "C" void __ct__9dMs_HIO_cFv(); extern "C" void __ct__12dMenu_save_cFv(); extern "C" void _create__12dMenu_save_cFv(); @@ -464,17 +460,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cAPICPad_ANY_BUTTON(u32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__12dMenu_save_c[3 + 3 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_mDoMemCd_control[8192]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_getJ2dHeap__Fv(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -1333,10 +1318,10 @@ static u8 lit_3785[12]; static u8 g_msHIO[16 + 4 /* padding */]; /* 80454438-8045443C 0004+00 s=1 e=0 z=0 None .sdata2 @3849 */ -SECTION_SDATA2 static u32 lit_3849 = 0x3F666666; +SECTION_SDATA2 static f32 lit_3849 = 9.0f / 10.0f; /* 8045443C-80454440 0004+00 s=2 e=0 z=0 None .sdata2 @3850 */ -SECTION_SDATA2 static u32 lit_3850 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3850 = 0.5f; /* 801EF7AC-801EF904 0158+00 s=0 e=3 z=0 None .text _create__12dMenu_save_cFv */ #pragma push @@ -1368,10 +1353,10 @@ SECTION_SDATA static u8 l_msgNum[2 + 2 /* padding */] = { }; /* 80454440-80454444 0004+00 s=1 e=0 z=0 None .sdata2 @4173 */ -SECTION_SDATA2 static u32 lit_4173 = 0x41980000; +SECTION_SDATA2 static f32 lit_4173 = 19.0f; /* 80454444-80454448 0004+00 s=1 e=0 z=0 None .sdata2 @4174 */ -SECTION_SDATA2 static u32 lit_4174 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4174 = 20.0f; /* 80454448-8045444C 0004+00 s=13 e=0 z=0 None .sdata2 @4175 */ SECTION_SDATA2 static u8 lit_4175[4] = { @@ -1382,25 +1367,25 @@ SECTION_SDATA2 static u8 lit_4175[4] = { }; /* 8045444C-80454450 0004+00 s=1 e=0 z=0 None .sdata2 @4176 */ -SECTION_SDATA2 static u32 lit_4176 = 0x43DC0000; +SECTION_SDATA2 static f32 lit_4176 = 440.0f; /* 80454450-80454454 0004+00 s=1 e=0 z=0 None .sdata2 @4177 */ -SECTION_SDATA2 static u32 lit_4177 = 0x43460000; +SECTION_SDATA2 static f32 lit_4177 = 198.0f; /* 80454454-80454458 0004+00 s=1 e=0 z=0 None .sdata2 @4178 */ -SECTION_SDATA2 static u32 lit_4178 = 0x41A80000; +SECTION_SDATA2 static f32 lit_4178 = 21.0f; /* 80454458-8045445C 0004+00 s=20 e=0 z=0 None .sdata2 @4179 */ -SECTION_SDATA2 static u32 lit_4179 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4179 = 1.0f; /* 8045445C-80454460 0004+00 s=3 e=0 z=0 None .sdata2 @4180 */ -SECTION_SDATA2 static u32 lit_4180 = 0x3F75C28F; +SECTION_SDATA2 static f32 lit_4180 = 24.0f / 25.0f; /* 80454460-80454464 0004+00 s=2 e=0 z=0 None .sdata2 @4181 */ -SECTION_SDATA2 static u32 lit_4181 = 0x3F70A3D7; +SECTION_SDATA2 static f32 lit_4181 = 47.0f / 50.0f; /* 80454464-80454468 0004+00 s=2 e=0 z=0 None .sdata2 @4182 */ -SECTION_SDATA2 static u32 lit_4182 = 0x3CF5C28F; +SECTION_SDATA2 static f32 lit_4182 = 3.0f / 100.0f; /* 80454468-80454470 0004+04 s=2 e=0 z=0 None .sdata2 @4183 */ SECTION_SDATA2 static f32 lit_4183[1 + 1 /* padding */] = { @@ -1410,9 +1395,7 @@ SECTION_SDATA2 static f32 lit_4183[1 + 1 /* padding */] = { }; /* 80454470-80454478 0008+00 s=17 e=0 z=0 None .sdata2 @4185 */ -SECTION_SDATA2 static u8 lit_4185[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4185 = 4503601774854144.0 /* cast s32 to float */; /* 801EF904-801F0938 1034+00 s=1 e=0 z=0 None .text screenSet__12dMenu_save_cFv */ #pragma push @@ -1637,7 +1620,7 @@ asm void dMenu_save_c::backSaveQuestion2() { /* ############################################################################################## */ /* 80454478-8045447C 0004+00 s=16 e=0 z=0 None .sdata2 @4879 */ -SECTION_SDATA2 static u32 lit_4879 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4879 = -1.0f; /* 801F1B38-801F1BF8 00C0+00 s=5 e=0 z=0 None .text closeSelect__12dMenu_save_cFv */ #pragma push @@ -2454,7 +2437,7 @@ asm void dMenu_save_c::yesnoSelectMoveAnm(u8 param_0) { /* ############################################################################################## */ /* 8045447C-80454480 0004+00 s=1 e=0 z=0 None .sdata2 @6327 */ -SECTION_SDATA2 static u32 lit_6327 = 0x3F570A3D; +SECTION_SDATA2 static f32 lit_6327 = 21.0f / 25.0f; /* 80454480-80454488 0004+04 s=1 e=0 z=0 None .sdata2 @6328 */ SECTION_SDATA2 static f32 lit_6328[1 + 1 /* padding */] = { diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp index e389a8bd4e2..6df22e2d577 100644 --- a/src/d/menu/d_menu_skill.cpp +++ b/src/d/menu/d_menu_skill.cpp @@ -44,15 +44,15 @@ struct dMeter2Info_c { /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*); }; +struct CSTControl {}; + +struct JKRExpHeap {}; + struct STControl { /* 80032524 */ void checkUpTrigger(); /* 800325A0 */ void checkDownTrigger(); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7348 */ ~dMenu_Skill_c(); @@ -133,8 +133,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_menu_d_menu_skill__stringBase0; - extern "C" void __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl(); extern "C" void __dt__13dMenu_Skill_cFv(); extern "C" void _create__13dMenu_Skill_cFv(); @@ -179,14 +177,6 @@ void dMeter2Info_set2DVibration(); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -353,7 +343,7 @@ SECTION_SDATA2 static u8 lit_3808[4] = { }; /* 8045448C-80454490 0004+00 s=6 e=0 z=0 None .sdata2 @3809 */ -SECTION_SDATA2 static u32 lit_3809 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3809 = 1.0f; /* 801F7224-801F7348 0124+00 s=0 e=2 z=0 None .text * __ct__13dMenu_Skill_cFP10JKRExpHeapP9STControlP10CSTControl */ @@ -378,16 +368,16 @@ asm dMenu_Skill_c::~dMenu_Skill_c() { /* ############################################################################################## */ /* 80454490-80454494 0004+00 s=1 e=0 z=0 None .sdata2 @3904 */ -SECTION_SDATA2 static u32 lit_3904 = 0x3F8147AE; +SECTION_SDATA2 static f32 lit_3904 = 101.0f / 100.0f; /* 80454494-80454498 0004+00 s=1 e=0 z=0 None .sdata2 @3905 */ -SECTION_SDATA2 static u32 lit_3905 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_3905 = 17.0f / 20.0f; /* 80454498-8045449C 0004+00 s=1 e=0 z=0 None .sdata2 @3906 */ -SECTION_SDATA2 static u32 lit_3906 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_3906 = 1.0f / 50.0f; /* 8045449C-804544A0 0004+00 s=1 e=0 z=0 None .sdata2 @3907 */ -SECTION_SDATA2 static u32 lit_3907 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3907 = 0.5f; /* 801F763C-801F7718 00DC+00 s=1 e=0 z=0 None .text _create__13dMenu_Skill_cFv */ #pragma push @@ -411,10 +401,10 @@ asm void dMenu_Skill_c::_move() { /* ############################################################################################## */ /* 804544A0-804544A4 0004+00 s=1 e=0 z=0 None .sdata2 @3944 */ -SECTION_SDATA2 static u32 lit_3944 = 0x44180000; +SECTION_SDATA2 static f32 lit_3944 = 608.0f; /* 804544A4-804544A8 0004+00 s=1 e=0 z=0 None .sdata2 @3945 */ -SECTION_SDATA2 static u32 lit_3945 = 0x43E00000; +SECTION_SDATA2 static f32 lit_3945 = 448.0f; /* 804544A8-804544B0 0004+04 s=3 e=0 z=0 None .sdata2 @3946 */ SECTION_SDATA2 static f32 lit_3946[1 + 1 /* padding */] = { @@ -625,9 +615,7 @@ SECTION_DEAD static char const* const pad_80397E32 = "\0\0\0\0\0"; #pragma pop /* 804544B0-804544B8 0008+00 s=4 e=0 z=0 None .sdata2 @4016 */ -SECTION_SDATA2 static u8 lit_4016[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4016 = 4503601774854144.0 /* cast s32 to float */; /* 801F7A40-801F7C1C 01DC+00 s=0 e=2 z=0 None .text _open__13dMenu_Skill_cFv */ #pragma push @@ -681,9 +669,7 @@ asm void dMenu_Skill_c::read_open_init() { /* ############################################################################################## */ /* 804544B8-804544C0 0008+00 s=2 e=0 z=0 None .sdata2 @4104 */ -SECTION_SDATA2 static u8 lit_4104[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4104 = 4503599627370496.0 /* cast u32 to float */; /* 801F7FF8-801F8114 011C+00 s=1 e=0 z=0 None .text read_open_move__13dMenu_Skill_cFv */ #pragma push diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 36a94834a2f..f6587aec73b 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -152,16 +152,16 @@ struct dMenu_save_c { /* 801F69FC */ void _draw2(); }; +struct CSTControl {}; + +struct JKRExpHeap {}; + struct STControl { /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16); /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16); /* 8003219C */ void checkTrigger(); }; -struct JKRExpHeap {}; - -struct CSTControl {}; - struct dMenu_Skill_c { /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*); /* 801F7718 */ void _move(); @@ -295,8 +295,6 @@ static void dMw_Execute(dMw_c*); static bool dMw_IsDelete(dMw_c*); static void dMw_Delete(dMw_c*); static void dMw_Create(msg_class*); -extern "C" extern char const* const d_menu_d_menu_window__stringBase0; -extern "C" extern void* g_profile_MENUWINDOW[10 + 6 /* padding */]; extern "C" void dMw_UP_TRIGGER__Fv(); extern "C" void dMw_DOWN_TRIGGER__Fv(); @@ -446,25 +444,6 @@ void dMeter2Info_set2DVibration(); void dMeter2Info_set2DVibrationM(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__10CSTControl[4]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_mwHIO[304]; -extern "C" extern u8 g_mwDHIO[520]; -extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u32 g_blackColor; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void OSReport_Error(); extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); @@ -1380,10 +1359,10 @@ SECTION_SDATA2 static u8 lit_4152[4] = { }; /* 804544C4-804544C8 0004+00 s=10 e=0 z=0 None .sdata2 @4386 */ -SECTION_SDATA2 static u32 lit_4386 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4386 = 1.0f; /* 804544C8-804544CC 0004+00 s=10 e=0 z=0 None .sdata2 @4387 */ -SECTION_SDATA2 static u32 lit_4387 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4387 = -1.0f; /* 801FA244-801FA2D0 008C+00 s=1 e=0 z=0 None .text collect_open_init__5dMw_cFUc */ #pragma push @@ -2347,10 +2326,10 @@ asm void dMw_c::dMw_fade_in() { /* ############################################################################################## */ /* 804544CC-804544D0 0004+00 s=1 e=0 z=0 None .sdata2 @6000 */ -SECTION_SDATA2 static u32 lit_6000 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_6000 = 4.0f / 5.0f; /* 804544D0-804544D4 0004+00 s=1 e=0 z=0 None .sdata2 @6001 */ -SECTION_SDATA2 static u32 lit_6001 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_6001 = 3.0f / 20.0f; /* 801FCEE8-801FCF84 009C+00 s=1 e=0 z=0 None .text checkCStickTrigger__5dMw_cFv */ #pragma push @@ -2404,7 +2383,7 @@ asm void dMw_c::checkMemSize() { /* ############################################################################################## */ /* 804544D4-804544D8 0004+00 s=1 e=0 z=0 None .sdata2 @6086 */ -SECTION_SDATA2 static u32 lit_6086 = 0x3F666666; +SECTION_SDATA2 static f32 lit_6086 = 9.0f / 10.0f; /* 804544D8-804544E0 0004+04 s=1 e=0 z=0 None .sdata2 @6087 */ SECTION_SDATA2 static f32 lit_6087[1 + 1 /* padding */] = { diff --git a/src/d/menu/d_menu_window_HIO.cpp b/src/d/menu/d_menu_window_HIO.cpp index bba51629ae0..517e87be918 100644 --- a/src/d/menu/d_menu_window_HIO.cpp +++ b/src/d/menu/d_menu_window_HIO.cpp @@ -33,9 +33,6 @@ struct dMw_DHIO_c { // Forward References: // -extern "C" extern u8 g_mwHIO[304]; -extern "C" extern u8 g_mwDHIO[520]; - extern "C" void __ct__9dMw_HIO_cFv(); extern "C" void init__9dMw_HIO_cFv(); extern "C" bool getBombFlag__9dMw_HIO_cFv(); @@ -53,7 +50,6 @@ extern "C" extern u8 g_mwDHIO[520]; // void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void isFirstBit__21dSv_player_get_item_cCFUc(); extern "C" void __dl__FPv(); diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp index a546ad34816..e93bd021e0f 100644 --- a/src/d/meter/d_meter2.cpp +++ b/src/d/meter/d_meter2.cpp @@ -263,8 +263,6 @@ static void dMeter2_Execute(dMeter2_c*); static bool dMeter2_IsDelete(dMeter2_c*); static void dMeter2_Delete(dMeter2_c*); static void dMeter2_Create(msg_class*); -extern "C" extern char const* const d_meter_d_meter2__stringBase0; -extern "C" extern void* g_profile_METER2[10]; extern "C" void _create__9dMeter2_cFv(); extern "C" void _execute__9dMeter2_cFv(); @@ -345,17 +343,6 @@ bool dMeter2Info_is2DActiveTouchArea(); void dTimer_createStockTimer(); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_mwHIO[304]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_ringHIO[344]; -extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 m_mode__7dDemo_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void fopMsgM_setStageLayer__FPv(); @@ -545,7 +532,7 @@ SECTION_SDATA2 static u8 lit_4662[4] = { }; /* 804549CC-804549D0 0004+00 s=13 e=0 z=0 None .sdata2 @4663 */ -SECTION_SDATA2 static u32 lit_4663 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4663 = 1.0f; /* 8021EA14-8021F128 0714+00 s=1 e=0 z=0 None .text _create__9dMeter2_cFv */ #pragma push @@ -643,14 +630,10 @@ asm void dMeter2_c::checkStatus() { /* ############################################################################################## */ /* 804549D8-804549E0 0008+00 s=4 e=0 z=0 None .sdata2 @5267 */ -SECTION_SDATA2 static u8 lit_5267[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5267 = 4503601774854144.0 /* cast s32 to float */; /* 804549E0-804549E8 0008+00 s=2 e=0 z=0 None .sdata2 @5268 */ -SECTION_SDATA2 static u8 lit_5268[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5268 = 4503599627370496.0 /* cast u32 to float */; /* 8021FD60-80220180 0420+00 s=1 e=0 z=0 None .text moveLife__9dMeter2_cFv */ #pragma push @@ -664,7 +647,7 @@ asm void dMeter2_c::moveLife() { /* ############################################################################################## */ /* 804549E8-804549EC 0004+00 s=4 e=0 z=0 None .sdata2 @5791 */ -SECTION_SDATA2 static u32 lit_5791 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_5791 = 1.0f / 10.0f; /* 80220180-8022051C 039C+00 s=1 e=0 z=0 None .text moveKantera__9dMeter2_cFv */ #pragma push @@ -678,7 +661,7 @@ asm void dMeter2_c::moveKantera() { /* ############################################################################################## */ /* 804549EC-804549F0 0004+00 s=2 e=0 z=0 None .sdata2 @5933 */ -SECTION_SDATA2 static u32 lit_5933 = 0x3F000000; +SECTION_SDATA2 static f32 lit_5933 = 0.5f; /* 8022051C-80220888 036C+00 s=1 e=0 z=0 None .text moveOxygen__9dMeter2_cFv */ #pragma push @@ -692,10 +675,10 @@ asm void dMeter2_c::moveOxygen() { /* ############################################################################################## */ /* 804549F0-804549F4 0004+00 s=3 e=0 z=0 None .sdata2 @6051 */ -SECTION_SDATA2 static u32 lit_6051 = 0x41200000; +SECTION_SDATA2 static f32 lit_6051 = 10.0f; /* 804549F4-804549F8 0004+00 s=1 e=0 z=0 None .sdata2 @6052 */ -SECTION_SDATA2 static u32 lit_6052 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_6052 = 1.0f / 5.0f; /* 80220888-80220C30 03A8+00 s=1 e=0 z=0 None .text moveLightDrop__9dMeter2_cFv */ #pragma push @@ -729,7 +712,7 @@ asm void dMeter2_c::moveKey() { /* ############################################################################################## */ /* 804549F8-804549FC 0004+00 s=2 e=0 z=0 None .sdata2 @6564 */ -SECTION_SDATA2 static u32 lit_6564 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_6564 = 1.0f / 100.0f; /* 80221244-802217F4 05B0+00 s=1 e=0 z=0 None .text moveButtonA__9dMeter2_cFv */ #pragma push @@ -813,10 +796,10 @@ asm void dMeter2_c::moveButtonXY() { /* ############################################################################################## */ /* 804549FC-80454A00 0004+00 s=1 e=0 z=0 None .sdata2 @7509 */ -SECTION_SDATA2 static u32 lit_7509 = 0x41700000; +SECTION_SDATA2 static f32 lit_7509 = 15.0f; /* 80454A00-80454A04 0004+00 s=1 e=0 z=0 None .sdata2 @7510 */ -SECTION_SDATA2 static u32 lit_7510 = 0x42480000; +SECTION_SDATA2 static f32 lit_7510 = 50.0f; /* 80222E88-802230F8 0270+00 s=1 e=0 z=0 None .text moveButtonCross__9dMeter2_cFv */ #pragma push @@ -985,7 +968,7 @@ asm void dMeter2_c::alphaAnimeButton() { /* ############################################################################################## */ /* 80454A04-80454A08 0004+00 s=1 e=0 z=0 None .sdata2 @9090 */ -SECTION_SDATA2 static u32 lit_9090 = 0x437F0000; +SECTION_SDATA2 static f32 lit_9090 = 255.0f; /* 80454A08-80454A10 0004+04 s=1 e=0 z=0 None .sdata2 @9091 */ SECTION_SDATA2 static f32 lit_9091[1 + 1 /* padding */] = { diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp index a725fef44a2..4a279f1f8d9 100644 --- a/src/d/meter/d_meter2_draw.cpp +++ b/src/d/meter/d_meter2_draw.cpp @@ -31,8 +31,6 @@ struct dMsgObject_c { struct JMSMesgEntry_c {}; -struct ResTIMG {}; - struct JGeometry { template struct TBox2 {}; @@ -42,6 +40,8 @@ struct JGeometry { struct ResTLUT {}; +struct ResTIMG {}; + struct J2DPicture { /* 802FC708 */ J2DPicture(ResTIMG const*); /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); @@ -56,12 +56,6 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct JUtility { - struct TColor {}; -}; - -struct JKRExpHeap {}; - struct J2DGrafContext {}; struct JKRArchive { @@ -75,6 +69,8 @@ struct J2DScreen { /* 802F9690 */ void animation(); }; +struct JKRExpHeap {}; + struct CPaneMgrAlpha { /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*); /* 802555C8 */ void show(); @@ -84,6 +80,12 @@ struct CPaneMgrAlpha { /* 80255828 */ void getAlphaRate(); }; +struct JUtility { + struct TColor {}; +}; + +struct J2DAnmColor {}; + struct J2DRotateAxis {}; struct J2DBasePosition {}; @@ -103,8 +105,6 @@ struct CPaneMgr { /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16); }; -struct J2DAnmColor {}; - struct dMeter2Draw_c { /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*); /* 802102F8 */ ~dMeter2Draw_c(); @@ -246,9 +246,6 @@ struct J2DAnmLoaderDataBase { // Forward References: // -extern "C" extern u8 const data_803988B8[24]; -extern "C" extern char const* const d_meter_d_meter2_draw__stringBase0; - extern "C" void __ct__13dMeter2Draw_cFP10JKRExpHeap(); extern "C" void __dt__13dMeter2Draw_cFv(); extern "C" void init__13dMeter2Draw_cFv(); @@ -370,13 +367,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* item_resource__10dItem_data[1530]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -915,13 +905,13 @@ SECTION_SDATA2 static u8 lit_4182[4] = { }; /* 80454884-80454888 0004+00 s=14 e=0 z=0 None .sdata2 @4183 */ -SECTION_SDATA2 static u32 lit_4183 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4183 = 1.0f; /* 80454888-8045488C 0004+00 s=5 e=0 z=0 None .sdata2 @4184 */ -SECTION_SDATA2 static u32 lit_4184 = 0x41880000; +SECTION_SDATA2 static f32 lit_4184 = 17.0f; /* 8045488C-80454890 0004+00 s=1 e=0 z=0 None .sdata2 @4185 */ -SECTION_SDATA2 static u32 lit_4185 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4185 = 20.0f; /* 8020FAB4-802102F8 0844+00 s=0 e=1 z=0 None .text __ct__13dMeter2Draw_cFP10JKRExpHeap */ #pragma push @@ -965,10 +955,10 @@ asm void dMeter2Draw_c::exec(u32 param_0) { /* ############################################################################################## */ /* 80454890-80454894 0004+00 s=1 e=0 z=0 None .sdata2 @4921 */ -SECTION_SDATA2 static u32 lit_4921 = 0x41800000; +SECTION_SDATA2 static f32 lit_4921 = 16.0f; /* 80454894-80454898 0004+00 s=9 e=0 z=0 None .sdata2 @4922 */ -SECTION_SDATA2 static u32 lit_4922 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4922 = 0.5f; /* 80454898-804548A0 0004+04 s=7 e=0 z=0 None .sdata2 @4923 */ SECTION_SDATA2 static f32 lit_4923[1 + 1 /* padding */] = { @@ -978,9 +968,7 @@ SECTION_SDATA2 static f32 lit_4923[1 + 1 /* padding */] = { }; /* 804548A0-804548A8 0008+00 s=13 e=0 z=0 None .sdata2 @4925 */ -SECTION_SDATA2 static u8 lit_4925[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4925 = 4503601774854144.0 /* cast s32 to float */; /* 8021151C-80211BEC 06D0+00 s=1 e=0 z=0 None .text draw__13dMeter2Draw_cFv */ #pragma push @@ -1113,13 +1101,13 @@ asm void dMeter2Draw_c::drawPikari(CPaneMgr* param_0, f32* param_1, f32 param_2, /* ############################################################################################## */ /* 804548A8-804548AC 0004+00 s=1 e=0 z=0 None .sdata2 @5784 */ -SECTION_SDATA2 static u32 lit_5784 = 0x41E00000; +SECTION_SDATA2 static f32 lit_5784 = 28.0f; /* 804548AC-804548B0 0004+00 s=1 e=0 z=0 None .sdata2 @5785 */ -SECTION_SDATA2 static u32 lit_5785 = 0x41C00000; +SECTION_SDATA2 static f32 lit_5785 = 24.0f; /* 804548B0-804548B4 0004+00 s=4 e=0 z=0 None .sdata2 @5786 */ -SECTION_SDATA2 static u32 lit_5786 = 0xBF800000; +SECTION_SDATA2 static f32 lit_5786 = -1.0f; /* 802140DC-8021462C 0550+00 s=1 e=6 z=0 None .text * drawPikari__13dMeter2Draw_cFffPffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorfUc @@ -1202,7 +1190,7 @@ asm void dMeter2Draw_c::setAlphaLifeAnimeMax() { /* ############################################################################################## */ /* 804548B4-804548B8 0004+00 s=1 e=0 z=0 None .sdata2 @6143 */ -SECTION_SDATA2 static u32 lit_6143 = 0x3E800000; +SECTION_SDATA2 static f32 lit_6143 = 0.25f; /* 80214EB4-80215290 03DC+00 s=1 e=0 z=0 None .text drawKanteraScreen__13dMeter2Draw_cFUc */ #pragma push @@ -1216,7 +1204,7 @@ asm void dMeter2Draw_c::drawKanteraScreen(u8 param_0) { /* ############################################################################################## */ /* 804548B8-804548BC 0004+00 s=1 e=0 z=0 None .sdata2 @6175 */ -SECTION_SDATA2 static u32 lit_6175 = 0x3D000000; +SECTION_SDATA2 static f32 lit_6175 = 0.03125f; /* 80215290-80215380 00F0+00 s=1 e=0 z=0 None .text drawMagic__13dMeter2Draw_cFssff */ #pragma push @@ -1240,12 +1228,10 @@ asm void dMeter2Draw_c::setAlphaMagicChange(bool param_0) { /* ############################################################################################## */ /* 804548BC-804548C0 0004+00 s=4 e=0 z=0 None .sdata2 @6210 */ -SECTION_SDATA2 static u32 lit_6210 = 0x40A00000; +SECTION_SDATA2 static f32 lit_6210 = 5.0f; /* 804548C0-804548C8 0008+00 s=9 e=0 z=0 None .sdata2 @6293 */ -SECTION_SDATA2 static u8 lit_6293[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6293 = 4503599627370496.0 /* cast u32 to float */; /* 802154A8-802155B8 0110+00 s=1 e=1 z=0 None .text drawKantera__13dMeter2Draw_cFllff */ #pragma push @@ -1334,7 +1320,7 @@ asm void dMeter2Draw_c::setAlphaOxygenAnimeMax() { /* ############################################################################################## */ /* 804548C8-804548CC 0004+00 s=4 e=0 z=0 None .sdata2 @6524 */ -SECTION_SDATA2 static u32 lit_6524 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_6524 = 3.0f / 10.0f; /* 80215B18-80215DA4 028C+00 s=1 e=1 z=0 None .text drawLightDrop__13dMeter2Draw_cFUcUcffffUc */ @@ -1727,7 +1713,7 @@ asm void dMeter2Draw_c::setAlphaButtonBAnimeMax() { /* ############################################################################################## */ /* 804548CC-804548D0 0004+00 s=5 e=0 z=0 None .sdata2 @8207 */ -SECTION_SDATA2 static u32 lit_8207 = 0x437F0000; +SECTION_SDATA2 static f32 lit_8207 = 255.0f; /* 802195A4-80219788 01E4+00 s=0 e=1 z=0 None .text setButtonIconAAlpha__13dMeter2Draw_cFUcUlb */ @@ -1753,10 +1739,10 @@ asm void dMeter2Draw_c::setButtonIconBAlpha(u8 param_0, u32 param_1, bool param_ /* ############################################################################################## */ /* 804548D0-804548D4 0004+00 s=1 e=0 z=0 None .sdata2 @8359 */ -SECTION_SDATA2 static u32 lit_8359 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_8359 = 2.0f / 5.0f; /* 804548D4-804548D8 0004+00 s=1 e=0 z=0 None .sdata2 @8360 */ -SECTION_SDATA2 static u32 lit_8360 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_8360 = 1.0f / 10.0f; /* 80219A84-80219E98 0414+00 s=0 e=1 z=0 None .text setButtonIconMidonaAlpha__13dMeter2Draw_cFUl */ @@ -1807,10 +1793,10 @@ asm void dMeter2Draw_c::getActionString(u8 param_0, u8 param_1, u8* param_2) { /* ############################################################################################## */ /* 804548D8-804548DC 0004+00 s=2 e=0 z=0 None .sdata2 @8548 */ -SECTION_SDATA2 static u32 lit_8548 = 0x42C80000; +SECTION_SDATA2 static f32 lit_8548 = 100.0f; /* 804548DC-804548E0 0004+00 s=2 e=0 z=0 None .sdata2 @8549 */ -SECTION_SDATA2 static u32 lit_8549 = 0x42400000; +SECTION_SDATA2 static f32 lit_8549 = 48.0f; /* 8021A468-8021A71C 02B4+00 s=2 e=0 z=0 None .text changeTextureItemB__13dMeter2Draw_cFUc */ #pragma push @@ -1877,10 +1863,10 @@ asm void dMeter2Draw_c::drawItemNum(u8 param_0, f32 param_1) { /* ############################################################################################## */ /* 804548E0-804548E4 0004+00 s=1 e=0 z=0 None .sdata2 @8774 */ -SECTION_SDATA2 static u32 lit_8774 = 0x41100000; +SECTION_SDATA2 static f32 lit_8774 = 9.0f; /* 804548E4-804548E8 0004+00 s=1 e=0 z=0 None .sdata2 @8775 */ -SECTION_SDATA2 static u32 lit_8775 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_8775 = 3.0f / 5.0f; /* 80456B90-80456B94 0004+00 s=1 e=0 z=0 None .sbss2 @8746 */ SECTION_SBSS2 static u8 lit_8746[4]; @@ -1916,52 +1902,52 @@ asm void dMeter2Draw_c::isButtonVisible() { /* ############################################################################################## */ /* 804548E8-804548EC 0004+00 s=2 e=0 z=0 None .sdata2 @8992 */ -SECTION_SDATA2 static u32 lit_8992 = 0x40800000; +SECTION_SDATA2 static f32 lit_8992 = 4.0f; /* 804548EC-804548F0 0004+00 s=1 e=0 z=0 None .sdata2 @8993 */ -SECTION_SDATA2 static u32 lit_8993 = 0xC1300000; +SECTION_SDATA2 static f32 lit_8993 = -11.0f; /* 804548F0-804548F4 0004+00 s=4 e=0 z=0 None .sdata2 @8994 */ -SECTION_SDATA2 static u32 lit_8994 = 0x3FD9999A; +SECTION_SDATA2 static f32 lit_8994 = 17.0f / 10.0f; /* 804548F4-804548F8 0004+00 s=3 e=0 z=0 None .sdata2 @8995 */ -SECTION_SDATA2 static u32 lit_8995 = 0xC0800000; +SECTION_SDATA2 static f32 lit_8995 = -4.0f; /* 804548F8-804548FC 0004+00 s=2 e=0 z=0 None .sdata2 @8996 */ -SECTION_SDATA2 static u32 lit_8996 = 0xC1133333; +SECTION_SDATA2 static f32 lit_8996 = -46.0f / 5.0f; /* 804548FC-80454900 0004+00 s=2 e=0 z=0 None .sdata2 @8997 */ -SECTION_SDATA2 static u32 lit_8997 = 0x3F733333; +SECTION_SDATA2 static f32 lit_8997 = 19.0f / 20.0f; /* 80454900-80454904 0004+00 s=2 e=0 z=0 None .sdata2 @8998 */ -SECTION_SDATA2 static u32 lit_8998 = 0x41133333; +SECTION_SDATA2 static f32 lit_8998 = 46.0f / 5.0f; /* 80454904-80454908 0004+00 s=1 e=0 z=0 None .sdata2 @8999 */ -SECTION_SDATA2 static u32 lit_8999 = 0xC1600000; +SECTION_SDATA2 static f32 lit_8999 = -14.0f; /* 80454908-8045490C 0004+00 s=2 e=0 z=0 None .sdata2 @9000 */ -SECTION_SDATA2 static u32 lit_9000 = 0x40000000; +SECTION_SDATA2 static f32 lit_9000 = 2.0f; /* 8045490C-80454910 0004+00 s=2 e=0 z=0 None .sdata2 @9001 */ -SECTION_SDATA2 static u32 lit_9001 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_9001 = 1.5f; /* 80454910-80454914 0004+00 s=2 e=0 z=0 None .sdata2 @9002 */ -SECTION_SDATA2 static u32 lit_9002 = 0x43AF0000; +SECTION_SDATA2 static f32 lit_9002 = 350.0f; /* 80454914-80454918 0004+00 s=1 e=0 z=0 None .sdata2 @9003 */ -SECTION_SDATA2 static u32 lit_9003 = 0xC0000000; +SECTION_SDATA2 static f32 lit_9003 = -2.0f; /* 80454918-8045491C 0004+00 s=1 e=0 z=0 None .sdata2 @9004 */ -SECTION_SDATA2 static u32 lit_9004 = 0xC1700000; +SECTION_SDATA2 static f32 lit_9004 = -15.0f; /* 8045491C-80454920 0004+00 s=3 e=0 z=0 None .sdata2 @9005 */ -SECTION_SDATA2 static u32 lit_9005 = 0xBFA66666; +SECTION_SDATA2 static f32 lit_9005 = -13.0f / 10.0f; /* 80454920-80454924 0004+00 s=2 e=0 z=0 None .sdata2 @9006 */ -SECTION_SDATA2 static u32 lit_9006 = 0xC1800000; +SECTION_SDATA2 static f32 lit_9006 = -16.0f; /* 80454924-80454928 0004+00 s=3 e=0 z=0 None .sdata2 @9007 */ -SECTION_SDATA2 static u32 lit_9007 = 0x3FF1C71D; +SECTION_SDATA2 static f32 lit_9007 = 1.888888955116272f; /* 8021B104-8021B364 0260+00 s=3 e=0 z=0 None .text setItemParamX__13dMeter2Draw_cFUc */ #pragma push @@ -1975,19 +1961,19 @@ asm void dMeter2Draw_c::setItemParamX(u8 param_0) { /* ############################################################################################## */ /* 80454928-8045492C 0004+00 s=3 e=0 z=0 None .sdata2 @9025 */ -SECTION_SDATA2 static u32 lit_9025 = 0x41600000; +SECTION_SDATA2 static f32 lit_9025 = 14.0f; /* 8045492C-80454930 0004+00 s=2 e=0 z=0 None .sdata2 @9026 */ -SECTION_SDATA2 static u32 lit_9026 = 0x3FA66666; +SECTION_SDATA2 static f32 lit_9026 = 13.0f / 10.0f; /* 80454930-80454934 0004+00 s=2 e=0 z=0 None .sdata2 @9027 */ -SECTION_SDATA2 static u32 lit_9027 = 0xC0D33333; +SECTION_SDATA2 static f32 lit_9027 = -33.0f / 5.0f; /* 80454934-80454938 0004+00 s=2 e=0 z=0 None .sdata2 @9028 */ -SECTION_SDATA2 static u32 lit_9028 = 0x40D33333; +SECTION_SDATA2 static f32 lit_9028 = 33.0f / 5.0f; /* 80454938-8045493C 0004+00 s=1 e=0 z=0 None .sdata2 @9029 */ -SECTION_SDATA2 static u32 lit_9029 = 0xBFE66666; +SECTION_SDATA2 static f32 lit_9029 = -9.0f / 5.0f; /* 8021B364-8021B5B0 024C+00 s=3 e=0 z=0 None .text setItemParamY__13dMeter2Draw_cFUc */ #pragma push @@ -2001,22 +1987,22 @@ asm void dMeter2Draw_c::setItemParamY(u8 param_0) { /* ############################################################################################## */ /* 8045493C-80454940 0004+00 s=2 e=0 z=0 None .sdata2 @9047 */ -SECTION_SDATA2 static u32 lit_9047 = 0x400CCCCD; +SECTION_SDATA2 static f32 lit_9047 = 11.0f / 5.0f; /* 80454940-80454944 0004+00 s=2 e=0 z=0 None .sdata2 @9048 */ -SECTION_SDATA2 static u32 lit_9048 = 0xC1F00000; +SECTION_SDATA2 static f32 lit_9048 = -30.0f; /* 80454944-80454948 0004+00 s=2 e=0 z=0 None .sdata2 @9049 */ -SECTION_SDATA2 static u32 lit_9049 = 0x3F400000; +SECTION_SDATA2 static f32 lit_9049 = 0.75f; /* 80454948-8045494C 0004+00 s=2 e=0 z=0 None .sdata2 @9050 */ -SECTION_SDATA2 static u32 lit_9050 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_9050 = 4.0f / 5.0f; /* 8045494C-80454950 0004+00 s=2 e=0 z=0 None .sdata2 @9051 */ -SECTION_SDATA2 static u32 lit_9051 = 0x3FB33333; +SECTION_SDATA2 static f32 lit_9051 = 7.0f / 5.0f; /* 80454950-80454954 0004+00 s=1 e=0 z=0 None .sdata2 @9052 */ -SECTION_SDATA2 static u32 lit_9052 = 0xC0600000; +SECTION_SDATA2 static f32 lit_9052 = -3.5f; /* 8021B5B0-8021B810 0260+00 s=3 e=0 z=0 None .text setItemParamZ__13dMeter2Draw_cFUc */ #pragma push @@ -2030,55 +2016,55 @@ asm void dMeter2Draw_c::setItemParamZ(u8 param_0) { /* ############################################################################################## */ /* 80454954-80454958 0004+00 s=1 e=0 z=0 None .sdata2 @9089 */ -SECTION_SDATA2 static u32 lit_9089 = 0x418A6666; +SECTION_SDATA2 static f32 lit_9089 = 17.299999237060547f; /* 80454958-8045495C 0004+00 s=1 e=0 z=0 None .sdata2 @9090 */ -SECTION_SDATA2 static u32 lit_9090 = 0xC23B3333; +SECTION_SDATA2 static f32 lit_9090 = -46.79999923706055f; /* 8045495C-80454960 0004+00 s=1 e=0 z=0 None .sdata2 @9091 */ -SECTION_SDATA2 static u32 lit_9091 = 0x41D00000; +SECTION_SDATA2 static f32 lit_9091 = 26.0f; /* 80454960-80454964 0004+00 s=1 e=0 z=0 None .sdata2 @9092 */ -SECTION_SDATA2 static u32 lit_9092 = 0xC25ACCCD; +SECTION_SDATA2 static f32 lit_9092 = -54.70000076293945f; /* 80454964-80454968 0004+00 s=1 e=0 z=0 None .sdata2 @9093 */ -SECTION_SDATA2 static u32 lit_9093 = 0x41A5999A; +SECTION_SDATA2 static f32 lit_9093 = 20.700000762939453f; /* 80454968-8045496C 0004+00 s=1 e=0 z=0 None .sdata2 @9094 */ -SECTION_SDATA2 static u32 lit_9094 = 0xC25ECCCD; +SECTION_SDATA2 static f32 lit_9094 = -55.70000076293945f; /* 8045496C-80454970 0004+00 s=1 e=0 z=0 None .sdata2 @9095 */ -SECTION_SDATA2 static u32 lit_9095 = 0x41766666; +SECTION_SDATA2 static f32 lit_9095 = 77.0f / 5.0f; /* 80454970-80454974 0004+00 s=1 e=0 z=0 None .sdata2 @9096 */ -SECTION_SDATA2 static u32 lit_9096 = 0xC23F3333; +SECTION_SDATA2 static f32 lit_9096 = -47.79999923706055f; /* 80454974-80454978 0004+00 s=1 e=0 z=0 None .sdata2 @9097 */ -SECTION_SDATA2 static u32 lit_9097 = 0x41BA6666; +SECTION_SDATA2 static f32 lit_9097 = 23.299999237060547f; /* 80454978-8045497C 0004+00 s=1 e=0 z=0 None .sdata2 @9098 */ -SECTION_SDATA2 static u32 lit_9098 = 0x41EA6666; +SECTION_SDATA2 static f32 lit_9098 = 29.299999237060547f; /* 8045497C-80454980 0004+00 s=1 e=0 z=0 None .sdata2 @9099 */ -SECTION_SDATA2 static u32 lit_9099 = 0x41A26666; +SECTION_SDATA2 static f32 lit_9099 = 20.299999237060547f; /* 80454980-80454984 0004+00 s=1 e=0 z=0 None .sdata2 @9100 */ -SECTION_SDATA2 static u32 lit_9100 = 0x41400000; +SECTION_SDATA2 static f32 lit_9100 = 12.0f; /* 80454984-80454988 0004+00 s=1 e=0 z=0 None .sdata2 @9101 */ -SECTION_SDATA2 static u32 lit_9101 = 0xC1B00000; +SECTION_SDATA2 static f32 lit_9101 = -22.0f; /* 80454988-8045498C 0004+00 s=1 e=0 z=0 None .sdata2 @9102 */ -SECTION_SDATA2 static u32 lit_9102 = 0x41A80000; +SECTION_SDATA2 static f32 lit_9102 = 21.0f; /* 8045498C-80454990 0004+00 s=1 e=0 z=0 None .sdata2 @9103 */ -SECTION_SDATA2 static u32 lit_9103 = 0xC23ACCCD; +SECTION_SDATA2 static f32 lit_9103 = -46.70000076293945f; /* 80454990-80454994 0004+00 s=1 e=0 z=0 None .sdata2 @9104 */ -SECTION_SDATA2 static u32 lit_9104 = 0x41980000; +SECTION_SDATA2 static f32 lit_9104 = 19.0f; /* 80454994-80454998 0004+00 s=1 e=0 z=0 None .sdata2 @9105 */ -SECTION_SDATA2 static u32 lit_9105 = 0xC2340000; +SECTION_SDATA2 static f32 lit_9105 = -45.0f; /* 8021B810-8021BB6C 035C+00 s=3 e=0 z=0 None .text setItemParamB__13dMeter2Draw_cFUc */ #pragma push diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp index 04b4a2fd761..37ca9f9841d 100644 --- a/src/d/meter/d_meter2_info.cpp +++ b/src/d/meter/d_meter2_info.cpp @@ -60,18 +60,18 @@ struct dMeterMap_c { /* 8020D900 */ void isMapOpenCheck(); }; +struct cXyz {}; + struct JMSMesgEntry_c {}; +struct J2DPicture {}; + +struct JUTFont {}; + struct J2DTextBox { /* 8021C7F4 */ void getFont() const; }; -struct JUTFont {}; - -struct cXyz {}; - -struct J2DPicture {}; - struct dMeter2Info_c { /* 8021BDDC */ dMeter2Info_c(); /* 8021BE20 */ ~dMeter2Info_c(); @@ -146,9 +146,6 @@ void dMeter2Info_setNewLetterSender(); void dMeter2Info_recieveLetter(); void dMeter2Info_set2DVibration(); void dMeter2Info_set2DVibrationM(); -extern "C" extern char const* const d_meter_d_meter2_info__stringBase0; -extern "C" extern u8 letter_data__12dMenu_Letter[512]; -extern "C" extern u8 g_meter2_info[248]; extern "C" void __ct__13dMeter2Info_cFv(); extern "C" void __dt__13dMeter2Info_cFv(); @@ -228,9 +225,6 @@ void dComIfGs_setWarpItemData(char const*, cXyz, s16, s8, u8, u8); void dComIfGs_setWarpMarkFlag(u8); void daNpcF_getPlayerInfoFromPlayerList(int, int, cXyz&, csXyz&); void operator delete(void*); -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* item_resource__10dItem_data[1530]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; SECTION_INIT void memcpy(); extern "C" void dComIfGs_setSelectItemIndex__FiUc(); @@ -605,19 +599,19 @@ SECTION_SDATA2 static u8 lit_3916[4] = { }; /* 8045499C-804549A0 0004+00 s=1 e=0 z=0 None .sdata2 @3917 */ -SECTION_SDATA2 static u32 lit_3917 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3917 = 1.0f; /* 804549A0-804549A4 0004+00 s=1 e=0 z=0 None .sdata2 @3918 */ -SECTION_SDATA2 static u32 lit_3918 = 0x41F00000; +SECTION_SDATA2 static f32 lit_3918 = 30.0f; /* 804549A4-804549A8 0004+00 s=1 e=0 z=0 None .sdata2 @3919 */ -SECTION_SDATA2 static u32 lit_3919 = 0x43980000; +SECTION_SDATA2 static f32 lit_3919 = 304.0f; /* 804549A8-804549AC 0004+00 s=1 e=0 z=0 None .sdata2 @3920 */ -SECTION_SDATA2 static u32 lit_3920 = 0x43600000; +SECTION_SDATA2 static f32 lit_3920 = 224.0f; /* 804549AC-804549B0 0004+00 s=1 e=0 z=0 None .sdata2 @3921 */ -SECTION_SDATA2 static u32 lit_3921 = 0x44180000; +SECTION_SDATA2 static f32 lit_3921 = 608.0f; /* 804549B0-804549B8 0004+04 s=1 e=0 z=0 None .sdata2 @3922 */ SECTION_SDATA2 static f32 lit_3922[1 + 1 /* padding */] = { @@ -734,9 +728,7 @@ asm void dMeter2Info_c::getStringKanji(u32 param_0, char* param_1, JMSMesgEntry_ /* ############################################################################################## */ /* 804549B8-804549C0 0008+00 s=2 e=0 z=0 None .sdata2 @4108 */ -SECTION_SDATA2 static u8 lit_4108[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4108 = 4503601774854144.0 /* cast s32 to float */; /* 8021C6A4-8021C7F4 0150+00 s=0 e=1 z=0 None .text * getStringLength__13dMeter2Info_cFP10J2DTextBoxPc */ @@ -1079,9 +1071,7 @@ asm void dMeter2Info_getPlusTextureName() { /* ############################################################################################## */ /* 804549C0-804549C8 0008+00 s=1 e=0 z=0 None .sdata2 @5206 */ -SECTION_SDATA2 static u8 lit_5206[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5206 = 4503599627370496.0 /* cast u32 to float */; /* 8021E308-8021E4B0 01A8+00 s=0 e=3 z=0 None .text dMeter2Info_getPixel__FffffffPC7ResTIMG */ #pragma push diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp index d98b02e0e73..194aa42654d 100644 --- a/src/d/meter/d_meter_HIO.cpp +++ b/src/d/meter/d_meter_HIO.cpp @@ -114,14 +114,6 @@ struct JKRHeap { // Forward References: // -extern "C" extern u8 const data_80397F40[24]; -extern "C" extern u8 const data_80397F58[24]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_ringHIO[344]; -extern "C" extern u8 g_fmapHIO[1188]; -extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */]; -extern "C" extern u8 g_menuHIO[8]; - extern "C" void __ct__16dMeter_menuHIO_cFv(); extern "C" void __ct__23dMeter_drawCollectHIO_cFv(); extern "C" void __ct__22dMeter_drawOptionHIO_cFv(); @@ -314,22 +306,22 @@ asm dMeter_menuHIO_c::dMeter_menuHIO_c() { /* ############################################################################################## */ /* 804544E0-804544E4 0004+00 s=12 e=0 z=0 None .sdata2 @3787 */ -SECTION_SDATA2 static u32 lit_3787 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3787 = 1.0f; /* 804544E4-804544E8 0004+00 s=5 e=0 z=0 None .sdata2 @3788 */ -SECTION_SDATA2 static u32 lit_3788 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_3788 = 1.5f; /* 804544E8-804544EC 0004+00 s=6 e=0 z=0 None .sdata2 @3789 */ -SECTION_SDATA2 static u32 lit_3789 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_3789 = 11.0f / 10.0f; /* 804544EC-804544F0 0004+00 s=2 e=0 z=0 None .sdata2 @3790 */ -SECTION_SDATA2 static u32 lit_3790 = 0xC1400000; +SECTION_SDATA2 static f32 lit_3790 = -12.0f; /* 804544F0-804544F4 0004+00 s=4 e=0 z=0 None .sdata2 @3791 */ -SECTION_SDATA2 static u32 lit_3791 = 0x3FA66666; +SECTION_SDATA2 static f32 lit_3791 = 13.0f / 10.0f; /* 804544F4-804544F8 0004+00 s=5 e=0 z=0 None .sdata2 @3792 */ -SECTION_SDATA2 static u32 lit_3792 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_3792 = 4.0f / 5.0f; /* 804544F8-804544FC 0004+00 s=11 e=0 z=0 None .sdata2 @3793 */ SECTION_SDATA2 static u8 lit_3793[4] = { @@ -340,31 +332,31 @@ SECTION_SDATA2 static u8 lit_3793[4] = { }; /* 804544FC-80454500 0004+00 s=2 e=0 z=0 None .sdata2 @3794 */ -SECTION_SDATA2 static u32 lit_3794 = 0xC0A00000; +SECTION_SDATA2 static f32 lit_3794 = -5.0f; /* 80454500-80454504 0004+00 s=3 e=0 z=0 None .sdata2 @3795 */ -SECTION_SDATA2 static u32 lit_3795 = 0x40800000; +SECTION_SDATA2 static f32 lit_3795 = 4.0f; /* 80454504-80454508 0004+00 s=6 e=0 z=0 None .sdata2 @3796 */ -SECTION_SDATA2 static u32 lit_3796 = 0x3F666666; +SECTION_SDATA2 static f32 lit_3796 = 9.0f / 10.0f; /* 80454508-8045450C 0004+00 s=1 e=0 z=0 None .sdata2 @3797 */ -SECTION_SDATA2 static u32 lit_3797 = 0xC1B26666; +SECTION_SDATA2 static f32 lit_3797 = -22.299999237060547f; /* 8045450C-80454510 0004+00 s=1 e=0 z=0 None .sdata2 @3798 */ -SECTION_SDATA2 static u32 lit_3798 = 0x41C73333; +SECTION_SDATA2 static f32 lit_3798 = 24.899999618530273f; /* 80454510-80454514 0004+00 s=4 e=0 z=0 None .sdata2 @3799 */ -SECTION_SDATA2 static u32 lit_3799 = 0x41C80000; +SECTION_SDATA2 static f32 lit_3799 = 25.0f; /* 80454514-80454518 0004+00 s=1 e=0 z=0 None .sdata2 @3800 */ -SECTION_SDATA2 static u32 lit_3800 = 0xC1C73333; +SECTION_SDATA2 static f32 lit_3800 = -24.899999618530273f; /* 80454518-8045451C 0004+00 s=1 e=0 z=0 None .sdata2 @3801 */ -SECTION_SDATA2 static u32 lit_3801 = 0xC1DC0000; +SECTION_SDATA2 static f32 lit_3801 = -27.5f; /* 8045451C-80454520 0004+00 s=1 e=0 z=0 None .sdata2 @3802 */ -SECTION_SDATA2 static u32 lit_3802 = 0x41D00000; +SECTION_SDATA2 static f32 lit_3802 = 26.0f; /* 801FE348-801FE4EC 01A4+00 s=1 e=0 z=0 None .text __ct__23dMeter_drawCollectHIO_cFv */ #pragma push @@ -378,19 +370,19 @@ asm dMeter_drawCollectHIO_c::dMeter_drawCollectHIO_c() { /* ############################################################################################## */ /* 80454520-80454524 0004+00 s=3 e=0 z=0 None .sdata2 @3828 */ -SECTION_SDATA2 static u32 lit_3828 = 0x3F828F5C; +SECTION_SDATA2 static f32 lit_3828 = 51.0f / 50.0f; /* 80454524-80454528 0004+00 s=3 e=0 z=0 None .sdata2 @3829 */ -SECTION_SDATA2 static u32 lit_3829 = 0x3F7AE148; +SECTION_SDATA2 static f32 lit_3829 = 49.0f / 50.0f; /* 80454528-8045452C 0004+00 s=4 e=0 z=0 None .sdata2 @3830 */ -SECTION_SDATA2 static u32 lit_3830 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_3830 = 3.0f / 10.0f; /* 8045452C-80454530 0004+00 s=1 e=0 z=0 None .sdata2 @3831 */ -SECTION_SDATA2 static u32 lit_3831 = 0x42340000; +SECTION_SDATA2 static f32 lit_3831 = 45.0f; /* 80454530-80454534 0004+00 s=1 e=0 z=0 None .sdata2 @3832 */ -SECTION_SDATA2 static u32 lit_3832 = 0x42180000; +SECTION_SDATA2 static f32 lit_3832 = 38.0f; /* 801FE4EC-801FE5CC 00E0+00 s=1 e=0 z=0 None .text __ct__22dMeter_drawOptionHIO_cFv */ #pragma push @@ -404,7 +396,7 @@ asm dMeter_drawOptionHIO_c::dMeter_drawOptionHIO_c() { /* ############################################################################################## */ /* 80454534-80454538 0004+00 s=4 e=0 z=0 None .sdata2 @3867 */ -SECTION_SDATA2 static u32 lit_3867 = 0xC1A00000; +SECTION_SDATA2 static f32 lit_3867 = -20.0f; /* 801FE5CC-801FE730 0164+00 s=1 e=0 z=0 None .text __ct__22dMeter_drawLetterHIO_cFv */ #pragma push @@ -544,22 +536,22 @@ SECTION_RODATA static u8 const fishnPosY[24] = { }; /* 80454538-8045453C 0004+00 s=1 e=0 z=0 None .sdata2 @3902 */ -SECTION_SDATA2 static u32 lit_3902 = 0x3F547AE1; +SECTION_SDATA2 static f32 lit_3902 = 83.0f / 100.0f; /* 8045453C-80454540 0004+00 s=3 e=0 z=0 None .sdata2 @3903 */ -SECTION_SDATA2 static u32 lit_3903 = 0x40A00000; +SECTION_SDATA2 static f32 lit_3903 = 5.0f; /* 80454540-80454544 0004+00 s=1 e=0 z=0 None .sdata2 @3904 */ -SECTION_SDATA2 static u32 lit_3904 = 0xC1B1999A; +SECTION_SDATA2 static f32 lit_3904 = -111.0f / 5.0f; /* 80454544-80454548 0004+00 s=1 e=0 z=0 None .sdata2 @3905 */ -SECTION_SDATA2 static u32 lit_3905 = 0xC33D8000; +SECTION_SDATA2 static f32 lit_3905 = -189.5f; /* 80454548-8045454C 0004+00 s=1 e=0 z=0 None .sdata2 @3906 */ -SECTION_SDATA2 static u32 lit_3906 = 0xC07CCCCD; +SECTION_SDATA2 static f32 lit_3906 = -79.0f / 20.0f; /* 8045454C-80454550 0004+00 s=1 e=0 z=0 None .sdata2 @3907 */ -SECTION_SDATA2 static u32 lit_3907 = 0xC33C0000; +SECTION_SDATA2 static f32 lit_3907 = -188.0f; /* 801FE730-801FE8DC 01AC+00 s=1 e=0 z=0 None .text __ct__23dMeter_drawFishingHIO_cFv */ #pragma push @@ -573,19 +565,19 @@ asm dMeter_drawFishingHIO_c::dMeter_drawFishingHIO_c() { /* ############################################################################################## */ /* 80454550-80454554 0004+00 s=1 e=0 z=0 None .sdata2 @3912 */ -SECTION_SDATA2 static u32 lit_3912 = 0x429A0000; +SECTION_SDATA2 static f32 lit_3912 = 77.0f; /* 80454554-80454558 0004+00 s=1 e=0 z=0 None .sdata2 @3913 */ -SECTION_SDATA2 static u32 lit_3913 = 0x422C0000; +SECTION_SDATA2 static f32 lit_3913 = 43.0f; /* 80454558-8045455C 0004+00 s=1 e=0 z=0 None .sdata2 @3914 */ -SECTION_SDATA2 static u32 lit_3914 = 0x42EE0000; +SECTION_SDATA2 static f32 lit_3914 = 119.0f; /* 8045455C-80454560 0004+00 s=5 e=0 z=0 None .sdata2 @3915 */ -SECTION_SDATA2 static u32 lit_3915 = 0x41A00000; +SECTION_SDATA2 static f32 lit_3915 = 20.0f; /* 80454560-80454564 0004+00 s=1 e=0 z=0 None .sdata2 @3916 */ -SECTION_SDATA2 static u32 lit_3916 = 0xC2080000; +SECTION_SDATA2 static f32 lit_3916 = -34.0f; /* 801FE8DC-801FE954 0078+00 s=1 e=0 z=0 None .text __ct__22dMeter_drawInsectHIO_cFv */ #pragma push @@ -599,7 +591,7 @@ asm dMeter_drawInsectHIO_c::dMeter_drawInsectHIO_c() { /* ############################################################################################## */ /* 80454564-80454568 0004+00 s=3 e=0 z=0 None .sdata2 @3921 */ -SECTION_SDATA2 static u32 lit_3921 = 0x3F400000; +SECTION_SDATA2 static f32 lit_3921 = 0.75f; /* 801FE954-801FE990 003C+00 s=1 e=0 z=0 None .text __ct__27dMeter_drawCalibrationHIO_cFv */ #pragma push @@ -613,10 +605,10 @@ asm dMeter_drawCalibrationHIO_c::dMeter_drawCalibrationHIO_c() { /* ############################################################################################## */ /* 80454568-8045456C 0004+00 s=1 e=0 z=0 None .sdata2 @3956 */ -SECTION_SDATA2 static u32 lit_3956 = 0x42A00000; +SECTION_SDATA2 static f32 lit_3956 = 80.0f; /* 8045456C-80454570 0004+00 s=5 e=0 z=0 None .sdata2 @3957 */ -SECTION_SDATA2 static u32 lit_3957 = 0x3F733333; +SECTION_SDATA2 static f32 lit_3957 = 19.0f / 20.0f; /* 801FE990-801FEAF0 0160+00 s=1 e=0 z=0 None .text __ct__21dMeter_drawSkillHIO_cFv */ #pragma push @@ -630,49 +622,49 @@ asm dMeter_drawSkillHIO_c::dMeter_drawSkillHIO_c() { /* ############################################################################################## */ /* 80454570-80454574 0004+00 s=5 e=0 z=0 None .sdata2 @4028 */ -SECTION_SDATA2 static u32 lit_4028 = 0x40200000; +SECTION_SDATA2 static f32 lit_4028 = 2.5f; /* 80454574-80454578 0004+00 s=2 e=0 z=0 None .sdata2 @4029 */ -SECTION_SDATA2 static u32 lit_4029 = 0x3F45CFFF; +SECTION_SDATA2 static f32 lit_4029 = 0.7727050185203552f; /* 80454578-8045457C 0004+00 s=3 e=0 z=0 None .sdata2 @4030 */ -SECTION_SDATA2 static u32 lit_4030 = 0x40400000; +SECTION_SDATA2 static f32 lit_4030 = 3.0f; /* 8045457C-80454580 0004+00 s=1 e=0 z=0 None .sdata2 @4031 */ -SECTION_SDATA2 static u32 lit_4031 = 0x40000000; +SECTION_SDATA2 static f32 lit_4031 = 2.0f; /* 80454580-80454584 0004+00 s=1 e=0 z=0 None .sdata2 @4032 */ -SECTION_SDATA2 static u32 lit_4032 = 0x3F933333; +SECTION_SDATA2 static f32 lit_4032 = 23.0f / 20.0f; /* 80454584-80454588 0004+00 s=1 e=0 z=0 None .sdata2 @4033 */ -SECTION_SDATA2 static u32 lit_4033 = 0x420C0000; +SECTION_SDATA2 static f32 lit_4033 = 35.0f; /* 80454588-8045458C 0004+00 s=2 e=0 z=0 None .sdata2 @4034 */ -SECTION_SDATA2 static u32 lit_4034 = 0x432F0000; +SECTION_SDATA2 static f32 lit_4034 = 175.0f; /* 8045458C-80454590 0004+00 s=1 e=0 z=0 None .sdata2 @4035 */ -SECTION_SDATA2 static u32 lit_4035 = 0xC3C40000; +SECTION_SDATA2 static f32 lit_4035 = -392.0f; /* 80454590-80454594 0004+00 s=2 e=0 z=0 None .sdata2 @4036 */ -SECTION_SDATA2 static u32 lit_4036 = 0xC1D00000; +SECTION_SDATA2 static f32 lit_4036 = -26.0f; /* 80454594-80454598 0004+00 s=1 e=0 z=0 None .sdata2 @4037 */ -SECTION_SDATA2 static u32 lit_4037 = 0x42860000; +SECTION_SDATA2 static f32 lit_4037 = 67.0f; /* 80454598-8045459C 0004+00 s=3 e=0 z=0 None .sdata2 @4038 */ -SECTION_SDATA2 static u32 lit_4038 = 0x41400000; +SECTION_SDATA2 static f32 lit_4038 = 12.0f; /* 8045459C-804545A0 0004+00 s=3 e=0 z=0 None .sdata2 @4039 */ -SECTION_SDATA2 static u32 lit_4039 = 0x41880000; +SECTION_SDATA2 static f32 lit_4039 = 17.0f; /* 804545A0-804545A4 0004+00 s=1 e=0 z=0 None .sdata2 @4040 */ -SECTION_SDATA2 static u32 lit_4040 = 0xC1880000; +SECTION_SDATA2 static f32 lit_4040 = -17.0f; /* 804545A4-804545A8 0004+00 s=2 e=0 z=0 None .sdata2 @4041 */ -SECTION_SDATA2 static u32 lit_4041 = 0xC0C00000; +SECTION_SDATA2 static f32 lit_4041 = -6.0f; /* 804545A8-804545AC 0004+00 s=3 e=0 z=0 None .sdata2 @4042 */ -SECTION_SDATA2 static u32 lit_4042 = 0xC1000000; +SECTION_SDATA2 static f32 lit_4042 = -8.0f; /* 801FEAF0-801FEFF0 0500+00 s=1 e=0 z=0 None .text __ct__25dMeter_drawEmpButtonHIO_cFv */ #pragma push @@ -686,73 +678,73 @@ asm dMeter_drawEmpButtonHIO_c::dMeter_drawEmpButtonHIO_c() { /* ############################################################################################## */ /* 804545AC-804545B0 0004+00 s=4 e=0 z=0 None .sdata2 @4071 */ -SECTION_SDATA2 static u32 lit_4071 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_4071 = 6.0f / 5.0f; /* 804545B0-804545B4 0004+00 s=1 e=0 z=0 None .sdata2 @4072 */ -SECTION_SDATA2 static u32 lit_4072 = 0x434F0000; +SECTION_SDATA2 static f32 lit_4072 = 207.0f; /* 804545B4-804545B8 0004+00 s=1 e=0 z=0 None .sdata2 @4073 */ -SECTION_SDATA2 static u32 lit_4073 = 0xC22C0000; +SECTION_SDATA2 static f32 lit_4073 = -43.0f; /* 804545B8-804545BC 0004+00 s=5 e=0 z=0 None .sdata2 @4074 */ -SECTION_SDATA2 static u32 lit_4074 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4074 = 0.5f; /* 804545BC-804545C0 0004+00 s=1 e=0 z=0 None .sdata2 @4075 */ -SECTION_SDATA2 static u32 lit_4075 = 0x439E8000; +SECTION_SDATA2 static f32 lit_4075 = 317.0f; /* 804545C0-804545C4 0004+00 s=5 e=0 z=0 None .sdata2 @4076 */ -SECTION_SDATA2 static u32 lit_4076 = 0x3F333333; +SECTION_SDATA2 static f32 lit_4076 = 7.0f / 10.0f; /* 804545C4-804545C8 0004+00 s=1 e=0 z=0 None .sdata2 @4077 */ -SECTION_SDATA2 static u32 lit_4077 = 0xC3898000; +SECTION_SDATA2 static f32 lit_4077 = -275.0f; /* 804545C8-804545CC 0004+00 s=2 e=0 z=0 None .sdata2 @4078 */ -SECTION_SDATA2 static u32 lit_4078 = 0x42980000; +SECTION_SDATA2 static f32 lit_4078 = 76.0f; /* 804545CC-804545D0 0004+00 s=2 e=0 z=0 None .sdata2 @4079 */ -SECTION_SDATA2 static u32 lit_4079 = 0xC1B00000; +SECTION_SDATA2 static f32 lit_4079 = -22.0f; /* 804545D0-804545D4 0004+00 s=2 e=0 z=0 None .sdata2 @4080 */ -SECTION_SDATA2 static u32 lit_4080 = 0xC1F00000; +SECTION_SDATA2 static f32 lit_4080 = -30.0f; /* 804545D4-804545D8 0004+00 s=4 e=0 z=0 None .sdata2 @4081 */ -SECTION_SDATA2 static u32 lit_4081 = 0x3FB33333; +SECTION_SDATA2 static f32 lit_4081 = 7.0f / 5.0f; /* 804545D8-804545DC 0004+00 s=1 e=0 z=0 None .sdata2 @4082 */ -SECTION_SDATA2 static u32 lit_4082 = 0x43460000; +SECTION_SDATA2 static f32 lit_4082 = 198.0f; /* 804545DC-804545E0 0004+00 s=2 e=0 z=0 None .sdata2 @4083 */ -SECTION_SDATA2 static u32 lit_4083 = 0x43200000; +SECTION_SDATA2 static f32 lit_4083 = 160.0f; /* 804545E0-804545E4 0004+00 s=2 e=0 z=0 None .sdata2 @4084 */ -SECTION_SDATA2 static u32 lit_4084 = 0x41E00000; +SECTION_SDATA2 static f32 lit_4084 = 28.0f; /* 804545E4-804545E8 0004+00 s=3 e=0 z=0 None .sdata2 @4085 */ -SECTION_SDATA2 static u32 lit_4085 = 0xC1900000; +SECTION_SDATA2 static f32 lit_4085 = -18.0f; /* 804545E8-804545EC 0004+00 s=1 e=0 z=0 None .sdata2 @4086 */ -SECTION_SDATA2 static u32 lit_4086 = 0x41B80000; +SECTION_SDATA2 static f32 lit_4086 = 23.0f; /* 804545EC-804545F0 0004+00 s=1 e=0 z=0 None .sdata2 @4087 */ -SECTION_SDATA2 static u32 lit_4087 = 0xC1800000; +SECTION_SDATA2 static f32 lit_4087 = -16.0f; /* 804545F0-804545F4 0004+00 s=1 e=0 z=0 None .sdata2 @4088 */ -SECTION_SDATA2 static u32 lit_4088 = 0x43858000; +SECTION_SDATA2 static f32 lit_4088 = 267.0f; /* 804545F4-804545F8 0004+00 s=1 e=0 z=0 None .sdata2 @4089 */ -SECTION_SDATA2 static u32 lit_4089 = 0x43900000; +SECTION_SDATA2 static f32 lit_4089 = 288.0f; /* 804545F8-804545FC 0004+00 s=1 e=0 z=0 None .sdata2 @4090 */ -SECTION_SDATA2 static u32 lit_4090 = 0xC1E80000; +SECTION_SDATA2 static f32 lit_4090 = -29.0f; /* 804545FC-80454600 0004+00 s=1 e=0 z=0 None .sdata2 @4091 */ -SECTION_SDATA2 static u32 lit_4091 = 0x42480000; +SECTION_SDATA2 static f32 lit_4091 = 50.0f; /* 80454600-80454604 0004+00 s=1 e=0 z=0 None .sdata2 @4092 */ -SECTION_SDATA2 static u32 lit_4092 = 0x3FE66666; +SECTION_SDATA2 static f32 lit_4092 = 9.0f / 5.0f; /* 80454604-80454608 0004+00 s=3 e=0 z=0 None .sdata2 @4093 */ -SECTION_SDATA2 static u32 lit_4093 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4093 = 3.0f / 5.0f; /* 801FEFF0-801FF31C 032C+00 s=1 e=0 z=0 None .text __ct__24dMeter_drawMiniGameHIO_cFv */ #pragma push @@ -766,25 +758,25 @@ asm dMeter_drawMiniGameHIO_c::dMeter_drawMiniGameHIO_c() { /* ############################################################################################## */ /* 80454608-8045460C 0004+00 s=1 e=0 z=0 None .sdata2 @4126 */ -SECTION_SDATA2 static u32 lit_4126 = 0x3F428F5C; +SECTION_SDATA2 static f32 lit_4126 = 19.0f / 25.0f; /* 8045460C-80454610 0004+00 s=1 e=0 z=0 None .sdata2 @4127 */ -SECTION_SDATA2 static u32 lit_4127 = 0x41300000; +SECTION_SDATA2 static f32 lit_4127 = 11.0f; /* 80454610-80454614 0004+00 s=3 e=0 z=0 None .sdata2 @4128 */ -SECTION_SDATA2 static u32 lit_4128 = 0x40D33333; +SECTION_SDATA2 static f32 lit_4128 = 33.0f / 5.0f; /* 80454614-80454618 0004+00 s=1 e=0 z=0 None .sdata2 @4129 */ -SECTION_SDATA2 static u32 lit_4129 = 0xC20C0000; +SECTION_SDATA2 static f32 lit_4129 = -35.0f; /* 80454618-8045461C 0004+00 s=3 e=0 z=0 None .sdata2 @4130 */ -SECTION_SDATA2 static u32 lit_4130 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_4130 = 1.0f / 5.0f; /* 8045461C-80454620 0004+00 s=1 e=0 z=0 None .sdata2 @4131 */ -SECTION_SDATA2 static u32 lit_4131 = 0x41980000; +SECTION_SDATA2 static f32 lit_4131 = 19.0f; /* 80454620-80454624 0004+00 s=1 e=0 z=0 None .sdata2 @4132 */ -SECTION_SDATA2 static u32 lit_4132 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4132 = 1.0f / 10.0f; /* 801FF31C-801FF5B8 029C+00 s=1 e=0 z=0 None .text __ct__25dMeter_drawLightDropHIO_cFv */ #pragma push @@ -798,106 +790,106 @@ asm dMeter_drawLightDropHIO_c::dMeter_drawLightDropHIO_c() { /* ############################################################################################## */ /* 80454624-80454628 0004+00 s=1 e=0 z=0 None .sdata2 @4257 */ -SECTION_SDATA2 static u32 lit_4257 = 0x42200000; +SECTION_SDATA2 static f32 lit_4257 = 40.0f; /* 80454628-8045462C 0004+00 s=1 e=0 z=0 None .sdata2 @4258 */ -SECTION_SDATA2 static u32 lit_4258 = 0xC0B33333; +SECTION_SDATA2 static f32 lit_4258 = -28.0f / 5.0f; /* 8045462C-80454630 0004+00 s=1 e=0 z=0 None .sdata2 @4259 */ -SECTION_SDATA2 static u32 lit_4259 = 0xC1700000; +SECTION_SDATA2 static f32 lit_4259 = -15.0f; /* 80454630-80454634 0004+00 s=3 e=0 z=0 None .sdata2 @4260 */ -SECTION_SDATA2 static u32 lit_4260 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_4260 = 2.0f / 5.0f; /* 80454634-80454638 0004+00 s=2 e=0 z=0 None .sdata2 @4261 */ -SECTION_SDATA2 static u32 lit_4261 = 0x41900000; +SECTION_SDATA2 static f32 lit_4261 = 18.0f; /* 80454638-8045463C 0004+00 s=2 e=0 z=0 None .sdata2 @4262 */ -SECTION_SDATA2 static u32 lit_4262 = 0x3F0CCCCD; +SECTION_SDATA2 static f32 lit_4262 = 11.0f / 20.0f; /* 8045463C-80454640 0004+00 s=1 e=0 z=0 None .sdata2 @4263 */ -SECTION_SDATA2 static u32 lit_4263 = 0xC2280000; +SECTION_SDATA2 static f32 lit_4263 = -42.0f; /* 80454640-80454644 0004+00 s=2 e=0 z=0 None .sdata2 @4264 */ -SECTION_SDATA2 static u32 lit_4264 = 0x41000000; +SECTION_SDATA2 static f32 lit_4264 = 8.0f; /* 80454644-80454648 0004+00 s=2 e=0 z=0 None .sdata2 @4265 */ -SECTION_SDATA2 static u32 lit_4265 = 0x3F6B851F; +SECTION_SDATA2 static f32 lit_4265 = 23.0f / 25.0f; /* 80454648-8045464C 0004+00 s=1 e=0 z=0 None .sdata2 @4266 */ -SECTION_SDATA2 static u32 lit_4266 = 0xC27C0000; +SECTION_SDATA2 static f32 lit_4266 = -63.0f; /* 8045464C-80454650 0004+00 s=1 e=0 z=0 None .sdata2 @4267 */ -SECTION_SDATA2 static u32 lit_4267 = 0xC2440000; +SECTION_SDATA2 static f32 lit_4267 = -49.0f; /* 80454650-80454654 0004+00 s=1 e=0 z=0 None .sdata2 @4268 */ -SECTION_SDATA2 static u32 lit_4268 = 0xC2780000; +SECTION_SDATA2 static f32 lit_4268 = -62.0f; /* 80454654-80454658 0004+00 s=1 e=0 z=0 None .sdata2 @4269 */ -SECTION_SDATA2 static u32 lit_4269 = 0xC2400000; +SECTION_SDATA2 static f32 lit_4269 = -48.0f; /* 80454658-8045465C 0004+00 s=1 e=0 z=0 None .sdata2 @4270 */ -SECTION_SDATA2 static u32 lit_4270 = 0xC00CCCCD; +SECTION_SDATA2 static f32 lit_4270 = -11.0f / 5.0f; /* 8045465C-80454660 0004+00 s=2 e=0 z=0 None .sdata2 @4271 */ -SECTION_SDATA2 static u32 lit_4271 = 0xBFA66666; +SECTION_SDATA2 static f32 lit_4271 = -13.0f / 10.0f; /* 80454660-80454664 0004+00 s=1 e=0 z=0 None .sdata2 @4272 */ -SECTION_SDATA2 static u32 lit_4272 = 0xC1133333; +SECTION_SDATA2 static f32 lit_4272 = -46.0f / 5.0f; /* 80454664-80454668 0004+00 s=1 e=0 z=0 None .sdata2 @4273 */ -SECTION_SDATA2 static u32 lit_4273 = 0xC2820000; +SECTION_SDATA2 static f32 lit_4273 = -65.0f; /* 80454668-8045466C 0004+00 s=1 e=0 z=0 None .sdata2 @4274 */ -SECTION_SDATA2 static u32 lit_4274 = 0x40133333; +SECTION_SDATA2 static f32 lit_4274 = 23.0f / 10.0f; /* 8045466C-80454670 0004+00 s=1 e=0 z=0 None .sdata2 @4275 */ -SECTION_SDATA2 static u32 lit_4275 = 0x41B00000; +SECTION_SDATA2 static f32 lit_4275 = 22.0f; /* 80454670-80454674 0004+00 s=1 e=0 z=0 None .sdata2 @4276 */ -SECTION_SDATA2 static u32 lit_4276 = 0x40066666; +SECTION_SDATA2 static f32 lit_4276 = 21.0f / 10.0f; /* 80454674-80454678 0004+00 s=2 e=0 z=0 None .sdata2 @4277 */ -SECTION_SDATA2 static u32 lit_4277 = 0xC1600000; +SECTION_SDATA2 static f32 lit_4277 = -14.0f; /* 80454678-8045467C 0004+00 s=1 e=0 z=0 None .sdata2 @4278 */ -SECTION_SDATA2 static u32 lit_4278 = 0xC1500000; +SECTION_SDATA2 static f32 lit_4278 = -13.0f; /* 8045467C-80454680 0004+00 s=2 e=0 z=0 None .sdata2 @4279 */ -SECTION_SDATA2 static u32 lit_4279 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4279 = -1.0f; /* 80454680-80454684 0004+00 s=1 e=0 z=0 None .sdata2 @4280 */ -SECTION_SDATA2 static u32 lit_4280 = 0x41600000; +SECTION_SDATA2 static f32 lit_4280 = 14.0f; /* 80454684-80454688 0004+00 s=2 e=0 z=0 None .sdata2 @4281 */ -SECTION_SDATA2 static u32 lit_4281 = 0x40C00000; +SECTION_SDATA2 static f32 lit_4281 = 6.0f; /* 80454688-8045468C 0004+00 s=1 e=0 z=0 None .sdata2 @4282 */ -SECTION_SDATA2 static u32 lit_4282 = 0xC0966666; +SECTION_SDATA2 static f32 lit_4282 = -47.0f / 10.0f; /* 8045468C-80454690 0004+00 s=2 e=0 z=0 None .sdata2 @4283 */ -SECTION_SDATA2 static u32 lit_4283 = 0x41133333; +SECTION_SDATA2 static f32 lit_4283 = 46.0f / 5.0f; /* 80454690-80454694 0004+00 s=1 e=0 z=0 None .sdata2 @4284 */ -SECTION_SDATA2 static u32 lit_4284 = 0xC0800000; +SECTION_SDATA2 static f32 lit_4284 = -4.0f; /* 80454694-80454698 0004+00 s=2 e=0 z=0 None .sdata2 @4285 */ -SECTION_SDATA2 static u32 lit_4285 = 0x400CCCCD; +SECTION_SDATA2 static f32 lit_4285 = 11.0f / 5.0f; /* 80454698-8045469C 0004+00 s=2 e=0 z=0 None .sdata2 @4286 */ -SECTION_SDATA2 static u32 lit_4286 = 0x3F59999A; +SECTION_SDATA2 static f32 lit_4286 = 17.0f / 20.0f; /* 8045469C-804546A0 0004+00 s=1 e=0 z=0 None .sdata2 @4287 */ -SECTION_SDATA2 static u32 lit_4287 = 0x43480000; +SECTION_SDATA2 static f32 lit_4287 = 200.0f; /* 804546A0-804546A4 0004+00 s=1 e=0 z=0 None .sdata2 @4288 */ -SECTION_SDATA2 static u32 lit_4288 = 0x43160000; +SECTION_SDATA2 static f32 lit_4288 = 150.0f; /* 804546A4-804546A8 0004+00 s=1 e=0 z=0 None .sdata2 @4289 */ -SECTION_SDATA2 static u32 lit_4289 = 0x43500000; +SECTION_SDATA2 static f32 lit_4289 = 208.0f; /* 804546A8-804546AC 0004+00 s=1 e=0 z=0 None .sdata2 @4290 */ -SECTION_SDATA2 static u32 lit_4290 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_4290 = -100.0f; /* 801FF5B8-802001AC 0BF4+00 s=1 e=0 z=0 None .text __ct__16dMeter_drawHIO_cFv */ #pragma push @@ -911,46 +903,46 @@ asm dMeter_drawHIO_c::dMeter_drawHIO_c() { /* ############################################################################################## */ /* 804546AC-804546B0 0004+00 s=1 e=0 z=0 None .sdata2 @4334 */ -SECTION_SDATA2 static u32 lit_4334 = 0x42FA0000; +SECTION_SDATA2 static f32 lit_4334 = 125.0f; /* 804546B0-804546B4 0004+00 s=1 e=0 z=0 None .sdata2 @4335 */ -SECTION_SDATA2 static u32 lit_4335 = 0x432D0000; +SECTION_SDATA2 static f32 lit_4335 = 173.0f; /* 804546B4-804546B8 0004+00 s=1 e=0 z=0 None .sdata2 @4336 */ -SECTION_SDATA2 static u32 lit_4336 = 0x3EB33333; +SECTION_SDATA2 static f32 lit_4336 = 7.0f / 20.0f; /* 804546B8-804546BC 0004+00 s=1 e=0 z=0 None .sdata2 @4337 */ -SECTION_SDATA2 static u32 lit_4337 = 0xC26C0000; +SECTION_SDATA2 static f32 lit_4337 = -59.0f; /* 804546BC-804546C0 0004+00 s=1 e=0 z=0 None .sdata2 @4338 */ -SECTION_SDATA2 static u32 lit_4338 = 0xC2800000; +SECTION_SDATA2 static f32 lit_4338 = -64.0f; /* 804546C0-804546C4 0004+00 s=1 e=0 z=0 None .sdata2 @4339 */ -SECTION_SDATA2 static u32 lit_4339 = 0x42B40000; +SECTION_SDATA2 static f32 lit_4339 = 90.0f; /* 804546C4-804546C8 0004+00 s=1 e=0 z=0 None .sdata2 @4340 */ -SECTION_SDATA2 static u32 lit_4340 = 0xC2F80000; +SECTION_SDATA2 static f32 lit_4340 = -124.0f; /* 804546C8-804546CC 0004+00 s=1 e=0 z=0 None .sdata2 @4341 */ -SECTION_SDATA2 static u32 lit_4341 = 0x42EC0000; +SECTION_SDATA2 static f32 lit_4341 = 118.0f; /* 804546CC-804546D0 0004+00 s=1 e=0 z=0 None .sdata2 @4342 */ -SECTION_SDATA2 static u32 lit_4342 = 0xC2FE0000; +SECTION_SDATA2 static f32 lit_4342 = -127.0f; /* 804546D0-804546D4 0004+00 s=1 e=0 z=0 None .sdata2 @4343 */ -SECTION_SDATA2 static u32 lit_4343 = 0x42380000; +SECTION_SDATA2 static f32 lit_4343 = 46.0f; /* 804546D4-804546D8 0004+00 s=1 e=0 z=0 None .sdata2 @4344 */ -SECTION_SDATA2 static u32 lit_4344 = 0x41100000; +SECTION_SDATA2 static f32 lit_4344 = 9.0f; /* 804546D8-804546DC 0004+00 s=1 e=0 z=0 None .sdata2 @4345 */ -SECTION_SDATA2 static u32 lit_4345 = 0xC2700000; +SECTION_SDATA2 static f32 lit_4345 = -60.0f; /* 804546DC-804546E0 0004+00 s=1 e=0 z=0 None .sdata2 @4346 */ -SECTION_SDATA2 static u32 lit_4346 = 0xC2680000; +SECTION_SDATA2 static f32 lit_4346 = -58.0f; /* 804546E0-804546E4 0004+00 s=1 e=0 z=0 None .sdata2 @4347 */ -SECTION_SDATA2 static u32 lit_4347 = 0x42F00000; +SECTION_SDATA2 static f32 lit_4347 = 120.0f; /* 802001AC-802004B4 0308+00 s=1 e=0 z=0 None .text __ct__16dMeter_ringHIO_cFv */ #pragma push @@ -964,16 +956,16 @@ asm dMeter_ringHIO_c::dMeter_ringHIO_c() { /* ############################################################################################## */ /* 804546E4-804546E8 0004+00 s=1 e=0 z=0 None .sdata2 @4357 */ -SECTION_SDATA2 static u32 lit_4357 = 0x3F266666; +SECTION_SDATA2 static f32 lit_4357 = 13.0f / 20.0f; /* 804546E8-804546EC 0004+00 s=1 e=0 z=0 None .sdata2 @4358 */ -SECTION_SDATA2 static u32 lit_4358 = 0x3FA3D70A; +SECTION_SDATA2 static f32 lit_4358 = 32.0f / 25.0f; /* 804546EC-804546F0 0004+00 s=1 e=0 z=0 None .sdata2 @4359 */ -SECTION_SDATA2 static u32 lit_4359 = 0x3FCCCCCD; +SECTION_SDATA2 static f32 lit_4359 = 8.0f / 5.0f; /* 804546F0-804546F4 0004+00 s=1 e=0 z=0 None .sdata2 @4360 */ -SECTION_SDATA2 static u32 lit_4360 = 0x3E800000; +SECTION_SDATA2 static f32 lit_4360 = 0.25f; /* 802004B4-802006C8 0214+00 s=1 e=0 z=0 None .text __ct__19dMeter_mapIconHIO_cFv */ #pragma push @@ -987,49 +979,49 @@ asm dMeter_mapIconHIO_c::dMeter_mapIconHIO_c() { /* ############################################################################################## */ /* 804546F4-804546F8 0004+00 s=1 e=0 z=0 None .sdata2 @4416 */ -SECTION_SDATA2 static u32 lit_4416 = 0x47435000; +SECTION_SDATA2 static f32 lit_4416 = 50000.0f; /* 804546F8-804546FC 0004+00 s=1 e=0 z=0 None .sdata2 @4417 */ -SECTION_SDATA2 static u32 lit_4417 = 0x461C4000; +SECTION_SDATA2 static f32 lit_4417 = 10000.0f; /* 804546FC-80454700 0004+00 s=1 e=0 z=0 None .sdata2 @4418 */ -SECTION_SDATA2 static u32 lit_4418 = 0xC8927C00; +SECTION_SDATA2 static f32 lit_4418 = -300000.0f; /* 80454700-80454704 0004+00 s=1 e=0 z=0 None .sdata2 @4419 */ -SECTION_SDATA2 static u32 lit_4419 = 0x48927C00; +SECTION_SDATA2 static f32 lit_4419 = 300000.0f; /* 80454704-80454708 0004+00 s=1 e=0 z=0 None .sdata2 @4420 */ -SECTION_SDATA2 static u32 lit_4420 = 0x430E0000; +SECTION_SDATA2 static f32 lit_4420 = 142.0f; /* 80454708-8045470C 0004+00 s=1 e=0 z=0 None .sdata2 @4421 */ -SECTION_SDATA2 static u32 lit_4421 = 0x42740000; +SECTION_SDATA2 static f32 lit_4421 = 61.0f; /* 8045470C-80454710 0004+00 s=1 e=0 z=0 None .sdata2 @4422 */ -SECTION_SDATA2 static u32 lit_4422 = 0x43A48000; +SECTION_SDATA2 static f32 lit_4422 = 329.0f; /* 80454710-80454714 0004+00 s=1 e=0 z=0 None .sdata2 @4423 */ -SECTION_SDATA2 static u32 lit_4423 = 0x41200000; +SECTION_SDATA2 static f32 lit_4423 = 10.0f; /* 80454714-80454718 0004+00 s=1 e=0 z=0 None .sdata2 @4424 */ -SECTION_SDATA2 static u32 lit_4424 = 0x40E00000; +SECTION_SDATA2 static f32 lit_4424 = 7.0f; /* 80454718-8045471C 0004+00 s=1 e=0 z=0 None .sdata2 @4425 */ -SECTION_SDATA2 static u32 lit_4425 = 0x3F5D6FFC; +SECTION_SDATA2 static f32 lit_4425 = 0.8649899959564209f; /* 8045471C-80454720 0004+00 s=1 e=0 z=0 None .sdata2 @4426 */ -SECTION_SDATA2 static u32 lit_4426 = 0x40900000; +SECTION_SDATA2 static f32 lit_4426 = 4.5f; /* 80454720-80454724 0004+00 s=1 e=0 z=0 None .sdata2 @4427 */ -SECTION_SDATA2 static u32 lit_4427 = 0xBF000000; +SECTION_SDATA2 static f32 lit_4427 = -0.5f; /* 80454724-80454728 0004+00 s=2 e=0 z=0 None .sdata2 @4428 */ -SECTION_SDATA2 static u32 lit_4428 = 0x3F866666; +SECTION_SDATA2 static f32 lit_4428 = 21.0f / 20.0f; /* 80454728-8045472C 0004+00 s=1 e=0 z=0 None .sdata2 @4429 */ -SECTION_SDATA2 static u32 lit_4429 = 0xC0F00000; +SECTION_SDATA2 static f32 lit_4429 = -7.5f; /* 8045472C-80454730 0004+00 s=1 e=0 z=0 None .sdata2 @4430 */ -SECTION_SDATA2 static u32 lit_4430 = 0xC0E00000; +SECTION_SDATA2 static f32 lit_4430 = -7.0f; /* 802006C8-80200BCC 0504+00 s=1 e=0 z=0 None .text __ct__16dMeter_fmapHIO_cFv */ #pragma push @@ -1053,16 +1045,16 @@ asm dMeter_fmapHIO_c::~dMeter_fmapHIO_c() { /* ############################################################################################## */ /* 80454730-80454734 0004+00 s=1 e=0 z=0 None .sdata2 @4485 */ -SECTION_SDATA2 static u32 lit_4485 = 0x41500000; +SECTION_SDATA2 static f32 lit_4485 = 13.0f; /* 80454734-80454738 0004+00 s=1 e=0 z=0 None .sdata2 @4486 */ -SECTION_SDATA2 static u32 lit_4486 = 0xC2CC0000; +SECTION_SDATA2 static f32 lit_4486 = -102.0f; /* 80454738-8045473C 0004+00 s=1 e=0 z=0 None .sdata2 @4487 */ -SECTION_SDATA2 static u32 lit_4487 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4487 = 100.0f; /* 8045473C-80454740 0004+00 s=1 e=0 z=0 None .sdata2 @4488 */ -SECTION_SDATA2 static u32 lit_4488 = 0x43110000; +SECTION_SDATA2 static f32 lit_4488 = 145.0f; /* 80454740-80454748 0004+04 s=1 e=0 z=0 None .sdata2 @4489 */ SECTION_SDATA2 static f32 lit_4489[1 + 1 /* padding */] = { diff --git a/src/d/meter/d_meter_button.cpp b/src/d/meter/d_meter_button.cpp index d4918aa596e..4db939ffac2 100644 --- a/src/d/meter/d_meter_button.cpp +++ b/src/d/meter/d_meter_button.cpp @@ -24,6 +24,10 @@ struct dMsgString_c { /* 80249D28 */ ~dMsgString_c(); }; +struct COutFont_c { + /* 80225C94 */ COutFont_c(u8); +}; + struct J2DTextBox { /* 80300658 */ void getStringPtr() const; /* 8030074C */ void setString(s16, char const*, ...); @@ -31,10 +35,6 @@ struct J2DTextBox { struct JUTFont {}; -struct COutFont_c { - /* 80225C94 */ COutFont_c(u8); -}; - struct dMsgObject_c { /* 802370A8 */ void isGetItemMessage(); /* 802370BC */ void isKanbanMessage(); @@ -54,8 +54,6 @@ struct J2DPane { /* 802F7100 */ void getBounds(); }; -struct JKRExpHeap {}; - struct J2DGrafContext {}; struct JKRArchive {}; @@ -66,6 +64,8 @@ struct J2DScreen { /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*); }; +struct JKRExpHeap {}; + struct CPaneMgr { /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*); /* 80253930 */ CPaneMgr(); @@ -181,10 +181,6 @@ struct dMeter2Info_c { J2DPicture*, void*, J2DPicture*, int); }; -struct JUtility { - struct TColor {}; -}; - struct CPaneMgrAlpha { /* 802555C8 */ void show(); /* 80255608 */ void hide(); @@ -192,6 +188,10 @@ struct CPaneMgrAlpha { /* 80255828 */ void getAlphaRate(); }; +struct JUtility { + struct TColor {}; +}; + struct dMeter2Draw_c { /* 802140DC */ void drawPikari(f32, f32, f32*, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor, f32, u8); @@ -220,8 +220,6 @@ struct JKRHeap { // Forward References: // -extern "C" extern char const* const d_meter_d_meter_button__stringBase0; - extern "C" void __ct__14dMeterButton_cFv(); extern "C" void __dt__14dMeterButton_cFv(); extern "C" void _create__14dMeterButton_cFv(); @@ -326,13 +324,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_getCurrentHeap__Fv(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -516,13 +507,13 @@ SECTION_SDATA2 static u8 lit_4146[4] = { }; /* 8045474C-80454750 0004+00 s=30 e=0 z=0 None .sdata2 @4147 */ -SECTION_SDATA2 static u32 lit_4147 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4147 = 1.0f; /* 80454750-80454754 0004+00 s=2 e=0 z=0 None .sdata2 @4148 */ -SECTION_SDATA2 static u32 lit_4148 = 0x41200000; +SECTION_SDATA2 static f32 lit_4148 = 10.0f; /* 80454754-80454758 0004+00 s=1 e=0 z=0 None .sdata2 @4149 */ -SECTION_SDATA2 static u32 lit_4149 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4149 = 1.0f / 10.0f; /* 80201404-80202240 0E3C+00 s=0 e=1 z=0 None .text * _execute__14dMeterButton_cFUlbbbbbbbbbbbbbbbbbbbbbb */ @@ -542,10 +533,10 @@ asm void dMeterButton_c::_execute(u32 param_0, bool param_1, bool param_2, bool /* ############################################################################################## */ /* 80454758-8045475C 0004+00 s=23 e=0 z=0 None .sdata2 @4513 */ -SECTION_SDATA2 static u32 lit_4513 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4513 = -1.0f; /* 8045475C-80454760 0004+00 s=2 e=0 z=0 None .sdata2 @4514 */ -SECTION_SDATA2 static u32 lit_4514 = 0x41900000; +SECTION_SDATA2 static f32 lit_4514 = 18.0f; /* 80454760-80454768 0004+04 s=1 e=0 z=0 None .sdata2 @4515 */ SECTION_SDATA2 static f32 lit_4515[1 + 1 /* padding */] = { @@ -555,9 +546,7 @@ SECTION_SDATA2 static f32 lit_4515[1 + 1 /* padding */] = { }; /* 80454768-80454770 0008+00 s=3 e=0 z=0 None .sdata2 @4517 */ -SECTION_SDATA2 static u8 lit_4517[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4517 = 4503601774854144.0 /* cast s32 to float */; /* 80202240-80202A9C 085C+00 s=1 e=0 z=0 None .text draw__14dMeterButton_cFv */ #pragma push @@ -847,31 +836,31 @@ SECTION_DEAD static char const* const pad_80398154 = "\0\0\0"; #pragma pop /* 80454770-80454774 0004+00 s=4 e=0 z=0 None .sdata2 @5628 */ -SECTION_SDATA2 static u32 lit_5628 = 0x3F000000; +SECTION_SDATA2 static f32 lit_5628 = 0.5f; /* 80454774-80454778 0004+00 s=2 e=0 z=0 None .sdata2 @5629 */ -SECTION_SDATA2 static u32 lit_5629 = 0x43980000; +SECTION_SDATA2 static f32 lit_5629 = 304.0f; /* 80454778-8045477C 0004+00 s=1 e=0 z=0 None .sdata2 @5630 */ -SECTION_SDATA2 static u32 lit_5630 = 0x41000000; +SECTION_SDATA2 static f32 lit_5630 = 8.0f; /* 8045477C-80454780 0004+00 s=1 e=0 z=0 None .sdata2 @5631 */ -SECTION_SDATA2 static u32 lit_5631 = 0x4399A000; +SECTION_SDATA2 static f32 lit_5631 = 307.25f; /* 80454780-80454784 0004+00 s=1 e=0 z=0 None .sdata2 @5632 */ -SECTION_SDATA2 static u32 lit_5632 = 0x4399E000; +SECTION_SDATA2 static f32 lit_5632 = 307.75f; /* 80454784-80454788 0004+00 s=1 e=0 z=0 None .sdata2 @5633 */ -SECTION_SDATA2 static u32 lit_5633 = 0x43960000; +SECTION_SDATA2 static f32 lit_5633 = 300.0f; /* 80454788-8045478C 0004+00 s=1 e=0 z=0 None .sdata2 @5634 */ -SECTION_SDATA2 static u32 lit_5634 = 0x43984000; +SECTION_SDATA2 static f32 lit_5634 = 304.5f; /* 8045478C-80454790 0004+00 s=1 e=0 z=0 None .sdata2 @5635 */ -SECTION_SDATA2 static u32 lit_5635 = 0x43ADC000; +SECTION_SDATA2 static f32 lit_5635 = 347.5f; /* 80454790-80454794 0004+00 s=1 e=0 z=0 None .sdata2 @5636 */ -SECTION_SDATA2 static u32 lit_5636 = 0x43B7A000; +SECTION_SDATA2 static f32 lit_5636 = 367.25f; /* 802047E8-80205834 104C+00 s=1 e=0 z=0 None .text screenInitButton__14dMeterButton_cFv */ #pragma push @@ -895,22 +884,22 @@ asm void dMeterButton_c::screenInitText() { /* ############################################################################################## */ /* 80454794-80454798 0004+00 s=1 e=0 z=0 None .sdata2 @6012 */ -SECTION_SDATA2 static u32 lit_6012 = 0xC1C80000; +SECTION_SDATA2 static f32 lit_6012 = -25.0f; /* 80454798-8045479C 0004+00 s=1 e=0 z=0 None .sdata2 @6013 */ -SECTION_SDATA2 static u32 lit_6013 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_6013 = 4.0f / 5.0f; /* 8045479C-804547A0 0004+00 s=1 e=0 z=0 None .sdata2 @6014 */ -SECTION_SDATA2 static u32 lit_6014 = 0xC1200000; +SECTION_SDATA2 static f32 lit_6014 = -10.0f; /* 804547A0-804547A4 0004+00 s=1 e=0 z=0 None .sdata2 @6015 */ -SECTION_SDATA2 static u32 lit_6015 = 0x41C80000; +SECTION_SDATA2 static f32 lit_6015 = 25.0f; /* 804547A4-804547A8 0004+00 s=1 e=0 z=0 None .sdata2 @6016 */ -SECTION_SDATA2 static u32 lit_6016 = 0x3F666666; +SECTION_SDATA2 static f32 lit_6016 = 9.0f / 10.0f; /* 804547A8-804547AC 0004+00 s=2 e=0 z=0 None .sdata2 @6017 */ -SECTION_SDATA2 static u32 lit_6017 = 0x40000000; +SECTION_SDATA2 static f32 lit_6017 = 2.0f; /* 80205CA0-80206978 0CD8+00 s=2 e=0 z=0 None .text updateButton__14dMeterButton_cFv */ #pragma push @@ -1525,7 +1514,7 @@ asm void dMeterButton_c::getCenterPosCalc(u8 param_0, char* param_1, int param_2 /* ############################################################################################## */ /* 804547AC-804547B0 0004+00 s=1 e=0 z=0 None .sdata2 @7857 */ -SECTION_SDATA2 static u32 lit_7857 = 0x41A00000; +SECTION_SDATA2 static f32 lit_7857 = 20.0f; /* 8020A540-8020A94C 040C+00 s=2 e=0 z=0 None .text trans_button__14dMeterButton_cFif */ #pragma push diff --git a/src/d/meter/d_meter_haihai.cpp b/src/d/meter/d_meter_haihai.cpp index 548f9984c44..3f5cb3d2ea7 100644 --- a/src/d/meter/d_meter_haihai.cpp +++ b/src/d/meter/d_meter_haihai.cpp @@ -17,10 +17,10 @@ struct dMeterSub_c { struct J2DAnmTransformKey {}; -struct J2DAnmColor {}; - struct J2DAnmTextureSRTKey {}; +struct J2DAnmColor {}; + struct dMeterHaihai_c { /* 8020AE8C */ dMeterHaihai_c(u8); /* 8020AEF0 */ ~dMeterHaihai_c(); @@ -78,8 +78,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_meter_d_meter_haihai__stringBase0; - extern "C" void __ct__14dMeterHaihai_cFUc(); extern "C" void __dt__14dMeterHaihai_cFv(); extern "C" void _create__14dMeterHaihai_cFv(); @@ -107,10 +105,6 @@ extern "C" extern char const* const d_meter_d_meter_haihai__stringBase0; void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; extern "C" bool isDead__11dMeterSub_cFv(); extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); @@ -210,31 +204,31 @@ asm void dMeterHaihai_c::_execute(u32 param_0) { /* ############################################################################################## */ /* 804547B4-804547B8 0004+00 s=2 e=0 z=0 None .sdata2 @3890 */ -SECTION_SDATA2 static u32 lit_3890 = 0x40266666; +SECTION_SDATA2 static f32 lit_3890 = 13.0f / 5.0f; /* 804547B8-804547BC 0004+00 s=2 e=0 z=0 None .sdata2 @3891 */ -SECTION_SDATA2 static u32 lit_3891 = 0x421C0000; +SECTION_SDATA2 static f32 lit_3891 = 39.0f; /* 804547BC-804547C0 0004+00 s=2 e=0 z=0 None .sdata2 @3892 */ -SECTION_SDATA2 static u32 lit_3892 = 0x42680000; +SECTION_SDATA2 static f32 lit_3892 = 58.0f; /* 804547C0-804547C4 0004+00 s=2 e=0 z=0 None .sdata2 @3893 */ -SECTION_SDATA2 static u32 lit_3893 = 0x43980000; +SECTION_SDATA2 static f32 lit_3893 = 304.0f; /* 804547C4-804547C8 0004+00 s=2 e=0 z=0 None .sdata2 @3894 */ -SECTION_SDATA2 static u32 lit_3894 = 0x43600000; +SECTION_SDATA2 static f32 lit_3894 = 224.0f; /* 804547C8-804547CC 0004+00 s=6 e=0 z=0 None .sdata2 @3895 */ -SECTION_SDATA2 static u32 lit_3895 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3895 = 0.5f; /* 804547CC-804547D0 0004+00 s=2 e=0 z=0 None .sdata2 @3896 */ -SECTION_SDATA2 static u32 lit_3896 = 0x42B40000; +SECTION_SDATA2 static f32 lit_3896 = 90.0f; /* 804547D0-804547D4 0004+00 s=2 e=0 z=0 None .sdata2 @3897 */ -SECTION_SDATA2 static u32 lit_3897 = 0x43340000; +SECTION_SDATA2 static f32 lit_3897 = 180.0f; /* 804547D4-804547D8 0004+00 s=2 e=0 z=0 None .sdata2 @3898 */ -SECTION_SDATA2 static u32 lit_3898 = 0x43870000; +SECTION_SDATA2 static f32 lit_3898 = 270.0f; /* 8020B140-8020B518 03D8+00 s=1 e=0 z=0 None .text draw__14dMeterHaihai_cFv */ #pragma push @@ -248,16 +242,16 @@ asm void dMeterHaihai_c::draw() { /* ############################################################################################## */ /* 804547D8-804547DC 0004+00 s=2 e=0 z=0 None .sdata2 @3940 */ -SECTION_SDATA2 static u32 lit_3940 = 0x40400000; +SECTION_SDATA2 static f32 lit_3940 = 3.0f; /* 804547DC-804547E0 0004+00 s=2 e=0 z=0 None .sdata2 @3941 */ -SECTION_SDATA2 static u32 lit_3941 = 0x40A00000; +SECTION_SDATA2 static f32 lit_3941 = 5.0f; /* 804547E0-804547E4 0004+00 s=1 e=0 z=0 None .sdata2 @3942 */ -SECTION_SDATA2 static u32 lit_3942 = 0x428C0000; +SECTION_SDATA2 static f32 lit_3942 = 70.0f; /* 804547E4-804547E8 0004+00 s=1 e=0 z=0 None .sdata2 @3943 */ -SECTION_SDATA2 static u32 lit_3943 = 0x42480000; +SECTION_SDATA2 static f32 lit_3943 = 50.0f; /* 8020B518-8020B814 02FC+00 s=0 e=1 z=0 None .text drawHaihai__14dMeterHaihai_cFUc */ #pragma push @@ -322,10 +316,10 @@ asm void dMeterHaihai_c::drawHaihaiBottom(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 804547E8-804547EC 0004+00 s=1 e=0 z=0 None .sdata2 @4116 */ -SECTION_SDATA2 static u32 lit_4116 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_4116 = 4.0f / 5.0f; /* 804547EC-804547F0 0004+00 s=1 e=0 z=0 None .sdata2 @4117 */ -SECTION_SDATA2 static u32 lit_4117 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4117 = 3.0f / 5.0f; /* 8020BC20-8020BDAC 018C+00 s=1 e=1 z=0 None .text setScale__14dMeterHaihai_cFf */ #pragma push @@ -372,9 +366,7 @@ asm void dMeterHaihai_c::updateHaihai() { /* ############################################################################################## */ /* 804547F8-80454800 0008+00 s=3 e=0 z=0 None .sdata2 @4189 */ -SECTION_SDATA2 static u8 lit_4189[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4189 = 4503601774854144.0 /* cast s32 to float */; /* 8020BF00-8020C078 0178+00 s=1 e=0 z=0 None .text * playBckAnime__14dMeterHaihai_cFP18J2DAnmTransformKey */ diff --git a/src/d/meter/d_meter_hakusha.cpp b/src/d/meter/d_meter_hakusha.cpp index 32c270460a7..a887888273b 100644 --- a/src/d/meter/d_meter_hakusha.cpp +++ b/src/d/meter/d_meter_hakusha.cpp @@ -31,10 +31,6 @@ struct dMeterHakusha_c { /* 8020D480 */ void getHakushaNum(); }; -struct JUtility { - struct TColor {}; -}; - struct CPaneMgrAlpha { /* 802555C8 */ void show(); /* 80255608 */ void hide(); @@ -42,6 +38,10 @@ struct CPaneMgrAlpha { /* 80255828 */ void getAlphaRate(); }; +struct JUtility { + struct TColor {}; +}; + struct dMeter2Draw_c { /* 8021462C */ void drawPikariHakusha(f32, f32, f32, f32, JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor); @@ -77,8 +77,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_meter_d_meter_hakusha__stringBase0; - extern "C" void __ct__15dMeterHakusha_cFPv(); extern "C" void __dt__15dMeterHakusha_cFv(); extern "C" void _create__15dMeterHakusha_cFv(); @@ -101,11 +99,6 @@ extern "C" extern char const* const d_meter_d_meter_hakusha__stringBase0; void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; extern "C" void getLayerNo__14dComIfG_play_cFi(); extern "C" bool isDead__11dMeterSub_cFv(); @@ -205,7 +198,7 @@ SECTION_SDATA2 static u8 lit_3793[4] = { }; /* 80454804-80454808 0004+00 s=2 e=0 z=0 None .sdata2 @3794 */ -SECTION_SDATA2 static u32 lit_3794 = 0x41E33333; +SECTION_SDATA2 static f32 lit_3794 = 28.399999618530273f; /* 8020C400-8020C808 0408+00 s=1 e=0 z=0 None .text _create__15dMeterHakusha_cFv */ #pragma push @@ -239,7 +232,7 @@ asm void dMeterHakusha_c::draw() { /* ############################################################################################## */ /* 80454808-8045480C 0004+00 s=3 e=0 z=0 None .sdata2 @3936 */ -SECTION_SDATA2 static u32 lit_3936 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3936 = 1.0f; /* 8020CABC-8020CC58 019C+00 s=1 e=0 z=0 None .text _delete__15dMeterHakusha_cFv */ #pragma push @@ -263,18 +256,16 @@ asm void dMeterHakusha_c::alphaAnimeHakusha(u32 param_0) { /* ############################################################################################## */ /* 8045480C-80454810 0004+00 s=1 e=0 z=0 None .sdata2 @4094 */ -SECTION_SDATA2 static u32 lit_4094 = 0x41900000; +SECTION_SDATA2 static f32 lit_4094 = 18.0f; /* 80454810-80454814 0004+00 s=1 e=0 z=0 None .sdata2 @4095 */ -SECTION_SDATA2 static u32 lit_4095 = 0x41E00000; +SECTION_SDATA2 static f32 lit_4095 = 28.0f; /* 80454814-80454818 0004+00 s=1 e=0 z=0 None .sdata2 @4096 */ -SECTION_SDATA2 static u32 lit_4096 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4096 = 20.0f; /* 80454818-80454820 0008+00 s=1 e=0 z=0 None .sdata2 @4098 */ -SECTION_SDATA2 static u8 lit_4098[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4098 = 4503601774854144.0 /* cast s32 to float */; /* 8020CD6C-8020D258 04EC+00 s=1 e=0 z=0 None .text updateHakusha__15dMeterHakusha_cFv */ #pragma push diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp index 64cd610374b..37132e05c6f 100644 --- a/src/d/meter/d_meter_map.cpp +++ b/src/d/meter/d_meter_map.cpp @@ -98,8 +98,6 @@ struct J2DPicture { // Forward References: // -extern "C" extern char const* const d_meter_d_meter_map__stringBase0; - extern "C" void isEnableDispMap__11dMeterMap_cFv(); extern "C" void getMapDispSizeTypeNo__11dMeterMap_cFv(); extern "C" void isEnableDispMapAndMapDispSizeTypeNo__11dMeterMap_cFv(); @@ -143,13 +141,6 @@ void dMeter2Info_set2DVibration(); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void fopOvlpM_IsDoingReq__Fv(); extern "C" void getStatusRoomDt__20dStage_roomControl_cFi(); @@ -255,9 +246,7 @@ asm void dMeterMap_c::isEventRunCheck() { /* ############################################################################################## */ /* 80454828-80454830 0008+00 s=3 e=0 z=0 None .sdata2 @4100 */ -SECTION_SDATA2 static u8 lit_4100[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4100 = 4503601774854144.0 /* cast s32 to float */; /* 8020D72C-8020D75C 0030+00 s=2 e=0 z=0 None .text getMapDispEdgeLeftX_Layout__11dMeterMap_cFv */ @@ -280,12 +269,10 @@ SECTION_SDATA2 static u8 lit_4128[4] = { }; /* 80454834-80454838 0004+00 s=5 e=0 z=0 None .sdata2 @4129 */ -SECTION_SDATA2 static u32 lit_4129 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4129 = 1.0f; /* 80454838-80454840 0008+00 s=1 e=0 z=0 None .sdata2 @4131 */ -SECTION_SDATA2 static u8 lit_4131[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4131 = 4503599627370496.0 /* cast u32 to float */; /* 8020D75C-8020D7E4 0088+00 s=0 e=1 z=0 None .text getMapDispEdgeTop__11dMeterMap_cFv */ #pragma push @@ -305,7 +292,7 @@ bool dMeterMap_c::getDispPosInside_OffsetX() { /* ############################################################################################## */ /* 80454840-80454844 0004+00 s=1 e=0 z=0 None .sdata2 @4159 */ -SECTION_SDATA2 static u32 lit_4159 = 0xC2100000; +SECTION_SDATA2 static f32 lit_4159 = -36.0f; /* 8020D7EC-8020D874 0088+00 s=2 e=0 z=0 None .text getDispPosOutSide_OffsetX__11dMeterMap_cFv */ @@ -461,7 +448,7 @@ asm void dMeterMap_c::draw() { /* ############################################################################################## */ /* 80454844-80454848 0004+00 s=3 e=0 z=0 None .sdata2 @4515 */ -SECTION_SDATA2 static u32 lit_4515 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4515 = -1.0f; /* 8020E070-8020E45C 03EC+00 s=2 e=0 z=0 None .text ctrlShowMap__11dMeterMap_cFv */ #pragma push diff --git a/src/d/meter/d_meter_string.cpp b/src/d/meter/d_meter_string.cpp index 1c05177920c..5b2f158ea08 100644 --- a/src/d/meter/d_meter_string.cpp +++ b/src/d/meter/d_meter_string.cpp @@ -88,8 +88,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const d_meter_d_meter_string__stringBase0; - extern "C" void __ct__14dMeterString_cFi(); extern "C" void __dt__14dMeterString_cFv(); extern "C" void _create__14dMeterString_cFv(); @@ -112,11 +110,6 @@ void dPaneClass_showNullPane(J2DScreen*); void dTimer_createTimer(s32, u32, u8, u8, f32, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__11dMeterSub_c[8 + 3 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void dComIfG_TimerDeleteRequest__Fi(); @@ -201,16 +194,16 @@ SECTION_DEAD static char const* const pad_80398251 = "\0\0\0\0\0\0"; #pragma pop /* 80454848-8045484C 0004+00 s=1 e=0 z=0 None .sdata2 @3758 */ -SECTION_SDATA2 static u32 lit_3758 = 0x43520000; +SECTION_SDATA2 static f32 lit_3758 = 210.0f; /* 8045484C-80454850 0004+00 s=1 e=0 z=0 None .sdata2 @3759 */ -SECTION_SDATA2 static u32 lit_3759 = 0x43CD0000; +SECTION_SDATA2 static f32 lit_3759 = 410.0f; /* 80454850-80454854 0004+00 s=1 e=0 z=0 None .sdata2 @3760 */ -SECTION_SDATA2 static u32 lit_3760 = 0x42000000; +SECTION_SDATA2 static f32 lit_3760 = 32.0f; /* 80454854-80454858 0004+00 s=1 e=0 z=0 None .sdata2 @3761 */ -SECTION_SDATA2 static u32 lit_3761 = 0x43D18000; +SECTION_SDATA2 static f32 lit_3761 = 419.0f; /* 80454858-8045485C 0004+00 s=3 e=0 z=0 None .sdata2 @3762 */ SECTION_SDATA2 static u8 lit_3762[4] = { @@ -242,13 +235,13 @@ asm void dMeterString_c::_execute(u32 param_0) { /* ############################################################################################## */ /* 8045485C-80454860 0004+00 s=1 e=0 z=0 None .sdata2 @3819 */ -SECTION_SDATA2 static u32 lit_3819 = 0x42700000; +SECTION_SDATA2 static f32 lit_3819 = 60.0f; /* 80454860-80454864 0004+00 s=2 e=0 z=0 None .sdata2 @3820 */ -SECTION_SDATA2 static u32 lit_3820 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3820 = 1.0f; /* 80454864-80454868 0004+00 s=2 e=0 z=0 None .sdata2 @3821 */ -SECTION_SDATA2 static u32 lit_3821 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3821 = -1.0f; /* 80454868-80454870 0004+04 s=1 e=0 z=0 None .sdata2 @3822 */ SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = { @@ -258,9 +251,7 @@ SECTION_SDATA2 static f32 lit_3822[1 + 1 /* padding */] = { }; /* 80454870-80454878 0008+00 s=2 e=0 z=0 None .sdata2 @3824 */ -SECTION_SDATA2 static u8 lit_3824[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3824 = 4503601774854144.0 /* cast s32 to float */; /* 8020F1B0-8020F49C 02EC+00 s=1 e=0 z=0 None .text draw__14dMeterString_cFv */ #pragma push @@ -284,7 +275,7 @@ asm void dMeterString_c::_delete() { /* ############################################################################################## */ /* 80454878-8045487C 0004+00 s=1 e=0 z=0 None .sdata2 @3866 */ -SECTION_SDATA2 static u32 lit_3866 = 0x42200000; +SECTION_SDATA2 static f32 lit_3866 = 40.0f; /* 8020F5A4-8020F66C 00C8+00 s=2 e=1 z=0 None .text createString__14dMeterString_cFi */ #pragma push @@ -308,7 +299,7 @@ asm void dMeterString_c::playBckAnimation(f32 param_0) { /* ############################################################################################## */ /* 8045487C-80454880 0004+00 s=1 e=0 z=0 None .sdata2 @3979 */ -SECTION_SDATA2 static u32 lit_3979 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3979 = 0.5f; /* 8020F6EC-8020FA88 039C+00 s=1 e=0 z=0 None .text drawPikari__14dMeterString_cFv */ #pragma push diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp index c58743fa0b2..a1ec18deaac 100644 --- a/src/d/msg/d_msg_class.cpp +++ b/src/d/msg/d_msg_class.cpp @@ -11,10 +11,6 @@ // Types: // -struct jmessage_tControl { - /* 802299EC */ jmessage_tControl(); -}; - struct jmessage_tReference { /* 80228B04 */ jmessage_tReference(); /* 80228CB4 */ ~jmessage_tReference(); @@ -53,6 +49,10 @@ struct cXyz { /* 80266B34 */ void operator-(Vec const&) const; }; +struct jmessage_tControl { + /* 802299EC */ jmessage_tControl(); +}; + struct jmessage_tSequenceProcessor { /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); /* 8022B654 */ void do_reset(); @@ -115,16 +115,21 @@ struct jmessage_tMeasureProcessor { /* 8022B5F4 */ ~jmessage_tMeasureProcessor(); }; +struct jmessage_string_tControl { + /* 8022FB5C */ jmessage_string_tControl(); + /* 802328DC */ ~jmessage_string_tControl(); +}; + +struct COutFont_c { + /* 80226CF8 */ void initialize(); +}; + struct J2DTextBox { /* 80300658 */ void getStringPtr() const; }; struct JUTFont {}; -struct COutFont_c { - /* 80226CF8 */ void initialize(); -}; - struct jmessage_string_tReference { /* 8022F8C0 */ jmessage_string_tReference(); /* 8022F94C */ ~jmessage_string_tReference(); @@ -140,11 +145,6 @@ struct jmessage_string_tReference { /* 8022FB24 */ void getLineCountNowPage(); }; -struct jmessage_string_tControl { - /* 8022FB5C */ jmessage_string_tControl(); - /* 802328DC */ ~jmessage_string_tControl(); -}; - struct jmessage_string_tSequenceProcessor { /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*, jmessage_string_tControl*); @@ -314,7 +314,6 @@ static void getFontCCColorTable(u8, u8); static void getFontGCColorTable(u8, u8); static void getOutFontNumberType(int); static void getPohNum(); -extern "C" extern char const* const d_msg_d_msg_class__stringBase0; extern "C" static void checkCharInfoCharactor__Fi(); extern "C" static void changeCodeToChar__FUs(); @@ -473,18 +472,6 @@ void dMeter2Info_getNewLetterNum(); void dMsgObject_getFundRaising(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__17jmessage_tControl[3]; -extern "C" extern void* __vt__Q28JMessage10TReference[4 + 1 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 g_msg_unit[4 + 4 /* padding */]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void dComIfGp_getReverb__Fi(); @@ -1651,10 +1638,10 @@ SECTION_DATA static void* __vt__19jmessage_tReference[4 + 1 /* padding */] = { }; /* 80454A58-80454A5C 0004+00 s=1 e=0 z=0 None .sdata2 @4025 */ -SECTION_SDATA2 static u32 lit_4025 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4025 = 9.0f / 10.0f; /* 80454A5C-80454A60 0004+00 s=14 e=0 z=0 None .sdata2 @4026 */ -SECTION_SDATA2 static u32 lit_4026 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4026 = 0.5f; /* 80454A60-80454A64 0004+00 s=25 e=0 z=0 None .sdata2 @4027 */ SECTION_SDATA2 static u8 lit_4027[4] = { @@ -1665,7 +1652,7 @@ SECTION_SDATA2 static u8 lit_4027[4] = { }; /* 80454A64-80454A68 0004+00 s=23 e=0 z=0 None .sdata2 @4028 */ -SECTION_SDATA2 static u32 lit_4028 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4028 = 1.0f; /* 80228B04-80228CB4 01B0+00 s=0 e=1 z=0 None .text __ct__19jmessage_tReferenceFv */ #pragma push @@ -1805,9 +1792,7 @@ asm void jmessage_tReference::resetReference() { /* ############################################################################################## */ /* 80454A70-80454A78 0008+00 s=16 e=0 z=0 None .sdata2 @4198 */ -SECTION_SDATA2 static u8 lit_4198[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4198 = 4503601774854144.0 /* cast s32 to float */; /* 80229034-80229168 0134+00 s=0 e=1 z=0 None .text pageSend__19jmessage_tReferenceFv */ #pragma push @@ -1821,7 +1806,7 @@ asm void jmessage_tReference::pageSend() { /* ############################################################################################## */ /* 80454A78-80454A7C 0004+00 s=4 e=0 z=0 None .sdata2 @4291 */ -SECTION_SDATA2 static u32 lit_4291 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4291 = -1.0f; /* 80229168-802294A8 0340+00 s=0 e=2 z=0 None .text selectMessage__19jmessage_tReferenceFv */ #pragma push @@ -2056,12 +2041,10 @@ SECTION_DEAD static char const* const pad_8039965A = "\0\0\0\0\0"; #pragma pop /* 80454A7C-80454A80 0004+00 s=5 e=0 z=0 None .sdata2 @5151 */ -SECTION_SDATA2 static u32 lit_5151 = 0x42C80000; +SECTION_SDATA2 static f32 lit_5151 = 100.0f; /* 80454A80-80454A88 0008+00 s=5 e=0 z=0 None .sdata2 @5154 */ -SECTION_SDATA2 static u8 lit_5154[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5154 = 4503599627370496.0 /* cast u32 to float */; /* 8022A268-8022B0B0 0E48+00 s=5 e=0 z=0 None .text do_tag__26jmessage_tMeasureProcessorFUlPCvUl */ @@ -2165,10 +2148,10 @@ void jmessage_tSequenceProcessor::do_reset() { /* ############################################################################################## */ /* 80454A88-80454A8C 0004+00 s=1 e=0 z=0 None .sdata2 @5490 */ -SECTION_SDATA2 static u32 lit_5490 = 0x41200000; +SECTION_SDATA2 static f32 lit_5490 = 10.0f; /* 80454A8C-80454A90 0004+00 s=2 e=0 z=0 None .sdata2 @5491 */ -SECTION_SDATA2 static u32 lit_5491 = 0x437F0000; +SECTION_SDATA2 static f32 lit_5491 = 255.0f; /* 8022B658-8022BA3C 03E4+00 s=1 e=0 z=0 None .text * do_begin__27jmessage_tSequenceProcessorFPCvPCc */ @@ -2338,7 +2321,7 @@ asm void jmessage_tRenderingProcessor::do_end() { /* ############################################################################################## */ /* 80454A90-80454A94 0004+00 s=1 e=0 z=0 None .sdata2 @6374 */ -SECTION_SDATA2 static u32 lit_6374 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_6374 = 3.0f / 10.0f; /* 8022D0A0-8022D74C 06AC+00 s=1 e=0 z=0 None .text * do_character__28jmessage_tRenderingProcessorFi */ @@ -2452,7 +2435,7 @@ asm void jmessage_tRenderingProcessor::do_transY(s16 param_0, bool param_1) { /* ############################################################################################## */ /* 80454A94-80454A98 0004+00 s=1 e=0 z=0 None .sdata2 @6781 */ -SECTION_SDATA2 static u32 lit_6781 = 0x41C00000; +SECTION_SDATA2 static f32 lit_6781 = 24.0f; /* 8022EAE4-8022ED10 022C+00 s=2 e=0 z=0 None .text * do_outfont__28jmessage_tRenderingProcessorFUcUl */ diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index aafbe7ddbc1..d37540d7876 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -280,7 +280,6 @@ struct Z2SeMgr { // static void cLib_calcTimer__template3(s32*); -extern "C" extern char const* const d_msg_d_msg_flow__stringBase0; extern "C" void __ct__10dMsgFlow_cFv(); extern "C" void __dt__10dMsgFlow_cFv(); @@ -442,16 +441,6 @@ void dMsgObject_getOffering(); void dMsgObject_addOffering(s16); void cM_rndF(f32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u32 g_saftyWhiteColor; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; SECTION_INIT void memcpy(); extern "C" void fadeOut__13mDoGph_gInf_cFfR8_GXColor(); @@ -1766,9 +1755,7 @@ asm void dMsgFlow_c::query002(mesg_flow_node_branch* param_0, fopAc_ac_c* param_ /* ############################################################################################## */ /* 80454D90-80454D98 0008+00 s=5 e=0 z=0 None .sdata2 @5116 */ -SECTION_SDATA2 static u8 lit_5116[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5116 = 4503599627370496.0 /* cast u32 to float */; /* 8024B208-8024B250 0048+00 s=1 e=0 z=0 None .text * query003__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ @@ -2380,9 +2367,7 @@ asm void dMsgFlow_c::event003(mesg_flow_node_event* param_0, fopAc_ac_c* param_1 /* ############################################################################################## */ /* 80454DA0-80454DA8 0008+00 s=3 e=0 z=0 None .sdata2 @6040 */ -SECTION_SDATA2 static u8 lit_6040[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_6040 = 4503601774854144.0 /* cast s32 to float */; /* 8024C590-8024C5F0 0060+00 s=1 e=0 z=0 None .text * event004__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ @@ -2574,7 +2559,7 @@ asm void dMsgFlow_c::event021(mesg_flow_node_event* param_0, fopAc_ac_c* param_1 /* ############################################################################################## */ /* 80454DA8-80454DAC 0004+00 s=1 e=0 z=0 None .sdata2 @6273 */ -SECTION_SDATA2 static u32 lit_6273 = 0x42C80000; +SECTION_SDATA2 static f32 lit_6273 = 100.0f; /* 8024CDAC-8024CE40 0094+00 s=1 e=0 z=0 None .text * event022__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ @@ -2688,7 +2673,7 @@ asm void dMsgFlow_c::event031(mesg_flow_node_event* param_0, fopAc_ac_c* param_1 /* ############################################################################################## */ /* 80454DAC-80454DB0 0004+00 s=2 e=0 z=0 None .sdata2 @6613 */ -SECTION_SDATA2 static u32 lit_6613 = 0x3F800000; +SECTION_SDATA2 static f32 lit_6613 = 1.0f; /* 8024D5EC-8024D6BC 00D0+00 s=1 e=0 z=0 None .text * event032__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c */ diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp index 24fe6882f44..14b1179743a 100644 --- a/src/d/msg/d_msg_object.cpp +++ b/src/d/msg/d_msg_object.cpp @@ -13,20 +13,18 @@ struct msg_class {}; -struct JKRArchive { - struct EMountMode {}; -}; - struct JKRHeap { /* 802CE784 */ void getTotalFreeSize(); }; +struct JKRArchive { + struct EMountMode {}; +}; + struct mDoDvdThd_mountXArchive_c { /* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*); }; -struct jmessage_tControl {}; - struct Vec {}; struct cXyz { @@ -44,6 +42,8 @@ struct jmessage_tReference { /* 80238C78 */ void setActorPos(cXyz); }; +struct jmessage_tControl {}; + struct jmessage_tSequenceProcessor { /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*); }; @@ -138,12 +138,12 @@ struct dMsgScrnBase_c { /* 8023C3EC */ void setRubyString(char*); }; -struct J2DTextBox {}; - struct COutFont_c { /* 80225C94 */ COutFont_c(u8); }; +struct J2DTextBox {}; + struct dMsgObject_c { /* 80233284 */ void _create(msg_class*); /* 80233590 */ void _execute(); @@ -400,9 +400,6 @@ void dMsgObject_setFundRaising(u16); static void dMsgObject_addFundRaising(s16); void dMsgObject_getOffering(); void dMsgObject_addOffering(s16); -extern "C" extern char const* const d_msg_d_msg_object__stringBase0; -extern "C" extern void* g_profile_MSG_OBJECT[10]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void dMsgObject_getGroupID__Fv(); extern "C" static void dMsgObject_searchSSItem__FPvPv(); @@ -602,18 +599,6 @@ void dComIfGp_getSubHeap2D(int); void dMeter2Info_set2DVibration(); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 m_control__7dDemo_c[4]; -extern "C" extern u8 m_mesgControl__7dDemo_c[4]; -extern "C" extern u8 m_midnaActor__9daPy_py_c[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_setCurrentHeap__FP7JKRHeap(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -830,25 +815,25 @@ SECTION_DATA static void* __vt__20dMsgObject_HowlHIO_c[3] = { }; /* 80454AA0-80454AA4 0004+00 s=2 e=0 z=0 None .sdata2 @4076 */ -SECTION_SDATA2 static u32 lit_4076 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4076 = 0.5f; /* 80454AA4-80454AA8 0004+00 s=1 e=0 z=0 None .sdata2 @4077 */ -SECTION_SDATA2 static u32 lit_4077 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4077 = 1.0f / 10.0f; /* 80454AA8-80454AAC 0004+00 s=2 e=0 z=0 None .sdata2 @4078 */ -SECTION_SDATA2 static u32 lit_4078 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_4078 = 3.0f / 10.0f; /* 80454AAC-80454AB0 0004+00 s=2 e=0 z=0 None .sdata2 @4079 */ -SECTION_SDATA2 static u32 lit_4079 = 0x3ECCCCCD; +SECTION_SDATA2 static f32 lit_4079 = 2.0f / 5.0f; /* 80454AB0-80454AB4 0004+00 s=1 e=0 z=0 None .sdata2 @4080 */ -SECTION_SDATA2 static u32 lit_4080 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4080 = 1.0f / 20.0f; /* 80454AB4-80454AB8 0004+00 s=2 e=0 z=0 None .sdata2 @4081 */ -SECTION_SDATA2 static u32 lit_4081 = 0x3FC00000; +SECTION_SDATA2 static f32 lit_4081 = 1.5f; /* 80454AB8-80454ABC 0004+00 s=1 e=0 z=0 None .sdata2 @4082 */ -SECTION_SDATA2 static u32 lit_4082 = 0x40000000; +SECTION_SDATA2 static f32 lit_4082 = 2.0f; /* 80454ABC-80454AC0 0004+00 s=7 e=0 z=0 None .sdata2 @4083 */ SECTION_SDATA2 static u8 lit_4083[4] = { @@ -859,10 +844,10 @@ SECTION_SDATA2 static u8 lit_4083[4] = { }; /* 80454AC0-80454AC4 0004+00 s=12 e=0 z=0 None .sdata2 @4084 */ -SECTION_SDATA2 static u32 lit_4084 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4084 = 1.0f; /* 80454AC4-80454AC8 0004+00 s=1 e=0 z=0 None .sdata2 @4085 */ -SECTION_SDATA2 static u32 lit_4085 = 0x400CCCCD; +SECTION_SDATA2 static f32 lit_4085 = 11.0f / 5.0f; /* 80232AEC-80232D6C 0280+00 s=1 e=0 z=0 None .text __ct__20dMsgObject_HowlHIO_cFv */ #pragma push @@ -876,64 +861,64 @@ asm dMsgObject_HowlHIO_c::dMsgObject_HowlHIO_c() { /* ############################################################################################## */ /* 80454AC8-80454ACC 0004+00 s=1 e=0 z=0 None .sdata2 @4127 */ -SECTION_SDATA2 static u32 lit_4127 = 0x41B80000; +SECTION_SDATA2 static f32 lit_4127 = 23.0f; /* 80454ACC-80454AD0 0004+00 s=1 e=0 z=0 None .sdata2 @4128 */ -SECTION_SDATA2 static u32 lit_4128 = 0x41B00000; +SECTION_SDATA2 static f32 lit_4128 = 22.0f; /* 80454AD0-80454AD4 0004+00 s=1 e=0 z=0 None .sdata2 @4129 */ -SECTION_SDATA2 static u32 lit_4129 = 0x41D00000; +SECTION_SDATA2 static f32 lit_4129 = 26.0f; /* 80454AD4-80454AD8 0004+00 s=1 e=0 z=0 None .sdata2 @4130 */ -SECTION_SDATA2 static u32 lit_4130 = 0x41C80000; +SECTION_SDATA2 static f32 lit_4130 = 25.0f; /* 80454AD8-80454ADC 0004+00 s=1 e=0 z=0 None .sdata2 @4131 */ -SECTION_SDATA2 static u32 lit_4131 = 0x3F333333; +SECTION_SDATA2 static f32 lit_4131 = 7.0f / 10.0f; /* 80454ADC-80454AE0 0004+00 s=1 e=0 z=0 None .sdata2 @4132 */ -SECTION_SDATA2 static u32 lit_4132 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4132 = 9.0f / 10.0f; /* 80454AE0-80454AE4 0004+00 s=1 e=0 z=0 None .sdata2 @4133 */ -SECTION_SDATA2 static u32 lit_4133 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_4133 = 1.0f / 5.0f; /* 80454AE4-80454AE8 0004+00 s=1 e=0 z=0 None .sdata2 @4134 */ -SECTION_SDATA2 static u32 lit_4134 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_4134 = 6.0f / 5.0f; /* 80454AE8-80454AEC 0004+00 s=1 e=0 z=0 None .sdata2 @4135 */ -SECTION_SDATA2 static u32 lit_4135 = 0x3F866666; +SECTION_SDATA2 static f32 lit_4135 = 21.0f / 20.0f; /* 80454AEC-80454AF0 0004+00 s=1 e=0 z=0 None .sdata2 @4136 */ -SECTION_SDATA2 static u32 lit_4136 = 0x3F7851EC; +SECTION_SDATA2 static f32 lit_4136 = 97.0f / 100.0f; /* 80454AF0-80454AF4 0004+00 s=1 e=0 z=0 None .sdata2 @4137 */ -SECTION_SDATA2 static u32 lit_4137 = 0x3F8CCCCD; +SECTION_SDATA2 static f32 lit_4137 = 11.0f / 10.0f; /* 80454AF4-80454AF8 0004+00 s=1 e=0 z=0 None .sdata2 @4138 */ -SECTION_SDATA2 static u32 lit_4138 = 0x41F00000; +SECTION_SDATA2 static f32 lit_4138 = 30.0f; /* 80454AF8-80454AFC 0004+00 s=1 e=0 z=0 None .sdata2 @4139 */ -SECTION_SDATA2 static u32 lit_4139 = 0x41300000; +SECTION_SDATA2 static f32 lit_4139 = 11.0f; /* 80454AFC-80454B00 0004+00 s=1 e=0 z=0 None .sdata2 @4140 */ -SECTION_SDATA2 static u32 lit_4140 = 0x3FD9999A; +SECTION_SDATA2 static f32 lit_4140 = 17.0f / 10.0f; /* 80454B00-80454B04 0004+00 s=1 e=0 z=0 None .sdata2 @4141 */ -SECTION_SDATA2 static u32 lit_4141 = 0x40900000; +SECTION_SDATA2 static f32 lit_4141 = 4.5f; /* 80454B04-80454B08 0004+00 s=1 e=0 z=0 None .sdata2 @4142 */ -SECTION_SDATA2 static u32 lit_4142 = 0xC2340000; +SECTION_SDATA2 static f32 lit_4142 = -45.0f; /* 80454B08-80454B0C 0004+00 s=1 e=0 z=0 None .sdata2 @4143 */ -SECTION_SDATA2 static u32 lit_4143 = 0x3F400000; +SECTION_SDATA2 static f32 lit_4143 = 0.75f; /* 80454B0C-80454B10 0004+00 s=1 e=0 z=0 None .sdata2 @4144 */ -SECTION_SDATA2 static u32 lit_4144 = 0xC0A00000; +SECTION_SDATA2 static f32 lit_4144 = -5.0f; /* 80454B10-80454B14 0004+00 s=7 e=0 z=0 None .sdata2 @4145 */ -SECTION_SDATA2 static u32 lit_4145 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4145 = -1.0f; /* 80454B14-80454B18 0004+00 s=1 e=0 z=0 None .sdata2 @4146 */ -SECTION_SDATA2 static u32 lit_4146 = 0x3F733333; +SECTION_SDATA2 static f32 lit_4146 = 19.0f / 20.0f; /* 80454B18-80454B20 0004+04 s=1 e=0 z=0 None .sdata2 @4147 */ SECTION_SDATA2 static f32 lit_4147[1 + 1 /* padding */] = { @@ -1102,9 +1087,7 @@ asm void dMsgObject_c::waitProc() { /* ############################################################################################## */ /* 80454B20-80454B28 0008+00 s=6 e=0 z=0 None .sdata2 @4965 */ -SECTION_SDATA2 static u8 lit_4965[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4965 = 4503601774854144.0 /* cast s32 to float */; /* 80234318-802349D8 06C0+00 s=1 e=0 z=0 None .text openProc__12dMsgObject_cFv */ #pragma push @@ -1118,7 +1101,7 @@ asm void dMsgObject_c::openProc() { /* ############################################################################################## */ /* 80454B28-80454B2C 0004+00 s=3 e=0 z=0 None .sdata2 @5044 */ -SECTION_SDATA2 static u32 lit_5044 = 0x41200000; +SECTION_SDATA2 static f32 lit_5044 = 10.0f; /* 802349D8-80234CCC 02F4+00 s=1 e=0 z=0 None .text outnowProc__12dMsgObject_cFv */ #pragma push @@ -1232,13 +1215,13 @@ asm void dMsgObject_c::talkStartInit() { /* ############################################################################################## */ /* 80454B2C-80454B30 0004+00 s=1 e=0 z=0 None .sdata2 @5947 */ -SECTION_SDATA2 static u32 lit_5947 = 0x44180000; +SECTION_SDATA2 static f32 lit_5947 = 608.0f; /* 80454B30-80454B34 0004+00 s=1 e=0 z=0 None .sdata2 @5948 */ -SECTION_SDATA2 static u32 lit_5948 = 0x43E00000; +SECTION_SDATA2 static f32 lit_5948 = 448.0f; /* 80454B34-80454B38 0004+00 s=1 e=0 z=0 None .sdata2 @5949 */ -SECTION_SDATA2 static u32 lit_5949 = 0xC3480000; +SECTION_SDATA2 static f32 lit_5949 = -200.0f; /* 80454B38-80454B40 0004+04 s=1 e=0 z=0 None .sdata2 @5950 */ SECTION_SDATA2 static f32 lit_5950[1 + 1 /* padding */] = { diff --git a/src/d/msg/d_msg_out_font.cpp b/src/d/msg/d_msg_out_font.cpp index 5e7054ee74d..05633fbdd9c 100644 --- a/src/d/msg/d_msg_out_font.cpp +++ b/src/d/msg/d_msg_out_font.cpp @@ -51,8 +51,6 @@ struct COutFontSet_c { // Forward References: // -extern "C" extern char const* const d_msg_d_msg_out_font__stringBase0; - extern "C" void __ct__13COutFontSet_cFv(); extern "C" void __dt__13COutFontSet_cFv(); extern "C" void initialize__13COutFontSet_cFv(); @@ -78,8 +76,6 @@ void fopMsgM_valueIncrease(int, int, u8); void dMeter2Info_getNumberTextureName(int); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void fopMsgM_valueIncrease__FiiUc(); extern "C" void dMeter2Info_getNumberTextureName__Fi(); @@ -427,7 +423,7 @@ SECTION_SDATA2 static u8 lit_3748[4] = { }; /* 80454A14-80454A18 0004+00 s=6 e=0 z=0 None .sdata2 @3749 */ -SECTION_SDATA2 static u32 lit_3749 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3749 = 1.0f; /* 80225C3C-80225C70 0034+00 s=2 e=0 z=0 None .text initialize__13COutFontSet_cFv */ #pragma push @@ -483,9 +479,7 @@ asm void COutFont_c::setPane(J2DPicture* param_0) { /* ############################################################################################## */ /* 80454A18-80454A20 0008+00 s=2 e=0 z=0 None .sdata2 @4397 */ -SECTION_SDATA2 static u8 lit_4397[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4397 = 4503599627370496.0 /* cast u32 to float */; /* 80225EA8-80226CF8 0E50+00 s=2 e=0 z=0 None .text createPane__10COutFont_cFv */ #pragma push @@ -531,45 +525,43 @@ asm void COutFont_c::setAlphaRatio(f32 param_0) { /* ############################################################################################## */ /* 80454A20-80454A24 0004+00 s=1 e=0 z=0 None .sdata2 @4986 */ -SECTION_SDATA2 static u32 lit_4986 = 0x40000000; +SECTION_SDATA2 static f32 lit_4986 = 2.0f; /* 80454A24-80454A28 0004+00 s=1 e=0 z=0 None .sdata2 @4987 */ -SECTION_SDATA2 static u32 lit_4987 = 0x40400000; +SECTION_SDATA2 static f32 lit_4987 = 3.0f; /* 80454A28-80454A2C 0004+00 s=1 e=0 z=0 None .sdata2 @4988 */ -SECTION_SDATA2 static u32 lit_4988 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4988 = 0.5f; /* 80454A2C-80454A30 0004+00 s=1 e=0 z=0 None .sdata2 @4989 */ -SECTION_SDATA2 static u32 lit_4989 = 0x43B40000; +SECTION_SDATA2 static f32 lit_4989 = 360.0f; /* 80454A30-80454A34 0004+00 s=1 e=0 z=0 None .sdata2 @4990 */ -SECTION_SDATA2 static u32 lit_4990 = 0x41E00000; +SECTION_SDATA2 static f32 lit_4990 = 28.0f; /* 80454A34-80454A38 0004+00 s=1 e=0 z=0 None .sdata2 @4991 */ -SECTION_SDATA2 static u32 lit_4991 = 0x42480000; +SECTION_SDATA2 static f32 lit_4991 = 50.0f; /* 80454A38-80454A3C 0004+00 s=1 e=0 z=0 None .sdata2 @4992 */ -SECTION_SDATA2 static u32 lit_4992 = 0x434D0000; +SECTION_SDATA2 static f32 lit_4992 = 205.0f; /* 80454A3C-80454A40 0004+00 s=1 e=0 z=0 None .sdata2 @4993 */ -SECTION_SDATA2 static u32 lit_4993 = 0x41100000; +SECTION_SDATA2 static f32 lit_4993 = 9.0f; /* 80454A40-80454A44 0004+00 s=1 e=0 z=0 None .sdata2 @4994 */ -SECTION_SDATA2 static u32 lit_4994 = 0x41900000; +SECTION_SDATA2 static f32 lit_4994 = 18.0f; /* 80454A44-80454A48 0004+00 s=1 e=0 z=0 None .sdata2 @4995 */ -SECTION_SDATA2 static u32 lit_4995 = 0xC0400000; +SECTION_SDATA2 static f32 lit_4995 = -3.0f; /* 80454A48-80454A4C 0004+00 s=1 e=0 z=0 None .sdata2 @4996 */ -SECTION_SDATA2 static u32 lit_4996 = 0x40800000; +SECTION_SDATA2 static f32 lit_4996 = 4.0f; /* 80454A4C-80454A50 0004+00 s=1 e=0 z=0 None .sdata2 @4997 */ -SECTION_SDATA2 static u32 lit_4997 = 0x3FA00000; +SECTION_SDATA2 static f32 lit_4997 = 1.25f; /* 80454A50-80454A58 0008+00 s=1 e=0 z=0 None .sdata2 @5001 */ -SECTION_SDATA2 static u8 lit_5001[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5001 = 4503601774854144.0 /* cast s32 to float */; /* 80226DB0-80228448 1698+00 s=2 e=0 z=0 None .text draw__10COutFont_cFP10J2DTextBoxfff */ #pragma push diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp index 3311c56dacb..81fb84a42d6 100644 --- a/src/d/msg/d_msg_string.cpp +++ b/src/d/msg/d_msg_string.cpp @@ -11,14 +11,14 @@ // Types: // -struct J2DTextBox {}; - -struct JUTFont {}; - struct COutFont_c { /* 80225C94 */ COutFont_c(u8); }; +struct J2DTextBox {}; + +struct JUTFont {}; + struct dMsgString_c { /* 80191B6C */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 801E1D10 */ void getStringPage(u32, u8, u8, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, @@ -132,10 +132,10 @@ asm void dMsgString_c::resetStringLocal(J2DTextBox* param_0) { /* ############################################################################################## */ /* 80454D78-80454D7C 0004+00 s=1 e=0 z=0 None .sdata2 @3777 */ -SECTION_SDATA2 static u32 lit_3777 = 0x437F0000; +SECTION_SDATA2 static f32 lit_3777 = 255.0f; /* 80454D7C-80454D80 0004+00 s=1 e=0 z=0 None .sdata2 @3778 */ -SECTION_SDATA2 static u32 lit_3778 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3778 = -1.0f; /* 80454D80-80454D88 0004+04 s=1 e=0 z=0 None .sdata2 @3779 */ SECTION_SDATA2 static f32 lit_3779[1 + 1 /* padding */] = { @@ -145,9 +145,7 @@ SECTION_SDATA2 static f32 lit_3779[1 + 1 /* padding */] = { }; /* 80454D88-80454D90 0008+00 s=1 e=0 z=0 None .sdata2 @3781 */ -SECTION_SDATA2 static u8 lit_3781[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3781 = 4503599627370496.0 /* cast u32 to float */; /* 80249DE4-80249ED0 00EC+00 s=1 e=0 z=0 None .text * drawOutFontLocal__12dMsgString_cFP10J2DTextBoxf */ diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp index e6f1781cd97..65cc1880b4b 100644 --- a/src/d/msg/d_msg_string_base.cpp +++ b/src/d/msg/d_msg_string_base.cpp @@ -11,22 +11,22 @@ // Types: // +struct jmessage_string_tControl { + /* 8022FB5C */ jmessage_string_tControl(); +}; + +struct COutFont_c {}; + struct J2DTextBox {}; struct JUTFont {}; -struct COutFont_c {}; - struct jmessage_string_tReference { /* 8022F8C0 */ jmessage_string_tReference(); /* 8022F9AC */ void init(J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, u8); /* 8022FA38 */ void getLineLength(int); }; -struct jmessage_string_tControl { - /* 8022FB5C */ jmessage_string_tControl(); -}; - struct jmessage_string_tSequenceProcessor { /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*, jmessage_string_tControl*); @@ -98,8 +98,6 @@ struct TNodeLinkList { // Forward References: // -extern "C" extern char const* const d_msg_d_msg_string_base__stringBase0; - extern "C" void __ct__16dMsgStringBase_cFv(); extern "C" void __dt__16dMsgStringBase_cFv(); extern "C" void getResource__16dMsgStringBase_cFv(); @@ -125,8 +123,6 @@ extern "C" extern char const* const d_msg_d_msg_string_base__stringBase0; void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; extern "C" void __ct__26jmessage_string_tReferenceFv(); extern "C" void @@ -235,16 +231,10 @@ asm void dMsgStringBase_c::getStringLocal(u32 param_0, J2DTextBox* param_1, J2DT /* ############################################################################################## */ /* 80454D70-80454D78 0004+04 s=2 e=0 z=0 None .sdata2 @4046 */ -SECTION_SDATA2 static u8 lit_4046[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_4046[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 802498D8-80249A48 0170+00 s=1 e=1 z=0 None .text diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp index 718924bc0e9..eb3e3ca8351 100644 --- a/src/d/msg/d_msg_unit.cpp +++ b/src/d/msg/d_msg_unit.cpp @@ -25,10 +25,6 @@ struct dMsgUnit_c { // Forward References: // -extern "C" extern char const* const d_msg_d_msg_unit__stringBase0; -extern "C" extern u8 g_msg_unit[4 + 4 /* padding */]; -extern "C" extern u8 data_804510D8[8]; - extern "C" void __ct__10dMsgUnit_cFv(); extern "C" void __dt__10dMsgUnit_cFv(); extern "C" void setTag__10dMsgUnit_cFiiPcb(); @@ -42,8 +38,6 @@ extern "C" extern u8 data_804510D8[8]; // void operator delete(void*); -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_meter2_info[248]; extern "C" void getDaytime__18dScnKy_env_light_cFv(); extern "C" void __dl__FPv(); @@ -106,10 +100,10 @@ SECTION_DEAD static char const* const pad_80399705 = "\0\0"; #pragma pop /* 80454B40-80454B44 0004+00 s=1 e=0 z=0 None .sdata2 @3702 */ -SECTION_SDATA2 static u32 lit_3702 = 0x49742400; +SECTION_SDATA2 static f32 lit_3702 = 1000000.0f; /* 80454B44-80454B48 0004+00 s=1 e=0 z=0 None .sdata2 @3703 */ -SECTION_SDATA2 static u32 lit_3703 = 0x42700000; +SECTION_SDATA2 static f32 lit_3703 = 60.0f; /* 80454B48-80454B50 0004+04 s=1 e=0 z=0 None .sdata2 @3704 */ SECTION_SDATA2 static f32 lit_3704[1 + 1 /* padding */] = { @@ -119,9 +113,7 @@ SECTION_SDATA2 static f32 lit_3704[1 + 1 /* padding */] = { }; /* 80454B50-80454B58 0008+00 s=1 e=0 z=0 None .sdata2 @3707 */ -SECTION_SDATA2 static u8 lit_3707[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3707 = 4503601774854144.0 /* cast s32 to float */; /* 80238CEC-8023907C 0390+00 s=0 e=5 z=0 None .text setTag__10dMsgUnit_cFiiPcb */ #pragma push diff --git a/src/d/ovlp/d_ovlp_fade.cpp b/src/d/ovlp/d_ovlp_fade.cpp index 5839ffaf9bd..949fb662ae4 100644 --- a/src/d/ovlp/d_ovlp_fade.cpp +++ b/src/d/ovlp/d_ovlp_fade.cpp @@ -34,14 +34,6 @@ static void dOvlpFd_Execute(overlap1_class*); static bool dOvlpFd_IsDelete(overlap1_class*); static bool dOvlpFd_Delete(overlap1_class*); static void dOvlpFd_Create(void*); -extern "C" extern void* g_profile_OVERLAP0[10]; -extern "C" extern void* g_profile_OVERLAP1[10]; -extern "C" extern void* g_profile_OVERLAP6[10]; -extern "C" extern void* g_profile_OVERLAP7[10]; -extern "C" extern void* g_profile_OVERLAP8[10]; -extern "C" extern void* g_profile_OVERLAP9[10]; -extern "C" extern void* g_profile_OVERLAP10[10]; -extern "C" extern void* g_profile_OVERLAP11[10 + 1 /* padding */]; extern "C" static bool dOvlpFd_Draw__FP14overlap1_class(); extern "C" static void dOvlpFd_startFadeIn__Fi(); @@ -70,10 +62,6 @@ void mDoAud_setFadeInStart(u8); void fopOvlpM_SceneIsStart(); void fopOvlpM_IsOutReq(overlap_task_class*); void fopOvlpM_Done(overlap_task_class*); -extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sManager__10JFWDisplay[4]; extern "C" void mDoAud_setFadeOutStart__FUc(); extern "C" void mDoAud_setFadeInStart__FUc(); diff --git a/src/d/ovlp/d_ovlp_fade2.cpp b/src/d/ovlp/d_ovlp_fade2.cpp index 62647ba5541..06591fa8fd3 100644 --- a/src/d/ovlp/d_ovlp_fade2.cpp +++ b/src/d/ovlp/d_ovlp_fade2.cpp @@ -57,7 +57,6 @@ static bool dOvlpFd2_IsDelete(dOvlpFd2_c*); static bool dOvlpFd2_Delete(dOvlpFd2_c*); static void dOvlpFd2_Create(void*); void cLib_calcTimer__template4(s8*); -extern "C" extern void* g_profile_OVERLAP2[10]; extern "C" void draw__15dOvlpFd2_dlst_cFv(); extern "C" void __ct__10dOvlpFd2_cFv(); @@ -87,18 +86,6 @@ void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalc0(f32*, f32, f32); void cLib_chaseAngleS(s16*, s16, s16); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern void* __vt__16dDlst_snapShot_c[3]; -extern "C" extern u8 mFrameBufferTexObj__13mDoGph_gInf_c[32]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 sManager__10JFWDisplay[4]; extern "C" void mDoMtx_ZrotM__FPA4_fs(); extern "C" void scaleM__14mDoMtx_stack_cFfff(); @@ -177,28 +164,28 @@ SECTION_SDATA2 static u8 lit_3683[4] = { }; /* 80454E28-80454E2C 0004+00 s=1 e=0 z=0 None .sdata2 @3684 */ -SECTION_SDATA2 static u32 lit_3684 = 0x44180000; +SECTION_SDATA2 static f32 lit_3684 = 608.0f; /* 80454E2C-80454E30 0004+00 s=1 e=0 z=0 None .sdata2 @3685 */ -SECTION_SDATA2 static u32 lit_3685 = 0x43E00000; +SECTION_SDATA2 static f32 lit_3685 = 448.0f; /* 80454E30-80454E34 0004+00 s=4 e=0 z=0 None .sdata2 @3686 */ -SECTION_SDATA2 static u32 lit_3686 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3686 = 1.0f; /* 80454E34-80454E38 0004+00 s=1 e=0 z=0 None .sdata2 @3687 */ -SECTION_SDATA2 static u32 lit_3687 = 0x42700000; +SECTION_SDATA2 static f32 lit_3687 = 60.0f; /* 80454E38-80454E3C 0004+00 s=1 e=0 z=0 None .sdata2 @3688 */ -SECTION_SDATA2 static u32 lit_3688 = 0x3FADB6DB; +SECTION_SDATA2 static f32 lit_3688 = 19.0f / 14.0f; /* 80454E3C-80454E40 0004+00 s=1 e=0 z=0 None .sdata2 @3689 */ -SECTION_SDATA2 static u32 lit_3689 = 0x42C80000; +SECTION_SDATA2 static f32 lit_3689 = 100.0f; /* 80454E40-80454E44 0004+00 s=1 e=0 z=0 None .sdata2 @3690 */ -SECTION_SDATA2 static u32 lit_3690 = 0x47C35000; +SECTION_SDATA2 static f32 lit_3690 = 100000.0f; /* 80454E44-80454E48 0004+00 s=1 e=0 z=0 None .sdata2 @3691 */ -SECTION_SDATA2 static u32 lit_3691 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3691 = -1.0f; /* 8025247C-80252990 0514+00 s=1 e=0 z=0 None .text draw__15dOvlpFd2_dlst_cFv */ #pragma push @@ -289,7 +276,7 @@ asm void dOvlpFd2_c::execFirstSnap() { /* ############################################################################################## */ /* 80454E48-80454E4C 0004+00 s=1 e=0 z=0 None .sdata2 @3757 */ -SECTION_SDATA2 static u32 lit_3757 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_3757 = 1.0f / 20.0f; /* 80252A78-80252BC0 0148+00 s=1 e=0 z=0 None .text execFadeOut__10dOvlpFd2_cFv */ #pragma push @@ -313,10 +300,10 @@ asm void dOvlpFd2_c::execNextSnap() { /* ############################################################################################## */ /* 80454E4C-80454E50 0004+00 s=1 e=0 z=0 None .sdata2 @3794 */ -SECTION_SDATA2 static u32 lit_3794 = 0x3CF5C28F; +SECTION_SDATA2 static f32 lit_3794 = 3.0f / 100.0f; /* 80454E50-80454E54 0004+00 s=1 e=0 z=0 None .sdata2 @3795 */ -SECTION_SDATA2 static u32 lit_3795 = 0x3A83126F; +SECTION_SDATA2 static f32 lit_3795 = 0.0010000000474974513f; /* 80252C68-80252D0C 00A4+00 s=1 e=0 z=0 None .text execFadeIn__10dOvlpFd2_cFv */ #pragma push @@ -330,7 +317,7 @@ asm void dOvlpFd2_c::execFadeIn() { /* ############################################################################################## */ /* 80454E54-80454E58 0004+00 s=1 e=0 z=0 None .sdata2 @3822 */ -SECTION_SDATA2 static u32 lit_3822 = 0xC3D20000; +SECTION_SDATA2 static f32 lit_3822 = -420.0f; /* 80252D0C-80252E08 00FC+00 s=1 e=0 z=0 None .text dOvlpFd2_Draw__FP10dOvlpFd2_c */ #pragma push diff --git a/src/d/ovlp/d_ovlp_fade3.cpp b/src/d/ovlp/d_ovlp_fade3.cpp index 74cb3dc6950..5674d946490 100644 --- a/src/d/ovlp/d_ovlp_fade3.cpp +++ b/src/d/ovlp/d_ovlp_fade3.cpp @@ -64,8 +64,6 @@ static void dOvlpFd3_Execute(dOvlpFd3_c*); static bool dOvlpFd3_IsDelete(dOvlpFd3_c*); static bool dOvlpFd3_Delete(dOvlpFd3_c*); static void dOvlpFd3_Create(void*); -extern "C" extern void* g_profile_OVERLAP3[10]; -extern "C" extern void* __vt__16dDlst_snapShot_c[3]; extern "C" void draw__16dDlst_snapShot_cFv(); extern "C" void draw__15dOvlpFd3_dlst_cFv(); @@ -97,16 +95,6 @@ void dCam_getBody(); void cLib_calcTimer__template4(s8*); void cLib_addCalc0(f32*, f32, f32); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 mFrameBufferTexObj__13mDoGph_gInf_c[32]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" extern u8 sManager__10JFWDisplay[4]; extern "C" void mDoAud_setFadeOutStart__FUc(); extern "C" void mDoAud_setFadeInStart__FUc(); @@ -199,28 +187,28 @@ SECTION_SDATA2 static u8 lit_3800[4] = { }; /* 80454E60-80454E64 0004+00 s=1 e=0 z=0 None .sdata2 @3801 */ -SECTION_SDATA2 static u32 lit_3801 = 0x44180000; +SECTION_SDATA2 static f32 lit_3801 = 608.0f; /* 80454E64-80454E68 0004+00 s=1 e=0 z=0 None .sdata2 @3802 */ -SECTION_SDATA2 static u32 lit_3802 = 0x43E00000; +SECTION_SDATA2 static f32 lit_3802 = 448.0f; /* 80454E68-80454E6C 0004+00 s=3 e=0 z=0 None .sdata2 @3803 */ -SECTION_SDATA2 static u32 lit_3803 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3803 = 1.0f; /* 80454E6C-80454E70 0004+00 s=1 e=0 z=0 None .sdata2 @3804 */ -SECTION_SDATA2 static u32 lit_3804 = 0x42700000; +SECTION_SDATA2 static f32 lit_3804 = 60.0f; /* 80454E70-80454E74 0004+00 s=1 e=0 z=0 None .sdata2 @3805 */ -SECTION_SDATA2 static u32 lit_3805 = 0x3FADB6DB; +SECTION_SDATA2 static f32 lit_3805 = 19.0f / 14.0f; /* 80454E74-80454E78 0004+00 s=1 e=0 z=0 None .sdata2 @3806 */ -SECTION_SDATA2 static u32 lit_3806 = 0x42C80000; +SECTION_SDATA2 static f32 lit_3806 = 100.0f; /* 80454E78-80454E7C 0004+00 s=1 e=0 z=0 None .sdata2 @3807 */ -SECTION_SDATA2 static u32 lit_3807 = 0x47C35000; +SECTION_SDATA2 static f32 lit_3807 = 100000.0f; /* 80454E7C-80454E80 0004+00 s=1 e=0 z=0 None .sdata2 @3808 */ -SECTION_SDATA2 static u32 lit_3808 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3808 = -1.0f; /* 80252F28-8025343C 0514+00 s=1 e=0 z=0 None .text draw__15dOvlpFd3_dlst_cFv */ #pragma push @@ -336,7 +324,7 @@ asm void dOvlpFd3_c::execNextSnap() { /* ############################################################################################## */ /* 80454E80-80454E84 0004+00 s=1 e=0 z=0 None .sdata2 @3923 */ -SECTION_SDATA2 static u32 lit_3923 = 0x3CF5C28F; +SECTION_SDATA2 static f32 lit_3923 = 3.0f / 100.0f; /* 80253730-802537AC 007C+00 s=1 e=0 z=0 None .text execFadeIn__10dOvlpFd3_cFv */ #pragma push @@ -350,7 +338,7 @@ asm void dOvlpFd3_c::execFadeIn() { /* ############################################################################################## */ /* 80454E84-80454E88 0004+00 s=1 e=0 z=0 None .sdata2 @3947 */ -SECTION_SDATA2 static u32 lit_3947 = 0xC3C20000; +SECTION_SDATA2 static f32 lit_3947 = -388.0f; /* 802537AC-80253880 00D4+00 s=1 e=0 z=0 None .text dOvlpFd3_Draw__FP10dOvlpFd3_c */ #pragma push diff --git a/src/d/pane/d_pane_class.cpp b/src/d/pane/d_pane_class.cpp index 37e3c5d8ddf..adcb4434411 100644 --- a/src/d/pane/d_pane_class.cpp +++ b/src/d/pane/d_pane_class.cpp @@ -119,7 +119,6 @@ struct CPaneMgr { void dPaneClass_showNullPane(J2DScreen*); static void dPaneClass_showNullPane(J2DPane*); void dPaneClass_setPriority(void**, JKRHeap*, J2DScreen*, char const*, u32, JKRArchive*); -extern "C" extern void* __vt__10JSUIosBase[3]; extern "C" void __ct__8CPaneMgrFv(); extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); @@ -162,11 +161,6 @@ extern "C" extern void* __vt__10JSUIosBase[3]; void mDoExt_getCurrentHeap(); void dLib_getExpandSizeFromAramArchive(JKRAramArchive*, char const*); void operator delete(void*); -extern "C" extern void* __vt__20JSURandomInputStream[9]; -extern "C" extern void* __vt__14JSUInputStream[6 + 1 /* padding */]; -extern "C" extern void* __vt__20JSUMemoryInputStream[9 + 1 /* padding */]; -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; extern "C" void mDoExt_getCurrentHeap__Fv(); extern "C" void dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc(); @@ -325,22 +319,14 @@ asm void CPaneMgr::childPaneGetSize(J2DPane* param_0) { /* ############################################################################################## */ /* 80454E88-80454E90 0004+04 s=4 e=0 z=0 None .sdata2 @3858 */ -SECTION_SDATA2 static u8 lit_3858[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3858[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80454E90-80454E98 0008+00 s=2 e=0 z=0 None .sdata2 @3860 */ -SECTION_SDATA2 static u8 lit_3860[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3860 = 4503601774854144.0 /* cast s32 to float */; /* 80254134-802542E8 01B4+00 s=1 e=0 z=0 None .text childPaneSetSize__8CPaneMgrFP7J2DPaneff */ #pragma push @@ -465,9 +451,7 @@ asm void CPaneMgr::scaleAnime(s16 param_0, f32 param_1, f32 param_2, u8 param_3) /* ############################################################################################## */ /* 80454EA0-80454EA8 0008+00 s=1 e=0 z=0 None .sdata2 @4349 */ -SECTION_SDATA2 static u8 lit_4349[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4349 = 4503599627370496.0 /* cast u32 to float */; /* 802548BC-80254C90 03D4+00 s=0 e=4 z=0 None .text * colorAnime__8CPaneMgrFsQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorUc @@ -484,16 +468,16 @@ asm void CPaneMgr::colorAnime(s16 param_0, JUtility::TColor param_1, JUtility::T /* ############################################################################################## */ /* 80454EA8-80454EAC 0004+00 s=1 e=0 z=0 None .sdata2 @4473 */ -SECTION_SDATA2 static u32 lit_4473 = 0x44180000; +SECTION_SDATA2 static f32 lit_4473 = 608.0f; /* 80454EAC-80454EB0 0004+00 s=1 e=0 z=0 None .sdata2 @4474 */ -SECTION_SDATA2 static u32 lit_4474 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4474 = 448.0f; /* 80454EB0-80454EB4 0004+00 s=1 e=0 z=0 None .sdata2 @4475 */ -SECTION_SDATA2 static u32 lit_4475 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4475 = -1.0f; /* 80454EB4-80454EB8 0004+00 s=1 e=0 z=0 None .sdata2 @4476 */ -SECTION_SDATA2 static u32 lit_4476 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4476 = 1.0f; /* 80254C90-80254EBC 022C+00 s=1 e=9 z=0 None .text getGlobalVtx__8CPaneMgrFP7J2DPanePA3_A4_fUcbs */ diff --git a/src/d/pane/d_pane_class_alpha.cpp b/src/d/pane/d_pane_class_alpha.cpp index fd2bc350a32..23a3f38fcff 100644 --- a/src/d/pane/d_pane_class_alpha.cpp +++ b/src/d/pane/d_pane_class_alpha.cpp @@ -202,9 +202,7 @@ SECTION_SDATA2 static f32 lit_3692[1 + 1 /* padding */] = { }; /* 80454EC0-80454EC8 0008+00 s=3 e=0 z=0 None .sdata2 @3694 */ -SECTION_SDATA2 static u8 lit_3694[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3694 = 4503601774854144.0 /* cast s32 to float */; /* 80255658-80255758 0100+00 s=2 e=2 z=0 None .text rateCalc__13CPaneMgrAlphaFssUc */ #pragma push @@ -228,9 +226,7 @@ asm void CPaneMgrAlpha::setAlpha(u8 param_0) { /* ############################################################################################## */ /* 80454EC8-80454ED0 0008+00 s=6 e=0 z=0 None .sdata2 @3708 */ -SECTION_SDATA2 static u8 lit_3708[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3708 = 4503599627370496.0 /* cast u32 to float */; /* 802557D0-80255828 0058+00 s=1 e=173 z=5 None .text setAlphaRate__13CPaneMgrAlphaFf */ #pragma push @@ -244,16 +240,10 @@ asm void CPaneMgrAlpha::setAlphaRate(f32 param_0) { /* ############################################################################################## */ /* 80454ED0-80454ED8 0004+04 s=2 e=0 z=0 None .sdata2 @3721 */ -SECTION_SDATA2 static u8 lit_3721[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3721[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80255828-80255878 0050+00 s=0 e=107 z=2 None .text getAlphaRate__13CPaneMgrAlphaFv */ diff --git a/src/d/pane/d_pane_class_ex.cpp b/src/d/pane/d_pane_class_ex.cpp index eacb21fc122..91eea7f69ba 100644 --- a/src/d/pane/d_pane_class_ex.cpp +++ b/src/d/pane/d_pane_class_ex.cpp @@ -37,10 +37,10 @@ struct J2DPicture { struct J2DAnmTexPattern {}; -struct J2DAnmVisibilityFull {}; - struct J2DAnmVtxColor {}; +struct J2DAnmVisibilityFull {}; + struct J2DPane { /* 80256018 */ void setAnimation(J2DAnmVtxColor*); /* 80256020 */ void setAnimation(J2DAnmTexPattern*); diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index bbc663af62b..42eaf4465ea 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -58,6 +58,15 @@ struct dPa_wbPcallBack_c { /* 8004FECC */ ~dPa_wbPcallBack_c(); }; +struct _GXColor {}; + +struct JGeometry { + template + struct TVec3 {}; + /* TVec3 */ + struct TVec3__template0 {}; +}; + struct JPAEmitterCallBack { /* 80050368 */ void execute(JPABaseEmitter*); /* 8005036C */ void draw(JPABaseEmitter*); @@ -66,6 +75,14 @@ struct JPAEmitterCallBack { /* 8027E6A4 */ ~JPAEmitterCallBack(); }; +struct JPADrawInfo {}; + +struct JPAParticleCallBack { + /* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*); + /* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*); + /* 8027EFA4 */ ~JPAParticleCallBack(); +}; + struct ResTIMG {}; struct JPAResourceManager { @@ -75,21 +92,6 @@ struct JPAResourceManager { /* 80273FCC */ void getResUserWork(u16) const; }; -struct JPAParticleCallBack { - /* 800183D4 */ void execute(JPABaseEmitter*, JPABaseParticle*); - /* 800183D8 */ void draw(JPABaseEmitter*, JPABaseParticle*); - /* 8027EFA4 */ ~JPAParticleCallBack(); -}; - -struct JPADrawInfo {}; - -struct JGeometry { - template - struct TVec3 {}; - /* TVec3 */ - struct TVec3__template0 {}; -}; - struct JPAEmitterManager { /* 8027DCA0 */ JPAEmitterManager(u32, u32, JKRHeap*, u8, u8); /* 8027DEBC */ void createSimpleEmitterID(JGeometry::TVec3 const&, u16, u8, u8, @@ -103,8 +105,6 @@ struct JPAEmitterManager { struct dKy_tevstr_c {}; -struct _GXColor {}; - struct dPa_simpleEcallBack { /* 8004ADF4 */ dPa_simpleEcallBack(); /* 8004AE1C */ void executeAfter(JPABaseEmitter*); @@ -346,14 +346,14 @@ struct J3DShape { /* 80315300 */ void loadPreDrawSetting() const; }; -struct J3DAnmTexPattern { - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); -}; - struct J3DAnmTevRegKey { /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); }; +struct J3DAnmTexPattern { + /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); +}; + struct J3DMaterialTable { /* 8032F6F8 */ void removeTexNoAnimator(J3DAnmTexPattern*); /* 8032F880 */ void removeTevRegAnimator(J3DAnmTevRegKey*); @@ -387,18 +387,6 @@ static void static_gen_d_light8EcallBack(JPABaseEmitter*); static void dPa_setWindPower(JPABaseParticle*); static void dPa_kankyocolor_set(f32, JPABaseEmitter*, dKy_tevstr_c const*, u32, cXyz const*, _GXColor const*, _GXColor const*); -extern "C" extern char const* const d_particle_d_particle__stringBase0; -extern "C" extern void* __vt__22dPa_hermiteEcallBack_c[9]; -extern "C" extern void* __vt__19dPa_followEcallBack[10]; -extern "C" extern void* __vt__18dPa_levelEcallBack[9]; -extern "C" extern void* __vt__18JPAEmitterCallBack[7]; -extern "C" extern u8 mTsubo__13dPa_control_c[64]; -extern "C" extern u8 mEcallback__18dPa_modelEcallBack[4]; -extern "C" extern u8 mEmitterMng__13dPa_control_c[4]; -extern "C" extern u8 mWaterBubblePcallBack__13dPa_control_c[4]; -extern "C" extern u8 mLight8EcallBack__13dPa_control_c[4]; -extern "C" extern u8 data_80450EC4[4]; -extern "C" extern u8 mParticleTracePCB__13dPa_control_c[4 + 4 /* padding */]; extern "C" static void dPa_cleanupGX__Fv(); extern "C" void __ct__19dPa_followEcallBackFUcUc(); @@ -601,24 +589,6 @@ void JPAGetXYZRotateMtx(s16, s16, s16, f32 (*)[4]); void* operator new(u32, JKRHeap*, int); void* operator new[](u32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern void* __vt__19JPAParticleCallBack[5]; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern u8 j_o_id__8dPa_name[10 + 2 /* padding */]; -extern "C" extern u8 s_o_id__8dPa_name[28]; -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_epsilon; -extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 JPTracePCB4[4]; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; extern "C" void OSReport(); extern "C" void mDoExt_getArchiveHeap__Fv(); @@ -1175,15 +1145,13 @@ asm static void dPa_group_id_change(u32* param_0, u8* param_1) { /* ############################################################################################## */ /* 80451F40-80451F44 0004+00 s=2 e=0 z=0 None .sdata2 @3880 */ -SECTION_SDATA2 static u32 lit_3880 = 0x437F0000; +SECTION_SDATA2 static f32 lit_3880 = 255.0f; /* 80451F44-80451F48 0004+00 s=1 e=0 z=0 None .sdata2 @3881 */ -SECTION_SDATA2 static u32 lit_3881 = 0x40800000; +SECTION_SDATA2 static f32 lit_3881 = 4.0f; /* 80451F48-80451F50 0008+00 s=2 e=0 z=0 None .sdata2 @3883 */ -SECTION_SDATA2 static u8 lit_3883[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3883 = 4503601774854144.0 /* cast s32 to float */; /* 80049934-80049B30 01FC+00 s=1 e=0 z=0 None .text initiateLighting8__FR8_GXColors */ #pragma push @@ -1322,10 +1290,10 @@ asm void dPa_gen_d_light8EcallBack::draw(JPABaseEmitter* param_0) { /* ############################################################################################## */ /* 80451F54-80451F58 0004+00 s=1 e=0 z=0 None .sdata2 @4048 */ -SECTION_SDATA2 static u32 lit_4048 = 0x3F266666; +SECTION_SDATA2 static f32 lit_4048 = 13.0f / 20.0f; /* 80451F58-80451F5C 0004+00 s=1 e=0 z=0 None .sdata2 @4049 */ -SECTION_SDATA2 static u32 lit_4049 = 0x41100000; +SECTION_SDATA2 static f32 lit_4049 = 9.0f; /* 8004A3AC-8004A460 00B4+00 s=2 e=0 z=0 None .text dPa_setWindPower__FP15JPABaseParticle */ #pragma push @@ -1344,7 +1312,7 @@ SECTION_RODATA static u8 const lit_4065[12] = { }; /* 80451F5C-80451F60 0004+00 s=3 e=0 z=0 None .sdata2 @4090 */ -SECTION_SDATA2 static u32 lit_4090 = 0xBBB40000; +SECTION_SDATA2 static f32 lit_4090 = -0.0054931640625f; /* 80451F60-80451F68 0004+04 s=3 e=0 z=0 None .sdata2 @4091 */ SECTION_SDATA2 static f32 lit_4091[1 + 1 /* padding */] = { @@ -1354,9 +1322,7 @@ SECTION_SDATA2 static f32 lit_4091[1 + 1 /* padding */] = { }; /* 80451F68-80451F70 0008+00 s=7 e=0 z=0 None .sdata2 @4093 */ -SECTION_SDATA2 static u8 lit_4093[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4093 = 4503599627370496.0 /* cast u32 to float */; /* 8004A460-8004A608 01A8+00 s=1 e=0 z=0 None .text * draw__18dPa_modelPcallBackFP14JPABaseEmitterP15JPABaseParticle */ @@ -1568,7 +1534,7 @@ asm dPa_simpleEcallBack::dPa_simpleEcallBack() { /* ############################################################################################## */ /* 80451F70-80451F74 0004+00 s=1 e=0 z=0 None .sdata2 @4391 */ -SECTION_SDATA2 static u32 lit_4391 = 0x43480000; +SECTION_SDATA2 static f32 lit_4391 = 200.0f; /* 8004AE1C-8004AF94 0178+00 s=1 e=0 z=0 None .text * executeAfter__19dPa_simpleEcallBackFP14JPABaseEmitter */ @@ -1648,10 +1614,10 @@ SECTION_SDATA2 static u32 lit_4482 = 0xFFFFFFFF; SECTION_SDATA2 static u32 lit_4483 = 0xFFFFFFFF; /* 80451F84-80451F88 0004+00 s=3 e=0 z=0 None .sdata2 @4518 */ -SECTION_SDATA2 static u32 lit_4518 = 0x42C60000; +SECTION_SDATA2 static f32 lit_4518 = 99.0f; /* 80451F88-80451F8C 0004+00 s=10 e=0 z=0 None .sdata2 @4519 */ -SECTION_SDATA2 static u32 lit_4519 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4519 = 1.0f; /* 8004B168-8004B4E0 0378+00 s=1 e=0 z=0 None .text * set__19dPa_simpleEcallBackFPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif */ @@ -2067,7 +2033,7 @@ asm void dPa_control_c::draw(JPADrawInfo* param_0, u8 param_1) { /* ############################################################################################## */ /* 80451F8C-80451F90 0004+00 s=5 e=0 z=0 None .sdata2 @5066 */ -SECTION_SDATA2 static u32 lit_5066 = 0x3F000000; +SECTION_SDATA2 static f32 lit_5066 = 0.5f; /* 8004C218-8004C838 0620+00 s=0 e=7 z=54 None .text * setHitMark__13dPa_control_cFUsP10fopAc_ac_cPC4cXyzPC5csXyzPC4cXyzUl */ @@ -2091,23 +2057,19 @@ SECTION_SDATA2 static u8 particleID[4] = { }; /* 80451F94-80451F98 0004+00 s=1 e=0 z=0 None .sdata2 @5140 */ -SECTION_SDATA2 static u32 lit_5140 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_5140 = 1.0f / 20.0f; /* 80451F98-80451F9C 0004+00 s=1 e=0 z=0 None .sdata2 @5141 */ -SECTION_SDATA2 static u32 lit_5141 = 0x3E19999A; +SECTION_SDATA2 static f32 lit_5141 = 3.0f / 20.0f; /* 80451F9C-80451FA0 0004+00 s=2 e=0 z=0 None .sdata2 @5142 */ -SECTION_SDATA2 static u32 lit_5142 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_5142 = 1.0f / 10.0f; /* 80451FA0-80451FA8 0008+00 s=2 e=0 z=0 None .sdata2 @5143 */ -SECTION_SDATA2 static u8 lit_5143[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5143 = 0.5; /* 80451FA8-80451FB0 0008+00 s=2 e=0 z=0 None .sdata2 @5144 */ -SECTION_SDATA2 static u8 lit_5144[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5144 = 3.0; /* 80451FB0-80451FB8 0008+00 s=2 e=0 z=0 None .sdata2 @5145 */ SECTION_SDATA2 static u8 lit_5145[8] = { @@ -2362,19 +2324,19 @@ void dPa_gen_d_light8PcallBack::execute(JPABaseEmitter* param_0, JPABaseParticle /* ############################################################################################## */ /* 80451FD8-80451FDC 0004+00 s=3 e=0 z=0 None .sdata2 @6075 */ -SECTION_SDATA2 static u32 lit_6075 = 0x42000000; +SECTION_SDATA2 static f32 lit_6075 = 32.0f; /* 80451FDC-80451FE0 0004+00 s=4 e=0 z=0 None .sdata2 @6076 */ -SECTION_SDATA2 static u32 lit_6076 = 0x40400000; +SECTION_SDATA2 static f32 lit_6076 = 3.0f; /* 80451FE0-80451FE4 0004+00 s=1 e=0 z=0 None .sdata2 @6077 */ -SECTION_SDATA2 static u32 lit_6077 = 0x41200000; +SECTION_SDATA2 static f32 lit_6077 = 10.0f; /* 80451FE4-80451FE8 0004+00 s=2 e=0 z=0 None .sdata2 @6078 */ -SECTION_SDATA2 static u32 lit_6078 = 0x40000000; +SECTION_SDATA2 static f32 lit_6078 = 2.0f; /* 80451FE8-80451FEC 0004+00 s=3 e=0 z=0 None .sdata2 @6079 */ -SECTION_SDATA2 static u32 lit_6079 = 0xBF800000; +SECTION_SDATA2 static f32 lit_6079 = -1.0f; /* 8004DD1C-8004E6A8 098C+00 s=1 e=0 z=0 None .text * draw__19dPa_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */ @@ -2389,10 +2351,10 @@ asm void dPa_light8PcallBack::draw(JPABaseEmitter* param_0, JPABaseParticle* par /* ############################################################################################## */ /* 80451FEC-80451FF0 0004+00 s=2 e=0 z=0 None .sdata2 @6350 */ -SECTION_SDATA2 static u32 lit_6350 = 0x41480000; +SECTION_SDATA2 static f32 lit_6350 = 12.5f; /* 80451FF0-80451FF4 0004+00 s=2 e=0 z=0 None .sdata2 @6351 */ -SECTION_SDATA2 static u32 lit_6351 = 0xC1480000; +SECTION_SDATA2 static f32 lit_6351 = -12.5f; /* 8004E6A8-8004ED44 069C+00 s=1 e=0 z=0 None .text * draw__25dPa_gen_b_light8PcallBackFP14JPABaseEmitterP15JPABaseParticle */ @@ -2429,7 +2391,7 @@ asm void dPa_hermiteEcallBack_c::setOldPosP(cXyz const* param_0, cXyz const* par /* ############################################################################################## */ /* 80451FF4-80451FF8 0004+00 s=1 e=0 z=0 None .sdata2 @6846 */ -SECTION_SDATA2 static u32 lit_6846 = 0xC0000000; +SECTION_SDATA2 static f32 lit_6846 = -2.0f; /* 8004F6C4-8004FABC 03F8+00 s=1 e=0 z=0 None .text * executeAfter__22dPa_hermiteEcallBack_cFP14JPABaseEmitter */ diff --git a/src/d/particle/d_particle_copoly.cpp b/src/d/particle/d_particle_copoly.cpp index 61900265875..282c6a7661b 100644 --- a/src/d/particle/d_particle_copoly.cpp +++ b/src/d/particle/d_particle_copoly.cpp @@ -11,13 +11,13 @@ // Types: // -struct csXyz {}; +struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct cBgS_PolyInfo {}; -struct cXyz {}; +struct dKy_tevstr_c {}; struct dPa_control_c { struct level_c { @@ -79,10 +79,6 @@ struct cBgS { // Forward References: // -extern "C" extern u8 m_emitterTwoData__8dPaPoT_c[36]; -extern "C" extern u8 m_typeFourData__8dPaPoF_c[60]; -extern "C" extern u8 m_emitterFourData__8dPaPoF_c[60 + 28 /* padding */]; - extern "C" void init__7dPaPo_cFP9dBgS_Acchff(); extern "C" void checkWaterIn__7dPaPo_cFP4cXyzPC4cXyzPC12dKy_tevstr_cUlScff(); extern "C" void setEffect__7dPaPo_cFPUliPC12dKy_tevstr_cPC4cXyzUlUlPC4cXyzPC5csXyzScPUcPUc(); @@ -114,7 +110,6 @@ extern "C" extern u8 m_emitterFourData__8dPaPoF_c[60 + 28 /* padding */]; // void fopKyM_createWpillar(cXyz const*, f32, int); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void fopKyM_createWpillar__FPC4cXyzfi(); extern "C" void getEmitter__Q213dPa_control_c7level_cFUl(); @@ -151,16 +146,10 @@ asm void dPaPo_c::init(dBgS_Acch* param_0, f32 param_1, f32 param_2) { /* ############################################################################################## */ /* 80451FF8-80452000 0004+04 s=1 e=0 z=0 None .sdata2 @3672 */ -SECTION_SDATA2 static u8 lit_3672[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3672[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 80050CC4-80050E7C 01B8+00 s=1 e=0 z=0 None .text diff --git a/src/d/particle/d_particle_name.cpp b/src/d/particle/d_particle_name.cpp index 1280699a09a..012fff028e4 100644 --- a/src/d/particle/d_particle_name.cpp +++ b/src/d/particle/d_particle_name.cpp @@ -14,9 +14,6 @@ extern "C" extern u8 j_o_id__8dPa_name[10 + 2 /* padding */]; extern "C" extern u8 s_o_id__8dPa_name[28]; -extern "C" extern u8 j_o_id__8dPa_name[10 + 2 /* padding */]; -extern "C" extern u8 s_o_id__8dPa_name[28]; - // // External References: // diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index 74cd31bc602..0d06099f779 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -164,8 +164,6 @@ static void dScnLogo_Draw(dScnLogo_c*); static void dScnLogo_Delete(dScnLogo_c*); static bool dScnLogo_IsDelete(dScnLogo_c*); static void cLib_calcTimer__template5(u16*); -extern "C" extern char const* const d_s_d_s_logo__stringBase0; -extern "C" extern void* g_profile_LOGO_SCENE[10]; extern "C" void __ct__10dLog_HIO_cFv(); extern "C" void preLoad_dyl_create__10dScnLogo_cFv(); @@ -233,25 +231,6 @@ void* operator new(u32); void* operator new[](u32); void operator delete(void*); void operator delete[](void*); -extern "C" extern u8 g_ntscZeldaProg[60]; -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__10dDlst_2D_c[3]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" extern u32 g_blackColor; -extern "C" extern u8 struct_80450BB8[4]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 archiveHeap[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sAramObject__7JKRAram[4]; -extern "C" extern u8 sCallback__Q210JUTGamePad13C3ButtonReset[4]; -extern "C" extern u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451500[4]; SECTION_INIT void memset(); extern "C" void mDoExt_getGameHeap__Fv(); @@ -583,27 +562,25 @@ asm void dScnLogo_c::progInDraw() { /* ############################################################################################## */ /* 80454ED8-80454EDC 0004+00 s=1 e=0 z=0 None .sdata2 @3933 */ -SECTION_SDATA2 static u32 lit_3933 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3933 = 0.5f; /* 80454EDC-80454EE0 0004+00 s=2 e=0 z=0 None .sdata2 @3934 */ -SECTION_SDATA2 static u32 lit_3934 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3934 = 1.0f; /* 80454EE0-80454EE4 0004+00 s=1 e=0 z=0 None .sdata2 @3935 */ -SECTION_SDATA2 static u32 lit_3935 = 0xBF800000; +SECTION_SDATA2 static f32 lit_3935 = -1.0f; /* 80454EE4-80454EE8 0004+00 s=1 e=0 z=0 None .sdata2 @3936 */ -SECTION_SDATA2 static u32 lit_3936 = 0xBF000000; +SECTION_SDATA2 static f32 lit_3936 = -0.5f; /* 80454EE8-80454EEC 0004+00 s=2 e=0 z=0 None .sdata2 @3937 */ -SECTION_SDATA2 static u32 lit_3937 = 0x437F0000; +SECTION_SDATA2 static f32 lit_3937 = 255.0f; /* 80454EEC-80454EF0 0004+00 s=1 e=0 z=0 None .sdata2 @3938 */ -SECTION_SDATA2 static u32 lit_3938 = 0x43480000; +SECTION_SDATA2 static f32 lit_3938 = 200.0f; /* 80454EF0-80454EF8 0008+00 s=2 e=0 z=0 None .sdata2 @3940 */ -SECTION_SDATA2 static u8 lit_3940[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3940 = 4503599627370496.0 /* cast u32 to float */; /* 8025631C-802568E0 05C4+00 s=1 e=0 z=0 None .text progSelDraw__10dScnLogo_cFv */ #pragma push diff --git a/src/d/s/d_s_menu.cpp b/src/d/s/d_s_menu.cpp index 9406ea173b4..ff51ff37190 100644 --- a/src/d/s/d_s_menu.cpp +++ b/src/d/s/d_s_menu.cpp @@ -13,8 +13,6 @@ extern "C" extern void* g_profile_MENU_SCENE[10]; -extern "C" extern void* g_profile_MENU_SCENE[10]; - // // External References: // @@ -22,9 +20,6 @@ extern "C" extern void* g_profile_MENU_SCENE[10]; extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index dbbb177af7b..b31007c7d96 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -115,9 +115,6 @@ static void dScnName_Execute(dScnName_c*); static void dScnName_IsDelete(dScnName_c*); static void dScnName_Delete(dScnName_c*); static void dScnName_Create(scene_class*); -extern "C" extern char const* const d_s_d_s_name__stringBase0; -extern "C" extern void* g_profile_NAME_SCENE[10]; -extern "C" extern void* g_profile_NAMEEX_SCENE[10]; extern "C" void __ct__9dSn_HIO_cFv(); extern "C" static void phase_1__FPc(); @@ -165,18 +162,6 @@ void dKy_clear_game_init(); void dKy_setLight_init(); void* operator new(u32); void operator delete(void*); -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" extern u32 g_blackColor; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3Vecs(); extern "C" void mDoMtx_concatProjView__FPA4_CfPA4_CfPA4_f(); @@ -421,24 +406,22 @@ SECTION_SDATA2 static u8 lit_3923[4] = { }; /* 80454EFC-80454F00 0004+00 s=1 e=0 z=0 None .sdata2 @3924 */ -SECTION_SDATA2 static u32 lit_3924 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3924 = 1.0f; /* 80454F00-80454F04 0004+00 s=1 e=0 z=0 None .sdata2 @3925 */ -SECTION_SDATA2 static u32 lit_3925 = 0x47C35000; +SECTION_SDATA2 static f32 lit_3925 = 100000.0f; /* 80454F04-80454F08 0004+00 s=1 e=0 z=0 None .sdata2 @3926 */ -SECTION_SDATA2 static u32 lit_3926 = 0x42340000; +SECTION_SDATA2 static f32 lit_3926 = 45.0f; /* 80454F08-80454F0C 0004+00 s=1 e=0 z=0 None .sdata2 @3927 */ -SECTION_SDATA2 static u32 lit_3927 = 0x3FADB6DB; +SECTION_SDATA2 static f32 lit_3927 = 19.0f / 14.0f; /* 80454F0C-80454F10 0004+00 s=1 e=0 z=0 None .sdata2 @3928 */ -SECTION_SDATA2 static u32 lit_3928 = 0xC47A0000; +SECTION_SDATA2 static f32 lit_3928 = -1000.0f; /* 80454F10-80454F18 0008+00 s=1 e=0 z=0 None .sdata2 @3930 */ -SECTION_SDATA2 static u8 lit_3930[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3930 = 4503599627370496.0 /* cast u32 to float */; /* 802588A0-80258B2C 028C+00 s=1 e=0 z=0 None .text create__10dScnName_cFv */ #pragma push diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index 198ff3ab82c..772f60678fd 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -241,11 +241,6 @@ static void phase_5(dScnPly_c*); static void phase_6(dScnPly_c*); static s32 phase_compleate(void*); static void dScnPly_Create(scene_class*); -extern "C" extern char const* const d_s_d_s_play__stringBase0; -extern "C" extern void* g_profile_PLAY_SCENE[10]; -extern "C" extern void* g_profile_OPENING_SCENE[10]; -extern "C" extern u8 g_envHIO[68]; -extern "C" extern u8 struct_80451124[4]; extern "C" void calcPauseTimer__9dScnPly_cFv(); extern "C" void __ct__22dScnPly_env_otherHIO_cFv(); @@ -321,36 +316,6 @@ void dMeter2Info_setSword(u8, bool); void dMeter2Info_setShield(u8, bool); void cLib_calcTimer__template4(s8*); void operator delete(void*); -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" extern void* __vt__14mDoHIO_entry_c[3]; -extern "C" extern u8 m_bloom__13mDoGph_gInf_c[20]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 mRoofCheck__11fopAcM_rc_c[80]; -extern "C" extern u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */]; -extern "C" extern u8 g_Counter[12 + 4 /* padding */]; -extern "C" extern u8 data_804505F0[8]; -extern "C" extern u32 g_blackColor; -extern "C" extern u32 g_saftyWhiteColor; -extern "C" extern u8 struct_80450BB8[4]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 struct_80450BE4[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 mProcID__20dStage_roomControl_c[4]; -extern "C" extern u8 data_80450D68[4]; -extern "C" extern u8 struct_80450D8C[4]; -extern "C" extern u8 m_emitter__8daYkgr_c[4]; -extern "C" extern u8 data_80450EC4[4]; -extern "C" extern u8 data_80450ED0[4]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sCallback__Q210JUTGamePad13C3ButtonReset[4]; -extern "C" extern u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451500[4]; extern "C" void mDoAud_setSceneName__FPCcll(); extern "C" void mDoAud_load1stDynamicWave__Fv(); @@ -678,7 +643,7 @@ SECTION_SDATA2 static u16 T_JOINT_dylKeyTbl[1 + 1 /* padding */] = { }; /* 80454F1C-80454F20 0004+00 s=1 e=0 z=0 None .sdata2 @4055 */ -SECTION_SDATA2 static u32 lit_4055 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4055 = 255.0f; /* 80259440-80259468 0028+00 s=1 e=0 z=0 None .text __ct__22dScnPly_env_otherHIO_cFv */ #pragma push @@ -692,10 +657,10 @@ asm dScnPly_env_otherHIO_c::dScnPly_env_otherHIO_c() { /* ############################################################################################## */ /* 80454F20-80454F24 0004+00 s=1 e=0 z=0 None .sdata2 @4066 */ -SECTION_SDATA2 static u32 lit_4066 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_4066 = -100.0f; /* 80454F24-80454F28 0004+00 s=1 e=0 z=0 None .sdata2 @4067 */ -SECTION_SDATA2 static u32 lit_4067 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4067 = 100.0f; /* 80454F28-80454F2C 0004+00 s=2 e=0 z=0 None .sdata2 @4068 */ SECTION_SDATA2 static u8 lit_4068[4] = { @@ -912,10 +877,10 @@ static u8 lit_4050[12]; u8 g_envHIO[68]; /* 80454F30-80454F34 0004+00 s=1 e=0 z=0 None .sdata2 @4804 */ -SECTION_SDATA2 static u32 lit_4804 = 0x44180000; +SECTION_SDATA2 static f32 lit_4804 = 608.0f; /* 80454F34-80454F38 0004+00 s=1 e=0 z=0 None .sdata2 @4805 */ -SECTION_SDATA2 static u32 lit_4805 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4805 = 448.0f; /* 80454F38-80454F40 0004+04 s=1 e=0 z=0 None .sdata2 @4806 */ SECTION_SDATA2 static f32 lit_4806[1 + 1 /* padding */] = { diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp index c08ac3beb78..023ba468916 100644 --- a/src/d/s/d_s_room.cpp +++ b/src/d/s/d_s_room.cpp @@ -104,8 +104,6 @@ static void phase_2(room_of_scene_class*); static void phase_3(room_of_scene_class*); static void phase_4(room_of_scene_class*); static void dScnRoom_Create(scene_class*); -extern "C" extern char const* const d_s_d_s_room__stringBase0; -extern "C" extern void* g_profile_ROOM_SCENE[10]; extern "C" static bool dScnRoom_Draw__FP19room_of_scene_class(); extern "C" static void getResetArchiveBank__FiPPCUc(); @@ -149,17 +147,6 @@ void dStage_dt_c_roomReLoader(void*, dStage_dt_c*, int); void dComIfG_getRoomArcName(int); void dComIfGp_ret_wp_set(s8); void dComLbG_PhaseHandler(request_of_phase_process_class*, int (**)(void*), void*); -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 g_fpcNd_type[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 mArcBankName__20dStage_roomControl_c[4]; -extern "C" extern u8 mArcBankData__20dStage_roomControl_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void OSReport_Error(); extern "C" void mDoExt_getArchiveHeap__Fv(); diff --git a/src/d/s/d_s_title.cpp b/src/d/s/d_s_title.cpp index 43f6d94e41c..475543665dc 100644 --- a/src/d/s/d_s_title.cpp +++ b/src/d/s/d_s_title.cpp @@ -14,9 +14,6 @@ extern "C" extern void* g_profile_WARNING_SCENE[10]; extern "C" extern void* g_profile_WARNING2_SCENE[10]; -extern "C" extern void* g_profile_WARNING_SCENE[10]; -extern "C" extern void* g_profile_WARNING2_SCENE[10]; - // // External References: // @@ -24,9 +21,6 @@ extern "C" extern void* g_profile_WARNING2_SCENE[10]; extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; - // // Declarations: // diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index 2bf8120966d..ea74d4f710a 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -298,9 +298,6 @@ struct Z2AudioMgr { // static void dSv_item_rename(u8); -extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; -extern "C" extern char const* const d_save_d_save__stringBase0; -extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" static void dSv_item_rename__FUc(); extern "C" void init__21dSv_player_status_a_cFv(); @@ -477,10 +474,6 @@ void dComIfGp_setSelectItem(int); s32 dComIfGs_getBottleMax(); void dComIfGs_setKeyNum(int, u8); void setInitEventBit(); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sRumbleSupported__10JUTGamePad[4]; SECTION_INIT void memcpy(); extern "C" void OSReport_Error(); @@ -614,7 +607,7 @@ asm void dSv_player_status_a_c::isMagicFlag(u8 param_0) const { /* ############################################################################################## */ /* 80451D58-80451D5C 0004+00 s=1 e=0 z=0 None .sdata2 @3775 */ -SECTION_SDATA2 static u32 lit_3775 = 0x437F0000; +SECTION_SDATA2 static f32 lit_3775 = 255.0f; /* 80032B50-80032B94 0044+00 s=1 e=0 z=0 None .text init__21dSv_player_status_b_cFv */ #pragma push diff --git a/src/d/save/d_save_HIO.cpp b/src/d/save/d_save_HIO.cpp index 3aec3db493a..71bf75f784e 100644 --- a/src/d/save/d_save_HIO.cpp +++ b/src/d/save/d_save_HIO.cpp @@ -129,8 +129,6 @@ struct dSvBit_HIO_c { // Forward References: // -extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */]; - extern "C" void __ct__29dSvBit_childSwPerfectionHIO_cFv(); extern "C" void init__29dSvBit_childSwPerfectionHIO_cFv(); extern "C" void __ct__26dSvBit_childSwDungeonHIO_cFv(); @@ -180,7 +178,6 @@ extern "C" extern u8 g_save_bit_HIO[1184 + 4 /* padding */]; // void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void isDarkClearLV__21dSv_player_status_b_cCFi(); extern "C" void isTransformLV__21dSv_player_status_b_cCFi(); diff --git a/src/d/shop/d_shop_camera.cpp b/src/d/shop/d_shop_camera.cpp index e8a1f901614..2a77bed44d9 100644 --- a/src/d/shop/d_shop_camera.cpp +++ b/src/d/shop/d_shop_camera.cpp @@ -68,9 +68,6 @@ void cM_atan2s(f32, f32); void cLib_addCalc2(f32*, f32, f32, f32); void cLib_addCalcPos2(cXyz*, cXyz const&, f32, f32); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); -extern "C" extern u8 const __ptmf_null[12 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" void Stay__9dCamera_cFv(); extern "C" void SetTrimSize__9dCamera_cFl(); @@ -136,13 +133,13 @@ SECTION_DATA static void* lit_3771[3] = { }; /* 80453A88-80453A8C 0004+00 s=1 e=0 z=0 None .sdata2 @3796 */ -SECTION_SDATA2 static u32 lit_3796 = 0x3E800000; +SECTION_SDATA2 static f32 lit_3796 = 0.25f; /* 80453A8C-80453A90 0004+00 s=1 e=0 z=0 None .sdata2 @3797 */ -SECTION_SDATA2 static u32 lit_3797 = 0x41A00000; +SECTION_SDATA2 static f32 lit_3797 = 20.0f; /* 80453A90-80453A94 0004+00 s=1 e=0 z=0 None .sdata2 @3798 */ -SECTION_SDATA2 static u32 lit_3798 = 0x40A00000; +SECTION_SDATA2 static f32 lit_3798 = 5.0f; /* 80195C9C-80195E18 017C+00 s=0 e=0 z=9 None .text shop_cam_action_init__16ShopCam_action_cFv */ @@ -165,14 +162,10 @@ SECTION_SDATA2 static u8 lit_3916[4] = { }; /* 80453A98-80453AA0 0008+00 s=1 e=0 z=0 None .sdata2 @3917 */ -SECTION_SDATA2 static u8 lit_3917[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3917 = 0.5; /* 80453AA0-80453AA8 0008+00 s=1 e=0 z=0 None .sdata2 @3918 */ -SECTION_SDATA2 static u8 lit_3918[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3918 = 3.0; /* 80453AA8-80453AB0 0008+00 s=1 e=0 z=0 None .sdata2 @3919 */ SECTION_SDATA2 static u8 lit_3919[8] = { @@ -180,7 +173,7 @@ SECTION_SDATA2 static u8 lit_3919[8] = { }; /* 80453AB0-80453AB4 0004+00 s=1 e=0 z=0 None .sdata2 @3920 */ -SECTION_SDATA2 static u32 lit_3920 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3920 = 1.0f; /* 80195E18-8019630C 04F4+00 s=1 e=0 z=0 None .text shop_cam_action__16ShopCam_action_cFv */ #pragma push @@ -235,7 +228,7 @@ asm void ShopCam_action_c::move() { /* ############################################################################################## */ /* 80453AB4-80453AB8 0004+00 s=2 e=0 z=0 None .sdata2 @3992 */ -SECTION_SDATA2 static u32 lit_3992 = 0x42340000; +SECTION_SDATA2 static f32 lit_3992 = 45.0f; /* 80196544-80196608 00C4+00 s=0 e=1 z=0 None .text * setCamDataIdx__16ShopCam_action_cFP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP10fopAc_ac_cP4cXyzP4cXyz @@ -268,22 +261,22 @@ asm void ShopCam_action_c::setCamDataIdx2(fopAc_ac_c* param_0, fopAc_ac_c* param /* ############################################################################################## */ /* 80453AB8-80453ABC 0004+00 s=1 e=0 z=0 None .sdata2 @4059 */ -SECTION_SDATA2 static u32 lit_4059 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4059 = 0.5f; /* 80453ABC-80453AC0 0004+00 s=1 e=0 z=0 None .sdata2 @4060 */ -SECTION_SDATA2 static u32 lit_4060 = 0x43270000; +SECTION_SDATA2 static f32 lit_4060 = 167.0f; /* 80453AC0-80453AC4 0004+00 s=1 e=0 z=0 None .sdata2 @4061 */ -SECTION_SDATA2 static u32 lit_4061 = 0x435C0000; +SECTION_SDATA2 static f32 lit_4061 = 220.0f; /* 80453AC4-80453AC8 0004+00 s=1 e=0 z=0 None .sdata2 @4062 */ -SECTION_SDATA2 static u32 lit_4062 = 0x42F00000; +SECTION_SDATA2 static f32 lit_4062 = 120.0f; /* 80453AC8-80453ACC 0004+00 s=1 e=0 z=0 None .sdata2 @4063 */ -SECTION_SDATA2 static u32 lit_4063 = 0xC2480000; +SECTION_SDATA2 static f32 lit_4063 = -50.0f; /* 80453ACC-80453AD0 0004+00 s=1 e=0 z=0 None .sdata2 @4064 */ -SECTION_SDATA2 static u32 lit_4064 = 0x43AF0000; +SECTION_SDATA2 static f32 lit_4064 = 350.0f; /* 801966D4-801968B8 01E4+00 s=2 e=0 z=0 None .text _debugSetCamera__16ShopCam_action_cFv */ #pragma push diff --git a/src/d/shop/d_shop_item_ctrl.cpp b/src/d/shop/d_shop_item_ctrl.cpp index 0462d119b8d..e573456bbf6 100644 --- a/src/d/shop/d_shop_item_ctrl.cpp +++ b/src/d/shop/d_shop_item_ctrl.cpp @@ -54,7 +54,6 @@ void fpcFCtRq_Do(fast_create_request*); void cLib_addCalcPos2(cXyz*, cXyz const&, f32, f32); void cLib_addCalcAngleS(s16*, s16, s16, s16, s16); void operator delete(void*); -extern "C" extern u32 __float_nan; extern "C" void fopAcIt_Judge__FPFPvPv_PvPv(); extern "C" void fpcSch_JudgeByID__FPvPv(); @@ -108,16 +107,10 @@ asm dShopItemCtrl_c::~dShopItemCtrl_c() { /* ############################################################################################## */ /* 80453AD0-80453AD8 0004+04 s=2 e=0 z=0 None .sdata2 @3659 */ -SECTION_SDATA2 static u8 lit_3659[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, +SECTION_SDATA2 static f32 lit_3659[1 + 1 /* padding */] = { + 0.0f, /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, + 0.0f, }; /* 801969A0-80196A3C 009C+00 s=0 e=3 z=3 None .text getCurrentPos__15dShopItemCtrl_cFi */ @@ -152,14 +145,10 @@ asm void dShopItemCtrl_c::setRotateAnime(int param_0) { /* ############################################################################################## */ /* 80453AD8-80453AE0 0008+00 s=1 e=0 z=0 None .sdata2 @3838 */ -SECTION_SDATA2 static u8 lit_3838[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3838 = 0.5; /* 80453AE0-80453AE8 0008+00 s=1 e=0 z=0 None .sdata2 @3839 */ -SECTION_SDATA2 static u8 lit_3839[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3839 = 3.0; /* 80453AE8-80453AF0 0008+00 s=1 e=0 z=0 None .sdata2 @3840 */ SECTION_SDATA2 static u8 lit_3840[8] = { @@ -167,16 +156,16 @@ SECTION_SDATA2 static u8 lit_3840[8] = { }; /* 80453AF0-80453AF4 0004+00 s=1 e=0 z=0 None .sdata2 @3841 */ -SECTION_SDATA2 static u32 lit_3841 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3841 = 0.5f; /* 80453AF4-80453AF8 0004+00 s=1 e=0 z=0 None .sdata2 @3842 */ -SECTION_SDATA2 static u32 lit_3842 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_3842 = 1.0f / 20.0f; /* 80453AF8-80453AFC 0004+00 s=1 e=0 z=0 None .sdata2 @3843 */ -SECTION_SDATA2 static u32 lit_3843 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_3843 = 1.0f / 10.0f; /* 80453AFC-80453B00 0004+00 s=1 e=0 z=0 None .sdata2 @3844 */ -SECTION_SDATA2 static u32 lit_3844 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_3844 = 1.0f / 100.0f; /* 80196BA4-80197098 04F4+00 s=0 e=1 z=0 None .text setZoomAnime__15dShopItemCtrl_cFiP4cXyzsb */ diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp index ca082a07ee6..75152b6dab6 100644 --- a/src/d/shop/d_shop_system.cpp +++ b/src/d/shop/d_shop_system.cpp @@ -19,8 +19,6 @@ struct daNpcT_motionAnmData_c {}; struct daNpcT_faceMotionAnmData_c {}; -struct J3DModel {}; - struct Vec {}; struct cXyz { @@ -29,6 +27,8 @@ struct cXyz { struct J3DJoint {}; +struct J3DModel {}; + struct daNpcT_c { /* 801490D4 */ void ctrlBtk(); /* 8014951C */ void ctrlJoint(J3DJoint*, J3DModel*); @@ -211,8 +211,6 @@ struct ShopCam_action_c { static void dShopSystem_searchItemActor(void*, void*); static void dShopSystem_searchCameraActor(void*, void*); -extern "C" extern char const* const d_shop_d_shop_system__stringBase0; -extern "C" extern void* __vt__13dShopSystem_c[52 + 1 /* padding */]; extern "C" static void dShopSystem_searchItemActor__FPvPv(); extern "C" static void dShopSystem_searchCameraActor__FPvPv(); @@ -289,12 +287,6 @@ void cM_atan2s(f32, f32); void cLib_offsetPos(cXyz*, cXyz const*, s16, cXyz const*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__9STControl[4]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_cursorHIO[68 + 4 /* padding */]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoLib_project__FP3VecP3Vec(); extern "C" void fopAc_IsActor__FPv(); @@ -484,19 +476,19 @@ asm static void dShopSystem_searchCameraActor(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80453B00-80453B04 0004+00 s=1 e=0 z=0 None .sdata2 @4097 */ -SECTION_SDATA2 static u32 lit_4097 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4097 = 9.0f / 10.0f; /* 80453B04-80453B08 0004+00 s=2 e=0 z=0 None .sdata2 @4098 */ -SECTION_SDATA2 static u32 lit_4098 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4098 = 0.5f; /* 80453B08-80453B0C 0004+00 s=5 e=0 z=0 None .sdata2 @4099 */ -SECTION_SDATA2 static u32 lit_4099 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4099 = 1.0f; /* 80453B0C-80453B10 0004+00 s=1 e=0 z=0 None .sdata2 @4100 */ -SECTION_SDATA2 static u32 lit_4100 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4100 = 1.0f / 10.0f; /* 80453B10-80453B14 0004+00 s=1 e=0 z=0 None .sdata2 @4101 */ -SECTION_SDATA2 static u32 lit_4101 = 0x3F333333; +SECTION_SDATA2 static f32 lit_4101 = 7.0f / 10.0f; /* 80197338-801974E4 01AC+00 s=0 e=0 z=19 None .text initShopSystem__13dShopSystem_cFv */ #pragma push @@ -1010,16 +1002,16 @@ asm void dShopSystem_c::checkController(u8 param_0, dMsgFlow_c* param_1) { /* ############################################################################################## */ /* 80453B14-80453B18 0004+00 s=4 e=0 z=0 None .sdata2 @4493 */ -SECTION_SDATA2 static u32 lit_4493 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4493 = -1.0f; /* 80453B18-80453B1C 0004+00 s=8 e=0 z=0 None .sdata2 @4494 */ -SECTION_SDATA2 static u32 lit_4494 = 0x3E800000; +SECTION_SDATA2 static f32 lit_4494 = 0.25f; /* 80453B1C-80453B20 0004+00 s=9 e=0 z=0 None .sdata2 @4495 */ -SECTION_SDATA2 static u32 lit_4495 = 0x41A00000; +SECTION_SDATA2 static f32 lit_4495 = 20.0f; /* 80453B20-80453B24 0004+00 s=9 e=0 z=0 None .sdata2 @4496 */ -SECTION_SDATA2 static u32 lit_4496 = 0x40A00000; +SECTION_SDATA2 static f32 lit_4496 = 5.0f; /* 80197808-80197DD0 05C8+00 s=1 e=0 z=0 None .text chooseItem3__13dShopSystem_cFUc */ #pragma push @@ -1115,28 +1107,28 @@ SECTION_DEAD static char const* const pad_80394C26 = "\0"; #pragma pop /* 80453B24-80453B28 0004+00 s=1 e=0 z=0 None .sdata2 @5000 */ -SECTION_SDATA2 static u32 lit_5000 = 0xC1C80000; +SECTION_SDATA2 static f32 lit_5000 = -25.0f; /* 80453B28-80453B2C 0004+00 s=1 e=0 z=0 None .sdata2 @5001 */ -SECTION_SDATA2 static u32 lit_5001 = 0x43160000; +SECTION_SDATA2 static f32 lit_5001 = 150.0f; /* 80453B2C-80453B30 0004+00 s=1 e=0 z=0 None .sdata2 @5002 */ -SECTION_SDATA2 static u32 lit_5002 = 0xC2480000; +SECTION_SDATA2 static f32 lit_5002 = -50.0f; /* 80453B30-80453B34 0004+00 s=1 e=0 z=0 None .sdata2 @5003 */ -SECTION_SDATA2 static u32 lit_5003 = 0x437A0000; +SECTION_SDATA2 static f32 lit_5003 = 250.0f; /* 80453B34-80453B38 0004+00 s=1 e=0 z=0 None .sdata2 @5004 */ -SECTION_SDATA2 static u32 lit_5004 = 0x42700000; +SECTION_SDATA2 static f32 lit_5004 = 60.0f; /* 80453B38-80453B3C 0004+00 s=1 e=0 z=0 None .sdata2 @5005 */ -SECTION_SDATA2 static u32 lit_5005 = 0xC3020000; +SECTION_SDATA2 static f32 lit_5005 = -130.0f; /* 80453B3C-80453B40 0004+00 s=2 e=0 z=0 None .sdata2 @5006 */ -SECTION_SDATA2 static u32 lit_5006 = 0x43570000; +SECTION_SDATA2 static f32 lit_5006 = 215.0f; /* 80453B40-80453B44 0004+00 s=1 e=0 z=0 None .sdata2 @5007 */ -SECTION_SDATA2 static u32 lit_5007 = 0x41700000; +SECTION_SDATA2 static f32 lit_5007 = 15.0f; /* 80198A2C-801990B0 0684+00 s=0 e=0 z=9 None .text itemZoom__13dShopSystem_cFP4cXyz */ #pragma push @@ -1216,9 +1208,7 @@ SECTION_SDATA2 static f32 lit_5296[1 + 1 /* padding */] = { }; /* 80453B50-80453B58 0008+00 s=1 e=0 z=0 None .sdata2 @5298 */ -SECTION_SDATA2 static u8 lit_5298[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_5298 = 4503601774854144.0 /* cast s32 to float */; /* 80199A18-80199BF8 01E0+00 s=1 e=0 z=0 None .text * seq_moving__13dShopSystem_cFP10fopAc_ac_cP10dMsgFlow_c */ @@ -1401,28 +1391,28 @@ asm void dShopSystem_c::deleteObject() { /* ############################################################################################## */ /* 80453B60-80453B64 0004+00 s=1 e=0 z=0 None .sdata2 @5687 */ -SECTION_SDATA2 static u32 lit_5687 = 0xC32F0000; +SECTION_SDATA2 static f32 lit_5687 = -175.0f; /* 80453B64-80453B68 0004+00 s=1 e=0 z=0 None .sdata2 @5688 */ -SECTION_SDATA2 static u32 lit_5688 = 0x43250000; +SECTION_SDATA2 static f32 lit_5688 = 165.0f; /* 80453B68-80453B6C 0004+00 s=1 e=0 z=0 None .sdata2 @5689 */ -SECTION_SDATA2 static u32 lit_5689 = 0x41200000; +SECTION_SDATA2 static f32 lit_5689 = 10.0f; /* 80453B6C-80453B70 0004+00 s=1 e=0 z=0 None .sdata2 @5690 */ -SECTION_SDATA2 static u32 lit_5690 = 0x43610000; +SECTION_SDATA2 static f32 lit_5690 = 225.0f; /* 80453B70-80453B74 0004+00 s=1 e=0 z=0 None .sdata2 @5691 */ -SECTION_SDATA2 static u32 lit_5691 = 0x43B90000; +SECTION_SDATA2 static f32 lit_5691 = 370.0f; /* 80453B74-80453B78 0004+00 s=1 e=0 z=0 None .sdata2 @5692 */ -SECTION_SDATA2 static u32 lit_5692 = 0xC3340000; +SECTION_SDATA2 static f32 lit_5692 = -180.0f; /* 80453B78-80453B7C 0004+00 s=1 e=0 z=0 None .sdata2 @5693 */ -SECTION_SDATA2 static u32 lit_5693 = 0x43750000; +SECTION_SDATA2 static f32 lit_5693 = 245.0f; /* 80453B7C-80453B80 0004+00 s=1 e=0 z=0 None .sdata2 @5694 */ -SECTION_SDATA2 static u32 lit_5694 = 0xC3BE0000; +SECTION_SDATA2 static f32 lit_5694 = -380.0f; /* 8019A5D0-8019AB00 0530+00 s=1 e=0 z=8 None .text searchItemActor__13dShopSystem_cFv */ #pragma push diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index f987b6d6c0d..02f89685d9e 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -23,7 +23,6 @@ struct fapGm_HIO_c { static void fapGm_After(); void fapGm_Execute(); void fapGm_Create(); -extern "C" extern u8 g_HIO[64 + 4 /* padding */]; extern "C" void __ct__11fapGm_HIO_cFv(); extern "C" static void fapGm_After__Fv(); @@ -48,7 +47,6 @@ void fpcM_Management(void (*)(void), void (*)(void)); void fpcM_Init(); void cCt_Counter(int); void operator delete(void*); -extern "C" extern u32 data_80450580; extern "C" void fopCamM_Management__Fv(); extern "C" void fopCamM_Init__Fv(); @@ -79,10 +77,10 @@ SECTION_DATA static void* __vt__11fapGm_HIO_c[3 + 1 /* padding */] = { }; /* 80451BC0-80451BC4 0004+00 s=1 e=0 z=0 None .sdata2 @3689 */ -SECTION_SDATA2 static u32 lit_3689 = 0x3F666666; +SECTION_SDATA2 static f32 lit_3689 = 9.0f / 10.0f; /* 80451BC4-80451BC8 0004+00 s=1 e=0 z=0 None .sdata2 @3690 */ -SECTION_SDATA2 static u32 lit_3690 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_3690 = 3.0f / 5.0f; /* 80018944-80018A44 0100+00 s=1 e=0 z=0 None .text __ct__11fapGm_HIO_cFv */ #pragma push diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index fff64fa5326..6549572e8ab 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -61,12 +61,12 @@ struct dRes_control_c { struct dPa_levelEcallBack {}; +struct cXyz {}; + struct csXyz { /* 80018BD0 */ ~csXyz(); }; -struct cXyz {}; - struct _GXColor {}; struct dPa_control_c { @@ -128,11 +128,6 @@ static void fopAc_Execute(void*); static void fopAc_IsDelete(void*); static void fopAc_Delete(void*); static void fopAc_Create(void*); -extern "C" extern char const* const f_op_f_op_actor__stringBase0; -extern "C" extern void* g_fopAc_Method[8]; -extern "C" extern void* __vt__11dEvt_info_c[3 + 1 /* padding */]; -extern "C" extern u8 stopStatus__10fopAc_ac_c[4]; -extern "C" extern u8 data_80450CC0[4 + 4 /* padding */]; extern "C" void __ct__10fopAc_ac_cFv(); extern "C" void __dt__5csXyzFv(); @@ -183,14 +178,6 @@ void dKy_tevstr_init(dKy_tevstr_c*, s8, u8); void dKy_depth_dist_set(void*); void cLib_chaseF(f32*, f32, f32); void operator delete(void*); -extern "C" extern u8 const j3dDefaultLightInfo[52]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 g_dComIfAc_gameInfo[8]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_object__7dDemo_c[4]; -extern "C" extern u8 struct_80451124[4]; extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); @@ -351,10 +338,10 @@ asm static void fopAc_Draw(void* param_0) { /* ############################################################################################## */ /* 80451BC8-80451BCC 0004+00 s=1 e=0 z=0 None .sdata2 @4324 */ -SECTION_SDATA2 static u32 lit_4324 = 0x459C4000; +SECTION_SDATA2 static f32 lit_4324 = 5000.0f; /* 80451BCC-80451BD0 0004+00 s=1 e=0 z=0 None .sdata2 @4325 */ -SECTION_SDATA2 static u32 lit_4325 = 0xF2FC6F7C; +SECTION_SDATA2 static f32 lit_4325 = -9.999999848243207e+30f; /* 80018DD8-80018F78 01A0+00 s=1 e=0 z=0 None .text fopAc_Execute__FPv */ #pragma push @@ -388,15 +375,13 @@ asm static void fopAc_Delete(void* param_0) { /* ############################################################################################## */ /* 80451BD0-80451BD4 0004+00 s=2 e=0 z=0 None .sdata2 @4431 */ -SECTION_SDATA2 static u32 lit_4431 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4431 = 1.0f / 10.0f; /* 80451BD4-80451BD8 0004+00 s=1 e=0 z=0 None .sdata2 @4432 */ -SECTION_SDATA2 static u32 lit_4432 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_4432 = -100.0f; /* 80451BD8-80451BE0 0008+00 s=1 e=0 z=0 None .sdata2 @4434 */ -SECTION_SDATA2 static u8 lit_4434[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4434 = 4503599627370496.0 /* cast u32 to float */; /* 8001904C-800193FC 03B0+00 s=1 e=0 z=0 None .text fopAc_Create__FPv */ #pragma push @@ -457,9 +442,7 @@ SECTION_SDATA2 static f32 lit_4505[1 + 1 /* padding */] = { }; /* 80451BE8-80451BF0 0008+00 s=1 e=0 z=0 None .sdata2 @4507 */ -SECTION_SDATA2 static u8 lit_4507[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4507 = 4503601774854144.0 /* cast s32 to float */; /* 80019520-800196A0 0180+00 s=0 e=0 z=2 None .text * setBallModelEffect__13fopEn_enemy_cFP12dKy_tevstr_c */ @@ -482,7 +465,7 @@ SECTION_SDATA2 static u8 lit_4555[4] = { }; /* 80451BF4-80451BF8 0004+00 s=1 e=0 z=0 None .sdata2 @4556 */ -SECTION_SDATA2 static u32 lit_4556 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4556 = 1.0f / 20.0f; /* 80451BF8-80451C00 0004+04 s=1 e=0 z=0 None .sdata2 @4557 */ SECTION_SDATA2 static f32 lit_4557[1 + 1 /* padding */] = { diff --git a/src/f_op/f_op_actor_iter.cpp b/src/f_op/f_op_actor_iter.cpp index 85ada03b472..b1b4f7ec4dc 100644 --- a/src/f_op/f_op_actor_iter.cpp +++ b/src/f_op/f_op_actor_iter.cpp @@ -39,7 +39,6 @@ void cLsIt_Method(node_list_class*, int (*)(node_class*, void*), void*); void cLsIt_Judge(node_list_class*, void* (*)(node_class*, void*), void*); void cTgIt_MethodCall(create_tag_class*, method_filter*); void cTgIt_JudgeFilter(create_tag_class*, judge_filter*); -extern "C" extern u8 g_fopAcTg_Queue[12 + 4 /* padding */]; extern "C" void cLsIt_Method__FP15node_list_classPFP10node_classPv_iPv(); extern "C" void cLsIt_Judge__FP15node_list_classPFP10node_classPv_PvPv(); diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index 6c3e6255cf0..4a52959262b 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -69,11 +69,11 @@ struct csXyz { /* 802673F4 */ csXyz(s16, s16, s16); }; -struct dKy_tevstr_c {}; +struct cBgS_PolyInfo {}; struct _GXColor {}; -struct cBgS_PolyInfo {}; +struct dKy_tevstr_c {}; struct dPa_control_c { struct level_c { @@ -301,21 +301,6 @@ void fopAcM_getWaterStream(cXyz const*, cBgS_PolyInfo const&, cXyz*, int*, int); void fopAcM_getPolygonAngle(cBgS_PolyInfo const&, s16); void fopAcM_getPolygonAngle(cM3dGPla const*, s16); void fopAcM_initManager(); -extern "C" extern char const* const f_op_f_op_actor_mng__stringBase0; -extern "C" extern void* __vt__8cM3dGPla[3]; -extern "C" extern void* __vt__11dBgS_WtrChk[12]; -extern "C" extern void* __vt__14dBgS_ObjGndChk[12 + 1 /* padding */]; -extern "C" extern u8 lit_5078[12]; -extern "C" extern u8 data_803F1C18[12]; -extern "C" extern u8 lit_5115[12]; -extern "C" extern u8 data_803F1C30[12]; -extern "C" extern u8 mLineCheck__11fopAcM_lc_c[112]; -extern "C" extern u8 mGndCheck__11fopAcM_gc_c[84]; -extern "C" extern u8 mRoofCheck__11fopAcM_rc_c[80]; -extern "C" extern u8 mWaterCheck__11fopAcM_wt_c[84 + 4 /* padding */]; -extern "C" extern f32 mGroundY__11fopAcM_gc_c; -extern "C" extern u8 mRoofY__11fopAcM_rc_c[4]; -extern "C" extern f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; extern "C" void fopAcM_FastCreate__FsPFPv_iPvPv(); extern "C" void fopAcM_setStageLayer__FPv(); @@ -496,24 +481,6 @@ void cLib_chaseAngleS(s16*, s16, s16); void cLib_targetAngleY(Vec const*, Vec const*); void MtxPosition(cXyz*, cXyz*); void operator delete(void*); -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern u8 mStatus__20dStage_roomControl_c[65792]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 BaseY__4cXyz[12]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern void* calc_mtx[1 + 1 /* padding */]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 mSystemFar__14mDoLib_clipper; -extern "C" extern u8 g_fpcNd_type[4 + 4 /* padding */]; -extern "C" extern u8 mProcID__20dStage_roomControl_c[4]; -extern "C" extern u8 struct_80450D64[4]; -extern "C" extern u8 m_top__13daTagStream_c[4]; -extern "C" extern u8 mData__12dEnemyItem_c[4 + 4 /* padding */]; -extern "C" extern u8 Zero__5csXyz[4]; -extern "C" extern u8 data_80451164[4]; extern "C" void OSReport_Error(); extern "C" void mDoMtx_YrotS__FPA4_fs(); @@ -711,7 +678,7 @@ asm void fopAcM_CreateAppend() { /* ############################################################################################## */ /* 80451C00-80451C04 0004+00 s=1 e=0 z=0 None .sdata2 @4263 */ -SECTION_SDATA2 static u32 lit_4263 = 0x41200000; +SECTION_SDATA2 static f32 lit_4263 = 10.0f; /* 80019B1C-80019C78 015C+00 s=4 e=0 z=0 None .text * createAppend__FUsUlPC4cXyziPC5csXyzPC4cXyzScUi */ @@ -1056,14 +1023,10 @@ asm void fopAcM_seenActorAngleY(fopAc_ac_c const* param_0, fopAc_ac_c const* par /* ############################################################################################## */ /* 80451C08-80451C10 0008+00 s=3 e=0 z=0 None .sdata2 @4745 */ -SECTION_SDATA2 static u8 lit_4745[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4745 = 0.5; /* 80451C10-80451C18 0008+00 s=3 e=0 z=0 None .sdata2 @4746 */ -SECTION_SDATA2 static u8 lit_4746[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4746 = 3.0; /* 80451C18-80451C20 0008+00 s=4 e=0 z=0 None .sdata2 @4747 */ SECTION_SDATA2 static u8 lit_4747[8] = { @@ -1116,10 +1079,10 @@ asm void fopAcM_searchActorDistanceXZ2(fopAc_ac_c const* param_0, fopAc_ac_c con /* ############################################################################################## */ /* 80451C20-80451C24 0004+00 s=1 e=0 z=0 None .sdata2 @4922 */ -SECTION_SDATA2 static u32 lit_4922 = 0x42200000; +SECTION_SDATA2 static f32 lit_4922 = 40.0f; /* 80451C24-80451C28 0004+00 s=1 e=0 z=0 None .sdata2 @4923 */ -SECTION_SDATA2 static u32 lit_4923 = 0x425C0000; +SECTION_SDATA2 static f32 lit_4923 = 55.0f; /* 8001AAE0-8001AC40 0160+00 s=0 e=0 z=2 None .text * fopAcM_rollPlayerCrash__FPC10fopAc_ac_cfUlffif */ @@ -1422,7 +1385,7 @@ asm void fopAcM_createItemForTrBoxDemo(cXyz const* param_0, int param_1, int par /* ############################################################################################## */ /* 80451C28-80451C2C 0004+00 s=1 e=0 z=0 None .sdata2 @5584 */ -SECTION_SDATA2 static u32 lit_5584 = 0x417FFF97; +SECTION_SDATA2 static f32 lit_5584 = 15.999899864196777f; /* 8001BCFC-8001BE14 0118+00 s=2 e=0 z=0 None .text fopAcM_getItemNoFromTableNo__FUc */ #pragma push @@ -1527,7 +1490,7 @@ asm void fopAcM_createItemForSimpleDemo(cXyz const* param_0, int param_1, int pa /* ############################################################################################## */ /* 80451C2C-80451C30 0004+00 s=2 e=0 z=0 None .sdata2 @5711 */ -SECTION_SDATA2 static u32 lit_5711 = 0x46FFFE00; +SECTION_SDATA2 static f32 lit_5711 = 32767.0f; /* 8001C240-8001C3E0 01A0+00 s=1 e=1 z=17 None .text * fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi */ @@ -1555,19 +1518,19 @@ asm static void fopAcM_fastCreateItem2(cXyz const* param_0, int param_1, int par /* ############################################################################################## */ /* 80451C30-80451C34 0004+00 s=1 e=0 z=0 None .sdata2 @5808 */ -SECTION_SDATA2 static u32 lit_5808 = 0x40000000; +SECTION_SDATA2 static f32 lit_5808 = 2.0f; /* 80451C34-80451C38 0004+00 s=1 e=0 z=0 None .sdata2 @5809 */ -SECTION_SDATA2 static u32 lit_5809 = 0x46000000; +SECTION_SDATA2 static f32 lit_5809 = 8192.0f; /* 80451C38-80451C3C 0004+00 s=4 e=0 z=0 None .sdata2 @5810 */ -SECTION_SDATA2 static u32 lit_5810 = 0x3F800000; +SECTION_SDATA2 static f32 lit_5810 = 1.0f; /* 80451C3C-80451C40 0004+00 s=1 e=0 z=0 None .sdata2 @5811 */ -SECTION_SDATA2 static u32 lit_5811 = 0x3E99999A; +SECTION_SDATA2 static f32 lit_5811 = 3.0f / 10.0f; /* 80451C40-80451C44 0004+00 s=1 e=0 z=0 None .sdata2 @5812 */ -SECTION_SDATA2 static u32 lit_5812 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_5812 = 1.0f / 5.0f; /* 8001C5B0-8001C870 02C0+00 s=3 e=0 z=4 None .text * fopAcM_fastCreateItem__FPC4cXyziiPC5csXyzPC4cXyzPfPfiiPFPv_i */ @@ -1584,7 +1547,7 @@ asm void fopAcM_fastCreateItem(cXyz const* param_0, int param_1, int param_2, cs /* ############################################################################################## */ /* 80451C44-80451C48 0004+00 s=1 e=0 z=0 None .sdata2 @5845 */ -SECTION_SDATA2 static u32 lit_5845 = 0x45000000; +SECTION_SDATA2 static f32 lit_5845 = 2048.0f; /* 8001C870-8001C95C 00EC+00 s=0 e=0 z=1 None .text fopAcM_createBokkuri__FUsPC4cXyziiiPC4cXyzii */ @@ -1674,7 +1637,7 @@ asm void fopAcM_otoCheck(fopAc_ac_c const* param_0, f32 param_1) { /* ############################################################################################## */ /* 80451C48-80451C4C 0004+00 s=2 e=0 z=0 None .sdata2 @6035 */ -SECTION_SDATA2 static u32 lit_6035 = 0x42C80000; +SECTION_SDATA2 static f32 lit_6035 = 100.0f; /* 8001CDFC-8001CED0 00D4+00 s=0 e=0 z=49 None .text * fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c */ @@ -1689,7 +1652,7 @@ asm void fopAcM_otherBgCheck(fopAc_ac_c const* param_0, fopAc_ac_c const* param_ /* ############################################################################################## */ /* 80451C4C-80451C50 0004+00 s=1 e=0 z=0 None .sdata2 @6068 */ -SECTION_SDATA2 static u32 lit_6068 = 0x42480000; +SECTION_SDATA2 static f32 lit_6068 = 50.0f; /* 8001CED0-8001CFD8 0108+00 s=0 e=0 z=18 None .text fopAcM_wayBgCheck__FPC10fopAc_ac_cff */ #pragma push @@ -1783,7 +1746,7 @@ bool fopAcM_riverStream(cXyz* param_0, s16* param_1, f32* param_2, f32 param_3) /* ############################################################################################## */ /* 80451C54-80451C58 0004+00 s=1 e=0 z=0 None .sdata2 @6174 */ -SECTION_SDATA2 static u32 lit_6174 = 0x43160000; +SECTION_SDATA2 static f32 lit_6174 = 150.0f; /* 8001D1FC-8001D32C 0130+00 s=0 e=0 z=12 None .text fopAcM_carryOffRevise__FP10fopAc_ac_c */ #pragma push @@ -1898,7 +1861,7 @@ u8 mRoofY__11fopAcM_rc_c[4]; f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; /* 80451C58-80451C5C 0004+00 s=2 e=0 z=0 None .sdata2 @6353 */ -SECTION_SDATA2 static u32 lit_6353 = 0xCE6E6B28; +SECTION_SDATA2 static f32 lit_6353 = -1000000000.0f; /* 8001D890-8001D900 0070+00 s=0 e=2 z=19 None .text fopAcM_getWaterY__FPC4cXyzPf */ #pragma push @@ -1996,7 +1959,7 @@ asm void fopAcM_gc_c::gndCheck(cXyz const* param_0) { /* ############################################################################################## */ /* 80451C5C-80451C60 0004+00 s=1 e=0 z=0 None .sdata2 @6517 */ -SECTION_SDATA2 static u32 lit_6517 = 0x4E6E6B28; +SECTION_SDATA2 static f32 lit_6517 = 1000000000.0f; /* 8001DD1C-8001DD84 0068+00 s=0 e=0 z=3 None .text roofCheck__11fopAcM_rc_cFPC4cXyz */ #pragma push diff --git a/src/f_op/f_op_actor_tag.cpp b/src/f_op/f_op_actor_tag.cpp index 70f9c8a5100..ed158b0064c 100644 --- a/src/f_op/f_op_actor_tag.cpp +++ b/src/f_op/f_op_actor_tag.cpp @@ -22,7 +22,6 @@ struct create_tag_class {}; void fopAcTg_ToActorQ(create_tag_class*); void fopAcTg_ActorQTo(create_tag_class*); void fopAcTg_Init(create_tag_class*, void*); -extern "C" extern u8 g_fopAcTg_Queue[12 + 4 /* padding */]; extern "C" void fopAcTg_ToActorQ__FP16create_tag_class(); extern "C" void fopAcTg_ActorQTo__FP16create_tag_class(); diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp index ac8396c07cf..b686d2db3dd 100644 --- a/src/f_op/f_op_camera.cpp +++ b/src/f_op/f_op_camera.cpp @@ -30,7 +30,6 @@ static void fopCam_Execute(camera_class*); static void fopCam_IsDelete(camera_class*); static void fopCam_Delete(camera_class*); static void fopCam_Create(void*); -extern "C" extern void* g_fopCam_Method[5 + 1 /* padding */]; extern "C" static void fopCam_Draw__FP12camera_class(); extern "C" static void fopCam_Execute__FP12camera_class(); @@ -52,8 +51,6 @@ void fpcMtd_Execute(process_method_class*, void*); void fpcMtd_IsDelete(process_method_class*, void*); void fpcMtd_Delete(process_method_class*, void*); void fpcMtd_Create(process_method_class*, void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80451124[4]; extern "C" void fopDwTg_ToDrawQ__FP16create_tag_classi(); extern "C" void fopDwTg_DrawQTo__FP16create_tag_class(); diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp index 60621bfa8f7..e8035de7759 100644 --- a/src/f_op/f_op_draw_iter.cpp +++ b/src/f_op/f_op_draw_iter.cpp @@ -31,8 +31,6 @@ extern "C" void fopDwIt_Next__FP16create_tag_class(); extern "C" extern u8 g_fopDwTg_Queue[8]; -extern "C" extern u8 g_fopDwTg_Queue[8]; - // // Declarations: // diff --git a/src/f_op/f_op_draw_tag.cpp b/src/f_op/f_op_draw_tag.cpp index 5fb1dacb882..327fb1d5352 100644 --- a/src/f_op/f_op_draw_tag.cpp +++ b/src/f_op/f_op_draw_tag.cpp @@ -25,7 +25,6 @@ void fopDwTg_ToDrawQ(create_tag_class*, int); void fopDwTg_DrawQTo(create_tag_class*); void fopDwTg_Init(create_tag_class*, void*); void fopDwTg_CreateQueue(); -extern "C" extern u8 g_fopDwTg_Queue[8]; extern "C" void fopDwTg_ToDrawQ__FP16create_tag_classi(); extern "C" void fopDwTg_DrawQTo__FP16create_tag_class(); diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index 1f3be260b3c..7b4f7ccfbe5 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -28,7 +28,6 @@ static void fopKy_Execute(void*); static void fopKy_IsDelete(void*); static void fopKy_Delete(void*); static void fopKy_Create(void*); -extern "C" extern void* g_fopKy_Method[5 + 1 /* padding */]; extern "C" static void fopKy_Draw__FPv(); extern "C" static void fopKy_Execute__FPv(); @@ -51,8 +50,6 @@ void fpcMtd_Execute(process_method_class*, void*); void fpcMtd_IsDelete(process_method_class*, void*); void fpcMtd_Delete(process_method_class*, void*); void fpcMtd_Create(process_method_class*, void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 struct_80451124[4]; extern "C" void fopDwTg_ToDrawQ__FP16create_tag_classi(); extern "C" void fopDwTg_DrawQTo__FP16create_tag_class(); diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 2389a9d939b..0cfa0b4c2ee 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -15,14 +15,14 @@ struct layer_class {}; struct dPa_levelEcallBack {}; -struct csXyz {}; - struct cXyz {}; -struct dKy_tevstr_c {}; +struct csXyz {}; struct _GXColor {}; +struct dKy_tevstr_c {}; + struct dPa_control_c { /* 8004CA90 */ void set(u8, u16, cXyz const*, dKy_tevstr_c const*, csXyz const*, cXyz const*, u8, dPa_levelEcallBack*, s8, _GXColor const*, _GXColor const*, @@ -64,7 +64,6 @@ void fpcM_Delete(void*); void fpcM_FastCreate(s16, int (*)(void*), void*, void*); void fpcSCtRq_Request(layer_class*, s16, int (*)(void*, void*), void*, void*); void cLib_memSet(void*, int, u32); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void fpcLy_CurrentLayer__Fv(); extern "C" void fpcM_Delete__FPv(); diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index 72f4e8d68e4..891e1ac6d89 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -28,7 +28,6 @@ static void fopMsg_Execute(void*); static void fopMsg_IsDelete(void*); static void fopMsg_Delete(void*); static void fopMsg_Create(void*); -extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */]; extern "C" static void fopMsg_Draw__FPv(); extern "C" static void fopMsg_Execute__FPv(); @@ -52,7 +51,6 @@ void fpcMtd_Execute(process_method_class*, void*); void fpcMtd_IsDelete(process_method_class*, void*); void fpcMtd_Delete(process_method_class*, void*); void fpcMtd_Create(process_method_class*, void*); -extern "C" extern u8 struct_80451124[4]; extern "C" void fopMsgM_GetAppend__FPv(); extern "C" void fopDwTg_ToDrawQ__FP16create_tag_classi(); diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index 5617fa92412..0d87e191219 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -115,12 +115,6 @@ void fpcLy_CurrentLayer(); void fpcM_Delete(void*); void fpcPi_Change(process_priority_class*, unsigned int, u16, u16); void fpcSCtRq_Request(layer_class*, s16, int (*)(void*, void*), void*, void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u8 g_fpcNd_type[4 + 4 /* padding */]; -extern "C" extern u8 mProcID__20dStage_roomControl_c[4]; extern "C" void mDoExt_getGameHeap__Fv(); extern "C" void fopScnM_SearchByID__FUi(); @@ -347,24 +341,22 @@ SECTION_DATA static void* lit_4305[7 + 1 /* padding */] = { }; /* 80451C74-80451C78 0004+00 s=1 e=0 z=0 None .sdata2 @4167 */ -SECTION_SDATA2 static u32 lit_4167 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4167 = 0.5f; /* 80451C78-80451C7C 0004+00 s=1 e=0 z=0 None .sdata2 @4298 */ -SECTION_SDATA2 static u32 lit_4298 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4298 = 1.0f; /* 80451C7C-80451C80 0004+00 s=1 e=0 z=0 None .sdata2 @4299 */ -SECTION_SDATA2 static u32 lit_4299 = 0x40000000; +SECTION_SDATA2 static f32 lit_4299 = 2.0f; /* 80451C80-80451C84 0004+00 s=1 e=0 z=0 None .sdata2 @4300 */ -SECTION_SDATA2 static u32 lit_4300 = 0x47000000; +SECTION_SDATA2 static f32 lit_4300 = 32768.0f; /* 80451C84-80451C88 0004+00 s=1 e=0 z=0 None .sdata2 @4301 */ -SECTION_SDATA2 static u32 lit_4301 = 0x477FFF00; +SECTION_SDATA2 static f32 lit_4301 = 65535.0f; /* 80451C88-80451C90 0008+00 s=1 e=0 z=0 None .sdata2 @4303 */ -SECTION_SDATA2 static u8 lit_4303[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4303 = 4503601774854144.0 /* cast s32 to float */; /* 80020160-800202CC 016C+00 s=1 e=4 z=2 None .text fopMsgM_valueIncrease__FiiUc */ #pragma push diff --git a/src/f_op/f_op_overlap.cpp b/src/f_op/f_op_overlap.cpp index 185c83ac2fb..d8eba6fc38d 100644 --- a/src/f_op/f_op_overlap.cpp +++ b/src/f_op/f_op_overlap.cpp @@ -26,7 +26,6 @@ static void fopOvlp_Execute(void*); static void fopOvlp_IsDelete(void*); static void fopOvlp_Delete(void*); static void fopOvlp_Create(void*); -extern "C" extern void* g_fopOvlp_Method[5 + 1 /* padding */]; extern "C" static void fopOvlp_Draw__FPv(); extern "C" static void fopOvlp_Execute__FPv(); diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index eb0a92975b0..10e1b611568 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -28,7 +28,6 @@ static void fopScn_Execute(scene_class*); static void fopScn_IsDelete(void*); static void fopScn_Delete(void*); static void fopScn_Create(void*); -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; extern "C" static void fopScn_Draw__FP11scene_class(); extern "C" static void fopScn_Execute__FP11scene_class(); diff --git a/src/f_op/f_op_scene_iter.cpp b/src/f_op/f_op_scene_iter.cpp index 7d0c02661da..6b5ca28cda5 100644 --- a/src/f_op/f_op_scene_iter.cpp +++ b/src/f_op/f_op_scene_iter.cpp @@ -33,7 +33,6 @@ extern "C" void fopScnIt_Judge__FPFPvPv_PvPv(); void cLsIt_Judge(node_list_class*, void* (*)(node_class*, void*), void*); void cTgIt_JudgeFilter(create_tag_class*, judge_filter*); -extern "C" extern u8 g_fopScnTg_SceneList[12 + 4 /* padding */]; extern "C" void cLsIt_Judge__FP15node_list_classPFP10node_classPv_PvPv(); extern "C" void cTgIt_JudgeFilter__FP16create_tag_classP12judge_filter(); diff --git a/src/f_op/f_op_scene_tag.cpp b/src/f_op/f_op_scene_tag.cpp index 5a6717c7dad..0600e1539d4 100644 --- a/src/f_op/f_op_scene_tag.cpp +++ b/src/f_op/f_op_scene_tag.cpp @@ -24,7 +24,6 @@ struct create_tag_class {}; void fopScnTg_QueueTo(scene_tag_class*); void fopScnTg_ToQueue(scene_tag_class*); void fopScnTg_Init(scene_tag_class*, void*); -extern "C" extern u8 g_fopScnTg_SceneList[12 + 4 /* padding */]; extern "C" void fopScnTg_QueueTo__FP15scene_tag_class(); extern "C" void fopScnTg_ToQueue__FP15scene_tag_class(); diff --git a/src/f_op/f_op_view.cpp b/src/f_op/f_op_view.cpp index d1209ea5b7d..7ec5ec8df95 100644 --- a/src/f_op/f_op_view.cpp +++ b/src/f_op/f_op_view.cpp @@ -26,7 +26,6 @@ static void fopVw_Execute(view_class*); static void fopVw_IsDelete(void*); static void fopVw_Delete(view_class*); static void fopVw_Create(void*); -extern "C" extern void* g_fopVw_Method[5 + 1 /* padding */]; extern "C" static void fopVw_Draw__FP10view_class(); extern "C" static void fopVw_Execute__FP10view_class(); diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp index 55a66a78251..4041222c794 100644 --- a/src/f_pc/f_pc_create_iter.cpp +++ b/src/f_pc/f_pc_create_iter.cpp @@ -47,7 +47,6 @@ void cLsIt_Method(node_list_class*, int (*)(node_class*, void*), void*); void cLsIt_Judge(node_list_class*, void* (*)(node_class*, void*), void*); void cTgIt_MethodCall(create_tag_class*, method_filter*); void cTgIt_JudgeFilter(create_tag_class*, judge_filter*); -extern "C" extern u8 g_fpcCtTg_Queue[12 + 4 /* padding */]; extern "C" void cLsIt_Method__FP15node_list_classPFP10node_classPv_iPv(); extern "C" void cLsIt_Judge__FP15node_list_classPFP10node_classPv_PvPv(); diff --git a/src/f_pc/f_pc_create_tag.cpp b/src/f_pc/f_pc_create_tag.cpp index a915edba2bd..57379c66b0a 100644 --- a/src/f_pc/f_pc_create_tag.cpp +++ b/src/f_pc/f_pc_create_tag.cpp @@ -24,7 +24,6 @@ struct create_tag {}; void fpcCtTg_ToCreateQ(create_tag*); void fpcCtTg_CreateQTo(create_tag*); void fpcCtTg_Init(create_tag*, void*); -extern "C" extern u8 g_fpcCtTg_Queue[12 + 4 /* padding */]; extern "C" void fpcCtTg_ToCreateQ__FP10create_tag(); extern "C" void fpcCtTg_CreateQTo__FP10create_tag(); diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp index 066008e47e3..59e73617157 100644 --- a/src/f_pc/f_pc_delete_tag.cpp +++ b/src/f_pc/f_pc_delete_tag.cpp @@ -26,7 +26,6 @@ void fpcDtTg_ToDeleteQ(delete_tag_class*); static void fpcDtTg_DeleteQTo(delete_tag_class*); void fpcDtTg_Do(delete_tag_class*, int (*)(void*)); void fpcDtTg_Init(delete_tag_class*, void*); -extern "C" extern u8 g_fpcDtTg_Queue[12 + 4 /* padding */]; extern "C" void fpcDtTg_IsEmpty__Fv(); extern "C" void fpcDtTg_ToDeleteQ__FP16delete_tag_class(); diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index 9002b1e8084..65be2bf6094 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -73,8 +73,6 @@ void fpcPi_Delete(process_priority_class*); void fpcLnTg_QueueTo(line_tag*); void cLsIt_Method(node_list_class*, int (*)(node_class*, void*), void*); void cTg_IsUse(create_tag_class*); -extern "C" extern u8 g_fpcDtTg_Queue[12 + 4 /* padding */]; -extern "C" extern u8 g_fpcNd_type[4 + 4 /* padding */]; extern "C" void fpcBs_Is_JustOfType__Fii(); extern "C" void fpcBs_IsDelete__FP18base_process_class(); diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp index 568fa25807a..e4c12d6e90a 100644 --- a/src/f_pc/f_pc_draw.cpp +++ b/src/f_pc/f_pc_draw.cpp @@ -35,7 +35,6 @@ void fpcLy_CurrentLayer(); void fpcPause_IsEnable(void*, u8); void cAPIGph_BeforeOfDraw(); void cAPIGph_AfterOfDraw(); -extern "C" extern u8 g_fpcLf_type[4 + 4 /* padding */]; extern "C" void fpcBs_Is_JustOfType__Fii(); extern "C" void fpcLy_SetCurrentLayer__FP11layer_class(); diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index 6096cbc6989..d2257beb1cf 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -58,7 +58,6 @@ void fpcLnTg_ToQueue(line_tag*, int); void fpcLnIt_Queue(int (*)(void*, void*)); void fpcPause_IsEnable(void*, u8); void cTg_IsUse(create_tag_class*); -extern "C" extern u8 g_fpcNd_type[4 + 4 /* padding */]; extern "C" void fpcBs_Is_JustOfType__Fii(); extern "C" void fpcBs_Execute__FP18base_process_class(); diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 1864def214a..e8497a87dcc 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -30,9 +30,6 @@ static void fpcLf_Execute(leafdraw_class*); static void fpcLf_IsDelete(leafdraw_class*); static void fpcLf_Delete(leafdraw_class*); static void fpcLf_Create(leafdraw_class*); -extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_fpcLf_type[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450D38[8]; extern "C" void fpcLf_GetPriority__FPC14leafdraw_class(); extern "C" void fpcLf_DrawMethod__FP21leafdraw_method_classPv(); diff --git a/src/f_pc/f_pc_line.cpp b/src/f_pc/f_pc_line.cpp index 230e147339b..b8b665e54bb 100644 --- a/src/f_pc/f_pc_line.cpp +++ b/src/f_pc/f_pc_line.cpp @@ -18,7 +18,6 @@ struct node_list_class {}; // void fpcLn_Create(); -extern "C" extern void* g_fpcLn_Queue[2]; extern "C" void fpcLn_Create__Fv(); extern "C" extern void* g_fpcLn_Queue[2]; diff --git a/src/f_pc/f_pc_line_iter.cpp b/src/f_pc/f_pc_line_iter.cpp index f97d6d1776a..2b491c95688 100644 --- a/src/f_pc/f_pc_line_iter.cpp +++ b/src/f_pc/f_pc_line_iter.cpp @@ -39,7 +39,6 @@ void fpcLy_SetCurrentLayer(layer_class*); void fpcLy_CurrentLayer(); void cTrIt_Method(node_lists_tree_class*, int (*)(node_class*, void*), void*); void cTgIt_MethodCall(create_tag_class*, method_filter*); -extern "C" extern void* g_fpcLn_Queue[2]; extern "C" void fpcLy_SetCurrentLayer__FP11layer_class(); extern "C" void fpcLy_CurrentLayer__Fv(); diff --git a/src/f_pc/f_pc_line_tag.cpp b/src/f_pc/f_pc_line_tag.cpp index 7dc0e6e5492..d093bba35ca 100644 --- a/src/f_pc/f_pc_line_tag.cpp +++ b/src/f_pc/f_pc_line_tag.cpp @@ -38,7 +38,6 @@ extern "C" void fpcLnTg_Init__FP8line_tagPv(); void cTg_SingleCutFromTree(create_tag_class*); void cTg_AdditionToTree(node_lists_tree_class*, int, create_tag_class*); void cTg_Create(create_tag_class*, void*); -extern "C" extern void* g_fpcLn_Queue[2]; extern "C" void cTg_SingleCutFromTree__FP16create_tag_class(); extern "C" void cTg_AdditionToTree__FP21node_lists_tree_classiP16create_tag_class(); diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 0044289e7ed..73898a45154 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -105,11 +105,6 @@ void fpcDw_Handler(int (*)(int (*)(void*, void*)), int (*)(void*, void*)); void fpcFCtRq_Request(layer_class*, s16, int (*)(void*, void*), void*, void*); void cAPIGph_Painter(); void MtxInit(); -extern "C" extern u8 m_gamePad__8mDoCPd_c[16]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 struct_80450D38[8]; -extern "C" extern u8 data_80450EC4[4]; extern "C" void fpcCtIt_JudgeInLayer__FUiPFPvPv_PvPv(); extern "C" void fpcCt_IsCreatingByID__FUi(); diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index 5d62c7b6608..406444b6be1 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -33,8 +33,6 @@ void fpcNd_IsDeleteTiming(process_node_class*); static void fpcNd_IsDelete(process_node_class*); static void fpcNd_Delete(process_node_class*); static void fpcNd_Create(process_node_class*); -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; -extern "C" extern u8 g_fpcNd_type[4 + 4 /* padding */]; extern "C" void fpcNd_DrawMethod__FP21nodedraw_method_classPv(); extern "C" static void fpcNd_Draw__FP18process_node_class(); diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp index 6355374c5ab..1761eb9ee6f 100644 --- a/src/f_pc/f_pc_pause.cpp +++ b/src/f_pc/f_pc_pause.cpp @@ -33,7 +33,6 @@ extern "C" void fpcPause_Init__FPv(); void fpcBs_Is_JustOfType(int, int); void fpcLyIt_OnlyHere(layer_class*, int (*)(void*, void*), void*); -extern "C" extern u8 g_fpcNd_type[4 + 4 /* padding */]; extern "C" void fpcBs_Is_JustOfType__Fii(); extern "C" void fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv(); diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp index e3eff79a07d..472de25b319 100644 --- a/src/f_pc/f_pc_priority.cpp +++ b/src/f_pc/f_pc_priority.cpp @@ -38,7 +38,6 @@ static void fpcPi_IsNormal(unsigned int, u16, u16); void fpcPi_Change(process_priority_class*, unsigned int, u16, u16); void fpcPi_Handler(); void fpcPi_Init(process_priority_class*, void*, unsigned int, u16, u16); -extern "C" extern u8 data_804505F0[8]; extern "C" void fpcPi_IsInQueue__FP22process_priority_class(); extern "C" static void fpcPi_QueueTo__FP22process_priority_class(); diff --git a/src/f_pc/f_pc_profile.cpp b/src/f_pc/f_pc_profile.cpp index 43128099a41..48a463e1db1 100644 --- a/src/f_pc/f_pc_profile.cpp +++ b/src/f_pc/f_pc_profile.cpp @@ -12,7 +12,6 @@ // void fpcPf_Get(s16); -extern "C" extern u8 g_fpcPf_ProfileList_p[4 + 4 /* padding */]; extern "C" void fpcPf_Get__Fs(); extern "C" extern u8 g_fpcPf_ProfileList_p[4 + 4 /* padding */]; diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 774e9228343..c41ae83353c 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -61,7 +61,6 @@ void fpcLd_Free(s16); void fpcLd_Load(s16); void cPhs_Set(request_of_phase_process_class*, int (**)(void*)); void cPhs_Do(request_of_phase_process_class*, void*); -extern "C" extern u8 g_fpcNd_type[4 + 4 /* padding */]; extern "C" void fpcBs_Is_JustOfType__Fii(); extern "C" void fpcBs_Create__FsUiPv(); diff --git a/src/init.cpp b/src/init.cpp index ba523b5fc07..14e180f16b3 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -25,10 +25,6 @@ struct daBgObj_c { // Forward References: // -extern "C" extern u8 const __TRK_unknown_data[7988]; -extern "C" extern u8 const _rom_copy_info[132]; -extern "C" extern u8 const _bss_init_info[32]; - SECTION_INIT static void __check_pad3(); SECTION_INIT static void __set_debug_bba(); SECTION_INIT static void __get_debug_bba(); @@ -51,8 +47,6 @@ extern "C" extern u8 const _bss_init_info[32]; // External References: // -extern "C" extern u8 data_804516D0[8]; - extern "C" void main(); extern "C" void __OSFPRInit(); extern "C" void OSInit(); diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp index 9ca3587a0cb..120247c2984 100644 --- a/src/m_Do/m_Do_DVDError.cpp +++ b/src/m_Do/m_Do_DVDError.cpp @@ -49,7 +49,6 @@ extern "C" static void AlarmHandler__FP7OSAlarmP9OSContext(); // void mDoExt_getAssertHeap(); -extern "C" extern u8 data_80450C88[8]; extern "C" void mDoExt_getAssertHeap__Fv(); extern "C" void suspend__9mDoDvdThdFv(); diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index cf72a9c3e4c..289f3a5e24d 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -53,8 +53,6 @@ struct CARDFileInfo {}; // static void mDoMemCd_main(void*); -extern "C" extern char const* const m_Do_m_Do_MemCard__stringBase0; -extern "C" extern u8 g_mDoMemCd_control[8192]; extern "C" void __ct__15mDoMemCd_Ctrl_cFv(); extern "C" void ThdInit__15mDoMemCd_Ctrl_cFv(); @@ -89,7 +87,6 @@ extern "C" extern u8 g_mDoMemCd_control[8192]; void mDoExt_getAssertHeap(); void mDoMemCdRWm_Store(CARDFileInfo*, void*, u32); void mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32); -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; SECTION_INIT void memcpy(); extern "C" void mDoExt_getAssertHeap__Fv(); diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index a23c38ecfbf..8b913e94295 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -28,7 +28,6 @@ static void mDoMemCdRWm_CalcCheckSum(void*, u32); static void mDoMemCdRWm_CalcCheckSumGameData(void*, u32); void mDoMemCdRWm_TestCheckSumGameData(void*); void mDoMemCdRWm_SetCheckSumGameData(u8*, u8); -extern "C" extern char const* const m_Do_m_Do_MemCardRWmng__stringBase0; extern "C" void mDoMemCdRWm_Store__FP12CARDFileInfoPvUl(); extern "C" void mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl(); @@ -45,9 +44,6 @@ extern "C" extern char const* const m_Do_m_Do_MemCardRWmng__stringBase0; // External References: // -extern "C" extern u8 g_mDoMemCd_control[8192]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; - SECTION_INIT void memset(); SECTION_INIT void memcpy(); extern "C" void OSGetTime(); diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp index e0d86c43ae3..df980054f04 100644 --- a/src/m_Do/m_Do_Reset.cpp +++ b/src/m_Do/m_Do_Reset.cpp @@ -47,10 +47,6 @@ static void my_OSCancelAlarmAll(); static void destroyVideo(); void mDoRst_reset(int, u32, int); void mDoRst_resetCallBack(int, void*); -extern "C" extern char const* const m_Do_m_Do_Reset__stringBase0; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450C80[8]; -extern "C" extern u8 data_80450C88[8]; extern "C" static void my_OSCancelAlarmAll__Fv(); extern "C" static void destroyVideo__Fv(); @@ -68,13 +64,6 @@ extern "C" extern u8 data_80450C88[8]; void mDoDvdErr_ThdCleanup(); void cAPICPad_recalibrate(); -extern "C" extern u8 g_mDoMemCd_control[8192]; -extern "C" extern u8 struct_80450BB8[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sCallback__Q210JUTGamePad13C3ButtonReset[4]; -extern "C" extern u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451500[4]; -extern "C" extern u8 sManager__6JUTXfb[4 + 4 /* padding */]; extern "C" void OSAttention(); extern "C" void main__9mDoDvdThdFPv(); diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp index efc2154503b..c2c4e70f05b 100644 --- a/src/m_Do/m_Do_audio.cpp +++ b/src/m_Do/m_Do_audio.cpp @@ -52,17 +52,6 @@ struct Z2MultiSeMgr { /* 802AEB34 */ ~Z2MultiSeMgr(); }; -struct JAISoundID {}; - -struct JKRSolidHeap { - /* 802D0BF4 */ void adjustSize(); -}; - -struct JAISoundHandle { - /* 80007838 */ ~JAISoundHandle(); - /* 802A2184 */ void releaseSound(); -}; - struct JGeometry { template struct TVec3 {}; @@ -70,6 +59,17 @@ struct JGeometry { struct TVec3__template0 {}; }; +struct JKRSolidHeap { + /* 802D0BF4 */ void adjustSize(); +}; + +struct JAISoundID {}; + +struct JAISoundHandle { + /* 80007838 */ ~JAISoundHandle(); + /* 802A2184 */ void releaseSound(); +}; + struct Z2AudioMgr { /* 800073C8 */ ~Z2AudioMgr(); /* 802CD248 */ Z2AudioMgr(); @@ -126,11 +126,6 @@ void mDoAud_setFadeOutStart(u8); void mDoAud_setFadeInStart(u8); void mDoAud_resetProcess(); void mDoAud_resetRecover(); -extern "C" extern char const* const m_Do_m_Do_audio__stringBase0; -extern "C" extern void* __vt__12JAUSoundInfo[4 + 1 /* padding */]; -extern "C" extern u8 lit_3620[12]; -extern "C" extern u8 struct_80450BB8[4]; -extern "C" extern u8 g_mDoAud_audioHeap[4]; extern "C" void reset__17mDoAud_zelAudio_cFv(); extern "C" static void mDoAud_Create__Fv(); @@ -158,33 +153,6 @@ extern "C" extern u8 g_mDoAud_audioHeap[4]; // void operator delete(void*); -extern "C" extern void* __vt__8JAISeMgr[5]; -extern "C" extern void* __vt__16JAISeCategoryMgr[5]; -extern "C" extern void* __vt__9JAISeqMgr[5 + 1 /* padding */]; -extern "C" extern void* __vt__10Z2SoundMgr[3 + 1 /* padding */]; -extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; -extern "C" extern void* __vt__11Z2SoundInfo[20]; -extern "C" extern void* __vt__15Z2SpeechStarter[5]; -extern "C" extern void* __vt__10Z2AudioMgr[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B50[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B64[4]; -extern "C" extern u8 data_80450B68[4]; -extern "C" extern u8 data_80450B6C[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450C80[8]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; extern "C" void OSReport_Error(); extern "C" void create__25mDoDvdThd_mountXArchive_cFPCcUcQ210JKRArchive10EMountModeP7JKRHeap(); diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index fafe1350506..083b6eaa04c 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -38,9 +38,6 @@ struct mDoCPd_c { // Forward References: // -extern "C" extern u8 m_gamePad__8mDoCPd_c[16]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; - extern "C" void create__8mDoCPd_cFv(); extern "C" void read__8mDoCPd_cFv(); extern "C" void convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad(); @@ -56,13 +53,6 @@ extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; void mDoRst_resetCallBack(int, void*); void cLib_memSet(void*, int, u32); void* operator new(u32); -extern "C" extern u8 g_HIO[64 + 4 /* padding */]; -extern "C" extern u32 data_80450580; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 sAnalogMode__10JUTGamePad[4]; -extern "C" extern u8 sCallback__Q210JUTGamePad13C3ButtonReset[4]; -extern "C" extern u8 sCallbackArg__Q210JUTGamePad13C3ButtonReset[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451500[4]; extern "C" void mDoRst_resetCallBack__FiPv(); extern "C" void cLib_memSet__FPviUl(); @@ -116,10 +106,10 @@ asm void mDoCPd_c::read() { /* ############################################################################################## */ /* 80451A20-80451A24 0004+00 s=1 e=0 z=0 None .sdata2 @3709 */ -SECTION_SDATA2 static u32 lit_3709 = 0x3D888889; +SECTION_SDATA2 static f32 lit_3709 = 1.0f / 15.0f; /* 80451A24-80451A28 0004+00 s=1 e=0 z=0 None .sdata2 @3710 */ -SECTION_SDATA2 static u32 lit_3710 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3710 = 1.0f; /* 80451A28-80451A30 0004+04 s=1 e=0 z=0 None .sdata2 @3711 */ SECTION_SDATA2 static f32 lit_3711[1 + 1 /* padding */] = { @@ -129,9 +119,7 @@ SECTION_SDATA2 static f32 lit_3711[1 + 1 /* padding */] = { }; /* 80451A30-80451A38 0008+00 s=1 e=0 z=0 None .sdata2 @3713 */ -SECTION_SDATA2 static u8 lit_3713[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3713 = 4503599627370496.0 /* cast u32 to float */; /* 80007B7C-80007CD0 0154+00 s=1 e=0 z=0 None .text * convert__8mDoCPd_cFP27interface_of_controller_padP10JUTGamePad */ diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index f2989f15c3a..30cf4e5f050 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -111,7 +111,6 @@ struct JASDvd { static void my_DVDConvertPathToEntrynum(char const*); static void cb(void*); -extern "C" extern char const* const m_Do_m_Do_dvd_thread__stringBase0; extern "C" void main__9mDoDvdThdFPv(); extern "C" void create__9mDoDvdThdFl(); @@ -163,7 +162,6 @@ void cLs_Create(node_list_class*); void cNd_ForcedClear(node_class*); void* operator new(u32, JKRHeap*, int); void operator delete(void*); -extern "C" extern u8 struct_80450C80[8]; extern "C" void OSReport_FatalError(); extern "C" void OSReport_Error(); diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 6dd662d2c92..c2eea30b018 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -58,13 +58,16 @@ struct J3DAnmTextureSRTKey { /* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*); }; -struct J3DAnmTexPattern; +struct J3DAnmColor { + /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*); +}; + struct J3DAnmTevRegKey { /* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*); }; -struct J3DAnmColor { - /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*); +struct J3DAnmTexPattern { + /* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*); }; struct J3DMaterialTable { @@ -74,10 +77,6 @@ struct J3DMaterialTable { /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); }; -struct J3DAnmTexPattern { - /* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*); -}; - struct mDoExt_btpAnm { /* 8000D54C */ void init(J3DMaterialTable*, J3DAnmTexPattern*, int, int, f32, s16, s16); /* 8000D5E8 */ void entry(J3DMaterialTable*, s16); @@ -139,14 +138,14 @@ struct mDoExt_MtxCalcAnmBlendTbl { struct mDoExt_McaMorfCallBack2_c {}; -struct mDoExt_McaMorfCallBack1_c {}; +struct J3DTransformInfo {}; struct Z2Creature { /* 802C0628 */ void initAnime(void*, bool, f32, f32); /* 802C06D0 */ void updateAnime(f32, f32); }; -struct J3DTransformInfo {}; +struct mDoExt_McaMorfCallBack1_c {}; struct mDoExt_McaMorfSO { /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*, @@ -213,11 +212,11 @@ struct mDoExt_3DlineMatSortPacket { /* 80014E20 */ ~mDoExt_3DlineMatSortPacket(); }; -struct ResTIMG {}; +struct _GXColor {}; struct dKy_tevstr_c {}; -struct _GXColor {}; +struct ResTIMG {}; struct mDoExt_3DlineMat1_c { /* 80013360 */ void init(u16, u16, ResTIMG*, int); @@ -237,16 +236,16 @@ struct mDoExt_3DlineMat0_c { /* 80014E84 */ bool getMaterialID(); }; -struct J3DDrawBuffer; +struct J3DPacket; +struct J3DDrawBuffer { + /* 8032548C */ void entryImm(J3DPacket*, u16); +}; + struct J3DPacket { /* 8000E680 */ ~J3DPacket(); /* 80312750 */ bool entry(J3DDrawBuffer*); }; -struct J3DDrawBuffer { - /* 8032548C */ void entryImm(J3DPacket*, u16); -}; - struct dDlst_list_c { /* 800565EC */ void entryZSortXluDrawList(J3DDrawBuffer*, J3DPacket*, cXyz&); }; @@ -422,10 +421,10 @@ struct J3DShape { /* 80315300 */ void loadPreDrawSetting() const; }; -struct J3DBlend {}; - struct J3DAlphaComp {}; +struct J3DBlend {}; + struct J3DPEBlock { /* 8000DBCC */ void patch(); /* 8000DF3C */ bool getZCompLoc() const; @@ -606,21 +605,6 @@ void mDoExt_removeSubFont(); void mDoExt_J3DModel__create(J3DModelData*, u32, u32); void mDoExt_setAraCacheSize(u32); void mDoExt_GetCurrentRunningThread(); -extern "C" extern char const* const m_Do_m_Do_ext__stringBase0; -extern "C" extern void* __vt__7JUTFont[17]; -extern "C" extern void* __vt__26mDoExt_3DlineMatSortPacket[5]; -extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5]; -extern "C" extern void* __vt__19mDoExt_3DlineMat0_c[5]; -extern "C" extern void* __vt__12J3DFrameCtrl[3]; -extern "C" extern void* data_803A3360[11]; -extern "C" extern void* __vt__19J3DMtxCalcNoAnmBase[11]; -extern "C" extern void* __vt__28mDoExt_MtxCalcAnmBlendTblOld[11]; -extern "C" extern void* __vt__25mDoExt_MtxCalcAnmBlendTbl[11]; -extern "C" extern void* __vt__10J3DMtxCalc[11 + 1 /* padding */]; -extern "C" extern u8 gameHeap[4]; -extern "C" extern u8 zeldaHeap[4]; -extern "C" extern u8 commandHeap[4]; -extern "C" extern u8 archiveHeap[4]; extern "C" static void mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs(); extern "C" void initPlay__14mDoExt_baseAnmFsifss(); @@ -887,30 +871,6 @@ void* operator new[](u32); void operator delete(void*); void JMAEulerToQuat(s16, s16, s16, Quaternion*); void JMAQuatLerp(Quaternion const*, Quaternion const*, f32, Quaternion*); -extern "C" extern u8 const j3dDefaultTexCoordInfo[32]; -extern "C" extern u8 const j3dDefaultIndTexMtxInfo[28]; -extern "C" extern u8 const j3dDefaultTevStageInfo[20]; -extern "C" extern u8 const j3dDefaultIndTevStageInfo[12]; -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" extern void* __vt__8J3DModel[9]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 mCurrentMtx__6J3DSys[48]; -extern "C" extern u8 mParentS__6J3DSys[12]; -extern "C" extern u8 sGDLObj__17J3DDisplayListObj[16]; -extern "C" extern u32 __float_nan; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sOldVcdVatCmd__8J3DShape[4]; -extern "C" extern u8 mJoint__10J3DMtxCalc[4]; -extern "C" extern u8 __GDCurrentDL[4]; -extern "C" extern u32 j3dDefaultTevOrderInfoNull; -extern "C" extern u32 j3dDefaultIndTexOrderNull; -extern "C" extern u8 j3dDefaultIndTexCoordScaleInfo[4]; -extern "C" extern u8 j3dDefaultTevSwapMode[4]; -extern "C" extern u8 j3dDefaultColorChanInfo[8]; -extern "C" extern u8 struct_804563F8[4]; extern "C" void OSReport_FatalError(); extern "C" void OSReport_Error(); @@ -1071,7 +1031,7 @@ extern "C" extern u8 struct_804563F8[4]; /* ############################################################################################## */ /* 80451B18-80451B1C 0004+00 s=11 e=0 z=0 None .sdata2 @3847 */ -SECTION_SDATA2 static u32 lit_3847 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3847 = 1.0f; /* 8000D0AC-8000D320 0274+00 s=5 e=0 z=0 None .text * mDoExt_setJ3DData__FPA4_fPC16J3DTransformInfoUs */ @@ -1094,9 +1054,7 @@ SECTION_SDATA2 static u8 lit_3876[4] = { }; /* 80451B20-80451B28 0008+00 s=10 e=0 z=0 None .sdata2 @3878 */ -SECTION_SDATA2 static u8 lit_3878[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3878 = 4503601774854144.0 /* cast s32 to float */; /* 8000D320-8000D428 0108+00 s=6 e=0 z=0 None .text initPlay__14mDoExt_baseAnmFsifss */ #pragma push @@ -3155,7 +3113,7 @@ asm mDoExt_McaMorf::~mDoExt_McaMorf() { /* ############################################################################################## */ /* 80451B28-80451B2C 0004+00 s=3 e=0 z=0 None .sdata2 @5939 */ -SECTION_SDATA2 static u32 lit_5939 = 0xBF800000; +SECTION_SDATA2 static f32 lit_5939 = -1.0f; /* 8000FD94-80010074 02E0+00 s=1 e=0 z=0 None .text * create__14mDoExt_McaMorfFP12J3DModelDataP25mDoExt_McaMorfCallBack1_cP25mDoExt_McaMorfCallBack2_cP15J3DAnmTransformifiiiPvUlUl @@ -3421,7 +3379,7 @@ asm void mDoExt_McaMorf2::calc() { /* ############################################################################################## */ /* 80451B2C-80451B30 0004+00 s=6 e=0 z=0 None .sdata2 @6819 */ -SECTION_SDATA2 static u32 lit_6819 = 0x3F000000; +SECTION_SDATA2 static f32 lit_6819 = 0.5f; /* 80011D70-80011FCC 025C+00 s=1 e=0 z=2 None .text * setAnm__15mDoExt_McaMorf2FP15J3DAnmTransformP15J3DAnmTransformfiffff */ @@ -3554,9 +3512,7 @@ SECTION_SDATA2 static f32 lit_7404[1 + 1 /* padding */] = { }; /* 80451B38-80451B40 0008+00 s=2 e=0 z=0 None .sdata2 @7406 */ -SECTION_SDATA2 static u8 lit_7406[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_7406 = 4503599627370496.0 /* cast u32 to float */; /* 80012874-80012E3C 05C8+00 s=0 e=0 z=2 None .text * update__19mDoExt_3DlineMat0_cFifR8_GXColorUsP12dKy_tevstr_c */ @@ -3583,10 +3539,10 @@ asm void mDoExt_3DlineMat0_c::update(int param_0, _GXColor& param_1, dKy_tevstr_ /* ############################################################################################## */ /* 80451B40-80451B44 0004+00 s=1 e=0 z=0 None .sdata2 @7624 */ -SECTION_SDATA2 static u32 lit_7624 = 0x3E000000; +SECTION_SDATA2 static f32 lit_7624 = 0.125f; /* 80451B44-80451B48 0004+00 s=1 e=0 z=0 None .sdata2 @7625 */ -SECTION_SDATA2 static u32 lit_7625 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_7625 = 1.0f / 100.0f; /* 80013360-800134F8 0198+00 s=0 e=0 z=19 None .text init__19mDoExt_3DlineMat1_cFUsUsP7ResTIMGi */ @@ -3621,14 +3577,10 @@ asm void mDoExt_3DlineMat1_c::draw() { /* ############################################################################################## */ /* 80451B48-80451B50 0008+00 s=2 e=0 z=0 None .sdata2 @7919 */ -SECTION_SDATA2 static u8 lit_7919[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_7919 = 0.5; /* 80451B50-80451B58 0008+00 s=2 e=0 z=0 None .sdata2 @7920 */ -SECTION_SDATA2 static u8 lit_7920[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_7920 = 3.0; /* 80451B58-80451B60 0008+00 s=2 e=0 z=0 None .sdata2 @7921 */ SECTION_SDATA2 static u8 lit_7921[8] = { @@ -3636,10 +3588,10 @@ SECTION_SDATA2 static u8 lit_7921[8] = { }; /* 80451B60-80451B64 0004+00 s=2 e=0 z=0 None .sdata2 @7922 */ -SECTION_SDATA2 static u32 lit_7922 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_7922 = 1.0f / 10.0f; /* 80451B64-80451B68 0004+00 s=1 e=0 z=0 None .sdata2 @7923 */ -SECTION_SDATA2 static u32 lit_7923 = 0x3CA3D70A; +SECTION_SDATA2 static f32 lit_7923 = 1.0f / 50.0f; /* 80451B68-80451B70 0004+04 s=1 e=0 z=0 None .sdata2 @7924 */ SECTION_SDATA2 static f32 lit_7924[1 + 1 /* padding */] = { diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 89debb30066..e13702ece96 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -58,10 +58,10 @@ struct dDlst_shadowControl_c { /* 80055A14 */ void draw(f32 (*)[4]); }; -struct J3DDrawBuffer {}; - struct dDlst_base_c {}; +struct J3DDrawBuffer {}; + struct dDlst_list_c { /* 80056390 */ void init(); /* 80056538 */ void reset(); @@ -156,18 +156,6 @@ static void setLight(); static void drawItem3D(); void mDoGph_Painter(); void mDoGph_Create(); -extern "C" extern char const* const m_Do_m_Do_graphic__stringBase0; -extern "C" extern u8 mFrameBufferTexObj__13mDoGph_gInf_c[32]; -extern "C" extern u8 m_bloom__13mDoGph_gInf_c[20]; -extern "C" extern u8 mBackColor__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFadeColor__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFader__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 mFrameBufferTex__13mDoGph_gInf_c[4]; -extern "C" extern u8 mZbufferTimg__13mDoGph_gInf_c[4]; -extern "C" extern u8 mZbufferTex__13mDoGph_gInf_c[4]; -extern "C" extern f32 mFadeRate__13mDoGph_gInf_c; -extern "C" extern u8 struct_80450BE4[4]; extern "C" static void createTimg__FUsUsUl(); extern "C" void create__13mDoGph_gInf_cFv(); @@ -232,29 +220,6 @@ void cLib_memSet(void*, int, u32); void cLib_addCalc(f32*, f32, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern void* __vt__14J2DGrafContext[10]; -extern "C" extern void* __vt__13J2DOrthoGraph[10]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; -extern "C" extern u8 g_HIO[64 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_env_light[4880]; -extern "C" extern f32 Zero__4cXyz[3]; -extern "C" extern u8 mPadStatus__10JUTGamePad[48]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 data_80450580; -extern "C" extern void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; -extern "C" extern u8 g_clearColor[4]; -extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u8 systemConsole__9JFWSystem[4]; -extern "C" extern u8 sManager__10JFWDisplay[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */]; -extern "C" extern u8 sManager__8JUTVideo[4]; -extern "C" extern u8 sManager__6JUTXfb[4 + 4 /* padding */]; -extern "C" extern u8 sManager__10JUTProcBar[4]; extern "C" void mDoMtx_lookAt__FPA4_fPC3VecPC3VecPC3Vecs(); extern "C" void mDoExt_getArchiveHeap__Fv(); @@ -489,7 +454,7 @@ SECTION_SDATA2 static u8 lit_4062[4] = { }; /* 80451A3C-80451A40 0004+00 s=8 e=0 z=0 None .sdata2 @4063 */ -SECTION_SDATA2 static u32 lit_4063 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4063 = 1.0f; /* 80007FD8-80008028 0050+00 s=1 e=6 z=15 None .text fadeOut__13mDoGph_gInf_cFfR8_GXColor */ #pragma push @@ -556,7 +521,7 @@ asm void mDoGph_gInf_c::fadeOut(f32 param_0) { /* ############################################################################################## */ /* 80451A40-80451A44 0004+00 s=5 e=0 z=0 None .sdata2 @4105 */ -SECTION_SDATA2 static u32 lit_4105 = 0x41200000; +SECTION_SDATA2 static f32 lit_4105 = 10.0f; /* 800080F4-80008330 023C+00 s=1 e=0 z=0 None .text darwFilter__F8_GXColor */ #pragma push @@ -570,7 +535,7 @@ asm static void darwFilter(_GXColor param_0) { /* ############################################################################################## */ /* 80451A44-80451A48 0004+00 s=1 e=0 z=0 None .sdata2 @4131 */ -SECTION_SDATA2 static u32 lit_4131 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4131 = 255.0f; /* 80008330-8000841C 00EC+00 s=1 e=0 z=0 None .text calcFade__13mDoGph_gInf_cFv */ #pragma push @@ -640,26 +605,22 @@ SECTION_SDATA static u8 data_8045059C[4] = { }; /* 80451A48-80451A4C 0004+00 s=1 e=0 z=0 None .sdata2 @4422 */ -SECTION_SDATA2 static u32 lit_4422 = 0xC37F0000; +SECTION_SDATA2 static f32 lit_4422 = -255.0f; /* 80451A4C-80451A50 0004+00 s=2 e=0 z=0 None .sdata2 @4423 */ -SECTION_SDATA2 static u32 lit_4423 = 0x42700000; +SECTION_SDATA2 static f32 lit_4423 = 60.0f; /* 80451A50-80451A54 0004+00 s=1 e=0 z=0 None .sdata2 @4424 */ -SECTION_SDATA2 static u32 lit_4424 = 0x42400000; +SECTION_SDATA2 static f32 lit_4424 = 48.0f; /* 80451A54-80451A58 0004+00 s=1 e=0 z=0 None .sdata2 @4425 */ -SECTION_SDATA2 static u32 lit_4425 = 0x43C80000; +SECTION_SDATA2 static f32 lit_4425 = 400.0f; /* 80451A58-80451A60 0008+00 s=1 e=0 z=0 None .sdata2 @4426 */ -SECTION_SDATA2 static u8 lit_4426[8] = { - 0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4426 = 0.5; /* 80451A60-80451A68 0008+00 s=1 e=0 z=0 None .sdata2 @4427 */ -SECTION_SDATA2 static u8 lit_4427[8] = { - 0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4427 = 3.0; /* 80451A68-80451A70 0008+00 s=1 e=0 z=0 None .sdata2 @4428 */ SECTION_SDATA2 static u8 lit_4428[8] = { @@ -667,46 +628,46 @@ SECTION_SDATA2 static u8 lit_4428[8] = { }; /* 80451A70-80451A74 0004+00 s=1 e=0 z=0 None .sdata2 @4429 */ -SECTION_SDATA2 static u32 lit_4429 = 0x438C0000; +SECTION_SDATA2 static f32 lit_4429 = 280.0f; /* 80451A74-80451A78 0004+00 s=1 e=0 z=0 None .sdata2 @4430 */ -SECTION_SDATA2 static u32 lit_4430 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_4430 = 4.0f / 5.0f; /* 80451A78-80451A7C 0004+00 s=1 e=0 z=0 None .sdata2 @4431 */ -SECTION_SDATA2 static u32 lit_4431 = 0xC3340000; +SECTION_SDATA2 static f32 lit_4431 = -180.0f; /* 80451A7C-80451A80 0004+00 s=1 e=0 z=0 None .sdata2 @4432 */ -SECTION_SDATA2 static u32 lit_4432 = 0x42960000; +SECTION_SDATA2 static f32 lit_4432 = 75.0f; /* 80451A80-80451A84 0004+00 s=1 e=0 z=0 None .sdata2 @4433 */ -SECTION_SDATA2 static u32 lit_4433 = 0x40400000; +SECTION_SDATA2 static f32 lit_4433 = 3.0f; /* 80451A84-80451A88 0004+00 s=1 e=0 z=0 None .sdata2 @4434 */ -SECTION_SDATA2 static u32 lit_4434 = 0x497423F0; +SECTION_SDATA2 static f32 lit_4434 = 999999.0f; /* 80451A88-80451A8C 0004+00 s=1 e=0 z=0 None .sdata2 @4435 */ -SECTION_SDATA2 static u32 lit_4435 = 0x42A00000; +SECTION_SDATA2 static f32 lit_4435 = 80.0f; /* 80451A8C-80451A90 0004+00 s=1 e=0 z=0 None .sdata2 @4436 */ -SECTION_SDATA2 static u32 lit_4436 = 0x3DCCCCCD; +SECTION_SDATA2 static f32 lit_4436 = 1.0f / 10.0f; /* 80451A90-80451A94 0004+00 s=1 e=0 z=0 None .sdata2 @4437 */ -SECTION_SDATA2 static u32 lit_4437 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4437 = 100.0f; /* 80451A94-80451A98 0004+00 s=1 e=0 z=0 None .sdata2 @4438 */ -SECTION_SDATA2 static u32 lit_4438 = 0x38D1B717; +SECTION_SDATA2 static f32 lit_4438 = 9.999999747378752e-05f; /* 80451A98-80451A9C 0004+00 s=1 e=0 z=0 None .sdata2 @4439 */ -SECTION_SDATA2 static u32 lit_4439 = 0xC37E0000; +SECTION_SDATA2 static f32 lit_4439 = -254.0f; /* 80451A9C-80451AA0 0004+00 s=1 e=0 z=0 None .sdata2 @4440 */ -SECTION_SDATA2 static u32 lit_4440 = 0x43FE8000; +SECTION_SDATA2 static f32 lit_4440 = 509.0f; /* 80451AA0-80451AA4 0004+00 s=1 e=0 z=0 None .sdata2 @4441 */ -SECTION_SDATA2 static u32 lit_4441 = 0x3B23D70A; +SECTION_SDATA2 static f32 lit_4441 = 0.0024999999441206455f; /* 80451AA4-80451AA8 0004+00 s=1 e=0 z=0 None .sdata2 @4442 */ -SECTION_SDATA2 static u32 lit_4442 = 0xBB23D70A; +SECTION_SDATA2 static f32 lit_4442 = -0.0024999999441206455f; /* 80008630-80009184 0B54+00 s=1 e=0 z=0 None .text drawDepth2__FP10view_classP15view_port_classi */ @@ -731,10 +692,10 @@ asm cXyz::~cXyz() { /* ############################################################################################## */ /* 80451AA8-80451AAC 0004+00 s=3 e=0 z=0 None .sdata2 @4480 */ -SECTION_SDATA2 static u32 lit_4480 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4480 = 448.0f; /* 80451AAC-80451AB0 0004+00 s=3 e=0 z=0 None .sdata2 @4481 */ -SECTION_SDATA2 static u32 lit_4481 = 0x44180000; +SECTION_SDATA2 static f32 lit_4481 = 608.0f; /* 800091C0-800094B4 02F4+00 s=1 e=0 z=0 None .text trimming__FP10view_classP15view_port_class */ @@ -794,7 +755,7 @@ SECTION_SDATA2 static u8 lit_4528[4] = { SECTION_SDATA2 static u32 data_80451AB8 = 0x00000040; /* 80451ABC-80451AC0 0004+00 s=1 e=0 z=0 None .sdata2 @4592 */ -SECTION_SDATA2 static u32 lit_4592 = 0x40800000; +SECTION_SDATA2 static f32 lit_4592 = 4.0f; /* 80451AC0-80451AC8 0004+04 s=1 e=0 z=0 None .sdata2 @4593 */ SECTION_SDATA2 static f32 lit_4593[1 + 1 /* padding */] = { @@ -804,9 +765,7 @@ SECTION_SDATA2 static f32 lit_4593[1 + 1 /* padding */] = { }; /* 80451AC8-80451AD0 0008+00 s=1 e=0 z=0 None .sdata2 @4595 */ -SECTION_SDATA2 static u8 lit_4595[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4595 = 4503599627370496.0 /* cast u32 to float */; /* 80456B60-80456B68 0004+04 s=1 e=0 z=0 None .sbss2 @4530 */ SECTION_SBSS2 static u8 lit_4530[4 + 4 /* padding */]; @@ -844,10 +803,10 @@ asm static void motionBlure(view_class* param_0) { /* ############################################################################################## */ /* 80451AD0-80451AD4 0004+00 s=1 e=0 z=0 None .sdata2 @4641 */ -SECTION_SDATA2 static u32 lit_4641 = 0xC708B800; +SECTION_SDATA2 static f32 lit_4641 = -35000.0f; /* 80451AD4-80451AD8 0004+00 s=1 e=0 z=0 None .sdata2 @4642 */ -SECTION_SDATA2 static u32 lit_4642 = 0xC6EA6000; +SECTION_SDATA2 static f32 lit_4642 = -30000.0f; /* 8000A504-8000A58C 0088+00 s=1 e=0 z=0 None .text setLight__Fv */ #pragma push @@ -882,28 +841,28 @@ SECTION_DEAD static char const* const pad_80373DE7 = ""; #pragma pop /* 80451AD8-80451ADC 0004+00 s=1 e=0 z=0 None .sdata2 @5023 */ -SECTION_SDATA2 static u32 lit_5023 = 0xBF800000; +SECTION_SDATA2 static f32 lit_5023 = -1.0f; /* 80451ADC-80451AE0 0004+00 s=1 e=0 z=0 None .sdata2 @5024 */ -SECTION_SDATA2 static u32 lit_5024 = 0x3F000000; +SECTION_SDATA2 static f32 lit_5024 = 0.5f; /* 80451AE0-80451AE4 0004+00 s=1 e=0 z=0 None .sdata2 @5025 */ -SECTION_SDATA2 static u32 lit_5025 = 0xBF000000; +SECTION_SDATA2 static f32 lit_5025 = -0.5f; /* 80451AE4-80451AE8 0004+00 s=1 e=0 z=0 None .sdata2 @5026 */ -SECTION_SDATA2 static u32 lit_5026 = 0x3FADB6DB; +SECTION_SDATA2 static f32 lit_5026 = 19.0f / 14.0f; /* 80451AE8-80451AEC 0004+00 s=1 e=0 z=0 None .sdata2 @5027 */ -SECTION_SDATA2 static u32 lit_5027 = 0x47C35000; +SECTION_SDATA2 static f32 lit_5027 = 100000.0f; /* 80451AEC-80451AF0 0004+00 s=1 e=0 z=0 None .sdata2 @5028 */ -SECTION_SDATA2 static u32 lit_5028 = 0xC0000000; +SECTION_SDATA2 static f32 lit_5028 = -2.0f; /* 80451AF0-80451AF4 0004+00 s=1 e=0 z=0 None .sdata2 @5029 */ -SECTION_SDATA2 static u32 lit_5029 = 0xC7C35000; +SECTION_SDATA2 static f32 lit_5029 = -100000.0f; /* 80451AF4-80451AF8 0004+00 s=1 e=0 z=0 None .sdata2 @5030 */ -SECTION_SDATA2 static u32 lit_5030 = 0x43980000; +SECTION_SDATA2 static f32 lit_5030 = 304.0f; /* 80451AF8-80451B00 0004+04 s=1 e=0 z=0 None .sdata2 @5031 */ SECTION_SDATA2 static f32 lit_5031[1 + 1 /* padding */] = { diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp index 54a4a207949..8811a337993 100644 --- a/src/m_Do/m_Do_lib.cpp +++ b/src/m_Do/m_Do_lib.cpp @@ -36,9 +36,6 @@ struct J3DUClipper { void mDoLib_setResTimgObj(ResTIMG const*, _GXTexObj*, u32, _GXTlutObj*); void mDoLib_project(Vec*, Vec*); void mDoLib_pos2camera(Vec*, Vec*); -extern "C" extern u8 mClipper__14mDoLib_clipper[92]; -extern "C" extern f32 mSystemFar__14mDoLib_clipper; -extern "C" extern f32 mFovyRate__14mDoLib_clipper; extern "C" void mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj(); extern "C" void setup__14mDoLib_clipperFffff(); @@ -55,8 +52,6 @@ extern "C" extern f32 mFovyRate__14mDoLib_clipper; // void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sincosTable___5JMath[65536]; extern "C" void init__11J3DUClipperFv(); extern "C" void calcViewFrustum__11J3DUClipperFv(); @@ -78,15 +73,13 @@ extern "C" extern u8 sincosTable___5JMath[65536]; /* ############################################################################################## */ /* 80451B70-80451B74 0004+00 s=1 e=0 z=0 None .sdata2 @3634 */ -SECTION_SDATA2 static u32 lit_3634 = 0x3E000000; +SECTION_SDATA2 static f32 lit_3634 = 0.125f; /* 80451B74-80451B78 0004+00 s=1 e=0 z=0 None .sdata2 @3635 */ -SECTION_SDATA2 static u32 lit_3635 = 0x3C23D70A; +SECTION_SDATA2 static f32 lit_3635 = 1.0f / 100.0f; /* 80451B78-80451B80 0008+00 s=1 e=0 z=0 None .sdata2 @3638 */ -SECTION_SDATA2 static u8 lit_3638[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3638 = 4503601774854144.0 /* cast s32 to float */; /* 8001513C-8001528C 0150+00 s=0 e=3 z=2 None .text * mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj */ @@ -114,7 +107,7 @@ f32 mSystemFar__14mDoLib_clipper; f32 mFovyRate__14mDoLib_clipper; /* 80451B80-80451B84 0004+00 s=1 e=0 z=0 None .sdata2 @3739 */ -SECTION_SDATA2 static u32 lit_3739 = 0x43360B61; +SECTION_SDATA2 static f32 lit_3739 = 182.04444885253906f; /* 8001528C-80015310 0084+00 s=0 e=1 z=0 None .text setup__14mDoLib_clipperFffff */ #pragma push @@ -136,22 +129,22 @@ SECTION_SDATA2 static u8 lit_3784[4] = { }; /* 80451B88-80451B8C 0004+00 s=1 e=0 z=0 None .sdata2 @3785 */ -SECTION_SDATA2 static u32 lit_3785 = 0x48F42400; +SECTION_SDATA2 static f32 lit_3785 = 500000.0f; /* 80451B8C-80451B90 0004+00 s=1 e=0 z=0 None .sdata2 @3786 */ -SECTION_SDATA2 static u32 lit_3786 = 0x3F000000; +SECTION_SDATA2 static f32 lit_3786 = 0.5f; /* 80451B90-80451B94 0004+00 s=1 e=0 z=0 None .sdata2 @3787 */ -SECTION_SDATA2 static u32 lit_3787 = 0x40000000; +SECTION_SDATA2 static f32 lit_3787 = 2.0f; /* 80451B94-80451B98 0004+00 s=1 e=0 z=0 None .sdata2 @3788 */ -SECTION_SDATA2 static u32 lit_3788 = 0x43980000; +SECTION_SDATA2 static f32 lit_3788 = 304.0f; /* 80451B98-80451B9C 0004+00 s=1 e=0 z=0 None .sdata2 @3789 */ -SECTION_SDATA2 static u32 lit_3789 = 0x44180000; +SECTION_SDATA2 static f32 lit_3789 = 608.0f; /* 80451B9C-80451BA0 0004+00 s=1 e=0 z=0 None .sdata2 @3790 */ -SECTION_SDATA2 static u32 lit_3790 = 0x43600000; +SECTION_SDATA2 static f32 lit_3790 = 224.0f; /* 80451BA0-80451BA8 0004+04 s=1 e=0 z=0 None .sdata2 @3791 */ SECTION_SDATA2 static f32 lit_3791[1 + 1 /* padding */] = { diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index d6c1474a8d6..f953d11e2a1 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -112,9 +112,6 @@ static void fault_callback_scroll(u16, OSContext*, u32, u32); static void my_PrintHeap(char const*, u32); static void my_SysPrintHeap(char const*, void*, u32); void mDoMch_Create(); -extern "C" extern char const* const m_Do_m_Do_machine__stringBase0; -extern "C" extern u8 g_ntscZeldaProg[60]; -extern "C" extern void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; extern "C" static void myGetHeapTypeByString__FP7JKRHeap(); extern "C" static void myMemoryErrorRoutine__FPvUli(); @@ -156,35 +153,6 @@ void exception_addition(JUTConsole*); void cAPICPad_recalibrate(); void cM_initRnd(int, int, int); void* operator new(u32); -extern "C" extern u8 g_mDoMemCd_control[8192]; -extern "C" extern u32 data_80450580; -extern "C" extern u32 memMargin__7mDoMain; -extern "C" extern u32 maxStdHeaps__Q29JFWSystem11CSetUpParam; -extern "C" extern u32 sysHeapSize__Q29JFWSystem11CSetUpParam; -extern "C" extern u32 fifoBufSize__Q29JFWSystem11CSetUpParam; -extern "C" extern u32 aramAudioBufSize__Q29JFWSystem11CSetUpParam; -extern "C" extern u32 aramGraphBufSize__Q29JFWSystem11CSetUpParam; -extern "C" extern void* renderMode__Q29JFWSystem11CSetUpParam; -extern "C" extern u8 data_804508B0[8]; -extern "C" extern u32 sSZSBufferSize__7JKRAram[1 + 1 /* padding */]; -extern "C" extern u32 sSZSBufferSize__12JKRDvdRipper; -extern "C" extern u32 sSZSBufferSize__16JKRDvdAramRipper; -extern "C" extern u8 sHungUpTime__7mDoMain[4]; -extern "C" extern u8 data_80450B14[4]; -extern "C" extern u8 gameHeap[4]; -extern "C" extern u8 zeldaHeap[4]; -extern "C" extern u8 commandHeap[4]; -extern "C" extern u8 archiveHeap[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 systemHeap__9JFWSystem[4]; -extern "C" extern u8 systemConsole__9JFWSystem[4]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sRootHeap__7JKRHeap[4]; -extern "C" extern u8 sDebugPrint__10JUTDbPrint[4 + 4 /* padding */]; -extern "C" extern u8 struct_80451500[4]; -extern "C" extern u8 sErrorManager__12JUTException[4]; -extern "C" extern u8 sConsole__12JUTException[4]; -extern "C" extern u8 sManager__17JUTConsoleManager[4]; extern "C" void OSReportDisable(); extern "C" void OSReportEnable(); @@ -469,10 +437,10 @@ asm static void myExceptionCallback(u16 param_0, OSContext* param_1, u32 param_2 /* ############################################################################################## */ /* 80451B00-80451B04 0004+00 s=1 e=0 z=0 None .sdata2 @3940 */ -SECTION_SDATA2 static u32 lit_3940 = 0x41000000; +SECTION_SDATA2 static f32 lit_3940 = 8.0f; /* 80451B04-80451B08 0004+00 s=1 e=0 z=0 None .sdata2 @3941 */ -SECTION_SDATA2 static u32 lit_3941 = 0x40C00000; +SECTION_SDATA2 static f32 lit_3941 = 6.0f; /* 8000B95C-8000BCF4 0398+00 s=1 e=0 z=0 None .text fault_callback_scroll__FUsP9OSContextUlUl */ diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp index 11aff8c88e8..bdfa76c5b5d 100644 --- a/src/m_Do/m_Do_machine_exception.cpp +++ b/src/m_Do/m_Do_machine_exception.cpp @@ -44,9 +44,6 @@ static void dispGameInfo(); static void dispDateInfo(); static void dispConsoleToTerminal(); void exception_addition(JUTConsole*); -extern "C" extern char const* const m_Do_m_Do_machine_exception__stringBase0; -extern "C" extern u8 struct_80450C98[4]; -extern "C" extern u8 struct_80450C9C[4]; extern "C" static void print_f__FPCce(); extern "C" static void print__FPCc(); @@ -63,18 +60,6 @@ extern "C" extern u8 struct_80450C9C[4]; // External References: // -extern "C" extern u8 COPYDATE_STRING__7mDoMain[18 + 2 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 sPowerOnTime__7mDoMain[4]; -extern "C" extern u8 data_80450B0C[4]; -extern "C" extern u8 sHungUpTime__7mDoMain[4]; -extern "C" extern u8 data_80450B14[4]; -extern "C" extern u8 gameHeap[4]; -extern "C" extern u8 zeldaHeap[4]; -extern "C" extern u8 archiveHeap[4]; -extern "C" extern u8 systemConsole__9JFWSystem[4]; -extern "C" extern u8 sAramObject__7JKRAram[4]; - extern "C" void dump__14dRes_control_cFv(); extern "C" void dump__24DynamicModuleControlBaseFv(); extern "C" void getFreeSize__7JKRHeapFv(); diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index f77b8069db5..2fe14fd0c51 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -85,39 +85,6 @@ static void Debug_console(u32); static void LOAD_COPYDATE(void*); static void debug(); static void main01(); -extern "C" extern char const* const m_Do_m_Do_main__stringBase0; -extern "C" extern u8 COPYDATE_STRING__7mDoMain[18 + 2 /* padding */]; -extern "C" extern u32 data_80450580; -extern "C" extern u32 memMargin__7mDoMain; -extern "C" extern u8 sPowerOnTime__7mDoMain[4]; -extern "C" extern u8 data_80450B0C[4]; -extern "C" extern u8 sHungUpTime__7mDoMain[4]; -extern "C" extern u8 data_80450B14[4]; -extern "C" extern u8 data_80450B38[4]; -extern "C" extern u8 data_80450B3C[4]; -extern "C" extern u8 data_80450B40[4]; -extern "C" extern u8 data_80450B44[4]; -extern "C" extern u8 data_80450B48[4]; -extern "C" extern u8 data_80450B4C[4]; -extern "C" extern u8 data_80450B50[4]; -extern "C" extern u8 data_80450B54[4]; -extern "C" extern u8 data_80450B58[4]; -extern "C" extern u8 data_80450B5C[4]; -extern "C" extern u8 data_80450B60[4]; -extern "C" extern u8 data_80450B64[4]; -extern "C" extern u8 data_80450B68[4]; -extern "C" extern u8 data_80450B6C[4]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 data_80450B74[4]; -extern "C" extern u8 data_80450B78[4]; -extern "C" extern u8 data_80450B7C[4]; -extern "C" extern u8 data_80450B80[4]; -extern "C" extern u8 data_80450B84[4]; -extern "C" extern u8 data_80450B88[4]; -extern "C" extern u8 data_80450B8C[4]; -extern "C" extern u8 data_80450B90[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450B98[4]; -extern "C" extern u8 data_80450B9C[4]; extern "C" static void version_check__Fv(); extern "C" void CheckHeap1__9HeapCheckFv(); @@ -188,22 +155,6 @@ void fapGm_Create(); void fopAcM_initManager(); void JUTReport(int, int, char const*, ...); void JUTReport(int, int, int, char const*, ...); -extern "C" extern u8 m_gamePad__8mDoCPd_c[16]; -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_mDoMemCd_control[8192]; -extern "C" extern u8 g_HIO[64 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_mDoAud_audioHeap[4]; -extern "C" extern u8 gameHeap[4]; -extern "C" extern u8 zeldaHeap[4]; -extern "C" extern u8 archiveHeap[4]; -extern "C" extern u8 mResetData__6mDoRst[4 + 4 /* padding */]; -extern "C" extern u8 struct_80450C80[8]; -extern "C" extern u8 systemConsole__9JFWSystem[4]; -extern "C" extern u8 sSystemHeap__7JKRHeap[4]; -extern "C" extern u8 sCurrentHeap__7JKRHeap[4]; -extern "C" extern u8 sRootHeap__7JKRHeap[4]; -extern "C" extern u8 sAramObject__7JKRAram[4]; SECTION_INIT void memcpy(); extern "C" void OSReportInit__Fv(); @@ -569,10 +520,10 @@ static u8 console_scroll[4]; static u8 data_80450B30[4]; /* 80451A00-80451A04 0004+00 s=1 e=0 z=0 None .sdata2 @3884 */ -SECTION_SDATA2 static u32 lit_3884 = 0x41A00000; +SECTION_SDATA2 static f32 lit_3884 = 20.0f; /* 80451A04-80451A08 0004+00 s=1 e=0 z=0 None .sdata2 @3885 */ -SECTION_SDATA2 static u32 lit_3885 = 0x41F00000; +SECTION_SDATA2 static f32 lit_3885 = 30.0f; /* 80451A08-80451A0C 0004+00 s=1 e=0 z=0 None .sdata2 @3886 */ SECTION_SDATA2 static u8 lit_3886[4] = { @@ -583,7 +534,7 @@ SECTION_SDATA2 static u8 lit_3886[4] = { }; /* 80451A0C-80451A10 0004+00 s=1 e=0 z=0 None .sdata2 @3887 */ -SECTION_SDATA2 static u32 lit_3887 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3887 = 1.0f; /* 80451A10-80451A18 0004+04 s=1 e=0 z=0 None .sdata2 @3888 */ SECTION_SDATA2 static f32 lit_3888[1 + 1 /* padding */] = { @@ -593,9 +544,7 @@ SECTION_SDATA2 static f32 lit_3888[1 + 1 /* padding */] = { }; /* 80451A18-80451A20 0008+00 s=1 e=0 z=0 None .sdata2 @3890 */ -SECTION_SDATA2 static u8 lit_3890[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3890 = 4503601774854144.0 /* cast s32 to float */; /* 80005D4C-8000614C 0400+00 s=1 e=0 z=0 None .text Debug_console__FUl */ #pragma push diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index 10d3eb90126..ad8e2e63cc8 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -11,10 +11,6 @@ // Types: // -struct csXyz {}; - -struct Quaternion {}; - struct Vec {}; struct cXyz { @@ -24,6 +20,10 @@ struct cXyz { /* 80266FDC */ void normalizeRS(); }; +struct Quaternion {}; + +struct csXyz {}; + struct mDoMtx_stack_c { /* 8000CCC8 */ void push(); /* 8000CD14 */ void pop(); @@ -65,8 +65,6 @@ void mDoMtx_concatProjView(f32 const (*)[4], f32 const (*)[4], f32 (*)[4]); void mDoMtx_inverseTranspose(f32 const (*)[4], f32 (*)[4]); void mDoMtx_QuatConcat(Quaternion const*, Quaternion const*, Quaternion*); void mDoMtx_MtxToRot(f32 const (*)[4], csXyz*); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; -extern "C" extern u8 now__14mDoMtx_stack_c[48]; extern "C" static void mDoMtx_XYZrotS__FPA4_fsss(); extern "C" void mDoMtx_XYZrotM__FPA4_fsss(); @@ -109,9 +107,6 @@ extern "C" extern u8 now__14mDoMtx_stack_c[48]; void cM_atan2s(f32, f32); void operator delete(void*); -extern "C" extern u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_epsilon; -extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" void __mi__4cXyzCFRC3Vec(); extern "C" void outprod__4cXyzCFRC3Vec(); @@ -180,7 +175,7 @@ asm void mDoMtx_ZXYrotM(f32 (*param_0)[4], s16 param_1, s16 param_2, s16 param_3 /* ############################################################################################## */ /* 80451B08-80451B0C 0004+00 s=6 e=0 z=0 None .sdata2 @3676 */ -SECTION_SDATA2 static u32 lit_3676 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3676 = 1.0f; /* 80451B0C-80451B10 0004+00 s=7 e=0 z=0 None .sdata2 @3677 */ SECTION_SDATA2 static u8 lit_3677[4] = { diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp index fe1dadeee4f..90fdb6e94f6 100644 --- a/src/m_Do/m_Do_printf.cpp +++ b/src/m_Do/m_Do_printf.cpp @@ -24,7 +24,6 @@ void OSReportInit(); static void mDoPrintf_vprintf_Interrupt(char const*, __va_list_struct*); static void mDoPrintf_vprintf_Thread(char const*, __va_list_struct*); static void mDoPrintf_vprintf(char const*, __va_list_struct*); -extern "C" extern char const* const m_Do_m_Do_printf__stringBase0; extern "C" static void OSSwitchFiberEx__FUlUlUlUlUlUl(); extern "C" static void my_PutString__FPCc(); @@ -53,10 +52,6 @@ extern "C" extern char const* const m_Do_m_Do_printf__stringBase0; // void mDoExt_GetCurrentRunningThread(); -extern "C" extern void* __files[80]; -extern "C" extern u8 lit_3620[12]; -extern "C" extern u8 struct_80450B98[4]; -extern "C" extern u8 data_80450B9C[4]; extern "C" void mDoExt_GetCurrentRunningThread__Fv(); extern "C" void PPCHalt(); diff --git a/src/msg/scrn/d_msg_scrn_3select.cpp b/src/msg/scrn/d_msg_scrn_3select.cpp index 1bf945089d1..648e3def16f 100644 --- a/src/msg/scrn/d_msg_scrn_3select.cpp +++ b/src/msg/scrn/d_msg_scrn_3select.cpp @@ -100,9 +100,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_3select__stringBase0; -extern "C" extern u8 data_803C0CA0[24 + 48 /* padding */]; - extern "C" void __ct__17dMsgScrn3Select_cFv(); extern "C" void __dt__17dMsgScrn3Select_cFv(); extern "C" void __dt__14J2DAnmColorKeyFv(); @@ -142,12 +139,6 @@ void mDoExt_getMesgFont(); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* __vt__10J2DAnmBase[4]; -extern "C" extern void* __vt__10JUTNameTab[3]; -extern "C" extern void* __vt__14J2DAnmColorKey[5]; -extern "C" extern void* __vt__11J2DAnmColor[5]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void __ct__16dSelect_cursor_cFUcfP10JKRArchive(); @@ -469,10 +460,10 @@ SECTION_SDATA2 static u8 lit_3909[4] = { }; /* 80454B5C-80454B60 0004+00 s=4 e=0 z=0 None .sdata2 @3910 */ -SECTION_SDATA2 static u32 lit_3910 = 0x433E0000; +SECTION_SDATA2 static f32 lit_3910 = 190.0f; /* 80454B60-80454B64 0004+00 s=10 e=0 z=0 None .sdata2 @3911 */ -SECTION_SDATA2 static u32 lit_3911 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3911 = 1.0f; /* 802390B4-802398CC 0818+00 s=0 e=4 z=0 None .text __ct__17dMsgScrn3Select_cFv */ #pragma push @@ -547,19 +538,19 @@ asm void dMsgScrn3Select_c::translate(f32 param_0, f32 param_1) { /* ############################################################################################## */ /* 80454B64-80454B68 0004+00 s=2 e=0 z=0 None .sdata2 @4154 */ -SECTION_SDATA2 static u32 lit_4154 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4154 = 0.5f; /* 80454B68-80454B6C 0004+00 s=1 e=0 z=0 None .sdata2 @4155 */ -SECTION_SDATA2 static u32 lit_4155 = 0x40400000; +SECTION_SDATA2 static f32 lit_4155 = 3.0f; /* 80454B6C-80454B70 0004+00 s=1 e=0 z=0 None .sdata2 @4156 */ -SECTION_SDATA2 static u32 lit_4156 = 0x3F666666; +SECTION_SDATA2 static f32 lit_4156 = 9.0f / 10.0f; /* 80454B70-80454B74 0004+00 s=1 e=0 z=0 None .sdata2 @4157 */ -SECTION_SDATA2 static u32 lit_4157 = 0x3F333333; +SECTION_SDATA2 static f32 lit_4157 = 7.0f / 10.0f; /* 80454B74-80454B78 0004+00 s=1 e=0 z=0 None .sdata2 @4158 */ -SECTION_SDATA2 static u32 lit_4158 = 0x3D4CCCCD; +SECTION_SDATA2 static f32 lit_4158 = 1.0f / 20.0f; /* 80239DD4-8023A094 02C0+00 s=0 e=5 z=0 None .text draw__17dMsgScrn3Select_cFff */ #pragma push @@ -585,9 +576,7 @@ asm void dMsgScrn3Select_c::selAnimeInit(u8 param_0, u8 param_1, u8 param_2, f32 /* ############################################################################################## */ /* 80454B78-80454B80 0008+00 s=2 e=0 z=0 None .sdata2 @4345 */ -SECTION_SDATA2 static u8 lit_4345[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4345 = 4503601774854144.0 /* cast s32 to float */; /* 8023A398-8023A680 02E8+00 s=0 e=5 z=0 None .text selAnimeMove__17dMsgScrn3Select_cFUcUcb */ #pragma push @@ -601,7 +590,7 @@ asm void dMsgScrn3Select_c::selAnimeMove(u8 param_0, u8 param_1, bool param_2) { /* ############################################################################################## */ /* 80454B80-80454B84 0004+00 s=2 e=0 z=0 None .sdata2 @4434 */ -SECTION_SDATA2 static u32 lit_4434 = 0x43470000; +SECTION_SDATA2 static f32 lit_4434 = 199.0f; /* 8023A680-8023A934 02B4+00 s=0 e=9 z=0 None .text selAnimeEnd__17dMsgScrn3Select_cFv */ #pragma push @@ -717,13 +706,13 @@ asm void dMsgScrn3Select_c::waitProc() { /* ############################################################################################## */ /* 80454B84-80454B88 0004+00 s=2 e=0 z=0 None .sdata2 @4604 */ -SECTION_SDATA2 static u32 lit_4604 = 0x43978000; +SECTION_SDATA2 static f32 lit_4604 = 303.0f; /* 80454B88-80454B8C 0004+00 s=2 e=0 z=0 None .sdata2 @4605 */ -SECTION_SDATA2 static u32 lit_4605 = 0x43960000; +SECTION_SDATA2 static f32 lit_4605 = 300.0f; /* 80454B8C-80454B90 0004+00 s=2 e=0 z=0 None .sdata2 @4606 */ -SECTION_SDATA2 static u32 lit_4606 = 0x43C98000; +SECTION_SDATA2 static f32 lit_4606 = 403.0f; /* 80454B90-80454B98 0004+04 s=2 e=0 z=0 None .sdata2 @4607 */ SECTION_SDATA2 static f32 lit_4607[1 + 1 /* padding */] = { diff --git a/src/msg/scrn/d_msg_scrn_arrow.cpp b/src/msg/scrn/d_msg_scrn_arrow.cpp index b6ed1410680..5389b496ed6 100644 --- a/src/msg/scrn/d_msg_scrn_arrow.cpp +++ b/src/msg/scrn/d_msg_scrn_arrow.cpp @@ -57,8 +57,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_arrow__stringBase0; - extern "C" void __ct__15dMsgScrnArrow_cFv(); extern "C" void __dt__15dMsgScrnArrow_cFv(); extern "C" void draw__15dMsgScrnArrow_cFv(); @@ -76,7 +74,6 @@ extern "C" extern char const* const msg_scrn_d_msg_scrn_arrow__stringBase0; void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); extern "C" void dPaneClass_showNullPane__FP9J2DScreen(); @@ -178,12 +175,10 @@ asm void dMsgScrnArrow_c::arwAnimeInit() { /* ############################################################################################## */ /* 80454B9C-80454BA0 0004+00 s=2 e=0 z=0 None .sdata2 @3761 */ -SECTION_SDATA2 static u32 lit_3761 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3761 = 1.0f; /* 80454BA0-80454BA8 0008+00 s=2 e=0 z=0 None .sdata2 @3763 */ -SECTION_SDATA2 static u8 lit_3763[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3763 = 4503601774854144.0 /* cast s32 to float */; /* 8023BE90-8023BFC4 0134+00 s=0 e=4 z=0 None .text arwAnimeMove__15dMsgScrnArrow_cFv */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_base.cpp b/src/msg/scrn/d_msg_scrn_base.cpp index 48dd71723a4..b59d05df54f 100644 --- a/src/msg/scrn/d_msg_scrn_base.cpp +++ b/src/msg/scrn/d_msg_scrn_base.cpp @@ -93,8 +93,6 @@ extern "C" void isTalkNow__14dMsgScrnBase_cFv(); // void operator delete(void*); -extern "C" extern void* __vt__12dDlst_base_c[3]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" void set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c(); extern "C" void getStatus__12dMsgObject_cFv(); @@ -209,7 +207,7 @@ SECTION_SDATA2 static u8 lit_3820[4] = { }; /* 80454BAC-80454BB0 0004+00 s=2 e=0 z=0 None .sdata2 @3821 */ -SECTION_SDATA2 static u32 lit_3821 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3821 = 1.0f; /* 8023C16C-8023C234 00C8+00 s=1 e=9 z=0 None .text init__14dMsgScrnBase_cFv */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_boss.cpp b/src/msg/scrn/d_msg_scrn_boss.cpp index 82692ffe0a0..3eb6c62c1f2 100644 --- a/src/msg/scrn/d_msg_scrn_boss.cpp +++ b/src/msg/scrn/d_msg_scrn_boss.cpp @@ -71,8 +71,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_boss__stringBase0; - extern "C" void __ct__14dMsgScrnBoss_cFv(); extern "C" void __dt__14dMsgScrnBoss_cFv(); extern "C" void exec__14dMsgScrnBoss_cFv(); @@ -91,8 +89,6 @@ void mDoExt_getRubyFont(); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void mDoExt_getRubyFont__Fv(); extern "C" void setSelectRubyString__14dMsgScrnBase_cFPcPcPc(); @@ -181,7 +177,7 @@ SECTION_DATA static void* __vt__14dMsgScrnBoss_c[22] = { }; /* 80454BB0-80454BB4 0004+00 s=3 e=0 z=0 None .sdata2 @3854 */ -SECTION_SDATA2 static u32 lit_3854 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3854 = 1.0f; /* 8023C5C8-8023C928 0360+00 s=0 e=1 z=0 None .text __ct__14dMsgScrnBoss_cFv */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp index 0406b41e8bd..b27f7aa2c36 100644 --- a/src/msg/scrn/d_msg_scrn_explain.cpp +++ b/src/msg/scrn/d_msg_scrn_explain.cpp @@ -69,6 +69,10 @@ struct dMsgScrn3Select_c { /* 8023A97C */ void getCharSpace(); }; +struct COutFont_c { + /* 80225C94 */ COutFont_c(u8); +}; + struct J2DTextBox { /* 80300658 */ void getStringPtr() const; /* 8030074C */ void setString(s16, char const*, ...); @@ -76,10 +80,6 @@ struct J2DTextBox { struct JUTFont {}; -struct COutFont_c { - /* 80225C94 */ COutFont_c(u8); -}; - struct dMsgObject_c { /* 802380F4 */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*, char*, char*, s16*); @@ -140,8 +140,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_explain__stringBase0; - extern "C" void __ct__17dMsgScrnExplain_cFP9STControlUcbUc(); extern "C" void __dt__17dMsgScrnExplain_cFv(); extern "C" void move__17dMsgScrnExplain_cFv(); @@ -174,12 +172,6 @@ void dMeter2Info_set2DVibrationM(); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; -extern "C" extern u8 data_80450B70[4]; -extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void checkTrigger__9STControlFv(); @@ -380,10 +372,10 @@ SECTION_DATA static void* __vt__17dMsgScrnExplain_c[3] = { }; /* 80454BB8-80454BBC 0004+00 s=5 e=0 z=0 None .sdata2 @3978 */ -SECTION_SDATA2 static u32 lit_3978 = 0x44180000; +SECTION_SDATA2 static f32 lit_3978 = 608.0f; /* 80454BBC-80454BC0 0004+00 s=1 e=0 z=0 None .sdata2 @3979 */ -SECTION_SDATA2 static u32 lit_3979 = 0xC1200000; +SECTION_SDATA2 static f32 lit_3979 = -10.0f; /* 80454BC0-80454BC4 0004+00 s=5 e=0 z=0 None .sdata2 @3980 */ SECTION_SDATA2 static u8 lit_3980[4] = { @@ -394,7 +386,7 @@ SECTION_SDATA2 static u8 lit_3980[4] = { }; /* 80454BC4-80454BC8 0004+00 s=1 e=0 z=0 None .sdata2 @3981 */ -SECTION_SDATA2 static u32 lit_3981 = 0xC33E0000; +SECTION_SDATA2 static f32 lit_3981 = -190.0f; /* 8023CC88-8023D538 08B0+00 s=0 e=2 z=0 None .text __ct__17dMsgScrnExplain_cFP9STControlUcbUc */ @@ -419,7 +411,7 @@ asm dMsgScrnExplain_c::~dMsgScrnExplain_c() { /* ############################################################################################## */ /* 80454BC8-80454BCC 0004+00 s=1 e=0 z=0 None .sdata2 @4078 */ -SECTION_SDATA2 static u32 lit_4078 = 0xC20C0000; +SECTION_SDATA2 static f32 lit_4078 = -35.0f; /* 8023D7D8-8023D918 0140+00 s=0 e=4 z=0 None .text move__17dMsgScrnExplain_cFv */ #pragma push @@ -433,19 +425,19 @@ asm void dMsgScrnExplain_c::move() { /* ############################################################################################## */ /* 80454BCC-80454BD0 0004+00 s=1 e=0 z=0 None .sdata2 @4120 */ -SECTION_SDATA2 static u32 lit_4120 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4120 = 448.0f; /* 80454BD0-80454BD4 0004+00 s=4 e=0 z=0 None .sdata2 @4121 */ -SECTION_SDATA2 static u32 lit_4121 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4121 = -1.0f; /* 80454BD4-80454BD8 0004+00 s=1 e=0 z=0 None .sdata2 @4122 */ -SECTION_SDATA2 static u32 lit_4122 = 0xC2C80000; +SECTION_SDATA2 static f32 lit_4122 = -100.0f; /* 80454BD8-80454BDC 0004+00 s=1 e=0 z=0 None .sdata2 @4123 */ -SECTION_SDATA2 static u32 lit_4123 = 0x43F30000; +SECTION_SDATA2 static f32 lit_4123 = 486.0f; /* 80454BDC-80454BE0 0004+00 s=1 e=0 z=0 None .sdata2 @4124 */ -SECTION_SDATA2 static u32 lit_4124 = 0x43510000; +SECTION_SDATA2 static f32 lit_4124 = 209.0f; /* 8023D918-8023DAD0 01B8+00 s=0 e=3 z=0 None .text draw__17dMsgScrnExplain_cFP13J2DOrthoGraph */ @@ -487,7 +479,7 @@ asm void dMsgScrnExplain_c::open_request_proc() { /* ############################################################################################## */ /* 80454BE0-80454BE4 0004+00 s=6 e=0 z=0 None .sdata2 @4211 */ -SECTION_SDATA2 static u32 lit_4211 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4211 = 1.0f; /* 8023DBE4-8023DC7C 0098+00 s=1 e=0 z=0 None .text open_init__17dMsgScrnExplain_cFv */ #pragma push @@ -501,7 +493,7 @@ asm void dMsgScrnExplain_c::open_init() { /* ############################################################################################## */ /* 80454BE4-80454BE8 0004+00 s=2 e=0 z=0 None .sdata2 @4230 */ -SECTION_SDATA2 static u32 lit_4230 = 0x43160000; +SECTION_SDATA2 static f32 lit_4230 = 150.0f; /* 8023DC7C-8023DD90 0114+00 s=1 e=0 z=0 None .text open_proc__17dMsgScrnExplain_cFv */ #pragma push @@ -535,7 +527,7 @@ asm void dMsgScrnExplain_c::move_proc() { /* ############################################################################################## */ /* 80454BE8-80454BEC 0004+00 s=1 e=0 z=0 None .sdata2 @4294 */ -SECTION_SDATA2 static u32 lit_4294 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4294 = 0.5f; /* 8023DE8C-8023E0F4 0268+00 s=1 e=0 z=0 None .text move_select_init__17dMsgScrnExplain_cFv */ #pragma push @@ -591,12 +583,10 @@ asm void dMsgScrnExplain_c::openExplain(u32 param_0, u8 param_1, u8 param_2, u8 /* ############################################################################################## */ /* 80454BEC-80454BF0 0004+00 s=1 e=0 z=0 None .sdata2 @4414 */ -SECTION_SDATA2 static u32 lit_4414 = 0x40A00000; +SECTION_SDATA2 static f32 lit_4414 = 5.0f; /* 80454BF0-80454BF8 0008+00 s=1 e=0 z=0 None .sdata2 @4416 */ -SECTION_SDATA2 static u8 lit_4416[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4416 = 4503601774854144.0 /* cast s32 to float */; /* 8023E5CC-8023E640 0074+00 s=2 e=0 z=0 None .text getAlphaRatio__17dMsgScrnExplain_cFv */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_howl.cpp b/src/msg/scrn/d_msg_scrn_howl.cpp index 8eebb2b7e49..a8d215d8da8 100644 --- a/src/msg/scrn/d_msg_scrn_howl.cpp +++ b/src/msg/scrn/d_msg_scrn_howl.cpp @@ -149,10 +149,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_howl__stringBase0; -extern "C" extern u8 data_803C1120[56]; -extern "C" extern u8 data_803C1158[56]; - extern "C" void __ct__14dMsgScrnHowl_cFv(); extern "C" void __dt__14dMsgScrnHowl_cFv(); extern "C" void exec__14dMsgScrnHowl_cFv(); @@ -204,10 +200,6 @@ void dPaneClass_showNullPane(J2DScreen*); void cLib_addCalc2(f32*, f32, f32, f32); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void @@ -513,13 +505,13 @@ SECTION_SDATA2 static u8 lit_4427[4] = { }; /* 80454C54-80454C58 0004+00 s=1 e=0 z=0 None .sdata2 @4428 */ -SECTION_SDATA2 static u32 lit_4428 = 0x43AF0000; +SECTION_SDATA2 static f32 lit_4428 = 350.0f; /* 80454C58-80454C5C 0004+00 s=2 e=0 z=0 None .sdata2 @4429 */ -SECTION_SDATA2 static u32 lit_4429 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4429 = 255.0f; /* 80454C5C-80454C60 0004+00 s=2 e=0 z=0 None .sdata2 @4430 */ -SECTION_SDATA2 static u32 lit_4430 = 0x40400000; +SECTION_SDATA2 static f32 lit_4430 = 3.0f; /* 80454C60-80454C68 0004+04 s=8 e=0 z=0 None .sdata2 @4431 */ SECTION_SDATA2 static f32 lit_4431[1 + 1 /* padding */] = { @@ -529,9 +521,7 @@ SECTION_SDATA2 static f32 lit_4431[1 + 1 /* padding */] = { }; /* 80454C68-80454C70 0008+00 s=4 e=0 z=0 None .sdata2 @4434 */ -SECTION_SDATA2 static u8 lit_4434[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4434 = 4503601774854144.0 /* cast s32 to float */; /* 8024096C-80241784 0E18+00 s=0 e=1 z=0 None .text __ct__14dMsgScrnHowl_cFv */ #pragma push @@ -555,10 +545,10 @@ asm dMsgScrnHowl_c::~dMsgScrnHowl_c() { /* ############################################################################################## */ /* 80454C70-80454C74 0004+00 s=7 e=0 z=0 None .sdata2 @4561 */ -SECTION_SDATA2 static u32 lit_4561 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4561 = 0.5f; /* 80454C74-80454C78 0004+00 s=2 e=0 z=0 None .sdata2 @4562 */ -SECTION_SDATA2 static u32 lit_4562 = 0x3E4CCCCD; +SECTION_SDATA2 static f32 lit_4562 = 1.0f / 5.0f; /* 80454C78-80454C80 0004+04 s=2 e=0 z=0 None .sdata2 @4563 */ SECTION_SDATA2 static f32 lit_4563[1 + 1 /* padding */] = { @@ -579,9 +569,7 @@ asm void dMsgScrnHowl_c::exec() { /* ############################################################################################## */ /* 80454C80-80454C88 0008+00 s=6 e=0 z=0 None .sdata2 @4587 */ -SECTION_SDATA2 static u8 lit_4587[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4587 = 4503599627370496.0 /* cast u32 to float */; /* 80241C30-80241D58 0128+00 s=1 e=0 z=0 None .text drawSelf__14dMsgScrnHowl_cFv */ #pragma push @@ -717,22 +705,22 @@ asm void dMsgScrnHowl_c::resetLine() { /* ############################################################################################## */ /* 80454C88-80454C8C 0004+00 s=2 e=0 z=0 None .sdata2 @4824 */ -SECTION_SDATA2 static u32 lit_4824 = 0x41F00000; +SECTION_SDATA2 static f32 lit_4824 = 30.0f; /* 80454C8C-80454C90 0004+00 s=1 e=0 z=0 None .sdata2 @4825 */ -SECTION_SDATA2 static u32 lit_4825 = 0x41800000; +SECTION_SDATA2 static f32 lit_4825 = 16.0f; /* 80454C90-80454C94 0004+00 s=1 e=0 z=0 None .sdata2 @4826 */ -SECTION_SDATA2 static u32 lit_4826 = 0x42000000; +SECTION_SDATA2 static f32 lit_4826 = 32.0f; /* 80454C94-80454C98 0004+00 s=4 e=0 z=0 None .sdata2 @4827 */ -SECTION_SDATA2 static u32 lit_4827 = 0x40000000; +SECTION_SDATA2 static f32 lit_4827 = 2.0f; /* 80454C98-80454C9C 0004+00 s=1 e=0 z=0 None .sdata2 @4828 */ -SECTION_SDATA2 static u32 lit_4828 = 0x40A00000; +SECTION_SDATA2 static f32 lit_4828 = 5.0f; /* 80454C9C-80454CA0 0004+00 s=1 e=0 z=0 None .sdata2 @4829 */ -SECTION_SDATA2 static u32 lit_4829 = 0x41700000; +SECTION_SDATA2 static f32 lit_4829 = 15.0f; /* 80242198-802427A8 0610+00 s=1 e=0 z=0 None .text drawWave__14dMsgScrnHowl_cFv */ #pragma push @@ -756,7 +744,7 @@ asm void dMsgScrnHowl_c::drawGuide() { /* ############################################################################################## */ /* 80454CA0-80454CA4 0004+00 s=1 e=0 z=0 None .sdata2 @5203 */ -SECTION_SDATA2 static u32 lit_5203 = 0x41900000; +SECTION_SDATA2 static f32 lit_5203 = 18.0f; /* 80242FE4-802435BC 05D8+00 s=1 e=0 z=0 None .text drawGuide2__14dMsgScrnHowl_cFv */ #pragma push @@ -770,10 +758,10 @@ asm void dMsgScrnHowl_c::drawGuide2() { /* ############################################################################################## */ /* 80454CA4-80454CA8 0004+00 s=1 e=0 z=0 None .sdata2 @5233 */ -SECTION_SDATA2 static u32 lit_5233 = 0x41400000; +SECTION_SDATA2 static f32 lit_5233 = 12.0f; /* 80454CA8-80454CAC 0004+00 s=1 e=0 z=0 None .sdata2 @5234 */ -SECTION_SDATA2 static u32 lit_5234 = 0x42480000; +SECTION_SDATA2 static f32 lit_5234 = 50.0f; /* 802435BC-80243838 027C+00 s=1 e=0 z=0 None .text drawEffect__14dMsgScrnHowl_cFv */ #pragma push @@ -867,7 +855,7 @@ asm void dMsgScrnHowl_c::addCountGuide(s16 param_0) { /* ############################################################################################## */ /* 80454CAC-80454CB0 0004+00 s=1 e=0 z=0 None .sdata2 @5508 */ -SECTION_SDATA2 static u32 lit_5508 = 0xBF800000; +SECTION_SDATA2 static f32 lit_5508 = -1.0f; /* 80243F94-80244108 0174+00 s=2 e=0 z=0 None .text getNowPlotPitch__14dMsgScrnHowl_cFf */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_item.cpp b/src/msg/scrn/d_msg_scrn_item.cpp index 7d9b2432ce0..663e48be235 100644 --- a/src/msg/scrn/d_msg_scrn_item.cpp +++ b/src/msg/scrn/d_msg_scrn_item.cpp @@ -18,10 +18,10 @@ struct dMsgScrnLight_c { struct J2DAnmColor {}; -struct JKRExpHeap {}; - struct J2DAnmTextureSRTKey {}; +struct JKRExpHeap {}; + struct dMsgScrnItem_c { /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*); /* 8023F51C */ ~dMsgScrnItem_c(); @@ -161,8 +161,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_item__stringBase0; - extern "C" void __ct__14dMsgScrnItem_cFUcUcP10JKRExpHeap(); extern "C" void __dt__14dMsgScrnItem_cFv(); extern "C" void exec__14dMsgScrnItem_cFv(); @@ -197,11 +195,6 @@ void dComIfGp_getSubHeap2D(int); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern void* item_resource__10dItem_data[1530]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_drawHIO[3880]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; SECTION_INIT void memset(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -329,13 +322,13 @@ SECTION_DATA static void* __vt__14dMsgScrnItem_c[22] = { }; /* 80454BF8-80454BFC 0004+00 s=2 e=0 z=0 None .sdata2 @4192 */ -SECTION_SDATA2 static u32 lit_4192 = 0x42C80000; +SECTION_SDATA2 static f32 lit_4192 = 100.0f; /* 80454BFC-80454C00 0004+00 s=3 e=0 z=0 None .sdata2 @4193 */ -SECTION_SDATA2 static u32 lit_4193 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4193 = 1.0f; /* 80454C00-80454C04 0004+00 s=1 e=0 z=0 None .sdata2 @4194 */ -SECTION_SDATA2 static u32 lit_4194 = 0x42400000; +SECTION_SDATA2 static f32 lit_4194 = 48.0f; /* 80454C04-80454C08 0004+00 s=3 e=0 z=0 None .sdata2 @4195 */ SECTION_SDATA2 static u8 lit_4195[4] = { @@ -346,15 +339,13 @@ SECTION_SDATA2 static u8 lit_4195[4] = { }; /* 80454C08-80454C0C 0004+00 s=1 e=0 z=0 None .sdata2 @4196 */ -SECTION_SDATA2 static u32 lit_4196 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_4196 = 6.0f / 5.0f; /* 80454C0C-80454C10 0004+00 s=3 e=0 z=0 None .sdata2 @4197 */ -SECTION_SDATA2 static u32 lit_4197 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4197 = 0.5f; /* 80454C10-80454C18 0008+00 s=2 e=0 z=0 None .sdata2 @4199 */ -SECTION_SDATA2 static u8 lit_4199[8] = { - 0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4199 = 4503599627370496.0 /* cast u32 to float */; /* 8023E79C-8023F51C 0D80+00 s=0 e=1 z=0 None .text __ct__14dMsgScrnItem_cFUcUcP10JKRExpHeap */ @@ -379,9 +370,7 @@ asm dMsgScrnItem_c::~dMsgScrnItem_c() { /* ############################################################################################## */ /* 80454C18-80454C20 0008+00 s=2 e=0 z=0 None .sdata2 @4388 */ -SECTION_SDATA2 static u8 lit_4388[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4388 = 4503601774854144.0 /* cast s32 to float */; /* 8023F888-8023FB24 029C+00 s=1 e=0 z=0 None .text exec__14dMsgScrnItem_cFv */ #pragma push @@ -395,13 +384,13 @@ asm void dMsgScrnItem_c::exec() { /* ############################################################################################## */ /* 80454C20-80454C24 0004+00 s=1 e=0 z=0 None .sdata2 @4476 */ -SECTION_SDATA2 static u32 lit_4476 = 0x40000000; +SECTION_SDATA2 static f32 lit_4476 = 2.0f; /* 80454C24-80454C28 0004+00 s=1 e=0 z=0 None .sdata2 @4477 */ -SECTION_SDATA2 static u32 lit_4477 = 0x437F0000; +SECTION_SDATA2 static f32 lit_4477 = 255.0f; /* 80454C28-80454C2C 0004+00 s=1 e=0 z=0 None .sdata2 @4478 */ -SECTION_SDATA2 static u32 lit_4478 = 0x3F19999A; +SECTION_SDATA2 static f32 lit_4478 = 3.0f / 5.0f; /* 8023FB24-8023FF30 040C+00 s=1 e=0 z=0 None .text drawSelf__14dMsgScrnItem_cFv */ #pragma push @@ -543,31 +532,31 @@ asm void dMsgScrnItem_c::fukiAlpha(f32 param_0) { /* ############################################################################################## */ /* 80454C2C-80454C30 0004+00 s=1 e=0 z=0 None .sdata2 @4663 */ -SECTION_SDATA2 static u32 lit_4663 = 0x44180000; +SECTION_SDATA2 static f32 lit_4663 = 608.0f; /* 80454C30-80454C34 0004+00 s=1 e=0 z=0 None .sdata2 @4664 */ -SECTION_SDATA2 static u32 lit_4664 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4664 = 448.0f; /* 80454C34-80454C38 0004+00 s=1 e=0 z=0 None .sdata2 @4665 */ -SECTION_SDATA2 static u32 lit_4665 = 0x42480000; +SECTION_SDATA2 static f32 lit_4665 = 50.0f; /* 80454C38-80454C3C 0004+00 s=1 e=0 z=0 None .sdata2 @4666 */ -SECTION_SDATA2 static u32 lit_4666 = 0x42D20000; +SECTION_SDATA2 static f32 lit_4666 = 105.0f; /* 80454C3C-80454C40 0004+00 s=1 e=0 z=0 None .sdata2 @4667 */ -SECTION_SDATA2 static u32 lit_4667 = 0x43F30000; +SECTION_SDATA2 static f32 lit_4667 = 486.0f; /* 80454C40-80454C44 0004+00 s=1 e=0 z=0 None .sdata2 @4668 */ -SECTION_SDATA2 static u32 lit_4668 = 0x43660000; +SECTION_SDATA2 static f32 lit_4668 = 230.0f; /* 80454C44-80454C48 0004+00 s=1 e=0 z=0 None .sdata2 @4669 */ -SECTION_SDATA2 static u32 lit_4669 = 0x436B0000; +SECTION_SDATA2 static f32 lit_4669 = 235.0f; /* 80454C48-80454C4C 0004+00 s=1 e=0 z=0 None .sdata2 @4670 */ -SECTION_SDATA2 static u32 lit_4670 = 0x43B18000; +SECTION_SDATA2 static f32 lit_4670 = 355.0f; /* 80454C4C-80454C50 0004+00 s=1 e=0 z=0 None .sdata2 @4671 */ -SECTION_SDATA2 static u32 lit_4671 = 0x43510000; +SECTION_SDATA2 static f32 lit_4671 = 209.0f; /* 80240174-8024074C 05D8+00 s=1 e=0 z=0 None .text fukiPosCalc__14dMsgScrnItem_cFUc */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_jimaku.cpp b/src/msg/scrn/d_msg_scrn_jimaku.cpp index a1bd198d27e..a3242960bc5 100644 --- a/src/msg/scrn/d_msg_scrn_jimaku.cpp +++ b/src/msg/scrn/d_msg_scrn_jimaku.cpp @@ -85,8 +85,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_jimaku__stringBase0; - extern "C" void __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap(); extern "C" void __dt__16dMsgScrnJimaku_cFv(); extern "C" void exec__16dMsgScrnJimaku_cFv(); @@ -106,8 +104,6 @@ void dComIfGp_getSubHeap2D(int); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; SECTION_INIT void memset(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -206,7 +202,7 @@ SECTION_SDATA2 static u8 lit_3941[4] = { }; /* 80454CB4-80454CB8 0004+00 s=1 e=0 z=0 None .sdata2 @3942 */ -SECTION_SDATA2 static u32 lit_3942 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_3942 = 6.0f / 5.0f; /* 80244558-80244A74 051C+00 s=0 e=1 z=0 None .text __ct__16dMsgScrnJimaku_cFUcP10JKRExpHeap */ diff --git a/src/msg/scrn/d_msg_scrn_kanban.cpp b/src/msg/scrn/d_msg_scrn_kanban.cpp index 2ca726fb22d..97854e412ff 100644 --- a/src/msg/scrn/d_msg_scrn_kanban.cpp +++ b/src/msg/scrn/d_msg_scrn_kanban.cpp @@ -85,8 +85,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_kanban__stringBase0; - extern "C" void __ct__16dMsgScrnKanban_cFP10JKRExpHeap(); extern "C" void __dt__16dMsgScrnKanban_cFv(); extern "C" void exec__16dMsgScrnKanban_cFv(); @@ -105,8 +103,6 @@ void dComIfGp_getSubHeap2D(int); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void dComIfGp_getSubHeap2D__Fi(); @@ -207,7 +203,7 @@ SECTION_SDATA2 static u8 lit_3944[4] = { }; /* 80454CC4-80454CC8 0004+00 s=3 e=0 z=0 None .sdata2 @3945 */ -SECTION_SDATA2 static u32 lit_3945 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3945 = 1.0f; /* 80454CC8-80454CD0 0004+04 s=1 e=0 z=0 None .sdata2 @3946 */ SECTION_SDATA2 static f32 lit_3946[1 + 1 /* padding */] = { @@ -238,9 +234,7 @@ asm dMsgScrnKanban_c::~dMsgScrnKanban_c() { /* ############################################################################################## */ /* 80454CD0-80454CD8 0008+00 s=1 e=0 z=0 None .sdata2 @4033 */ -SECTION_SDATA2 static u8 lit_4033[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4033 = 4503601774854144.0 /* cast s32 to float */; /* 80245528-80245618 00F0+00 s=1 e=0 z=0 None .text exec__16dMsgScrnKanban_cFv */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_light.cpp b/src/msg/scrn/d_msg_scrn_light.cpp index 848671e2c05..3495185e33c 100644 --- a/src/msg/scrn/d_msg_scrn_light.cpp +++ b/src/msg/scrn/d_msg_scrn_light.cpp @@ -69,8 +69,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_light__stringBase0; - extern "C" void __ct__19dMsgScrnLight_HIO_cFv(); extern "C" void updateColor__19dMsgScrnLight_HIO_cFUc(); extern "C" void __ct__15dMsgScrnLight_cFUcUc(); @@ -89,8 +87,6 @@ extern "C" extern char const* const msg_scrn_d_msg_scrn_light__stringBase0; void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 data_804510D8[8]; extern "C" void __ct__8CPaneMgrFP9J2DScreenUxUcP10JKRExpHeap(); extern "C" void setBlackWhite__8CPaneMgrFQ28JUtility6TColorQ28JUtility6TColor(); @@ -197,12 +193,10 @@ asm dMsgScrnLight_c::~dMsgScrnLight_c() { /* ############################################################################################## */ /* 80454CDC-80454CE0 0004+00 s=2 e=0 z=0 None .sdata2 @3869 */ -SECTION_SDATA2 static u32 lit_3869 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3869 = 1.0f; /* 80454CE0-80454CE8 0008+00 s=2 e=0 z=0 None .sdata2 @3871 */ -SECTION_SDATA2 static u8 lit_3871[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_3871 = 4503601774854144.0 /* cast s32 to float */; /* 80245C04-80245F90 038C+00 s=0 e=2 z=0 None .text draw__15dMsgScrnLight_cFPffffffUc */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_place.cpp b/src/msg/scrn/d_msg_scrn_place.cpp index ece38d3d76a..d9cc5e9e11b 100644 --- a/src/msg/scrn/d_msg_scrn_place.cpp +++ b/src/msg/scrn/d_msg_scrn_place.cpp @@ -71,8 +71,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_place__stringBase0; - extern "C" void __ct__15dMsgScrnPlace_cFv(); extern "C" void __dt__15dMsgScrnPlace_cFv(); extern "C" void exec__15dMsgScrnPlace_cFv(); @@ -92,8 +90,6 @@ void dCam_getBody(); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void mDoExt_getRubyFont__Fv(); extern "C" void dCam_getBody__Fv(); @@ -191,7 +187,7 @@ SECTION_SDATA2 static u8 lit_3998[4] = { }; /* 80454CEC-80454CF0 0004+00 s=3 e=0 z=0 None .sdata2 @3999 */ -SECTION_SDATA2 static u32 lit_3999 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3999 = 1.0f; /* 80454CF0-80454CF8 0004+04 s=1 e=0 z=0 None .sdata2 @4000 */ SECTION_SDATA2 static f32 lit_4000[1 + 1 /* padding */] = { diff --git a/src/msg/scrn/d_msg_scrn_staff.cpp b/src/msg/scrn/d_msg_scrn_staff.cpp index 388f6f79bfe..cb89c315725 100644 --- a/src/msg/scrn/d_msg_scrn_staff.cpp +++ b/src/msg/scrn/d_msg_scrn_staff.cpp @@ -70,8 +70,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_staff__stringBase0; - extern "C" void __ct__15dMsgScrnStaff_cFUc(); extern "C" void __dt__15dMsgScrnStaff_cFv(); extern "C" void exec__15dMsgScrnStaff_cFv(); @@ -90,8 +88,6 @@ void mDoExt_getMesgFont(); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void setSelectRubyString__14dMsgScrnBase_cFPcPcPc(); @@ -205,7 +201,7 @@ asm dMsgScrnStaff_c::~dMsgScrnStaff_c() { /* ############################################################################################## */ /* 80454CFC-80454D00 0004+00 s=2 e=0 z=0 None .sdata2 @3877 */ -SECTION_SDATA2 static u32 lit_3877 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3877 = 1.0f; /* 80246EE8-80246F68 0080+00 s=1 e=0 z=0 None .text exec__15dMsgScrnStaff_cFv */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_talk.cpp b/src/msg/scrn/d_msg_scrn_talk.cpp index d582f567110..7e7b4cf5535 100644 --- a/src/msg/scrn/d_msg_scrn_talk.cpp +++ b/src/msg/scrn/d_msg_scrn_talk.cpp @@ -139,8 +139,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_talk__stringBase0; - extern "C" void __ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap(); extern "C" void __dt__14dMsgScrnTalk_cFv(); extern "C" void exec__14dMsgScrnTalk_cFv(); @@ -171,9 +169,6 @@ void dComIfGp_getSubHeap2D(int); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_meter2_info[248]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; SECTION_INIT void memset(); extern "C" void mDoExt_getMesgFont__Fv(); @@ -292,7 +287,7 @@ SECTION_DATA static void* __vt__14dMsgScrnTalk_c[22] = { }; /* 80454D00-80454D04 0004+00 s=2 e=0 z=0 None .sdata2 @4086 */ -SECTION_SDATA2 static u32 lit_4086 = 0x41900000; +SECTION_SDATA2 static f32 lit_4086 = 18.0f; /* 80454D04-80454D08 0004+00 s=3 e=0 z=0 None .sdata2 @4087 */ SECTION_SDATA2 static u8 lit_4087[4] = { @@ -303,10 +298,10 @@ SECTION_SDATA2 static u8 lit_4087[4] = { }; /* 80454D08-80454D0C 0004+00 s=1 e=0 z=0 None .sdata2 @4088 */ -SECTION_SDATA2 static u32 lit_4088 = 0xC1200000; +SECTION_SDATA2 static f32 lit_4088 = -10.0f; /* 80454D0C-80454D10 0004+00 s=1 e=0 z=0 None .sdata2 @4089 */ -SECTION_SDATA2 static u32 lit_4089 = 0x3F99999A; +SECTION_SDATA2 static f32 lit_4089 = 6.0f / 5.0f; /* 80246FF0-80247A90 0AA0+00 s=0 e=1 z=0 None .text __ct__14dMsgScrnTalk_cFUcUcP10JKRExpHeap */ @@ -331,7 +326,7 @@ asm dMsgScrnTalk_c::~dMsgScrnTalk_c() { /* ############################################################################################## */ /* 80454D10-80454D14 0004+00 s=2 e=0 z=0 None .sdata2 @4197 */ -SECTION_SDATA2 static u32 lit_4197 = 0x3F800000; +SECTION_SDATA2 static f32 lit_4197 = 1.0f; /* 80247D34-80247E4C 0118+00 s=1 e=0 z=0 None .text exec__14dMsgScrnTalk_cFv */ #pragma push @@ -345,10 +340,10 @@ asm void dMsgScrnTalk_c::exec() { /* ############################################################################################## */ /* 80454D14-80454D18 0004+00 s=1 e=0 z=0 None .sdata2 @4278 */ -SECTION_SDATA2 static u32 lit_4278 = 0x3F4CCCCD; +SECTION_SDATA2 static f32 lit_4278 = 4.0f / 5.0f; /* 80454D18-80454D1C 0004+00 s=1 e=0 z=0 None .sdata2 @4279 */ -SECTION_SDATA2 static u32 lit_4279 = 0xBF800000; +SECTION_SDATA2 static f32 lit_4279 = -1.0f; /* 80247E4C-802480F0 02A4+00 s=1 e=0 z=0 None .text drawSelf__14dMsgScrnTalk_cFv */ #pragma push @@ -485,37 +480,37 @@ asm void dMsgScrnTalk_c::fukiAlpha(f32 param_0) { /* ############################################################################################## */ /* 80454D1C-80454D20 0004+00 s=1 e=0 z=0 None .sdata2 @4489 */ -SECTION_SDATA2 static u32 lit_4489 = 0x44180000; +SECTION_SDATA2 static f32 lit_4489 = 608.0f; /* 80454D20-80454D24 0004+00 s=1 e=0 z=0 None .sdata2 @4490 */ -SECTION_SDATA2 static u32 lit_4490 = 0x43E00000; +SECTION_SDATA2 static f32 lit_4490 = 448.0f; /* 80454D24-80454D28 0004+00 s=1 e=0 z=0 None .sdata2 @4491 */ -SECTION_SDATA2 static u32 lit_4491 = 0x3F000000; +SECTION_SDATA2 static f32 lit_4491 = 0.5f; /* 80454D28-80454D2C 0004+00 s=1 e=0 z=0 None .sdata2 @4492 */ -SECTION_SDATA2 static u32 lit_4492 = 0x42480000; +SECTION_SDATA2 static f32 lit_4492 = 50.0f; /* 80454D2C-80454D30 0004+00 s=1 e=0 z=0 None .sdata2 @4493 */ -SECTION_SDATA2 static u32 lit_4493 = 0x42D20000; +SECTION_SDATA2 static f32 lit_4493 = 105.0f; /* 80454D30-80454D34 0004+00 s=1 e=0 z=0 None .sdata2 @4494 */ -SECTION_SDATA2 static u32 lit_4494 = 0x43F30000; +SECTION_SDATA2 static f32 lit_4494 = 486.0f; /* 80454D34-80454D38 0004+00 s=1 e=0 z=0 None .sdata2 @4495 */ -SECTION_SDATA2 static u32 lit_4495 = 0x43660000; +SECTION_SDATA2 static f32 lit_4495 = 230.0f; /* 80454D38-80454D3C 0004+00 s=1 e=0 z=0 None .sdata2 @4496 */ -SECTION_SDATA2 static u32 lit_4496 = 0x436B0000; +SECTION_SDATA2 static f32 lit_4496 = 235.0f; /* 80454D3C-80454D40 0004+00 s=1 e=0 z=0 None .sdata2 @4497 */ -SECTION_SDATA2 static u32 lit_4497 = 0x43B18000; +SECTION_SDATA2 static f32 lit_4497 = 355.0f; /* 80454D40-80454D44 0004+00 s=1 e=0 z=0 None .sdata2 @4498 */ -SECTION_SDATA2 static u32 lit_4498 = 0x43510000; +SECTION_SDATA2 static f32 lit_4498 = 209.0f; /* 80454D44-80454D48 0004+00 s=1 e=0 z=0 None .sdata2 @4499 */ -SECTION_SDATA2 static u32 lit_4499 = 0xC33E0000; +SECTION_SDATA2 static f32 lit_4499 = -190.0f; /* 80454D48-80454D50 0004+04 s=1 e=0 z=0 None .sdata2 @4500 */ SECTION_SDATA2 static f32 lit_4500[1 + 1 /* padding */] = { @@ -525,9 +520,7 @@ SECTION_SDATA2 static f32 lit_4500[1 + 1 /* padding */] = { }; /* 80454D50-80454D58 0008+00 s=1 e=0 z=0 None .sdata2 @4502 */ -SECTION_SDATA2 static u8 lit_4502[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4502 = 4503601774854144.0 /* cast s32 to float */; /* 8024835C-80248954 05F8+00 s=1 e=0 z=0 None .text fukiPosCalc__14dMsgScrnTalk_cFUc */ #pragma push diff --git a/src/msg/scrn/d_msg_scrn_tree.cpp b/src/msg/scrn/d_msg_scrn_tree.cpp index 531cb031398..a4b2913b5dc 100644 --- a/src/msg/scrn/d_msg_scrn_tree.cpp +++ b/src/msg/scrn/d_msg_scrn_tree.cpp @@ -91,8 +91,6 @@ struct CPaneMgr { // Forward References: // -extern "C" extern char const* const msg_scrn_d_msg_scrn_tree__stringBase0; - extern "C" void __ct__14dMsgScrnTree_cFP7JUTFontP10JKRExpHeap(); extern "C" void __dt__14dMsgScrnTree_cFv(); extern "C" void exec__14dMsgScrnTree_cFv(); @@ -111,8 +109,6 @@ void dComIfGp_getSubHeap2D(int); void dPaneClass_showNullPane(J2DScreen*); void* operator new(u32); void operator delete(void*); -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 g_MsgObject_HIO_c[1040]; extern "C" void mDoExt_getMesgFont__Fv(); extern "C" void dComIfGp_getSubHeap2D__Fi(); @@ -216,7 +212,7 @@ SECTION_SDATA2 static u8 lit_3949[4] = { }; /* 80454D5C-80454D60 0004+00 s=3 e=0 z=0 None .sdata2 @3950 */ -SECTION_SDATA2 static u32 lit_3950 = 0x3F800000; +SECTION_SDATA2 static f32 lit_3950 = 1.0f; /* 80454D60-80454D68 0004+04 s=1 e=0 z=0 None .sdata2 @3951 */ SECTION_SDATA2 static f32 lit_3951[1 + 1 /* padding */] = { @@ -248,9 +244,7 @@ asm dMsgScrnTree_c::~dMsgScrnTree_c() { /* ############################################################################################## */ /* 80454D68-80454D70 0008+00 s=1 e=0 z=0 None .sdata2 @4053 */ -SECTION_SDATA2 static u8 lit_4053[8] = { - 0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; +SECTION_SDATA2 static f64 lit_4053 = 4503601774854144.0 /* cast s32 to float */; /* 80249118-80249270 0158+00 s=1 e=0 z=0 None .text exec__14dMsgScrnTree_cFv */ #pragma push diff --git a/src/unknown_translation_unit.cpp b/src/unknown_translation_unit.cpp index 3d7481fb084..4263bff60be 100644 --- a/src/unknown_translation_unit.cpp +++ b/src/unknown_translation_unit.cpp @@ -22,9 +22,6 @@ struct __partial_array_destructor { #pragma section "extab_" extern "C" extern void* const _section_symbol_extab[18]; -#pragma section "extab_" -extern "C" extern void* const _section_symbol_extab[18]; - // // External References: //