From f8c601e36ab40c757031e7f33eadde50b5891be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Thu, 21 Jul 2022 15:57:05 +0100 Subject: [PATCH] rename all sections --- asm/Linker/Generated/Symbol/File.s | 8 +- ...ort\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" | 12 +- ...\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" | 14 +- ...L\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" | 6 +- ...\\MSL\\MSL_C\\MSL_Common\\Src\\FILE_POS.s" | 2 +- ...ort\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" | 4 +- ...MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" | 4 +- ...ort\\MSL\\MSL_C\\MSL_Common\\Src\\arith.s" | 2 +- ...\MSL\\MSL_C\\MSL_Common\\Src\\buffer_io.s" | 2 +- ...ort\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" | 4 +- ...\MSL\\MSL_C\\MSL_Common\\Src\\direct_io.s" | 2 +- ...rt\\MSL\\MSL_C\\MSL_Common\\Src\\extras.s" | 2 +- ...t\\MSL\\MSL_C\\MSL_Common\\Src\\file_io.s" | 2 +- ...ort\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" | 2 +- ...rt\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" | 6 +- ...\\MSL\\MSL_C\\MSL_Common\\Src\\math_api.s" | 2 +- ...SL\\MSL_C\\MSL_Common\\Src\\math_double.s" | 2 +- ...\\MSL\\MSL_C\\MSL_Common\\Src\\mbstring.s" | 2 +- ...pport\\MSL\\MSL_C\\MSL_Common\\Src\\mem.s" | 2 +- ...\MSL\\MSL_C\\MSL_Common\\Src\\mem_funcs.s" | 2 +- ...t\\MSL\\MSL_C\\MSL_Common\\Src\\misc_io.s" | 2 +- ...rt\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" | 10 +- ...ort\\MSL\\MSL_C\\MSL_Common\\Src\\scanf.s" | 2 +- ...L\\MSL_C\\MSL_Common\\Src\\secure_error.s" | 2 +- ...rt\\MSL\\MSL_C\\MSL_Common\\Src\\signal.s" | 2 +- ...rt\\MSL\\MSL_C\\MSL_Common\\Src\\string.s" | 2 +- ...t\\MSL\\MSL_C\\MSL_Common\\Src\\strtoul.s" | 2 +- ...\\MSL\\MSL_C\\MSL_Common\\Src\\wchar_io.s" | 2 +- ...rt\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" | 2 +- ...port\\MSL\\MSL_C\\MSL_Common\\Src\\wmem.s" | 2 +- ...t\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" | 8 +- ...t\\MSL\\MSL_C\\MSL_Common\\Src\\wstring.s" | 2 +- ...mbedded\\Math\\Double_precision\\e_acos.s" | 4 +- ...mbedded\\Math\\Double_precision\\e_asin.s" | 4 +- ...bedded\\Math\\Double_precision\\e_atan2.s" | 4 +- ...mbedded\\Math\\Double_precision\\e_fmod.s" | 4 +- ...Embedded\\Math\\Double_precision\\e_log.s" | 4 +- ...bedded\\Math\\Double_precision\\e_log10.s" | 4 +- ...Embedded\\Math\\Double_precision\\e_pow.s" | 6 +- ...ded\\Math\\Double_precision\\e_rem_pio2.s" | 6 +- ...mbedded\\Math\\Double_precision\\e_sqrt.s" | 4 +- ...Embedded\\Math\\Double_precision\\k_cos.s" | 4 +- ...ded\\Math\\Double_precision\\k_rem_pio2.s" | 6 +- ...Embedded\\Math\\Double_precision\\k_sin.s" | 4 +- ...Embedded\\Math\\Double_precision\\k_tan.s" | 6 +- ...mbedded\\Math\\Double_precision\\s_atan.s" | 6 +- ...mbedded\\Math\\Double_precision\\s_ceil.s" | 4 +- ...ded\\Math\\Double_precision\\s_copysign.s" | 2 +- ...Embedded\\Math\\Double_precision\\s_cos.s" | 4 +- ...bedded\\Math\\Double_precision\\s_floor.s" | 4 +- ...bedded\\Math\\Double_precision\\s_frexp.s" | 4 +- ...bedded\\Math\\Double_precision\\s_ldexp.s" | 4 +- ...mbedded\\Math\\Double_precision\\s_modf.s" | 2 +- ...Embedded\\Math\\Double_precision\\s_sin.s" | 4 +- ...Embedded\\Math\\Double_precision\\s_tan.s" | 4 +- ...mbedded\\Math\\Double_precision\\w_acos.s" | 2 +- ...mbedded\\Math\\Double_precision\\w_asin.s" | 2 +- ...bedded\\Math\\Double_precision\\w_atan2.s" | 2 +- ...mbedded\\Math\\Double_precision\\w_fmod.s" | 2 +- ...bedded\\Math\\Double_precision\\w_log10.s" | 2 +- ...Embedded\\Math\\Double_precision\\w_pow.s" | 2 +- ...mbedded\\Math\\Double_precision\\w_sqrt.s" | 2 +- ...SL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" | 8 +- ...L_C\\MSL_Common_Embedded\\Src\\math_sun.s" | 2 +- ...L_C\\PPC_EABI\\SRC\\abort_exit_ppc_eabi.s" | 2 +- ...L_C\\PPC_EABI\\SRC\\uart_console_io_gcn.s" | 2 +- asm/Runtime.PPCEABI.H/GCN_mem_alloc.s | 4 +- asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s | 12 +- asm/Runtime.PPCEABI.H/NMWException.s | 8 +- asm/Runtime.PPCEABI.H/New.s | 10 +- asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s | 8 +- asm/Runtime.PPCEABI.H/__mem.s | 4 +- asm/Runtime.PPCEABI.H/__va_arg.s | 2 +- .../global_destructor_chain.s | 2 +- asm/Runtime.PPCEABI.H/ptmf.s | 4 +- asm/Runtime.PPCEABI.H/runtime.s | 4 +- ...iiProj\\metrotrk\\metrotrk\\__exception.s" | 2 +- ...rotrk\\metrotrk\\custconn\\CircleBuffer.s" | 2 +- ...etrotrk\\custconn\\MWCriticalSection_gc.s" | 2 +- ...\\metrotrk\\metrotrk\\custconn\\cc_gdev.s" | 2 +- ...\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" | 4 +- ...iiProj\\metrotrk\\metrotrk\\dolphin_trk.s" | 4 +- ...j\\metrotrk\\metrotrk\\dolphin_trk_glue.s" | 6 +- ...iiProj\\metrotrk\\metrotrk\\flush_cache.s" | 2 +- ...\\wiiProj\\metrotrk\\metrotrk\\main_TRK.s" | 2 +- ...\\wiiProj\\metrotrk\\metrotrk\\mainloop.s" | 2 +- ...a\\wiiProj\\metrotrk\\metrotrk\\mem_TRK.s" | 2 +- ...iProj\\metrotrk\\metrotrk\\mpc_7xx_603e.s" | 2 +- ...\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" | 4 +- ...ta\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" | 4 +- ...\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" | 4 +- ...a\\wiiProj\\metrotrk\\metrotrk\\mslsupp.s" | 2 +- ...ta\\wiiProj\\metrotrk\\metrotrk\\notify.s" | 2 +- ...\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" | 4 +- ...a\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" | 4 +- ...a\\wiiProj\\metrotrk\\metrotrk\\serpoll.s" | 2 +- ...a\\wiiProj\\metrotrk\\metrotrk\\support.s" | 4 +- ...\\wiiProj\\metrotrk\\metrotrk\\targcont.s" | 2 +- ...roj\\metrotrk\\metrotrk\\target_options.s" | 2 +- ...\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" | 6 +- ...\\wiiProj\\metrotrk\\metrotrk\\targsupp.s" | 2 +- asm/ai/ai.s | 6 +- asm/arc/arc.s | 6 +- asm/ax/AX.s | 6 +- asm/ax/AXAlloc.s | 2 +- asm/ax/AXAux.s | 2 +- asm/ax/AXCL.s | 2 +- asm/ax/AXComp.s | 2 +- asm/ax/AXOut.s | 2 +- asm/ax/AXProf.s | 2 +- asm/ax/AXSPB.s | 2 +- asm/ax/AXVPB.s | 6 +- asm/ax/DSPCode.s | 4 +- asm/axfx/AXFXHooks.s | 4 +- asm/axfx/AXFXReverbHi.s | 4 +- asm/axfx/AXFXReverbHiExp.s | 6 +- asm/base/PPCArch.s | 4 +- asm/bte/bd.s | 2 +- asm/bte/bta_dm_act.s | 8 +- asm/bte/bta_dm_api.s | 4 +- asm/bte/bta_dm_cfg.s | 4 +- asm/bte/bta_dm_main.s | 4 +- asm/bte/bta_dm_pm.s | 4 +- asm/bte/bta_hh_act.s | 6 +- asm/bte/bta_hh_api.s | 6 +- asm/bte/bta_hh_cfg.s | 4 +- asm/bte/bta_hh_main.s | 6 +- asm/bte/bta_hh_utils.s | 4 +- asm/bte/bta_sys_cfg.s | 4 +- asm/bte/bta_sys_conn.s | 2 +- asm/bte/bta_sys_main.s | 4 +- asm/bte/bte_hcisu.s | 2 +- asm/bte/bte_init.s | 2 +- asm/bte/bte_logmsg.s | 4 +- asm/bte/bte_main.s | 4 +- asm/bte/btm_acl.s | 4 +- asm/bte/btm_dev.s | 2 +- asm/bte/btm_devctl.s | 6 +- asm/bte/btm_discovery.s | 2 +- asm/bte/btm_inq.s | 6 +- asm/bte/btm_main.s | 2 +- asm/bte/btm_pm.s | 8 +- asm/bte/btm_sco.s | 6 +- asm/bte/btm_sec.s | 6 +- asm/bte/btu_hcif.s | 4 +- asm/bte/btu_init.s | 4 +- asm/bte/btu_task1.s | 4 +- asm/bte/gap_api.s | 2 +- asm/bte/gap_conn.s | 6 +- asm/bte/gap_utils.s | 4 +- asm/bte/gki_buffer.s | 4 +- asm/bte/gki_ppc.s | 2 +- asm/bte/gki_time.s | 2 +- asm/bte/hcicmds.s | 4 +- asm/bte/hcisu_h2.s | 8 +- asm/bte/hidd_api.s | 2 +- asm/bte/hidd_conn.s | 4 +- asm/bte/hidd_mgmt.s | 4 +- asm/bte/hidd_pm.s | 2 +- asm/bte/hidh_api.s | 4 +- asm/bte/hidh_conn.s | 6 +- asm/bte/l2c_api.s | 4 +- asm/bte/l2c_csm.s | 4 +- asm/bte/l2c_link.s | 4 +- asm/bte/l2c_main.s | 4 +- asm/bte/l2c_utils.s | 6 +- asm/bte/port_api.s | 2 +- asm/bte/port_rfc.s | 4 +- asm/bte/port_utils.s | 4 +- asm/bte/ptim.s | 2 +- asm/bte/rfc_l2cap_if.s | 4 +- asm/bte/rfc_mx_fsm.s | 4 +- asm/bte/rfc_port_fsm.s | 4 +- asm/bte/rfc_port_if.s | 2 +- asm/bte/rfc_ts_frames.s | 6 +- asm/bte/rfc_utils.s | 6 +- asm/bte/sdp_api.s | 4 +- asm/bte/sdp_db.s | 4 +- asm/bte/sdp_discovery.s | 4 +- asm/bte/sdp_main.s | 4 +- asm/bte/sdp_server.s | 4 +- asm/bte/sdp_utils.s | 6 +- asm/bte/utl.s | 2 +- asm/bte/uusb_ppc.s | 4 +- asm/bte/wbt_ext.s | 2 +- asm/cx/CXSecureUncompression.s | 2 +- asm/cx/CXUncompression.s | 2 +- asm/db/db.s | 2 +- asm/dsp/dsp.s | 6 +- asm/dsp/dsp_debug.s | 2 +- asm/dsp/dsp_task.s | 4 +- asm/dvd/dvd.s | 6 +- asm/dvd/dvdDeviceError.s | 10 +- asm/dvd/dvdFatal.s | 10 +- asm/dvd/dvd_broadway.s | 6 +- asm/dvd/dvderror.s | 4 +- asm/dvd/dvdfs.s | 6 +- asm/dvd/dvdidutils.s | 2 +- asm/dvd/dvdqueue.s | 2 +- asm/enc/encunicode.s | 2 +- asm/enc/encutility.s | 6 +- asm/esp/esp.s | 4 +- asm/euart/euart.s | 2 +- asm/exi/EXIBios.s | 6 +- asm/exi/EXICommon.s | 4 +- asm/exi/EXIUart.s | 2 +- asm/fs/fs.s | 6 +- asm/gx/GXAttr.s | 6 +- asm/gx/GXBump.s | 4 +- asm/gx/GXDisplayList.s | 2 +- asm/gx/GXFifo.s | 4 +- asm/gx/GXFrameBuf.s | 6 +- asm/gx/GXGeometry.s | 2 +- asm/gx/GXInit.s | 8 +- asm/gx/GXLight.s | 4 +- asm/gx/GXMisc.s | 2 +- asm/gx/GXPerf.s | 4 +- asm/gx/GXPixel.s | 6 +- asm/gx/GXTev.s | 4 +- asm/gx/GXTexture.s | 8 +- asm/gx/GXTransform.s | 4 +- asm/homebuttonLib/HBMAnmController.s | 4 +- asm/homebuttonLib/HBMAxSound.s | 6 +- asm/homebuttonLib/HBMBase.s | 6 +- asm/homebuttonLib/HBMCommon.s | 4 +- asm/homebuttonLib/HBMController.s | 4 +- asm/homebuttonLib/HBMFrameController.s | 6 +- asm/homebuttonLib/HBMGUIManager.s | 6 +- asm/homebuttonLib/HBMRemoteSpk.s | 4 +- asm/homebuttonLib/lyt_animation.s | 6 +- asm/homebuttonLib/lyt_arcResourceAccessor.s | 4 +- asm/homebuttonLib/lyt_bounding.s | 6 +- asm/homebuttonLib/lyt_common.s | 4 +- asm/homebuttonLib/lyt_drawInfo.s | 6 +- asm/homebuttonLib/lyt_group.s | 4 +- asm/homebuttonLib/lyt_layout.s | 6 +- asm/homebuttonLib/lyt_material.s | 6 +- asm/homebuttonLib/lyt_pane.s | 8 +- asm/homebuttonLib/lyt_picture.s | 8 +- asm/homebuttonLib/lyt_resourceAccessor.s | 4 +- asm/homebuttonLib/lyt_textBox.s | 8 +- asm/homebuttonLib/lyt_window.s | 8 +- asm/homebuttonLib/math_triangular.s | 6 +- asm/homebuttonLib/mix.s | 4 +- asm/homebuttonLib/seq.s | 6 +- asm/homebuttonLib/syn.s | 2 +- asm/homebuttonLib/synctrl.s | 4 +- asm/homebuttonLib/synenv.s | 4 +- asm/homebuttonLib/synmix.s | 4 +- asm/homebuttonLib/synpitch.s | 6 +- asm/homebuttonLib/synsample.s | 2 +- asm/homebuttonLib/synvoice.s | 2 +- asm/homebuttonLib/ut_CharStrmReader.s | 2 +- asm/homebuttonLib/ut_CharWriter.s | 4 +- asm/homebuttonLib/ut_Font.s | 4 +- asm/homebuttonLib/ut_ResFont.s | 4 +- asm/homebuttonLib/ut_ResFontBase.s | 4 +- asm/homebuttonLib/ut_TagProcessorBase.s | 6 +- asm/homebuttonLib/ut_TextWriterBase.s | 8 +- asm/homebuttonLib/ut_list.s | 2 +- asm/ipc/ipcMain.s | 2 +- asm/ipc/ipcProfile.s | 2 +- asm/ipc/ipcclt.s | 4 +- asm/ipc/memory.s | 2 +- asm/kpad/KMPLS.s | 6 +- asm/kpad/KPAD.s | 8 +- asm/kpad/KZMplsTestSub.s | 6 +- asm/libMobiclip/Bignum.s | 4 +- asm/libMobiclip/CodecFast.s | 4 +- asm/libMobiclip/Digits.s | 2 +- asm/libMobiclip/ImaAdpcm.s | 4 +- asm/libMobiclip/MoApi.s | 6 +- asm/libMobiclip/MoDeblockWii.s | 6 +- asm/libMobiclip/MoSdk.s | 6 +- asm/libMobiclip/MoSdkAdpcmDecoder.s | 6 +- asm/libMobiclip/MoSdkAudioDecoder.s | 4 +- asm/libMobiclip/MoSdkDemux.s | 2 +- asm/libMobiclip/MoSdkFastAudioDecoder.s | 6 +- asm/libMobiclip/MoSdkHeaders.s | 10 +- asm/libMobiclip/MoSdkInput.s | 4 +- asm/libMobiclip/MoSdkMem.s | 4 +- asm/libMobiclip/MoSdkPcmPassthroughDecoder.s | 6 +- asm/libMobiclip/MoSdkProcessImage.s | 2 +- asm/libMobiclip/MoSdkSeek.s | 2 +- asm/libMobiclip/MoSdkVideoDecoder.s | 4 +- asm/libMobiclip/VX2_BitStream.s | 2 +- asm/libMobiclip/VX2_Cpu.s | 2 +- asm/libMobiclip/VX2_DecodeBlock16x16.s | 4 +- asm/libMobiclip/VX2_DecodeBlock16x2.s | 4 +- asm/libMobiclip/VX2_DecodeBlock16x4.s | 4 +- asm/libMobiclip/VX2_DecodeBlock16x8.s | 4 +- asm/libMobiclip/VX2_DecodeBlock2x16.s | 4 +- asm/libMobiclip/VX2_DecodeBlock2x2.s | 4 +- asm/libMobiclip/VX2_DecodeBlock2x4.s | 4 +- asm/libMobiclip/VX2_DecodeBlock2x8.s | 4 +- asm/libMobiclip/VX2_DecodeBlock4x16.s | 4 +- asm/libMobiclip/VX2_DecodeBlock4x2.s | 4 +- asm/libMobiclip/VX2_DecodeBlock4x4.s | 4 +- asm/libMobiclip/VX2_DecodeBlock4x8.s | 4 +- asm/libMobiclip/VX2_DecodeBlock8x16.s | 4 +- asm/libMobiclip/VX2_DecodeBlock8x2.s | 4 +- asm/libMobiclip/VX2_DecodeBlock8x4.s | 4 +- asm/libMobiclip/VX2_DecodeBlock8x8.s | 4 +- asm/libMobiclip/VX2_DecodeIntra.s | 4 +- asm/libMobiclip/VX2_Decoder.s | 6 +- asm/libMobiclip/VX2_DecoderMeFct.s | 2 +- asm/libMobiclip/VX2_InvMc.s | 2 +- asm/libMobiclip/VX2_InverseQuantization.s | 4 +- asm/libMobiclip/VX2_MotionCompensation.s | 4 +- asm/libMobiclip/VX2_Pred.s | 2 +- asm/libms/commonbin.s | 2 +- asm/libms/libms.s | 2 +- asm/libms/msgfile.s | 6 +- asm/libms/projfile.s | 6 +- asm/libnw4r_db/db_assert.s | 6 +- asm/libnw4r_db/db_console.s | 4 +- asm/libnw4r_db/db_directPrint.s | 8 +- asm/libnw4r_ef/ef_animcurve.s | 6 +- asm/libnw4r_ef/ef_creationqueue.s | 2 +- asm/libnw4r_ef/ef_cube.s | 6 +- asm/libnw4r_ef/ef_cylinder.s | 6 +- asm/libnw4r_ef/ef_disc.s | 6 +- asm/libnw4r_ef/ef_drawbillboardstrategy.s | 8 +- asm/libnw4r_ef/ef_drawdirectionalstrategy.s | 10 +- asm/libnw4r_ef/ef_drawfreestrategy.s | 10 +- asm/libnw4r_ef/ef_drawlinestrategy.s | 8 +- asm/libnw4r_ef/ef_draworder.s | 4 +- asm/libnw4r_ef/ef_drawpointstrategy.s | 8 +- asm/libnw4r_ef/ef_drawsmoothstripestrategy.s | 6 +- asm/libnw4r_ef/ef_drawstrategybuilder.s | 4 +- asm/libnw4r_ef/ef_drawstrategyimpl.s | 8 +- asm/libnw4r_ef/ef_drawstripestrategy.s | 6 +- asm/libnw4r_ef/ef_effect.s | 6 +- asm/libnw4r_ef/ef_effectsystem.s | 10 +- asm/libnw4r_ef/ef_emform.s | 6 +- asm/libnw4r_ef/ef_emitter.s | 6 +- asm/libnw4r_ef/ef_emitterform.s | 4 +- asm/libnw4r_ef/ef_handle.s | 2 +- asm/libnw4r_ef/ef_line.s | 6 +- asm/libnw4r_ef/ef_particle.s | 6 +- asm/libnw4r_ef/ef_particlemanager.s | 8 +- asm/libnw4r_ef/ef_point.s | 6 +- asm/libnw4r_ef/ef_postfield.s | 4 +- asm/libnw4r_ef/ef_resource.s | 4 +- asm/libnw4r_ef/ef_sphere.s | 6 +- asm/libnw4r_ef/ef_torus.s | 6 +- asm/libnw4r_ef/ef_util.s | 6 +- asm/libnw4r_g3d/g3d_3dsmax.s | 6 +- asm/libnw4r_g3d/g3d_anmchr.s | 8 +- asm/libnw4r_g3d/g3d_anmclr.s | 8 +- asm/libnw4r_g3d/g3d_anmobj.s | 8 +- asm/libnw4r_g3d/g3d_anmscn.s | 8 +- asm/libnw4r_g3d/g3d_anmshp.s | 8 +- asm/libnw4r_g3d/g3d_anmtexpat.s | 8 +- asm/libnw4r_g3d/g3d_anmtexsrt.s | 8 +- asm/libnw4r_g3d/g3d_anmvis.s | 10 +- asm/libnw4r_g3d/g3d_basic.s | 4 +- asm/libnw4r_g3d/g3d_calcmaterial.s | 2 +- asm/libnw4r_g3d/g3d_calcview.s | 6 +- asm/libnw4r_g3d/g3d_calcvtx.s | 4 +- asm/libnw4r_g3d/g3d_calcworld.s | 8 +- asm/libnw4r_g3d/g3d_camera.s | 4 +- asm/libnw4r_g3d/g3d_cpu.s | 4 +- asm/libnw4r_g3d/g3d_dcc.s | 2 +- asm/libnw4r_g3d/g3d_draw.s | 6 +- asm/libnw4r_g3d/g3d_draw1mat1shp.s | 6 +- asm/libnw4r_g3d/g3d_fog.s | 4 +- asm/libnw4r_g3d/g3d_gpu.s | 4 +- asm/libnw4r_g3d/g3d_init.s | 6 +- asm/libnw4r_g3d/g3d_light.s | 4 +- asm/libnw4r_g3d/g3d_maya.s | 6 +- asm/libnw4r_g3d/g3d_obj.s | 6 +- asm/libnw4r_g3d/g3d_resanm.s | 4 +- asm/libnw4r_g3d/g3d_resanmamblight.s | 4 +- asm/libnw4r_g3d/g3d_resanmcamera.s | 2 +- asm/libnw4r_g3d/g3d_resanmchr.s | 6 +- asm/libnw4r_g3d/g3d_resanmclr.s | 4 +- asm/libnw4r_g3d/g3d_resanmfog.s | 4 +- asm/libnw4r_g3d/g3d_resanmlight.s | 4 +- asm/libnw4r_g3d/g3d_resanmscn.s | 4 +- asm/libnw4r_g3d/g3d_resanmshp.s | 4 +- asm/libnw4r_g3d/g3d_resanmtexpat.s | 2 +- asm/libnw4r_g3d/g3d_resanmtexsrt.s | 4 +- asm/libnw4r_g3d/g3d_resanmvis.s | 4 +- asm/libnw4r_g3d/g3d_rescommon.s | 2 +- asm/libnw4r_g3d/g3d_resdict.s | 2 +- asm/libnw4r_g3d/g3d_resfile.s | 4 +- asm/libnw4r_g3d/g3d_reslightset.s | 2 +- asm/libnw4r_g3d/g3d_resmat.s | 4 +- asm/libnw4r_g3d/g3d_resmdl.s | 4 +- asm/libnw4r_g3d/g3d_resnode.s | 4 +- asm/libnw4r_g3d/g3d_resshp.s | 2 +- asm/libnw4r_g3d/g3d_restev.s | 6 +- asm/libnw4r_g3d/g3d_restex.s | 2 +- asm/libnw4r_g3d/g3d_resvtx.s | 2 +- asm/libnw4r_g3d/g3d_scnmdl.s | 6 +- asm/libnw4r_g3d/g3d_scnmdlexpand.s | 8 +- asm/libnw4r_g3d/g3d_scnmdlsmpl.s | 10 +- asm/libnw4r_g3d/g3d_scnobj.s | 8 +- asm/libnw4r_g3d/g3d_scnroot.s | 10 +- asm/libnw4r_g3d/g3d_state.s | 12 +- asm/libnw4r_g3d/g3d_tmem.s | 4 +- asm/libnw4r_g3d/g3d_transform.s | 4 +- asm/libnw4r_g3d/g3d_workmem.s | 2 +- asm/libnw4r_g3d/g3d_xsi.s | 6 +- asm/libnw4r_lyt/lyt_animation.s | 6 +- asm/libnw4r_lyt/lyt_arcResourceAccessor.s | 6 +- asm/libnw4r_lyt/lyt_bounding.s | 6 +- asm/libnw4r_lyt/lyt_common.s | 4 +- asm/libnw4r_lyt/lyt_drawInfo.s | 6 +- asm/libnw4r_lyt/lyt_group.s | 4 +- asm/libnw4r_lyt/lyt_layout.s | 6 +- asm/libnw4r_lyt/lyt_material.s | 6 +- asm/libnw4r_lyt/lyt_pane.s | 8 +- asm/libnw4r_lyt/lyt_picture.s | 8 +- asm/libnw4r_lyt/lyt_resourceAccessor.s | 4 +- asm/libnw4r_lyt/lyt_texMap.s | 4 +- asm/libnw4r_lyt/lyt_textBox.s | 10 +- asm/libnw4r_lyt/lyt_util.s | 2 +- asm/libnw4r_lyt/lyt_window.s | 8 +- asm/libnw4r_math/math_arithmetic.s | 6 +- asm/libnw4r_math/math_geometry.s | 4 +- asm/libnw4r_math/math_triangular.s | 8 +- asm/libnw4r_math/math_types.s | 4 +- asm/libnw4r_snd/snd_AnimSound.s | 2 +- asm/libnw4r_snd/snd_AxManager.s | 6 +- asm/libnw4r_snd/snd_AxVoice.s | 4 +- asm/libnw4r_snd/snd_AxVoiceManager.s | 2 +- asm/libnw4r_snd/snd_Bank.s | 4 +- asm/libnw4r_snd/snd_BankFile.s | 4 +- asm/libnw4r_snd/snd_BasicPlayer.s | 6 +- asm/libnw4r_snd/snd_BasicSound.s | 8 +- asm/libnw4r_snd/snd_BiquadFilterPreset.s | 8 +- asm/libnw4r_snd/snd_Channel.s | 4 +- asm/libnw4r_snd/snd_DisposeCallbackManager.s | 2 +- asm/libnw4r_snd/snd_DvdSoundArchive.s | 4 +- asm/libnw4r_snd/snd_EnvGenerator.s | 6 +- asm/libnw4r_snd/snd_ExternalSoundPlayer.s | 2 +- asm/libnw4r_snd/snd_FrameHeap.s | 2 +- asm/libnw4r_snd/snd_InstancePool.s | 2 +- asm/libnw4r_snd/snd_Lfo.s | 6 +- asm/libnw4r_snd/snd_MidiSeqPlayer.s | 2 +- asm/libnw4r_snd/snd_MmlParser.s | 8 +- asm/libnw4r_snd/snd_MmlSeqTrack.s | 4 +- asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s | 4 +- asm/libnw4r_snd/snd_PlayerHeap.s | 4 +- asm/libnw4r_snd/snd_RemoteSpeaker.s | 2 +- asm/libnw4r_snd/snd_RemoteSpeakerManager.s | 2 +- asm/libnw4r_snd/snd_SeqFile.s | 2 +- asm/libnw4r_snd/snd_SeqPlayer.s | 6 +- asm/libnw4r_snd/snd_SeqSound.s | 6 +- asm/libnw4r_snd/snd_SeqSoundHandle.s | 2 +- asm/libnw4r_snd/snd_SeqTrack.s | 8 +- asm/libnw4r_snd/snd_SoundActor.s | 6 +- asm/libnw4r_snd/snd_SoundArchive.s | 4 +- asm/libnw4r_snd/snd_SoundArchiveFile.s | 2 +- asm/libnw4r_snd/snd_SoundArchiveLoader.s | 2 +- asm/libnw4r_snd/snd_SoundArchivePlayer.s | 6 +- asm/libnw4r_snd/snd_SoundHandle.s | 2 +- asm/libnw4r_snd/snd_SoundHeap.s | 4 +- asm/libnw4r_snd/snd_SoundPlayer.s | 4 +- asm/libnw4r_snd/snd_SoundStartable.s | 2 +- asm/libnw4r_snd/snd_SoundSystem.s | 8 +- asm/libnw4r_snd/snd_SoundThread.s | 2 +- asm/libnw4r_snd/snd_StrmChannel.s | 2 +- asm/libnw4r_snd/snd_StrmFile.s | 2 +- asm/libnw4r_snd/snd_StrmPlayer.s | 6 +- asm/libnw4r_snd/snd_StrmSound.s | 8 +- asm/libnw4r_snd/snd_StrmSoundHandle.s | 2 +- asm/libnw4r_snd/snd_TaskManager.s | 2 +- asm/libnw4r_snd/snd_TaskThread.s | 2 +- asm/libnw4r_snd/snd_Util.s | 10 +- asm/libnw4r_snd/snd_Voice.s | 6 +- asm/libnw4r_snd/snd_VoiceManager.s | 2 +- asm/libnw4r_snd/snd_WaveArchive.s | 2 +- asm/libnw4r_snd/snd_WaveFile.s | 2 +- asm/libnw4r_snd/snd_WavePlayer.s | 6 +- asm/libnw4r_snd/snd_WaveSound.s | 6 +- asm/libnw4r_snd/snd_WaveSoundHandle.s | 2 +- asm/libnw4r_snd/snd_WsdFile.s | 4 +- asm/libnw4r_snd/snd_WsdPlayer.s | 6 +- asm/libnw4r_ut/ut_CharStrmReader.s | 2 +- asm/libnw4r_ut/ut_CharWriter.s | 4 +- asm/libnw4r_ut/ut_DvdFileStream.s | 6 +- asm/libnw4r_ut/ut_DvdLockedFileStream.s | 6 +- asm/libnw4r_ut/ut_FileStream.s | 4 +- asm/libnw4r_ut/ut_Font.s | 4 +- asm/libnw4r_ut/ut_IOStream.s | 4 +- asm/libnw4r_ut/ut_LinkList.s | 2 +- asm/libnw4r_ut/ut_LockedCache.s | 4 +- asm/libnw4r_ut/ut_ResFont.s | 4 +- asm/libnw4r_ut/ut_ResFontBase.s | 4 +- asm/libnw4r_ut/ut_RomFont.s | 6 +- asm/libnw4r_ut/ut_TagProcessorBase.s | 6 +- asm/libnw4r_ut/ut_TextWriterBase.s | 8 +- asm/libnw4r_ut/ut_binaryFileFormat.s | 2 +- asm/libnw4r_ut/ut_list.s | 2 +- asm/mem/mem_allocator.s | 4 +- asm/mem/mem_expHeap.s | 2 +- asm/mem/mem_frameHeap.s | 2 +- asm/mem/mem_heapCommon.s | 2 +- asm/mem/mem_list.s | 2 +- asm/mem/mem_unitHeap.s | 2 +- asm/mtx/mtx.s | 6 +- asm/mtx/mtx44.s | 4 +- asm/mtx/mtx44vec.s | 2 +- asm/mtx/mtxvec.s | 2 +- asm/mtx/quat.s | 6 +- asm/mtx/vec.s | 4 +- asm/nand/NANDCheck.s | 6 +- asm/nand/NANDCore.s | 8 +- asm/nand/NANDErrorMessage.s | 8 +- asm/nand/NANDLogging.s | 6 +- asm/nand/NANDOpenClose.s | 2 +- asm/nand/nand.s | 6 +- asm/nrel/Alert.s | 4 +- asm/nrel/AlertStyle.s | 2 +- asm/nrel/Block.s | 4 +- asm/nrel/CoreHolder.s | 2 +- asm/nrel/ExpHeapAccessor.s | 8 +- asm/nrel/ExpHeapMapUser.s | 6 +- asm/nrel/ExpHeapSupport.s | 4 +- asm/nrel/GXSettingFor2D.s | 4 +- asm/nrel/HeapMap.s | 2 +- asm/nrel/HeapMapBlockDrawer.s | 6 +- asm/nrel/OrthoCameraSetting.s | 2 +- asm/nrel/Render2D.s | 4 +- asm/nrel/StringStyle.s | 2 +- asm/nrel/TextWriter.s | 4 +- asm/nrel/ViewportSetting.s | 2 +- asm/os/OS.s | 8 +- asm/os/OSAlarm.s | 4 +- asm/os/OSAlloc.s | 4 +- asm/os/OSArena.s | 4 +- asm/os/OSAudioSystem.s | 4 +- asm/os/OSCache.s | 4 +- asm/os/OSContext.s | 4 +- asm/os/OSCrc.s | 4 +- asm/os/OSError.s | 6 +- asm/os/OSExec.s | 6 +- asm/os/OSFatal.s | 6 +- asm/os/OSFont.s | 8 +- asm/os/OSInterrupt.s | 4 +- asm/os/OSIpc.s | 4 +- asm/os/OSLaunch.s | 2 +- asm/os/OSLink.s | 2 +- asm/os/OSMemory.s | 4 +- asm/os/OSMessage.s | 2 +- asm/os/OSMutex.s | 2 +- asm/os/OSNandbootInfo.s | 4 +- asm/os/OSNet.s | 6 +- asm/os/OSPlayRecord.s | 6 +- asm/os/OSPlayTime.s | 8 +- asm/os/OSReboot.s | 2 +- asm/os/OSReset.s | 4 +- asm/os/OSRtc.s | 2 +- asm/os/OSSemaphore.s | 2 +- asm/os/OSStateFlags.s | 4 +- asm/os/OSStateTM.s | 4 +- asm/os/OSSync.s | 2 +- asm/os/OSThread.s | 4 +- asm/os/OSTime.s | 4 +- asm/os/OSUtf.s | 4 +- asm/os/__ppc_eabi_init.s | 4 +- asm/os/__start.s | 2 +- asm/pad/Pad.s | 6 +- asm/pad/Padclamp.s | 2 +- asm/sc/scapi.s | 2 +- asm/sc/scapi_prdinfo.s | 6 +- asm/sc/scsystem.s | 8 +- asm/si/SIBios.s | 6 +- asm/si/SISamplingRate.s | 4 +- asm/snd_adpcm.s | 2 +- asm/src/AABBox.s | 4 +- asm/src/AbilityBase.s | 4 +- asm/src/AbilityCursor.s | 8 +- asm/src/AbilityCustomBase.s | 4 +- asm/src/AbilityGetFade.s | 8 +- asm/src/AbilityKindUtil.s | 14 +- asm/src/AbilityManager.s | 4 +- asm/src/AbilityPanel.s | 8 +- asm/src/AbilityPanelContext.s | 2 +- asm/src/AbilitySelect.s | 10 +- asm/src/Accel.s | 2 +- asm/src/Accessor.s | 6 +- asm/src/ActionAttack.s | 8 +- asm/src/ActionDrink.s | 6 +- asm/src/ActionHover.s | 8 +- asm/src/ActionRun.s | 8 +- asm/src/ActionThroughLand.s | 8 +- asm/src/ActionVacuumSuper.s | 8 +- asm/src/ActionVomit.s | 6 +- asm/src/Actor.s | 6 +- asm/src/ActorDetectOption.s | 2 +- asm/src/ActorDiamond.s | 10 +- asm/src/ActorDiamondContext.s | 2 +- asm/src/ActorInfo.s | 2 +- asm/src/AddOnCast.s | 6 +- asm/src/AddOnMathDirection3.s | 6 +- asm/src/AddOnMathMath.s | 6 +- asm/src/AddOnMathVector3.s | 4 +- asm/src/AddOnMint.s | 294 +++++----- asm/src/AddWiiRemote.s | 8 +- asm/src/AdditionalMove.s | 6 +- asm/src/AirFlow.s | 10 +- asm/src/Alarm.s | 8 +- asm/src/AlgorithmGrandLowperAppear.s | 4 +- asm/src/AllStageClear.s | 8 +- asm/src/AllocatorChanger.s | 2 +- asm/src/Angry.s | 4 +- asm/src/Anim.s | 4 +- asm/src/AnimController.s | 4 +- asm/src/AnimScript.s | 4 +- asm/src/AppImpl.s | 4 +- asm/src/App__Alert.s | 4 +- asm/src/App__Random.s | 4 +- asm/src/Application.s | 2 +- asm/src/AreaLight.s | 4 +- asm/src/AreaLightInfo.s | 4 +- asm/src/AreaLightManager.s | 2 +- asm/src/AreaOperation.s | 4 +- asm/src/AreaSE.s | 6 +- asm/src/ArenaCtrl.s | 2 +- asm/src/ArrowBoard.s | 10 +- asm/src/Assert.s | 2 +- asm/src/Attack.s | 2 +- asm/src/AttackBallCtrl.s | 6 +- asm/src/AttackCenter.s | 2 +- asm/src/AttackFlash.s | 6 +- asm/src/AttackLog.s | 2 +- asm/src/AttackNode.s | 4 +- asm/src/AttackResult.s | 4 +- asm/src/AttackResultGimmick.s | 4 +- asm/src/AttackRoot.s | 2 +- asm/src/Attacker.s | 4 +- asm/src/AutoHeapExp.s | 2 +- asm/src/AutoReqAnim.s | 8 +- asm/src/AutoReqAnimReqInfo.s | 2 +- asm/src/AutoResetTimer.s | 2 +- asm/src/AvoidEnemyCtrl.s | 4 +- asm/src/BCModule.s | 2 +- asm/src/BCOpCode.s | 6 +- asm/src/BG.s | 16 +- asm/src/BGFade.s | 2 +- asm/src/BGLayout.s | 8 +- asm/src/BGM.s | 4 +- asm/src/BGMController.s | 6 +- asm/src/BGMCtrl.s | 2 +- asm/src/BGModel.s | 12 +- asm/src/BackButton.s | 6 +- asm/src/BackupData.s | 2 +- asm/src/BackupFileAccessor.s | 2 +- asm/src/BackupFileData2.s | 4 +- asm/src/Barrier.s | 4 +- asm/src/BarrierInvincible.s | 2 +- asm/src/BgCamera.s | 8 +- asm/src/BgManager.s | 6 +- asm/src/BgmPlayer.s | 4 +- asm/src/BinCarryItemKindUtil.s | 4 +- asm/src/BinDecorationKindUtil.s | 8 +- asm/src/BinMaproPos.s | 2 +- asm/src/BinMaproRect.s | 2 +- asm/src/Blink.s | 4 +- asm/src/Block.s | 16 +- asm/src/BlockAttackResult.s | 2 +- asm/src/BlockEffRequestInfo.s | 4 +- asm/src/BlockInfo.s | 2 +- asm/src/BlockManager.s | 10 +- asm/src/BlockResFiles.s | 10 +- asm/src/BodyColl.s | 2 +- asm/src/Boss.s | 6 +- asm/src/BossDataAccessor.s | 2 +- asm/src/BossDemoCtrl.s | 4 +- asm/src/BossPanel.s | 8 +- asm/src/BrainAttack.s | 32 +- asm/src/BrainAttackStraight.s | 6 +- asm/src/BrainBase.s | 4 +- asm/src/BrainBound.s | 4 +- asm/src/BrainChase.s | 20 +- asm/src/BrainCreditFallToGoodbye.s | 4 +- asm/src/BrainCreditPraise.s | 12 +- asm/src/BrainCreditWalkToPraise.s | 12 +- asm/src/BrainCtrl.s | 6 +- asm/src/BrainDash.s | 4 +- asm/src/BrainDive.s | 6 +- asm/src/BrainEscape.s | 4 +- asm/src/BrainFactory.s | 6 +- asm/src/BrainFattyBuffer.s | 4 +- asm/src/BrainFix.s | 4 +- asm/src/BrainFixCeil.s | 6 +- asm/src/BrainFlushPursuit.s | 4 +- asm/src/BrainFly.s | 40 +- asm/src/BrainFlyAround.s | 4 +- asm/src/BrainFlyFarSinCurve.s | 6 +- asm/src/BrainFlySinCurve.s | 4 +- asm/src/BrainFlyStraight.s | 4 +- asm/src/BrainFlyUpDown.s | 8 +- asm/src/BrainFlyWait.s | 4 +- asm/src/BrainFollow.s | 4 +- asm/src/BrainGrandLowper.s | 40 +- asm/src/BrainGround.s | 4 +- asm/src/BrainHang.s | 6 +- asm/src/BrainJump.s | 8 +- asm/src/BrainJumpAttack.s | 4 +- asm/src/BrainJumpOrAttack.s | 4 +- asm/src/BrainMain.s | 6 +- asm/src/BrainMove.s | 44 +- asm/src/BrainMoveAround.s | 4 +- asm/src/BrainMoveAttack.s | 14 +- asm/src/BrainMoveStraight.s | 4 +- asm/src/BrainNoseDive.s | 8 +- asm/src/BrainPuff.s | 4 +- asm/src/BrainPursuit.s | 8 +- asm/src/BrainPursuitCeil.s | 4 +- asm/src/BrainRelease.s | 8 +- asm/src/BrainRise.s | 4 +- asm/src/BrainRun.s | 4 +- asm/src/BrainShot.s | 4 +- asm/src/BrainSmoke.s | 4 +- asm/src/BrainTeleport.s | 4 +- asm/src/BrainTeleportRepeat.s | 4 +- asm/src/BrainWait.s | 40 +- asm/src/BrainWaitAndChase.s | 4 +- asm/src/BrainWaitAttack.s | 4 +- asm/src/BrainWaitFlyStraight.s | 4 +- asm/src/BrainWaitPursuit.s | 4 +- asm/src/BrainWalk.s | 28 +- asm/src/BrainWalkAround.s | 20 +- asm/src/BrainWalkStepBack.s | 4 +- asm/src/BrainWalkStraight.s | 8 +- asm/src/BrainWalkTurnCliff.s | 4 +- asm/src/BrainWall.s | 4 +- asm/src/BrainWhispy.s | 20 +- asm/src/Button.s | 20 +- asm/src/ButtonHelp.s | 6 +- asm/src/ButtonPanel.s | 6 +- asm/src/Camera.s | 4 +- asm/src/CameraAccessor.s | 10 +- asm/src/CameraController.s | 4 +- asm/src/CameraCtrl.s | 8 +- asm/src/CameraInfo.s | 4 +- asm/src/CameraLock.s | 4 +- asm/src/CameraLockPauseRequestor.s | 2 +- asm/src/CameraManager.s | 4 +- asm/src/CameraSet.s | 4 +- asm/src/CameraTarget.s | 8 +- asm/src/CaptureAttacker.s | 6 +- asm/src/CaptureCtrl.s | 4 +- asm/src/CaptureHeroAttacker.s | 4 +- asm/src/CaptureHeroReceiver.s | 6 +- asm/src/CaptureReceiver.s | 6 +- asm/src/CarryBlock.s | 8 +- asm/src/Catcher.s | 6 +- asm/src/ChainStarter.s | 4 +- asm/src/Challenge.s | 6 +- asm/src/ChallengeBattleCtrl.s | 4 +- asm/src/ChallengeDoor.s | 8 +- asm/src/ChallengeDoorMaster.s | 10 +- asm/src/ChallengeDoorMasterEx.s | 6 +- asm/src/ChallengeDoorMusou.s | 8 +- asm/src/ChallengeDoorMusouEx.s | 6 +- asm/src/ChallengeDoorNormal.s | 8 +- asm/src/ChallengeDoorTraining.s | 6 +- asm/src/ChallengeKindUtil.s | 8 +- asm/src/ChallengeUtil.s | 2 +- asm/src/Chara.s | 20 +- asm/src/CharaAnimBlender.s | 6 +- asm/src/CharaAnimInterpolation.s | 4 +- asm/src/CharaAnimInterpolationContext.s | 2 +- asm/src/CharaManager.s | 16 +- asm/src/CharaModel.s | 4 +- asm/src/CharaModelContext.s | 2 +- asm/src/CharaParam.s | 200 +++---- asm/src/CharacterEncodeUtil.s | 2 +- asm/src/ChargeFlash.s | 6 +- asm/src/CheckWindow.s | 6 +- asm/src/ChoseAbility.s | 6 +- asm/src/Chronology.s | 6 +- asm/src/CinemaScope.s | 16 +- asm/src/CinemaScopeModel.s | 6 +- asm/src/ClearDanceSync.s | 4 +- asm/src/ClearDanceUtil.s | 2 +- asm/src/CliffChecker.s | 4 +- asm/src/CliffEdgeBoundCtrl.s | 4 +- asm/src/ClosePanel.s | 4 +- asm/src/Closest.s | 4 +- asm/src/CollDataTable.s | 2 +- asm/src/CollUtil.s | 2 +- asm/src/CollideTarget.s | 2 +- asm/src/CollideTargetRepos.s | 2 +- asm/src/CollideTargetReposSet.s | 2 +- asm/src/CollidedAction.s | 4 +- asm/src/CollidedDetectionInfo.s | 2 +- asm/src/CollidedInfo.s | 4 +- asm/src/CollidedLog.s | 2 +- asm/src/Color.s | 4 +- asm/src/ColorAnim.s | 6 +- asm/src/ColorAnimContext.s | 2 +- asm/src/ColorAnimFlash.s | 2 +- asm/src/ColorAnimMaterialTarget.s | 4 +- asm/src/ColorAnimTevManager.s | 6 +- asm/src/CommandManager.s | 4 +- asm/src/Commander.s | 26 +- asm/src/Common.s | 6 +- asm/src/Component.s | 32 +- asm/src/Confirm.s | 8 +- asm/src/ConsecutiveBattle.s | 6 +- asm/src/Console.s | 4 +- asm/src/Constant.s | 12 +- asm/src/Context.s | 4 +- asm/src/ContextChallenge.s | 2 +- asm/src/ContextGhost.s | 2 +- asm/src/ContextHero.s | 2 +- asm/src/ContextInit.s | 2 +- asm/src/ContextLvMap.s | 2 +- asm/src/ContextMode.s | 2 +- asm/src/ContextOpen.s | 2 +- asm/src/ContextStory.s | 2 +- asm/src/ControlIcon.s | 6 +- asm/src/ControlPanel.s | 8 +- asm/src/Controller.s | 2 +- asm/src/CountDown.s | 6 +- asm/src/Counter.s | 4 +- asm/src/Cry.s | 6 +- asm/src/Culling.s | 4 +- asm/src/Cursor.s | 14 +- asm/src/CursorPanel.s | 4 +- asm/src/Curtain.s | 6 +- asm/src/CurveUtility.s | 4 +- asm/src/Custom.s | 420 +++++++------- asm/src/CustomBase.s | 14 +- asm/src/CustomFactory.s | 12 +- asm/src/CustomFlash.s | 2 +- asm/src/CutIn.s | 14 +- asm/src/CutRopeStep.s | 8 +- asm/src/Cutter.s | 4 +- asm/src/DNOption.s | 2 +- asm/src/DPD.s | 4 +- asm/src/DamageEyeCtrl.s | 2 +- asm/src/DamageFeedback.s | 4 +- asm/src/DamageFieldReact.s | 10 +- asm/src/DamageFlash.s | 16 +- asm/src/DamageInfo.s | 4 +- asm/src/DamageInvincible.s | 4 +- asm/src/DamagePrevent.s | 4 +- asm/src/DarknessAdjust.s | 6 +- asm/src/DarknessLight.s | 8 +- asm/src/DarknessRoot.s | 4 +- asm/src/DataAccessor.s | 4 +- asm/src/DataBlock.s | 2 +- asm/src/DataFile.s | 8 +- asm/src/Dead.s | 4 +- asm/src/DeadFlash.s | 6 +- asm/src/DeadUtil.s | 4 +- asm/src/DebugCamera.s | 4 +- asm/src/DecorationBG.s | 6 +- asm/src/DecorationDataAccessor.s | 2 +- asm/src/DecorationManager.s | 4 +- asm/src/DecorationMapro.s | 6 +- asm/src/DecorationMaproColl.s | 8 +- asm/src/Dedede.s | 8 +- asm/src/Dee.s | 10 +- asm/src/Delete.s | 6 +- asm/src/DeleteConfirm.s | 6 +- asm/src/Demo.s | 6 +- asm/src/DemoAllStageClear.s | 6 +- asm/src/DemoAppearWarpStar.s | 6 +- asm/src/DemoChangeGrade.s | 8 +- asm/src/DemoFirstLvIn.s | 6 +- asm/src/DemoFirstPlay.s | 6 +- asm/src/DemoUnlockMaster.s | 6 +- asm/src/DemoUnlockMasterEx.s | 6 +- asm/src/Desc.s | 8 +- asm/src/Detail.s | 10 +- asm/src/DetailContext.s | 4 +- asm/src/DetectArg.s | 4 +- asm/src/DetectResult.s | 2 +- asm/src/DetectResultContext.s | 4 +- asm/src/Direction3.s | 6 +- asm/src/DisableIcon.s | 6 +- asm/src/DisableIconResource.s | 2 +- asm/src/Door.s | 8 +- asm/src/DoorUnlockStar.s | 8 +- asm/src/DrawInfo.s | 4 +- asm/src/DrawLayerKindUtil.s | 4 +- asm/src/Drawer.s | 6 +- asm/src/DvdControl.s | 6 +- asm/src/DvdWatch.s | 6 +- asm/src/DvdWatch_ENG.s | 6 +- asm/src/Dynamics.s | 8 +- asm/src/EFBToLetterBox.s | 4 +- asm/src/EasyRender3D.s | 6 +- asm/src/EasyTex3D.s | 2 +- asm/src/Effect.s | 16 +- asm/src/EffectComponent.s | 2 +- asm/src/EffectLocatorModelDesc.s | 6 +- asm/src/EffectManager.s | 20 +- asm/src/EffectObjListUtil.s | 2 +- asm/src/EmotionCtrl.s | 6 +- asm/src/Enemy.s | 6 +- asm/src/EnemyCtrl.s | 12 +- asm/src/EnemyDataAccessor.s | 2 +- asm/src/EnemyKiller.s | 4 +- asm/src/EnemyList.s | 2 +- asm/src/EnemyReqBuff.s | 2 +- asm/src/EnemySummonCtrl.s | 6 +- asm/src/Engine.s | 4 +- asm/src/EntryPoint.s | 4 +- asm/src/ExUtil.s | 2 +- asm/src/Exception.s | 8 +- asm/src/Explain.s | 2 +- asm/src/ExplainBase.s | 6 +- asm/src/ExplainButton.s | 6 +- asm/src/ExplainConsole.s | 10 +- asm/src/ExplainCursor.s | 6 +- asm/src/ExplainUtil.s | 8 +- asm/src/Explanation.s | 8 +- asm/src/EyeCtrl.s | 4 +- asm/src/FDGAccessor.s | 20 +- asm/src/FDGManager.s | 10 +- asm/src/FGFade.s | 2 +- asm/src/FaceRotCtrl.s | 6 +- asm/src/Fade.s | 4 +- asm/src/FallLandController.s | 4 +- asm/src/Fighter.s | 12 +- asm/src/File.s | 8 +- asm/src/FileAccessor.s | 2 +- asm/src/FileClearDisableScope.s | 2 +- asm/src/FileLoader.s | 4 +- asm/src/FileManager.s | 2 +- asm/src/FileTree.s | 2 +- asm/src/FixedGridManager.s | 4 +- asm/src/FixedString.s | 2 +- asm/src/Flash.s | 24 +- asm/src/FloaterRotCtrl.s | 4 +- asm/src/FlowSoundCtrl.s | 2 +- asm/src/FogAccessor.s | 4 +- asm/src/Font.s | 2 +- asm/src/FontKindUtil.s | 8 +- asm/src/FontLoader.s | 2 +- asm/src/FontManager.s | 4 +- asm/src/Food.s | 6 +- asm/src/FoodTableKindUtil.s | 4 +- asm/src/FootState.s | 2 +- asm/src/FormationUtil.s | 2 +- asm/src/Frame.s | 12 +- asm/src/FrameControl.s | 2 +- asm/src/FrameCounter.s | 4 +- asm/src/FramePanel.s | 8 +- asm/src/FreeRotController.s | 4 +- asm/src/FreezeHandler.s | 4 +- asm/src/FreezeManager.s | 6 +- asm/src/FreezeThread.s | 8 +- asm/src/FullScreenModel.s | 6 +- asm/src/FullScreenPlate.s | 4 +- asm/src/G3DAnimData.s | 2 +- asm/src/G3DAnimDataRepos.s | 2 +- asm/src/G3DAutoReqAnimCallback.s | 4 +- asm/src/G3DLightSet.s | 2 +- asm/src/G3DLightSetManager.s | 2 +- asm/src/G3DRootSet.s | 14 +- asm/src/GXFifoMemoryManager.s | 2 +- asm/src/GXFifoProtectCanceler.s | 2 +- asm/src/GameCheckWindow.s | 6 +- asm/src/GameScreen.s | 2 +- asm/src/GatherItem.s | 2 +- asm/src/Gear.s | 12 +- asm/src/GearAnim.s | 2 +- asm/src/GearManager.s | 2 +- asm/src/GearModel.s | 4 +- asm/src/GearModelDesc.s | 4 +- asm/src/GearNodeRandomChanger.s | 2 +- asm/src/GenContext.s | 4 +- asm/src/GenContextTable.s | 4 +- asm/src/GeneralDrawer.s | 4 +- asm/src/GenerateFromObj.s | 6 +- asm/src/GenerateUtil.s | 2 +- asm/src/Generator.s | 4 +- asm/src/GetInfo.s | 2 +- asm/src/Ghost.s | 10 +- asm/src/GhostData.s | 2 +- asm/src/GhostFileData.s | 2 +- asm/src/GhostIcon.s | 8 +- asm/src/Gimmick.s | 4 +- asm/src/GimmickDataAccessor.s | 2 +- asm/src/GlobalNewDeleteChanger.s | 2 +- asm/src/Goal.s | 6 +- asm/src/GoalFlag.s | 8 +- asm/src/GridPos.s | 4 +- asm/src/GroundChecker.s | 4 +- asm/src/Group.s | 6 +- asm/src/Guard.s | 10 +- asm/src/GuardFlash.s | 4 +- asm/src/GuideBoard.s | 8 +- asm/src/HEL__Math__Vector2.s | 6 +- asm/src/HEL__Math__Vector3.s | 6 +- asm/src/HID.s | 2 +- asm/src/HIDAccessor.s | 6 +- asm/src/HIDErrorMenu.s | 6 +- asm/src/HIDManager.s | 4 +- asm/src/Hammer.s | 8 +- asm/src/Hang.s | 4 +- asm/src/Hat.s | 8 +- asm/src/HateCtrl.s | 4 +- asm/src/Heap.s | 10 +- asm/src/HeapCompaction.s | 6 +- asm/src/HeapCompactionNode.s | 2 +- asm/src/HeapCompactionNodeHandle.s | 2 +- asm/src/HeapExp.s | 4 +- asm/src/HeapExpArray.s | 4 +- asm/src/HeapExpArrayUser.s | 2 +- asm/src/HeapMapUserRepos.s | 4 +- asm/src/HeapUnit.s | 4 +- asm/src/HelpPushAll.s | 8 +- asm/src/HelpPushUp.s | 8 +- asm/src/HelpShake.s | 8 +- asm/src/Hero.s | 6 +- asm/src/HeroLifeBar.s | 8 +- asm/src/HeroPanel.s | 6 +- asm/src/HeroPanelController.s | 6 +- asm/src/HeroStatus.s | 8 +- asm/src/HeroStatusIcon.s | 6 +- asm/src/HeroStatusIconSyncer.s | 2 +- asm/src/Hid.s | 6 +- asm/src/HidKindUtil.s | 4 +- asm/src/Hit.s | 4 +- asm/src/HitNode.s | 4 +- asm/src/HitPoint.s | 4 +- asm/src/HitResult.s | 2 +- asm/src/HitStop.s | 2 +- asm/src/HitStopCallback.s | 16 +- asm/src/HomeButtonMenu.s | 8 +- asm/src/ISequence.s | 2 +- asm/src/IState.s | 2 +- asm/src/InactiveHero.s | 6 +- asm/src/InactiveStateBase.s | 4 +- asm/src/InactiveStateCallback.s | 4 +- asm/src/IndiviCamera.s | 4 +- asm/src/IndiviCameraManager.s | 2 +- asm/src/IndiviUtil.s | 22 +- asm/src/InertialMove.s | 2 +- asm/src/InfoControl.s | 4 +- asm/src/InfoGameStatus.s | 6 +- asm/src/InfoUtil.s | 4 +- asm/src/Initiative.s | 2 +- asm/src/InitiativeUtil.s | 2 +- asm/src/Input.s | 6 +- asm/src/Intersection.s | 4 +- asm/src/Invincible.s | 14 +- asm/src/InvisibleControl.s | 2 +- asm/src/Item.s | 14 +- asm/src/ItemCatcher.s | 10 +- asm/src/ItemCollReact.s | 6 +- asm/src/ItemDataAccessor.s | 2 +- asm/src/JITParam.s | 2 +- asm/src/KindUtil.s | 8 +- asm/src/Kirby.s | 18 +- asm/src/Kiss.s | 8 +- asm/src/Knockback.s | 4 +- asm/src/LadderInfo.s | 4 +- asm/src/LandAttribute.s | 10 +- asm/src/LandConstraint.s | 4 +- asm/src/LandGatherOption.s | 2 +- asm/src/LandGrid.s | 2 +- asm/src/LandLayer.s | 8 +- asm/src/LandManager.s | 6 +- asm/src/LandProperty.s | 2 +- asm/src/LandSet.s | 2 +- asm/src/Landing.s | 4 +- asm/src/Layout.s | 8 +- asm/src/LayoutContext.s | 2 +- asm/src/LevelKindUtil.s | 2 +- asm/src/LibInitializer.s | 4 +- asm/src/Lifetime.s | 2 +- asm/src/LightSetAccessor.s | 2 +- asm/src/LoadIcon.s | 8 +- asm/src/Loader.s | 4 +- asm/src/Locale.s | 12 +- asm/src/Location.s | 4 +- asm/src/LocationDesc.s | 2 +- asm/src/LogoutController.s | 2 +- asm/src/Lose.s | 6 +- asm/src/LowBattery.s | 6 +- asm/src/LvMap.s | 6 +- asm/src/Mahoroa.s | 22 +- asm/src/Main.s | 56 +- asm/src/MainCamera.s | 4 +- asm/src/Manager.s | 212 +++---- asm/src/ManagerContext.s | 2 +- asm/src/ManagerCreator.s | 4 +- asm/src/ManualData.s | 8 +- asm/src/MapColl.s | 20 +- asm/src/MapCollConstant.s | 2 +- asm/src/MapCollProducer.s | 2 +- asm/src/MapCollResult.s | 2 +- asm/src/MapFile.s | 2 +- asm/src/MaproPos.s | 4 +- asm/src/MaproRect.s | 4 +- asm/src/MasterAttackArea.s | 2 +- asm/src/MasterIcon.s | 8 +- asm/src/MasterMarker.s | 4 +- asm/src/MaterialAccessor.s | 6 +- asm/src/Matrix34.s | 4 +- asm/src/Matrix44.s | 2 +- asm/src/Medal.s | 6 +- asm/src/MemBlock.s | 2 +- asm/src/MemManager.s | 4 +- asm/src/Memory.s | 6 +- asm/src/Menu.s | 8 +- asm/src/MeshFlip.s | 2 +- asm/src/Message.s | 18 +- asm/src/MessageWindow.s | 6 +- asm/src/Meta.s | 8 +- asm/src/MintAbilityManager.s | 2 +- asm/src/MintAnim.s | 4 +- asm/src/MintAttacker.s | 4 +- asm/src/MintBGMController.s | 4 +- asm/src/MintBoss.s | 4 +- asm/src/MintCameraController.s | 4 +- asm/src/MintChallengeDoor.s | 4 +- asm/src/MintClearDanceSync.s | 2 +- asm/src/MintCommander.s | 4 +- asm/src/MintDemo.s | 4 +- asm/src/MintEffect.s | 4 +- asm/src/MintEnemy.s | 4 +- asm/src/MintFloaterRotCtrl.s | 2 +- asm/src/MintFootState.s | 4 +- asm/src/MintGatherItem.s | 2 +- asm/src/MintGear.s | 4 +- asm/src/MintGearAnim.s | 4 +- asm/src/MintHero.s | 4 +- asm/src/MintHid.s | 2 +- asm/src/MintHidRumble.s | 2 +- asm/src/MintInvincible.s | 2 +- asm/src/MintLandAttribute.s | 2 +- asm/src/MintLocation.s | 4 +- asm/src/MintManager.s | 18 +- asm/src/MintMeshFlip.s | 4 +- asm/src/MintModel.s | 8 +- asm/src/MintModelAccessor.s | 4 +- asm/src/MintModelRotCtrl.s | 4 +- asm/src/MintMonitor.s | 4 +- asm/src/MintMove.s | 4 +- asm/src/MintNodeAccessor.s | 4 +- asm/src/MintOCollManager.s | 4 +- asm/src/MintObjColl.s | 6 +- asm/src/MintSERequestor.s | 4 +- asm/src/MintScript.s | 4 +- asm/src/MintScriptData.s | 2 +- asm/src/MintScriptTrigger.s | 4 +- asm/src/MintSetting.s | 6 +- asm/src/MintShake.s | 4 +- asm/src/MintShipEvent.s | 4 +- asm/src/MintSlopeFit.s | 2 +- asm/src/MintSquash.s | 2 +- asm/src/MintStagingCtrl.s | 2 +- asm/src/MintStateChecker.s | 2 +- asm/src/MintSuperBackPicture.s | 4 +- asm/src/MintSuperFade.s | 4 +- asm/src/MintSystemCall.s | 4 +- asm/src/MintTarget.s | 4 +- asm/src/MintUtility.s | 4 +- asm/src/MintZoomQuake.s | 4 +- asm/src/Model.s | 28 +- asm/src/ModelAccessor.s | 2 +- asm/src/ModelAnim.s | 8 +- asm/src/ModelAnimAccessor.s | 4 +- asm/src/ModelAnimContext.s | 2 +- asm/src/ModelBufferOption.s | 2 +- asm/src/ModelContext.s | 2 +- asm/src/ModelDesc.s | 522 +++++++++--------- asm/src/ModelDescUtil.s | 16 +- asm/src/ModelMultiAnim.s | 4 +- asm/src/ModelMultiAnimContext.s | 4 +- asm/src/ModelNode.s | 6 +- asm/src/ModelRotCtrl.s | 4 +- asm/src/ModelTree.s | 2 +- asm/src/Monitor.s | 8 +- asm/src/Monotone.s | 10 +- asm/src/Move.s | 4 +- asm/src/MoveAlgorithmVacuumReceive.s | 6 +- asm/src/MoveCtrl.s | 6 +- asm/src/MoveGrid.s | 2 +- asm/src/MoveGridGroup.s | 10 +- asm/src/MoveGridGroupId.s | 2 +- asm/src/MoveGridManager.s | 8 +- asm/src/MoveGroupAccessor.s | 2 +- asm/src/MoveGroupCtrl.s | 8 +- asm/src/MoveGroupCtrlOrder.s | 2 +- asm/src/MoveLandAttack.s | 8 +- asm/src/MoveLimit.s | 8 +- asm/src/MoveLimitResponseCtrl.s | 4 +- asm/src/MoveParamAccel.s | 4 +- asm/src/MoveParamDecel.s | 4 +- asm/src/MoveParamFall.s | 4 +- asm/src/MovieAudio.s | 2 +- asm/src/MovieButtonContent.s | 6 +- asm/src/MovieCommand.s | 2 +- asm/src/MovieKindUtil.s | 8 +- asm/src/MoviePlayer.s | 6 +- asm/src/MovieThread.s | 4 +- asm/src/MovieWindow.s | 10 +- asm/src/MovieYuv.s | 6 +- asm/src/MusicCheckWindow.s | 6 +- asm/src/Mutex.s | 2 +- asm/src/NANDErrorMenu.s | 6 +- asm/src/NW4RAssert.s | 6 +- asm/src/N_Mint_Cast.s | 6 +- asm/src/N_Mint_Debug.s | 8 +- asm/src/NandManager.s | 2 +- asm/src/NandThread.s | 8 +- asm/src/News.s | 10 +- asm/src/NextArrowPanel.s | 8 +- asm/src/NodeAccessor.s | 2 +- asm/src/NodeAttach.s | 4 +- asm/src/NodeDesc.s | 4 +- asm/src/NodeLocalMtx.s | 4 +- asm/src/NodeLocalMtxAccessor.s | 2 +- asm/src/NodeRepos.s | 2 +- asm/src/Nururi.s | 14 +- asm/src/ObjColl.s | 6 +- asm/src/ObjCollLite.s | 2 +- asm/src/ObjCollReact.s | 30 +- asm/src/ObjInfoImpl.s | 12 +- asm/src/ObjInfoRepos.s | 2 +- asm/src/ObjPlacement.s | 2 +- asm/src/ObjStop.s | 20 +- asm/src/OperatorNewDelete.s | 4 +- asm/src/OrderUtil.s | 6 +- asm/src/Otachidai.s | 8 +- asm/src/Owner.s | 2 +- asm/src/Package.s | 18 +- asm/src/PackageButtonContent.s | 6 +- asm/src/PackageHelp.s | 6 +- asm/src/PackageHelps.s | 6 +- asm/src/PackageWindow.s | 10 +- asm/src/PageAbility.s | 6 +- asm/src/PageCommand.s | 6 +- asm/src/PageCounter.s | 6 +- asm/src/PageDropout.s | 10 +- asm/src/PageManager.s | 10 +- asm/src/PaneAccessor.s | 4 +- asm/src/Param.s | 258 ++++----- asm/src/ParamAccessor.s | 18 +- asm/src/ParamBase.s | 4 +- asm/src/Parasol.s | 12 +- asm/src/PassageTime.s | 6 +- asm/src/Pause.s | 6 +- asm/src/PauseManager.s | 4 +- asm/src/PauseTrigger.s | 2 +- asm/src/PerformanceController.s | 6 +- asm/src/PermEffect.s | 4 +- asm/src/PermSoundSE.s | 2 +- asm/src/Piggyback.s | 8 +- asm/src/Pinch.s | 6 +- asm/src/Player.s | 8 +- asm/src/PlayerEntryInfo.s | 2 +- asm/src/PlayerIcon.s | 6 +- asm/src/PlayerWindow.s | 6 +- asm/src/Point2.s | 6 +- asm/src/PolyEffect.s | 6 +- asm/src/PolyEffectAllocator.s | 2 +- asm/src/PolyEffectManager.s | 2 +- asm/src/PolyEffectMemManager.s | 4 +- asm/src/PolyEffectRes.s | 2 +- asm/src/PosNotifier.s | 6 +- asm/src/PowerCharge.s | 4 +- asm/src/PreLoadManager.s | 2 +- asm/src/PreLoadReq.s | 4 +- asm/src/Print.s | 2 +- asm/src/ProcessSeparator.s | 2 +- asm/src/Product.s | 6 +- asm/src/ProgressCtrl.s | 6 +- asm/src/Project.s | 4 +- asm/src/PtclEffect.s | 2 +- asm/src/PtclEffectManager.s | 4 +- asm/src/PtclEffectMemManager.s | 4 +- asm/src/PtclEffectRes.s | 4 +- asm/src/Quake.s | 4 +- asm/src/QuakeData.s | 4 +- asm/src/QuakePiece.s | 2 +- asm/src/Radar.s | 8 +- asm/src/RadarIcon.s | 4 +- asm/src/Random.s | 6 +- asm/src/RankItem.s | 2 +- asm/src/Ranking.s | 6 +- asm/src/RankingPanel.s | 6 +- asm/src/RayChecker.s | 4 +- asm/src/ReceiverBase.s | 4 +- asm/src/Rect.s | 4 +- asm/src/Regset.s | 8 +- asm/src/RenderSetting.s | 4 +- asm/src/ReqHandle.s | 2 +- asm/src/RequestArg.s | 2 +- asm/src/RequestArgOption.s | 4 +- asm/src/Requestor.s | 8 +- asm/src/ResFile.s | 4 +- asm/src/ResFileAccessor.s | 4 +- asm/src/ResFileRepository.s | 2 +- asm/src/ResModel.s | 2 +- asm/src/ResModelContext.s | 4 +- asm/src/ResNode.s | 6 +- asm/src/Reset.s | 6 +- asm/src/ResidentFile.s | 6 +- asm/src/Resource.s | 2 +- asm/src/ResourceFileName.s | 8 +- asm/src/Result.s | 16 +- asm/src/ResultLyt.s | 8 +- asm/src/ResultSetter.s | 2 +- asm/src/ReverseWorld.s | 4 +- asm/src/RomFontWrapper.s | 2 +- asm/src/RoofChecker.s | 4 +- asm/src/RoomGuarder.s | 8 +- asm/src/RoomGuarderMarker.s | 2 +- asm/src/Root.s | 4 +- asm/src/RootContext.s | 2 +- asm/src/RotAnim.s | 4 +- asm/src/RotController.s | 4 +- asm/src/RotControllerData.s | 4 +- asm/src/RotCtrl.s | 6 +- asm/src/Rumble.s | 6 +- asm/src/RumbleManager.s | 2 +- asm/src/RumbleRequestor.s | 2 +- asm/src/RumbleResource.s | 10 +- asm/src/RumbleSetting.s | 6 +- asm/src/RunChecker.s | 2 +- asm/src/Runner.s | 8 +- asm/src/SCWaftCtrl.s | 4 +- asm/src/SDKAllocator.s | 4 +- asm/src/SERequestor.s | 4 +- asm/src/SIntAABBox.s | 2 +- asm/src/SaveInfo.s | 6 +- asm/src/SceneAnim.s | 8 +- asm/src/SceneAnime.s | 4 +- asm/src/SceneChallengeFileSelect.s | 10 +- asm/src/SceneChallengeResult.s | 8 +- asm/src/SceneChallengeTitle.s | 4 +- asm/src/SceneChallengeTutorial.s | 6 +- asm/src/SceneChanger.s | 2 +- asm/src/SceneComic.s | 4 +- asm/src/SceneGrandMenu.s | 4 +- asm/src/SceneGrandTitle.s | 4 +- asm/src/SceneHistory.s | 4 +- asm/src/SceneInit.s | 8 +- asm/src/ScenePackageList.s | 4 +- asm/src/SceneStaffCredit.s | 4 +- asm/src/SceneStep.s | 4 +- asm/src/SceneStrap.s | 8 +- asm/src/SceneVC.s | 4 +- asm/src/Scn__ChallengeTitle__Chara.s | 8 +- asm/src/Scn__ChallengeTitle__Commander.s | 4 +- asm/src/Scn__GrandTitle__Block.s | 6 +- asm/src/Scn__GrandTitle__Chara.s | 8 +- asm/src/Scn__GrandTitle__Commander.s | 4 +- asm/src/Score.s | 10 +- asm/src/ScoreCoin.s | 6 +- asm/src/ScoreInfo.s | 4 +- asm/src/ScoreLine.s | 6 +- asm/src/ScreenFade.s | 2 +- asm/src/ScreenRemap.s | 4 +- asm/src/Script.s | 6 +- asm/src/ScriptArchive.s | 14 +- asm/src/ScriptCallback.s | 12 +- asm/src/ScriptTrigger.s | 2 +- asm/src/Scroll.s | 6 +- asm/src/SearchAttack.s | 4 +- asm/src/SearchAttackNode.s | 4 +- asm/src/SearchAttackResult.s | 4 +- asm/src/SearchHit.s | 4 +- asm/src/SearchHitNode.s | 4 +- asm/src/SearchHitResult.s | 2 +- asm/src/SelectButtonContent.s | 6 +- asm/src/Sequence.s | 4 +- asm/src/SequenceChallengeRoot.s | 4 +- asm/src/SequenceChallengeTitleRoot.s | 4 +- asm/src/SequenceFirstDemo.s | 4 +- asm/src/SequenceGrandMenu.s | 4 +- asm/src/SequenceHistory.s | 4 +- asm/src/SequenceLvMapRoot.s | 4 +- asm/src/SequenceProductRoot.s | 4 +- asm/src/SequenceRoot.s | 4 +- asm/src/SequenceStack.s | 2 +- asm/src/SequenceStaffCredit.s | 4 +- asm/src/SequenceStep.s | 6 +- asm/src/SequenceVC.s | 4 +- asm/src/Shadow.s | 28 +- asm/src/ShadowRoot.s | 2 +- asm/src/ShadowSphere.s | 8 +- asm/src/Shake.s | 6 +- asm/src/ShakeCharge.s | 4 +- asm/src/Shape.s | 4 +- asm/src/ShapeDiamondContext.s | 4 +- asm/src/ShareData.s | 2 +- asm/src/Ship.s | 6 +- asm/src/ShipEvent.s | 10 +- asm/src/Shooting.s | 4 +- asm/src/ShuffleManager.s | 8 +- asm/src/Shutter.s | 10 +- asm/src/SimpleGCHID.s | 2 +- asm/src/SimpleWRHID.s | 2 +- asm/src/Skip.s | 6 +- asm/src/SkipHelp.s | 8 +- asm/src/SlopeFit.s | 4 +- asm/src/Smash.s | 6 +- asm/src/SoundManager.s | 6 +- asm/src/SoundSE.s | 10 +- asm/src/SoundSystem.s | 2 +- asm/src/Spark.s | 12 +- asm/src/SphereComplete.s | 8 +- asm/src/SpiralScreen.s | 6 +- asm/src/Spotlight.s | 10 +- asm/src/Squash.s | 4 +- asm/src/StaffCredit.s | 6 +- asm/src/StaffCreditCtrl.s | 4 +- asm/src/StaffRoll.s | 10 +- asm/src/Stage.s | 8 +- asm/src/StageParts.s | 8 +- asm/src/StagingCtrl.s | 8 +- asm/src/Stake.s | 8 +- asm/src/Start.s | 6 +- asm/src/StateAbilityCrash.s | 6 +- asm/src/StateAgony.s | 6 +- asm/src/StateAim.s | 12 +- asm/src/StateAirJump.s | 6 +- asm/src/StateAirSpin.s | 6 +- asm/src/StateAllStageClear.s | 4 +- asm/src/StateAngerChase.s | 6 +- asm/src/StateAnyWhereIn.s | 8 +- asm/src/StateAppear.s | 24 +- asm/src/StateApproach.s | 6 +- asm/src/StateAreaMapDemoFirstPlay.s | 4 +- asm/src/StateAttack.s | 144 ++--- asm/src/StateAttack1Way.s | 6 +- asm/src/StateAttack3Way.s | 6 +- asm/src/StateAttackBreath.s | 4 +- asm/src/StateAttackDesc.s | 2 +- asm/src/StateAttackEnd.s | 4 +- asm/src/StateAttackJoint.s | 4 +- asm/src/StateAttackOver.s | 6 +- asm/src/StateAttackOverEnd.s | 4 +- asm/src/StateAttackShot.s | 6 +- asm/src/StateAttackUnder.s | 6 +- asm/src/StateAttackUnderEnd.s | 4 +- asm/src/StateBack.s | 12 +- asm/src/StateBackCircle.s | 6 +- asm/src/StateBase.s | 20 +- asm/src/StateBodyHit.s | 6 +- asm/src/StateBomb.s | 4 +- asm/src/StateBombStart.s | 4 +- asm/src/StateBossDemoGrandLowper.s | 2 +- asm/src/StateBossDemoStart.s | 4 +- asm/src/StateBossDemoWait.s | 6 +- asm/src/StateBound.s | 12 +- asm/src/StateBound1.s | 6 +- asm/src/StateBound2.s | 6 +- asm/src/StateBoundNear.s | 6 +- asm/src/StateCall.s | 6 +- asm/src/StateCallback.s | 20 +- asm/src/StateCapture.s | 8 +- asm/src/StateCaptureAttack.s | 4 +- asm/src/StateCapturedFighter.s | 8 +- asm/src/StateCapturedParasol.s | 6 +- asm/src/StateCapturedWaterGalborosEat.s | 6 +- asm/src/StateCapturedWaterGalborosVomit.s | 6 +- asm/src/StateCapturedWhip.s | 6 +- asm/src/StateCapturedWhispyChewing.s | 4 +- asm/src/StateCapturedWhispyRelease.s | 4 +- asm/src/StateCapturedWhispyVacuum.s | 6 +- asm/src/StateCapturedWhispyVomit.s | 4 +- asm/src/StateCapturedWhispyVomitBound.s | 6 +- asm/src/StateCapturedWhispyVomitSoft.s | 6 +- asm/src/StateCatch.s | 14 +- asm/src/StateChallengeBattleLose.s | 6 +- asm/src/StateChallengeBattleWin.s | 6 +- asm/src/StateChallengeBattleWinPre.s | 8 +- asm/src/StateChallengeConfirm.s | 4 +- asm/src/StateChallengeIn.s | 6 +- asm/src/StateChange.s | 6 +- asm/src/StateChangeGrade.s | 4 +- asm/src/StateChanger.s | 4 +- asm/src/StateCharge.s | 6 +- asm/src/StateChargeAttack.s | 6 +- asm/src/StateChargeAttackStart.s | 4 +- asm/src/StateChase.s | 42 +- asm/src/StateChecker.s | 6 +- asm/src/StateChewing.s | 4 +- asm/src/StateCircle.s | 6 +- asm/src/StateClearDance.s | 6 +- asm/src/StateClearDanceFall.s | 4 +- asm/src/StateClearDancePre.s | 4 +- asm/src/StateClearDanceWalk.s | 6 +- asm/src/StateCliffAttack.s | 6 +- asm/src/StateCliffJump.s | 4 +- asm/src/StateCombinationAttack.s | 6 +- asm/src/StateCopy.s | 6 +- asm/src/StateCopyPre.s | 4 +- asm/src/StateCreditMove.s | 6 +- asm/src/StateCreditWalk.s | 12 +- asm/src/StateCutFall.s | 6 +- asm/src/StateCutLanding.s | 6 +- asm/src/StateDamage.s | 4 +- asm/src/StateDamageCapture.s | 6 +- asm/src/StateDamageExtreme.s | 6 +- asm/src/StateDamageL.s | 4 +- asm/src/StateDamageNormal.s | 6 +- asm/src/StateDamageWingToss.s | 6 +- asm/src/StateDash.s | 20 +- asm/src/StateDashAttack.s | 6 +- asm/src/StateDashAttackWallHit.s | 6 +- asm/src/StateDashDesc.s | 2 +- asm/src/StateDashEnd.s | 4 +- asm/src/StateDashWallHit.s | 10 +- asm/src/StateDead.s | 20 +- asm/src/StateDeadCaptureRelease.s | 6 +- asm/src/StateDeadExtreme.s | 6 +- asm/src/StateDeadInWater.s | 8 +- asm/src/StateDeadSuper.s | 6 +- asm/src/StateDemo.s | 4 +- asm/src/StateDive.s | 12 +- asm/src/StateDiveAttack.s | 6 +- asm/src/StateDiveWait.s | 4 +- asm/src/StateDoubleAttack.s | 6 +- asm/src/StateDoubleKick.s | 6 +- asm/src/StateDrink.s | 6 +- asm/src/StateEat.s | 4 +- asm/src/StateEaten.s | 6 +- asm/src/StateEnd.s | 6 +- asm/src/StateEndure.s | 4 +- asm/src/StateEnterChallengeDoor.s | 6 +- asm/src/StateEnterChallengeDoorPre.s | 6 +- asm/src/StateEnterDoor.s | 6 +- asm/src/StateEnterMahoroa.s | 8 +- asm/src/StateEscape.s | 10 +- asm/src/StateExplosion.s | 32 +- asm/src/StateExtreme.s | 6 +- asm/src/StateFaceChange.s | 4 +- asm/src/StateFaint.s | 4 +- asm/src/StateFall.s | 88 +-- asm/src/StateFallEnemy.s | 4 +- asm/src/StateFallFeathery.s | 4 +- asm/src/StateFallNoDecel.s | 6 +- asm/src/StateFallScrewStart.s | 4 +- asm/src/StateFattyBufferAppearFall.s | 6 +- asm/src/StateFattyBufferEscapeNear.s | 6 +- asm/src/StateFinalCutterDrop.s | 4 +- asm/src/StateFinalCutterLanding.s | 6 +- asm/src/StateFinalCutterPre.s | 4 +- asm/src/StateFinalCutterRise.s | 6 +- asm/src/StateFireBlock.s | 6 +- asm/src/StateFireLv2.s | 6 +- asm/src/StateFireLv3.s | 6 +- asm/src/StateFirst.s | 4 +- asm/src/StateFirstDemo.s | 6 +- asm/src/StateFirstMotion.s | 4 +- asm/src/StateFirstMotionDash.s | 4 +- asm/src/StateFixed.s | 4 +- asm/src/StateFlight.s | 4 +- asm/src/StateFlightFar.s | 6 +- asm/src/StateFlush.s | 6 +- asm/src/StateFlushWait.s | 6 +- asm/src/StateFly.s | 46 +- asm/src/StateFlyAround.s | 12 +- asm/src/StateFlyAway.s | 8 +- asm/src/StateFlyFarSinCurve.s | 6 +- asm/src/StateFlyPursuit.s | 6 +- asm/src/StateFlySinCurve.s | 12 +- asm/src/StateFlyStraight.s | 12 +- asm/src/StateFlyUpDown.s | 12 +- asm/src/StateFlyWait.s | 4 +- asm/src/StateFlyWaitFix.s | 6 +- asm/src/StateFlyWall.s | 6 +- asm/src/StateFlyWallStart.s | 4 +- asm/src/StateFlyingOut.s | 6 +- asm/src/StateFollow.s | 6 +- asm/src/StateFootSweep.s | 6 +- asm/src/StateFootSweepEnd.s | 4 +- asm/src/StateGather.s | 6 +- asm/src/StateGetShipParts.s | 6 +- asm/src/StateGlide.s | 14 +- asm/src/StateGlideAway.s | 6 +- asm/src/StateGoodbye.s | 4 +- asm/src/StateGrandLowperAppear.s | 54 +- asm/src/StateGrandLowperEscape.s | 28 +- asm/src/StateGrandLowperEscapeStart.s | 28 +- asm/src/StateGrandLowperLanding.s | 4 +- asm/src/StateGroundAttack.s | 4 +- asm/src/StateGrow.s | 8 +- asm/src/StateGuard.s | 14 +- asm/src/StateHadou.s | 6 +- asm/src/StateHammerAirSpin.s | 4 +- asm/src/StateHammerStrongSwing.s | 4 +- asm/src/StateHang.s | 12 +- asm/src/StateHeightAdjust.s | 6 +- asm/src/StateHide.s | 16 +- asm/src/StateHover.s | 12 +- asm/src/StateHoverFar.s | 6 +- asm/src/StateHoverLanding.s | 4 +- asm/src/StateIdling.s | 6 +- asm/src/StateInit.s | 10 +- asm/src/StateItemGet.s | 4 +- asm/src/StateJump.s | 84 +-- asm/src/StateJumpAttack.s | 20 +- asm/src/StateJumpAttackDesc.s | 2 +- asm/src/StateJumpAttackStart.s | 10 +- asm/src/StateJumpBig.s | 6 +- asm/src/StateJumpBigStart.s | 4 +- asm/src/StateJumpCenterAttack.s | 6 +- asm/src/StateJumpDesc.s | 2 +- asm/src/StateJumpHold.s | 6 +- asm/src/StateJumpMachinegun.s | 6 +- asm/src/StateJumpMachinegunStart.s | 4 +- asm/src/StateJumpStart.s | 22 +- asm/src/StateKiss.s | 6 +- asm/src/StateKissReceive.s | 6 +- asm/src/StateLadder.s | 6 +- asm/src/StateLanding.s | 60 +- asm/src/StateLaugh.s | 4 +- asm/src/StateLeaveChallengeDoor.s | 6 +- asm/src/StateLeaveLvMapDoor.s | 6 +- asm/src/StateLeaveMahoroa.s | 6 +- asm/src/StateLeaveSubgameDoor.s | 6 +- asm/src/StateLink.s | 6 +- asm/src/StateLogout.s | 4 +- asm/src/StateLookAround.s | 4 +- asm/src/StateLookBoss.s | 6 +- asm/src/StateLose.s | 4 +- asm/src/StateLoseFly.s | 10 +- asm/src/StateLostHat.s | 4 +- asm/src/StateMain.s | 186 +++---- asm/src/StateMasterSummon.s | 6 +- asm/src/StateMasterSummonWait.s | 4 +- asm/src/StateMix.s | 4 +- asm/src/StateMixPre.s | 4 +- asm/src/StateMoonSault.s | 4 +- asm/src/StateMove.s | 70 +-- asm/src/StateMoveAround.s | 6 +- asm/src/StateMoveBack.s | 4 +- asm/src/StateMoveCircle.s | 6 +- asm/src/StateMoveForward.s | 10 +- asm/src/StateMoveJoint.s | 4 +- asm/src/StateMoveSinCurve.s | 6 +- asm/src/StateMoveStraight.s | 6 +- asm/src/StateMoveThunder.s | 6 +- asm/src/StateMoveThunderStart.s | 6 +- asm/src/StateMoveToOtherSide.s | 8 +- asm/src/StateNormal.s | 6 +- asm/src/StateNoseDive.s | 12 +- asm/src/StatePanic.s | 4 +- asm/src/StateParasolCapture.s | 8 +- asm/src/StateParasolDive.s | 6 +- asm/src/StateParasolDrill.s | 6 +- asm/src/StateParasolDrillEnd.s | 4 +- asm/src/StateParasolFall.s | 12 +- asm/src/StateParasolParachute.s | 6 +- asm/src/StateParasolParachuteFall.s | 6 +- asm/src/StateParasolRelease.s | 6 +- asm/src/StateParasolShield.s | 4 +- asm/src/StateParasolSwing.s | 6 +- asm/src/StateParasolUnder.s | 4 +- asm/src/StateParasolWaterDive.s | 6 +- asm/src/StateParasolWaterDrill.s | 6 +- asm/src/StateParasolWaterDrillEnd.s | 4 +- asm/src/StatePick.s | 6 +- asm/src/StatePiggyback.s | 6 +- asm/src/StatePlancher.s | 6 +- asm/src/StatePlancherBound.s | 6 +- asm/src/StatePlancherHit.s | 6 +- asm/src/StatePlancherLanding.s | 6 +- asm/src/StatePraise.s | 28 +- asm/src/StatePreciousAppear.s | 6 +- asm/src/StatePressFall.s | 6 +- asm/src/StatePressFallStart.s | 6 +- asm/src/StatePressJump.s | 6 +- asm/src/StatePressJumpStart.s | 4 +- asm/src/StatePuff.s | 6 +- asm/src/StatePursuit.s | 12 +- asm/src/StateQuivery.s | 6 +- asm/src/StateRainBomb.s | 6 +- asm/src/StateRainBombStart.s | 6 +- asm/src/StateReady.s | 6 +- asm/src/StateReflect.s | 12 +- asm/src/StateReturnWarpLowper.s | 6 +- asm/src/StateRise.s | 6 +- asm/src/StateRising.s | 12 +- asm/src/StateRoah.s | 6 +- asm/src/StateRollJump.s | 6 +- asm/src/StateRolling.s | 6 +- asm/src/StateRollingEnd.s | 4 +- asm/src/StateRollingStart.s | 6 +- asm/src/StateRoomGuarderAppear.s | 6 +- asm/src/StateRootAttack.s | 6 +- asm/src/StateRun.s | 10 +- asm/src/StateRunAppear.s | 6 +- asm/src/StateSCFlyAway.s | 8 +- asm/src/StateSCHide.s | 4 +- asm/src/StateSCLookFar.s | 4 +- asm/src/StateSCLookKirby.s | 8 +- asm/src/StateSCPursuit.s | 6 +- asm/src/StateSelect.s | 4 +- asm/src/StateShipRepairDemo.s | 6 +- asm/src/StateShipRepairDemoAfter.s | 6 +- asm/src/StateShipRepairDemoAfterFollow.s | 8 +- asm/src/StateShipRepairDemoFollow.s | 8 +- asm/src/StateShot.s | 56 +- asm/src/StateShotAirBall.s | 10 +- asm/src/StateShotAirBallBase.s | 4 +- asm/src/StateShotAirBallBig.s | 4 +- asm/src/StateShotAirBallTornado.s | 6 +- asm/src/StateShuttleLoop.s | 12 +- asm/src/StateShuttleLoopEnd.s | 4 +- asm/src/StateSkinned.s | 4 +- asm/src/StateSkyKick.s | 4 +- asm/src/StateSkyKickHit.s | 6 +- asm/src/StateSlant.s | 6 +- asm/src/StateSliding.s | 6 +- asm/src/StateSlidingHit.s | 6 +- asm/src/StateSlip.s | 6 +- asm/src/StateSlope.s | 6 +- asm/src/StateSmash.s | 6 +- asm/src/StateSmashKick.s | 4 +- asm/src/StateSmashKickCharge.s | 4 +- asm/src/StateSmashed.s | 12 +- asm/src/StateSmashedEnd.s | 12 +- asm/src/StateSpaceJump.s | 6 +- asm/src/StateSparkLv1.s | 6 +- asm/src/StateSparkLv2.s | 6 +- asm/src/StateSparkLv3.s | 6 +- asm/src/StateSpin.s | 12 +- asm/src/StateSpinKick.s | 4 +- asm/src/StateSpine.s | 6 +- asm/src/StateSquashRoof.s | 6 +- asm/src/StateSquashWall.s | 6 +- asm/src/StateSquat.s | 6 +- asm/src/StateStamp.s | 4 +- asm/src/StateStampHit.s | 6 +- asm/src/StateStartJump.s | 4 +- asm/src/StateStartWait.s | 4 +- asm/src/StateStay.s | 10 +- asm/src/StateStepBack.s | 4 +- asm/src/StateStickObj.s | 8 +- asm/src/StateStickWall.s | 12 +- asm/src/StateStop.s | 6 +- asm/src/StateStopAir.s | 6 +- asm/src/StateStraight.s | 6 +- asm/src/StateSummon.s | 4 +- asm/src/StateSuperAppear.s | 6 +- asm/src/StateSuperAppearPre.s | 4 +- asm/src/StateSuperFirst.s | 6 +- asm/src/StateSuperJump.s | 6 +- asm/src/StateSuperTeamAttack.s | 6 +- asm/src/StateSwim.s | 6 +- asm/src/StateSwing.s | 4 +- asm/src/StateSwingEnd.s | 4 +- asm/src/StateSwingPursuit.s | 6 +- asm/src/StateSwordAirSpin.s | 4 +- asm/src/StateSwordAttack.s | 6 +- asm/src/StateSwordAttackFinish.s | 4 +- asm/src/StateSwordCharge.s | 4 +- asm/src/StateSwordChargeStart.s | 4 +- asm/src/StateSwordChopping.s | 4 +- asm/src/StateSwordChoppingHit.s | 6 +- asm/src/StateSwordFloatSpin.s | 6 +- asm/src/StateSwordMeteor.s | 4 +- asm/src/StateSwordMeteorLanding.s | 4 +- asm/src/StateSwordMince.s | 4 +- asm/src/StateSwordRaising.s | 6 +- asm/src/StateSwordRaisingEnd.s | 4 +- asm/src/StateSwordSpin.s | 4 +- asm/src/StateSwordThrust.s | 6 +- asm/src/StateSwordThrustEnd.s | 4 +- asm/src/StateSwordUnderThrust.s | 6 +- asm/src/StateSwordUnderThrustLanding.s | 4 +- asm/src/StateSwordUnderThrustStart.s | 4 +- asm/src/StateSwordWaterSpin.s | 4 +- asm/src/StateTakeOff.s | 6 +- asm/src/StateTeleport.s | 6 +- asm/src/StateThrow.s | 22 +- asm/src/StateThrownFighter.s | 6 +- asm/src/StateThunder.s | 4 +- asm/src/StateThunderStart.s | 6 +- asm/src/StateTornadoChase.s | 6 +- asm/src/StateTornadoRise.s | 6 +- asm/src/StateToss.s | 6 +- asm/src/StateUnderAttack.s | 6 +- asm/src/StateUnderAttackLanding.s | 8 +- asm/src/StateUnlockLvMapDoor.s | 4 +- asm/src/StateVacuum.s | 10 +- asm/src/StateVacuumEnd.s | 8 +- asm/src/StateVacuumReceive.s | 28 +- asm/src/StateVacuumStart.s | 4 +- asm/src/StateVanish.s | 12 +- asm/src/StateVomit.s | 12 +- asm/src/StateVomited.s | 6 +- asm/src/StateVulcan.s | 14 +- asm/src/StateVulcanEnd.s | 8 +- asm/src/StateWaft.s | 6 +- asm/src/StateWait.s | 84 +-- asm/src/StateWaitFar.s | 4 +- asm/src/StateWakeUp.s | 4 +- asm/src/StateWalk.s | 50 +- asm/src/StateWalkAround.s | 24 +- asm/src/StateWalkEnd.s | 6 +- asm/src/StateWalkStart.s | 6 +- asm/src/StateWalkStepBack.s | 6 +- asm/src/StateWalkStraight.s | 24 +- asm/src/StateWall.s | 6 +- asm/src/StateWallAttack.s | 6 +- asm/src/StateWarp.s | 6 +- asm/src/StateWarpStar.s | 4 +- asm/src/StateWarpStarFall.s | 8 +- asm/src/StateWarpStarIn.s | 10 +- asm/src/StateWaterFloat.s | 4 +- asm/src/StateWaterPistol.s | 6 +- asm/src/StateWaterPistolFloat.s | 6 +- asm/src/StateWaterWait.s | 4 +- asm/src/StateWaterWalk.s | 4 +- asm/src/StateWhipAttack.s | 4 +- asm/src/StateWhipAttackAir.s | 4 +- asm/src/StateWhipAttackUp.s | 4 +- asm/src/StateWhipCapture.s | 4 +- asm/src/StateWhipCaptureUp.s | 4 +- asm/src/StateWhipCatch.s | 6 +- asm/src/StateWhipCharge.s | 4 +- asm/src/StateWhipDrill.s | 4 +- asm/src/StateWhipGazerSpiral.s | 6 +- asm/src/StateWhipRush.s | 4 +- asm/src/StateWhipSlamBack.s | 4 +- asm/src/StateWhipSlamDown.s | 4 +- asm/src/StateWhipSlamFront.s | 4 +- asm/src/StateWhipSlamUp.s | 4 +- asm/src/StateWhispyAppear.s | 26 +- asm/src/StateWhispyFall.s | 6 +- asm/src/StateWhispyLanding.s | 4 +- asm/src/StateWin.s | 4 +- asm/src/StateWinFly.s | 6 +- asm/src/StateWorrisome.s | 6 +- asm/src/StdModel.s | 2 +- asm/src/StdRequestor.s | 2 +- asm/src/StdResponder.s | 4 +- asm/src/StepMain.s | 6 +- asm/src/StepMoveInfo.s | 2 +- asm/src/StepReleaseUtil.s | 2 +- asm/src/Stepping.s | 6 +- asm/src/Stick.s | 4 +- asm/src/StickObjAlgorithm.s | 4 +- asm/src/StickWallAlgorithm.s | 4 +- asm/src/Stone.s | 6 +- asm/src/Stop.s | 8 +- asm/src/StorageAccessor2.s | 2 +- asm/src/StorageData.s | 2 +- asm/src/StorageManager.s | 4 +- asm/src/StorageUtil.s | 4 +- asm/src/StoryModeUtil.s | 2 +- asm/src/SubAnimControl.s | 6 +- asm/src/SuperBackPicture.s | 8 +- asm/src/SuperFade.s | 4 +- asm/src/SuperStop.s | 20 +- asm/src/Switch.s | 8 +- asm/src/SwitchOnce.s | 6 +- asm/src/SwitchReceiver.s | 4 +- asm/src/SwitchReceiverManager.s | 2 +- asm/src/SwitchReturn.s | 6 +- asm/src/SwitchToggle.s | 6 +- asm/src/Sword.s | 14 +- asm/src/System.s | 2 +- asm/src/SystemSERequestor.s | 2 +- asm/src/SystemTagProcessor.s | 6 +- asm/src/TPL.s | 2 +- asm/src/TPLTexture.s | 4 +- asm/src/TPLTexturePlate.s | 4 +- asm/src/TSCtrl.s | 6 +- asm/src/Table.s | 58 +- asm/src/TagProcessor.s | 4 +- asm/src/TagUtil.s | 4 +- asm/src/TalkManager.s | 6 +- asm/src/Target.s | 4 +- asm/src/TargetDesc.s | 2 +- asm/src/TargetScorePanel.s | 8 +- asm/src/TexBuffer.s | 2 +- asm/src/Text.s | 8 +- asm/src/Thread.s | 2 +- asm/src/ThreadCtrl.s | 4 +- asm/src/Ticker.s | 4 +- asm/src/TickerContext.s | 4 +- asm/src/Time.s | 6 +- asm/src/TimeString.s | 6 +- asm/src/TimeUp.s | 6 +- asm/src/TitleInfo.s | 16 +- asm/src/TotalScore.s | 22 +- asm/src/TotalScorePanel.s | 8 +- asm/src/Trophy.s | 12 +- asm/src/Tutorial.s | 8 +- asm/src/UIntAABBox.s | 4 +- asm/src/UnitHeapMapUser.s | 6 +- asm/src/Updater.s | 2 +- asm/src/UserTagProcessor.s | 8 +- asm/src/Util.s | 18 +- asm/src/Utility.s | 92 +-- asm/src/VISetting.s | 8 +- asm/src/VMCore.s | 6 +- asm/src/VMFunction.s | 4 +- asm/src/VMFunctionList.s | 4 +- asm/src/VMModule.s | 4 +- asm/src/VMObjectType.s | 4 +- asm/src/VMObjectTypeList.s | 4 +- asm/src/VMSymbolTable.s | 4 +- asm/src/VMVariable.s | 2 +- asm/src/VMVariableList.s | 2 +- asm/src/VacuumAttackerCallback.s | 8 +- asm/src/VacuumReceiver.s | 28 +- asm/src/VacuumSoundCtrl.s | 6 +- asm/src/VariationDemo.s | 10 +- asm/src/VariationDownside.s | 6 +- asm/src/VariationLoose.s | 8 +- asm/src/VariationMove.s | 4 +- asm/src/VariationNpc.s | 6 +- asm/src/VariationPerm.s | 6 +- asm/src/VariationShooting.s | 6 +- asm/src/VariationSphere.s | 6 +- asm/src/VariationStill.s | 6 +- asm/src/VariationUpside.s | 6 +- asm/src/Vector2.s | 6 +- asm/src/Vector3.s | 6 +- asm/src/VolatileData2.s | 4 +- asm/src/Warp.s | 4 +- asm/src/WarpStar.s | 8 +- asm/src/WarpStarPanel.s | 8 +- asm/src/Water.s | 12 +- asm/src/WaterCallback.s | 4 +- asm/src/WaterFlow.s | 10 +- asm/src/WaveHandle.s | 6 +- asm/src/WeakPointCtrl.s | 4 +- asm/src/Weapon.s | 6 +- asm/src/WeaponCtrl.s | 2 +- asm/src/WearBack.s | 4 +- asm/src/Whip.s | 12 +- asm/src/WhispyAppleUtility.s | 2 +- asm/src/WiiButton.s | 6 +- asm/src/WindCtrl.s | 6 +- asm/src/WindowPanel.s | 6 +- asm/src/Wing.s | 12 +- asm/src/Wipe.s | 12 +- asm/src/WorldCage.s | 4 +- asm/src/XFBManager.s | 2 +- asm/src/XFBRestore.s | 2 +- asm/src/Year.s | 4 +- asm/src/ZNururi.s | 6 +- asm/src/ZoneSwitch.s | 2 +- asm/src/ZoomController.s | 4 +- asm/src/ZoomControllerData.s | 4 +- asm/src/ZoomQuake.s | 6 +- asm/tpl/TPL.s | 8 +- asm/usb/usb.s | 6 +- asm/vi/i2c.s | 4 +- asm/vi/vi.s | 6 +- asm/vi/vi3in1.s | 6 +- asm/wenc/wenc.s | 6 +- asm/wpad/WPAD.s | 10 +- asm/wpad/WPADEncrypt.s | 4 +- asm/wpad/WPADHIDParser.s | 8 +- asm/wpad/WPADMem.s | 2 +- asm/wpad/WUD.s | 8 +- asm/wpad/WUDHidHost.s | 4 +- asm/wpad/lint.s | 2 +- deincbin-in-place.sh | 7 + deincbin.py | 134 +++++ ldscript.lcf | 20 +- ldscript.ld | 40 +- macros.inc | 20 +- 1969 files changed, 7099 insertions(+), 6958 deletions(-) create mode 100755 deincbin-in-place.sh create mode 100755 deincbin.py diff --git a/asm/Linker/Generated/Symbol/File.s b/asm/Linker/Generated/Symbol/File.s index 0e67aefd..5b32fc0d 100644 --- a/asm/Linker/Generated/Symbol/File.s +++ b/asm/Linker/Generated/Symbol/File.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text0, "ax" # 0x80004000 - 0x80006740 +.section .init, "ax" # 0x80004000 - 0x80006740 .global _rom_copy_info _rom_copy_info: /* 80006684 00002784 80 00 40 00 */ lwz r0, 0x4000(0) @@ -54,17 +54,17 @@ _bss_init_info: /* 80006738 00002838 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8000673C 0000283C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data1, "wa" # 0x800068E0 - 0x80006A00 +.section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global _eti_init_info _eti_init_info: .incbin "baserom.dol", 0x402324, 0x3C -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .global _ctors$99 _ctors$99: .incbin "baserom.dol", 0x40262C, 0x14 -.section .data3, "wa" # 0x80406540 - 0x80406560 +.section .dtors, "wa" # 0x80406540 - 0x80406560 .global _dtors$99 _dtors$99: .incbin "baserom.dol", 0x402648, 0x18 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" index 74841b58..cd194877 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\ios.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global get_deleter__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1CFRCQ23std9type_info get_deleter__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1CFRCQ23std9type_info: /* 8001488C 000106CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -63,7 +63,7 @@ lbl_80014924: __dt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1Fv: /* 80014940 00010780 4B FF 22 90 */ b __dt__Q23std9exceptionFv -.section .data0, "wa" # 0x80006740 - 0x800068E0 +.section extab, "wa" # 0x80006740 - 0x800068E0 .global $$210911 $$210911: .incbin "baserom.dol", 0x402154, 0x8 @@ -71,7 +71,7 @@ $$210911: $$210953: .incbin "baserom.dol", 0x40215C, 0x8 -.section .data1, "wa" # 0x800068E0 - 0x80006A00 +.section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$210912 $$210912: .incbin "baserom.dol", 0x4022C4, 0xC @@ -79,7 +79,7 @@ $$210912: $$210954: .incbin "baserom.dol", 0x4022D0, 0xC -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29022 $$29022: .incbin "baserom.dol", 0x4036B8, 0x50 @@ -90,7 +90,7 @@ $$29050: $$29165: .incbin "baserom.dol", 0x403734, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1 __vt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1: .incbin "baserom.dol", 0x41DB28, 0x14 @@ -98,7 +98,7 @@ __vt__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$ $$29023: .incbin "baserom.dol", 0x41DB3C, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1 __RTTI__Q43std3tr16detail57shared_ptr_deleter$$0c$$4Q33std6detail20default_delete$$0A0_c$$1$$1: .incbin "baserom.dol", 0x492830, 0x8 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" index 0ec7a22f..0b5a58f2 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\locale.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global what__Q23std11logic_errorCFv what__Q23std11logic_errorCFv: /* 80014944 00010784 48 0E BE 9C */ b GetZeroBufferAddress__Q44nw4r3snd6detail9AxManagerFv @@ -431,7 +431,7 @@ lbl_80014F00: /* 80014F10 00010D50 98 0D E3 03 */ stb r0, $$2GUARD$$2id__Q23std14codecvt$$0w$$4c$$4i$$1-_SDA_BASE_(r13) /* 80014F14 00010D54 4E 80 00 20 */ blr -.section .data0, "wa" # 0x80006740 - 0x800068E0 +.section extab, "wa" # 0x80006740 - 0x800068E0 .global $$225556 $$225556: .incbin "baserom.dol", 0x402164, 0x28 @@ -445,7 +445,7 @@ $$227127: $$227197: .incbin "baserom.dol", 0x4021F4, 0x28 -.section .data1, "wa" # 0x800068E0 - 0x80006A00 +.section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$225557 $$225557: .incbin "baserom.dol", 0x4022DC, 0xC @@ -459,10 +459,10 @@ $$227128: $$227198: .incbin "baserom.dol", 0x402300, 0xC -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402364, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$210379 $$210379: .incbin "baserom.dol", 0x403758, 0x14 @@ -476,7 +476,7 @@ $$210387: $$2stringBase0: .incbin "baserom.dol", 0x403794, 0xE4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23std12out_of_range __vt__Q23std12out_of_range: .incbin "baserom.dol", 0x41DB48, 0x10 @@ -496,7 +496,7 @@ __vt__Q23std11logic_error: $$210388: .incbin "baserom.dol", 0x41DBA8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std12out_of_range __RTTI__Q23std12out_of_range: .incbin "baserom.dol", 0x492848, 0x8 diff --git "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" index 2474832b..607211a4 100644 --- "a/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" +++ "b/asm/MSL_C++.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C++\\MSL_Common\\Src\\msl_thread.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global release__Q43std3tr16detail25shared_ptr_deleter_commonFv release__Q43std3tr16detail25shared_ptr_deleter_commonFv: /* 80014F18 00010D58 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -85,7 +85,7 @@ lbl_80015014: __dt__Q43std3tr16detail20function_base$$0PFv_v$$1Fv: /* 80015030 00010E70 4B FF 1B A0 */ b __dt__Q23std9exceptionFv -.section .data0, "wa" # 0x80006740 - 0x800068E0 +.section extab, "wa" # 0x80006740 - 0x800068E0 .global $$28323 $$28323: .incbin "baserom.dol", 0x40221C, 0x8 @@ -93,7 +93,7 @@ $$28323: $$28430: .incbin "baserom.dol", 0x402224, 0x1C -.section .data1, "wa" # 0x800068E0 - 0x80006A00 +.section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$28324 $$28324: .incbin "baserom.dol", 0x40230C, 0xC diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\FILE_POS.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\FILE_POS.s" index fb8b2213..5d3b34d4 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\FILE_POS.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\FILE_POS.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global _ftell _ftell: /* 8000A8E4 00006724 80 03 00 04 */ lwz r0, 4(r3) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" index 19ecc6aa..91921077 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\alloc.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Block_link Block_link: /* 80009234 00005074 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -372,7 +372,7 @@ lbl_80009730: /* 80009740 00005580 38 21 00 10 */ addi r1, r1, 0x10 /* 80009744 00005584 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global fix_pool_sizes fix_pool_sizes: .incbin "baserom.dol", 0x402770, 0x18 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" index aca466c1..ee49e63b 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ansi_files.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __close_all __close_all: /* 80009748 00005588 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -82,7 +82,7 @@ lbl_80009834: /* 80009850 00005690 38 21 00 10 */ addi r1, r1, 0x10 /* 80009854 00005694 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __files __files: .incbin "baserom.dol", 0x41D1F8, 0x140 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\arith.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\arith.s" index 5d7f3142..6ba78a16 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\arith.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\arith.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global abs abs: /* 8000A2CC 0000610C 7C 64 FE 70 */ srawi r4, r3, 0x1f diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\buffer_io.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\buffer_io.s" index 9fe6f62b..2440cd78 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\buffer_io.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\buffer_io.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __prep_buffer __prep_buffer: /* 8000A2DC 0000611C 80 83 00 18 */ lwz r4, 0x18(r3) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" index a8ed90e6..8cc7ed3a 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\ctype.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global toupper toupper: /* 8000A3BC 000061FC 28 03 00 FF */ cmplwi r3, 0xff @@ -17,7 +17,7 @@ lbl_8000A3CC: /* 8000A3E4 00006224 7C 64 18 AE */ lbzx r3, r4, r3 /* 8000A3E8 00006228 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global __ctype_mapC __ctype_mapC: .incbin "baserom.dol", 0x402868, 0x200 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\direct_io.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\direct_io.s" index bd8405bd..006d9375 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\direct_io.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\direct_io.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __fwrite __fwrite: /* 8000A3EC 0000622C 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\extras.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\extras.s" index 3fcdde86..b2a66160 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\extras.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\extras.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global stricmp stricmp: /* 800147EC 0001062C 3C A0 80 42 */ lis r5, _current_locale@ha diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\file_io.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\file_io.s" index 4cac7756..d8e749f6 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\file_io.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\file_io.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global fclose fclose: /* 8000A6F4 00006534 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" index 1ccbab27..5931cded 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\float.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __float_nan __float_nan: .incbin "baserom.dol", 0x492828, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" index a452944e..62414eb4 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\locale.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2142 $$2142: .incbin "baserom.dol", 0x402C68, 0x10 @@ -17,7 +17,7 @@ $$2146: $$2147: .incbin "baserom.dol", 0x402CE8, 0x88 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __lconv __lconv: .incbin "baserom.dol", 0x41D460, 0x38 @@ -43,7 +43,7 @@ _loc_tim_C: _current_locale: .incbin "baserom.dol", 0x41D610, 0x48 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2139 $$2139: .incbin "baserom.dol", 0x498AC8, 0x4 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\math_api.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\math_api.s" index 379e1a59..2365dfa9 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\math_api.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\math_api.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __fpclassifyf __fpclassifyf: /* 8000B18C 00006FCC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\math_double.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\math_double.s" index c78816c4..48365c79 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\math_double.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\math_double.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global acosf acosf: /* 80010574 0000C3B4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mbstring.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mbstring.s" index 04c8c68e..164a370b 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mbstring.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mbstring.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global mbtowc mbtowc: /* 8000AB54 00006994 3C C0 80 42 */ lis r6, _current_locale@ha diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mem.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mem.s" index 8d4e7c21..802a5953 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mem.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mem.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global memmove memmove: /* 8000AD4C 00006B8C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mem_funcs.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mem_funcs.s" index e588eb2c..266c34cb 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mem_funcs.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\mem_funcs.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __copy_longs_aligned __copy_longs_aligned: /* 8000AEBC 00006CFC 7C 03 00 D0 */ neg r0, r3 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\misc_io.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\misc_io.s" index 4f68c36f..58afe437 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\misc_io.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\misc_io.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __stdio_atexit __stdio_atexit: /* 8000B280 000070C0 3C 60 80 01 */ lis r3, __close_all@ha diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" index 91b45817..e0a4005c 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\printf.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global parse_format parse_format: /* 8000B290 000070D0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2791,12 +2791,12 @@ lbl_8000D87C: /* 8000D888 000096C8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8000D88C 000096CC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x402D70, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22465 $$22465: .incbin "baserom.dol", 0x41D658, 0xE0 @@ -2804,12 +2804,12 @@ $$22465: $$22934: .incbin "baserom.dol", 0x41D738, 0x150 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2wstringBase0 $$2wstringBase0: .incbin "baserom.dol", 0x492820, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22604 $$22604: .incbin "baserom.dol", 0x498AE0, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\scanf.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\scanf.s" index 069b00a5..236d618b 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\scanf.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\scanf.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __StringRead __StringRead: /* 8000D890 000096D0 2C 05 00 00 */ cmpwi r5, 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\secure_error.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\secure_error.s" index 4bcb13ba..e8c2765a 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\secure_error.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\secure_error.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __msl_runtime_constraint_violation_s __msl_runtime_constraint_violation_s: /* 8001055C 0000C39C 81 8D E2 E8 */ lwz r12, __msl_constraint_handler-_SDA_BASE_(r13) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\signal.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\signal.s" index e701e7e0..2447f84e 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\signal.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\signal.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global raise raise: /* 8000D918 00009758 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\string.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\string.s" index 374a5c6e..32811405 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\string.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\string.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global strcpy strcpy: /* 8000D9C0 00009800 54 60 07 BE */ clrlwi r0, r3, 0x1e diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\strtoul.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\strtoul.s" index 5ea3fb57..8e71930f 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\strtoul.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\strtoul.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __strtoul __strtoul: /* 8000DD34 00009B74 94 21 FF B0 */ stwu r1, -0x50(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wchar_io.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wchar_io.s" index 13283ffe..ab08a89a 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wchar_io.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wchar_io.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global fwide fwide: /* 800103DC 0000C21C 2C 03 00 00 */ cmpwi r3, 0 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" index 99ade038..7964fee2 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wctype.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global __wctype_mapC __wctype_mapC: .incbin "baserom.dol", 0x402D98, 0x200 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wmem.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wmem.s" index a53089c1..b2f4c6d8 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wmem.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wmem.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global wmemcpy wmemcpy: /* 8000E20C 0000A04C 54 A5 08 3C */ slwi r5, r5, 1 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" index 5a077d32..e11f9b05 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wprintf.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global parse_format parse_format: /* 8000E23C 0000A07C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2408,12 +2408,12 @@ lbl_80010318: /* 8001032C 0000C16C 38 21 00 30 */ addi r1, r1, 0x30 /* 80010330 0000C170 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x403398, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22455 $$22455: .incbin "baserom.dol", 0x41D888, 0xE0 @@ -2424,7 +2424,7 @@ $$22923: $$2wstringBase0: .incbin "baserom.dol", 0x41DAB8, 0x70 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22601 $$22601: .incbin "baserom.dol", 0x498AE8, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wstring.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wstring.s" index 912a763f..652ae9e9 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wstring.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common\\Src\\wstring.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global wcslen wcslen: /* 80010334 0000C174 38 83 FF FE */ addi r4, r3, -2 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_acos.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_acos.s" index 435d6c22..7f1a6a4b 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_acos.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_acos.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_acos __ieee754_acos: /* 80010620 0000C460 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -190,7 +190,7 @@ lbl_800108CC: /* 800108E4 0000C724 38 21 00 40 */ addi r1, r1, 0x40 /* 800108E8 0000C728 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2505 $$2505: .incbin "baserom.dol", 0x498AF0, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_asin.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_asin.s" index 8ff749be..af1e01f1 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_asin.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_asin.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_asin __ieee754_asin: /* 800108EC 0000C72C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -179,7 +179,7 @@ lbl_80010B54: /* 80010B7C 0000C9BC 38 21 00 50 */ addi r1, r1, 0x50 /* 80010B80 0000C9C0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2512 $$2512: .incbin "baserom.dol", 0x498B78, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_atan2.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_atan2.s" index 4b84cead..82efdb52 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_atan2.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_atan2.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_atan2 __ieee754_atan2: /* 80010B84 0000C9C4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -181,7 +181,7 @@ lbl_80010DC8: /* 80010DD4 0000CC14 38 21 00 30 */ addi r1, r1, 0x30 /* 80010DD8 0000CC18 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2583 $$2583: .incbin "baserom.dol", 0x498C00, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_fmod.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_fmod.s" index 81a3e087..49243709 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_fmod.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_fmod.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_fmod __ieee754_fmod: /* 80010DDC 0000CC1C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -271,7 +271,7 @@ lbl_80011154: /* 80011154 0000CF94 38 21 00 20 */ addi r1, r1, 0x20 /* 80011158 0000CF98 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global Zero Zero: .incbin "baserom.dol", 0x4033A0, 0x10 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log.s" index afd949c9..3805091f 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_log __ieee754_log: /* 8001115C 0000CF9C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -189,7 +189,7 @@ lbl_80011408: /* 80011408 0000D248 38 21 00 20 */ addi r1, r1, 0x20 /* 8001140C 0000D24C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2514 $$2514: .incbin "baserom.dol", 0x498C58, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log10.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log10.s" index 8e927ce4..43e26558 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log10.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_log10.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_log10 __ieee754_log10: /* 80011410 0000D250 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -78,7 +78,7 @@ lbl_80011510: /* 8001151C 0000D35C 38 21 00 20 */ addi r1, r1, 0x20 /* 80011520 0000D360 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2478 $$2478: .incbin "baserom.dol", 0x498CD8, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_pow.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_pow.s" index 7ac37726..12ea15b1 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_pow.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_pow.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_pow __ieee754_pow: /* 80011524 0000D364 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -566,7 +566,7 @@ lbl_80011CF8: /* 80011D30 0000DB70 38 21 00 C0 */ addi r1, r1, 0xc0 /* 80011D34 0000DB74 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global bp bp: .incbin "baserom.dol", 0x4033B0, 0x10 @@ -577,7 +577,7 @@ dp_h: dp_l: .incbin "baserom.dol", 0x4033D0, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2794 $$2794: .incbin "baserom.dol", 0x498D08, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_rem_pio2.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_rem_pio2.s" index 2e67fac1..df4b1696 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_rem_pio2.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_rem_pio2.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_rem_pio2 __ieee754_rem_pio2: /* 80011D38 0000DB78 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -244,7 +244,7 @@ lbl_800120A4: /* 800120B4 0000DEF4 38 21 00 60 */ addi r1, r1, 0x60 /* 800120B8 0000DEF8 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global two_over_pi two_over_pi: .incbin "baserom.dol", 0x4033E0, 0x108 @@ -252,7 +252,7 @@ two_over_pi: npio2_hw: .incbin "baserom.dol", 0x4034E8, 0x80 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2594 $$2594: .incbin "baserom.dol", 0x498E18, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_sqrt.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_sqrt.s" index 88b141fe..e54f5d08 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_sqrt.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\e_sqrt.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ieee754_sqrt __ieee754_sqrt: /* 800145A0 000103E0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -174,7 +174,7 @@ lbl_800147E0: /* 800147E0 00010620 38 21 00 20 */ addi r1, r1, 0x20 /* 800147E4 00010624 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2562 $$2562: .incbin "baserom.dol", 0x498FF8, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_cos.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_cos.s" index 57b8f3c6..f87f1a63 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_cos.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_cos.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __kernel_cos __kernel_cos: /* 800120BC 0000DEFC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -77,7 +77,7 @@ lbl_800121C4: /* 800121C4 0000E004 38 21 00 20 */ addi r1, r1, 0x20 /* 800121C8 0000E008 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2476 $$2476: .incbin "baserom.dol", 0x498E70, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_rem_pio2.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_rem_pio2.s" index f209698e..4b5aae7f 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_rem_pio2.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_rem_pio2.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __kernel_rem_pio2 __kernel_rem_pio2: /* 800121CC 0000E00C 94 21 FC 90 */ stwu r1, -0x370(r1) @@ -1584,7 +1584,7 @@ lbl_80013864: /* 8001387C 0000F6BC 38 21 03 70 */ addi r1, r1, 0x370 /* 80013880 0000F6C0 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global init_jk init_jk: .incbin "baserom.dol", 0x403568, 0x10 @@ -1592,7 +1592,7 @@ init_jk: PIo2: .incbin "baserom.dol", 0x403578, 0x40 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21235 $$21235: .incbin "baserom.dol", 0x498EB8, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_sin.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_sin.s" index aa7c02a4..630c48ef 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_sin.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_sin.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __kernel_sin __kernel_sin: /* 80013884 0000F6C4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -55,7 +55,7 @@ lbl_8001393C: /* 8001393C 0000F77C 38 21 00 20 */ addi r1, r1, 0x20 /* 80013940 0000F780 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2470 $$2470: .incbin "baserom.dol", 0x498EF8, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_tan.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_tan.s" index 668e8809..b1ca3ebe 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_tan.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\k_tan.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __kernel_tan __kernel_tan: /* 80013944 0000F784 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -160,12 +160,12 @@ lbl_80013B7C: /* 80013B8C 0000F9CC 38 21 00 50 */ addi r1, r1, 0x50 /* 80013B90 0000F9D0 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T T: .incbin "baserom.dol", 0x4035B8, 0x68 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2516 $$2516: .incbin "baserom.dol", 0x498F30, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_atan.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_atan.s" index ca35f307..d5bcbfb0 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_atan.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_atan.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global atan atan: /* 80013B94 0000F9D4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -158,7 +158,7 @@ lbl_80013DBC: /* 80013DBC 0000FBFC 38 21 00 10 */ addi r1, r1, 0x10 /* 80013DC0 0000FC00 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global atanhi atanhi: .incbin "baserom.dol", 0x403620, 0x20 @@ -169,7 +169,7 @@ atanlo: aT: .incbin "baserom.dol", 0x403660, 0x58 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2532 $$2532: .incbin "baserom.dol", 0x498F68, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ceil.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ceil.s" index 50aa765a..5cc46cec 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ceil.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ceil.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ceil ceil: /* 80013DC4 0000FC04 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -101,7 +101,7 @@ lbl_80013F08: /* 80013F08 0000FD48 38 21 00 10 */ addi r1, r1, 0x10 /* 80013F0C 0000FD4C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2515 $$2515: .incbin "baserom.dol", 0x498F90, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_copysign.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_copysign.s" index c2a263d7..282167ad 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_copysign.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_copysign.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global copysign copysign: /* 80013F10 0000FD50 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_cos.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_cos.s" index 9e4eaae5..b9ce9449 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_cos.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_cos.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global cos cos: /* 80013F3C 0000FD7C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -61,7 +61,7 @@ lbl_80013FF4: /* 80013FFC 0000FE3C 38 21 00 20 */ addi r1, r1, 0x20 /* 80014000 0000FE40 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2477 $$2477: .incbin "baserom.dol", 0x498FA0, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_floor.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_floor.s" index be260e56..9d9cbb28 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_floor.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_floor.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global floor floor: /* 80014004 0000FE44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -102,7 +102,7 @@ lbl_8001414C: /* 8001414C 0000FF8C 38 21 00 10 */ addi r1, r1, 0x10 /* 80014150 0000FF90 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2515 $$2515: .incbin "baserom.dol", 0x498FA8, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_frexp.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_frexp.s" index a43b431d..c6c0bdca 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_frexp.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_frexp.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global frexp frexp: /* 80014154 0000FF94 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -41,7 +41,7 @@ lbl_800141D4: /* 800141D4 00010014 38 21 00 10 */ addi r1, r1, 0x10 /* 800141D8 00010018 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2468 $$2468: .incbin "baserom.dol", 0x498FB8, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ldexp.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ldexp.s" index a9c4c9e9..6c29432e 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ldexp.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_ldexp.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ldexp ldexp: /* 800141DC 0001001C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -105,7 +105,7 @@ lbl_80014330: /* 80014340 00010180 38 21 00 20 */ addi r1, r1, 0x20 /* 80014344 00010184 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2488 $$2488: .incbin "baserom.dol", 0x498FC0, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_modf.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_modf.s" index e776e7d8..be14cd59 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_modf.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_modf.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global modf modf: /* 80014348 00010188 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_sin.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_sin.s" index 8bfa945b..b2bacfef 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_sin.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_sin.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global sin sin: /* 80014444 00010284 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -62,7 +62,7 @@ lbl_80014500: /* 80014508 00010348 38 21 00 20 */ addi r1, r1, 0x20 /* 8001450C 0001034C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2477 $$2477: .incbin "baserom.dol", 0x498FE8, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_tan.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_tan.s" index 303405f4..b4a136d8 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_tan.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\s_tan.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tan tan: /* 80014510 00010350 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -37,7 +37,7 @@ lbl_80014578: /* 80014580 000103C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80014584 000103C4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2466 $$2466: .incbin "baserom.dol", 0x498FF0, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_acos.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_acos.s" index eae29d94..8ce169ff 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_acos.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_acos.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global acos acos: /* 80014588 000103C8 4B FF C0 98 */ b __ieee754_acos diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_asin.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_asin.s" index 2fe7b758..a7d8806b 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_asin.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_asin.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global asin asin: /* 8001458C 000103CC 4B FF C3 60 */ b __ieee754_asin diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_atan2.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_atan2.s" index b50f91d7..05c8c643 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_atan2.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_atan2.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global atan2 atan2: /* 80014590 000103D0 4B FF C5 F4 */ b __ieee754_atan2 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_fmod.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_fmod.s" index e1f35b61..6b5e57eb 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_fmod.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_fmod.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global fmod fmod: /* 80014594 000103D4 4B FF C8 48 */ b __ieee754_fmod diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_log10.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_log10.s" index 6ca6d6b6..7f95d0da 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_log10.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_log10.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global log10 log10: /* 80014598 000103D8 4B FF CE 78 */ b __ieee754_log10 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_pow.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_pow.s" index f6de5253..f99ce069 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_pow.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_pow.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global pow pow: /* 8001459C 000103DC 4B FF CF 88 */ b __ieee754_pow diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_sqrt.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_sqrt.s" index 9307595d..e1a86a8e 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_sqrt.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Math\\Double_precision\\w_sqrt.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global sqrt sqrt: /* 800147E8 00010628 4B FF FD B8 */ b __ieee754_sqrt diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" index 962c9c56..516948fe 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\ansi_fp.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ull2dec __ull2dec: /* 80009858 00005698 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -746,17 +746,17 @@ lbl_8000A2B4: /* 8000A2C4 00006104 38 21 00 10 */ addi r1, r1, 0x10 /* 8000A2C8 00006108 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x402788, 0xE0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21232 $$21232: .incbin "baserom.dol", 0x41D338, 0x128 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21377 $$21377: .incbin "baserom.dol", 0x498AC0, 0x8 diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\math_sun.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\math_sun.s" index c604f14e..06dd2c4d 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\math_sun.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\MSL_Common_Embedded\\Src\\math_sun.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global scalbn scalbn: /* 800105E0 0000C420 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\PPC_EABI\\SRC\\abort_exit_ppc_eabi.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\PPC_EABI\\SRC\\abort_exit_ppc_eabi.s" index 66f54c85..cb65e571 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\PPC_EABI\\SRC\\abort_exit_ppc_eabi.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\PPC_EABI\\SRC\\abort_exit_ppc_eabi.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global abort abort: /* 80010528 0000C368 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\PPC_EABI\\SRC\\uart_console_io_gcn.s" "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\PPC_EABI\\SRC\\uart_console_io_gcn.s" index f0e311a2..7c1d9fbd 100644 --- "a/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\PPC_EABI\\SRC\\uart_console_io_gcn.s" +++ "b/asm/MSL_C.PPCEABI.bare.H/D:\\workspace\\EPPC\\TempBuildMSL\\PowerPC_EABI_Support\\MSL\\MSL_C\\PPC_EABI\\SRC\\uart_console_io_gcn.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __write_console __write_console: /* 80010454 0000C294 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s b/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s index af2a258e..9a74d582 100644 --- a/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s +++ b/asm/Runtime.PPCEABI.H/GCN_mem_alloc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __sys_free __sys_free: /* 8000917C 00004FBC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -51,7 +51,7 @@ lbl_8000920C: /* 8000922C 0000506C 38 21 00 20 */ addi r1, r1, 0x20 /* 80009230 00005070 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x402700, 0x70 diff --git a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s index 133b95ef..dc6b3c52 100644 --- a/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s +++ b/asm/Runtime.PPCEABI.H/Gecko_ExceptionPPC.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __register_fragment __register_fragment: /* 80007A6C 000038AC 3C A0 80 49 */ lis r5, fragmentinfo@ha @@ -1653,7 +1653,7 @@ what__Q23std13bad_exceptionCFv: /* 80009174 00004FB4 38 63 10 E4 */ addi r3, r3, $$2STRING$$2what__Q23std13bad_exceptionCFv@l /* 80009178 00004FB8 4E 80 00 20 */ blr -.section .data0, "wa" # 0x80006740 - 0x800068E0 +.section extab, "wa" # 0x80006740 - 0x800068E0 .global $$2283 $$2283: .incbin "baserom.dol", 0x4020E8, 0x8 @@ -1673,7 +1673,7 @@ $$2952: $$21130: .incbin "baserom.dol", 0x402140, 0x14 -.section .data1, "wa" # 0x800068E0 - 0x80006A00 +.section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2284 $$2284: .incbin "baserom.dol", 0x40227C, 0xC @@ -1693,7 +1693,7 @@ $$2953: $$21131: .incbin "baserom.dol", 0x4022B8, 0xC -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21152 $$21152: .incbin "baserom.dol", 0x402698, 0x14 @@ -1701,7 +1701,7 @@ $$21152: $$2stringBase0: .incbin "baserom.dol", 0x4026AC, 0x54 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2366 $$2366: .incbin "baserom.dol", 0x41D140, 0x44 @@ -1718,7 +1718,7 @@ $$21153: $$2STRING$$2what__Q23std13bad_exceptionCFv: .incbin "baserom.dol", 0x41D1E4, 0x14 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std13bad_exception __RTTI__Q23std13bad_exception: .incbin "baserom.dol", 0x492818, 0x8 diff --git a/asm/Runtime.PPCEABI.H/NMWException.s b/asm/Runtime.PPCEABI.H/NMWException.s index 297d5f71..34176be5 100644 --- a/asm/Runtime.PPCEABI.H/NMWException.s +++ b/asm/Runtime.PPCEABI.H/NMWException.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global dthandler__3stdFv dthandler__3stdFv: /* 80006C10 00002A50 48 00 99 18 */ b abort @@ -421,7 +421,7 @@ lbl_8000716C: /* 8000718C 00002FCC 38 21 00 20 */ addi r1, r1, 0x20 /* 80007190 00002FD0 4E 80 00 20 */ blr -.section .data0, "wa" # 0x80006740 - 0x800068E0 +.section extab, "wa" # 0x80006740 - 0x800068E0 .global $$2340 $$2340: .incbin "baserom.dol", 0x4020A8, 0x18 @@ -435,7 +435,7 @@ $$2383: $$2401: .incbin "baserom.dol", 0x4020E0, 0x8 -.section .data1, "wa" # 0x800068E0 - 0x80006A00 +.section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2341 $$2341: .incbin "baserom.dol", 0x40224C, 0xC @@ -449,7 +449,7 @@ $$2384: $$2402: .incbin "baserom.dol", 0x402270, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global thandler__3std thandler__3std: .incbin "baserom.dol", 0x492808, 0x4 diff --git a/asm/Runtime.PPCEABI.H/New.s b/asm/Runtime.PPCEABI.H/New.s index ce96fc69..59e2e40e 100644 --- a/asm/Runtime.PPCEABI.H/New.s +++ b/asm/Runtime.PPCEABI.H/New.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q23std9exceptionFv __dt__Q23std9exceptionFv: /* 80006BD0 00002A10 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21,22 +21,22 @@ lbl_80006BF8: /* 80006C08 00002A48 38 21 00 10 */ addi r1, r1, 0x10 /* 80006C0C 00002A4C 4E 80 00 20 */ blr -.section .data0, "wa" # 0x80006740 - 0x800068E0 +.section extab, "wa" # 0x80006740 - 0x800068E0 .global $$2190 $$2190: .incbin "baserom.dol", 0x4020A0, 0x8 -.section .data1, "wa" # 0x800068E0 - 0x80006A00 +.section extabindex, "wa" # 0x800068E0 - 0x80006A00 .global $$2191 $$2191: .incbin "baserom.dol", 0x402240, 0xC -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2278 $$2278: .incbin "baserom.dol", 0x402660, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q23std9exception __RTTI__Q23std9exception: .incbin "baserom.dol", 0x492800, 0x8 diff --git a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s index e5b22c4b..19e28599 100644 --- a/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s +++ b/asm/Runtime.PPCEABI.H/__init_cpp_exceptions.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __init_cpp_exceptions __init_cpp_exceptions: /* 800079FC 0000383C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -37,12 +37,12 @@ lbl_80007A5C: /* 80007A64 000038A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80007A68 000038A8 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .global __init_cpp_exceptions_reference __init_cpp_exceptions_reference: .incbin "baserom.dol", 0x402360, 0x4 -.section .data3, "wa" # 0x80406540 - 0x80406560 +.section .dtors, "wa" # 0x80406540 - 0x80406560 .global __destroy_global_chain_reference __destroy_global_chain_reference: .incbin "baserom.dol", 0x402640, 0x4 @@ -50,7 +50,7 @@ __destroy_global_chain_reference: __fini_cpp_exceptions_reference: .incbin "baserom.dol", 0x402644, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global fragmentID fragmentID: .incbin "baserom.dol", 0x492810, 0x8 diff --git a/asm/Runtime.PPCEABI.H/__mem.s b/asm/Runtime.PPCEABI.H/__mem.s index 0061c286..f098d388 100644 --- a/asm/Runtime.PPCEABI.H/__mem.s +++ b/asm/Runtime.PPCEABI.H/__mem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text0, "ax" # 0x80004000 - 0x80006740 +.section .init, "ax" # 0x80004000 - 0x80006740 .global memcpy memcpy: /* 80004000 00000100 28 85 00 00 */ cmplwi cr1, r5, 0 @@ -265,7 +265,7 @@ memset: /* 80004378 00000478 38 21 00 10 */ addi r1, r1, 0x10 /* 8000437C 0000047C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global strlen strlen: /* 80006A8C 000028CC 38 83 FF FF */ addi r4, r3, -1 diff --git a/asm/Runtime.PPCEABI.H/__va_arg.s b/asm/Runtime.PPCEABI.H/__va_arg.s index 10647c92..0cb148ac 100644 --- a/asm/Runtime.PPCEABI.H/__va_arg.s +++ b/asm/Runtime.PPCEABI.H/__va_arg.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __va_arg __va_arg: /* 80006AA8 000028E8 88 E3 00 00 */ lbz r7, 0(r3) diff --git a/asm/Runtime.PPCEABI.H/global_destructor_chain.s b/asm/Runtime.PPCEABI.H/global_destructor_chain.s index 9c4004c9..b85b3b40 100644 --- a/asm/Runtime.PPCEABI.H/global_destructor_chain.s +++ b/asm/Runtime.PPCEABI.H/global_destructor_chain.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __register_global_object __register_global_object: /* 80006B70 000029B0 80 0D E2 C0 */ lwz r0, __global_destructor_chain-_SDA_BASE_(r13) diff --git a/asm/Runtime.PPCEABI.H/ptmf.s b/asm/Runtime.PPCEABI.H/ptmf.s index 9525d1cd..bb09906f 100644 --- a/asm/Runtime.PPCEABI.H/ptmf.s +++ b/asm/Runtime.PPCEABI.H/ptmf.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ptmf_test __ptmf_test: /* 80007194 00002FD4 80 A3 00 00 */ lwz r5, 0(r3) @@ -44,7 +44,7 @@ lbl_8000720C: /* 8000720C 0000304C 7D 89 03 A6 */ mtctr r12 /* 80007210 00003050 4E 80 04 20 */ bctr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global __ptmf_null __ptmf_null: .incbin "baserom.dol", 0x402670, 0x10 diff --git a/asm/Runtime.PPCEABI.H/runtime.s b/asm/Runtime.PPCEABI.H/runtime.s index 82ba2131..f4adb1e8 100644 --- a/asm/Runtime.PPCEABI.H/runtime.s +++ b/asm/Runtime.PPCEABI.H/runtime.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __cvt_fp2unsigned __cvt_fp2unsigned: /* 80007214 00003054 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -726,7 +726,7 @@ lbl_800079F4: /* 800079F4 00003834 38 21 00 10 */ addi r1, r1, 0x10 /* 800079F8 00003838 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global __constants __constants: .incbin "baserom.dol", 0x402680, 0x18 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\__exception.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\__exception.s" index 2454bd99..a3b958c3 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\__exception.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\__exception.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text0, "ax" # 0x80004000 - 0x80006740 +.section .init, "ax" # 0x80004000 - 0x80006740 lbl_80004380: /* 80004380 00000480 4D 65 74 72 */ .4byte 0x4D657472 /* unknown instruction */ /* 80004384 00000484 6F 77 65 72 */ xoris r23, r27, 0x6572 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\CircleBuffer.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\CircleBuffer.s" index 8c94474c..f8c3e20a 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\CircleBuffer.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\CircleBuffer.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CircleBufferInitialize CircleBufferInitialize: /* 800152FC 0001113C 38 00 00 00 */ li r0, 0 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\MWCriticalSection_gc.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\MWCriticalSection_gc.s" index d75a8876..8f2a2e0e 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\MWCriticalSection_gc.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\MWCriticalSection_gc.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MWEnterCriticalSection MWEnterCriticalSection: /* 800152C4 00011104 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\cc_gdev.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\cc_gdev.s" index e0333f1f..a93c3aad 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\cc_gdev.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\custconn\\cc_gdev.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global gdev_cc_initialize gdev_cc_initialize: /* 80015054 00010E94 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" index 84bd5729..eaaee5d2 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dispatch.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_DispatchMessage TRK_DispatchMessage: /* 800158F4 00011734 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -77,7 +77,7 @@ lbl_800159F8: /* 80015A0C 0001184C 38 21 00 10 */ addi r1, r1, 0x10 /* 80015A10 00011850 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2109 $$2109: .incbin "baserom.dol", 0x41DBB8, 0x70 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk.s" index 12d58115..7b6dcef6 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InitMetroTRK InitMetroTRK: /* 80015A14 00011854 38 21 FF FC */ addi r1, r1, -4 @@ -235,7 +235,7 @@ __TRKreset: /* 80015D30 00011B70 38 A0 00 00 */ li r5, 0 /* 80015D34 00011B74 48 00 DA EC */ b OSResetSystem -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global TRK_ISR_OFFSETS TRK_ISR_OFFSETS: .incbin "baserom.dol", 0x41DC28, 0x40 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk_glue.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk_glue.s" index bd680e39..c6fb10d0 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk_glue.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\dolphin_trk_glue.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRKLoadContext TRKLoadContext: /* 80015D38 00011B78 80 03 00 00 */ lwz r0, 0(r3) @@ -272,12 +272,12 @@ InitializeProgramEndTrap: /* 800160C8 00011F08 38 21 00 10 */ addi r1, r1, 0x10 /* 800160CC 00011F0C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x41DC68, 0xE8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global EndofProgramInstruction$631 EndofProgramInstruction$631: .incbin "baserom.dol", 0x499000, 0x8 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\flush_cache.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\flush_cache.s" index ec4d4f0a..709df24c 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\flush_cache.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\flush_cache.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_flush_cache TRK_flush_cache: /* 80015530 00011370 3C A0 FF FF */ lis r5, 0xFFFFFFF1@h diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\main_TRK.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\main_TRK.s" index 4acef56c..c14bbecd 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\main_TRK.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\main_TRK.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_main TRK_main: /* 80015568 000113A8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mainloop.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mainloop.s" index a42b41d4..395ae551 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mainloop.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mainloop.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_NubMainLoop TRK_NubMainLoop: /* 800155A4 000113E4 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mem_TRK.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mem_TRK.s" index 384998b9..1386674a 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mem_TRK.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mem_TRK.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_memcpy TRK_memcpy: /* 80015690 000114D0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mpc_7xx_603e.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mpc_7xx_603e.s" index 481e29d5..37da1a56 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mpc_7xx_603e.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mpc_7xx_603e.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRKSaveExtended1Block TRKSaveExtended1Block: /* 80016BDC 00012A1C 3C 40 80 49 */ lis r2, gTRKCPUState@h diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" index 557d58b6..c232eb03 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msg.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_MessageSend TRK_MessageSend: /* 80016F04 00012D44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -31,7 +31,7 @@ lbl_80016F54: /* 80016F60 00012DA0 38 21 00 10 */ addi r1, r1, 0x10 /* 80016F64 00012DA4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x41DDD8, 0x28 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" index b71fb8c2..88827ac2 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msgbuf.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_InitializeMessageBuffers TRK_InitializeMessageBuffers: /* 80016F68 00012DA8 3C 60 80 49 */ lis r3, gTRKMsgBufs@ha @@ -614,7 +614,7 @@ lbl_8001775C: /* 8001776C 000135AC 38 21 00 30 */ addi r1, r1, 0x30 /* 80017770 000135B0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x41DE00, 0x28 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" index 9e9b2a18..4ca2732b 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\msghndlr.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetTRKConnected GetTRKConnected: /* 80017774 000135B4 80 6D E3 44 */ lwz r3, IsTRKConnected-_SDA_BASE_(r13) @@ -1106,7 +1106,7 @@ lbl_80018694: /* 800186F0 00014530 38 21 00 50 */ addi r1, r1, 0x50 /* 800186F4 00014534 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2781 $$2781: .incbin "baserom.dol", 0x41DE28, 0x1C diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mslsupp.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mslsupp.s" index 1526976a..75637e01 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mslsupp.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\mslsupp.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __read_console __read_console: /* 800186F8 00014538 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\notify.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\notify.s" index a7f6069b..9db80ad2 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\notify.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\notify.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRKDoNotifyStopped TRKDoNotifyStopped: /* 800160D0 00011F10 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" index 63cec435..ddb1ac4a 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubevent.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRKInitializeEventQueue TRKInitializeEventQueue: /* 80016160 00011FA0 3C 60 80 49 */ lis r3, gTRKEventQueue@ha @@ -124,7 +124,7 @@ TRKDestructEvent: /* 800162F4 00012134 80 63 00 08 */ lwz r3, 8(r3) /* 800162F8 00012138 48 00 0D 50 */ b TRK_ReleaseBuffer -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x41DD50, 0x20 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" index 39190367..3a3067a8 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\nubinit.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_InitializeNub TRK_InitializeNub: /* 800162FC 0001213C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -105,7 +105,7 @@ lbl_80016444: /* 80016444 00012284 38 21 00 10 */ addi r1, r1, 0x10 /* 80016448 00012288 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x41DD70, 0x20 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\serpoll.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\serpoll.s" index 837121f0..560b9c90 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\serpoll.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\serpoll.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRKTestForPacket TRKTestForPacket: /* 8001644C 0001228C 94 21 F7 20 */ stwu r1, -0x8e0(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\support.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\support.s" index 4bdfcdc7..36f3e2c9 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\support.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\support.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRK_SuppAccessFile TRK_SuppAccessFile: /* 80016584 000123C4 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -443,7 +443,7 @@ lbl_80016B7C: /* 80016BA0 000129E0 38 21 00 70 */ addi r1, r1, 0x70 /* 80016BA4 000129E4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2stringBase0 $$2stringBase0: .incbin "baserom.dol", 0x41DD90, 0x48 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targcont.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targcont.s" index 77244789..d95768ed 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targcont.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targcont.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRKTargetContinue TRKTargetContinue: /* 80016BA8 000129E8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\target_options.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\target_options.s" index e96a11d6..b7078e4a 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\target_options.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\target_options.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetUseSerialIO SetUseSerialIO: /* 8001A098 00015ED8 98 6D E3 50 */ stb r3, bUseSerialIO-_SDA_BASE_(r13) diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" index f26dac5e..44b1b0cc 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targimpl.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TRKValidMemory32 TRKValidMemory32: /* 80018884 000146C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1736,7 +1736,7 @@ lbl_8001A090: /* 8001A090 00015ED0 90 C3 00 00 */ stw r6, 0(r3) /* 8001A094 00015ED4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global gTRKMemMap gTRKMemMap: .incbin "baserom.dol", 0x403878, 0x10 @@ -1750,7 +1750,7 @@ $$2999: $$21022: .incbin "baserom.dol", 0x4038D8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global gTRKExceptionStatus gTRKExceptionStatus: .incbin "baserom.dol", 0x41DE90, 0x10 diff --git "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targsupp.s" "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targsupp.s" index 407e290a..d5f9145e 100644 --- "a/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targsupp.s" +++ "b/asm/TRK_Hollywood_Revolution/D:\\Data\\wiiProj\\metrotrk\\metrotrk\\targsupp.s" @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global func_80015034 func_80015034: /* 80015034 00010E74 0F E0 00 00 */ twui r0, 0 diff --git a/asm/ai/ai.s b/asm/ai/ai.s index 98efc8ba..a9df648a 100644 --- a/asm/ai/ai.s +++ b/asm/ai/ai.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AIRegisterDMACallback AIRegisterDMACallback: /* 80042860 0003E6A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -410,12 +410,12 @@ lbl_80042DD4: /* 80042E08 0003EC48 4E 80 00 20 */ blr /* 80042E0C 0003EC4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x42F040, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AIVersion __AIVersion: .incbin "baserom.dol", 0x4929F0, 0x8 diff --git a/asm/arc/arc.s b/asm/arc/arc.s index 046cd2ea..abe5dd60 100644 --- a/asm/arc/arc.s +++ b/asm/arc/arc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ARCInitHandle ARCInitHandle: /* 8004DD70 00049BB0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -746,7 +746,7 @@ lbl_8004E720: /* 8004E728 0004A568 4E 80 00 20 */ blr /* 8004E72C 0004A56C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21127 $$21127: .incbin "baserom.dol", 0x434598, 0x24 @@ -754,7 +754,7 @@ $$21127: $$21189: .incbin "baserom.dol", 0x4345BC, 0x4C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21126 $$21126: .incbin "baserom.dol", 0x492B80, 0x8 diff --git a/asm/ax/AX.s b/asm/ax/AX.s index a18bdabc..d9ef51a2 100644 --- a/asm/ax/AX.s +++ b/asm/ax/AX.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AXInit AXInit: /* 80042E10 0003EC50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -36,12 +36,12 @@ AXIsInit: /* 80042E78 0003ECB8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80042E7C 0003ECBC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x42F088, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AXVersion __AXVersion: .incbin "baserom.dol", 0x4929F8, 0x8 diff --git a/asm/ax/AXAlloc.s b/asm/ax/AXAlloc.s index 6f6fe9e4..7a2270c4 100644 --- a/asm/ax/AXAlloc.s +++ b/asm/ax/AXAlloc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AXGetStackHead __AXGetStackHead: /* 80042E80 0003ECC0 3C 80 80 4A */ lis r4, __AXStackHead@ha diff --git a/asm/ax/AXAux.s b/asm/ax/AXAux.s index 9b610d8a..01325fde 100644 --- a/asm/ax/AXAux.s +++ b/asm/ax/AXAux.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AXAuxInit __AXAuxInit: /* 80043370 0003F1B0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/ax/AXCL.s b/asm/ax/AXCL.s index eab57a72..cd0a925b 100644 --- a/asm/ax/AXCL.s +++ b/asm/ax/AXCL.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AXGetCommandListCycles __AXGetCommandListCycles: /* 80043C10 0003FA50 80 6D E7 CC */ lwz r3, __AXCommandListCycles-_SDA_BASE_(r13) diff --git a/asm/ax/AXComp.s b/asm/ax/AXComp.s index 1037d0fe..fd0c4b21 100644 --- a/asm/ax/AXComp.s +++ b/asm/ax/AXComp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __AXCompressorDefaultTable __AXCompressorDefaultTable: .incbin "baserom.dol", 0x42F160, 0xFC0 diff --git a/asm/ax/AXOut.s b/asm/ax/AXOut.s index 2759bb74..a65e1c37 100644 --- a/asm/ax/AXOut.s +++ b/asm/ax/AXOut.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AXOutNewFrame __AXOutNewFrame: /* 800446F0 00040530 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/ax/AXProf.s b/asm/ax/AXProf.s index 16db894a..08545c06 100644 --- a/asm/ax/AXProf.s +++ b/asm/ax/AXProf.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AXGetCurrentProfile __AXGetCurrentProfile: /* 80046120 00041F60 80 0D E8 90 */ lwz r0, __AXProfileInitialized-_SDA_BASE_(r13) diff --git a/asm/ax/AXSPB.s b/asm/ax/AXSPB.s index c202f4ce..c1071bd4 100644 --- a/asm/ax/AXSPB.s +++ b/asm/ax/AXSPB.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AXGetStudio __AXGetStudio: /* 80044F30 00040D70 3C 60 80 4A */ lis r3, __AXStudio@ha diff --git a/asm/ax/AXVPB.s b/asm/ax/AXVPB.s index b779995f..edb26777 100644 --- a/asm/ax/AXVPB.s +++ b/asm/ax/AXVPB.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AXGetNumVoices __AXGetNumVoices: /* 80045360 000411A0 80 6D E8 80 */ lwz r3, __AXNumVoices-_SDA_BASE_(r13) @@ -995,7 +995,7 @@ AXGetMaxVoices: /* 80046118 00041F58 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004611C 00041F5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __AXMixCycles __AXMixCycles: .incbin "baserom.dol", 0x42F0D0, 0x80 @@ -1003,7 +1003,7 @@ __AXMixCycles: __AXRmtMixCycles: .incbin "baserom.dol", 0x42F150, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23525 $$23525: .incbin "baserom.dol", 0x4991E8, 0x4 diff --git a/asm/ax/DSPCode.s b/asm/ax/DSPCode.s index b31a94bc..5d2db34d 100644 --- a/asm/ax/DSPCode.s +++ b/asm/ax/DSPCode.s @@ -1,11 +1,11 @@ .include "macros.inc" -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global axDspSlave axDspSlave: .incbin "baserom.dol", 0x430120, 0x2000 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global axDspInitVector axDspInitVector: .incbin "baserom.dol", 0x492A00, 0x2 diff --git a/asm/axfx/AXFXHooks.s b/asm/axfx/AXFXHooks.s index 6578fcab..02065b11 100644 --- a/asm/axfx/AXFXHooks.s +++ b/asm/axfx/AXFXHooks.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AXFXAllocFunction __AXFXAllocFunction: /* 80047040 00042E80 7C 64 1B 78 */ mr r4, r3 @@ -33,7 +33,7 @@ AXFXGetHooks: /* 80047088 00042EC8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004708C 00042ECC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __AXFXAlloc __AXFXAlloc: .incbin "baserom.dol", 0x492A08, 0x4 diff --git a/asm/axfx/AXFXReverbHi.s b/asm/axfx/AXFXReverbHi.s index 65a26ca6..5300c098 100644 --- a/asm/axfx/AXFXReverbHi.s +++ b/asm/axfx/AXFXReverbHi.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AXFXReverbHiInit AXFXReverbHiInit: /* 80046160 00041FA0 C0 E3 01 58 */ lfs f7, 0x158(r3) @@ -54,7 +54,7 @@ AXFXReverbHiCallback: /* 80046208 00042048 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004620C 0004204C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22209 $$22209: .incbin "baserom.dol", 0x499208, 0x4 diff --git a/asm/axfx/AXFXReverbHiExp.s b/asm/axfx/AXFXReverbHiExp.s index b7779d6f..8aa1ae7e 100644 --- a/asm/axfx/AXFXReverbHiExp.s +++ b/asm/axfx/AXFXReverbHiExp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AXFXReverbHiExpInit AXFXReverbHiExpInit: /* 80046210 00042050 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1003,7 +1003,7 @@ lbl_80047004: /* 80047038 00042E78 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004703C 00042E7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __EarlySizeTable __EarlySizeTable: .incbin "baserom.dol", 0x432120, 0x60 @@ -1014,7 +1014,7 @@ __EarlyCoefTable: __FilterSizeTable: .incbin "baserom.dol", 0x4321E0, 0xE0 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23078 $$23078: .incbin "baserom.dol", 0x499210, 0x4 diff --git a/asm/base/PPCArch.s b/asm/base/PPCArch.s index a6186f43..3554a29f 100644 --- a/asm/base/PPCArch.s +++ b/asm/base/PPCArch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PPCMfmsr PPCMfmsr: /* 8001A0B0 00015EF0 7C 60 00 A6 */ mfmsr r3 @@ -205,7 +205,7 @@ lbl_8001A2AC: /* 8001A2B8 000160F8 38 21 00 10 */ addi r1, r1, 0x10 /* 8001A2BC 000160FC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22249 $$22249: .incbin "baserom.dol", 0x41DEA0, 0x38 diff --git a/asm/bte/bd.s b/asm/bte/bd.s index 6f3124c6..1980b45a 100644 --- a/asm/bte/bd.s +++ b/asm/bte/bd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bdcpy bdcpy: /* 80077F34 00073D74 89 24 00 00 */ lbz r9, 0(r4) diff --git a/asm/bte/bta_dm_act.s b/asm/bte/bta_dm_act.s index f9ad7ea2..cee9aaae 100644 --- a/asm/bte/bta_dm_act.s +++ b/asm/bte/bta_dm_act.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bta_dm_enable bta_dm_enable: /* 800786C4 00074504 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2565,7 +2565,7 @@ lbl_8007A9C8: /* 8007A9DC 0007681C 38 21 00 10 */ addi r1, r1, 0x10 /* 8007A9E0 00076820 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_service_id_to_uuid_lkup_tbl bta_service_id_to_uuid_lkup_tbl: .incbin "baserom.dol", 0x403FA0, 0x30 @@ -2576,7 +2576,7 @@ bta_service_id_to_btm_srv_id_lkup_tbl: bta_security: .incbin "baserom.dol", 0x404030, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22277 $$22277: .incbin "baserom.dol", 0x436B58, 0x20 @@ -2599,7 +2599,7 @@ $$22689: $$22690: .incbin "baserom.dol", 0x436C58, 0x40 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21489 $$21489: .incbin "baserom.dol", 0x499460, 0x2 diff --git a/asm/bte/bta_dm_api.s b/asm/bte/bta_dm_api.s index 86a55569..0891d659 100644 --- a/asm/bte/bta_dm_api.s +++ b/asm/bte/bta_dm_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BTA_EnableBluetooth BTA_EnableBluetooth: /* 8007A9E4 00076824 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -331,7 +331,7 @@ lbl_8007AE40: /* 8007AE48 00076C88 38 21 00 10 */ addi r1, r1, 0x10 /* 8007AE4C 00076C8C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global bta_dm_reg bta_dm_reg: .incbin "baserom.dol", 0x499468, 0x8 diff --git a/asm/bte/bta_dm_cfg.s b/asm/bte/bta_dm_cfg.s index 90638424..07be5436 100644 --- a/asm/bte/bta_dm_cfg.s +++ b/asm/bte/bta_dm_cfg.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_dm_cfg bta_dm_cfg: .incbin "baserom.dol", 0x403F00, 0xC @@ -17,7 +17,7 @@ bta_dm_pm_spec: bta_dm_pm_md: .incbin "baserom.dol", 0x403F78, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global p_bta_dm_rm_cfg p_bta_dm_rm_cfg: .incbin "baserom.dol", 0x492C90, 0x4 diff --git a/asm/bte/bta_dm_main.s b/asm/bte/bta_dm_main.s index f5bd4cff..51cafe28 100644 --- a/asm/bte/bta_dm_main.s +++ b/asm/bte/bta_dm_main.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bta_dm_sm_execute bta_dm_sm_execute: /* 8007AE50 00076C90 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -99,7 +99,7 @@ lbl_8007AF8C: /* 8007AFA8 00076DE8 38 21 00 20 */ addi r1, r1, 0x20 /* 8007AFAC 00076DEC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_dm_action bta_dm_action: .incbin "baserom.dol", 0x404048, 0x34 diff --git a/asm/bte/bta_dm_pm.s b/asm/bte/bta_dm_pm.s index 06aca582..308615c5 100644 --- a/asm/bte/bta_dm_pm.s +++ b/asm/bte/bta_dm_pm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bta_dm_init_pm bta_dm_init_pm: /* 8007AFB0 00076DF0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -730,7 +730,7 @@ bta_dm_pm_timer: /* 8007B9C4 00077804 38 63 00 08 */ addi r3, r3, 8 /* 8007B9C8 00077808 4B FF F9 E8 */ b bta_dm_pm_set_mode -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2951 $$2951: .incbin "baserom.dol", 0x436C98, 0x2C diff --git a/asm/bte/bta_hh_act.s b/asm/bte/bta_hh_act.s index e5642463..9bbb249f 100644 --- a/asm/bte/bta_hh_act.s +++ b/asm/bte/bta_hh_act.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bta_hh_api_enable bta_hh_api_enable: /* 8007B9CC 0007780C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1655,7 +1655,7 @@ lbl_8007D0F4: /* 8007D10C 00078F4C 38 21 00 20 */ addi r1, r1, 0x20 /* 8007D110 00078F50 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21516 $$21516: .incbin "baserom.dol", 0x436CE8, 0x58 @@ -1771,7 +1771,7 @@ $$21804: $$21803: .incbin "baserom.dol", 0x4371BC, 0x24 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21486 $$21486: .incbin "baserom.dol", 0x492CD8, 0x8 diff --git a/asm/bte/bta_hh_api.s b/asm/bte/bta_hh_api.s index ba1557d8..eb43f4f4 100644 --- a/asm/bte/bta_hh_api.s +++ b/asm/bte/bta_hh_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BTA_HhEnable BTA_HhEnable: /* 8007D114 00078F54 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -278,12 +278,12 @@ lbl_8007D4D0: /* 8007D4DC 0007931C 38 21 00 10 */ addi r1, r1, 0x10 /* 8007D4E0 00079320 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2863 $$2863: .incbin "baserom.dol", 0x4371E0, 0x30 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global bta_hh_reg bta_hh_reg: .incbin "baserom.dol", 0x499478, 0x8 diff --git a/asm/bte/bta_hh_cfg.s b/asm/bte/bta_hh_cfg.s index e1ece328..55423dff 100644 --- a/asm/bte/bta_hh_cfg.s +++ b/asm/bte/bta_hh_cfg.s @@ -1,11 +1,11 @@ .include "macros.inc" -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_hh_cfg bta_hh_cfg: .incbin "baserom.dol", 0x403F90, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global p_devt_list p_devt_list: .incbin "baserom.dol", 0x492CA8, 0x8 diff --git a/asm/bte/bta_hh_main.s b/asm/bte/bta_hh_main.s index a223a7af..eec094e0 100644 --- a/asm/bte/bta_hh_main.s +++ b/asm/bte/bta_hh_main.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bta_hh_sm_execute bta_hh_sm_execute: /* 8007D4E4 00079324 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -400,7 +400,7 @@ lbl_8007DA30: /* 8007DA30 00079870 38 64 02 84 */ addi r3, r4, 0x284 /* 8007DA34 00079874 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global bta_hh_action bta_hh_action: .incbin "baserom.dol", 0x404170, 0x30 @@ -417,7 +417,7 @@ bta_hh_st_connected: bta_hh_st_tbl: .incbin "baserom.dol", 0x4041E8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2811 $$2811: .incbin "baserom.dol", 0x437210, 0x1C diff --git a/asm/bte/bta_hh_utils.s b/asm/bte/bta_hh_utils.s index 50f8059f..d25d22d9 100644 --- a/asm/bte/bta_hh_utils.s +++ b/asm/bte/bta_hh_utils.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bta_hh_find_cb bta_hh_find_cb: /* 8007DA38 00079878 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -271,7 +271,7 @@ lbl_8007DDC8: /* 8007DDDC 00079C1C 38 21 00 20 */ addi r1, r1, 0x20 /* 8007DDE0 00079C20 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2865 $$2865: .incbin "baserom.dol", 0x4374F0, 0x24 diff --git a/asm/bte/bta_sys_cfg.s b/asm/bte/bta_sys_cfg.s index 5c02a140..ae06e123 100644 --- a/asm/bte/bta_sys_cfg.s +++ b/asm/bte/bta_sys_cfg.s @@ -1,11 +1,11 @@ .include "macros.inc" -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global p_bta_sys_cfg p_bta_sys_cfg: .incbin "baserom.dol", 0x492CB8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global bta_sys_cfg bta_sys_cfg: .incbin "baserom.dol", 0x499458, 0x8 diff --git a/asm/bte/bta_sys_conn.s b/asm/bte/bta_sys_conn.s index f6303d47..6c6a8d13 100644 --- a/asm/bte/bta_sys_conn.s +++ b/asm/bte/bta_sys_conn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bta_sys_rm_register bta_sys_rm_register: /* 80078008 00073E48 3C 80 80 4F */ lis r4, bta_sys_cb@ha diff --git a/asm/bte/bta_sys_main.s b/asm/bte/bta_sys_main.s index 9cde060d..771047d3 100644 --- a/asm/bte/bta_sys_main.s +++ b/asm/bte/bta_sys_main.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bta_sys_init bta_sys_init: /* 8007825C 0007409C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -181,7 +181,7 @@ bta_sys_set_trace_level: /* 80078498 000742D8 98 6D EA F0 */ stb r3, appl_trace_level-_SDA_BASE_(r13) /* 8007849C 000742DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2587 $$2587: .incbin "baserom.dol", 0x436B20, 0x14 diff --git a/asm/bte/bte_hcisu.s b/asm/bte/bte_hcisu.s index 8bbe3d23..866d0d36 100644 --- a/asm/bte/bte_hcisu.s +++ b/asm/bte/bte_hcisu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bte_hcisu_send bte_hcisu_send: /* 800777A0 000735E0 B0 83 00 00 */ sth r4, 0(r3) diff --git a/asm/bte/bte_init.s b/asm/bte/bte_init.s index 093a7f9f..83e4f15c 100644 --- a/asm/bte/bte_init.s +++ b/asm/bte/bte_init.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BTE_InitStack BTE_InitStack: /* 80077870 000736B0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/bte_logmsg.s b/asm/bte/bte_logmsg.s index 2f54f6cd..09a612eb 100644 --- a/asm/bte/bte_logmsg.s +++ b/asm/bte/bte_logmsg.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LogMsg LogMsg: /* 800778A0 000736E0 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -64,7 +64,7 @@ LogMsg_0: /* 80077978 000737B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8007797C 000737BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22252 $$22252: .incbin "baserom.dol", 0x492CC0, 0x8 diff --git a/asm/bte/bte_main.s b/asm/bte/bte_main.s index 3e40080f..34ed7105 100644 --- a/asm/bte/bte_main.s +++ b/asm/bte/bte_main.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BTUInterruptHandler BTUInterruptHandler: /* 80077980 000737C0 3C 80 80 4F */ lis r4, __BTUInterruptHandlerStack@ha @@ -110,7 +110,7 @@ lbl_80077AE0: /* 80077AE8 00073928 4E 80 04 20 */ bctr /* 80077AEC 0007392C 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global bte_hcisu_h2_cfg bte_hcisu_h2_cfg: .incbin "baserom.dol", 0x492CC8, 0x8 diff --git a/asm/bte/btm_acl.s b/asm/bte/btm_acl.s index 4acfdd94..4d2cac82 100644 --- a/asm/bte/btm_acl.s +++ b/asm/bte/btm_acl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btm_acl_init btm_acl_init: /* 8007DDE4 00079C24 3C 60 80 4F */ lis r3, btm_cb@ha @@ -2156,7 +2156,7 @@ lbl_8007FB10: /* 8007FB20 0007B960 38 21 00 40 */ addi r1, r1, 0x40 /* 8007FB24 0007B964 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22591 $$22591: .incbin "baserom.dol", 0x4377B0, 0x40 diff --git a/asm/bte/btm_dev.s b/asm/bte/btm_dev.s index 70ff77f5..91423df5 100644 --- a/asm/bte/btm_dev.s +++ b/asm/bte/btm_dev.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BTM_SecAddDevice BTM_SecAddDevice: /* 8007FB28 0007B968 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/bte/btm_devctl.s b/asm/bte/btm_devctl.s index 7ced1a00..691a1ab4 100644 --- a/asm/bte/btm_devctl.s +++ b/asm/bte/btm_devctl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btm_dev_init btm_dev_init: /* 800801F4 0007C034 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1857,7 +1857,7 @@ btm_report_device_status: /* 80081B74 0007D9B4 4E 80 04 20 */ bctr /* 80081B78 0007D9B8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22107 $$22107: .incbin "baserom.dol", 0x437BD0, 0x30 @@ -1898,7 +1898,7 @@ $$22372: $$22385: .incbin "baserom.dol", 0x437DF8, 0x38 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22067 $$22067: .incbin "baserom.dol", 0x492CE0, 0x4 diff --git a/asm/bte/btm_discovery.s b/asm/bte/btm_discovery.s index 60a50ce9..684bf719 100644 --- a/asm/bte/btm_discovery.s +++ b/asm/bte/btm_discovery.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btm_discovery_db_init btm_discovery_db_init: /* 80081B7C 0007D9BC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/btm_inq.s b/asm/bte/btm_inq.s index da092c5a..22200bb4 100644 --- a/asm/bte/btm_inq.s +++ b/asm/bte/btm_inq.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BTM_SetDiscoverability BTM_SetDiscoverability: /* 80081CAC 0007DAEC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1959,7 +1959,7 @@ btm_inq_rmt_name_failed: /* 80083738 0007F578 38 21 00 10 */ addi r1, r1, 0x10 /* 8008373C 0007F57C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22304 $$22304: .incbin "baserom.dol", 0x437E30, 0x5C @@ -1988,7 +1988,7 @@ $$22602: $$22672: .incbin "baserom.dol", 0x438004, 0x3C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global general_inq_lap general_inq_lap: .incbin "baserom.dol", 0x499480, 0x4 diff --git a/asm/bte/btm_main.s b/asm/bte/btm_main.s index 79437250..1a8b590f 100644 --- a/asm/bte/btm_main.s +++ b/asm/bte/btm_main.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btm_init btm_init: /* 80083740 0007F580 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/btm_pm.s b/asm/bte/btm_pm.s index 188aa8e3..a1038f9b 100644 --- a/asm/bte/btm_pm.s +++ b/asm/bte/btm_pm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BTM_PmRegister BTM_PmRegister: /* 8008379C 0007F5DC 54 60 07 7B */ rlwinm. r0, r3, 0, 0x1d, 0x1d @@ -918,17 +918,17 @@ lbl_80084418: /* 80084428 00080268 38 21 00 30 */ addi r1, r1, 0x30 /* 8008442C 0008026C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global btm_pm_md_comp_matrix btm_pm_md_comp_matrix: .incbin "baserom.dol", 0x4041F8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21775 $$21775: .incbin "baserom.dol", 0x438040, 0x40 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global btm_pm_mode_off btm_pm_mode_off: .incbin "baserom.dol", 0x499488, 0x4 diff --git a/asm/bte/btm_sco.s b/asm/bte/btm_sco.s index a245d810..0893ec65 100644 --- a/asm/bte/btm_sco.s +++ b/asm/bte/btm_sco.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btm_sco_init btm_sco_init: /* 80084430 00080270 3C 60 80 41 */ lis r3, lbl_80410004@ha @@ -1041,12 +1041,12 @@ lbl_8008524C: /* 80085260 000810A0 38 21 00 20 */ addi r1, r1, 0x20 /* 80085264 000810A4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global btm_esco_defaults btm_esco_defaults: .incbin "baserom.dol", 0x404208, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21903 $$21903: .incbin "baserom.dol", 0x438080, 0x24 diff --git a/asm/bte/btm_sec.s b/asm/bte/btm_sec.s index 9fee864e..931e7537 100644 --- a/asm/bte/btm_sec.s +++ b/asm/bte/btm_sec.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BTM_SecRegister BTM_SecRegister: /* 80085268 000810A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3422,7 +3422,7 @@ lbl_8008821C: /* 80088224 00084064 38 21 00 10 */ addi r1, r1, 0x10 /* 80088228 00084068 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22854 $$22854: .incbin "baserom.dol", 0x438380, 0x20 @@ -3574,7 +3574,7 @@ $$23492: $$23519: .incbin "baserom.dol", 0x438D74, 0x1C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21779 $$21779: .incbin "baserom.dol", 0x499490, 0x1 diff --git a/asm/bte/btu_hcif.s b/asm/bte/btu_hcif.s index d5b85799..ba4e2e53 100644 --- a/asm/bte/btu_hcif.s +++ b/asm/bte/btu_hcif.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btu_hcif_process_event btu_hcif_process_event: /* 8008822C 0008406C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1320,7 +1320,7 @@ btu_hcif_link_key_notification_evt: /* 80089480 000852C0 38 21 00 20 */ addi r1, r1, 0x20 /* 80089484 000852C4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22212 $$22212: .incbin "baserom.dol", 0x438D90, 0x18 diff --git a/asm/bte/btu_init.s b/asm/bte/btu_init.s index feb1628f..56de2ce6 100644 --- a/asm/bte/btu_init.s +++ b/asm/bte/btu_init.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btu_init_core btu_init_core: /* 80089488 000852C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -37,7 +37,7 @@ BTE_Init: /* 800894F8 00085338 38 21 00 10 */ addi r1, r1, 0x10 /* 800894FC 0008533C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global BT_BD_ANY BT_BD_ANY: .incbin "baserom.dol", 0x499498, 0x8 diff --git a/asm/bte/btu_task1.s b/asm/bte/btu_task1.s index f1511b8e..50276774 100644 --- a/asm/bte/btu_task1.s +++ b/asm/bte/btu_task1.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btu_task_init btu_task_init: /* 80077AF0 00073930 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -330,7 +330,7 @@ btu_stop_timer: /* 80077F2C 00073D6C 38 65 00 40 */ addi r3, r5, 0x40 /* 80077F30 00073D70 4B FF E1 60 */ b GKI_remove_from_timer_list -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global btu_count btu_count: .incbin "baserom.dol", 0x492CD0, 0x4 diff --git a/asm/bte/gap_api.s b/asm/bte/gap_api.s index 00fce0e9..f36db09a 100644 --- a/asm/bte/gap_api.s +++ b/asm/bte/gap_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GAP_Init GAP_Init: /* 800895E0 00085420 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/gap_conn.s b/asm/bte/gap_conn.s index eec6928f..aeabe0fe 100644 --- a/asm/bte/gap_conn.s +++ b/asm/bte/gap_conn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global gap_conn_init gap_conn_init: /* 80089640 00085480 3D 40 80 09 */ lis r10, gap_connect_ind@ha @@ -827,7 +827,7 @@ lbl_8008A164: /* 8008A174 00085FB4 38 21 00 10 */ addi r1, r1, 0x10 /* 8008A178 00085FB8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21709 $$21709: .incbin "baserom.dol", 0x438E20, 0x44 @@ -841,7 +841,7 @@ $$21777: $$21798: .incbin "baserom.dol", 0x438EB8, 0x38 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21708 $$21708: .incbin "baserom.dol", 0x492CF8, 0x8 diff --git a/asm/bte/gap_utils.s b/asm/bte/gap_utils.s index e97f4a96..f17a368d 100644 --- a/asm/bte/gap_utils.s +++ b/asm/bte/gap_utils.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btm_cback btm_cback: /* 8008A17C 00085FBC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -443,7 +443,7 @@ lbl_8008A790: /* 8008A790 000865D0 38 60 01 14 */ li r3, 0x114 /* 8008A794 000865D4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2882 $$2882: .incbin "baserom.dol", 0x438EF0, 0x3C diff --git a/asm/bte/gki_buffer.s b/asm/bte/gki_buffer.s index 69c4a5bc..4457c84d 100644 --- a/asm/bte/gki_buffer.s +++ b/asm/bte/gki_buffer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global gki_init_free_queue gki_init_free_queue: /* 80074790 000705D0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1489,7 +1489,7 @@ lbl_80075C10: /* 80075C28 00071A68 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80075C2C 00071A6C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2749 $$2749: .incbin "baserom.dol", 0x436968, 0x18 diff --git a/asm/bte/gki_ppc.s b/asm/bte/gki_ppc.s index 0c90b14b..b2593509 100644 --- a/asm/bte/gki_ppc.s +++ b/asm/bte/gki_ppc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GKI_init GKI_init: /* 800761C0 00072000 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/gki_time.s b/asm/bte/gki_time.s index 7b15655e..39313021 100644 --- a/asm/bte/gki_time.s +++ b/asm/bte/gki_time.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global gki_timers_init gki_timers_init: /* 80075C30 00071A70 3C 60 80 4D */ lis r3, gki_cb@ha diff --git a/asm/bte/hcicmds.s b/asm/bte/hcicmds.s index e51f121e..46e89c03 100644 --- a/asm/bte/hcicmds.s +++ b/asm/bte/hcicmds.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global btsnd_hcic_inquiry btsnd_hcic_inquiry: /* 8008A798 000865D8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2802,7 +2802,7 @@ lbl_8008CE9C: lbl_8008CEB0: /* 8008CEB0 00088CF0 4B FF B9 34 */ b btu_hcif_send_cmd -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21618 $$21618: .incbin "baserom.dol", 0x404218, 0x10 diff --git a/asm/bte/hcisu_h2.s b/asm/bte/hcisu_h2.s index 88d742a0..51e618a7 100644 --- a/asm/bte/hcisu_h2.s +++ b/asm/bte/hcisu_h2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global hcisu_h2_usb_cback hcisu_h2_usb_cback: /* 80076470 000722B0 2C 03 00 04 */ cmpwi r3, 4 @@ -489,12 +489,12 @@ hcisu_h2_handle_event: /* 80076B28 00072968 4E 80 00 20 */ blr /* 80076B2C 0007296C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global hcisu_h2 hcisu_h2: .incbin "baserom.dol", 0x403EE8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2530 $$2530: .incbin "baserom.dol", 0x436AB0, 0x3C @@ -502,7 +502,7 @@ $$2530: $$2531: .incbin "baserom.dol", 0x436AEC, 0x34 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global hcisu_preamble_table hcisu_preamble_table: .incbin "baserom.dol", 0x499448, 0x8 diff --git a/asm/bte/hidd_api.s b/asm/bte/hidd_api.s index 58e27dd3..d54a19f4 100644 --- a/asm/bte/hidd_api.s +++ b/asm/bte/hidd_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HID_DevInit HID_DevInit: /* 8008CEB4 00088CF4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/hidd_conn.s b/asm/bte/hidd_conn.s index 0000ed55..648fd831 100644 --- a/asm/bte/hidd_conn.s +++ b/asm/bte/hidd_conn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global hidd_conn_initiate hidd_conn_initiate: /* 8008CF1C 00088D5C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -56,7 +56,7 @@ lbl_8008CFC0: /* 8008CFD4 00088E14 38 21 00 20 */ addi r1, r1, 0x20 /* 8008CFD8 00088E18 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21275 $$21275: .incbin "baserom.dol", 0x4391E0, 0x18 diff --git a/asm/bte/hidd_mgmt.s b/asm/bte/hidd_mgmt.s index f0bca12f..0dbb097d 100644 --- a/asm/bte/hidd_mgmt.s +++ b/asm/bte/hidd_mgmt.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global hidd_proc_repage_timeout hidd_proc_repage_timeout: /* 8008CFDC 00088E1C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -58,7 +58,7 @@ lbl_8008D090: /* 8008D09C 00088EDC 38 21 00 10 */ addi r1, r1, 0x10 /* 8008D0A0 00088EE0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2651 $$2651: .incbin "baserom.dol", 0x439210, 0x20 diff --git a/asm/bte/hidd_pm.s b/asm/bte/hidd_pm.s index 2108fe29..60c1f34d 100644 --- a/asm/bte/hidd_pm.s +++ b/asm/bte/hidd_pm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global hidd_pm_set_now hidd_pm_set_now: /* 8008D0A4 00088EE4 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/bte/hidh_api.s b/asm/bte/hidh_api.s index 29ac3040..1d530967 100644 --- a/asm/bte/hidh_api.s +++ b/asm/bte/hidh_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HID_HostGetSDPRecord HID_HostGetSDPRecord: /* 8008D420 00089260 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -980,7 +980,7 @@ lbl_8008E184: /* 8008E198 00089FD8 38 21 00 20 */ addi r1, r1, 0x20 /* 8008E19C 00089FDC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21051 $$21051: .incbin "baserom.dol", 0x439230, 0x18 diff --git a/asm/bte/hidh_conn.s b/asm/bte/hidh_conn.s index f64c0743..ce011fc4 100644 --- a/asm/bte/hidh_conn.s +++ b/asm/bte/hidh_conn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global hidh_conn_reg hidh_conn_reg: /* 8008E1A0 00089FE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2308,12 +2308,12 @@ hidh_conn_dereg: /* 800901D8 0008C018 38 21 00 10 */ addi r1, r1, 0x10 /* 800901DC 0008C01C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global hst_reg_info hst_reg_info: .incbin "baserom.dol", 0x404228, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21580 $$21580: .incbin "baserom.dol", 0x439348, 0x20 diff --git a/asm/bte/l2c_api.s b/asm/bte/l2c_api.s index d0d97f30..c28a82be 100644 --- a/asm/bte/l2c_api.s +++ b/asm/bte/l2c_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global L2CA_Register L2CA_Register: /* 800901E0 0008C020 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -869,7 +869,7 @@ lbl_80090D9C: /* 80090DA0 0008CBE0 88 63 90 20 */ lbz r3, l2cb@l(r3) /* 80090DA4 0008CBE4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21653 $$21653: .incbin "baserom.dol", 0x439730, 0x30 diff --git a/asm/bte/l2c_csm.s b/asm/bte/l2c_csm.s index e72592cc..4fa254a7 100644 --- a/asm/bte/l2c_csm.s +++ b/asm/bte/l2c_csm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global l2c_csm_execute l2c_csm_execute: /* 80090DA8 0008CBE8 80 03 00 04 */ lwz r0, 4(r3) @@ -1431,7 +1431,7 @@ lbl_80092264: /* 8009227C 0008E0BC 38 21 00 20 */ addi r1, r1, 0x20 /* 80092280 0008E0C0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21658 $$21658: .incbin "baserom.dol", 0x439EC0, 0x24 diff --git a/asm/bte/l2c_link.s b/asm/bte/l2c_link.s index 8c4c6372..c29c54c5 100644 --- a/asm/bte/l2c_link.s +++ b/asm/bte/l2c_link.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global l2c_link_hci_conn_req l2c_link_hci_conn_req: /* 80092284 0008E0C4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1288,7 +1288,7 @@ lbl_80093400: /* 80093408 0008F248 38 21 00 10 */ addi r1, r1, 0x10 /* 8009340C 0008F24C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21744 $$21744: .incbin "baserom.dol", 0x43A6F8, 0x20 diff --git a/asm/bte/l2c_main.s b/asm/bte/l2c_main.s index a46eeb7b..c8b49124 100644 --- a/asm/bte/l2c_main.s +++ b/asm/bte/l2c_main.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global l2c_init l2c_init: /* 80093410 0008F250 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1119,7 +1119,7 @@ lbl_80094428: /* 80094438 00090278 38 21 00 20 */ addi r1, r1, 0x20 /* 8009443C 0009027C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21563 $$21563: .incbin "baserom.dol", 0x43A968, 0x24 diff --git a/asm/bte/l2c_utils.s b/asm/bte/l2c_utils.s index bf12edf0..6555255b 100644 --- a/asm/bte/l2c_utils.s +++ b/asm/bte/l2c_utils.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global l2cu_allocate_lcb l2cu_allocate_lcb: /* 80094440 00090280 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2210,7 +2210,7 @@ lbl_800962F4: /* 800962FC 0009213C 42 00 FF 3C */ bdnz lbl_80096238 /* 80096300 00092140 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22062 $$22062: .incbin "baserom.dol", 0x43AC68, 0x1C @@ -2230,7 +2230,7 @@ $$22327: $$22338: .incbin "baserom.dol", 0x43AD28, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22328 $$22328: .incbin "baserom.dol", 0x492D00, 0x8 diff --git a/asm/bte/port_api.s b/asm/bte/port_api.s index aa9af105..11dd199d 100644 --- a/asm/bte/port_api.s +++ b/asm/bte/port_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RFCOMM_Init RFCOMM_Init: /* 80096304 00092144 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/port_rfc.s b/asm/bte/port_rfc.s index 76a7ec20..415700c3 100644 --- a/asm/bte/port_rfc.s +++ b/asm/bte/port_rfc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PORT_StartCnf PORT_StartCnf: /* 80096354 00092194 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1448,7 +1448,7 @@ lbl_80097730: /* 80097748 00093588 38 21 00 20 */ addi r1, r1, 0x20 /* 8009774C 0009358C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21517 $$21517: .incbin "baserom.dol", 0x43AD50, 0x14 diff --git a/asm/bte/port_utils.s b/asm/bte/port_utils.s index efe074ab..df0e2779 100644 --- a/asm/bte/port_utils.s +++ b/asm/bte/port_utils.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global port_select_mtu port_select_mtu: /* 80097750 00093590 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -432,7 +432,7 @@ lbl_80097D14: /* 80097D20 00093B60 38 21 00 10 */ addi r1, r1, 0x10 /* 80097D24 00093B64 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21174 $$21174: .incbin "baserom.dol", 0x43B080, 0x20 diff --git a/asm/bte/ptim.s b/asm/bte/ptim.s index 52517aba..7f35892a 100644 --- a/asm/bte/ptim.s +++ b/asm/bte/ptim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ptim_init ptim_init: /* 800784A0 000742E0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/bte/rfc_l2cap_if.s b/asm/bte/rfc_l2cap_if.s index af75058f..0df27dce 100644 --- a/asm/bte/rfc_l2cap_if.s +++ b/asm/bte/rfc_l2cap_if.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global rfcomm_l2cap_if_init rfcomm_l2cap_if_init: /* 80097D28 00093B68 3C 60 80 09 */ lis r3, RFCOMM_ConnectInd@ha @@ -674,7 +674,7 @@ rfc_save_lcid_mcb: /* 80098654 00094494 90 64 00 3C */ stw r3, 0x3c(r4) /* 80098658 00094498 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2712 $$2712: .incbin "baserom.dol", 0x43B1C8, 0x1C diff --git a/asm/bte/rfc_mx_fsm.s b/asm/bte/rfc_mx_fsm.s index fdaa5d12..ae382f66 100644 --- a/asm/bte/rfc_mx_fsm.s +++ b/asm/bte/rfc_mx_fsm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global rfc_mx_sm_execute rfc_mx_sm_execute: /* 8009865C 0009449C 88 03 00 6C */ lbz r0, 0x6c(r3) @@ -867,7 +867,7 @@ lbl_80099288: /* 80099298 000950D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8009929C 000950DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2759 $$2759: .incbin "baserom.dol", 0x43B308, 0x1C diff --git a/asm/bte/rfc_port_fsm.s b/asm/bte/rfc_port_fsm.s index a1eb2db2..80686057 100644 --- a/asm/bte/rfc_port_fsm.s +++ b/asm/bte/rfc_port_fsm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global rfc_port_sm_execute rfc_port_sm_execute: /* 800992A0 000950E0 2C 03 00 00 */ cmpwi r3, 0 @@ -1244,7 +1244,7 @@ lbl_8009A424: /* 8009A434 00096274 98 03 00 08 */ stb r0, 8(r3) /* 8009A438 00096278 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21372 $$21372: .incbin "baserom.dol", 0x43B5C0, 0x14 diff --git a/asm/bte/rfc_port_if.s b/asm/bte/rfc_port_if.s index fd4fb5ea..4f81b6f1 100644 --- a/asm/bte/rfc_port_if.s +++ b/asm/bte/rfc_port_if.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RFCOMM_StartRsp RFCOMM_StartRsp: /* 8009A43C 0009627C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/rfc_ts_frames.s b/asm/bte/rfc_ts_frames.s index b7b47620..458a3bc3 100644 --- a/asm/bte/rfc_ts_frames.s +++ b/asm/bte/rfc_ts_frames.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global rfc_send_sabme rfc_send_sabme: /* 8009A968 000967A8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1588,7 +1588,7 @@ lbl_8009BF90: /* 8009BFA8 00097DE8 38 21 00 20 */ addi r1, r1, 0x20 /* 8009BFAC 00097DEC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21168 $$21168: .incbin "baserom.dol", 0x43B8E8, 0x10 @@ -1626,7 +1626,7 @@ $$21236: $$21237: .incbin "baserom.dol", 0x43B9B0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21171 $$21171: .incbin "baserom.dol", 0x492D10, 0x8 diff --git a/asm/bte/rfc_utils.s b/asm/bte/rfc_utils.s index 4c6e0d62..659b4a8a 100644 --- a/asm/bte/rfc_utils.s +++ b/asm/bte/rfc_utils.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global rfc_calc_fcs rfc_calc_fcs: /* 8009BFB0 00097DF0 3C A0 80 41 */ lis r5, rfc_crctable@ha @@ -588,12 +588,12 @@ lbl_8009C77C: /* 8009C788 000985C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8009C78C 000985CC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global rfc_crctable rfc_crctable: .incbin "baserom.dol", 0x404250, 0x100 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2688 $$2688: .incbin "baserom.dol", 0x43B9C0, 0x10 diff --git a/asm/bte/sdp_api.s b/asm/bte/sdp_api.s index 429df959..3f841e0e 100644 --- a/asm/bte/sdp_api.s +++ b/asm/bte/sdp_api.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SDP_InitDiscoveryDb SDP_InitDiscoveryDb: /* 8009C790 000985D0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1037,7 +1037,7 @@ lbl_8009D5E8: /* 8009D5F0 00099430 88 63 46 30 */ lbz r3, 0x4630(r3) /* 8009D5F4 00099434 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21415 $$21415: .incbin "baserom.dol", 0x43BA50, 0x50 diff --git a/asm/bte/sdp_db.s b/asm/bte/sdp_db.s index 90567cf2..5ec6f65f 100644 --- a/asm/bte/sdp_db.s +++ b/asm/bte/sdp_db.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global sdp_db_service_search sdp_db_service_search: /* 8009D5F8 00099438 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -933,7 +933,7 @@ lbl_8009E2AC: /* 8009E2BC 0009A0FC 38 21 00 30 */ addi r1, r1, 0x30 /* 8009E2C0 0009A100 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21330 $$21330: .incbin "baserom.dol", 0x43BAA0, 0x3C diff --git a/asm/bte/sdp_discovery.s b/asm/bte/sdp_discovery.s index c89bccfc..74ce84cb 100644 --- a/asm/bte/sdp_discovery.s +++ b/asm/bte/sdp_discovery.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global sdpu_build_uuid_seq sdpu_build_uuid_seq: /* 8009E2C4 0009A104 38 00 00 35 */ li r0, 0x35 @@ -1323,7 +1323,7 @@ lbl_8009F524: /* 8009F534 0009B374 38 21 00 40 */ addi r1, r1, 0x40 /* 8009F538 0009B378 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21493 $$21493: .incbin "baserom.dol", 0x43BB38, 0x28 diff --git a/asm/bte/sdp_main.s b/asm/bte/sdp_main.s index 43d4b6ae..baca5238 100644 --- a/asm/bte/sdp_main.s +++ b/asm/bte/sdp_main.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global sdp_init sdp_init: /* 8009F53C 0009B37C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -817,7 +817,7 @@ lbl_800A008C: /* 800A00A0 0009BEE0 38 21 00 10 */ addi r1, r1, 0x10 /* 800A00A4 0009BEE4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21261 $$21261: .incbin "baserom.dol", 0x43BC98, 0x14 diff --git a/asm/bte/sdp_server.s b/asm/bte/sdp_server.s index ba52d831..7697fc4b 100644 --- a/asm/bte/sdp_server.s +++ b/asm/bte/sdp_server.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global sdp_server_handle_client_req sdp_server_handle_client_req: /* 800A00A8 0009BEE8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -922,7 +922,7 @@ lbl_800A0DA0: /* 800A0DB0 0009CBF0 38 21 01 F0 */ addi r1, r1, 0x1f0 /* 800A0DB4 0009CBF4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21040 $$21040: .incbin "baserom.dol", 0x43BFF8, 0x24 diff --git a/asm/bte/sdp_utils.s b/asm/bte/sdp_utils.s index 13b9f7bb..116389d7 100644 --- a/asm/bte/sdp_utils.s +++ b/asm/bte/sdp_utils.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global sdpu_find_ccb_by_cid sdpu_find_ccb_by_cid: /* 800A0DB8 0009CBF8 3C 80 80 50 */ lis r4, sdp_cb@ha @@ -1183,12 +1183,12 @@ lbl_800A1DE8: /* 800A1DF8 0009DC38 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800A1DFC 0009DC3C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global sdp_base_uuid sdp_base_uuid: .incbin "baserom.dol", 0x404350, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21109 $$21109: .incbin "baserom.dol", 0x43C038, 0x44 diff --git a/asm/bte/utl.s b/asm/bte/utl.s index 2af4e27c..1c664672 100644 --- a/asm/bte/utl.s +++ b/asm/bte/utl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global utl_freebuf utl_freebuf: /* 80078680 000744C0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/bte/uusb_ppc.s b/asm/bte/uusb_ppc.s index f5adcb30..79705d97 100644 --- a/asm/bte/uusb_ppc.s +++ b/asm/bte/uusb_ppc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global uusb_CloseDeviceCB uusb_CloseDeviceCB: /* 80076B30 00072970 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -882,7 +882,7 @@ UUSB_Unregister: /* 80077798 000735D8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8007779C 000735DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global wait4hci wait4hci: .incbin "baserom.dol", 0x492C80, 0x4 diff --git a/asm/bte/wbt_ext.s b/asm/bte/wbt_ext.s index 8def567a..379ae66f 100644 --- a/asm/bte/wbt_ext.s +++ b/asm/bte/wbt_ext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WBT_ExtCreateRecord WBT_ExtCreateRecord: /* 80089500 00085340 94 21 FE E0 */ stwu r1, -0x120(r1) diff --git a/asm/cx/CXSecureUncompression.s b/asm/cx/CXSecureUncompression.s index dee7667f..e3bb7ea2 100644 --- a/asm/cx/CXSecureUncompression.s +++ b/asm/cx/CXSecureUncompression.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CXSecureUncompressLZ CXSecureUncompressLZ: /* 800470D0 00042F10 88 03 00 00 */ lbz r0, 0(r3) diff --git a/asm/cx/CXUncompression.s b/asm/cx/CXUncompression.s index c420e378..9fb17d3a 100644 --- a/asm/cx/CXUncompression.s +++ b/asm/cx/CXUncompression.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CXGetUncompressedSize CXGetUncompressedSize: /* 80047090 00042ED0 80 A3 00 00 */ lwz r5, 0(r3) diff --git a/asm/db/db.s b/asm/db/db.s index 086a6564..7098549f 100644 --- a/asm/db/db.s +++ b/asm/db/db.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DBIsDebuggerPresent DBIsDebuggerPresent: /* 8002BAB0 000278F0 80 6D E4 D8 */ lwz r3, __DBInterface-_SDA_BASE_(r13) diff --git a/asm/dsp/dsp.s b/asm/dsp/dsp.s index 19d0885f..8bae70f5 100644 --- a/asm/dsp/dsp.s +++ b/asm/dsp/dsp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DSPCheckMailToDSP DSPCheckMailToDSP: /* 800472F0 00043130 3C 60 CC 00 */ lis r3, 0xCC005000@ha @@ -183,7 +183,7 @@ lbl_80047534: /* 80047548 00043388 4E 80 00 20 */ blr /* 8004754C 0004338C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x4322C0, 0x48 @@ -197,7 +197,7 @@ $$22199: $$22200: .incbin "baserom.dol", 0x432334, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DSPVersion __DSPVersion: .incbin "baserom.dol", 0x492A10, 0x8 diff --git a/asm/dsp/dsp_debug.s b/asm/dsp/dsp_debug.s index 5e225c22..f8ce8612 100644 --- a/asm/dsp/dsp_debug.s +++ b/asm/dsp/dsp_debug.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __DSP_debug_printf __DSP_debug_printf: /* 80047550 00043390 94 21 FF 90 */ stwu r1, -0x70(r1) diff --git a/asm/dsp/dsp_task.s b/asm/dsp/dsp_task.s index b517ae08..99791c9c 100644 --- a/asm/dsp/dsp_task.s +++ b/asm/dsp/dsp_task.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __DSPHandler __DSPHandler: /* 800475A0 000433E0 94 21 FD 20 */ stwu r1, -0x2e0(r1) @@ -637,7 +637,7 @@ lbl_80047E18: /* 80047E38 00043C78 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80047E3C 00043C7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22654 $$22654: .incbin "baserom.dol", 0x432340, 0x20 diff --git a/asm/dvd/dvd.s b/asm/dvd/dvd.s index a065e4d7..e54639d7 100644 --- a/asm/dvd/dvd.s +++ b/asm/dvd/dvd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global StampCommand StampCommand: /* 8003A140 00035F80 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -5637,7 +5637,7 @@ lbl_8003F048: /* 8003F048 0003AE88 48 01 4D A8 */ b __wpadNoAlloc /* 8003F04C 0003AE8C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x42D360, 0x48 @@ -5669,7 +5669,7 @@ $$25040: $$25139: .incbin "baserom.dol", 0x42D76C, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDVersion __DVDVersion: .incbin "baserom.dol", 0x4929B8, 0x4 diff --git a/asm/dvd/dvdDeviceError.s b/asm/dvd/dvdDeviceError.s index 03e6606e..948f5eae 100644 --- a/asm/dvd/dvdDeviceError.s +++ b/asm/dvd/dvdDeviceError.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global lowCallback lowCallback: /* 8003FF50 0003BD90 90 6D E6 F0 */ stw r3, lowIntType-_SDA_BASE_(r13) @@ -193,12 +193,12 @@ lbl_800401C0: /* 800401D8 0003C018 4E 80 00 20 */ blr /* 800401DC 0003C01C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global __DVDDeviceErrorMessage __DVDDeviceErrorMessage: .incbin "baserom.dol", 0x403988, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2835 $$2835: .incbin "baserom.dol", 0x42DFA0, 0x3C @@ -221,12 +221,12 @@ $$2840: $$2841: .incbin "baserom.dol", 0x42E108, 0x30 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global lowDone lowDone: .incbin "baserom.dol", 0x4929D8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2850 $$2850: .incbin "baserom.dol", 0x4991E0, 0x8 diff --git a/asm/dvd/dvdFatal.s b/asm/dvd/dvdFatal.s index 52aa70ad..3518e180 100644 --- a/asm/dvd/dvdFatal.s +++ b/asm/dvd/dvdFatal.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __DVDShowFatalMessage __DVDShowFatalMessage: /* 8003FDE0 0003BC20 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -113,7 +113,7 @@ __DVDPrintFatalMessage: /* 8003FF48 0003BD88 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8003FF4C 0003BD8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global __DVDErrorMessageDefault __DVDErrorMessageDefault: .incbin "baserom.dol", 0x403950, 0x1C @@ -121,7 +121,7 @@ __DVDErrorMessageDefault: __DVDErrorMessageEurope: .incbin "baserom.dol", 0x40396C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21462 $$21462: .incbin "baserom.dol", 0x42D7D8, 0x90 @@ -159,12 +159,12 @@ $$21472: $$21473: .incbin "baserom.dol", 0x42DEF8, 0xA8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDErrorMessageChinaKorea __DVDErrorMessageChinaKorea: .incbin "baserom.dol", 0x4929D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21482 $$21482: .incbin "baserom.dol", 0x4991D8, 0x8 diff --git a/asm/dvd/dvd_broadway.s b/asm/dvd/dvd_broadway.s index ea36faf6..7e7ef7be 100644 --- a/asm/dvd/dvd_broadway.s +++ b/asm/dvd/dvd_broadway.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global doTransactionCallback doTransactionCallback: /* 800401E0 0003C020 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2762,7 +2762,7 @@ lbl_80042840: /* 80042858 0003E698 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004285C 0003E69C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$23815 $$23815: .incbin "baserom.dol", 0x42E138, 0x34 @@ -2974,7 +2974,7 @@ $$24320: $$24332: .incbin "baserom.dol", 0x42F000, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global DiFD DiFD: .incbin "baserom.dol", 0x4929E0, 0x8 diff --git a/asm/dvd/dvderror.s b/asm/dvd/dvderror.s index 6ea4dfb0..a7c41f7a 100644 --- a/asm/dvd/dvderror.s +++ b/asm/dvd/dvderror.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global cbForNandClose cbForNandClose: /* 8003F2D0 0003B110 81 8D E6 E0 */ lwz r12, Callback-_SDA_BASE_(r13) @@ -722,7 +722,7 @@ __DVDStoreErrorCode: /* 8003FCE8 0003BB28 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8003FCEC 0003BB2C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21459 $$21459: .incbin "baserom.dol", 0x42D7A8, 0x1C diff --git a/asm/dvd/dvdfs.s b/asm/dvd/dvdfs.s index 1d1d7a56..77a9c954 100644 --- a/asm/dvd/dvdfs.s +++ b/asm/dvd/dvdfs.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __DVDFSInit __DVDFSInit: /* 800398F0 00035730 3C 60 80 00 */ lis r3, 0x80000038@ha @@ -635,7 +635,7 @@ cbForReadSync: /* 8003A138 00035F78 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8003A13C 00035F7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21638 $$21638: .incbin "baserom.dol", 0x42D1F8, 0xC8 @@ -649,7 +649,7 @@ $$21762: $$21787: .incbin "baserom.dol", 0x42D32C, 0x34 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __DVDLongFileNameFlag __DVDLongFileNameFlag: .incbin "baserom.dol", 0x4929A8, 0x8 diff --git a/asm/dvd/dvdidutils.s b/asm/dvd/dvdidutils.s index f527fb8f..a61c7f51 100644 --- a/asm/dvd/dvdidutils.s +++ b/asm/dvd/dvdidutils.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DVDCompareDiskID DVDCompareDiskID: /* 8003FCF0 0003BB30 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/dvd/dvdqueue.s b/asm/dvd/dvdqueue.s index 30304968..81376433 100644 --- a/asm/dvd/dvdqueue.s +++ b/asm/dvd/dvdqueue.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __DVDClearWaitingQueue __DVDClearWaitingQueue: /* 8003F050 0003AE90 3C C0 80 4A */ lis r6, WaitingQueue@ha diff --git a/asm/enc/encunicode.s b/asm/enc/encunicode.s index b78a3b79..57618db4 100644 --- a/asm/enc/encunicode.s +++ b/asm/enc/encunicode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ENCConvertStringUtf8ToUtf16 ENCConvertStringUtf8ToUtf16: /* 8004D990 000497D0 38 E0 00 00 */ li r7, 0 diff --git a/asm/enc/encutility.s b/asm/enc/encutility.s index ea77c2db..cb1b9af5 100644 --- a/asm/enc/encutility.s +++ b/asm/enc/encutility.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ENCiCheckParameters ENCiCheckParameters: /* 8004D750 00049590 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -174,12 +174,12 @@ lbl_8004D974: /* 8004D988 000497C8 38 21 00 20 */ addi r1, r1, 0x20 /* 8004D98C 000497CC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2669 $$2669: .incbin "baserom.dol", 0x434550, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __ENCVersion __ENCVersion: .incbin "baserom.dol", 0x492B78, 0x8 diff --git a/asm/esp/esp.s b/asm/esp/esp.s index 7704d858..22a64306 100644 --- a/asm/esp/esp.s +++ b/asm/esp/esp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ESP_InitLib ESP_InitLib: /* 800A2020 0009DE60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -456,7 +456,7 @@ lbl_800A2628: /* 800A2638 0009E478 7D 41 53 78 */ mr r1, r10 /* 800A263C 0009E47C 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __esFd __esFd: .incbin "baserom.dol", 0x492D28, 0x8 diff --git a/asm/euart/euart.s b/asm/euart/euart.s index 85a83a1e..90b88ba4 100644 --- a/asm/euart/euart.s +++ b/asm/euart/euart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global EUARTInit EUARTInit: /* 80072ED0 0006ED10 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/exi/EXIBios.s b/asm/exi/EXIBios.s index ba0cec2a..9ed900ab 100644 --- a/asm/exi/EXIBios.s +++ b/asm/exi/EXIBios.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetExiInterruptMask SetExiInterruptMask: /* 800285F0 00024430 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1778,12 +1778,12 @@ lbl_80029ED0: /* 80029EE8 00025D28 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80029EEC 00025D2C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x42BC40, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __EXIVersion __EXIVersion: .incbin "baserom.dol", 0x4928F8, 0x8 diff --git a/asm/exi/EXICommon.s b/asm/exi/EXICommon.s index 135d9605..0e1c5bf1 100644 --- a/asm/exi/EXICommon.s +++ b/asm/exi/EXICommon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global EXIWriteReg EXIWriteReg: /* 8002A230 00026070 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -111,7 +111,7 @@ lbl_8002A39C: /* 8002A3B8 000261F8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8002A3BC 000261FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __EXIFreq __EXIFreq: .incbin "baserom.dol", 0x499068, 0x8 diff --git a/asm/exi/EXIUart.s b/asm/exi/EXIUart.s index cb30957f..fa324b9a 100644 --- a/asm/exi/EXIUart.s +++ b/asm/exi/EXIUart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ProbeBarnacle ProbeBarnacle: /* 80029EF0 00025D30 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/fs/fs.s b/asm/fs/fs.s index fc33d39d..bdc39c65 100644 --- a/asm/fs/fs.s +++ b/asm/fs/fs.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ISFS_OpenLib ISFS_OpenLib: /* 80050BC0 0004CA00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1655,12 +1655,12 @@ lbl_80052288: /* 80052298 0004E0D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8005229C 0004E0DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21709 $$21709: .incbin "baserom.dol", 0x434608, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __fsFd __fsFd: .incbin "baserom.dol", 0x492B90, 0x8 diff --git a/asm/gx/GXAttr.s b/asm/gx/GXAttr.s index 5fde0e93..7c09af37 100644 --- a/asm/gx/GXAttr.s +++ b/asm/gx/GXAttr.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXSetVtxDesc GXSetVtxDesc: /* 800337A0 0002F5E0 28 03 00 19 */ cmplwi r3, 0x19 @@ -1074,7 +1074,7 @@ GXSetNumTexGens: /* 80034708 00030548 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8003470C 0003054C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$23194 $$23194: .incbin "baserom.dol", 0x42CB70, 0x68 @@ -1094,7 +1094,7 @@ $$23456: $$23589: .incbin "baserom.dol", 0x42CD0C, 0x54 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2__GXCalculateVLim__Fv$$2tbl1 $$2LOCAL$$2__GXCalculateVLim__Fv$$2tbl1: .incbin "baserom.dol", 0x492950, 0x4 diff --git a/asm/gx/GXBump.s b/asm/gx/GXBump.s index c2a4cc5f..5b3130b0 100644 --- a/asm/gx/GXBump.s +++ b/asm/gx/GXBump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXSetTevIndirect GXSetTevIndirect: /* 80037770 000335B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -315,7 +315,7 @@ __GXFlushTextureState: /* 80037BB8 000339F8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80037BBC 000339FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22555 $$22555: .incbin "baserom.dol", 0x499168, 0x8 diff --git a/asm/gx/GXDisplayList.s b/asm/gx/GXDisplayList.s index 700f327f..c89c2277 100644 --- a/asm/gx/GXDisplayList.s +++ b/asm/gx/GXDisplayList.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXCallDisplayList GXCallDisplayList: /* 80038A50 00034890 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/gx/GXFifo.s b/asm/gx/GXFifo.s index 892d089e..3c277fab 100644 --- a/asm/gx/GXFifo.s +++ b/asm/gx/GXFifo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXCPInterruptHandler GXCPInterruptHandler: /* 80032DB0 0002EBF0 94 21 FD 20 */ stwu r1, -0x2e0(r1) @@ -692,7 +692,7 @@ GXResetOverflowCount: /* 80033798 0002F5D8 90 0D E5 DC */ stw r0, __GXOverflowCount-_SDA_BASE_(r13) /* 8003379C 0002F5DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21961 $$21961: .incbin "baserom.dol", 0x42CB40, 0x18 diff --git a/asm/gx/GXFrameBuf.s b/asm/gx/GXFrameBuf.s index ba6573a6..4fb6b00b 100644 --- a/asm/gx/GXFrameBuf.s +++ b/asm/gx/GXFrameBuf.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXSetDispCopySrc GXSetDispCopySrc: /* 80035600 00031440 81 02 86 08 */ lwz r8, __GXData-_SDA2_BASE_(r2) @@ -596,7 +596,7 @@ GXClearBoundingBox: /* 80035E48 00031C88 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80035E4C 00031C8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global GXNtsc480IntDf GXNtsc480IntDf: .incbin "baserom.dol", 0x42CD60, 0x3C @@ -610,7 +610,7 @@ GXPal528IntDf: GXEurgb60Hz480IntDf: .incbin "baserom.dol", 0x42CE14, 0x3C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22195 $$22195: .incbin "baserom.dol", 0x4990F0, 0x8 diff --git a/asm/gx/GXGeometry.s b/asm/gx/GXGeometry.s index 04e70f46..6d4e4604 100644 --- a/asm/gx/GXGeometry.s +++ b/asm/gx/GXGeometry.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __GXSetDirtyState __GXSetDirtyState: /* 80034FF0 00030E30 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/gx/GXInit.s b/asm/gx/GXInit.s index ae70909a..5e28dc7f 100644 --- a/asm/gx/GXInit.s +++ b/asm/gx/GXInit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __GXDefaultTexRegionCallback __GXDefaultTexRegionCallback: /* 80031C20 0002DA60 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1176,7 +1176,7 @@ lbl_80032CA8: /* 80032DA8 0002EBE8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80032DAC 0002EBEC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x42C900, 0x60 @@ -1196,12 +1196,12 @@ GXTexRegionAddrTable: GXShutdownFuncInfo: .incbin "baserom.dol", 0x42CB30, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __GXVersion __GXVersion: .incbin "baserom.dol", 0x492948, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __GXData __GXData: .incbin "baserom.dol", 0x4990C8, 0x4 diff --git a/asm/gx/GXLight.s b/asm/gx/GXLight.s index c31ffe13..1995f21f 100644 --- a/asm/gx/GXLight.s +++ b/asm/gx/GXLight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXInitLightAttn GXInitLightAttn: /* 80035E50 00031C90 D0 23 00 10 */ stfs f1, 0x10(r3) @@ -560,7 +560,7 @@ lbl_80036598: /* 800365B8 000323F8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800365BC 000323FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22975 $$22975: .incbin "baserom.dol", 0x4990F8, 0x4 diff --git a/asm/gx/GXMisc.s b/asm/gx/GXMisc.s index e53115ad..29c40d02 100644 --- a/asm/gx/GXMisc.s +++ b/asm/gx/GXMisc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXSetMisc GXSetMisc: /* 80034710 00030550 2C 03 00 01 */ cmpwi r3, 1 diff --git a/asm/gx/GXPerf.s b/asm/gx/GXPerf.s index 03302fb1..650e7bdd 100644 --- a/asm/gx/GXPerf.s +++ b/asm/gx/GXPerf.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXSetGPMetric GXSetGPMetric: /* 800390C0 00034F00 80 A2 86 08 */ lwz r5, __GXData-_SDA2_BASE_(r2) @@ -541,7 +541,7 @@ GXClearGPMetric: /* 800398E8 00035728 B0 03 00 04 */ sth r0, 4(r3) /* 800398EC 0003572C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$23023 $$23023: .incbin "baserom.dol", 0x42D110, 0x58 diff --git a/asm/gx/GXPixel.s b/asm/gx/GXPixel.s index c07411b4..370a7fb8 100644 --- a/asm/gx/GXPixel.s +++ b/asm/gx/GXPixel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXSetFog GXSetFog: /* 80038290 000340D0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -560,12 +560,12 @@ GXSetFieldMode: /* 80038A48 00034888 38 21 00 20 */ addi r1, r1, 0x20 /* 80038A4C 0003488C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GXSetPixelFmt__F11_GXPixelFmt9_GXZFmt16$$2p2f $$2LOCAL$$2GXSetPixelFmt__F11_GXPixelFmt9_GXZFmt16$$2p2f: .incbin "baserom.dol", 0x42D0F0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22990 $$22990: .incbin "baserom.dol", 0x499170, 0x4 diff --git a/asm/gx/GXTev.s b/asm/gx/GXTev.s index 4c64c5cf..32073d7b 100644 --- a/asm/gx/GXTev.s +++ b/asm/gx/GXTev.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXSetTevOp GXSetTevOp: /* 80037BC0 00033A00 2C 03 00 00 */ cmpwi r3, 0 @@ -510,7 +510,7 @@ GXSetNumTevStages: /* 80038288 000340C8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8003828C 000340CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global TEVCOpTableST0 TEVCOpTableST0: .incbin "baserom.dol", 0x42D078, 0x14 diff --git a/asm/gx/GXTexture.s b/asm/gx/GXTexture.s index ab118a02..a5529bce 100644 --- a/asm/gx/GXTexture.s +++ b/asm/gx/GXTexture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXGetTexBufferSize GXGetTexBufferSize: /* 800365C0 00032400 28 05 00 3C */ cmplwi r5, 0x3c @@ -1282,7 +1282,7 @@ lbl_80037760: /* 80037768 000335A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8003776C 000335AC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22689 $$22689: .incbin "baserom.dol", 0x42CE50, 0xF4 @@ -1293,7 +1293,7 @@ $$22732: $$22762: .incbin "baserom.dol", 0x42D038, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global GXTexMode0Ids GXTexMode0Ids: .incbin "baserom.dol", 0x492960, 0x8 @@ -1322,7 +1322,7 @@ GX2HWFiltConv: HW2GXFiltConv: .incbin "baserom.dol", 0x4929A0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22756 $$22756: .incbin "baserom.dol", 0x499130, 0x8 diff --git a/asm/gx/GXTransform.s b/asm/gx/GXTransform.s index 16212ca1..459f08aa 100644 --- a/asm/gx/GXTransform.s +++ b/asm/gx/GXTransform.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __GXSetProjection __GXSetProjection: /* 80038AD0 00034910 3C 80 CC 01 */ lis r4, 0xCC008000@ha @@ -449,7 +449,7 @@ lbl_800390AC: /* 800390B8 00034EF8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800390BC 00034EFC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22517 $$22517: .incbin "baserom.dol", 0x4991C0, 0x4 diff --git a/asm/homebuttonLib/HBMAnmController.s b/asm/homebuttonLib/HBMAnmController.s index f9a95dd0..0cafdf92 100644 --- a/asm/homebuttonLib/HBMAnmController.s +++ b/asm/homebuttonLib/HBMAnmController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q210homebutton18GroupAnmControllerFv __ct__Q210homebutton18GroupAnmControllerFv: /* 80128780 001245C0 3C 80 80 44 */ lis r4, __vt__Q210homebutton18GroupAnmController@ha @@ -70,7 +70,7 @@ lbl_80128838: /* 80128858 00124698 38 21 00 20 */ addi r1, r1, 0x20 /* 8012885C 0012469C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q210homebutton18GroupAnmController __vt__Q210homebutton18GroupAnmController: .incbin "baserom.dol", 0x43EAE0, 0x10 diff --git a/asm/homebuttonLib/HBMAxSound.s b/asm/homebuttonLib/HBMAxSound.s index 6ee79f65..7e29e5e7 100644 --- a/asm/homebuttonLib/HBMAxSound.s +++ b/asm/homebuttonLib/HBMAxSound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetFreePlayer__24$$2unnamed$$2HBMAxSound_cpp$$2Fi GetFreePlayer__24$$2unnamed$$2HBMAxSound_cpp$$2Fi: /* 8012B560 001273A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -818,7 +818,7 @@ SetSoundMode__10homebuttonFUl: /* 8012C078 00127EB8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8012C07C 00127EBC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global WT_FILENAME__24$$2unnamed$$2HBMAxSound_cpp$$2 WT_FILENAME__24$$2unnamed$$2HBMAxSound_cpp$$2: .incbin "baserom.dol", 0x409F08, 0x14 @@ -835,7 +835,7 @@ $$27518: $$27519: .incbin "baserom.dol", 0x409F38, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$26775 $$26775: .incbin "baserom.dol", 0x43EDC8, 0x18 diff --git a/asm/homebuttonLib/HBMBase.s b/asm/homebuttonLib/HBMBase.s index e3b96181..095770e5 100644 --- a/asm/homebuttonLib/HBMBase.s +++ b/asm/homebuttonLib/HBMBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global initgx__10homebuttonFv initgx__10homebuttonFv: /* 8012C410 00128250 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -9689,7 +9689,7 @@ lbl_80134CE0: /* 80134D08 00130B48 38 21 00 10 */ addi r1, r1, 0x10 /* 80134D0C 00130B4C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29436 $$29436: .incbin "baserom.dol", 0x409F40, 0x8 @@ -9841,7 +9841,7 @@ scSoundThreadPrio__Q210homebutton10HomeButton: scDvdThreadPrio__Q210homebutton10HomeButton: .incbin "baserom.dol", 0x40A2B8, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$29521 $$29521: .incbin "baserom.dol", 0x43F168, 0x10 diff --git a/asm/homebuttonLib/HBMCommon.s b/asm/homebuttonLib/HBMCommon.s index d005ce57..ae7a211d 100644 --- a/asm/homebuttonLib/HBMCommon.s +++ b/asm/homebuttonLib/HBMCommon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HBMAllocMem__FUl HBMAllocMem__FUl: /* 8012C080 00127EC0 3C A0 80 44 */ lis r5, spAllocator@ha @@ -280,7 +280,7 @@ HBMUpdateSound: /* 8012C408 00128248 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8012C40C 0012824C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$29367 $$29367: .incbin "baserom.dol", 0x43F118, 0x48 diff --git a/asm/homebuttonLib/HBMController.s b/asm/homebuttonLib/HBMController.s index 9b982e0c..73ea9fc8 100644 --- a/asm/homebuttonLib/HBMController.s +++ b/asm/homebuttonLib/HBMController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global wpadConnectCallback__Q210homebutton10ControllerFll wpadConnectCallback__Q210homebutton10ControllerFll: /* 8012A020 00125E60 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -892,7 +892,7 @@ clrBatteryFlag__Q210homebutton10ControllerFv: /* 8012AC38 00126A78 7C 03 21 AE */ stbx r0, r3, r4 /* 8012AC3C 00126A7C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29283 $$29283: .incbin "baserom.dol", 0x409EF8, 0x4 diff --git a/asm/homebuttonLib/HBMFrameController.s b/asm/homebuttonLib/HBMFrameController.s index 858141d9..989db86d 100644 --- a/asm/homebuttonLib/HBMFrameController.s +++ b/asm/homebuttonLib/HBMFrameController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global init__Q210homebutton15FrameControllerFifff init__Q210homebutton15FrameControllerFifff: /* 801285D0 00124410 2C 04 00 01 */ cmpwi r4, 1 @@ -127,12 +127,12 @@ lbl_8012874C: /* 80128778 001245B8 4E 80 00 20 */ blr /* 8012877C 001245BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$22246 $$22246: .incbin "baserom.dol", 0x409EE0, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22206 $$22206: .incbin "baserom.dol", 0x43EAB8, 0x20 diff --git a/asm/homebuttonLib/HBMGUIManager.s b/asm/homebuttonLib/HBMGUIManager.s index 05a1de05..9e541cb0 100644 --- a/asm/homebuttonLib/HBMGUIManager.s +++ b/asm/homebuttonLib/HBMGUIManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global drawLine___Q210homebutton3guiFfffffUcR8_GXColor drawLine___Q210homebutton3guiFfffffUcR8_GXColor: /* 80128860 001246A0 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -1801,7 +1801,7 @@ setDrawInfo__Q310homebutton3gui11PaneManagerFPCQ36nw4hbm3lyt8DrawInfo: /* 8012A018 00125E58 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8012A01C 00125E5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29996 $$29996: .incbin "baserom.dol", 0x409EE8, 0x4 @@ -1815,7 +1815,7 @@ $$210512: $$2LOCAL$$2drawLine___Q210homebutton3guiFfffffUcR8_GXColor$$2cubeScale: .incbin "baserom.dol", 0x409EF4, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q310homebutton3gui13PaneComponent __vt__Q310homebutton3gui13PaneComponent: .incbin "baserom.dol", 0x43EB28, 0x68 diff --git a/asm/homebuttonLib/HBMRemoteSpk.s b/asm/homebuttonLib/HBMRemoteSpk.s index c0492ec1..8fc5295a 100644 --- a/asm/homebuttonLib/HBMRemoteSpk.s +++ b/asm/homebuttonLib/HBMRemoteSpk.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global UpdateSpeaker__Q210homebutton9RemoteSpkFP7OSAlarmP9OSContext UpdateSpeaker__Q210homebutton9RemoteSpkFP7OSAlarmP9OSContext: /* 8012AC40 00126A80 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -664,7 +664,7 @@ isPlayReady__Q210homebutton9RemoteSpkCFl: /* 8012B558 00127398 4E 80 00 20 */ blr /* 8012B55C 0012739C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q210homebutton9RemoteSpk __vt__Q210homebutton9RemoteSpk: .incbin "baserom.dol", 0x43ED98, 0xC diff --git a/asm/homebuttonLib/lyt_animation.s b/asm/homebuttonLib/lyt_animation.s index 03d05eb5..f907f750 100644 --- a/asm/homebuttonLib/lyt_animation.s +++ b/asm/homebuttonLib/lyt_animation.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetStepCurveValue__27$$2unnamed$$2lyt_animation_cpp$$2FfPCQ46nw4hbm3lyt3res7StepKeyUl GetStepCurveValue__27$$2unnamed$$2lyt_animation_cpp$$2FfPCQ46nw4hbm3lyt3res7StepKeyUl: /* 80134D10 00130B50 28 04 00 01 */ cmplwi r4, 1 @@ -825,7 +825,7 @@ lbl_8013582C: /* 80135868 001316A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8013586C 001316AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$28495 $$28495: .incbin "baserom.dol", 0x40A2C0, 0x4 @@ -851,7 +851,7 @@ $$28528: $$28717: .incbin "baserom.dol", 0x40A2DC, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt18AnimTransformBasic __vt__Q36nw4hbm3lyt18AnimTransformBasic: .incbin "baserom.dol", 0x43FE80, 0x20 diff --git a/asm/homebuttonLib/lyt_arcResourceAccessor.s b/asm/homebuttonLib/lyt_arcResourceAccessor.s index 1f44dc40..74a7055e 100644 --- a/asm/homebuttonLib/lyt_arcResourceAccessor.s +++ b/asm/homebuttonLib/lyt_arcResourceAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global FindNameResource__37$$2unnamed$$2lyt_arcResourceAccessor_cpp$$2FP9ARCHandlePCc FindNameResource__37$$2unnamed$$2lyt_arcResourceAccessor_cpp$$2FP9ARCHandlePCc: /* 80135870 001316B0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -202,7 +202,7 @@ GetFont__Q36nw4hbm3lyt19ArcResourceAccessorFPCc: /* 80135B28 00131968 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80135B2C 0013196C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$23471 $$23471: .incbin "baserom.dol", 0x43FF00, 0x4 diff --git a/asm/homebuttonLib/lyt_bounding.s b/asm/homebuttonLib/lyt_bounding.s index d9a65709..5d0db30e 100644 --- a/asm/homebuttonLib/lyt_bounding.s +++ b/asm/homebuttonLib/lyt_bounding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm3lyt8BoundingFPCQ46nw4hbm3lyt3res8BoundingRCQ36nw4hbm3lyt11ResBlockSet __ct__Q36nw4hbm3lyt8BoundingFPCQ46nw4hbm3lyt3res8BoundingRCQ36nw4hbm3lyt11ResBlockSet: /* 80135B30 00131970 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -105,10 +105,10 @@ __sinit_$$3lyt_bounding_cpp: /* 80135C78 00131AB8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80135C7C 00131ABC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023C4, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt8Bounding __vt__Q36nw4hbm3lyt8Bounding: .incbin "baserom.dol", 0x43FF80, 0x64 diff --git a/asm/homebuttonLib/lyt_common.s b/asm/homebuttonLib/lyt_common.s index 73d7ba74..d1fe25a8 100644 --- a/asm/homebuttonLib/lyt_common.s +++ b/asm/homebuttonLib/lyt_common.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TestFileHeader__Q36nw4hbm3lyt6detailFRCQ46nw4hbm3lyt3res16BinaryFileHeader TestFileHeader__Q36nw4hbm3lyt6detailFRCQ46nw4hbm3lyt3res16BinaryFileHeader: /* 80135C80 00131AC0 A0 03 00 04 */ lhz r0, 4(r3) @@ -820,7 +820,7 @@ lbl_801367CC: /* 80136838 00132678 38 21 00 30 */ addi r1, r1, 0x30 /* 8013683C 0013267C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$27898 $$27898: .incbin "baserom.dol", 0x40A2E0, 0x4 diff --git a/asm/homebuttonLib/lyt_drawInfo.s b/asm/homebuttonLib/lyt_drawInfo.s index 02db8e9c..74509593 100644 --- a/asm/homebuttonLib/lyt_drawInfo.s +++ b/asm/homebuttonLib/lyt_drawInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm3lyt8DrawInfoFv __ct__Q36nw4hbm3lyt8DrawInfoFv: /* 80136840 00132680 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -43,7 +43,7 @@ __dt__Q36nw4hbm3lyt8DrawInfoFv: /* 801368C8 00132708 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 801368CC 0013270C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$25011 $$25011: .incbin "baserom.dol", 0x40A2F0, 0x4 @@ -51,7 +51,7 @@ $$25011: $$25012: .incbin "baserom.dol", 0x40A2F4, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt8DrawInfo __vt__Q36nw4hbm3lyt8DrawInfo: .incbin "baserom.dol", 0x440068, 0xC diff --git a/asm/homebuttonLib/lyt_group.s b/asm/homebuttonLib/lyt_group.s index 3eb7e666..b5d8b4e3 100644 --- a/asm/homebuttonLib/lyt_group.s +++ b/asm/homebuttonLib/lyt_group.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm3lyt5GroupFPCQ46nw4hbm3lyt3res5GroupPQ36nw4hbm3lyt4Pane __ct__Q36nw4hbm3lyt5GroupFPCQ46nw4hbm3lyt3res5GroupPQ36nw4hbm3lyt4Pane: /* 801368D0 00132710 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -244,7 +244,7 @@ lbl_80136BFC: /* 80136C18 00132A58 4E 80 00 20 */ blr /* 80136C1C 00132A5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt5Group __vt__Q36nw4hbm3lyt5Group: .incbin "baserom.dol", 0x440098, 0xC diff --git a/asm/homebuttonLib/lyt_layout.s b/asm/homebuttonLib/lyt_layout.s index f67aed74..3d41c511 100644 --- a/asm/homebuttonLib/lyt_layout.s +++ b/asm/homebuttonLib/lyt_layout.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetTagProcessorImpl__24$$2unnamed$$2lyt_layout_cpp$$2FPQ36nw4hbm3lyt4PanePQ36nw4hbm2ut19TagProcessorBase$$0w$$1 SetTagProcessorImpl__24$$2unnamed$$2lyt_layout_cpp$$2FPQ36nw4hbm3lyt4PanePQ36nw4hbm2ut19TagProcessorBase$$0w$$1: /* 80136C20 00132A60 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -944,7 +944,7 @@ lbl_80137858: /* 80137868 001336A8 4E 80 00 20 */ blr /* 8013786C 001336AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29387 $$29387: .incbin "baserom.dol", 0x40A2F8, 0x4 @@ -952,7 +952,7 @@ $$29387: $$29664: .incbin "baserom.dol", 0x40A2FC, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt6Layout __vt__Q36nw4hbm3lyt6Layout: .incbin "baserom.dol", 0x4400C0, 0x34 diff --git a/asm/homebuttonLib/lyt_material.s b/asm/homebuttonLib/lyt_material.s index 83ab7c24..03d79ad8 100644 --- a/asm/homebuttonLib/lyt_material.s +++ b/asm/homebuttonLib/lyt_material.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcTextureMtx__26$$2unnamed$$2lyt_material_cpp$$2FPQ36nw4hbm4math5MTX34RCQ36nw4hbm3lyt6TexSRT CalcTextureMtx__26$$2unnamed$$2lyt_material_cpp$$2FPQ36nw4hbm4math5MTX34RCQ36nw4hbm3lyt6TexSRT: /* 80137870 001336B0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3433,7 +3433,7 @@ lbl_8013AA5C: /* 8013AA78 001368B8 38 21 00 60 */ addi r1, r1, 0x60 /* 8013AA7C 001368BC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global DefaultBlackColor DefaultBlackColor: .incbin "baserom.dol", 0x40A300, 0x8 @@ -3459,7 +3459,7 @@ $$29536: $$211974: .incbin "baserom.dol", 0x40A328, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2SetupGX__Q36nw4hbm3lyt8MaterialFbUc$$2kColSels $$2LOCAL$$2SetupGX__Q36nw4hbm3lyt8MaterialFbUc$$2kColSels: .incbin "baserom.dol", 0x440110, 0x20 diff --git a/asm/homebuttonLib/lyt_pane.s b/asm/homebuttonLib/lyt_pane.s index 7cb55580..92a93365 100644 --- a/asm/homebuttonLib/lyt_pane.s +++ b/asm/homebuttonLib/lyt_pane.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm3lyt4PaneFPCQ46nw4hbm3lyt3res4Pane __ct__Q36nw4hbm3lyt4PaneFPCQ46nw4hbm3lyt3res4Pane: /* 8013AA80 001368C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1237,10 +1237,10 @@ __sinit_$$3lyt_pane_cpp: /* 8013BB38 00137978 90 03 37 78 */ stw r0, typeInfo__Q36nw4hbm3lyt4Pane@l(r3) /* 8013BB3C 0013797C 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023C8, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29169 $$29169: .incbin "baserom.dol", 0x40A330, 0x4 @@ -1263,7 +1263,7 @@ $$29729: $$29733: .incbin "baserom.dol", 0x40A348, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt4Pane __vt__Q36nw4hbm3lyt4Pane: .incbin "baserom.dol", 0x440198, 0x68 diff --git a/asm/homebuttonLib/lyt_picture.s b/asm/homebuttonLib/lyt_picture.s index aaf52476..f725d1c2 100644 --- a/asm/homebuttonLib/lyt_picture.s +++ b/asm/homebuttonLib/lyt_picture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm3lyt7PictureFPCQ46nw4hbm3lyt3res7PictureRCQ36nw4hbm3lyt11ResBlockSet __ct__Q36nw4hbm3lyt7PictureFPCQ46nw4hbm3lyt3res7PictureRCQ36nw4hbm3lyt11ResBlockSet: /* 8013BB40 00137980 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -391,15 +391,15 @@ __sinit_$$3lyt_picture_cpp: /* 8013C098 00137ED8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8013C09C 00137EDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023CC, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$28171 $$28171: .incbin "baserom.dol", 0x40A350, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt7Picture __vt__Q36nw4hbm3lyt7Picture: .incbin "baserom.dol", 0x440200, 0x6C diff --git a/asm/homebuttonLib/lyt_resourceAccessor.s b/asm/homebuttonLib/lyt_resourceAccessor.s index 2155cf63..c9c8ef4e 100644 --- a/asm/homebuttonLib/lyt_resourceAccessor.s +++ b/asm/homebuttonLib/lyt_resourceAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q36nw4hbm3lyt16ResourceAccessorFv __dt__Q36nw4hbm3lyt16ResourceAccessorFv: /* 8013C0A0 00137EE0 4B F6 8D 10 */ b __dt__Q34nw4r2ef7EmitterFv @@ -22,7 +22,7 @@ GetFont__Q36nw4hbm3lyt16ResourceAccessorFPCc: /* 8013C0C8 00137F08 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8013C0CC 00137F0C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm3lyt16ResourceAccessor __vt__Q36nw4hbm3lyt16ResourceAccessor: .incbin "baserom.dol", 0x4402A0, 0x18 diff --git a/asm/homebuttonLib/lyt_textBox.s b/asm/homebuttonLib/lyt_textBox.s index ffd7bb78..b17168d8 100644 --- a/asm/homebuttonLib/lyt_textBox.s +++ b/asm/homebuttonLib/lyt_textBox.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm3lyt7TextBoxFPCQ46nw4hbm3lyt3res7TextBoxRCQ36nw4hbm3lyt11ResBlockSet __ct__Q36nw4hbm3lyt7TextBoxFPCQ46nw4hbm3lyt3res7TextBoxRCQ36nw4hbm3lyt11ResBlockSet: /* 8013C0D0 00137F10 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1427,10 +1427,10 @@ __sinit_$$3lyt_textBox_cpp: /* 8013D4E8 00139328 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8013D4EC 0013932C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023D0, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29376 $$29376: .incbin "baserom.dol", 0x40A358, 0x8 @@ -1444,7 +1444,7 @@ $$29671: $$29672: .incbin "baserom.dol", 0x40A36C, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$29987 $$29987: .incbin "baserom.dol", 0x4402B8, 0x4 diff --git a/asm/homebuttonLib/lyt_window.s b/asm/homebuttonLib/lyt_window.s index a2784f9e..6449ce92 100644 --- a/asm/homebuttonLib/lyt_window.s +++ b/asm/homebuttonLib/lyt_window.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm3lyt6WindowFPCQ46nw4hbm3lyt3res6WindowRCQ36nw4hbm3lyt11ResBlockSet __ct__Q36nw4hbm3lyt6WindowFPCQ46nw4hbm3lyt3res6WindowRCQ36nw4hbm3lyt11ResBlockSet: /* 8013D4F0 00139330 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2568,10 +2568,10 @@ __sinit_$$3lyt_window_cpp: /* 8013FB18 0013B958 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8013FB1C 0013B95C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023D4, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29107 $$29107: .incbin "baserom.dol", 0x40A370, 0x8 @@ -2582,7 +2582,7 @@ $$29114: $$29115: .incbin "baserom.dol", 0x40A380, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GetTexutreFlipInfo__24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos $$2LOCAL$$2GetTexutreFlipInfo__24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos: .incbin "baserom.dol", 0x440368, 0x3C diff --git a/asm/homebuttonLib/math_triangular.s b/asm/homebuttonLib/math_triangular.s index 0eba9eef..d4a5717f 100644 --- a/asm/homebuttonLib/math_triangular.s +++ b/asm/homebuttonLib/math_triangular.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SinFIdx__Q26nw4hbm4mathFf SinFIdx__Q26nw4hbm4mathFf: /* 8013FB20 0013B960 3C 60 80 41 */ lis r3, $$22723@ha @@ -198,7 +198,7 @@ lbl_8013FDC8: /* 8013FDC8 0013BC08 38 21 00 20 */ addi r1, r1, 0x20 /* 8013FDCC 0013BC0C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$22723 $$22723: .incbin "baserom.dol", 0x40A388, 0x4 @@ -227,7 +227,7 @@ $$22776: $$22777: .incbin "baserom.dol", 0x40A3A8, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global sSinCosTbl__Q36nw4hbm4math29$$2unnamed$$2math_triangular_cpp$$2 sSinCosTbl__Q36nw4hbm4math29$$2unnamed$$2math_triangular_cpp$$2: .incbin "baserom.dol", 0x440450, 0x1010 diff --git a/asm/homebuttonLib/mix.s b/asm/homebuttonLib/mix.s index 236d3550..ecbbe408 100644 --- a/asm/homebuttonLib/mix.s +++ b/asm/homebuttonLib/mix.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMMIXSetPan__FP13HBMMIXChannel __HBMMIXSetPan__FP13HBMMIXChannel: /* 80147EB0 00143CF0 3C 80 80 54 */ lis r4, __HBMMIXSoundMode@ha @@ -1860,7 +1860,7 @@ HBMFreeIndexByKey: /* 80149818 00145658 4E 80 00 20 */ blr /* 8014981C 0014565C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMMIXVolumeTable __HBMMIXVolumeTable: .incbin "baserom.dol", 0x4417C8, 0x790 diff --git a/asm/homebuttonLib/seq.s b/asm/homebuttonLib/seq.s index 251ca0d3..139a7795 100644 --- a/asm/homebuttonLib/seq.s +++ b/asm/homebuttonLib/seq.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMSEQInitTracks__FP15_HBMSEQSEQUENCEPUci __HBMSEQInitTracks__FP15_HBMSEQSEQUENCEPUci: /* 8014AF30 00146D70 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -666,7 +666,7 @@ HBMSEQSetVolume: /* 8014B840 00147680 38 63 00 14 */ addi r3, r3, 0x14 /* 8014B844 00147684 4B FF E4 6C */ b HBMSYNSetMasterVolume -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21048 $$21048: .incbin "baserom.dol", 0x40A428, 0x4 @@ -689,7 +689,7 @@ $$21186: $$21188: .incbin "baserom.dol", 0x40A448, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMSEQMidiEventLength __HBMSEQMidiEventLength: .incbin "baserom.dol", 0x442CD8, 0x80 diff --git a/asm/homebuttonLib/syn.s b/asm/homebuttonLib/syn.s index 75f1bcc2..6b81a73e 100644 --- a/asm/homebuttonLib/syn.s +++ b/asm/homebuttonLib/syn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMSYNRemoveSynthFromList__FP11HBMSYNSYNTH __HBMSYNRemoveSynthFromList__FP11HBMSYNSYNTH: /* 80149820 00145660 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/homebuttonLib/synctrl.s b/asm/homebuttonLib/synctrl.s index c71ec532..a54c734b 100644 --- a/asm/homebuttonLib/synctrl.s +++ b/asm/homebuttonLib/synctrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMSYNResetAllControllers __HBMSYNResetAllControllers: /* 80149CC0 00145B00 3C A0 80 44 */ lis r5, __HBMSYNVolumeAttenuation@ha @@ -327,7 +327,7 @@ lbl_8014A12C: /* 8014A158 00145F98 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8014A15C 00145F9C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMSYNn128 __HBMSYNn128: .incbin "baserom.dol", 0x442358, 0x200 diff --git a/asm/homebuttonLib/synenv.s b/asm/homebuttonLib/synenv.s index 3e20b445..c29bda8b 100644 --- a/asm/homebuttonLib/synenv.s +++ b/asm/homebuttonLib/synenv.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMSYNSetupVolumeEnvelope __HBMSYNSetupVolumeEnvelope: /* 8014A160 00145FA0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -273,7 +273,7 @@ lbl_8014A52C: /* 8014A538 00146378 4E 80 00 20 */ blr /* 8014A53C 0014637C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21811 $$21811: .incbin "baserom.dol", 0x40A3F0, 0x8 diff --git a/asm/homebuttonLib/synmix.s b/asm/homebuttonLib/synmix.s index 032d3a35..54b3528a 100644 --- a/asm/homebuttonLib/synmix.s +++ b/asm/homebuttonLib/synmix.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMSYNSetupVolume __HBMSYNSetupVolume: /* 8014A540 00146380 88 03 00 0E */ lbz r0, 0xe(r3) @@ -96,7 +96,7 @@ __HBMSYNUpdateMix: /* 8014A678 001464B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8014A67C 001464BC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMSYNVolumeAttenuation __HBMSYNVolumeAttenuation: .incbin "baserom.dol", 0x442558, 0x200 diff --git a/asm/homebuttonLib/synpitch.s b/asm/homebuttonLib/synpitch.s index 7e899a79..a0e2a43b 100644 --- a/asm/homebuttonLib/synpitch.s +++ b/asm/homebuttonLib/synpitch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMSYNGetRelativePitch __HBMSYNGetRelativePitch: /* 8014A680 001464C0 80 63 00 28 */ lwz r3, 0x28(r3) @@ -176,7 +176,7 @@ __HBMSYNUpdateSrc: /* 8014A8F8 00146738 4E 80 00 20 */ blr /* 8014A8FC 0014673C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21762 $$21762: .incbin "baserom.dol", 0x40A410, 0x4 @@ -190,7 +190,7 @@ $$21768: $$21770: .incbin "baserom.dol", 0x40A420, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __HBMSYNCentsTable __HBMSYNCentsTable: .incbin "baserom.dol", 0x4428E8, 0x190 diff --git a/asm/homebuttonLib/synsample.s b/asm/homebuttonLib/synsample.s index fb8eede8..8727f658 100644 --- a/asm/homebuttonLib/synsample.s +++ b/asm/homebuttonLib/synsample.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMSYNSetupAdpcm__FP11HBMSYNVOICE __HBMSYNSetupAdpcm__FP11HBMSYNVOICE: /* 8014A900 00146740 80 C3 00 10 */ lwz r6, 0x10(r3) diff --git a/asm/homebuttonLib/synvoice.s b/asm/homebuttonLib/synvoice.s index 71fef9d1..f2b04043 100644 --- a/asm/homebuttonLib/synvoice.s +++ b/asm/homebuttonLib/synvoice.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __HBMSYNClearVoiceReferences __HBMSYNClearVoiceReferences: /* 8014AD80 00146BC0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/homebuttonLib/ut_CharStrmReader.s b/asm/homebuttonLib/ut_CharStrmReader.s index b1fd15f7..44b4d3cf 100644 --- a/asm/homebuttonLib/ut_CharStrmReader.s +++ b/asm/homebuttonLib/ut_CharStrmReader.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ReadNextCharUTF8__Q36nw4hbm2ut14CharStrmReaderFv ReadNextCharUTF8__Q36nw4hbm2ut14CharStrmReaderFv: /* 8013FDD0 0013BC10 4B FE 00 C0 */ b ReadNextCharUTF8__Q34nw4r2ut14CharStrmReaderFv diff --git a/asm/homebuttonLib/ut_CharWriter.s b/asm/homebuttonLib/ut_CharWriter.s index 323a0b24..b414ca25 100644 --- a/asm/homebuttonLib/ut_CharWriter.s +++ b/asm/homebuttonLib/ut_CharWriter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm2ut10CharWriterFv __ct__Q36nw4hbm2ut10CharWriterFv: /* 8013FE10 0013BC50 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1765,7 +1765,7 @@ lbl_80141510: /* 801417C8 0013D608 4E 80 00 20 */ blr /* 801417CC 0013D60C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$26157 $$26157: .incbin "baserom.dol", 0x40A3B0, 0x4 diff --git a/asm/homebuttonLib/ut_Font.s b/asm/homebuttonLib/ut_Font.s index 887e2e4d..9ba870c8 100644 --- a/asm/homebuttonLib/ut_Font.s +++ b/asm/homebuttonLib/ut_Font.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InitReaderFunc__Q36nw4hbm2ut4FontFQ36nw4hbm2ut12FontEncoding InitReaderFunc__Q36nw4hbm2ut4FontFQ36nw4hbm2ut12FontEncoding: /* 801417D0 0013D610 2C 04 00 00 */ cmpwi r4, 0 @@ -52,7 +52,7 @@ lbl_80141854: /* 80141878 0013D6B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8014187C 0013D6BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$298 $$298: .incbin "baserom.dol", 0x441568, 0xC diff --git a/asm/homebuttonLib/ut_ResFont.s b/asm/homebuttonLib/ut_ResFont.s index 0930ea7d..44382f43 100644 --- a/asm/homebuttonLib/ut_ResFont.s +++ b/asm/homebuttonLib/ut_ResFont.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm2ut7ResFontFv __ct__Q36nw4hbm2ut7ResFontFv: /* 801418D0 0013D710 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -144,7 +144,7 @@ lbl_80141AA0: /* 80141AB8 0013D8F8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80141ABC 0013D8FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm2ut7ResFont __vt__Q36nw4hbm2ut7ResFont: .incbin "baserom.dol", 0x441598, 0x58 diff --git a/asm/homebuttonLib/ut_ResFontBase.s b/asm/homebuttonLib/ut_ResFontBase.s index bdd5eefb..1c45b695 100644 --- a/asm/homebuttonLib/ut_ResFontBase.s +++ b/asm/homebuttonLib/ut_ResFontBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q46nw4hbm2ut6detail11ResFontBaseFv __ct__Q46nw4hbm2ut6detail11ResFontBaseFv: /* 80141AC0 0013D900 3C 80 80 44 */ lis r4, __vt__Q36nw4hbm2ut4Font@ha @@ -397,7 +397,7 @@ lbl_80141F20: /* 80141F78 0013DDB8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80141F7C 0013DDBC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2549 $$2549: .incbin "baserom.dol", 0x441678, 0x10 diff --git a/asm/homebuttonLib/ut_TagProcessorBase.s b/asm/homebuttonLib/ut_TagProcessorBase.s index a5b809ee..30cf0ca3 100644 --- a/asm/homebuttonLib/ut_TagProcessorBase.s +++ b/asm/homebuttonLib/ut_TagProcessorBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm2ut19TagProcessorBase$$0c$$1Fv __ct__Q36nw4hbm2ut19TagProcessorBase$$0c$$1Fv: /* 80141F80 0013DDC0 3C 80 80 44 */ lis r4, __vt__Q36nw4hbm2ut19TagProcessorBase$$0c$$1@ha @@ -761,12 +761,12 @@ lbl_80142A14: /* 80142A38 0013E878 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80142A3C 0013E87C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$24655 $$24655: .incbin "baserom.dol", 0x40A3D0, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1 __vt__Q36nw4hbm2ut19TagProcessorBase$$0w$$1: .incbin "baserom.dol", 0x441738, 0x14 diff --git a/asm/homebuttonLib/ut_TextWriterBase.s b/asm/homebuttonLib/ut_TextWriterBase.s index 115791a6..093269e6 100644 --- a/asm/homebuttonLib/ut_TextWriterBase.s +++ b/asm/homebuttonLib/ut_TextWriterBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36nw4hbm2ut17TextWriterBase$$0c$$1Fv __ct__Q36nw4hbm2ut17TextWriterBase$$0c$$1Fv: /* 80142A40 0013E880 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5830,10 +5830,10 @@ lbl_80147E8C: /* 80147EA8 00143CE8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80147EAC 00143CEC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023D8, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$27999 $$27999: .incbin "baserom.dol", 0x40A3D8, 0x8 @@ -5844,7 +5844,7 @@ $$28011: $$29160: .incbin "baserom.dol", 0x40A3E8, 0x8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global mFormatBufferSize__Q36nw4hbm2ut17TextWriterBase$$0c$$1 mFormatBufferSize__Q36nw4hbm2ut17TextWriterBase$$0c$$1: .incbin "baserom.dol", 0x4417C0, 0x4 diff --git a/asm/homebuttonLib/ut_list.s b/asm/homebuttonLib/ut_list.s index 465966a4..9a9ebfae 100644 --- a/asm/homebuttonLib/ut_list.s +++ b/asm/homebuttonLib/ut_list.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global List_GetNth__Q26nw4hbm2utFPCQ36nw4hbm2ut4ListUs List_GetNth__Q26nw4hbm2utFPCQ36nw4hbm2ut4ListUs: /* 80141880 0013D6C0 38 C0 00 00 */ li r6, 0 diff --git a/asm/ipc/ipcMain.s b/asm/ipc/ipcMain.s index f9d8c3f1..25d1b805 100644 --- a/asm/ipc/ipcMain.s +++ b/asm/ipc/ipcMain.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IPCInit IPCInit: /* 8004E730 0004A570 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/ipc/ipcProfile.s b/asm/ipc/ipcProfile.s index 2b6029a3..53e9b09a 100644 --- a/asm/ipc/ipcProfile.s +++ b/asm/ipc/ipcProfile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IPCiProfInit IPCiProfInit: /* 800507B0 0004C5F0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/ipc/ipcclt.s b/asm/ipc/ipcclt.s index 0ee2900e..4a69c5af 100644 --- a/asm/ipc/ipcclt.s +++ b/asm/ipc/ipcclt.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global strnlen strnlen: /* 8004E820 0004A660 7C 65 1B 78 */ mr r5, r3 @@ -1926,7 +1926,7 @@ lbl_80050258: /* 80050278 0004C0B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8005027C 0004C0BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __mailboxAck __mailboxAck: .incbin "baserom.dol", 0x492B88, 0x4 diff --git a/asm/ipc/memory.s b/asm/ipc/memory.s index 29b7521e..0a8f7efb 100644 --- a/asm/ipc/memory.s +++ b/asm/ipc/memory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global iosCreateHeap iosCreateHeap: /* 80050280 0004C0C0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/kpad/KMPLS.s b/asm/kpad/KMPLS.s index 2ad9346e..54806c56 100644 --- a/asm/kpad/KMPLS.s +++ b/asm/kpad/KMPLS.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global wpad_callback_func wpad_callback_func: /* 80070390 0006C1D0 80 AD EA 98 */ lwz r5, kmpls-_SDA_BASE_(r13) @@ -2307,7 +2307,7 @@ KMPLSSetSamplingCallback: /* 800724B8 0006E2F8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800724BC 0006E2FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global mpls_assign_deg mpls_assign_deg: .incbin "baserom.dol", 0x4360C8, 0x24 @@ -2315,7 +2315,7 @@ mpls_assign_deg: mpls_assign_ct: .incbin "baserom.dol", 0x4360EC, 0x24 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22647 $$22647: .incbin "baserom.dol", 0x4993B0, 0x4 diff --git a/asm/kpad/KPAD.s b/asm/kpad/KPAD.s index 12db1342..9d05e9cf 100644 --- a/asm/kpad/KPAD.s +++ b/asm/kpad/KPAD.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global KPADSetBtnRepeat KPADSetBtnRepeat: /* 8006B280 000670C0 C0 02 88 50 */ lfs f0, $$24535-_SDA2_BASE_(r2) @@ -5731,7 +5731,7 @@ lbl_80070368: /* 80070388 0006C1C8 38 21 00 60 */ addi r1, r1, 0x60 /* 8007038C 0006C1CC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21614 $$21614: .incbin "baserom.dol", 0x436000, 0x48 @@ -5742,7 +5742,7 @@ $$24805: $$2LOCAL$$2KPADiSamplingCallback__Fl$$2table: .incbin "baserom.dol", 0x43609C, 0x2C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __KPADVersion __KPADVersion: .incbin "baserom.dol", 0x492BE8, 0x4 @@ -5843,7 +5843,7 @@ kp_wbc_stable_count: kp_fs_revise_deg: .incbin "baserom.dol", 0x492C6C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24535 $$24535: .incbin "baserom.dol", 0x499310, 0x4 diff --git a/asm/kpad/KZMplsTestSub.s b/asm/kpad/KZMplsTestSub.s index 0c76f720..27a9f58f 100644 --- a/asm/kpad/KZMplsTestSub.s +++ b/asm/kpad/KZMplsTestSub.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __KMPLS_f2i __KMPLS_f2i: /* 800724C0 0006E300 C0 02 89 7C */ lfs f0, $$22973-_SDA2_BASE_(r2) @@ -669,12 +669,12 @@ __KMPLS_linear_Direction: /* 80072EC8 0006ED08 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80072ECC 0006ED0C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global e_dir e_dir: .incbin "baserom.dol", 0x436110, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22972 $$22972: .incbin "baserom.dol", 0x499438, 0x4 diff --git a/asm/libMobiclip/Bignum.s b/asm/libMobiclip/Bignum.s index 96fa9a65..d6729581 100644 --- a/asm/libMobiclip/Bignum.s +++ b/asm/libMobiclip/Bignum.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Reduce__6BignumFRC6BignumRC6BignumP6Bignum Reduce__6BignumFRC6BignumRC6BignumP6Bignum: /* 8014D200 00149040 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1053,7 +1053,7 @@ lbl_8014E078: /* 8014E088 00149EC8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8014E08C 00149ECC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2BitsUsed__FUi$$2bits $$2LOCAL$$2BitsUsed__FUi$$2bits: .incbin "baserom.dol", 0x40A450, 0x100 diff --git a/asm/libMobiclip/CodecFast.s b/asm/libMobiclip/CodecFast.s index ebce6e04..63189dc2 100644 --- a/asm/libMobiclip/CodecFast.s +++ b/asm/libMobiclip/CodecFast.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DecodeStream__FPCScPsPsPsPA21_s DecodeStream__FPCScPsPsPsPA21_s: /* 8014E090 00149ED0 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -529,7 +529,7 @@ lbl_8014E830: /* 8014E858 0014A698 4E 80 00 20 */ blr /* 8014E85C 0014A69C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global Apcm Apcm: .incbin "baserom.dol", 0x443728, 0x400 diff --git a/asm/libMobiclip/Digits.s b/asm/libMobiclip/Digits.s index 05304fa3..cf55a19e 100644 --- a/asm/libMobiclip/Digits.s +++ b/asm/libMobiclip/Digits.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DigitsAdd DigitsAdd: /* 8014E860 0014A6A0 2C 04 00 00 */ cmpwi r4, 0 diff --git a/asm/libMobiclip/ImaAdpcm.s b/asm/libMobiclip/ImaAdpcm.s index 2f99a70b..a19c0f42 100644 --- a/asm/libMobiclip/ImaAdpcm.s +++ b/asm/libMobiclip/ImaAdpcm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ImaAdpcmInit ImaAdpcmInit: /* 8014EB00 0014A940 38 C0 00 01 */ li r6, 1 @@ -162,7 +162,7 @@ lbl_8014ECF8: /* 8014ED08 0014AB48 4E 80 00 20 */ blr /* 8014ED0C 0014AB4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global g_Ima_Adpcm_StepTable g_Ima_Adpcm_StepTable: .incbin "baserom.dol", 0x40A550, 0xB8 diff --git a/asm/libMobiclip/MoApi.s b/asm/libMobiclip/MoApi.s index 681057d3..e42a9945 100644 --- a/asm/libMobiclip/MoApi.s +++ b/asm/libMobiclip/MoApi.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MOInit MOInit: /* 8014ED10 0014AB50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1086,7 +1086,7 @@ lbl_8014FAEC: /* 8014FB18 0014B958 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8014FB1C 0014B95C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22662 $$22662: .incbin "baserom.dol", 0x443C88, 0x50 @@ -1148,7 +1148,7 @@ $$23614: $$23615: .incbin "baserom.dol", 0x443F8C, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __MOBICLIP_MOVersion __MOBICLIP_MOVersion: .incbin "baserom.dol", 0x492E90, 0x8 diff --git a/asm/libMobiclip/MoDeblockWii.s b/asm/libMobiclip/MoDeblockWii.s index f9cfa3e4..7f094959 100644 --- a/asm/libMobiclip/MoDeblockWii.s +++ b/asm/libMobiclip/MoDeblockWii.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Tile__FPUcPCUciii Tile__FPUcPCUciii: /* 8014FB20 0014B960 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1362,7 +1362,7 @@ lbl_80150F10: /* 80150F28 0014CD68 4E 80 00 20 */ blr /* 80150F2C 0014CD6C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global clipTable clipTable: .incbin "baserom.dol", 0x40A618, 0x180 @@ -1373,7 +1373,7 @@ Alpha: Beta: .incbin "baserom.dol", 0x40A82C, 0x94 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global clip clip: .incbin "baserom.dol", 0x492E98, 0x8 diff --git a/asm/libMobiclip/MoSdk.s b/asm/libMobiclip/MoSdk.s index 6b0e71e8..89c598d8 100644 --- a/asm/libMobiclip/MoSdk.s +++ b/asm/libMobiclip/MoSdk.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __nw__5MoSdkFUl __nw__5MoSdkFUl: /* 80150F30 0014CD70 48 00 27 F0 */ b MOiAlloc__FUi @@ -847,7 +847,7 @@ lbl_80151AE8: /* 80151B18 0014D958 38 21 00 20 */ addi r1, r1, 0x20 /* 80151B1C 0014D95C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$23186 $$23186: .incbin "baserom.dol", 0x443FC8, 0x1C @@ -927,7 +927,7 @@ $$23353: $$23352: .incbin "baserom.dol", 0x444258, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23196 $$23196: .incbin "baserom.dol", 0x492EA0, 0x8 diff --git a/asm/libMobiclip/MoSdkAdpcmDecoder.s b/asm/libMobiclip/MoSdkAdpcmDecoder.s index 02896942..d2cc99e9 100644 --- a/asm/libMobiclip/MoSdkAdpcmDecoder.s +++ b/asm/libMobiclip/MoSdkAdpcmDecoder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__17MoSdkAdpcmDecoderFP20MoSdkAudioRepositoryPvUlUl __ct__17MoSdkAdpcmDecoderFP20MoSdkAudioRepositoryPvUlUl: /* 80151B20 0014D960 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -234,7 +234,7 @@ lbl_80151E50: /* 80151E68 0014DCA8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80151E6C 0014DCAC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22535 $$22535: .incbin "baserom.dol", 0x444280, 0x24 @@ -251,7 +251,7 @@ $$22511: $$22512: .incbin "baserom.dol", 0x4442E0, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__17MoSdkAdpcmDecoder __RTTI__17MoSdkAdpcmDecoder: .incbin "baserom.dol", 0x492EA8, 0x8 diff --git a/asm/libMobiclip/MoSdkAudioDecoder.s b/asm/libMobiclip/MoSdkAudioDecoder.s index ae4521b6..71c2ea55 100644 --- a/asm/libMobiclip/MoSdkAudioDecoder.s +++ b/asm/libMobiclip/MoSdkAudioDecoder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__20MoSdkAudioRepositoryFv __ct__20MoSdkAudioRepositoryFv: /* 80151E70 0014DCB0 38 00 00 00 */ li r0, 0 @@ -266,7 +266,7 @@ lbl_801521CC: /* 801521E8 0014E028 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 801521EC 0014E02C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22532 $$22532: .incbin "baserom.dol", 0x4442F8, 0x1C diff --git a/asm/libMobiclip/MoSdkDemux.s b/asm/libMobiclip/MoSdkDemux.s index 792f5b7d..475205a8 100644 --- a/asm/libMobiclip/MoSdkDemux.s +++ b/asm/libMobiclip/MoSdkDemux.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global decode__5MoSdkFPUl decode__5MoSdkFPUl: /* 801521F0 0014E030 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libMobiclip/MoSdkFastAudioDecoder.s b/asm/libMobiclip/MoSdkFastAudioDecoder.s index b14ad249..d18ebb1f 100644 --- a/asm/libMobiclip/MoSdkFastAudioDecoder.s +++ b/asm/libMobiclip/MoSdkFastAudioDecoder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__21MoSdkFastAudioDecoderFP20MoSdkAudioRepositoryPvUlUl __ct__21MoSdkFastAudioDecoderFP20MoSdkAudioRepositoryPvUlUl: /* 801523F0 0014E230 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -258,7 +258,7 @@ lbl_80152780: /* 80152798 0014E5D8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8015279C 0014E5DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22578 $$22578: .incbin "baserom.dol", 0x444370, 0x24 @@ -272,7 +272,7 @@ $$22542: $$22543: .incbin "baserom.dol", 0x4443C8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__21MoSdkFastAudioDecoder __RTTI__21MoSdkFastAudioDecoder: .incbin "baserom.dol", 0x492EB8, 0x8 diff --git a/asm/libMobiclip/MoSdkHeaders.s b/asm/libMobiclip/MoSdkHeaders.s index 7a4bbbb9..59bde8bd 100644 --- a/asm/libMobiclip/MoSdkHeaders.s +++ b/asm/libMobiclip/MoSdkHeaders.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MOAllocateImage__FUlUl MOAllocateImage__FUlUl: /* 801527A0 0014E5E0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -756,7 +756,7 @@ lbl_80153218: /* 80153228 0014F068 38 21 00 30 */ addi r1, r1, 0x30 /* 8015322C 0014F06C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global RootPublicKey RootPublicKey: .incbin "baserom.dol", 0x40A8C0, 0xA0 @@ -764,7 +764,7 @@ RootPublicKey: RootPublicBarrett: .incbin "baserom.dol", 0x40A960, 0xA8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$23024 $$23024: .incbin "baserom.dol", 0x4443D8, 0x30 @@ -790,12 +790,12 @@ $$23137: $$23138: .incbin "baserom.dol", 0x4444D8, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23098 $$23098: .incbin "baserom.dol", 0x492EC0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23100 $$23100: .incbin "baserom.dol", 0x49A0D0, 0x8 diff --git a/asm/libMobiclip/MoSdkInput.s b/asm/libMobiclip/MoSdkInput.s index f276f1fc..e12eb3ef 100644 --- a/asm/libMobiclip/MoSdkInput.s +++ b/asm/libMobiclip/MoSdkInput.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__10MoSdkInputFPvUlP17MO_MEDIUM_CONTROLPv __ct__10MoSdkInputFPvUlP17MO_MEDIUM_CONTROLPv: /* 80153230 0014F070 38 00 00 00 */ li r0, 0 @@ -356,7 +356,7 @@ jumpTo__10MoSdkInputFUl: /* 801536F8 0014F538 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 801536FC 0014F53C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22549 $$22549: .incbin "baserom.dol", 0x444500, 0x1C diff --git a/asm/libMobiclip/MoSdkMem.s b/asm/libMobiclip/MoSdkMem.s index 54c2f0c8..a632da21 100644 --- a/asm/libMobiclip/MoSdkMem.s +++ b/asm/libMobiclip/MoSdkMem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MOiSetAllocator__FP12MEMAllocator MOiSetAllocator__FP12MEMAllocator: /* 80153700 0014F540 90 6D EC B8 */ stw r3, MOiAllocator-_SDA_BASE_(r13) @@ -94,7 +94,7 @@ lbl_801537F4: /* 80153828 0014F668 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8015382C 0014F66C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22435 $$22435: .incbin "baserom.dol", 0x444598, 0x18 diff --git a/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s b/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s index 474c0edd..236ca4c7 100644 --- a/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s +++ b/asm/libMobiclip/MoSdkPcmPassthroughDecoder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__26MoSdkPcmPassthroughDecoderFP20MoSdkAudioRepositoryPvUlUl __ct__26MoSdkPcmPassthroughDecoderFP20MoSdkAudioRepositoryPvUlUl: /* 80153830 0014F670 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -105,7 +105,7 @@ lbl_80153980: /* 80153988 0014F7C8 4E 80 00 20 */ blr /* 8015398C 0014F7CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__26MoSdkPcmPassthroughDecoder __vt__26MoSdkPcmPassthroughDecoder: .incbin "baserom.dol", 0x4445B0, 0x1C @@ -116,7 +116,7 @@ $$22523: $$22524: .incbin "baserom.dol", 0x4445E8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__26MoSdkPcmPassthroughDecoder __RTTI__26MoSdkPcmPassthroughDecoder: .incbin "baserom.dol", 0x492EC8, 0x8 diff --git a/asm/libMobiclip/MoSdkProcessImage.s b/asm/libMobiclip/MoSdkProcessImage.s index 6ff3d899..219fb220 100644 --- a/asm/libMobiclip/MoSdkProcessImage.s +++ b/asm/libMobiclip/MoSdkProcessImage.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Tile__FPUcPUciii Tile__FPUcPUciii: /* 80153990 0014F7D0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libMobiclip/MoSdkSeek.s b/asm/libMobiclip/MoSdkSeek.s index 6a448f87..03c66110 100644 --- a/asm/libMobiclip/MoSdkSeek.s +++ b/asm/libMobiclip/MoSdkSeek.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global seekingLoop__5MoSdkFv seekingLoop__5MoSdkFv: /* 80153C90 0014FAD0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libMobiclip/MoSdkVideoDecoder.s b/asm/libMobiclip/MoSdkVideoDecoder.s index 45be0c2c..38cfb57b 100644 --- a/asm/libMobiclip/MoSdkVideoDecoder.s +++ b/asm/libMobiclip/MoSdkVideoDecoder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__17MoSdkVideoDecoderFPv __ct__17MoSdkVideoDecoderFPv: /* 80153F10 0014FD50 38 00 00 00 */ li r0, 0 @@ -361,7 +361,7 @@ VX2_Free__FPv: /* 801543E8 00150228 4B FF F3 E8 */ b MOiFree__FPv /* 801543EC 0015022C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22798 $$22798: .incbin "baserom.dol", 0x4445F8, 0x1C diff --git a/asm/libMobiclip/VX2_BitStream.s b/asm/libMobiclip/VX2_BitStream.s index 9fe64ce6..d4ed2456 100644 --- a/asm/libMobiclip/VX2_BitStream.s +++ b/asm/libMobiclip/VX2_BitStream.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2BitStreamInit__FP12VX2BitStreamPCUs VX2BitStreamInit__FP12VX2BitStreamPCUs: /* 801543F0 00150230 38 00 00 00 */ li r0, 0 diff --git a/asm/libMobiclip/VX2_Cpu.s b/asm/libMobiclip/VX2_Cpu.s index 188c8c36..3f24fc75 100644 --- a/asm/libMobiclip/VX2_Cpu.s +++ b/asm/libMobiclip/VX2_Cpu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetCaps_C__Fv GetCaps_C__Fv: /* 80154420 00150260 4B EF F9 D0 */ b __wpadNoAlloc diff --git a/asm/libMobiclip/VX2_DecodeBlock16x16.s b/asm/libMobiclip/VX2_DecodeBlock16x16.s index 57a31d51..e104e6e3 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x16.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip116x16__FR14VX2DecoderData VX2CommandSkip116x16__FR14VX2DecoderData: /* 80154460 001502A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -895,7 +895,7 @@ lbl_801551A8: /* 801551B8 00150FF8 4E 80 04 20 */ bctr /* 801551BC 00150FFC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x16 VX2CommandTable16x16: .incbin "baserom.dol", 0x40AA08, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x2.s b/asm/libMobiclip/VX2_DecodeBlock16x2.s index a5d11baf..fe351d90 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip116x2__FR14VX2DecoderData VX2CommandSkip116x2__FR14VX2DecoderData: /* 801551C0 00151000 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -852,7 +852,7 @@ lbl_80155E68: /* 80155E78 00151CB8 4E 80 04 20 */ bctr /* 80155E7C 00151CBC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x2 VX2CommandTable16x2: .incbin "baserom.dol", 0x40AB58, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x4.s b/asm/libMobiclip/VX2_DecodeBlock16x4.s index 829a6a29..2ab1f450 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x4.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip116x4__FR14VX2DecoderData VX2CommandSkip116x4__FR14VX2DecoderData: /* 80155E80 00151CC0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -887,7 +887,7 @@ lbl_80156BA8: /* 80156BB8 001529F8 4E 80 04 20 */ bctr /* 80156BBC 001529FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x4 VX2CommandTable16x4: .incbin "baserom.dol", 0x40ABE8, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock16x8.s b/asm/libMobiclip/VX2_DecodeBlock16x8.s index 9dc575f6..284504d1 100644 --- a/asm/libMobiclip/VX2_DecodeBlock16x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock16x8.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip116x8__FR14VX2DecoderData VX2CommandSkip116x8__FR14VX2DecoderData: /* 80156BC0 00152A00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -887,7 +887,7 @@ lbl_801578E8: /* 801578F8 00153738 4E 80 04 20 */ bctr /* 801578FC 0015373C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable16x8 VX2CommandTable16x8: .incbin "baserom.dol", 0x40AC78, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock2x16.s b/asm/libMobiclip/VX2_DecodeBlock2x16.s index 88131598..a9ee342c 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x16.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip12x16__FR14VX2DecoderData VX2CommandSkip12x16__FR14VX2DecoderData: /* 80157900 00153740 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -856,7 +856,7 @@ lbl_801585B8: /* 801585C8 00154408 4E 80 04 20 */ bctr /* 801585CC 0015440C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x16 VX2CommandTable2x16: .incbin "baserom.dol", 0x40AD48, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock2x2.s b/asm/libMobiclip/VX2_DecodeBlock2x2.s index 1f13b976..bf34bdb1 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip12x2__FR14VX2DecoderData VX2CommandSkip12x2__FR14VX2DecoderData: /* 801585D0 00154410 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -821,7 +821,7 @@ lbl_80159208: /* 80159218 00155058 4E 80 04 20 */ bctr /* 8015921C 0015505C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x2 VX2CommandTable2x2: .incbin "baserom.dol", 0x40ADD8, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock2x4.s b/asm/libMobiclip/VX2_DecodeBlock2x4.s index fc3bfc98..fee32a3a 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x4.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip12x4__FR14VX2DecoderData VX2CommandSkip12x4__FR14VX2DecoderData: /* 80159220 00155060 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -856,7 +856,7 @@ lbl_80159ED8: /* 80159EE8 00155D28 4E 80 04 20 */ bctr /* 80159EEC 00155D2C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x4 VX2CommandTable2x4: .incbin "baserom.dol", 0x40AE48, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock2x8.s b/asm/libMobiclip/VX2_DecodeBlock2x8.s index 7d2a6e24..30905f06 100644 --- a/asm/libMobiclip/VX2_DecodeBlock2x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock2x8.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip12x8__FR14VX2DecoderData VX2CommandSkip12x8__FR14VX2DecoderData: /* 80159EF0 00155D30 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -856,7 +856,7 @@ lbl_8015ABA8: /* 8015ABB8 001569F8 4E 80 04 20 */ bctr /* 8015ABBC 001569FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable2x8 VX2CommandTable2x8: .incbin "baserom.dol", 0x40AED8, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x16.s b/asm/libMobiclip/VX2_DecodeBlock4x16.s index 48ca4227..6a742c03 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x16.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip14x16__FR14VX2DecoderData VX2CommandSkip14x16__FR14VX2DecoderData: /* 8015ABC0 00156A00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -887,7 +887,7 @@ lbl_8015B8E8: /* 8015B8F8 00157738 4E 80 04 20 */ bctr /* 8015B8FC 0015773C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x16 VX2CommandTable4x16: .incbin "baserom.dol", 0x40AF68, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x2.s b/asm/libMobiclip/VX2_DecodeBlock4x2.s index 615cebb2..0d8b3b11 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip14x2__FR14VX2DecoderData VX2CommandSkip14x2__FR14VX2DecoderData: /* 8015B900 00157740 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -852,7 +852,7 @@ lbl_8015C5A8: /* 8015C5B8 001583F8 4E 80 04 20 */ bctr /* 8015C5BC 001583FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x2 VX2CommandTable4x2: .incbin "baserom.dol", 0x40AFF8, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x4.s b/asm/libMobiclip/VX2_DecodeBlock4x4.s index 0d36f89b..e18ad74b 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x4.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip14x4__FR14VX2DecoderData VX2CommandSkip14x4__FR14VX2DecoderData: /* 8015C5C0 00158400 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -887,7 +887,7 @@ lbl_8015D2E8: /* 8015D2F8 00159138 4E 80 04 20 */ bctr /* 8015D2FC 0015913C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x4 VX2CommandTable4x4: .incbin "baserom.dol", 0x40B088, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock4x8.s b/asm/libMobiclip/VX2_DecodeBlock4x8.s index 71ebd9f8..bf8099e6 100644 --- a/asm/libMobiclip/VX2_DecodeBlock4x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock4x8.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip14x8__FR14VX2DecoderData VX2CommandSkip14x8__FR14VX2DecoderData: /* 8015D300 00159140 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -887,7 +887,7 @@ lbl_8015E028: /* 8015E038 00159E78 4E 80 04 20 */ bctr /* 8015E03C 00159E7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable4x8 VX2CommandTable4x8: .incbin "baserom.dol", 0x40B118, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x16.s b/asm/libMobiclip/VX2_DecodeBlock8x16.s index ef4b5405..565f2304 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x16.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x16.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip18x16__FR14VX2DecoderData VX2CommandSkip18x16__FR14VX2DecoderData: /* 8015E040 00159E80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -887,7 +887,7 @@ lbl_8015ED68: /* 8015ED78 0015ABB8 4E 80 04 20 */ bctr /* 8015ED7C 0015ABBC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x16 VX2CommandTable8x16: .incbin "baserom.dol", 0x40B1E8, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x2.s b/asm/libMobiclip/VX2_DecodeBlock8x2.s index 572d92e8..bcaf368a 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x2.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip18x2__FR14VX2DecoderData VX2CommandSkip18x2__FR14VX2DecoderData: /* 8015ED80 0015ABC0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -852,7 +852,7 @@ lbl_8015FA28: /* 8015FA38 0015B878 4E 80 04 20 */ bctr /* 8015FA3C 0015B87C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x2 VX2CommandTable8x2: .incbin "baserom.dol", 0x40B2B8, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x4.s b/asm/libMobiclip/VX2_DecodeBlock8x4.s index 90b589bf..d42f975b 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x4.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x4.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip18x4__FR14VX2DecoderData VX2CommandSkip18x4__FR14VX2DecoderData: /* 8015FA40 0015B880 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -887,7 +887,7 @@ lbl_80160768: /* 80160778 0015C5B8 4E 80 04 20 */ bctr /* 8016077C 0015C5BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x4 VX2CommandTable8x4: .incbin "baserom.dol", 0x40B348, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeBlock8x8.s b/asm/libMobiclip/VX2_DecodeBlock8x8.s index baf93c6c..524194f5 100644 --- a/asm/libMobiclip/VX2_DecodeBlock8x8.s +++ b/asm/libMobiclip/VX2_DecodeBlock8x8.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2CommandSkip18x8__FR14VX2DecoderData VX2CommandSkip18x8__FR14VX2DecoderData: /* 80160780 0015C5C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -887,7 +887,7 @@ lbl_801614A8: /* 801614B8 0015D2F8 4E 80 04 20 */ bctr /* 801614BC 0015D2FC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2CommandTable8x8 VX2CommandTable8x8: .incbin "baserom.dol", 0x40B418, 0x28 diff --git a/asm/libMobiclip/VX2_DecodeIntra.s b/asm/libMobiclip/VX2_DecodeIntra.s index dc0d4d0f..d6633b39 100644 --- a/asm/libMobiclip/VX2_DecodeIntra.s +++ b/asm/libMobiclip/VX2_DecodeIntra.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2Intra8Mode2__FPUciUl VX2Intra8Mode2__FPUciUl: /* 801614C0 0015D300 81 05 0A 08 */ lwz r8, 0xa08(r5) @@ -2084,7 +2084,7 @@ VX2InitIntra__FR14VX2DecoderData: /* 80163338 0015F178 4E 80 00 20 */ blr /* 8016333C 0015F17C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global InvCbpTable InvCbpTable: .incbin "baserom.dol", 0x40B4A8, 0x200 diff --git a/asm/libMobiclip/VX2_Decoder.s b/asm/libMobiclip/VX2_Decoder.s index 399864c9..068940d2 100644 --- a/asm/libMobiclip/VX2_Decoder.s +++ b/asm/libMobiclip/VX2_Decoder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2DecoderInit__FR14VX2DecoderDataii VX2DecoderInit__FR14VX2DecoderDataii: /* 80163340 0015F180 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -821,7 +821,7 @@ VX2DecoderGetQuantizer__FR14VX2DecoderData: /* 80163F08 0015FD48 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80163F0C 0015FD4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global InvVlc InvVlc: .incbin "baserom.dol", 0x40B730, 0x9D4 @@ -835,7 +835,7 @@ MaxLevel: MaxRun: .incbin "baserom.dol", 0x40F830, 0x100 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global VX2GolombCodeSigned VX2GolombCodeSigned: .incbin "baserom.dol", 0x4446D8, 0x8000 diff --git a/asm/libMobiclip/VX2_DecoderMeFct.s b/asm/libMobiclip/VX2_DecoderMeFct.s index 07809699..49372e3b 100644 --- a/asm/libMobiclip/VX2_DecoderMeFct.s +++ b/asm/libMobiclip/VX2_DecoderMeFct.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InitMeFct__FR5MeFcti InitMeFct__FR5MeFcti: /* 80163F10 0015FD50 94 21 FE B0 */ stwu r1, -0x150(r1) diff --git a/asm/libMobiclip/VX2_InvMc.s b/asm/libMobiclip/VX2_InvMc.s index 0a778c74..1878c3b7 100644 --- a/asm/libMobiclip/VX2_InvMc.s +++ b/asm/libMobiclip/VX2_InvMc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InvMc8x8_C__FPsPUci InvMc8x8_C__FPsPUci: /* 8016F3C0 0016B200 94 21 FF C0 */ stwu r1, -0x40(r1) diff --git a/asm/libMobiclip/VX2_InverseQuantization.s b/asm/libMobiclip/VX2_InverseQuantization.s index b457cbf5..2b285918 100644 --- a/asm/libMobiclip/VX2_InverseQuantization.s +++ b/asm/libMobiclip/VX2_InverseQuantization.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2InverseQuantizationSet__FR14VX2DecoderDatai VX2InverseQuantizationSet__FR14VX2DecoderDatai: /* 80170C80 0016CAC0 3C A0 2A AB */ lis r5, 0x2AAAAAAB@ha @@ -142,7 +142,7 @@ lbl_80170DB8: /* 80170E98 0016CCD8 38 21 00 20 */ addi r1, r1, 0x20 /* 80170E9C 0016CCDC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VX2InverseQuantizer4x4 VX2InverseQuantizer4x4: .incbin "baserom.dol", 0x40F930, 0x180 diff --git a/asm/libMobiclip/VX2_MotionCompensation.s b/asm/libMobiclip/VX2_MotionCompensation.s index 75e718be..0b1441e3 100644 --- a/asm/libMobiclip/VX2_MotionCompensation.s +++ b/asm/libMobiclip/VX2_MotionCompensation.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DecodeEscape__FR14VX2DecoderDataRiRiRi DecodeEscape__FR14VX2DecoderDataRiRiRi: /* 80170EA0 0016CCE0 80 E3 0A 04 */ lwz r7, 0xa04(r3) @@ -732,7 +732,7 @@ lbl_80171910: /* 80171928 0016D768 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8017192C 0016D76C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global InvCbpTable InvCbpTable: .incbin "baserom.dol", 0x4101F0, 0x200 diff --git a/asm/libMobiclip/VX2_Pred.s b/asm/libMobiclip/VX2_Pred.s index 04e5f05d..1b686b15 100644 --- a/asm/libMobiclip/VX2_Pred.s +++ b/asm/libMobiclip/VX2_Pred.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VX2Intra8Mode4__FPUciUl VX2Intra8Mode4__FPUciUl: /* 80171930 0016D770 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libms/commonbin.s b/asm/libms/commonbin.s index d08e7553..14377299 100644 --- a/asm/libms/commonbin.s +++ b/asm/libms/commonbin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LMSi_AnalyzeMessageHeader LMSi_AnalyzeMessageHeader: /* 80174470 001702B0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libms/libms.s b/asm/libms/libms.s index 4f2f055f..72e321c6 100644 --- a/asm/libms/libms.s +++ b/asm/libms/libms.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LMS_SetMemFuncs LMS_SetMemFuncs: /* 80174190 0016FFD0 90 6D EC C8 */ stw r3, g_pMalloc-_SDA_BASE_(r13) diff --git a/asm/libms/msgfile.s b/asm/libms/msgfile.s index 2dd87df8..67ad98db 100644 --- a/asm/libms/msgfile.s +++ b/asm/libms/msgfile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LMS_InitMessage LMS_InitMessage: /* 80174210 00170050 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -178,12 +178,12 @@ lbl_80174454: /* 80174468 001702A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8017446C 001702AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22545 $$22545: .incbin "baserom.dol", 0x44EBE0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22546 $$22546: .incbin "baserom.dol", 0x492ED0, 0x8 diff --git a/asm/libms/projfile.s b/asm/libms/projfile.s index 27ed50a9..e16f518a 100644 --- a/asm/libms/projfile.s +++ b/asm/libms/projfile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LMS_InitProject LMS_InitProject: /* 801746A0 001704E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -316,12 +316,12 @@ lbl_80174AB4: /* 80174AD0 00170910 7C 65 02 14 */ add r3, r5, r0 /* 80174AD4 00170914 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$23242 $$23242: .incbin "baserom.dol", 0x44EBF0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23243 $$23243: .incbin "baserom.dol", 0x492EF0, 0x8 diff --git a/asm/libnw4r_db/db_assert.s b/asm/libnw4r_db/db_assert.s index f1fb4c7c..d9a1add3 100644 --- a/asm/libnw4r_db/db_assert.s +++ b/asm/libnw4r_db/db_assert.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Panic__Q24nw4r2dbFPCciPCce Panic__Q24nw4r2dbFPCciPCce: /* 80128350 00124190 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -179,12 +179,12 @@ WarningAlarmFunc___Q24nw4r2dbFP7OSAlarmP9OSContext: /* 801285C8 00124408 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 801285CC 0012440C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$26682 $$26682: .incbin "baserom.dol", 0x43EAA8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global sDispWarningAuto__Q24nw4r2db sDispWarningAuto__Q24nw4r2db: .incbin "baserom.dol", 0x492E70, 0x4 diff --git a/asm/libnw4r_db/db_console.s b/asm/libnw4r_db/db_console.s index 7f0616cc..a9fb8e70 100644 --- a/asm/libnw4r_db/db_console.s +++ b/asm/libnw4r_db/db_console.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Console_Create__Q24nw4r2dbFPvUsUsUsUsUs Console_Create__Q24nw4r2dbFPvUsUsUsUsUs: /* 80127830 00123670 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -802,7 +802,7 @@ lbl_80128328: /* 80128348 00124188 4E 80 00 20 */ blr /* 8012834C 0012418C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$28595 $$28595: .incbin "baserom.dol", 0x492E68, 0x4 diff --git a/asm/libnw4r_db/db_directPrint.s b/asm/libnw4r_db/db_directPrint.s index 9321fbf4..814d265c 100644 --- a/asm/libnw4r_db/db_directPrint.s +++ b/asm/libnw4r_db/db_directPrint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DirectPrint_IsActive__Q24nw4r2dbFv DirectPrint_IsActive__Q24nw4r2dbFv: /* 80126CE0 00122B20 80 0D EC 90 */ lwz r0, sInitialized__Q24nw4r2db-_SDA_BASE_(r13) @@ -822,7 +822,7 @@ lbl_80127808: /* 80127828 00123668 4E 80 00 20 */ blr /* 8012782C 0012366C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global sAsciiTable__Q24nw4r2db sAsciiTable__Q24nw4r2db: .incbin "baserom.dol", 0x409C28, 0x80 @@ -833,12 +833,12 @@ sFontData__Q24nw4r2db: sFontData2__Q24nw4r2db: .incbin "baserom.dol", 0x409DA8, 0x138 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2DrawCharToXfb___Q24nw4r2dbFiii$$2twiceBit $$2LOCAL$$2DrawCharToXfb___Q24nw4r2dbFiii$$2twiceBit: .incbin "baserom.dol", 0x43EA98, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22741 $$22741: .incbin "baserom.dol", 0x49A060, 0x4 diff --git a/asm/libnw4r_ef/ef_animcurve.s b/asm/libnw4r_ef/ef_animcurve.s index 6e58b18f..420913a2 100644 --- a/asm/libnw4r_ef/ef_animcurve.s +++ b/asm/libnw4r_ef/ef_animcurve.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AnimCurveExecuteU8__Q24nw4r2efFPUcPUcUlUsUl AnimCurveExecuteU8__Q24nw4r2efFPUcPUcUlUsUl: /* 800A6EF0 000A2D30 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -5667,7 +5667,7 @@ lbl_800ABDDC: /* 800ABDF8 000A7C38 4E 80 00 20 */ blr /* 800ABDFC 000A7C3C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global gCountStandBit__Q24nw4r2ef gCountStandBit__Q24nw4r2ef: .incbin "baserom.dol", 0x43C208, 0x100 @@ -5675,7 +5675,7 @@ gCountStandBit__Q24nw4r2ef: gMSB__Q24nw4r2ef: .incbin "baserom.dol", 0x43C308, 0x100 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211024 $$211024: .incbin "baserom.dol", 0x4994F8, 0x8 diff --git a/asm/libnw4r_ef/ef_creationqueue.s b/asm/libnw4r_ef/ef_creationqueue.s index 3371d989..be00d661 100644 --- a/asm/libnw4r_ef/ef_creationqueue.s +++ b/asm/libnw4r_ef/ef_creationqueue.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddParticleCreation__Q34nw4r2ef13CreationQueueFPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticlePQ34nw4r2ef15EmitterResourceUsPCQ34nw4r4math4VEC3PCQ34nw4r4math4VEC3 AddParticleCreation__Q34nw4r2ef13CreationQueueFPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticlePQ34nw4r2ef15EmitterResourceUsPCQ34nw4r4math4VEC3PCQ34nw4r4math4VEC3: /* 800B4690 000B04D0 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/libnw4r_ef/ef_cube.s b/asm/libnw4r_ef/ef_cube.s index 96d2a7fc..4a43fb23 100644 --- a/asm/libnw4r_ef/ef_cube.s +++ b/asm/libnw4r_ef/ef_cube.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global EmissionSub__Q34nw4r2ef15EmitterFormCubeFRQ34nw4r4math4VEC3RQ34nw4r4math4VEC3PQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManagerUsfPCQ34nw4r4math5MTX34 EmissionSub__Q34nw4r2ef15EmitterFormCubeFRQ34nw4r4math4VEC3RQ34nw4r4math4VEC3PQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManagerUsfPCQ34nw4r4math5MTX34: /* 800B6DD0 000B2C10 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -1946,12 +1946,12 @@ lbl_800B8904: /* 800B89A8 000B47E8 4E 80 00 20 */ blr /* 800B89AC 000B47EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitterFormCube __vt__Q34nw4r2ef15EmitterFormCube: .incbin "baserom.dol", 0x43C4D8, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28286 $$28286: .incbin "baserom.dol", 0x4997F0, 0x4 diff --git a/asm/libnw4r_ef/ef_cylinder.s b/asm/libnw4r_ef/ef_cylinder.s index 7177a272..3a0ef0f3 100644 --- a/asm/libnw4r_ef/ef_cylinder.s +++ b/asm/libnw4r_ef/ef_cylinder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global EmissionSub__Q34nw4r2ef19EmitterFormCylinderFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34fffffff EmissionSub__Q34nw4r2ef19EmitterFormCylinderFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34fffffff: /* 800B5FE0 000B1E20 94 21 FE 30 */ stwu r1, -0x1d0(r1) @@ -526,12 +526,12 @@ lbl_800B6728: /* 800B6788 000B25C8 38 21 00 E0 */ addi r1, r1, 0xe0 /* 800B678C 000B25CC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef19EmitterFormCylinder __vt__Q34nw4r2ef19EmitterFormCylinder: .incbin "baserom.dol", 0x43C4B8, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27773 $$27773: .incbin "baserom.dol", 0x499760, 0x4 diff --git a/asm/libnw4r_ef/ef_disc.s b/asm/libnw4r_ef/ef_disc.s index 4066ad5c..872f9cde 100644 --- a/asm/libnw4r_ef/ef_disc.s +++ b/asm/libnw4r_ef/ef_disc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Emission__Q34nw4r2ef15EmitterFormDiscFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 Emission__Q34nw4r2ef15EmitterFormDiscFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34: /* 800B5240 000B1080 94 21 FE 60 */ stwu r1, -0x1a0(r1) @@ -360,12 +360,12 @@ lbl_800B56E4: /* 800B5778 000B15B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B577C 000B15BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitterFormDisc __vt__Q34nw4r2ef15EmitterFormDisc: .incbin "baserom.dol", 0x43C498, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27752 $$27752: .incbin "baserom.dol", 0x4996C8, 0x4 diff --git a/asm/libnw4r_ef/ef_drawbillboardstrategy.s b/asm/libnw4r_ef/ef_drawbillboardstrategy.s index e27224fb..ef4af96d 100644 --- a/asm/libnw4r_ef/ef_drawbillboardstrategy.s +++ b/asm/libnw4r_ef/ef_drawbillboardstrategy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef21DrawBillboardStrategyFv __ct__Q34nw4r2ef21DrawBillboardStrategyFv: /* 800BAB50 000B6990 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2292,17 +2292,17 @@ __dt__Q34nw4r2ef21DrawBillboardStrategyFv: /* 800BCCB8 000B8AF8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800BCCBC 000B8AFC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef21DrawBillboardStrategy __vt__Q34nw4r2ef21DrawBillboardStrategy: .incbin "baserom.dol", 0x43C510, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global billboard_tex0_u8__Q24nw4r2ef billboard_tex0_u8__Q24nw4r2ef: .incbin "baserom.dol", 0x492D60, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$213380 $$213380: .incbin "baserom.dol", 0x499858, 0x4 diff --git a/asm/libnw4r_ef/ef_drawdirectionalstrategy.s b/asm/libnw4r_ef/ef_drawdirectionalstrategy.s index 322766db..97b009ab 100644 --- a/asm/libnw4r_ef/ef_drawdirectionalstrategy.s +++ b/asm/libnw4r_ef/ef_drawdirectionalstrategy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef23DrawDirectionalStrategyFv __ct__Q34nw4r2ef23DrawDirectionalStrategyFv: /* 800BCCC0 000B8B00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2486,7 +2486,7 @@ __dt__Q34nw4r2ef23DrawDirectionalStrategyFv: /* 800BF098 000BAED8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800BF09C 000BAEDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2p $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2p: .incbin "baserom.dol", 0x404360, 0x30 @@ -2494,17 +2494,17 @@ $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8Dra $$2LOCAL$$2DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2px$$20: .incbin "baserom.dol", 0x404390, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef23DrawDirectionalStrategy __vt__Q34nw4r2ef23DrawDirectionalStrategy: .incbin "baserom.dol", 0x43C530, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global directional_tex0_u8__Q24nw4r2ef directional_tex0_u8__Q24nw4r2ef: .incbin "baserom.dol", 0x492D80, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$213563 $$213563: .incbin "baserom.dol", 0x499888, 0x4 diff --git a/asm/libnw4r_ef/ef_drawfreestrategy.s b/asm/libnw4r_ef/ef_drawfreestrategy.s index 9497f901..a10a3dd8 100644 --- a/asm/libnw4r_ef/ef_drawfreestrategy.s +++ b/asm/libnw4r_ef/ef_drawfreestrategy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef16DrawFreeStrategyFv __ct__Q34nw4r2ef16DrawFreeStrategyFv: /* 800BF0A0 000BAEE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -594,7 +594,7 @@ __dt__Q34nw4r2ef16DrawFreeStrategyFv: /* 800BF958 000BB798 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800BF95C 000BB79C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2p $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2p: .incbin "baserom.dol", 0x4043C0, 0x30 @@ -602,17 +602,17 @@ $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15 $$2LOCAL$$2Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager$$2px$$20: .incbin "baserom.dol", 0x4043F0, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16DrawFreeStrategy __vt__Q34nw4r2ef16DrawFreeStrategy: .incbin "baserom.dol", 0x43C550, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global free_tex0_u8__Q24nw4r2ef free_tex0_u8__Q24nw4r2ef: .incbin "baserom.dol", 0x492DA0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29026 $$29026: .incbin "baserom.dol", 0x4998B0, 0x4 diff --git a/asm/libnw4r_ef/ef_drawlinestrategy.s b/asm/libnw4r_ef/ef_drawlinestrategy.s index dc691040..982a8857 100644 --- a/asm/libnw4r_ef/ef_drawlinestrategy.s +++ b/asm/libnw4r_ef/ef_drawlinestrategy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef16DrawLineStrategyFv __ct__Q34nw4r2ef16DrawLineStrategyFv: /* 800BF960 000BB7A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -415,17 +415,17 @@ __dt__Q34nw4r2ef16DrawLineStrategyFv: /* 800BFF58 000BBD98 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800BFF5C 000BBD9C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16DrawLineStrategy __vt__Q34nw4r2ef16DrawLineStrategy: .incbin "baserom.dol", 0x43C568, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$211461 $$211461: .incbin "baserom.dol", 0x492DA8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211851 $$211851: .incbin "baserom.dol", 0x4998D8, 0x4 diff --git a/asm/libnw4r_ef/ef_draworder.s b/asm/libnw4r_ef/ef_draworder.s index 6a9f8380..a5a40029 100644 --- a/asm/libnw4r_ef/ef_draworder.s +++ b/asm/libnw4r_ef/ef_draworder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Draw__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectRCQ34nw4r2ef8DrawInfo Draw__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectRCQ34nw4r2ef8DrawInfo: /* 800A3950 0009F790 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -87,7 +87,7 @@ Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager: /* 800A3A68 0009F8A8 38 63 00 90 */ addi r3, r3, 0x90 /* 800A3A6C 0009F8AC 4B FF FE 54 */ b MEMRemoveListObject -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef9DrawOrder __vt__Q34nw4r2ef9DrawOrder: .incbin "baserom.dol", 0x43C160, 0x18 diff --git a/asm/libnw4r_ef/ef_drawpointstrategy.s b/asm/libnw4r_ef/ef_drawpointstrategy.s index 82700c6c..6bb22ae5 100644 --- a/asm/libnw4r_ef/ef_drawpointstrategy.s +++ b/asm/libnw4r_ef/ef_drawpointstrategy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef17DrawPointStrategyFv __ct__Q34nw4r2ef17DrawPointStrategyFv: /* 800BFF60 000BBDA0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -307,17 +307,17 @@ __dt__Q34nw4r2ef17DrawPointStrategyFv: /* 800C03C8 000BC208 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800C03CC 000BC20C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef17DrawPointStrategy __vt__Q34nw4r2ef17DrawPointStrategy: .incbin "baserom.dol", 0x43C580, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$211451 $$211451: .incbin "baserom.dol", 0x492DB0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211644 $$211644: .incbin "baserom.dol", 0x4998E8, 0x4 diff --git a/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s b/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s index 1ee051ed..e77e1a6f 100644 --- a/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s +++ b/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef24DrawSmoothStripeStrategyFv __ct__Q34nw4r2ef24DrawSmoothStripeStrategyFv: /* 800C3A90 000BF8D0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5473,12 +5473,12 @@ __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv: /* 800C8AD8 000C4918 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800C8ADC 000C491C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef24DrawSmoothStripeStrategy __vt__Q34nw4r2ef24DrawSmoothStripeStrategy: .incbin "baserom.dol", 0x43C5B8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$215287 $$215287: .incbin "baserom.dol", 0x499930, 0x4 diff --git a/asm/libnw4r_ef/ef_drawstrategybuilder.s b/asm/libnw4r_ef/ef_drawstrategybuilder.s index 6ce20281..8b318fa7 100644 --- a/asm/libnw4r_ef/ef_drawstrategybuilder.s +++ b/asm/libnw4r_ef/ef_drawstrategybuilder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q34nw4r2ef19DrawStrategyBuilderFUl Create__Q34nw4r2ef19DrawStrategyBuilderFUl: /* 800B89B0 000B47F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -124,7 +124,7 @@ lbl_800B8B3C: /* 800B8B48 000B4988 38 21 00 10 */ addi r1, r1, 0x10 /* 800B8B4C 000B498C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef19DrawStrategyBuilder __vt__Q34nw4r2ef19DrawStrategyBuilder: .incbin "baserom.dol", 0x43C4E8, 0x10 diff --git a/asm/libnw4r_ef/ef_drawstrategyimpl.s b/asm/libnw4r_ef/ef_drawstrategyimpl.s index 00f96676..9203e9d8 100644 --- a/asm/libnw4r_ef/ef_drawstrategyimpl.s +++ b/asm/libnw4r_ef/ef_drawstrategyimpl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef16DrawStrategyImplFv __ct__Q34nw4r2ef16DrawStrategyImplFv: /* 800B8B50 000B4990 38 E3 00 34 */ addi r7, r3, 0x34 @@ -2307,15 +2307,15 @@ __sinit_$$3ef_drawstrategyimpl_cpp: /* 800BAB48 000B6988 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800BAB4C 000B698C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402378, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16DrawStrategyImpl __vt__Q34nw4r2ef16DrawStrategyImpl: .incbin "baserom.dol", 0x43C4F8, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29915 $$29915: .incbin "baserom.dol", 0x499828, 0x4 diff --git a/asm/libnw4r_ef/ef_drawstripestrategy.s b/asm/libnw4r_ef/ef_drawstripestrategy.s index d792cb97..c146f8bf 100644 --- a/asm/libnw4r_ef/ef_drawstripestrategy.s +++ b/asm/libnw4r_ef/ef_drawstripestrategy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef18DrawStripeStrategyFv __ct__Q34nw4r2ef18DrawStripeStrategyFv: /* 800C03D0 000BC210 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3789,12 +3789,12 @@ __dt__Q34nw4r2ef18DrawStripeStrategyFv: /* 800C3A88 000BF8C8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800C3A8C 000BF8CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef18DrawStripeStrategy __vt__Q34nw4r2ef18DrawStripeStrategy: .incbin "baserom.dol", 0x43C598, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211761 $$211761: .incbin "baserom.dol", 0x4998F8, 0x4 diff --git a/asm/libnw4r_ef/ef_effect.s b/asm/libnw4r_ef/ef_effect.s index d571a043..baad6f4b 100644 --- a/asm/libnw4r_ef/ef_effect.s +++ b/asm/libnw4r_ef/ef_effect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef6EffectFv __ct__Q34nw4r2ef6EffectFv: /* 800A3A70 0009F8B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -876,12 +876,12 @@ lbl_800A4648: /* 800A4668 000A04A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800A466C 000A04AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef6Effect __vt__Q34nw4r2ef6Effect: .incbin "baserom.dol", 0x43C178, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28467 $$28467: .incbin "baserom.dol", 0x4994B0, 0x8 diff --git a/asm/libnw4r_ef/ef_effectsystem.s b/asm/libnw4r_ef/ef_effectsystem.s index b1409cb5..d514cd0d 100644 --- a/asm/libnw4r_ef/ef_effectsystem.s +++ b/asm/libnw4r_ef/ef_effectsystem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q34nw4r2ef12EffectSystemFv __dt__Q34nw4r2ef12EffectSystemFv: /* 800A4670 000A04B0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -488,20 +488,20 @@ lbl_800A4D04: /* 800A4D48 000A0B88 4E 80 00 20 */ blr /* 800A4D4C 000A0B8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402368, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$27903 $$27903: .incbin "baserom.dol", 0x43C198, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_EF_Version___29$$2unnamed$$2ef_effectsystem_cpp$$2 NW4R_EF_Version___29$$2unnamed$$2ef_effectsystem_cpp$$2: .incbin "baserom.dol", 0x492D38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28588 $$28588: .incbin "baserom.dol", 0x4994B8, 0x4 diff --git a/asm/libnw4r_ef/ef_emform.s b/asm/libnw4r_ef/ef_emform.s index fcd853c3..11caa7ae 100644 --- a/asm/libnw4r_ef/ef_emform.s +++ b/asm/libnw4r_ef/ef_emform.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q34nw4r2ef15EmitFormBuilderFQ34nw4r2ef12EmitFormType Create__Q34nw4r2ef15EmitFormBuilderFQ34nw4r2ef12EmitFormType: /* 800B4AD0 000B0910 2C 04 00 00 */ cmpwi r4, 0 @@ -71,10 +71,10 @@ __sinit_$$3ef_emform_cpp: /* 800B4BA8 000B09E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B4BAC 000B09EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402374, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitFormBuilder __vt__Q34nw4r2ef15EmitFormBuilder: .incbin "baserom.dol", 0x43C468, 0x10 diff --git a/asm/libnw4r_ef/ef_emitter.s b/asm/libnw4r_ef/ef_emitter.s index b17a6b49..ea6ef674 100644 --- a/asm/libnw4r_ef/ef_emitter.s +++ b/asm/libnw4r_ef/ef_emitter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef7EmitterFv __ct__Q34nw4r2ef7EmitterFv: /* 800A4D50 000A0B90 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2348,12 +2348,12 @@ lbl_800A6ED8: /* 800A6EE8 000A2D28 38 21 00 20 */ addi r1, r1, 0x20 /* 800A6EEC 000A2D2C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef7Emitter __vt__Q34nw4r2ef7Emitter: .incbin "baserom.dol", 0x43C1E0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29108 $$29108: .incbin "baserom.dol", 0x4994C0, 0x4 diff --git a/asm/libnw4r_ef/ef_emitterform.s b/asm/libnw4r_ef/ef_emitterform.s index ad2a9b98..7fb5b8bc 100644 --- a/asm/libnw4r_ef/ef_emitterform.s +++ b/asm/libnw4r_ef/ef_emitterform.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcVelocity__Q34nw4r2ef11EmitterFormCFPQ34nw4r4math4VEC3PQ34nw4r2ef7EmitterRCQ34nw4r4math4VEC3RCQ34nw4r4math4VEC3RCQ34nw4r4math4VEC3RCQ34nw4r4math4VEC3 CalcVelocity__Q34nw4r2ef11EmitterFormCFPQ34nw4r4math4VEC3PQ34nw4r2ef7EmitterRCQ34nw4r4math4VEC3RCQ34nw4r4math4VEC3RCQ34nw4r4math4VEC3RCQ34nw4r4math4VEC3: /* 800B40F0 000AFF30 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -378,7 +378,7 @@ lbl_800B4678: /* 800B4688 000B04C8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B468C 000B04CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27729 $$27729: .incbin "baserom.dol", 0x499640, 0x4 diff --git a/asm/libnw4r_ef/ef_handle.s b/asm/libnw4r_ef/ef_handle.s index c7d47977..fe30ad87 100644 --- a/asm/libnw4r_ef/ef_handle.s +++ b/asm/libnw4r_ef/ef_handle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef10HandleBaseFRCQ34nw4r2ef10HandleBase __ct__Q34nw4r2ef10HandleBaseFRCQ34nw4r2ef10HandleBase: /* 800B4030 000AFE70 80 A4 00 00 */ lwz r5, 0(r4) diff --git a/asm/libnw4r_ef/ef_line.s b/asm/libnw4r_ef/ef_line.s index 4e910bd1..78740221 100644 --- a/asm/libnw4r_ef/ef_line.s +++ b/asm/libnw4r_ef/ef_line.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Emission__Q34nw4r2ef15EmitterFormLineFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 Emission__Q34nw4r2ef15EmitterFormLineFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34: /* 800B4F00 000B0D40 94 21 FE C0 */ stwu r1, -0x140(r1) @@ -219,12 +219,12 @@ lbl_800B51D8: /* 800B5238 000B1078 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B523C 000B107C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef15EmitterFormLine __vt__Q34nw4r2ef15EmitterFormLine: .incbin "baserom.dol", 0x43C488, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27653 $$27653: .incbin "baserom.dol", 0x4996A0, 0x4 diff --git a/asm/libnw4r_ef/ef_particle.s b/asm/libnw4r_ef/ef_particle.s index e1b16f00..36e02671 100644 --- a/asm/libnw4r_ef/ef_particle.s +++ b/asm/libnw4r_ef/ef_particle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef8ParticleFv __ct__Q34nw4r2ef8ParticleFv: /* 800AF490 000AB2D0 3C 80 80 44 */ lis r4, __vt__Q34nw4r2ef8Particle@ha @@ -945,12 +945,12 @@ lbl_800B023C: /* 800B0258 000AC098 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B025C 000AC09C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef8Particle __vt__Q34nw4r2ef8Particle: .incbin "baserom.dol", 0x43C408, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28602 $$28602: .incbin "baserom.dol", 0x499568, 0x4 diff --git a/asm/libnw4r_ef/ef_particlemanager.s b/asm/libnw4r_ef/ef_particlemanager.s index 2c0a33f7..fa857ca4 100644 --- a/asm/libnw4r_ef/ef_particlemanager.s +++ b/asm/libnw4r_ef/ef_particlemanager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ef15ParticleManagerFv __ct__Q34nw4r2ef15ParticleManagerFv: /* 800B0260 000AC0A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2379,10 +2379,10 @@ __sinit_$$3ef_particlemanager_cpp: /* 800B2538 000AE378 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B253C 000AE37C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40236C, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$211043 $$211043: .incbin "baserom.dol", 0x43C420, 0x28 @@ -2390,7 +2390,7 @@ $$211043: __vt__Q34nw4r2ef15ParticleManager: .incbin "baserom.dol", 0x43C448, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210377 $$210377: .incbin "baserom.dol", 0x4995B8, 0x4 diff --git a/asm/libnw4r_ef/ef_point.s b/asm/libnw4r_ef/ef_point.s index 8e4095fa..0259c41a 100644 --- a/asm/libnw4r_ef/ef_point.s +++ b/asm/libnw4r_ef/ef_point.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Emission__Q34nw4r2ef16EmitterFormPointFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 Emission__Q34nw4r2ef16EmitterFormPointFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34: /* 800B4BB0 000B09F0 94 21 FE C0 */ stwu r1, -0x140(r1) @@ -223,12 +223,12 @@ lbl_800B4E80: /* 800B4EF8 000B0D38 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B4EFC 000B0D3C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16EmitterFormPoint __vt__Q34nw4r2ef16EmitterFormPoint: .incbin "baserom.dol", 0x43C478, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27645 $$27645: .incbin "baserom.dol", 0x499670, 0x4 diff --git a/asm/libnw4r_ef/ef_postfield.s b/asm/libnw4r_ef/ef_postfield.s index 91f7d210..dc223a6e 100644 --- a/asm/libnw4r_ef/ef_postfield.s +++ b/asm/libnw4r_ef/ef_postfield.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetTypePositionSphere__Q24nw4r2efFRCQ34nw4r4math4VEC3Uc GetTypePositionSphere__Q24nw4r2efFRCQ34nw4r4math4VEC3Uc: /* 800ABE00 000A7C40 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -3801,7 +3801,7 @@ lbl_800AF468: /* 800AF488 000AB2C8 38 21 01 D0 */ addi r1, r1, 0x1d0 /* 800AF48C 000AB2CC 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210295 $$210295: .incbin "baserom.dol", 0x499530, 0x4 diff --git a/asm/libnw4r_ef/ef_resource.s b/asm/libnw4r_ef/ef_resource.s index d11c7ffd..e968ece7 100644 --- a/asm/libnw4r_ef/ef_resource.s +++ b/asm/libnw4r_ef/ef_resource.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetInstance__Q34nw4r2ef8ResourceFv GetInstance__Q34nw4r2ef8ResourceFv: /* 800B2540 000AE380 3C 60 80 51 */ lis r3, mResource__Q34nw4r2ef8Resource@ha @@ -851,7 +851,7 @@ __sinit_$$3ef_resource_cpp: /* 800B30A8 000AEEE8 38 21 00 10 */ addi r1, r1, 0x10 /* 800B30AC 000AEEEC 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402370, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ef/ef_sphere.s b/asm/libnw4r_ef/ef_sphere.s index cbd16e9b..d62c9986 100644 --- a/asm/libnw4r_ef/ef_sphere.s +++ b/asm/libnw4r_ef/ef_sphere.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Emission__Q34nw4r2ef17EmitterFormSphereFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 Emission__Q34nw4r2ef17EmitterFormSphereFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34: /* 800B5780 000B15C0 94 21 FD E0 */ stwu r1, -0x220(r1) @@ -567,12 +567,12 @@ lbl_800B5F2C: /* 800B5FD8 000B1E18 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B5FDC 000B1E1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef17EmitterFormSphere __vt__Q34nw4r2ef17EmitterFormSphere: .incbin "baserom.dol", 0x43C4A8, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27843 $$27843: .incbin "baserom.dol", 0x499710, 0x4 diff --git a/asm/libnw4r_ef/ef_torus.s b/asm/libnw4r_ef/ef_torus.s index bd85be2a..dc39459a 100644 --- a/asm/libnw4r_ef/ef_torus.s +++ b/asm/libnw4r_ef/ef_torus.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Emission__Q34nw4r2ef16EmitterFormTorusFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 Emission__Q34nw4r2ef16EmitterFormTorusFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34: /* 800B6790 000B25D0 94 21 FE 20 */ stwu r1, -0x1e0(r1) @@ -425,12 +425,12 @@ lbl_800B6D24: /* 800B6DC8 000B2C08 4E 80 00 20 */ blr /* 800B6DCC 000B2C0C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef16EmitterFormTorus __vt__Q34nw4r2ef16EmitterFormTorus: .incbin "baserom.dol", 0x43C4C8, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27765 $$27765: .incbin "baserom.dol", 0x4997A8, 0x4 diff --git a/asm/libnw4r_ef/ef_util.s b/asm/libnw4r_ef/ef_util.s index 15b8cad4..a550e8db 100644 --- a/asm/libnw4r_ef/ef_util.s +++ b/asm/libnw4r_ef/ef_util.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global UtlistToArray__Q24nw4r2efFPCQ34nw4r2ut4ListPPvi UtlistToArray__Q24nw4r2efFPCQ34nw4r2ut4ListPPvi: /* 800B30B0 000AEEF0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1099,12 +1099,12 @@ MTXColLen__Q24nw4r2efFPCQ34nw4r4math5MTX34i: /* 800B4028 000AFE68 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800B402C 000AFE6C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global sPS_Three_Half__Q24nw4r2ef sPS_Three_Half__Q24nw4r2ef: .incbin "baserom.dol", 0x492D40, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26727 $$26727: .incbin "baserom.dol", 0x499600, 0x8 diff --git a/asm/libnw4r_g3d/g3d_3dsmax.s b/asm/libnw4r_g3d/g3d_3dsmax.s index 344e8fa2..f9712338 100644 --- a/asm/libnw4r_g3d/g3d_3dsmax.s +++ b/asm/libnw4r_g3d/g3d_3dsmax.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24$$2unnamed$$2g3d_3dsmax_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt: /* 800E8610 000E4450 C0 A4 00 00 */ lfs f5, 0(r4) @@ -754,7 +754,7 @@ lbl_800E90F8: /* 800E9108 000E4F48 4E 80 00 20 */ blr /* 800E910C 000E4F4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: .incbin "baserom.dol", 0x404F58, 0x1C @@ -762,7 +762,7 @@ $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw $$2LOCAL$$2CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: .incbin "baserom.dol", 0x404F74, 0x1C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26188 $$26188: .incbin "baserom.dol", 0x499BE8, 0x4 diff --git a/asm/libnw4r_g3d/g3d_anmchr.s b/asm/libnw4r_g3d/g3d_anmchr.s index b0a3c556..676aca2a 100644 --- a/asm/libnw4r_g3d/g3d_anmchr.s +++ b/asm/libnw4r_g3d/g3d_anmchr.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TestDefined__Q34nw4r3g3d9AnmObjChrCFUl TestDefined__Q34nw4r3g3d9AnmObjChrCFUl: /* 800D7E20 000D3C60 80 63 00 14 */ lwz r3, 0x14(r3) @@ -1920,7 +1920,7 @@ GetTypeObj__Q34nw4r3g3d9AnmObjChrCFv: /* 800D9738 000D5578 4E 80 00 20 */ blr /* 800D973C 000D557C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d9AnmObjChr TYPE_NAME__Q34nw4r3g3d9AnmObjChr: .incbin "baserom.dol", 0x404628, 0x10 @@ -1934,7 +1934,7 @@ TYPE_NAME__Q34nw4r3g3d14AnmObjChrBlend: TYPE_NAME__Q34nw4r3g3d12AnmObjChrRes: .incbin "baserom.dol", 0x404660, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12AnmObjChrRes __vt__Q34nw4r3g3d12AnmObjChrRes: .incbin "baserom.dol", 0x43CC70, 0x58 @@ -1948,7 +1948,7 @@ __vt__Q34nw4r3g3d13AnmObjChrNode: __vt__Q34nw4r3g3d9AnmObjChr: .incbin "baserom.dol", 0x43CD78, 0x58 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28469 $$28469: .incbin "baserom.dol", 0x499AA0, 0x4 diff --git a/asm/libnw4r_g3d/g3d_anmclr.s b/asm/libnw4r_g3d/g3d_anmclr.s index a75f7c21..cb414dbc 100644 --- a/asm/libnw4r_g3d/g3d_anmclr.s +++ b/asm/libnw4r_g3d/g3d_anmclr.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TestExistence__Q34nw4r3g3d12AnmObjMatClrCFUl TestExistence__Q34nw4r3g3d12AnmObjMatClrCFUl: /* 800D4A90 000D08D0 80 63 00 14 */ lwz r3, 0x14(r3) @@ -1714,7 +1714,7 @@ GetTypeObj__Q34nw4r3g3d12AnmObjMatClrCFv: /* 800D6138 000D1F78 4E 80 00 20 */ blr /* 800D613C 000D1F7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr: .incbin "baserom.dol", 0x4044F0, 0x18 @@ -1728,7 +1728,7 @@ TYPE_NAME__Q34nw4r3g3d20AnmObjMatClrOverride: TYPE_NAME__Q34nw4r3g3d15AnmObjMatClrRes: .incbin "baserom.dol", 0x404540, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d15AnmObjMatClrRes __vt__Q34nw4r3g3d15AnmObjMatClrRes: .incbin "baserom.dol", 0x43C910, 0x48 @@ -1742,7 +1742,7 @@ __vt__Q34nw4r3g3d16AnmObjMatClrNode: __vt__Q34nw4r3g3d12AnmObjMatClr: .incbin "baserom.dol", 0x43C9E8, 0x48 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28993 $$28993: .incbin "baserom.dol", 0x499A60, 0x4 diff --git a/asm/libnw4r_g3d/g3d_anmobj.s b/asm/libnw4r_g3d/g3d_anmobj.s index ca60738d..1c4a5624 100644 --- a/asm/libnw4r_g3d/g3d_anmobj.s +++ b/asm/libnw4r_g3d/g3d_anmobj.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PlayPolicy_Onetime__Q24nw4r3g3dFfff PlayPolicy_Onetime__Q24nw4r3g3dFfff: /* 800DBE80 000D7CC0 FC 20 18 90 */ fmr f1, f3 @@ -68,17 +68,17 @@ TestAnmFlag__Q34nw4r3g3d6AnmObjCFQ44nw4r3g3d6AnmObj7AnmFlag: /* 800DBF48 000D7D88 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800DBF4C 000D7D8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6AnmObj TYPE_NAME__Q34nw4r3g3d6AnmObj: .incbin "baserom.dol", 0x4046F8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global smBaseUpdateRate__Q34nw4r3g3d9FrameCtrl smBaseUpdateRate__Q34nw4r3g3d9FrameCtrl: .incbin "baserom.dol", 0x492DD0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25234 $$25234: .incbin "baserom.dol", 0x499AE8, 0x8 diff --git a/asm/libnw4r_g3d/g3d_anmscn.s b/asm/libnw4r_g3d/g3d_anmscn.s index 9d1862d1..e0669bf2 100644 --- a/asm/libnw4r_g3d/g3d_anmscn.s +++ b/asm/libnw4r_g3d/g3d_anmscn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MakeDiffuseLightObj__Q34nw4r3g3d24$$2unnamed$$2g3d_anmscn_cpp$$2FPQ34nw4r3g3d8LightObjPCQ34nw4r3g3d14LightAnmResult MakeDiffuseLightObj__Q34nw4r3g3d24$$2unnamed$$2g3d_anmscn_cpp$$2FPQ34nw4r3g3d8LightObjPCQ34nw4r3g3d14LightAnmResult: /* 800DA7F0 000D6630 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1595,7 +1595,7 @@ GetTypeObj__Q34nw4r3g3d6AnmScnCFv: /* 800DBD08 000D7B48 4E 80 00 20 */ blr /* 800DBD0C 000D7B4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6AnmScn TYPE_NAME__Q34nw4r3g3d6AnmScn: .incbin "baserom.dol", 0x4046C8, 0x10 @@ -1603,7 +1603,7 @@ TYPE_NAME__Q34nw4r3g3d6AnmScn: TYPE_NAME__Q34nw4r3g3d9AnmScnRes: .incbin "baserom.dol", 0x4046D8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d9AnmScnRes __vt__Q34nw4r3g3d9AnmScnRes: .incbin "baserom.dol", 0x43CF10, 0x90 @@ -1611,7 +1611,7 @@ __vt__Q34nw4r3g3d9AnmScnRes: __vt__Q34nw4r3g3d6AnmScn: .incbin "baserom.dol", 0x43CFA0, 0x90 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$213876 $$213876: .incbin "baserom.dol", 0x499AC8, 0x4 diff --git a/asm/libnw4r_g3d/g3d_anmshp.s b/asm/libnw4r_g3d/g3d_anmshp.s index 233a3ec2..a0546fb2 100644 --- a/asm/libnw4r_g3d/g3d_anmshp.s +++ b/asm/libnw4r_g3d/g3d_anmshp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Release__Q34nw4r3g3d9AnmObjShpFv Release__Q34nw4r3g3d9AnmObjShpFv: /* 800D9740 000D5580 4B FF A1 40 */ b Release__Q34nw4r3g3d9AnmObjVisFv @@ -1300,7 +1300,7 @@ GetTypeObj__Q34nw4r3g3d9AnmObjShpCFv: /* 800DA7E8 000D6628 4E 80 00 20 */ blr /* 800DA7EC 000D662C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d9AnmObjShp TYPE_NAME__Q34nw4r3g3d9AnmObjShp: .incbin "baserom.dol", 0x404678, 0x10 @@ -1314,7 +1314,7 @@ TYPE_NAME__Q34nw4r3g3d14AnmObjShpBlend: TYPE_NAME__Q34nw4r3g3d12AnmObjShpRes: .incbin "baserom.dol", 0x4046B0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12AnmObjShpRes __vt__Q34nw4r3g3d12AnmObjShpRes: .incbin "baserom.dol", 0x43CDD0, 0x50 @@ -1328,7 +1328,7 @@ __vt__Q34nw4r3g3d13AnmObjShpNode: __vt__Q34nw4r3g3d9AnmObjShp: .incbin "baserom.dol", 0x43CEC0, 0x50 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28380 $$28380: .incbin "baserom.dol", 0x499AB8, 0x4 diff --git a/asm/libnw4r_g3d/g3d_anmtexpat.s b/asm/libnw4r_g3d/g3d_anmtexpat.s index 6fe27d68..eaa55e29 100644 --- a/asm/libnw4r_g3d/g3d_anmtexpat.s +++ b/asm/libnw4r_g3d/g3d_anmtexpat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Release__Q34nw4r3g3d12AnmObjTexPatFv Release__Q34nw4r3g3d12AnmObjTexPatFv: /* 800D6140 000D1F80 4B FF D7 40 */ b Release__Q34nw4r3g3d9AnmObjVisFv @@ -1152,7 +1152,7 @@ GetTypeObj__Q34nw4r3g3d12AnmObjTexPatCFv: /* 800D6FF8 000D2E38 4E 80 00 20 */ blr /* 800D6FFC 000D2E3C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat: .incbin "baserom.dol", 0x404558, 0x18 @@ -1166,7 +1166,7 @@ TYPE_NAME__Q34nw4r3g3d20AnmObjTexPatOverride: TYPE_NAME__Q34nw4r3g3d15AnmObjTexPatRes: .incbin "baserom.dol", 0x4045A8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d15AnmObjTexPatRes __vt__Q34nw4r3g3d15AnmObjTexPatRes: .incbin "baserom.dol", 0x43CA30, 0x48 @@ -1180,7 +1180,7 @@ __vt__Q34nw4r3g3d16AnmObjTexPatNode: __vt__Q34nw4r3g3d12AnmObjTexPat: .incbin "baserom.dol", 0x43CB08, 0x48 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210745 $$210745: .incbin "baserom.dol", 0x499A70, 0x4 diff --git a/asm/libnw4r_g3d/g3d_anmtexsrt.s b/asm/libnw4r_g3d/g3d_anmtexsrt.s index 4ab25946..0185e159 100644 --- a/asm/libnw4r_g3d/g3d_anmtexsrt.s +++ b/asm/libnw4r_g3d/g3d_anmtexsrt.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Release__Q34nw4r3g3d12AnmObjTexSrtFv Release__Q34nw4r3g3d12AnmObjTexSrtFv: /* 800D7000 000D2E40 4B FF C8 80 */ b Release__Q34nw4r3g3d9AnmObjVisFv @@ -1114,7 +1114,7 @@ GetTypeObj__Q34nw4r3g3d12AnmObjTexSrtCFv: /* 800D7E18 000D3C58 4E 80 00 20 */ blr /* 800D7E1C 000D3C5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt: .incbin "baserom.dol", 0x4045C0, 0x18 @@ -1128,7 +1128,7 @@ TYPE_NAME__Q34nw4r3g3d20AnmObjTexSrtOverride: TYPE_NAME__Q34nw4r3g3d15AnmObjTexSrtRes: .incbin "baserom.dol", 0x404610, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d15AnmObjTexSrtRes __vt__Q34nw4r3g3d15AnmObjTexSrtRes: .incbin "baserom.dol", 0x43CB50, 0x48 @@ -1142,7 +1142,7 @@ __vt__Q34nw4r3g3d16AnmObjTexSrtNode: __vt__Q34nw4r3g3d12AnmObjTexSrt: .incbin "baserom.dol", 0x43CC28, 0x48 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29106 $$29106: .incbin "baserom.dol", 0x499A80, 0x4 diff --git a/asm/libnw4r_g3d/g3d_anmvis.s b/asm/libnw4r_g3d/g3d_anmvis.s index 911c6265..e68c7cc2 100644 --- a/asm/libnw4r_g3d/g3d_anmvis.s +++ b/asm/libnw4r_g3d/g3d_anmvis.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Release__Q34nw4r3g3d9AnmObjVisFv Release__Q34nw4r3g3d9AnmObjVisFv: /* 800D3880 000CF6C0 3C 80 00 01 */ lis r4, 0x00008000@ha @@ -1384,7 +1384,7 @@ GetTypeObj__Q34nw4r3g3d9AnmObjVisCFv: /* 800D4A88 000D08C8 4E 80 00 20 */ blr /* 800D4A8C 000D08CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d9AnmObjVis TYPE_NAME__Q34nw4r3g3d9AnmObjVis: .incbin "baserom.dol", 0x4044A0, 0x10 @@ -1398,7 +1398,7 @@ TYPE_NAME__Q34nw4r3g3d11AnmObjVisOR: TYPE_NAME__Q34nw4r3g3d12AnmObjVisRes: .incbin "baserom.dol", 0x4044D8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12AnmObjVisRes __vt__Q34nw4r3g3d12AnmObjVisRes: .incbin "baserom.dol", 0x43C800, 0x44 @@ -1412,12 +1412,12 @@ __vt__Q34nw4r3g3d13AnmObjVisNode: __vt__Q34nw4r3g3d9AnmObjVis: .incbin "baserom.dol", 0x43C8CC, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy$$2policyTable $$2LOCAL$$2GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy$$2policyTable: .incbin "baserom.dol", 0x492DC8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27650 $$27650: .incbin "baserom.dol", 0x499A50, 0x4 diff --git a/asm/libnw4r_g3d/g3d_basic.s b/asm/libnw4r_g3d/g3d_basic.s index 422d3715..8fe4a6c4 100644 --- a/asm/libnw4r_g3d/g3d_basic.s +++ b/asm/libnw4r_g3d/g3d_basic.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcTexMtx_Basic__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag CalcTexMtx_Basic__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag: /* 800E6A10 000E2850 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -201,7 +201,7 @@ lbl_800E6CC0: /* 800E6CD8 000E2B18 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800E6CDC 000E2B1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27058 $$27058: .incbin "baserom.dol", 0x499BB0, 0x4 diff --git a/asm/libnw4r_g3d/g3d_calcmaterial.s b/asm/libnw4r_g3d/g3d_calcmaterial.s index 01d14fc6..a8ab1dd1 100644 --- a/asm/libnw4r_g3d/g3d_calcmaterial.s +++ b/asm/libnw4r_g3d/g3d_calcmaterial.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcMaterialDirectly__Q24nw4r3g3dFQ34nw4r3g3d6ResMdlPQ34nw4r3g3d12AnmObjTexPatPQ34nw4r3g3d12AnmObjTexSrtPQ34nw4r3g3d12AnmObjMatClr CalcMaterialDirectly__Q24nw4r3g3dFQ34nw4r3g3d6ResMdlPQ34nw4r3g3d12AnmObjTexPatPQ34nw4r3g3d12AnmObjTexSrtPQ34nw4r3g3d12AnmObjMatClr: /* 800F1470 000ED2B0 94 21 FE 20 */ stwu r1, -0x1e0(r1) diff --git a/asm/libnw4r_g3d/g3d_calcview.s b/asm/libnw4r_g3d/g3d_calcview.s index 9c7bf410..7816bd41 100644 --- a/asm/libnw4r_g3d/g3d_calcview.s +++ b/asm/libnw4r_g3d/g3d_calcview.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetModelLocalAxisY2__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math4VEC3PCQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34 GetModelLocalAxisY2__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2FPQ34nw4r4math4VEC3PCQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34: /* 800E0DC0 000DCC00 E0 05 80 00 */ psq_l f0, 0(r5), 1, qr0 @@ -2418,12 +2418,12 @@ lbl_800E303C: /* 800E3058 000DEE98 4E 80 00 20 */ blr /* 800E305C 000DEE9C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global bbFunc__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2 bbFunc__Q34nw4r3g3d26$$2unnamed$$2g3d_calcview_cpp$$2: .incbin "baserom.dol", 0x404EC8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212856 $$212856: .incbin "baserom.dol", 0x499B58, 0x4 diff --git a/asm/libnw4r_g3d/g3d_calcvtx.s b/asm/libnw4r_g3d/g3d_calcvtx.s index 4cceb032..26b11613 100644 --- a/asm/libnw4r_g3d/g3d_calcvtx.s +++ b/asm/libnw4r_g3d/g3d_calcvtx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcVtx__Q24nw4r3g3dFQ34nw4r3g3d6ResMdlPQ34nw4r3g3d9AnmObjShpPPQ34nw4r3g3d13ResVtxPosDataPPQ34nw4r3g3d13ResVtxNrmDataPPQ34nw4r3g3d13ResVtxClrData CalcVtx__Q24nw4r3g3dFQ34nw4r3g3d6ResMdlPQ34nw4r3g3d9AnmObjShpPPQ34nw4r3g3d13ResVtxPosDataPPQ34nw4r3g3d13ResVtxNrmDataPPQ34nw4r3g3d13ResVtxClrData: /* 800F2410 000EE250 94 21 FA 60 */ stwu r1, -0x5a0(r1) @@ -536,7 +536,7 @@ lbl_800F2B70: /* 800F2B98 000EE9D8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800F2B9C 000EE9DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27801 $$27801: .incbin "baserom.dol", 0x499C50, 0x8 diff --git a/asm/libnw4r_g3d/g3d_calcworld.s b/asm/libnw4r_g3d/g3d_calcworld.s index 18e966de..26a6c5d7 100644 --- a/asm/libnw4r_g3d/g3d_calcworld.s +++ b/asm/libnw4r_g3d/g3d_calcworld.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcWorld__Q24nw4r3g3dFPQ34nw4r4math5MTX34PUlPCUcPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlPQ34nw4r3g3d9AnmObjChrPQ34nw4r3g3d16FuncObjCalcWorldUl CalcWorld__Q24nw4r3g3dFPQ34nw4r4math5MTX34PUlPCUcPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlPQ34nw4r3g3d9AnmObjChrPQ34nw4r3g3d16FuncObjCalcWorldUl: /* 800E3170 000DEFB0 94 21 FF 30 */ stwu r1, -0xd0(r1) @@ -752,17 +752,17 @@ lbl_800E3C34: /* 800E3C48 000DFA88 4E 80 00 20 */ blr /* 800E3C4C 000DFA8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$29581 $$29581: .incbin "baserom.dol", 0x43D068, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$29736 $$29736: .incbin "baserom.dol", 0x492DE0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29400 $$29400: .incbin "baserom.dol", 0x499B68, 0x4 diff --git a/asm/libnw4r_g3d/g3d_camera.s b/asm/libnw4r_g3d/g3d_camera.s index 9c0154d6..17c3687b 100644 --- a/asm/libnw4r_g3d/g3d_camera.s +++ b/asm/libnw4r_g3d/g3d_camera.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3g3d6CameraFPQ34nw4r3g3d10CameraData __ct__Q34nw4r3g3d6CameraFPQ34nw4r3g3d10CameraData: /* 800E5AF0 000E1930 90 83 00 00 */ stw r4, 0(r3) @@ -1082,7 +1082,7 @@ lbl_800E69E4: /* 800E6A08 000E2848 4E 80 00 20 */ blr /* 800E6A0C 000E284C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28736 $$28736: .incbin "baserom.dol", 0x499B80, 0x4 diff --git a/asm/libnw4r_g3d/g3d_cpu.s b/asm/libnw4r_g3d/g3d_cpu.s index f719c002..cd592c08 100644 --- a/asm/libnw4r_g3d/g3d_cpu.s +++ b/asm/libnw4r_g3d/g3d_cpu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Copy32ByteBlocks__Q34nw4r3g3d6detailFPvPCvUl Copy32ByteBlocks__Q34nw4r3g3d6detailFPvPCvUl: /* 800DC7D0 000D8610 54 A5 D9 7F */ rlwinm. r5, r5, 0x1b, 5, 0x1f @@ -163,7 +163,7 @@ lbl_800DC9F0: /* 800DCA08 000D8848 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800DCA0C 000D884C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21129 $$21129: .incbin "baserom.dol", 0x499B08, 0x8 diff --git a/asm/libnw4r_g3d/g3d_dcc.s b/asm/libnw4r_g3d/g3d_dcc.s index 1d4a220f..63e915d7 100644 --- a/asm/libnw4r_g3d/g3d_dcc.s +++ b/asm/libnw4r_g3d/g3d_dcc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcTexMtx__Q24nw4r3g3dFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4FlagQ44nw4r3g3d13TexSrtTypedef13TexMatrixMode CalcTexMtx__Q24nw4r3g3dFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4FlagQ44nw4r3g3d13TexSrtTypedef13TexMatrixMode: /* 800E3060 000DEEA0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_g3d/g3d_draw.s b/asm/libnw4r_g3d/g3d_draw.s index e7e29be7..a571fcdf 100644 --- a/asm/libnw4r_g3d/g3d_draw.s +++ b/asm/libnw4r_g3d/g3d_draw.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetIndMtxOp__Q34nw4r3g3d6detailFQ34nw4r3g3d6ResMatQ34nw4r3g3d7ResNodeQ34nw4r3g3d6ResShp GetIndMtxOp__Q34nw4r3g3d6detailFQ34nw4r3g3d6ResMatQ34nw4r3g3d7ResNodeQ34nw4r3g3d6ResShp: /* 800E3C50 000DFA90 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -2164,7 +2164,7 @@ lbl_800E5AD8: /* 800E5AE8 000E1928 38 21 00 50 */ addi r1, r1, 0x50 /* 800E5AEC 000E192C 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2sort$$0PQ54nw4r3g3d6detail7workmem4MdlZ$$4PFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b$$1__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v$$2shuffle$$20 $$2LOCAL$$2sort$$0PQ54nw4r3g3d6detail7workmem4MdlZ$$4PFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b$$1__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v$$2shuffle$$20: .incbin "baserom.dol", 0x492DE8, 0x4 @@ -2172,7 +2172,7 @@ $$2LOCAL$$2sort$$0PQ54nw4r3g3d6detail7workmem4MdlZ$$4PFRCQ54nw4r3g3d6detail7work $$2LOCAL$$2sort$$0PQ54nw4r3g3d6detail7workmem4MdlZ$$4RPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b$$1__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZRPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v$$2shuffle$$20: .incbin "baserom.dol", 0x492DEC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$214861 $$214861: .incbin "baserom.dol", 0x499B70, 0x4 diff --git a/asm/libnw4r_g3d/g3d_draw1mat1shp.s b/asm/libnw4r_g3d/g3d_draw1mat1shp.s index 8307abc1..6303ea22 100644 --- a/asm/libnw4r_g3d/g3d_draw1mat1shp.s +++ b/asm/libnw4r_g3d/g3d_draw1mat1shp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LoadMaterial__Q34nw4r3g3d6detailFQ34nw4r3g3d6ResMatUlPQ34nw4r3g3d16Draw1Mat1ShpSwapPQ44nw4r3g3d8G3DState8IndMtxOpb LoadMaterial__Q34nw4r3g3d6detailFQ34nw4r3g3d6ResMatUlPQ34nw4r3g3d16Draw1Mat1ShpSwapPQ44nw4r3g3d8G3DState8IndMtxOpb: /* 800E0070 000DBEB0 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -952,12 +952,12 @@ lbl_800E0D54: /* 800E0DB8 000DCBF8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800E0DBC 000DCBFC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$210241 $$210241: .incbin "baserom.dol", 0x404EB8, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211256 $$211256: .incbin "baserom.dol", 0x499B38, 0x8 diff --git a/asm/libnw4r_g3d/g3d_fog.s b/asm/libnw4r_g3d/g3d_fog.s index 9e3a5459..6c62ebc6 100644 --- a/asm/libnw4r_g3d/g3d_fog.s +++ b/asm/libnw4r_g3d/g3d_fog.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Init__Q34nw4r3g3d3FogFv Init__Q34nw4r3g3d3FogFv: /* 800F17A0 000ED5E0 80 63 00 00 */ lwz r3, 0(r3) @@ -104,7 +104,7 @@ lbl_800F18EC: /* 800F18F8 000ED738 38 21 00 20 */ addi r1, r1, 0x20 /* 800F18FC 000ED73C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26809 $$26809: .incbin "baserom.dol", 0x499C18, 0x8 diff --git a/asm/libnw4r_g3d/g3d_gpu.s b/asm/libnw4r_g3d/g3d_gpu.s index b6281a80..8b924068 100644 --- a/asm/libnw4r_g3d/g3d_gpu.s +++ b/asm/libnw4r_g3d/g3d_gpu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GDSetGenMode2__Q34nw4r3g3d4fifoFUcUcUcUc11_GXCullMode GDSetGenMode2__Q34nw4r3g3d4fifoFUcUcUcUc11_GXCullMode: /* 800DBF50 000D7D90 3D 40 CC 01 */ lis r10, 0xCC008000@ha @@ -355,7 +355,7 @@ GDLoadTexMtxImm3x3__Q34nw4r3g3d4fifoFRCQ34nw4r4math5MTX33Ul: /* 800DC468 000D82A8 38 21 00 40 */ addi r1, r1, 0x40 /* 800DC46C 000D82AC 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global cm2hw__Q34nw4r3g3d4fifo cm2hw__Q34nw4r3g3d4fifo: .incbin "baserom.dol", 0x499AF0, 0x4 diff --git a/asm/libnw4r_g3d/g3d_init.s b/asm/libnw4r_g3d/g3d_init.s index 52c13c9d..0e5c6b33 100644 --- a/asm/libnw4r_g3d/g3d_init.s +++ b/asm/libnw4r_g3d/g3d_init.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global G3dInit__Q24nw4r3g3dFb G3dInit__Q24nw4r3g3dFb: /* 800F16B0 000ED4F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -72,12 +72,12 @@ lbl_800F1788: /* 800F1798 000ED5D8 38 21 00 10 */ addi r1, r1, 0x10 /* 800F179C 000ED5DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$28056 $$28056: .incbin "baserom.dol", 0x43D290, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_G3D_Version___22$$2unnamed$$2g3d_init_cpp$$2 NW4R_G3D_Version___22$$2unnamed$$2g3d_init_cpp$$2: .incbin "baserom.dol", 0x492E20, 0x8 diff --git a/asm/libnw4r_g3d/g3d_light.s b/asm/libnw4r_g3d/g3d_light.s index 983b4373..5430f6cb 100644 --- a/asm/libnw4r_g3d/g3d_light.s +++ b/asm/libnw4r_g3d/g3d_light.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __as__Q34nw4r3g3d8LightObjFRCQ34nw4r3g3d8LightObj __as__Q34nw4r3g3d8LightObjFRCQ34nw4r3g3d8LightObj: /* 800F1900 000ED740 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -805,7 +805,7 @@ lbl_800F2400: /* 800F2408 000EE248 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800F240C 000EE24C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212220 $$212220: .incbin "baserom.dol", 0x499C20, 0x4 diff --git a/asm/libnw4r_g3d/g3d_maya.s b/asm/libnw4r_g3d/g3d_maya.s index dcd41354..e1fccc3e 100644 --- a/asm/libnw4r_g3d/g3d_maya.s +++ b/asm/libnw4r_g3d/g3d_maya.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22$$2unnamed$$2g3d_maya_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt: /* 800E6CE0 000E2B20 C0 24 00 04 */ lfs f1, 4(r4) @@ -898,7 +898,7 @@ lbl_800E79CC: /* 800E79E8 000E3828 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800E79EC 000E382C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: .incbin "baserom.dol", 0x404EE8, 0x1C @@ -906,7 +906,7 @@ $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r $$2LOCAL$$2CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: .incbin "baserom.dol", 0x404F04, 0x1C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27167 $$27167: .incbin "baserom.dol", 0x499BC0, 0x4 diff --git a/asm/libnw4r_g3d/g3d_obj.s b/asm/libnw4r_g3d/g3d_obj.s index 068f3d84..72ba1bf9 100644 --- a/asm/libnw4r_g3d/g3d_obj.s +++ b/asm/libnw4r_g3d/g3d_obj.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q34nw4r3g3d6G3dObjFv __dt__Q34nw4r3g3d6G3dObjFv: /* 800DBD10 000D7B50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -115,12 +115,12 @@ GetTypeObj__Q34nw4r3g3d6G3dObjCFv: /* 800DBE78 000D7CB8 4E 80 00 20 */ blr /* 800DBE7C 000D7CBC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6G3dObj TYPE_NAME__Q34nw4r3g3d6G3dObj: .incbin "baserom.dol", 0x4046E8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d6G3dObj __vt__Q34nw4r3g3d6G3dObj: .incbin "baserom.dol", 0x43D030, 0x20 diff --git a/asm/libnw4r_g3d/g3d_resanm.s b/asm/libnw4r_g3d/g3d_resanm.s index 60e31545..86f24dbb 100644 --- a/asm/libnw4r_g3d/g3d_resanm.s +++ b/asm/libnw4r_g3d/g3d_resanm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetResKeyFrameAnmResult__Q34nw4r3g3d6detailFPCQ34nw4r3g3d18ResKeyFrameAnmDataf GetResKeyFrameAnmResult__Q34nw4r3g3d6detailFPCQ34nw4r3g3d18ResKeyFrameAnmDataf: /* 800CF440 000CB280 A0 A3 00 00 */ lhz r5, 0(r3) @@ -175,7 +175,7 @@ lbl_800CF694: /* 800CF6A8 000CB4E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800CF6AC 000CB4EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25115 $$25115: .incbin "baserom.dol", 0x4999B0, 0x4 diff --git a/asm/libnw4r_g3d/g3d_resanmamblight.s b/asm/libnw4r_g3d/g3d_resanmamblight.s index 47bb0e96..8c31ebeb 100644 --- a/asm/libnw4r_g3d/g3d_resanmamblight.s +++ b/asm/libnw4r_g3d/g3d_resanmamblight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmResult__Q34nw4r3g3d14ResAnmAmbLightCFPQ34nw4r3g3d17AmbLightAnmResultf GetAnmResult__Q34nw4r3g3d14ResAnmAmbLightCFPQ34nw4r3g3d17AmbLightAnmResultf: /* 800D20B0 000CDEF0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -63,7 +63,7 @@ lbl_800D2168: /* 800D2178 000CDFB8 38 21 00 20 */ addi r1, r1, 0x20 /* 800D217C 000CDFBC 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210893 $$210893: .incbin "baserom.dol", 0x499A10, 0x8 diff --git a/asm/libnw4r_g3d/g3d_resanmcamera.s b/asm/libnw4r_g3d/g3d_resanmcamera.s index 69479a1e..e0611840 100644 --- a/asm/libnw4r_g3d/g3d_resanmcamera.s +++ b/asm/libnw4r_g3d/g3d_resanmcamera.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmResult__Q34nw4r3g3d12ResAnmCameraCFPQ34nw4r3g3d15CameraAnmResultf GetAnmResult__Q34nw4r3g3d12ResAnmCameraCFPQ34nw4r3g3d15CameraAnmResultf: /* 800D26D0 000CE510 94 21 FF C0 */ stwu r1, -0x40(r1) diff --git a/asm/libnw4r_g3d/g3d_resanmchr.s b/asm/libnw4r_g3d/g3d_resanmchr.s index 159bc036..cf9d99e5 100644 --- a/asm/libnw4r_g3d/g3d_resanmchr.s +++ b/asm/libnw4r_g3d/g3d_resanmchr.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmScale__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r4math4VEC3PCQ34nw4r3g3d17ResAnmChrNodeDataPCQ44nw4r3g3d17ResAnmChrNodeData7AnmDataf GetAnmScale__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2FPQ34nw4r4math4VEC3PCQ34nw4r3g3d17ResAnmChrNodeDataPCQ44nw4r3g3d17ResAnmChrNodeData7AnmDataf: /* 800D02D0 000CC110 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -2034,12 +2034,12 @@ lbl_800D1F10: /* 800D1F38 000CDD78 4E 80 00 20 */ blr /* 800D1F3C 000CDD7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global gGetAnmResultTable__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2 gGetAnmResultTable__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmchr_cpp$$2: .incbin "baserom.dol", 0x404480, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28848 $$28848: .incbin "baserom.dol", 0x4999F0, 0x4 diff --git a/asm/libnw4r_g3d/g3d_resanmclr.s b/asm/libnw4r_g3d/g3d_resanmclr.s index bc67b730..6a6de022 100644 --- a/asm/libnw4r_g3d/g3d_resanmclr.s +++ b/asm/libnw4r_g3d/g3d_resanmclr.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmResult__Q34nw4r3g3d9ResAnmClrCFPQ34nw4r3g3d12ClrAnmResultUlf GetAnmResult__Q34nw4r3g3d9ResAnmClrCFPQ34nw4r3g3d12ClrAnmResultUlf: /* 800CF7D0 000CB610 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -109,7 +109,7 @@ lbl_800CF91C: /* 800CF938 000CB778 4E 80 00 20 */ blr /* 800CF93C 000CB77C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25911 $$25911: .incbin "baserom.dol", 0x4999D8, 0x8 diff --git a/asm/libnw4r_g3d/g3d_resanmfog.s b/asm/libnw4r_g3d/g3d_resanmfog.s index 092cda01..f03643d9 100644 --- a/asm/libnw4r_g3d/g3d_resanmfog.s +++ b/asm/libnw4r_g3d/g3d_resanmfog.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmResult__Q34nw4r3g3d9ResAnmFogCFPQ34nw4r3g3d12FogAnmResultf GetAnmResult__Q34nw4r3g3d9ResAnmFogCFPQ34nw4r3g3d12FogAnmResultf: /* 800D2570 000CE3B0 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -103,7 +103,7 @@ lbl_800D269C: /* 800D26C8 000CE508 38 21 00 50 */ addi r1, r1, 0x50 /* 800D26CC 000CE50C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210922 $$210922: .incbin "baserom.dol", 0x499A30, 0x8 diff --git a/asm/libnw4r_g3d/g3d_resanmlight.s b/asm/libnw4r_g3d/g3d_resanmlight.s index 2756bc3b..07f1a68f 100644 --- a/asm/libnw4r_g3d/g3d_resanmlight.s +++ b/asm/libnw4r_g3d/g3d_resanmlight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmResult__Q34nw4r3g3d11ResAnmLightCFPQ34nw4r3g3d14LightAnmResultf GetAnmResult__Q34nw4r3g3d11ResAnmLightCFPQ34nw4r3g3d14LightAnmResultf: /* 800D2180 000CDFC0 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -296,7 +296,7 @@ lbl_800D2540: /* 800D2568 000CE3A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800D256C 000CE3AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211230 $$211230: .incbin "baserom.dol", 0x499A20, 0x8 diff --git a/asm/libnw4r_g3d/g3d_resanmscn.s b/asm/libnw4r_g3d/g3d_resanmscn.s index 1bd38d06..f4798f58 100644 --- a/asm/libnw4r_g3d/g3d_resanmscn.s +++ b/asm/libnw4r_g3d/g3d_resanmscn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HasResAnmAmbLight__Q34nw4r3g3d9ResAnmScnCFv HasResAnmAmbLight__Q34nw4r3g3d9ResAnmScnCFv: /* 800D29E0 000CE820 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -796,7 +796,7 @@ lbl_800D33D8: /* 800D33F8 000CF238 4E 80 00 20 */ blr /* 800D33FC 000CF23C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global ResNameData_LightSet__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2 ResNameData_LightSet__Q34nw4r3g3d27$$2unnamed$$2g3d_resanmscn_cpp$$2: .incbin "baserom.dol", 0x43C760, 0x20 diff --git a/asm/libnw4r_g3d/g3d_resanmshp.s b/asm/libnw4r_g3d/g3d_resanmshp.s index debe2c41..04a6cd86 100644 --- a/asm/libnw4r_g3d/g3d_resanmshp.s +++ b/asm/libnw4r_g3d/g3d_resanmshp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmResult__Q34nw4r3g3d9ResAnmShpCFPQ34nw4r3g3d12ShpAnmResultUlfPCQ34nw4r3g3d12ShpAnmVtxSet GetAnmResult__Q34nw4r3g3d9ResAnmShpCFPQ34nw4r3g3d12ShpAnmResultUlfPCQ34nw4r3g3d12ShpAnmVtxSet: /* 800D3400 000CF240 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -105,7 +105,7 @@ lbl_800D353C: /* 800D3568 000CF3A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800D356C 000CF3AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27163 $$27163: .incbin "baserom.dol", 0x499A40, 0x8 diff --git a/asm/libnw4r_g3d/g3d_resanmtexpat.s b/asm/libnw4r_g3d/g3d_resanmtexpat.s index 3be5c802..fca3ad95 100644 --- a/asm/libnw4r_g3d/g3d_resanmtexpat.s +++ b/asm/libnw4r_g3d/g3d_resanmtexpat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SearchFrame__Q34nw4r3g3d30$$2unnamed$$2g3d_resanmtexpat_cpp$$2FPCQ34nw4r3g3d19ResAnmTexPatAnmDataf SearchFrame__Q34nw4r3g3d30$$2unnamed$$2g3d_resanmtexpat_cpp$$2FPCQ34nw4r3g3d19ResAnmTexPatAnmDataf: /* 800CF940 000CB780 A0 A3 00 00 */ lhz r5, 0(r3) diff --git a/asm/libnw4r_g3d/g3d_resanmtexsrt.s b/asm/libnw4r_g3d/g3d_resanmtexsrt.s index 10d054bf..7c30f35a 100644 --- a/asm/libnw4r_g3d/g3d_resanmtexsrt.s +++ b/asm/libnw4r_g3d/g3d_resanmtexsrt.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmResult__Q34nw4r3g3d12ResAnmTexSrtCFPQ34nw4r3g3d15TexSrtAnmResultUlf GetAnmResult__Q34nw4r3g3d12ResAnmTexSrtCFPQ34nw4r3g3d15TexSrtAnmResultUlf: /* 800CFEB0 000CBCF0 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -313,7 +313,7 @@ lbl_800D028C: /* 800D02C8 000CC108 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800D02CC 000CC10C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26218 $$26218: .incbin "baserom.dol", 0x4999E8, 0x4 diff --git a/asm/libnw4r_g3d/g3d_resanmvis.s b/asm/libnw4r_g3d/g3d_resanmvis.s index 4f0bc066..9056fabe 100644 --- a/asm/libnw4r_g3d/g3d_resanmvis.s +++ b/asm/libnw4r_g3d/g3d_resanmvis.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetAnmResult__Q34nw4r3g3d9ResAnmVisCFUlf GetAnmResult__Q34nw4r3g3d9ResAnmVisCFUlf: /* 800CF6B0 000CB4F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -86,7 +86,7 @@ lbl_800CF7BC: /* 800CF7C8 000CB608 38 21 00 20 */ addi r1, r1, 0x20 /* 800CF7CC 000CB60C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25876 $$25876: .incbin "baserom.dol", 0x4999C8, 0x8 diff --git a/asm/libnw4r_g3d/g3d_rescommon.s b/asm/libnw4r_g3d/g3d_rescommon.s index e34b629b..2e1e967b 100644 --- a/asm/libnw4r_g3d/g3d_rescommon.s +++ b/asm/libnw4r_g3d/g3d_rescommon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __eq__Q34nw4r3g3d7ResNameCFQ34nw4r3g3d7ResName __eq__Q34nw4r3g3d7ResNameCFQ34nw4r3g3d7ResName: /* 800C8AE0 000C4920 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_g3d/g3d_resdict.s b/asm/libnw4r_g3d/g3d_resdict.s index f72e043e..bf0687bc 100644 --- a/asm/libnw4r_g3d/g3d_resdict.s +++ b/asm/libnw4r_g3d/g3d_resdict.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Get__Q34nw4r3g3d6ResDicCFQ34nw4r3g3d7ResName Get__Q34nw4r3g3d6ResDicCFQ34nw4r3g3d7ResName: /* 800C8C50 000C4A90 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libnw4r_g3d/g3d_resfile.s b/asm/libnw4r_g3d/g3d_resfile.s index 7c7f0dab..c2d77e43 100644 --- a/asm/libnw4r_g3d/g3d_resfile.s +++ b/asm/libnw4r_g3d/g3d_resfile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetResMdl__Q34nw4r3g3d7ResFileCFPCc GetResMdl__Q34nw4r3g3d7ResFileCFPCc: /* 800C8F70 000C4DB0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1762,7 +1762,7 @@ lbl_800CA6D4: /* 800CA6E8 000C6528 4E 80 00 20 */ blr /* 800CA6EC 000C652C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global ResNameData_Models__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2 ResNameData_Models__Q34nw4r3g3d25$$2unnamed$$2g3d_resfile_cpp$$2: .incbin "baserom.dol", 0x43C5E0, 0x20 diff --git a/asm/libnw4r_g3d/g3d_reslightset.s b/asm/libnw4r_g3d/g3d_reslightset.s index c91f1d86..8d20c938 100644 --- a/asm/libnw4r_g3d/g3d_reslightset.s +++ b/asm/libnw4r_g3d/g3d_reslightset.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Bind__Q34nw4r3g3d11ResLightSetFQ34nw4r3g3d9ResAnmScn Bind__Q34nw4r3g3d11ResLightSetFQ34nw4r3g3d9ResAnmScn: /* 800D1F40 000CDD80 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/libnw4r_g3d/g3d_resmat.s b/asm/libnw4r_g3d/g3d_resmat.s index a04082ac..3a973151 100644 --- a/asm/libnw4r_g3d/g3d_resmat.s +++ b/asm/libnw4r_g3d/g3d_resmat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetParent__Q34nw4r3g3d6ResMatFv GetParent__Q34nw4r3g3d6ResMatFv: /* 800CCD10 000C8B50 80 63 00 00 */ lwz r3, 0(r3) @@ -1713,7 +1713,7 @@ lbl_800CE3D0: /* 800CE3E8 000CA228 4E 80 00 20 */ blr /* 800CE3EC 000CA22C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$213919 $$213919: .incbin "baserom.dol", 0x499968, 0x4 diff --git a/asm/libnw4r_g3d/g3d_resmdl.s b/asm/libnw4r_g3d/g3d_resmdl.s index 25c4c7cc..f8ef6bec 100644 --- a/asm/libnw4r_g3d/g3d_resmdl.s +++ b/asm/libnw4r_g3d/g3d_resmdl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetResByteCode__Q34nw4r3g3d6ResMdlCFPCc GetResByteCode__Q34nw4r3g3d6ResMdlCFPCc: /* 800CA6F0 000C6530 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1393,7 +1393,7 @@ lbl_800CB7E0: /* 800CB7F8 000C7638 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800CB7FC 000C763C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv$$20 $$2STRING$$2GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv$$20: .incbin "baserom.dol", 0x492DB8, 0x8 diff --git a/asm/libnw4r_g3d/g3d_resnode.s b/asm/libnw4r_g3d/g3d_resnode.s index bb532f11..43c570eb 100644 --- a/asm/libnw4r_g3d/g3d_resnode.s +++ b/asm/libnw4r_g3d/g3d_resnode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PatchChrAnmResult__Q34nw4r3g3d7ResNodeCFPQ34nw4r3g3d12ChrAnmResult PatchChrAnmResult__Q34nw4r3g3d7ResNodeCFPQ34nw4r3g3d12ChrAnmResult: /* 800CE7F0 000CA630 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -945,7 +945,7 @@ lbl_800CF41C: /* 800CF438 000CB278 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800CF43C 000CB27C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27550 $$27550: .incbin "baserom.dol", 0x4999A0, 0x4 diff --git a/asm/libnw4r_g3d/g3d_resshp.s b/asm/libnw4r_g3d/g3d_resshp.s index a420e484..040e30ff 100644 --- a/asm/libnw4r_g3d/g3d_resshp.s +++ b/asm/libnw4r_g3d/g3d_resshp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetResVtxPos__Q34nw4r3g3d6ResShpCFv GetResVtxPos__Q34nw4r3g3d6ResShpCFv: /* 800CB800 000C7640 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_g3d/g3d_restev.s b/asm/libnw4r_g3d/g3d_restev.s index 42e65d0a..59bbb3dd 100644 --- a/asm/libnw4r_g3d/g3d_restev.s +++ b/asm/libnw4r_g3d/g3d_restev.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GXSetTevSwapMode__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTevSwapSel13_GXTevSwapSel GXSetTevSwapMode__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTevSwapSel13_GXTevSwapSel: /* 800CC0D0 000C7F10 54 89 0F FE */ srwi r9, r4, 0x1f @@ -897,7 +897,7 @@ lbl_800CCD04: /* 800CCD08 000C8B48 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800CCD0C 000C8B4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapIDP12_GXChannelID$$2r2c $$2LOCAL$$2GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapIDP12_GXChannelID$$2r2c: .incbin "baserom.dol", 0x404420, 0x20 @@ -905,7 +905,7 @@ $$2LOCAL$$2GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11 $$2LOCAL$$2CallDisplayList__Q34nw4r3g3d6ResTevCFb$$2dlsize: .incbin "baserom.dol", 0x404440, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID$$2c2r $$2LOCAL$$2GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID$$2c2r: .incbin "baserom.dol", 0x43C740, 0x20 diff --git a/asm/libnw4r_g3d/g3d_restex.s b/asm/libnw4r_g3d/g3d_restex.s index 23e01897..ba273f04 100644 --- a/asm/libnw4r_g3d/g3d_restex.s +++ b/asm/libnw4r_g3d/g3d_restex.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DCStore__Q34nw4r3g3d7ResPlttFb DCStore__Q34nw4r3g3d7ResPlttFb: /* 800CE610 000CA450 80 63 00 00 */ lwz r3, 0(r3) diff --git a/asm/libnw4r_g3d/g3d_resvtx.s b/asm/libnw4r_g3d/g3d_resvtx.s index ad51f310..b6f3aaab 100644 --- a/asm/libnw4r_g3d/g3d_resvtx.s +++ b/asm/libnw4r_g3d/g3d_resvtx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetArray__Q34nw4r3g3d9ResVtxPosFv SetArray__Q34nw4r3g3d9ResVtxPosFv: /* 800CE3F0 000CA230 80 A3 00 00 */ lwz r5, 0(r3) diff --git a/asm/libnw4r_g3d/g3d_scnmdl.s b/asm/libnw4r_g3d/g3d_scnmdl.s index 6e3f61fb..e0d170a8 100644 --- a/asm/libnw4r_g3d/g3d_scnmdl.s +++ b/asm/libnw4r_g3d/g3d_scnmdl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetResGenMode__Q44nw4r3g3d6ScnMdl15CopiedMatAccessFb GetResGenMode__Q44nw4r3g3d6ScnMdl15CopiedMatAccessFb: /* 800EE240 000EA080 80 A3 00 00 */ lwz r5, 0(r3) @@ -2978,12 +2978,12 @@ GetTypeObj__Q34nw4r3g3d6ScnMdlCFv: /* 800F0AA8 000EC8E8 4E 80 00 20 */ blr /* 800F0AAC 000EC8EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6ScnMdl TYPE_NAME__Q34nw4r3g3d6ScnMdl: .incbin "baserom.dol", 0x404FE8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d6ScnMdl __vt__Q34nw4r3g3d6ScnMdl: .incbin "baserom.dol", 0x43D208, 0x48 diff --git a/asm/libnw4r_g3d/g3d_scnmdlexpand.s b/asm/libnw4r_g3d/g3d_scnmdlexpand.s index aaf530a7..823631db 100644 --- a/asm/libnw4r_g3d/g3d_scnmdlexpand.s +++ b/asm/libnw4r_g3d/g3d_scnmdlexpand.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Construct__Q34nw4r3g3d12ScnMdlExpandFP12MEMAllocatorPUlUlPQ34nw4r3g3d12ScnMdlSimple Construct__Q34nw4r3g3d12ScnMdlExpandFP12MEMAllocatorPUlUlPQ34nw4r3g3d12ScnMdlSimple: /* 800F0AB0 000EC8F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -705,17 +705,17 @@ GetTypeObj__Q34nw4r3g3d12ScnMdlExpandCFv: /* 800F1468 000ED2A8 4E 80 00 20 */ blr /* 800F146C 000ED2AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand: .incbin "baserom.dol", 0x404FF8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12ScnMdlExpand __vt__Q34nw4r3g3d12ScnMdlExpand: .incbin "baserom.dol", 0x43D250, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global INVALID_NODE_ID__Q34nw4r3g3d30$$2unnamed$$2g3d_scnmdlexpand_cpp$$2 INVALID_NODE_ID__Q34nw4r3g3d30$$2unnamed$$2g3d_scnmdlexpand_cpp$$2: .incbin "baserom.dol", 0x492E18, 0x8 diff --git a/asm/libnw4r_g3d/g3d_scnmdlsmpl.s b/asm/libnw4r_g3d/g3d_scnmdlsmpl.s index 44d62683..8b75471e 100644 --- a/asm/libnw4r_g3d/g3d_scnmdlsmpl.s +++ b/asm/libnw4r_g3d/g3d_scnmdlsmpl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ScnMdlSmpl_CalcPosture__Q34nw4r3g3d12ScnMdlSimpleFUlPCQ34nw4r4math5MTX34 ScnMdlSmpl_CalcPosture__Q34nw4r3g3d12ScnMdlSimpleFUlPCQ34nw4r4math5MTX34: /* 800EC3A0 000E81E0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -2235,12 +2235,12 @@ GetTypeObj__Q34nw4r3g3d12ScnMdlSimpleCFv: /* 800EE238 000EA078 4E 80 00 20 */ blr /* 800EE23C 000EA07C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple: .incbin "baserom.dol", 0x404FD0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$214160 $$214160: .incbin "baserom.dol", 0x43D1B0, 0x10 @@ -2248,7 +2248,7 @@ $$214160: __vt__Q34nw4r3g3d12ScnMdlSimple: .incbin "baserom.dol", 0x43D1C0, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$214161 $$214161: .incbin "baserom.dol", 0x492E00, 0x8 @@ -2259,7 +2259,7 @@ $$214162: $$214163: .incbin "baserom.dol", 0x492E10, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$214252 $$214252: .incbin "baserom.dol", 0x499C10, 0x8 diff --git a/asm/libnw4r_g3d/g3d_scnobj.s b/asm/libnw4r_g3d/g3d_scnobj.s index 418fbe87..16d04320 100644 --- a/asm/libnw4r_g3d/g3d_scnobj.s +++ b/asm/libnw4r_g3d/g3d_scnobj.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl: /* 800E9110 000E4F50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1784,7 +1784,7 @@ GetTypeObj__Q34nw4r3g3d6ScnObjCFv: /* 800EA928 000E6768 4E 80 00 20 */ blr /* 800EA92C 000E676C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d6ScnObj TYPE_NAME__Q34nw4r3g3d6ScnObj: .incbin "baserom.dol", 0x404F90, 0x10 @@ -1795,7 +1795,7 @@ TYPE_NAME__Q34nw4r3g3d7ScnLeaf: TYPE_NAME__Q34nw4r3g3d8ScnGroup: .incbin "baserom.dol", 0x404FB0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$211622 $$211622: .incbin "baserom.dol", 0x43D078, 0x28 @@ -1809,7 +1809,7 @@ __vt__Q34nw4r3g3d8ScnGroup: __vt__Q34nw4r3g3d6ScnObj: .incbin "baserom.dol", 0x43D108, 0x38 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211583 $$211583: .incbin "baserom.dol", 0x499C00, 0x4 diff --git a/asm/libnw4r_g3d/g3d_scnroot.s b/asm/libnw4r_g3d/g3d_scnroot.s index 62bb2159..340b6e7d 100644 --- a/asm/libnw4r_g3d/g3d_scnroot.s +++ b/asm/libnw4r_g3d/g3d_scnroot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Construct__Q34nw4r3g3d7ScnRootFP12MEMAllocatorPUlUlUlUlUl Construct__Q34nw4r3g3d7ScnRootFP12MEMAllocatorPUlUlUlUlUl: /* 800EA930 000E6770 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1932,12 +1932,12 @@ GetTypeObj__Q34nw4r3g3d7ScnRootCFv: /* 800EC398 000E81D8 4E 80 00 20 */ blr /* 800EC39C 000E81DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global TYPE_NAME__Q34nw4r3g3d7ScnRoot TYPE_NAME__Q34nw4r3g3d7ScnRoot: .incbin "baserom.dol", 0x404FC0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3g3d12ScnObjGather __vt__Q34nw4r3g3d12ScnObjGather: .incbin "baserom.dol", 0x43D140, 0x30 @@ -1945,7 +1945,7 @@ __vt__Q34nw4r3g3d12ScnObjGather: __vt__Q34nw4r3g3d7ScnRoot: .incbin "baserom.dol", 0x43D170, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$213447 $$213447: .incbin "baserom.dol", 0x492DF0, 0x4 @@ -1959,7 +1959,7 @@ $$2LOCAL$$2sort$$0PPQ34nw4r3g3d6ScnObj$$4PFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6Scn $$2LOCAL$$2sort$$0PPQ34nw4r3g3d6ScnObj$$4RPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b$$1__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjRPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v$$2shuffle$$20: .incbin "baserom.dol", 0x492DFC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$214739 $$214739: .incbin "baserom.dol", 0x499C08, 0x8 diff --git a/asm/libnw4r_g3d/g3d_state.s b/asm/libnw4r_g3d/g3d_state.s index 5cff089e..7a9deb09 100644 --- a/asm/libnw4r_g3d/g3d_state.s +++ b/asm/libnw4r_g3d/g3d_state.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc: /* 800DCA10 000D8850 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -3881,20 +3881,20 @@ lbl_800E0018: /* 800E0068 000DBEA8 38 21 00 20 */ addi r1, r1, 0x20 /* 800E006C 000DBEAC 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40237C, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc$$2envMtx $$2LOCAL$$2EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc$$2envMtx: .incbin "baserom.dol", 0x404E88, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3g3d8G3DState11IndMtxOpStd __vt__Q44nw4r3g3d8G3DState11IndMtxOpStd: .incbin "baserom.dol", 0x43D050, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$213345 $$213345: .incbin "baserom.dol", 0x492DD8, 0x4 @@ -3902,7 +3902,7 @@ $$213345: pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23$$2unnamed$$2g3d_state_cpp$$2: .incbin "baserom.dol", 0x492DDC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global cm2hw__Q34nw4r3g3d4fifo cm2hw__Q34nw4r3g3d4fifo: .incbin "baserom.dol", 0x499B10, 0x4 diff --git a/asm/libnw4r_g3d/g3d_tmem.s b/asm/libnw4r_g3d/g3d_tmem.s index 71658ae7..f69bcdc7 100644 --- a/asm/libnw4r_g3d/g3d_tmem.s +++ b/asm/libnw4r_g3d/g3d_tmem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetTMemLayout__Q34nw4r3g3d4tmemFQ44nw4r3g3d4tmem10TMemLayout SetTMemLayout__Q34nw4r3g3d4tmemFQ44nw4r3g3d4tmem10TMemLayout: /* 800DC470 000D82B0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -241,7 +241,7 @@ lbl_800DC7B8: /* 800DC7C8 000D8608 38 21 00 30 */ addi r1, r1, 0x30 /* 800DC7CC 000D860C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global scaaaTexRegionAddr scaaaTexRegionAddr: .incbin "baserom.dol", 0x404708, 0x3C0 diff --git a/asm/libnw4r_g3d/g3d_transform.s b/asm/libnw4r_g3d/g3d_transform.s index 08eb41e9..3056fec4 100644 --- a/asm/libnw4r_g3d/g3d_transform.s +++ b/asm/libnw4r_g3d/g3d_transform.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcViewNrmMtx__Q34nw4r3g3d6detailFPQ34nw4r4math5MTX33PCQ34nw4r4math5MTX34 CalcViewNrmMtx__Q34nw4r3g3d6detailFPQ34nw4r4math5MTX33PCQ34nw4r4math5MTX34: /* 800D3570 000CF3B0 E0 04 80 00 */ psq_l f0, 0(r4), 1, qr0 @@ -210,7 +210,7 @@ lbl_800D37E8: /* 800D3878 000CF6B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800D387C 000CF6BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global det_epsilon__Q34nw4r3g3d6detail det_epsilon__Q34nw4r3g3d6detail: .incbin "baserom.dol", 0x499A48, 0x8 diff --git a/asm/libnw4r_g3d/g3d_workmem.s b/asm/libnw4r_g3d/g3d_workmem.s index 3322f488..4f705726 100644 --- a/asm/libnw4r_g3d/g3d_workmem.s +++ b/asm/libnw4r_g3d/g3d_workmem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetScaleTemporary__Q44nw4r3g3d6detail7workmemFv GetScaleTemporary__Q44nw4r3g3d6detail7workmemFv: /* 800E3150 000DEF90 3C 60 80 51 */ lis r3, lbl_80510500@ha diff --git a/asm/libnw4r_g3d/g3d_xsi.s b/asm/libnw4r_g3d/g3d_xsi.s index 7757d5c0..d6f829e1 100644 --- a/asm/libnw4r_g3d/g3d_xsi.s +++ b/asm/libnw4r_g3d/g3d_xsi.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21$$2unnamed$$2g3d_xsi_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt: /* 800E79F0 000E3830 C0 24 00 04 */ lfs f1, 4(r4) @@ -838,7 +838,7 @@ lbl_800E85EC: /* 800E8608 000E4448 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800E860C 000E444C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable: .incbin "baserom.dol", 0x404F20, 0x1C @@ -846,7 +846,7 @@ $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3 $$2LOCAL$$2CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag$$2funcTable$$20: .incbin "baserom.dol", 0x404F3C, 0x1C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27161 $$27161: .incbin "baserom.dol", 0x499BD8, 0x4 diff --git a/asm/libnw4r_lyt/lyt_animation.s b/asm/libnw4r_lyt/lyt_animation.s index 0c086d57..a30ff742 100644 --- a/asm/libnw4r_lyt/lyt_animation.s +++ b/asm/libnw4r_lyt/lyt_animation.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetStepCurveValue__Q34nw4r3lyt27$$2unnamed$$2lyt_animation_cpp$$2FfPCQ44nw4r3lyt3res7StepKeyUl GetStepCurveValue__Q34nw4r3lyt27$$2unnamed$$2lyt_animation_cpp$$2FfPCQ44nw4r3lyt3res7StepKeyUl: /* 800FC270 000F80B0 28 04 00 01 */ cmplwi r4, 1 @@ -1655,12 +1655,12 @@ lbl_800FD854: /* 800FD878 000F96B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800FD87C 000F96BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt18AnimTransformBasic __vt__Q34nw4r3lyt18AnimTransformBasic: .incbin "baserom.dol", 0x43D668, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210121 $$210121: .incbin "baserom.dol", 0x499CF0, 0x4 diff --git a/asm/libnw4r_lyt/lyt_arcResourceAccessor.s b/asm/libnw4r_lyt/lyt_arcResourceAccessor.s index 413a8e3b..885cc6c5 100644 --- a/asm/libnw4r_lyt/lyt_arcResourceAccessor.s +++ b/asm/libnw4r_lyt/lyt_arcResourceAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global FindNameResource__37$$2unnamed$$2lyt_arcResourceAccessor_cpp$$2FP9ARCHandlePCc FindNameResource__37$$2unnamed$$2lyt_arcResourceAccessor_cpp$$2FP9ARCHandlePCc: /* 800FD8B0 000F96F0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -341,12 +341,12 @@ lbl_800FDD20: /* 800FDD38 000F9B78 4E 80 00 20 */ blr /* 800FDD3C 000F9B7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt19ArcResourceAccessor __vt__Q34nw4r3lyt19ArcResourceAccessor: .incbin "baserom.dol", 0x43D6A8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23486 $$23486: .incbin "baserom.dol", 0x492E30, 0x4 diff --git a/asm/libnw4r_lyt/lyt_bounding.s b/asm/libnw4r_lyt/lyt_bounding.s index 7fde6fbc..f2f764ee 100644 --- a/asm/libnw4r_lyt/lyt_bounding.s +++ b/asm/libnw4r_lyt/lyt_bounding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3lyt8BoundingFPCQ44nw4r3lyt3res8BoundingRCQ34nw4r3lyt11ResBlockSet __ct__Q34nw4r3lyt8BoundingFPCQ44nw4r3lyt3res8BoundingRCQ34nw4r3lyt11ResBlockSet: /* 800F9050 000F4E90 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -69,10 +69,10 @@ __sinit_$$3lyt_bounding_cpp: /* 800F9118 000F4F58 4E 80 00 20 */ blr /* 800F911C 000F4F5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402390, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt8Bounding __vt__Q34nw4r3lyt8Bounding: .incbin "baserom.dol", 0x43D570, 0x78 diff --git a/asm/libnw4r_lyt/lyt_common.s b/asm/libnw4r_lyt/lyt_common.s index f9c4efa7..e1cef011 100644 --- a/asm/libnw4r_lyt/lyt_common.s +++ b/asm/libnw4r_lyt/lyt_common.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global EqualsResName__Q34nw4r3lyt6detailFPCcPCc EqualsResName__Q34nw4r3lyt6detailFPCcPCc: /* 800FDD40 000F9B80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -819,7 +819,7 @@ lbl_800FE888: /* 800FE898 000FA6D8 38 21 00 30 */ addi r1, r1, 0x30 /* 800FE89C 000FA6DC 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28721 $$28721: .incbin "baserom.dol", 0x499D10, 0x4 diff --git a/asm/libnw4r_lyt/lyt_drawInfo.s b/asm/libnw4r_lyt/lyt_drawInfo.s index af6e0c15..78d3c543 100644 --- a/asm/libnw4r_lyt/lyt_drawInfo.s +++ b/asm/libnw4r_lyt/lyt_drawInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3lyt8DrawInfoFv __ct__Q34nw4r3lyt8DrawInfoFv: /* 800FC1E0 000F8020 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -43,12 +43,12 @@ __dt__Q34nw4r3lyt8DrawInfoFv: /* 800FC268 000F80A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800FC26C 000F80AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt8DrawInfo __vt__Q34nw4r3lyt8DrawInfo: .incbin "baserom.dol", 0x43D658, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25034 $$25034: .incbin "baserom.dol", 0x499CE8, 0x4 diff --git a/asm/libnw4r_lyt/lyt_group.s b/asm/libnw4r_lyt/lyt_group.s index 91c76d28..787e53ba 100644 --- a/asm/libnw4r_lyt/lyt_group.s +++ b/asm/libnw4r_lyt/lyt_group.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3lyt5GroupFPCQ44nw4r3lyt3res5GroupPQ34nw4r3lyt4Pane __ct__Q34nw4r3lyt5GroupFPCQ44nw4r3lyt3res5GroupPQ34nw4r3lyt4Pane: /* 800F3AF0 000EF930 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -249,7 +249,7 @@ lbl_800F3E2C: /* 800F3E48 000EFC88 4E 80 00 20 */ blr /* 800F3E4C 000EFC8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt5Group __vt__Q34nw4r3lyt5Group: .incbin "baserom.dol", 0x43D358, 0x10 diff --git a/asm/libnw4r_lyt/lyt_layout.s b/asm/libnw4r_lyt/lyt_layout.s index 898408d9..8ab98764 100644 --- a/asm/libnw4r_lyt/lyt_layout.s +++ b/asm/libnw4r_lyt/lyt_layout.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetTagProcessorImpl__Q34nw4r3lyt24$$2unnamed$$2lyt_layout_cpp$$2FPQ34nw4r3lyt4PanePQ34nw4r2ut19TagProcessorBase$$0w$$1 SetTagProcessorImpl__Q34nw4r3lyt24$$2unnamed$$2lyt_layout_cpp$$2FPQ34nw4r3lyt4PanePQ34nw4r2ut19TagProcessorBase$$0w$$1: /* 800F3E50 000EFC90 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1162,12 +1162,12 @@ lbl_800F4D94: /* 800F4DA8 000F0BE8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800F4DAC 000F0BEC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt6Layout __vt__Q34nw4r3lyt6Layout: .incbin "baserom.dol", 0x43D368, 0x40 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210260 $$210260: .incbin "baserom.dol", 0x499C78, 0x4 diff --git a/asm/libnw4r_lyt/lyt_material.s b/asm/libnw4r_lyt/lyt_material.s index e7ba4ead..88fc5275 100644 --- a/asm/libnw4r_lyt/lyt_material.s +++ b/asm/libnw4r_lyt/lyt_material.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcTextureMtx__Q34nw4r3lyt26$$2unnamed$$2lyt_material_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3lyt6TexSRT CalcTextureMtx__Q34nw4r3lyt26$$2unnamed$$2lyt_material_cpp$$2FPQ34nw4r4math5MTX34RCQ34nw4r3lyt6TexSRT: /* 800F9120 000F4F60 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3230,7 +3230,7 @@ lbl_800FBFF8: /* 800FBFF8 000F7E38 38 21 00 20 */ addi r1, r1, 0x20 /* 800FBFFC 000F7E3C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2SetupGX__Q34nw4r3lyt8MaterialFbUc$$2kColSels $$2LOCAL$$2SetupGX__Q34nw4r3lyt8MaterialFbUc$$2kColSels: .incbin "baserom.dol", 0x43D5E8, 0x20 @@ -3241,7 +3241,7 @@ $$2LOCAL$$2SetupGX__Q34nw4r3lyt8MaterialFbUc$$2kAlpSels$$20: __vt__Q34nw4r3lyt8Material: .incbin "baserom.dol", 0x43D628, 0x30 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210055 $$210055: .incbin "baserom.dol", 0x499CB8, 0x4 diff --git a/asm/libnw4r_lyt/lyt_pane.s b/asm/libnw4r_lyt/lyt_pane.s index 333d4293..bde1aa77 100644 --- a/asm/libnw4r_lyt/lyt_pane.s +++ b/asm/libnw4r_lyt/lyt_pane.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3lyt4PaneFPCQ44nw4r3lyt3res4Pane __ct__Q34nw4r3lyt4PaneFPCQ44nw4r3lyt3res4Pane: /* 800F2BA0 000EE9E0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1149,10 +1149,10 @@ __sinit_$$3lyt_pane_cpp: /* 800F3AE8 000EF928 4E 80 00 20 */ blr /* 800F3AEC 000EF92C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402380, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$210224 $$210224: .incbin "baserom.dol", 0x43D2D8, 0xC @@ -1160,7 +1160,7 @@ $$210224: __vt__Q34nw4r3lyt4Pane: .incbin "baserom.dol", 0x43D2E4, 0x74 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29820 $$29820: .incbin "baserom.dol", 0x499C58, 0x4 diff --git a/asm/libnw4r_lyt/lyt_picture.s b/asm/libnw4r_lyt/lyt_picture.s index ee6c0661..75c17189 100644 --- a/asm/libnw4r_lyt/lyt_picture.s +++ b/asm/libnw4r_lyt/lyt_picture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut5ColorFv __ct__Q34nw4r2ut5ColorFv: /* 800F4DB0 000F0BF0 4B FF E0 F0 */ b GetVtxColor__Q34nw4r3lyt4PaneCFUl @@ -404,15 +404,15 @@ __sinit_$$3lyt_picture_cpp: /* 800F5338 000F1178 4E 80 00 20 */ blr /* 800F533C 000F117C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402384, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt7Picture __vt__Q34nw4r3lyt7Picture: .incbin "baserom.dol", 0x43D3A8, 0x78 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28804 $$28804: .incbin "baserom.dol", 0x499C80, 0x8 diff --git a/asm/libnw4r_lyt/lyt_resourceAccessor.s b/asm/libnw4r_lyt/lyt_resourceAccessor.s index ca1e838f..73a43333 100644 --- a/asm/libnw4r_lyt/lyt_resourceAccessor.s +++ b/asm/libnw4r_lyt/lyt_resourceAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q34nw4r3lyt16ResourceAccessorFv __dt__Q34nw4r3lyt16ResourceAccessorFv: /* 800FD880 000F96C0 4B FA 75 30 */ b __dt__Q34nw4r2ef7EmitterFv @@ -22,7 +22,7 @@ GetFont__Q34nw4r3lyt16ResourceAccessorFPCc: /* 800FD8A8 000F96E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800FD8AC 000F96EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt16ResourceAccessor __vt__Q34nw4r3lyt16ResourceAccessor: .incbin "baserom.dol", 0x43D690, 0x18 diff --git a/asm/libnw4r_lyt/lyt_texMap.s b/asm/libnw4r_lyt/lyt_texMap.s index a142d38a..b4bc87eb 100644 --- a/asm/libnw4r_lyt/lyt_texMap.s +++ b/asm/libnw4r_lyt/lyt_texMap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Get__Q34nw4r3lyt6TexMapCFP9_GXTexObj Get__Q34nw4r3lyt6TexMapCFP9_GXTexObj: /* 800FC000 000F7E40 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -135,7 +135,7 @@ lbl_800FC1C4: /* 800FC1D8 000F8018 38 21 00 20 */ addi r1, r1, 0x20 /* 800FC1DC 000F801C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27564 $$27564: .incbin "baserom.dol", 0x499CD8, 0x8 diff --git a/asm/libnw4r_lyt/lyt_textBox.s b/asm/libnw4r_lyt/lyt_textBox.s index 82b789f8..24e11590 100644 --- a/asm/libnw4r_lyt/lyt_textBox.s +++ b/asm/libnw4r_lyt/lyt_textBox.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3lyt7TextBoxFPCQ44nw4r3lyt3res7TextBoxRCQ34nw4r3lyt11ResBlockSet __ct__Q34nw4r3lyt7TextBoxFPCQ44nw4r3lyt3res7TextBoxRCQ34nw4r3lyt11ResBlockSet: /* 800F5340 000F1180 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1679,20 +1679,20 @@ __sinit_$$3lyt_textBox_cpp: /* 800F6AA8 000F28E8 4E 80 00 20 */ blr /* 800F6AAC 000F28EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402388, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3lyt7TextBox __vt__Q34nw4r3lyt7TextBox: .incbin "baserom.dol", 0x43D420, 0x88 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$210917 $$210917: .incbin "baserom.dol", 0x492E28, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210401 $$210401: .incbin "baserom.dol", 0x499C88, 0x8 diff --git a/asm/libnw4r_lyt/lyt_util.s b/asm/libnw4r_lyt/lyt_util.s index 223ff372..bae10cb1 100644 --- a/asm/libnw4r_lyt/lyt_util.s +++ b/asm/libnw4r_lyt/lyt_util.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BindAnimation__Q24nw4r3lytFPQ34nw4r3lyt5GroupPQ34nw4r3lyt13AnimTransformbb BindAnimation__Q24nw4r3lytFPQ34nw4r3lyt5GroupPQ34nw4r3lyt13AnimTransformbb: /* 800FE8A0 000FA6E0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libnw4r_lyt/lyt_window.s b/asm/libnw4r_lyt/lyt_window.s index e3a15c6e..1ac87a45 100644 --- a/asm/libnw4r_lyt/lyt_window.s +++ b/asm/libnw4r_lyt/lyt_window.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3lyt6WindowFPCQ44nw4r3lyt3res6WindowRCQ34nw4r3lyt11ResBlockSet __ct__Q34nw4r3lyt6WindowFPCQ44nw4r3lyt3res6WindowRCQ34nw4r3lyt11ResBlockSet: /* 800F6AB0 000F28F0 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -2547,10 +2547,10 @@ __sinit_$$3lyt_window_cpp: /* 800F9048 000F4E88 4E 80 00 20 */ blr /* 800F904C 000F4E8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40238C, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2LOCAL$$2GetTexutreFlipInfo__Q34nw4r3lyt24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos $$2LOCAL$$2GetTexutreFlipInfo__Q34nw4r3lyt24$$2unnamed$$2lyt_window_cpp$$2FUc$$2flipInfos: .incbin "baserom.dol", 0x43D4A8, 0x3C @@ -2558,7 +2558,7 @@ $$2LOCAL$$2GetTexutreFlipInfo__Q34nw4r3lyt24$$2unnamed$$2lyt_window_cpp$$2FUc$$2 __vt__Q34nw4r3lyt6Window: .incbin "baserom.dol", 0x43D4E4, 0x8C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29836 $$29836: .incbin "baserom.dol", 0x499CA0, 0x8 diff --git a/asm/libnw4r_math/math_arithmetic.s b/asm/libnw4r_math/math_arithmetic.s index 32664003..8e3c5b9e 100644 --- a/asm/libnw4r_math/math_arithmetic.s +++ b/asm/libnw4r_math/math_arithmetic.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global FExp__Q34nw4r4math6detailFf FExp__Q34nw4r4math6detailFf: /* 800FE910 000FA750 C0 02 92 58 */ lfs f0, $$22456-_SDA2_BASE_(r2) @@ -110,7 +110,7 @@ FrSqrt__Q24nw4r4mathFf: /* 800FEA98 000FA8D8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800FEA9C 000FA8DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global sExpTbl__Q34nw4r4math29$$2unnamed$$2math_arithmetic_cpp$$2 sExpTbl__Q34nw4r4math29$$2unnamed$$2math_arithmetic_cpp$$2: .incbin "baserom.dol", 0x43D6C0, 0x108 @@ -118,7 +118,7 @@ sExpTbl__Q34nw4r4math29$$2unnamed$$2math_arithmetic_cpp$$2: sLogTbl__Q34nw4r4math29$$2unnamed$$2math_arithmetic_cpp$$2: .incbin "baserom.dol", 0x43D7C8, 0x808 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22456 $$22456: .incbin "baserom.dol", 0x499D18, 0x4 diff --git a/asm/libnw4r_math/math_geometry.s b/asm/libnw4r_math/math_geometry.s index e2943592..db072952 100644 --- a/asm/libnw4r_math/math_geometry.s +++ b/asm/libnw4r_math/math_geometry.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Set__Q34nw4r4math4AABBFPCQ34nw4r4math4VEC3Ui Set__Q34nw4r4math4AABBFPCQ34nw4r4math4VEC3Ui: /* 800FF1F0 000FB030 C0 44 00 00 */ lfs f2, 0(r4) @@ -817,7 +817,7 @@ lbl_800FFDD4: /* 800FFDD8 000FBC18 4E 80 00 20 */ blr /* 800FFDDC 000FBC1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210654 $$210654: .incbin "baserom.dol", 0x499D70, 0x4 diff --git a/asm/libnw4r_math/math_triangular.s b/asm/libnw4r_math/math_triangular.s index 23440dfc..234ee289 100644 --- a/asm/libnw4r_math/math_triangular.s +++ b/asm/libnw4r_math/math_triangular.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SinFIdx__Q24nw4r4mathFf SinFIdx__Q24nw4r4mathFf: /* 800FEAA0 000FA8E0 FC 60 0A 10 */ fabs f3, f1 @@ -232,17 +232,17 @@ lbl_800FEDB8: /* 800FEDB8 000FABF8 38 21 00 20 */ addi r1, r1, 0x20 /* 800FEDBC 000FABFC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global gSinCosTbl__Q34nw4r4math6detail gSinCosTbl__Q34nw4r4math6detail: .incbin "baserom.dol", 0x405010, 0x1010 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global sArcTanTbl__Q34nw4r4math29$$2unnamed$$2math_triangular_cpp$$2 sArcTanTbl__Q34nw4r4math29$$2unnamed$$2math_triangular_cpp$$2: .incbin "baserom.dol", 0x43DFD0, 0x108 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22956 $$22956: .incbin "baserom.dol", 0x499D38, 0x4 diff --git a/asm/libnw4r_math/math_types.s b/asm/libnw4r_math/math_types.s index 5f1ba932..9ef0b34e 100644 --- a/asm/libnw4r_math/math_types.s +++ b/asm/libnw4r_math/math_types.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MTX33Identity__Q24nw4r4mathFPQ34nw4r4math5MTX33 MTX33Identity__Q24nw4r4mathFPQ34nw4r4math5MTX33: /* 800FEDC0 000FAC00 C0 02 92 98 */ lfs f0, $$24187-_SDA2_BASE_(r2) @@ -308,7 +308,7 @@ MTX44Copy__Q24nw4r4mathFPQ34nw4r4math5MTX44PCQ34nw4r4math5MTX44: /* 800FF1E8 000FB028 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800FF1EC 000FB02C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24187 $$24187: .incbin "baserom.dol", 0x499D58, 0x4 diff --git a/asm/libnw4r_snd/snd_AnimSound.s b/asm/libnw4r_snd/snd_AnimSound.s index ca80a472..6b078cee 100644 --- a/asm/libnw4r_snd/snd_AnimSound.s +++ b/asm/libnw4r_snd/snd_AnimSound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q34nw4r3snd11SoundHandleFv __dt__Q34nw4r3snd11SoundHandleFv: /* 800FFDE0 000FBC20 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_AxManager.s b/asm/libnw4r_snd/snd_AxManager.s index 3cd6fbc5..f70cc601 100644 --- a/asm/libnw4r_snd/snd_AxManager.s +++ b/asm/libnw4r_snd/snd_AxManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail9AxManagerFv __ct__Q44nw4r3snd6detail9AxManagerFv: /* 800FFE40 000FBC80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1263,10 +1263,10 @@ __sinit_$$3snd_AxManager_cpp: /* 80100FC8 000FCE08 90 6D EB C8 */ stw r3, sBiquadFilterBpf2048__Q44nw4r3snd6detail9AxManager-_SDA_BASE_(r13) /* 80100FCC 000FCE0C 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402394, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24786 $$24786: .incbin "baserom.dol", 0x499D80, 0x4 diff --git a/asm/libnw4r_snd/snd_AxVoice.s b/asm/libnw4r_snd/snd_AxVoice.s index 344b8e74..665f5f6e 100644 --- a/asm/libnw4r_snd/snd_AxVoice.s +++ b/asm/libnw4r_snd/snd_AxVoice.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail7AxVoiceFv __ct__Q44nw4r3snd6detail7AxVoiceFv: /* 80100FD0 000FCE10 3C 80 00 01 */ lis r4, 0x00008000@ha @@ -3541,7 +3541,7 @@ lbl_80103F4C: /* 80103F68 000FFDA8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80103F6C 000FFDAC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212107 $$212107: .incbin "baserom.dol", 0x499D98, 0x4 diff --git a/asm/libnw4r_snd/snd_AxVoiceManager.s b/asm/libnw4r_snd/snd_AxVoiceManager.s index 7aa72313..0fd84781 100644 --- a/asm/libnw4r_snd/snd_AxVoiceManager.s +++ b/asm/libnw4r_snd/snd_AxVoiceManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetInstance__Q44nw4r3snd6detail14AxVoiceManagerFv GetInstance__Q44nw4r3snd6detail14AxVoiceManagerFv: /* 80103F70 000FFDB0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_Bank.s b/asm/libnw4r_snd/snd_Bank.s index 34b87e07..5b964371 100644 --- a/asm/libnw4r_snd/snd_Bank.s +++ b/asm/libnw4r_snd/snd_Bank.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail4BankFPCv __ct__Q44nw4r3snd6detail4BankFPCv: /* 801049A0 001007E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -157,7 +157,7 @@ lbl_80104BC0: /* 80104BD8 00100A18 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80104BDC 00100A1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28712 $$28712: .incbin "baserom.dol", 0x499DC0, 0x4 diff --git a/asm/libnw4r_snd/snd_BankFile.s b/asm/libnw4r_snd/snd_BankFile.s index 6f24f580..61fc56b1 100644 --- a/asm/libnw4r_snd/snd_BankFile.s +++ b/asm/libnw4r_snd/snd_BankFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail14BankFileReaderFPCv __ct__Q44nw4r3snd6detail14BankFileReaderFPCv: /* 80104BE0 00100A20 38 00 00 00 */ li r0, 0 @@ -504,7 +504,7 @@ lbl_80105280: /* 80105298 001010D8 4E 80 00 20 */ blr /* 8010529C 001010DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29016 $$29016: .incbin "baserom.dol", 0x499DE0, 0x8 diff --git a/asm/libnw4r_snd/snd_BasicPlayer.s b/asm/libnw4r_snd/snd_BasicPlayer.s index b3db39b2..bfb65026 100644 --- a/asm/libnw4r_snd/snd_BasicPlayer.s +++ b/asm/libnw4r_snd/snd_BasicPlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Init__Q44nw4r3snd6detail14PlayerParamSetFv Init__Q44nw4r3snd6detail14PlayerParamSetFv: /* 801052A0 001010E0 C0 02 93 2C */ lfs f0, $$22619-_SDA2_BASE_(r2) @@ -165,12 +165,12 @@ __dt__Q44nw4r3snd6detail11BasicPlayerFv: /* 801054A8 001012E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 801054AC 001012EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail11BasicPlayer __vt__Q44nw4r3snd6detail11BasicPlayer: .incbin "baserom.dol", 0x43E0D8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22618 $$22618: .incbin "baserom.dol", 0x499DE8, 0x4 diff --git a/asm/libnw4r_snd/snd_BasicSound.s b/asm/libnw4r_snd/snd_BasicSound.s index 0560743c..c0535b5d 100644 --- a/asm/libnw4r_snd/snd_BasicSound.s +++ b/asm/libnw4r_snd/snd_BasicSound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail10BasicSoundFii __ct__Q44nw4r3snd6detail10BasicSoundFii: /* 801054B0 001012F0 C0 02 93 34 */ lfs f0, $$212467-_SDA2_BASE_(r2) @@ -1643,15 +1643,15 @@ __sinit_$$3snd_BasicSound_cpp: /* 80106B78 001029B8 4E 80 00 20 */ blr /* 80106B7C 001029BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402398, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail10BasicSound __vt__Q44nw4r3snd6detail10BasicSound: .incbin "baserom.dol", 0x43E100, 0x38 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$212466 $$212466: .incbin "baserom.dol", 0x499DF0, 0x4 diff --git a/asm/libnw4r_snd/snd_BiquadFilterPreset.s b/asm/libnw4r_snd/snd_BiquadFilterPreset.s index 2c188494..b92cf12a 100644 --- a/asm/libnw4r_snd/snd_BiquadFilterPreset.s +++ b/asm/libnw4r_snd/snd_BiquadFilterPreset.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetCoef__Q44nw4r3snd6detail15BiquadFilterLpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef GetCoef__Q44nw4r3snd6detail15BiquadFilterLpfCFifPQ44nw4r3snd20BiquadFilterCallback10BiquadCoef: /* 80106B80 001029C0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -253,7 +253,7 @@ __dt__Q44nw4r3snd6detail19BiquadFilterBpf2048Fv: /* 80106EC8 00102D08 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80106ECC 00102D0C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global coefTable__Q44nw4r3snd6detail15BiquadFilterLpf coefTable__Q44nw4r3snd6detail15BiquadFilterLpf: .incbin "baserom.dol", 0x406020, 0x460 @@ -270,7 +270,7 @@ coefTable__Q44nw4r3snd6detail19BiquadFilterBpf1024: coefTable__Q44nw4r3snd6detail19BiquadFilterBpf2048: .incbin "baserom.dol", 0x4070B4, 0x3A4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail19BiquadFilterBpf2048 __vt__Q44nw4r3snd6detail19BiquadFilterBpf2048: .incbin "baserom.dol", 0x43E138, 0x10 @@ -287,7 +287,7 @@ __vt__Q44nw4r3snd6detail15BiquadFilterHpf: __vt__Q44nw4r3snd6detail15BiquadFilterLpf: .incbin "baserom.dol", 0x43E178, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2752 $$2752: .incbin "baserom.dol", 0x499E00, 0x8 diff --git a/asm/libnw4r_snd/snd_Channel.s b/asm/libnw4r_snd/snd_Channel.s index 2924cd0e..78041ba6 100644 --- a/asm/libnw4r_snd/snd_Channel.s +++ b/asm/libnw4r_snd/snd_Channel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetInstance__Q44nw4r3snd6detail14ChannelManagerFv GetInstance__Q44nw4r3snd6detail14ChannelManagerFv: /* 80106ED0 00102D10 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1247,7 +1247,7 @@ FreeChannel__Q44nw4r3snd6detail7ChannelFPQ44nw4r3snd6detail7Channel: /* 80108068 00103EA8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8010806C 00103EAC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210013 $$210013: .incbin "baserom.dol", 0x499E10, 0x4 diff --git a/asm/libnw4r_snd/snd_DisposeCallbackManager.s b/asm/libnw4r_snd/snd_DisposeCallbackManager.s index f199f7d7..17d8b43d 100644 --- a/asm/libnw4r_snd/snd_DisposeCallbackManager.s +++ b/asm/libnw4r_snd/snd_DisposeCallbackManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv GetInstance__Q44nw4r3snd6detail22DisposeCallbackManagerFv: /* 80108070 00103EB0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_DvdSoundArchive.s b/asm/libnw4r_snd/snd_DvdSoundArchive.s index f095ef84..c7485ff5 100644 --- a/asm/libnw4r_snd/snd_DvdSoundArchive.s +++ b/asm/libnw4r_snd/snd_DvdSoundArchive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd15DvdSoundArchiveFv __ct__Q34nw4r3snd15DvdSoundArchiveFv: /* 80108400 00104240 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -582,7 +582,7 @@ lbl_80108B0C: /* 80108B28 00104968 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80108B2C 0010496C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd15DvdSoundArchive13DvdFileStream __vt__Q44nw4r3snd15DvdSoundArchive13DvdFileStream: .incbin "baserom.dol", 0x43E188, 0x68 diff --git a/asm/libnw4r_snd/snd_EnvGenerator.s b/asm/libnw4r_snd/snd_EnvGenerator.s index 49c742ec..b36dc6b7 100644 --- a/asm/libnw4r_snd/snd_EnvGenerator.s +++ b/asm/libnw4r_snd/snd_EnvGenerator.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail12EnvGeneratorFv __ct__Q44nw4r3snd6detail12EnvGeneratorFv: /* 80108B30 00104970 C0 22 93 78 */ lfs f1, VOLUME_INIT__Q44nw4r3snd6detail12EnvGenerator-_SDA2_BASE_(r2) @@ -293,7 +293,7 @@ lbl_80108EF4: /* 80108EF8 00104D38 38 21 00 20 */ addi r1, r1, 0x20 /* 80108EFC 00104D3C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global DecibelSquareTable__Q44nw4r3snd6detail12EnvGenerator DecibelSquareTable__Q44nw4r3snd6detail12EnvGenerator: .incbin "baserom.dol", 0x407458, 0x100 @@ -301,7 +301,7 @@ DecibelSquareTable__Q44nw4r3snd6detail12EnvGenerator: $$2LOCAL$$2SetAttack__Q44nw4r3snd6detail12EnvGeneratorFi$$2attackTable: .incbin "baserom.dol", 0x407558, 0x200 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global VOLUME_INIT__Q44nw4r3snd6detail12EnvGenerator VOLUME_INIT__Q44nw4r3snd6detail12EnvGenerator: .incbin "baserom.dol", 0x499E38, 0x4 diff --git a/asm/libnw4r_snd/snd_ExternalSoundPlayer.s b/asm/libnw4r_snd/snd_ExternalSoundPlayer.s index 8091139b..4fe2ca10 100644 --- a/asm/libnw4r_snd/snd_ExternalSoundPlayer.s +++ b/asm/libnw4r_snd/snd_ExternalSoundPlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail19ExternalSoundPlayerFv __ct__Q44nw4r3snd6detail19ExternalSoundPlayerFv: /* 80108F00 00104D40 38 A3 00 04 */ addi r5, r3, 4 diff --git a/asm/libnw4r_snd/snd_FrameHeap.s b/asm/libnw4r_snd/snd_FrameHeap.s index 094532fb..327b6273 100644 --- a/asm/libnw4r_snd/snd_FrameHeap.s +++ b/asm/libnw4r_snd/snd_FrameHeap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail9FrameHeapFv __ct__Q44nw4r3snd6detail9FrameHeapFv: /* 80109480 001052C0 38 83 00 08 */ addi r4, r3, 8 diff --git a/asm/libnw4r_snd/snd_InstancePool.s b/asm/libnw4r_snd/snd_InstancePool.s index 3654ab33..dc33d90a 100644 --- a/asm/libnw4r_snd/snd_InstancePool.s +++ b/asm/libnw4r_snd/snd_InstancePool.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateImpl__Q44nw4r3snd6detail8PoolImplFPvUlUl CreateImpl__Q44nw4r3snd6detail8PoolImplFPvUlUl: /* 801098F0 00105730 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libnw4r_snd/snd_Lfo.s b/asm/libnw4r_snd/snd_Lfo.s index 8e95876f..c43d8c84 100644 --- a/asm/libnw4r_snd/snd_Lfo.s +++ b/asm/libnw4r_snd/snd_Lfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Init__Q44nw4r3snd6detail8LfoParamFv Init__Q44nw4r3snd6detail8LfoParamFv: /* 80109BE0 00105A20 C0 22 93 A8 */ lfs f1, $$27641-_SDA2_BASE_(r2) @@ -155,12 +155,12 @@ lbl_80109DE0: /* 80109DE8 00105C28 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80109DEC 00105C2C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2GetSinIdx__Q44nw4r3snd6detail3LfoFi$$2sinTable $$2LOCAL$$2GetSinIdx__Q44nw4r3snd6detail3LfoFi$$2sinTable: .incbin "baserom.dol", 0x407758, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27641 $$27641: .incbin "baserom.dol", 0x499E68, 0x4 diff --git a/asm/libnw4r_snd/snd_MidiSeqPlayer.s b/asm/libnw4r_snd/snd_MidiSeqPlayer.s index da0c9d27..83107876 100644 --- a/asm/libnw4r_snd/snd_MidiSeqPlayer.s +++ b/asm/libnw4r_snd/snd_MidiSeqPlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OnUpdateFrameSoundThread__Q44nw4r3snd6detail9SeqPlayerFv OnUpdateFrameSoundThread__Q44nw4r3snd6detail9SeqPlayerFv: /* 80109DF0 00105C30 48 00 32 A0 */ b Update__Q44nw4r3snd6detail9SeqPlayerFv diff --git a/asm/libnw4r_snd/snd_MmlParser.s b/asm/libnw4r_snd/snd_MmlParser.s index 907566bf..6a89ac69 100644 --- a/asm/libnw4r_snd/snd_MmlParser.s +++ b/asm/libnw4r_snd/snd_MmlParser.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Parse__Q44nw4r3snd6detail9MmlParserCFPQ44nw4r3snd6detail11MmlSeqTrackb Parse__Q44nw4r3snd6detail9MmlParserCFPQ44nw4r3snd6detail11MmlSeqTrackb: /* 80109EA0 00105CE0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1268,7 +1268,7 @@ lbl_8010B060: /* 8010B078 00106EB8 4E 80 00 20 */ blr /* 8010B07C 00106EBC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$210410 $$210410: .incbin "baserom.dol", 0x43E210, 0x28 @@ -1279,7 +1279,7 @@ $$210414: __vt__Q44nw4r3snd6detail9MmlParser: .incbin "baserom.dol", 0x43E430, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$210407 $$210407: .incbin "baserom.dol", 0x492E38, 0x4 @@ -1290,7 +1290,7 @@ $$210408: $$210409: .incbin "baserom.dol", 0x492E40, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210403 $$210403: .incbin "baserom.dol", 0x499E98, 0x4 diff --git a/asm/libnw4r_snd/snd_MmlSeqTrack.s b/asm/libnw4r_snd/snd_MmlSeqTrack.s index 350ba999..d759bab9 100644 --- a/asm/libnw4r_snd/snd_MmlSeqTrack.s +++ b/asm/libnw4r_snd/snd_MmlSeqTrack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail11MmlSeqTrackFv __ct__Q44nw4r3snd6detail11MmlSeqTrackFv: /* 8010B080 00106EC0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -59,7 +59,7 @@ lbl_8010B11C: /* 8010B138 00106F78 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8010B13C 00106F7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail11MmlSeqTrack __vt__Q44nw4r3snd6detail11MmlSeqTrack: .incbin "baserom.dol", 0x43E440, 0x10 diff --git a/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s b/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s index 8ecb128e..f72509a9 100644 --- a/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s +++ b/asm/libnw4r_snd/snd_MmlSeqTrackAllocator.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AllocTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail9SeqPlayer AllocTrack__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFPQ44nw4r3snd6detail9SeqPlayer: /* 8010B140 00106F80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -95,7 +95,7 @@ __dt__Q44nw4r3snd6detail20MmlSeqTrackAllocatorFv: /* 8010B258 00107098 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8010B25C 0010709C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail20MmlSeqTrackAllocator __vt__Q44nw4r3snd6detail20MmlSeqTrackAllocator: .incbin "baserom.dol", 0x43E450, 0x18 diff --git a/asm/libnw4r_snd/snd_PlayerHeap.s b/asm/libnw4r_snd/snd_PlayerHeap.s index d22c1c70..8f9f5890 100644 --- a/asm/libnw4r_snd/snd_PlayerHeap.s +++ b/asm/libnw4r_snd/snd_PlayerHeap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail10PlayerHeapFv __ct__Q44nw4r3snd6detail10PlayerHeapFv: /* 8010B260 001070A0 3C 80 80 44 */ lis r4, __vt__Q44nw4r3snd6detail10PlayerHeap@ha @@ -150,7 +150,7 @@ GetFreeSize__Q44nw4r3snd6detail10PlayerHeapCFv: /* 8010B458 00107298 7C 64 00 50 */ subf r3, r4, r0 /* 8010B45C 0010729C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail10PlayerHeap __vt__Q44nw4r3snd6detail10PlayerHeap: .incbin "baserom.dol", 0x43E468, 0x10 diff --git a/asm/libnw4r_snd/snd_RemoteSpeaker.s b/asm/libnw4r_snd/snd_RemoteSpeaker.s index 39eb1e5d..7af6f145 100644 --- a/asm/libnw4r_snd/snd_RemoteSpeaker.s +++ b/asm/libnw4r_snd/snd_RemoteSpeaker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd13RemoteSpeakerFv __ct__Q34nw4r3snd13RemoteSpeakerFv: /* 8010B460 001072A0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_RemoteSpeakerManager.s b/asm/libnw4r_snd/snd_RemoteSpeakerManager.s index 367f34fd..ae4ce409 100644 --- a/asm/libnw4r_snd/snd_RemoteSpeakerManager.s +++ b/asm/libnw4r_snd/snd_RemoteSpeakerManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetInstance__Q44nw4r3snd6detail20RemoteSpeakerManagerFv GetInstance__Q44nw4r3snd6detail20RemoteSpeakerManagerFv: /* 8010BE10 00107C50 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libnw4r_snd/snd_SeqFile.s b/asm/libnw4r_snd/snd_SeqFile.s index e959a384..d23a4c36 100644 --- a/asm/libnw4r_snd/snd_SeqFile.s +++ b/asm/libnw4r_snd/snd_SeqFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail13SeqFileReaderFPCv __ct__Q44nw4r3snd6detail13SeqFileReaderFPCv: /* 8010C0B0 00107EF0 38 00 00 00 */ li r0, 0 diff --git a/asm/libnw4r_snd/snd_SeqPlayer.s b/asm/libnw4r_snd/snd_SeqPlayer.s index 881fc4d5..ffaf16b0 100644 --- a/asm/libnw4r_snd/snd_SeqPlayer.s +++ b/asm/libnw4r_snd/snd_SeqPlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InitSeqPlayer__Q44nw4r3snd6detail9SeqPlayerFv InitSeqPlayer__Q44nw4r3snd6detail9SeqPlayerFv: /* 8010C1F0 00108030 3C 60 80 53 */ lis r3, mGlobalVariable__Q44nw4r3snd6detail9SeqPlayer@ha @@ -1538,12 +1538,12 @@ $$2192$$2__dt__Q44nw4r3snd6detail9SeqPlayerFv: /* 8010D708 00109548 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8010D70C 0010954C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9SeqPlayer __vt__Q44nw4r3snd6detail9SeqPlayer: .incbin "baserom.dol", 0x43E478, 0x68 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211283 $$211283: .incbin "baserom.dol", 0x499EB8, 0x4 diff --git a/asm/libnw4r_snd/snd_SeqSound.s b/asm/libnw4r_snd/snd_SeqSound.s index cb2d54c2..820aaa21 100644 --- a/asm/libnw4r_snd/snd_SeqSound.s +++ b/asm/libnw4r_snd/snd_SeqSound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail49SoundInstanceManager$$0Q44nw4r3snd6detail8SeqSound$$1ii __ct__Q44nw4r3snd6detail8SeqSoundFPQ44nw4r3snd6detail49SoundInstanceManager$$0Q44nw4r3snd6detail8SeqSound$$1ii: /* 8010D710 00109550 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -607,10 +607,10 @@ __sinit_$$3snd_SeqSound_cpp: /* 8010DF08 00109D48 4E 80 00 20 */ blr /* 8010DF0C 00109D4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40239C, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail8SeqSound __vt__Q44nw4r3snd6detail8SeqSound: .incbin "baserom.dol", 0x43E4E0, 0x38 diff --git a/asm/libnw4r_snd/snd_SeqSoundHandle.s b/asm/libnw4r_snd/snd_SeqSoundHandle.s index da0eaf53..ff07205c 100644 --- a/asm/libnw4r_snd/snd_SeqSoundHandle.s +++ b/asm/libnw4r_snd/snd_SeqSoundHandle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DetachSound__Q34nw4r3snd14SeqSoundHandleFv DetachSound__Q34nw4r3snd14SeqSoundHandleFv: /* 8010DF10 00109D50 80 83 00 00 */ lwz r4, 0(r3) diff --git a/asm/libnw4r_snd/snd_SeqTrack.s b/asm/libnw4r_snd/snd_SeqTrack.s index ba84c2a2..acbdff39 100644 --- a/asm/libnw4r_snd/snd_SeqTrack.s +++ b/asm/libnw4r_snd/snd_SeqTrack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetPlayerTrackNo__Q44nw4r3snd6detail8SeqTrackFi SetPlayerTrackNo__Q44nw4r3snd6detail8SeqTrackFi: /* 8010DF50 00109D90 98 83 00 04 */ stb r4, 4(r3) @@ -1462,17 +1462,17 @@ lbl_8010F390: /* 8010F3A8 0010B1E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8010F3AC 0010B1EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$29834 $$29834: .incbin "baserom.dol", 0x407780, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail8SeqTrack __vt__Q44nw4r3snd6detail8SeqTrack: .incbin "baserom.dol", 0x43E530, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210623 $$210623: .incbin "baserom.dol", 0x499ED0, 0x4 diff --git a/asm/libnw4r_snd/snd_SoundActor.s b/asm/libnw4r_snd/snd_SoundActor.s index e0778942..cae01b90 100644 --- a/asm/libnw4r_snd/snd_SoundActor.s +++ b/asm/libnw4r_snd/snd_SoundActor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd10SoundActorFRQ34nw4r3snd18SoundArchivePlayer __ct__Q34nw4r3snd10SoundActorFRQ34nw4r3snd18SoundArchivePlayer: /* 8010F3B0 0010B1F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -222,12 +222,12 @@ detail_ConvertLabelStringToSoundId__Q34nw4r3snd18SoundArchivePlayerFPCc: /* 8010F698 0010B4D8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8010F69C 0010B4DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd10SoundActor __vt__Q34nw4r3snd10SoundActor: .incbin "baserom.dol", 0x43E540, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211717 $$211717: .incbin "baserom.dol", 0x499F00, 0x4 diff --git a/asm/libnw4r_snd/snd_SoundArchive.s b/asm/libnw4r_snd/snd_SoundArchive.s index 4792006f..8e792312 100644 --- a/asm/libnw4r_snd/snd_SoundArchive.s +++ b/asm/libnw4r_snd/snd_SoundArchive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd12SoundArchiveFv __ct__Q34nw4r3snd12SoundArchiveFv: /* 8010F6A0 0010B4E0 3C A0 80 44 */ lis r5, __vt__Q34nw4r3snd12SoundArchive@ha @@ -511,7 +511,7 @@ lbl_8010FCD8: /* 8010FD08 0010BB48 4E 80 00 20 */ blr /* 8010FD0C 0010BB4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd12SoundArchive __vt__Q34nw4r3snd12SoundArchive: .incbin "baserom.dol", 0x43E560, 0x20 diff --git a/asm/libnw4r_snd/snd_SoundArchiveFile.s b/asm/libnw4r_snd/snd_SoundArchiveFile.s index 76c2a015..8fe6b769 100644 --- a/asm/libnw4r_snd/snd_SoundArchiveFile.s +++ b/asm/libnw4r_snd/snd_SoundArchiveFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail22SoundArchiveFileReaderFv __ct__Q44nw4r3snd6detail22SoundArchiveFileReaderFv: /* 8010FD10 0010BB50 38 00 00 00 */ li r0, 0 diff --git a/asm/libnw4r_snd/snd_SoundArchiveLoader.s b/asm/libnw4r_snd/snd_SoundArchiveLoader.s index f7856d29..2c2562fb 100644 --- a/asm/libnw4r_snd/snd_SoundArchiveLoader.s +++ b/asm/libnw4r_snd/snd_SoundArchiveLoader.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail18SoundArchiveLoaderFRCQ34nw4r3snd12SoundArchive __ct__Q44nw4r3snd6detail18SoundArchiveLoaderFRCQ34nw4r3snd12SoundArchive: /* 80110D40 0010CB80 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_SoundArchivePlayer.s b/asm/libnw4r_snd/snd_SoundArchivePlayer.s index 7eedefd7..4561ac56 100644 --- a/asm/libnw4r_snd/snd_SoundArchivePlayer.s +++ b/asm/libnw4r_snd/snd_SoundArchivePlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd18SoundArchivePlayerFv __ct__Q34nw4r3snd18SoundArchivePlayerFv: /* 80111360 0010D1A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2986,7 +2986,7 @@ $$212$$2__dt__Q34nw4r3snd18SoundArchivePlayerFv: /* 80113BA8 0010F9E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80113BAC 0010F9EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd18SoundArchivePlayer __vt__Q34nw4r3snd18SoundArchivePlayer: .incbin "baserom.dol", 0x43E580, 0x30 @@ -2997,7 +2997,7 @@ __vt__Q44nw4r3snd18SoundArchivePlayer11WsdCallback: __vt__Q44nw4r3snd18SoundArchivePlayer17SeqNoteOnCallback: .incbin "baserom.dol", 0x43E5C0, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$218172 $$218172: .incbin "baserom.dol", 0x499F08, 0x8 diff --git a/asm/libnw4r_snd/snd_SoundHandle.s b/asm/libnw4r_snd/snd_SoundHandle.s index a34041a7..7a43dfb1 100644 --- a/asm/libnw4r_snd/snd_SoundHandle.s +++ b/asm/libnw4r_snd/snd_SoundHandle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global detail_AttachSound__Q34nw4r3snd11SoundHandleFPQ44nw4r3snd6detail10BasicSound detail_AttachSound__Q34nw4r3snd11SoundHandleFPQ44nw4r3snd6detail10BasicSound: /* 80113BB0 0010F9F0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_SoundHeap.s b/asm/libnw4r_snd/snd_SoundHeap.s index 1a47092d..f1f8db66 100644 --- a/asm/libnw4r_snd/snd_SoundHeap.s +++ b/asm/libnw4r_snd/snd_SoundHeap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd9SoundHeapFv __ct__Q34nw4r3snd9SoundHeapFv: /* 80113C50 0010FA90 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -132,7 +132,7 @@ DisposeCallbackFunc__Q34nw4r3snd9SoundHeapFPvUlPv: /* 80113E08 0010FC48 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80113E0C 0010FC4C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd9SoundHeap __vt__Q34nw4r3snd9SoundHeap: .incbin "baserom.dol", 0x43E5D0, 0x10 diff --git a/asm/libnw4r_snd/snd_SoundPlayer.s b/asm/libnw4r_snd/snd_SoundPlayer.s index 5158f5e8..9d59d590 100644 --- a/asm/libnw4r_snd/snd_SoundPlayer.s +++ b/asm/libnw4r_snd/snd_SoundPlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd11SoundPlayerFv __ct__Q34nw4r3snd11SoundPlayerFv: /* 80113E10 0010FC50 C0 22 94 58 */ lfs f1, $$25348-_SDA2_BASE_(r2) @@ -822,7 +822,7 @@ lbl_80114904: /* 80114918 00110758 38 21 00 20 */ addi r1, r1, 0x20 /* 8011491C 0011075C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$25348 $$25348: .incbin "baserom.dol", 0x499F18, 0x4 diff --git a/asm/libnw4r_snd/snd_SoundStartable.s b/asm/libnw4r_snd/snd_SoundStartable.s index 8cb72823..7396d342 100644 --- a/asm/libnw4r_snd/snd_SoundStartable.s +++ b/asm/libnw4r_snd/snd_SoundStartable.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global detail_StartSound__Q34nw4r3snd14SoundStartableFPQ34nw4r3snd11SoundHandleUlPCQ44nw4r3snd14SoundStartable9StartInfo detail_StartSound__Q34nw4r3snd14SoundStartableFPQ34nw4r3snd11SoundHandleUlPCQ44nw4r3snd14SoundStartable9StartInfo: /* 80114920 00110760 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_SoundSystem.s b/asm/libnw4r_snd/snd_SoundSystem.s index e6fe23e0..0b3b8914 100644 --- a/asm/libnw4r_snd/snd_SoundSystem.s +++ b/asm/libnw4r_snd/snd_SoundSystem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InitSoundSystem__Q34nw4r3snd11SoundSystemFll InitSoundSystem__Q34nw4r3snd11SoundSystemFll: /* 80114980 001107C0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -246,15 +246,15 @@ __sinit_$$3snd_SoundSystem_cpp: /* 80114CD8 00110B18 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80114CDC 00110B1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023A0, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$24759 $$24759: .incbin "baserom.dol", 0x43E5E0, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global NW4R_SND_Version_ NW4R_SND_Version_: .incbin "baserom.dol", 0x492E48, 0x8 diff --git a/asm/libnw4r_snd/snd_SoundThread.s b/asm/libnw4r_snd/snd_SoundThread.s index 11cacf4c..ebef1f79 100644 --- a/asm/libnw4r_snd/snd_SoundThread.s +++ b/asm/libnw4r_snd/snd_SoundThread.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetInstance__Q44nw4r3snd6detail11SoundThreadFv GetInstance__Q44nw4r3snd6detail11SoundThreadFv: /* 80114CE0 00110B20 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_StrmChannel.s b/asm/libnw4r_snd/snd_StrmChannel.s index f2331267..04ba983e 100644 --- a/asm/libnw4r_snd/snd_StrmChannel.s +++ b/asm/libnw4r_snd/snd_StrmChannel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Setup__Q44nw4r3snd6detail14StrmBufferPoolFPvUli Setup__Q44nw4r3snd6detail14StrmBufferPoolFPvUli: /* 801153E0 00111220 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libnw4r_snd/snd_StrmFile.s b/asm/libnw4r_snd/snd_StrmFile.s index b4575788..16a97c23 100644 --- a/asm/libnw4r_snd/snd_StrmFile.s +++ b/asm/libnw4r_snd/snd_StrmFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ReadStrmInfo__Q44nw4r3snd6detail14StrmFileReaderCFPQ54nw4r3snd6detail14StrmFileReader8StrmInfo ReadStrmInfo__Q44nw4r3snd6detail14StrmFileReaderCFPQ54nw4r3snd6detail14StrmFileReader8StrmInfo: /* 80115620 00111460 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_StrmPlayer.s b/asm/libnw4r_snd/snd_StrmPlayer.s index 5e823740..55ce32c0 100644 --- a/asm/libnw4r_snd/snd_StrmPlayer.s +++ b/asm/libnw4r_snd/snd_StrmPlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail10StrmPlayerFv __ct__Q44nw4r3snd6detail10StrmPlayerFv: /* 80115FA0 00111DE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3148,7 +3148,7 @@ $$2180$$2__dt__Q44nw4r3snd6detail10StrmPlayerFv: /* 80118A68 001148A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80118A6C 001148AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail10StrmPlayer __vt__Q44nw4r3snd6detail10StrmPlayer: .incbin "baserom.dol", 0x43E628, 0x48 @@ -3159,7 +3159,7 @@ __vt__Q54nw4r3snd6detail10StrmPlayer16StrmDataLoadTask: __vt__Q54nw4r3snd6detail10StrmPlayer18StrmHeaderLoadTask: .incbin "baserom.dol", 0x43E688, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$211788 $$211788: .incbin "baserom.dol", 0x499F20, 0x8 diff --git a/asm/libnw4r_snd/snd_StrmSound.s b/asm/libnw4r_snd/snd_StrmSound.s index 05bc64c8..de8bbdba 100644 --- a/asm/libnw4r_snd/snd_StrmSound.s +++ b/asm/libnw4r_snd/snd_StrmSound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail50SoundInstanceManager$$0Q44nw4r3snd6detail9StrmSound$$1ii __ct__Q44nw4r3snd6detail9StrmSoundFPQ44nw4r3snd6detail50SoundInstanceManager$$0Q44nw4r3snd6detail9StrmSound$$1ii: /* 80118A70 001148B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -502,15 +502,15 @@ __sinit_$$3snd_StrmSound_cpp: /* 80119118 00114F58 4E 80 00 20 */ blr /* 8011911C 00114F5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023A4, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9StrmSound __vt__Q44nw4r3snd6detail9StrmSound: .incbin "baserom.dol", 0x43E6A0, 0x38 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210414 $$210414: .incbin "baserom.dol", 0x499F48, 0x4 diff --git a/asm/libnw4r_snd/snd_StrmSoundHandle.s b/asm/libnw4r_snd/snd_StrmSoundHandle.s index 46f2055e..8cd8396b 100644 --- a/asm/libnw4r_snd/snd_StrmSoundHandle.s +++ b/asm/libnw4r_snd/snd_StrmSoundHandle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd15StrmSoundHandleFPQ34nw4r3snd11SoundHandle __ct__Q34nw4r3snd15StrmSoundHandleFPQ34nw4r3snd11SoundHandle: /* 80119120 00114F60 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/libnw4r_snd/snd_TaskManager.s b/asm/libnw4r_snd/snd_TaskManager.s index 9ba3b2bc..161e5f85 100644 --- a/asm/libnw4r_snd/snd_TaskManager.s +++ b/asm/libnw4r_snd/snd_TaskManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetInstance__Q44nw4r3snd6detail11TaskManagerFv GetInstance__Q44nw4r3snd6detail11TaskManagerFv: /* 80119260 001150A0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_TaskThread.s b/asm/libnw4r_snd/snd_TaskThread.s index b1344e8a..15a36338 100644 --- a/asm/libnw4r_snd/snd_TaskThread.s +++ b/asm/libnw4r_snd/snd_TaskThread.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail10TaskThreadFv __ct__Q44nw4r3snd6detail10TaskThreadFv: /* 801199B0 001157F0 38 00 00 00 */ li r0, 0 diff --git a/asm/libnw4r_snd/snd_Util.s b/asm/libnw4r_snd/snd_Util.s index 3b0bfdbc..e6fe8957 100644 --- a/asm/libnw4r_snd/snd_Util.s +++ b/asm/libnw4r_snd/snd_Util.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CalcPitchRatio__Q44nw4r3snd6detail4UtilFi CalcPitchRatio__Q44nw4r3snd6detail4UtilFi: /* 8011CC80 00118AC0 20 A3 0B FF */ subfic r5, r3, 0xbff @@ -385,7 +385,7 @@ lbl_8011D140: /* 8011D158 00118F98 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8011D15C 00118F9C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global NoteTable__Q44nw4r3snd6detail4Util NoteTable__Q44nw4r3snd6detail4Util: .incbin "baserom.dol", 0x4077A8, 0x30 @@ -411,17 +411,17 @@ RemoteFilterCoefTable__Q44nw4r3snd6detail4Util: CalcLpfFreqTable__Q44nw4r3snd6detail4Util: .incbin "baserom.dol", 0x409BF8, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global PanTableTable__Q44nw4r3snd6detail4Util PanTableTable__Q44nw4r3snd6detail4Util: .incbin "baserom.dol", 0x43E710, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2LOCAL$$2CalcRandom__Q44nw4r3snd6detail4UtilFv$$2u $$2LOCAL$$2CalcRandom__Q44nw4r3snd6detail4UtilFv$$2u: .incbin "baserom.dol", 0x492E50, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27697 $$27697: .incbin "baserom.dol", 0x499F90, 0x4 diff --git a/asm/libnw4r_snd/snd_Voice.s b/asm/libnw4r_snd/snd_Voice.s index 955f9f3c..091510b0 100644 --- a/asm/libnw4r_snd/snd_Voice.s +++ b/asm/libnw4r_snd/snd_Voice.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail5VoiceFv __ct__Q44nw4r3snd6detail5VoiceFv: /* 80119BE0 00115A20 38 C3 00 44 */ addi r6, r3, 0x44 @@ -3089,7 +3089,7 @@ InvalidateData__Q44nw4r3snd6detail5VoiceFPCvPCv: /* 8011C4D8 00118318 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8011C4DC 0011831C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$211607 $$211607: .incbin "baserom.dol", 0x43E6D8, 0x24 @@ -3097,7 +3097,7 @@ $$211607: __vt__Q44nw4r3snd6detail5Voice: .incbin "baserom.dol", 0x43E6FC, 0x14 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210576 $$210576: .incbin "baserom.dol", 0x499F58, 0x4 diff --git a/asm/libnw4r_snd/snd_VoiceManager.s b/asm/libnw4r_snd/snd_VoiceManager.s index ef769afc..76bf002c 100644 --- a/asm/libnw4r_snd/snd_VoiceManager.s +++ b/asm/libnw4r_snd/snd_VoiceManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetInstance__Q44nw4r3snd6detail12VoiceManagerFv GetInstance__Q44nw4r3snd6detail12VoiceManagerFv: /* 8011C4E0 00118320 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_snd/snd_WaveArchive.s b/asm/libnw4r_snd/snd_WaveArchive.s index 41ed2d79..5d2ecae4 100644 --- a/asm/libnw4r_snd/snd_WaveArchive.s +++ b/asm/libnw4r_snd/snd_WaveArchive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail17WaveArchiveReaderFPCv __ct__Q44nw4r3snd6detail17WaveArchiveReaderFPCv: /* 8011D160 00118FA0 38 00 00 00 */ li r0, 0 diff --git a/asm/libnw4r_snd/snd_WaveFile.s b/asm/libnw4r_snd/snd_WaveFile.s index 87224bb7..2a9949e5 100644 --- a/asm/libnw4r_snd/snd_WaveFile.s +++ b/asm/libnw4r_snd/snd_WaveFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail14WaveFileReaderFPCQ54nw4r3snd6detail8WaveFile10FileHeader __ct__Q44nw4r3snd6detail14WaveFileReaderFPCQ54nw4r3snd6detail8WaveFile10FileHeader: /* 8011D270 001190B0 80 04 00 10 */ lwz r0, 0x10(r4) diff --git a/asm/libnw4r_snd/snd_WavePlayer.s b/asm/libnw4r_snd/snd_WavePlayer.s index 09cc1258..5376952a 100644 --- a/asm/libnw4r_snd/snd_WavePlayer.s +++ b/asm/libnw4r_snd/snd_WavePlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3snd10WavePlayerFv __ct__Q34nw4r3snd10WavePlayerFv: /* 8011D4D0 00119310 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1072,7 +1072,7 @@ __dt__Q44nw4r3snd10WavePlayer10WavePacketFv: /* 8011E3A8 0011A1E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8011E3AC 0011A1EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r3snd10WavePlayer __vt__Q34nw4r3snd10WavePlayer: .incbin "baserom.dol", 0x43E720, 0x18 @@ -1080,7 +1080,7 @@ __vt__Q34nw4r3snd10WavePlayer: __vt__Q44nw4r3snd10WavePlayer10WavePacket: .incbin "baserom.dol", 0x43E738, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$29744 $$29744: .incbin "baserom.dol", 0x499FC0, 0x4 diff --git a/asm/libnw4r_snd/snd_WaveSound.s b/asm/libnw4r_snd/snd_WaveSound.s index 3aeb4fdb..f42e4a39 100644 --- a/asm/libnw4r_snd/snd_WaveSound.s +++ b/asm/libnw4r_snd/snd_WaveSound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail9WaveSoundFPQ44nw4r3snd6detail50SoundInstanceManager$$0Q44nw4r3snd6detail9WaveSound$$1ii __ct__Q44nw4r3snd6detail9WaveSoundFPQ44nw4r3snd6detail50SoundInstanceManager$$0Q44nw4r3snd6detail9WaveSound$$1ii: /* 8011E3B0 0011A1F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -273,10 +273,10 @@ __sinit_$$3snd_WaveSound_cpp: /* 8011E708 0011A548 4E 80 00 20 */ blr /* 8011E70C 0011A54C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023A8, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9WaveSound __vt__Q44nw4r3snd6detail9WaveSound: .incbin "baserom.dol", 0x43E748, 0x38 diff --git a/asm/libnw4r_snd/snd_WaveSoundHandle.s b/asm/libnw4r_snd/snd_WaveSoundHandle.s index 1ed848de..b2e1d80a 100644 --- a/asm/libnw4r_snd/snd_WaveSoundHandle.s +++ b/asm/libnw4r_snd/snd_WaveSoundHandle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DetachSound__Q34nw4r3snd15WaveSoundHandleFv DetachSound__Q34nw4r3snd15WaveSoundHandleFv: /* 8011E710 0011A550 80 83 00 00 */ lwz r4, 0(r3) diff --git a/asm/libnw4r_snd/snd_WsdFile.s b/asm/libnw4r_snd/snd_WsdFile.s index 1bbacf27..c23f8bda 100644 --- a/asm/libnw4r_snd/snd_WsdFile.s +++ b/asm/libnw4r_snd/snd_WsdFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail13WsdFileReaderFPCv __ct__Q44nw4r3snd6detail13WsdFileReaderFPCv: /* 8011E750 0011A590 38 00 00 00 */ li r0, 0 @@ -272,7 +272,7 @@ lbl_8011EAF8: /* 8011EB18 0011A958 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8011EB1C 0011A95C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$27814 $$27814: .incbin "baserom.dol", 0x499FF0, 0x8 diff --git a/asm/libnw4r_snd/snd_WsdPlayer.s b/asm/libnw4r_snd/snd_WsdPlayer.s index ea9ae07b..a2fb2b50 100644 --- a/asm/libnw4r_snd/snd_WsdPlayer.s +++ b/asm/libnw4r_snd/snd_WsdPlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r3snd6detail9WsdPlayerFv __ct__Q44nw4r3snd6detail9WsdPlayerFv: /* 8011EB20 0011A960 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1171,12 +1171,12 @@ $$2192$$2__dt__Q44nw4r3snd6detail9WsdPlayerFv: /* 8011FB38 0011B978 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8011FB3C 0011B97C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nw4r3snd6detail9WsdPlayer __vt__Q44nw4r3snd6detail9WsdPlayer: .incbin "baserom.dol", 0x43E780, 0x60 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$210015 $$210015: .incbin "baserom.dol", 0x499FF8, 0x4 diff --git a/asm/libnw4r_ut/ut_CharStrmReader.s b/asm/libnw4r_ut/ut_CharStrmReader.s index b5f95669..0eb6703c 100644 --- a/asm/libnw4r_ut/ut_CharStrmReader.s +++ b/asm/libnw4r_ut/ut_CharStrmReader.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ReadNextCharUTF8__Q34nw4r2ut14CharStrmReaderFv ReadNextCharUTF8__Q34nw4r2ut14CharStrmReaderFv: /* 8011FE90 0011BCD0 80 E3 00 00 */ lwz r7, 0(r3) diff --git a/asm/libnw4r_ut/ut_CharWriter.s b/asm/libnw4r_ut/ut_CharWriter.s index f138bd19..d06d8169 100644 --- a/asm/libnw4r_ut/ut_CharWriter.s +++ b/asm/libnw4r_ut/ut_CharWriter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut10CharWriterFv __ct__Q34nw4r2ut10CharWriterFv: /* 80122610 0011E450 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1537,7 +1537,7 @@ lbl_80123A48: /* 80123CF8 0011FB38 4E 80 00 20 */ blr /* 80123CFC 0011FB3C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$26180 $$26180: .incbin "baserom.dol", 0x49A028, 0x4 diff --git a/asm/libnw4r_ut/ut_DvdFileStream.s b/asm/libnw4r_ut/ut_DvdFileStream.s index 5b6047b1..f5196a85 100644 --- a/asm/libnw4r_ut/ut_DvdFileStream.s +++ b/asm/libnw4r_ut/ut_DvdFileStream.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DvdAsyncCallback___Q34nw4r2ut13DvdFileStreamFlP11DVDFileInfo DvdAsyncCallback___Q34nw4r2ut13DvdFileStreamFlP11DVDFileInfo: /* 80120770 0011C5B0 80 84 00 3C */ lwz r4, 0x3c(r4) @@ -539,10 +539,10 @@ __sinit_$$3ut_DvdFileStream_cpp: /* 80120E98 0011CCD8 4E 80 00 20 */ blr /* 80120E9C 0011CCDC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023B4, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut13DvdFileStream __vt__Q34nw4r2ut13DvdFileStream: .incbin "baserom.dol", 0x43E808, 0x68 diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream.s b/asm/libnw4r_ut/ut_DvdLockedFileStream.s index 7e7a5dce..58ab1925 100644 --- a/asm/libnw4r_ut/ut_DvdLockedFileStream.s +++ b/asm/libnw4r_ut/ut_DvdLockedFileStream.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut19DvdLockedFileStreamFl __ct__Q34nw4r2ut19DvdLockedFileStreamFl: /* 80120EA0 0011CCE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -290,10 +290,10 @@ __sinit_$$3ut_DvdLockedFileStream_cpp: /* 80121288 0011D0C8 4E 80 00 20 */ blr /* 8012128C 0011D0CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023B8, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut19DvdLockedFileStream __vt__Q34nw4r2ut19DvdLockedFileStream: .incbin "baserom.dol", 0x43E870, 0x68 diff --git a/asm/libnw4r_ut/ut_FileStream.s b/asm/libnw4r_ut/ut_FileStream.s index 6b2087d9..017baf12 100644 --- a/asm/libnw4r_ut/ut_FileStream.s +++ b/asm/libnw4r_ut/ut_FileStream.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Skip__Q44nw4r2ut10FileStream12FilePositionFl Skip__Q44nw4r2ut10FileStream12FilePositionFl: /* 80120660 0011C4A0 2C 04 00 00 */ cmpwi r4, 0 @@ -88,7 +88,7 @@ __sinit_$$3ut_FileStream_cpp: /* 80120768 0011C5A8 4E 80 00 20 */ blr /* 8012076C 0011C5AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023B0, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ut/ut_Font.s b/asm/libnw4r_ut/ut_Font.s index f19252b6..20c1662d 100644 --- a/asm/libnw4r_ut/ut_Font.s +++ b/asm/libnw4r_ut/ut_Font.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InitReaderFunc__Q34nw4r2ut4FontFQ34nw4r2ut12FontEncoding InitReaderFunc__Q34nw4r2ut4FontFQ34nw4r2ut12FontEncoding: /* 80121470 0011D2B0 2C 04 00 00 */ cmpwi r4, 0 @@ -52,7 +52,7 @@ lbl_801214F4: /* 80121518 0011D358 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8012151C 0011D35C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2560 $$2560: .incbin "baserom.dol", 0x43E8D8, 0xC diff --git a/asm/libnw4r_ut/ut_IOStream.s b/asm/libnw4r_ut/ut_IOStream.s index ff9a2003..601c4ef4 100644 --- a/asm/libnw4r_ut/ut_IOStream.s +++ b/asm/libnw4r_ut/ut_IOStream.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Write__Q34nw4r2ut8IOStreamFPCvUl Write__Q34nw4r2ut8IOStreamFPCvUl: /* 80120630 0011C470 4B F3 37 C0 */ b __wpadNoAlloc @@ -22,7 +22,7 @@ __sinit_$$3ut_IOStream_cpp: /* 80120658 0011C498 4E 80 00 20 */ blr /* 8012065C 0011C49C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023AC, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ut/ut_LinkList.s b/asm/libnw4r_ut/ut_LinkList.s index 66c353aa..ad4135bd 100644 --- a/asm/libnw4r_ut/ut_LinkList.s +++ b/asm/libnw4r_ut/ut_LinkList.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q44nw4r2ut6detail12LinkListImplFv __dt__Q44nw4r2ut6detail12LinkListImplFv: /* 8011FC80 0011BAC0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/libnw4r_ut/ut_LockedCache.s b/asm/libnw4r_ut/ut_LockedCache.s index e93727db..9e07c539 100644 --- a/asm/libnw4r_ut/ut_LockedCache.s +++ b/asm/libnw4r_ut/ut_LockedCache.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Enable__Q34nw4r2ut2LCFv Enable__Q34nw4r2ut2LCFv: /* 80121290 0011D0D0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -155,7 +155,7 @@ __sinit_$$3ut_LockedCache_cpp: /* 80121468 0011D2A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8012146C 0011D2AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023BC, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/libnw4r_ut/ut_ResFont.s b/asm/libnw4r_ut/ut_ResFont.s index 3d452c5d..1e701ac4 100644 --- a/asm/libnw4r_ut/ut_ResFont.s +++ b/asm/libnw4r_ut/ut_ResFont.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut7ResFontFv __ct__Q34nw4r2ut7ResFontFv: /* 80122300 0011E140 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -231,7 +231,7 @@ lbl_801225EC: /* 80122608 0011E448 4E 80 00 20 */ blr /* 8012260C 0011E44C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut7ResFont __vt__Q34nw4r2ut7ResFont: .incbin "baserom.dol", 0x43EA38, 0x60 diff --git a/asm/libnw4r_ut/ut_ResFontBase.s b/asm/libnw4r_ut/ut_ResFontBase.s index 6bfa419c..59282df6 100644 --- a/asm/libnw4r_ut/ut_ResFontBase.s +++ b/asm/libnw4r_ut/ut_ResFontBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nw4r2ut6detail11ResFontBaseFv __ct__Q44nw4r2ut6detail11ResFontBaseFv: /* 80121B90 0011D9D0 3C 80 80 44 */ lis r4, __vt__Q34nw4r2ut4Font@ha @@ -596,7 +596,7 @@ lbl_801222A0: /* 801222F8 0011E138 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 801222FC 0011E13C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21039 $$21039: .incbin "baserom.dol", 0x43E9D0, 0xC diff --git a/asm/libnw4r_ut/ut_RomFont.s b/asm/libnw4r_ut/ut_RomFont.s index da146abe..ab744c8a 100644 --- a/asm/libnw4r_ut/ut_RomFont.s +++ b/asm/libnw4r_ut/ut_RomFont.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut7RomFontFv __ct__Q34nw4r2ut7RomFontFv: /* 80121520 0011D360 3C 80 80 44 */ lis r4, __vt__Q34nw4r2ut4Font@ha @@ -518,7 +518,7 @@ lbl_80121B88: /* 80121B88 0011D9C8 38 60 00 03 */ li r3, 3 /* 80121B8C 0011D9CC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2943 $$2943: .incbin "baserom.dol", 0x43E908, 0xC @@ -529,7 +529,7 @@ __vt__Q34nw4r2ut7RomFont: __vt__Q34nw4r2ut4Font: .incbin "baserom.dol", 0x43E970, 0x60 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global mFontEncode__Q34nw4r2ut7RomFont mFontEncode__Q34nw4r2ut7RomFont: .incbin "baserom.dol", 0x492E58, 0x8 diff --git a/asm/libnw4r_ut/ut_TagProcessorBase.s b/asm/libnw4r_ut/ut_TagProcessorBase.s index 58997972..c4ad6996 100644 --- a/asm/libnw4r_ut/ut_TagProcessorBase.s +++ b/asm/libnw4r_ut/ut_TagProcessorBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut19TagProcessorBase$$0c$$1Fv __ct__Q34nw4r2ut19TagProcessorBase$$0c$$1Fv: /* 8011FFB0 0011BDF0 3C 80 80 44 */ lis r4, __vt__Q34nw4r2ut19TagProcessorBase$$0c$$1@ha @@ -469,7 +469,7 @@ lbl_801205FC: /* 80120628 0011C468 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8012062C 0011C46C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ut19TagProcessorBase$$0w$$1 __vt__Q34nw4r2ut19TagProcessorBase$$0w$$1: .incbin "baserom.dol", 0x43E7E0, 0x14 @@ -477,7 +477,7 @@ __vt__Q34nw4r2ut19TagProcessorBase$$0w$$1: __vt__Q34nw4r2ut19TagProcessorBase$$0c$$1: .incbin "baserom.dol", 0x43E7F4, 0x14 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24919 $$24919: .incbin "baserom.dol", 0x49A020, 0x8 diff --git a/asm/libnw4r_ut/ut_TextWriterBase.s b/asm/libnw4r_ut/ut_TextWriterBase.s index 38123b8c..afa07a35 100644 --- a/asm/libnw4r_ut/ut_TextWriterBase.s +++ b/asm/libnw4r_ut/ut_TextWriterBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut17TextWriterBase$$0c$$1Fv __ct__Q34nw4r2ut17TextWriterBase$$0c$$1Fv: /* 80123D00 0011FB40 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3294,15 +3294,15 @@ lbl_80126CC4: /* 80126CD8 00122B18 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80126CDC 00122B1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023C0, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global mFormatBufferSize__Q34nw4r2ut17TextWriterBase$$0c$$1 mFormatBufferSize__Q34nw4r2ut17TextWriterBase$$0c$$1: .incbin "baserom.dol", 0x492E60, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$28480 $$28480: .incbin "baserom.dol", 0x49A048, 0x4 diff --git a/asm/libnw4r_ut/ut_binaryFileFormat.s b/asm/libnw4r_ut/ut_binaryFileFormat.s index b71d7c43..14f3f224 100644 --- a/asm/libnw4r_ut/ut_binaryFileFormat.s +++ b/asm/libnw4r_ut/ut_binaryFileFormat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsValidBinaryFile__Q24nw4r2utFPCQ34nw4r2ut16BinaryFileHeaderUlUsUs IsValidBinaryFile__Q24nw4r2utFPCQ34nw4r2ut16BinaryFileHeaderUlUsUs: /* 8011FE10 0011BC50 80 03 00 00 */ lwz r0, 0(r3) diff --git a/asm/libnw4r_ut/ut_list.s b/asm/libnw4r_ut/ut_list.s index f2ce8487..069ffb9d 100644 --- a/asm/libnw4r_ut/ut_list.s +++ b/asm/libnw4r_ut/ut_list.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global List_Insert__Q24nw4r2utFPQ34nw4r2ut4ListPvPv List_Insert__Q24nw4r2utFPQ34nw4r2ut4ListPvPv: /* 8011FB40 0011B980 2C 04 00 00 */ cmpwi r4, 0 diff --git a/asm/mem/mem_allocator.s b/asm/mem/mem_allocator.s index d9bee7df..e02c2b3e 100644 --- a/asm/mem/mem_allocator.s +++ b/asm/mem/mem_allocator.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AllocatorAllocForExpHeap_ AllocatorAllocForExpHeap_: /* 800A37D0 0009F610 7C 65 1B 78 */ mr r5, r3 @@ -40,7 +40,7 @@ MEMInitAllocatorForExpHeap: /* 800A3828 0009F668 4E 80 00 20 */ blr /* 800A382C 0009F66C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi$$2sAllocatorFunc $$2LOCAL$$2MEMInitAllocatorForExpHeap__FP12MEMAllocatorP12MEMiHeapHeadi$$2sAllocatorFunc: .incbin "baserom.dol", 0x4994A8, 0x8 diff --git a/asm/mem/mem_expHeap.s b/asm/mem/mem_expHeap.s index a83b2d8b..d352234b 100644 --- a/asm/mem/mem_expHeap.s +++ b/asm/mem/mem_expHeap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AllocUsedBlockFromFreeBlock_ AllocUsedBlockFromFreeBlock_: /* 800A2AB0 0009E8F0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/mem/mem_frameHeap.s b/asm/mem/mem_frameHeap.s index 9b06e720..285cc0b7 100644 --- a/asm/mem/mem_frameHeap.s +++ b/asm/mem/mem_frameHeap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MEMCreateFrmHeapEx MEMCreateFrmHeapEx: /* 800A32E0 0009F120 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/mem/mem_heapCommon.s b/asm/mem/mem_heapCommon.s index c51ea2d9..e491c2d4 100644 --- a/asm/mem/mem_heapCommon.s +++ b/asm/mem/mem_heapCommon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global FindContainHeap_ FindContainHeap_: /* 800A2640 0009E480 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/mem/mem_list.s b/asm/mem/mem_list.s index 9b87e24b..bcb3aed5 100644 --- a/asm/mem/mem_list.s +++ b/asm/mem/mem_list.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MEMInitList MEMInitList: /* 800A3830 0009F670 38 00 00 00 */ li r0, 0 diff --git a/asm/mem/mem_unitHeap.s b/asm/mem/mem_unitHeap.s index ab0fe52d..948271f4 100644 --- a/asm/mem/mem_unitHeap.s +++ b/asm/mem/mem_unitHeap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MEMCreateUnitHeapEx MEMCreateUnitHeapEx: /* 800A3530 0009F370 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/mtx/mtx.s b/asm/mtx/mtx.s index 009e5e60..14f95b26 100644 --- a/asm/mtx/mtx.s +++ b/asm/mtx/mtx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PSMTXIdentity PSMTXIdentity: /* 800304E0 0002C320 C0 02 85 B4 */ lfs f0, $$21636-_SDA2_BASE_(r2) @@ -835,12 +835,12 @@ C_MTXLightOrtho: /* 800310E8 0002CF28 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800310EC 0002CF2C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global Unit01 Unit01: .incbin "baserom.dol", 0x492940, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21635 $$21635: .incbin "baserom.dol", 0x499070, 0x4 diff --git a/asm/mtx/mtx44.s b/asm/mtx/mtx44.s index 018a690a..68a6525a 100644 --- a/asm/mtx/mtx44.s +++ b/asm/mtx/mtx44.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global C_MTXFrustum C_MTXFrustum: /* 800311B0 0002CFF0 EC 04 18 28 */ fsubs f0, f4, f3 @@ -221,7 +221,7 @@ PSMTX44Concat: /* 800314E8 0002D328 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800314EC 0002D32C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21671 $$21671: .incbin "baserom.dol", 0x499090, 0x4 diff --git a/asm/mtx/mtx44vec.s b/asm/mtx/mtx44vec.s index 27418887..c1402bcd 100644 --- a/asm/mtx/mtx44vec.s +++ b/asm/mtx/mtx44vec.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PSMTX44MultVec PSMTX44MultVec: /* 800314F0 0002D330 E0 04 00 00 */ psq_l f0, 0(r4), 0, qr0 diff --git a/asm/mtx/mtxvec.s b/asm/mtx/mtxvec.s index f38cf87e..2c10c89f 100644 --- a/asm/mtx/mtxvec.s +++ b/asm/mtx/mtxvec.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PSMTXMultVec PSMTXMultVec: /* 800310F0 0002CF30 E0 04 00 00 */ psq_l f0, 0(r4), 0, qr0 diff --git a/asm/mtx/quat.s b/asm/mtx/quat.s index 8f06daa5..cac3ff8b 100644 --- a/asm/mtx/quat.s +++ b/asm/mtx/quat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PSQUATMultiply PSQUATMultiply: /* 800317B0 0002D5F0 E0 03 00 00 */ psq_l f0, 0(r3), 0, qr0 @@ -305,12 +305,12 @@ lbl_80031B80: /* 80031C18 0002DA58 4E 80 00 20 */ blr /* 80031C1C 0002DA5C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21420 $$21420: .incbin "baserom.dol", 0x403940, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21598 $$21598: .incbin "baserom.dol", 0x4990B8, 0x4 diff --git a/asm/mtx/vec.s b/asm/mtx/vec.s index e2856393..b00201e4 100644 --- a/asm/mtx/vec.s +++ b/asm/mtx/vec.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PSVECAdd PSVECAdd: /* 80031570 0002D3B0 E0 43 00 00 */ psq_l f2, 0(r3), 0, qr0 @@ -168,7 +168,7 @@ PSVECSquareDistance: /* 800317A8 0002D5E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800317AC 0002D5EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21414 $$21414: .incbin "baserom.dol", 0x4990A8, 0x4 diff --git a/asm/nand/NANDCheck.s b/asm/nand/NANDCheck.s index b8041db4..d9bba53f 100644 --- a/asm/nand/NANDCheck.s +++ b/asm/nand/NANDCheck.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global nandCalcUsage nandCalcUsage: /* 8004A910 00046750 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -136,7 +136,7 @@ lbl_8004AABC: /* 8004AAD8 00046918 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004AADC 0004691C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22294 $$22294: .incbin "baserom.dol", 0x4325D0, 0x10 @@ -165,7 +165,7 @@ $$22301: USER_DIR_LIST: .incbin "baserom.dol", 0x432650, 0x30 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22292 $$22292: .incbin "baserom.dol", 0x492A40, 0x8 diff --git a/asm/nand/NANDCore.s b/asm/nand/NANDCore.s index 2b5b410a..63abea6c 100644 --- a/asm/nand/NANDCore.s +++ b/asm/nand/NANDCore.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global nandRemoveTailToken nandRemoveTailToken: /* 800497B0 000455F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1293,12 +1293,12 @@ nandGetHomeDir: /* 8004A908 00046748 4E 80 00 20 */ blr /* 8004A90C 0004674C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$23073 $$23073: .incbin "baserom.dol", 0x4039F0, 0x148 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22807 $$22807: .incbin "baserom.dol", 0x432480, 0x60 @@ -1327,7 +1327,7 @@ $$23851: $$23880: .incbin "baserom.dol", 0x4325B0, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __NANDVersion __NANDVersion: .incbin "baserom.dol", 0x492A20, 0x4 diff --git a/asm/nand/NANDErrorMessage.s b/asm/nand/NANDErrorMessage.s index a7c62af5..23f8853f 100644 --- a/asm/nand/NANDErrorMessage.s +++ b/asm/nand/NANDErrorMessage.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __NANDShowErrorMessage __NANDShowErrorMessage: /* 8004B130 00046F70 94 21 FC E0 */ stwu r1, -0x320(r1) @@ -225,7 +225,7 @@ __NANDPrintErrorMessage: /* 8004B428 00047268 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004B42C 0004726C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global __NANDMaxBlocksErrorMessageDefault __NANDMaxBlocksErrorMessageDefault: .incbin "baserom.dol", 0x403B38, 0x1C @@ -260,7 +260,7 @@ __NANDUnknownErrorMessageEurope: $$21868: .incbin "baserom.dol", 0x403C50, 0x100 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21805 $$21805: .incbin "baserom.dol", 0x4326C8, 0x5C @@ -430,7 +430,7 @@ $$21859: $$21860: .incbin "baserom.dol", 0x434284, 0x74 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global __NANDMaxBlocksErrorMessageChinaKorea __NANDMaxBlocksErrorMessageChinaKorea: .incbin "baserom.dol", 0x499250, 0x8 diff --git a/asm/nand/NANDLogging.s b/asm/nand/NANDLogging.s index b4aa7b86..305c7769 100644 --- a/asm/nand/NANDLogging.s +++ b/asm/nand/NANDLogging.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global reserveFileDescriptor reserveFileDescriptor: /* 8004AAE0 00046920 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -439,7 +439,7 @@ lbl_8004B10C: /* 8004B128 00046F68 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004B12C 00046F6C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21150 $$21150: .incbin "baserom.dol", 0x432680, 0x1C @@ -447,7 +447,7 @@ $$21150: $$21155: .incbin "baserom.dol", 0x43269C, 0x2C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global s_fd s_fd: .incbin "baserom.dol", 0x492A50, 0x4 diff --git a/asm/nand/NANDOpenClose.s b/asm/nand/NANDOpenClose.s index 0fa3ad8c..d9ee3eeb 100644 --- a/asm/nand/NANDOpenClose.s +++ b/asm/nand/NANDOpenClose.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global nandOpen nandOpen: /* 800492A0 000450E0 94 21 FF A0 */ stwu r1, -0x60(r1) diff --git a/asm/nand/nand.s b/asm/nand/nand.s index 90083ece..1096e9e1 100644 --- a/asm/nand/nand.s +++ b/asm/nand/nand.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global nandCreate nandCreate: /* 80047E40 00043C80 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -1495,12 +1495,12 @@ lbl_8004927C: /* 80049298 000450D8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004929C 000450DC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$23188 $$23188: .incbin "baserom.dol", 0x4039A8, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23665 $$23665: .incbin "baserom.dol", 0x492A18, 0x4 diff --git a/asm/nrel/Alert.s b/asm/nrel/Alert.s index 6edb9082..ab2ff9df 100644 --- a/asm/nrel/Alert.s +++ b/asm/nrel/Alert.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global max$$0f$$1__3stdFRCfRCf_RCf max$$0f$$1__3stdFRCfRCf_RCf: /* 8014B848 00147688 C0 23 00 00 */ lfs f1, 0(r3) @@ -67,7 +67,7 @@ __msl_error__3stdFPCc: /* 8014B90C 0014774C 38 21 00 10 */ addi r1, r1, 0x10 /* 8014B910 00147750 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$221840 $$221840: .incbin "baserom.dol", 0x49A090, 0x8 diff --git a/asm/nrel/AlertStyle.s b/asm/nrel/AlertStyle.s index 18c81fbd..1211add8 100644 --- a/asm/nrel/AlertStyle.s +++ b/asm/nrel/AlertStyle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __as__8_GXColorFRC8_GXColor __as__8_GXColorFRC8_GXColor: /* 8014B914 00147754 88 04 00 00 */ lbz r0, 0(r4) diff --git a/asm/nrel/Block.s b/asm/nrel/Block.s index 72b22ab4..41d58f19 100644 --- a/asm/nrel/Block.s +++ b/asm/nrel/Block.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nrel3mem5BlockFPCvPCvUl __ct__Q34nrel3mem5BlockFPCvPCvUl: /* 8014C6D8 00148518 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -28,7 +28,7 @@ lbl_8014C71C: /* 8014C72C 0014856C 38 21 00 10 */ addi r1, r1, 0x10 /* 8014C730 00148570 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2515 $$2515: .incbin "baserom.dol", 0x4430C8, 0xC diff --git a/asm/nrel/CoreHolder.s b/asm/nrel/CoreHolder.s index ea7de185..2b44c93a 100644 --- a/asm/nrel/CoreHolder.s +++ b/asm/nrel/CoreHolder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut5ColorFRCQ34nw4r2ut5Color __ct__Q34nw4r2ut5ColorFRCQ34nw4r2ut5Color: /* 8014C05C 00147E9C 80 04 00 00 */ lwz r0, 0(r4) diff --git a/asm/nrel/ExpHeapAccessor.s b/asm/nrel/ExpHeapAccessor.s index f876cdd7..3916c3cc 100644 --- a/asm/nrel/ExpHeapAccessor.s +++ b/asm/nrel/ExpHeapAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_usedBlockCount__29$$2unnamed$$2ExpHeapAccessor_cpp$$2FP12MEMiHeapHead t_usedBlockCount__29$$2unnamed$$2ExpHeapAccessor_cpp$$2FP12MEMiHeapHead: /* 8014C734 00148574 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -678,7 +678,7 @@ headerPtr__Q34nrel3mem5BlockCFv: /* 8014D064 00148EA4 7C 64 02 14 */ add r3, r4, r0 /* 8014D068 00148EA8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2882 $$2882: .incbin "baserom.dol", 0x443100, 0x14 @@ -788,12 +788,12 @@ $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead$$2 $$2STRING$$2__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead: .incbin "baserom.dol", 0x4436C8, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21059 $$21059: .incbin "baserom.dol", 0x492E88, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21044 $$21044: .incbin "baserom.dol", 0x49A0C0, 0x8 diff --git a/asm/nrel/ExpHeapMapUser.s b/asm/nrel/ExpHeapMapUser.s index b88e1523..e47b8ec9 100644 --- a/asm/nrel/ExpHeapMapUser.s +++ b/asm/nrel/ExpHeapMapUser.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q44nrel6devkit7heapmap14ExpHeapMapUserFP12MEMiHeapHeadPCc __ct__Q44nrel6devkit7heapmap14ExpHeapMapUserFP12MEMiHeapHeadPCc: /* 8014B97C 001477BC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -239,7 +239,7 @@ lbl_8014BC50: /* 8014BC64 00147AA4 38 21 00 10 */ addi r1, r1, 0x10 /* 8014BC68 00147AA8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q44nrel6devkit7heapmap14ExpHeapMapUser __vt__Q44nrel6devkit7heapmap14ExpHeapMapUser: .incbin "baserom.dol", 0x442D58, 0x30 @@ -262,7 +262,7 @@ $$2STRING$$2next__Q34nrel3mem20ExpHeapBlockIteratorCFv$$20: $$2STRING$$2next__Q34nrel3mem20ExpHeapBlockIteratorCFv: .incbin "baserom.dol", 0x442E38, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser: .incbin "baserom.dol", 0x492E78, 0x8 diff --git a/asm/nrel/ExpHeapSupport.s b/asm/nrel/ExpHeapSupport.s index f0790484..6e62aa62 100644 --- a/asm/nrel/ExpHeapSupport.s +++ b/asm/nrel/ExpHeapSupport.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global expHeapHead__Q34nrel3mem14ExpHeapSupportFP12MEMiHeapHead expHeapHead__Q34nrel3mem14ExpHeapSupportFP12MEMiHeapHead: /* 8014D06C 00148EAC 38 63 00 3C */ addi r3, r3, 0x3c @@ -126,7 +126,7 @@ lbl_8014D1E4: /* 8014D1F8 00149038 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8014D1FC 0014903C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2789 $$2789: .incbin "baserom.dol", 0x4436E8, 0x14 diff --git a/asm/nrel/GXSettingFor2D.s b/asm/nrel/GXSettingFor2D.s index 0ccc9a81..3aadf5db 100644 --- a/asm/nrel/GXSettingFor2D.s +++ b/asm/nrel/GXSettingFor2D.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nrel8ezrender14GXSettingFor2DFv __ct__Q34nrel8ezrender14GXSettingFor2DFv: /* 8014C2FC 0014813C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -104,7 +104,7 @@ setViewportSetting__Q34nrel8ezrender14GXSettingFor2DFRCQ34nrel8ezrender15Viewpor /* 8014C438 00148278 38 63 00 18 */ addi r3, r3, 0x18 /* 8014C43C 0014827C 4B FF FF A0 */ b __as__Q34nrel8ezrender18OrthoCameraSettingFRCQ34nrel8ezrender18OrthoCameraSetting -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2795 $$2795: .incbin "baserom.dol", 0x49A0A8, 0x4 diff --git a/asm/nrel/HeapMap.s b/asm/nrel/HeapMap.s index 54e87164..8029b70a 100644 --- a/asm/nrel/HeapMap.s +++ b/asm/nrel/HeapMap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global min$$0f$$1__3stdFRCfRCf_RCf min$$0f$$1__3stdFRCfRCf_RCf: /* 8014BC6C 00147AAC C0 24 00 00 */ lfs f1, 0(r4) diff --git a/asm/nrel/HeapMapBlockDrawer.s b/asm/nrel/HeapMapBlockDrawer.s index 471f8ba8..f236de50 100644 --- a/asm/nrel/HeapMapBlockDrawer.s +++ b/asm/nrel/HeapMapBlockDrawer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global getRenderPosition__Q44nrel6devkit7heapmap18HeapMapBlockDrawerFUlUlUlf getRenderPosition__Q44nrel6devkit7heapmap18HeapMapBlockDrawerFUlUlUlf: /* 8014BCA8 00147AE8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -269,7 +269,7 @@ lbl_8014C038: /* 8014C054 00147E94 38 21 00 40 */ addi r1, r1, 0x40 /* 8014C058 00147E98 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$214354 $$214354: .incbin "baserom.dol", 0x442E58, 0x18 @@ -286,7 +286,7 @@ $$214463: $$214516: .incbin "baserom.dol", 0x442F18, 0x50 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$214358 $$214358: .incbin "baserom.dol", 0x49A098, 0x8 diff --git a/asm/nrel/OrthoCameraSetting.s b/asm/nrel/OrthoCameraSetting.s index 758f3822..7c721301 100644 --- a/asm/nrel/OrthoCameraSetting.s +++ b/asm/nrel/OrthoCameraSetting.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global create__Q34nrel8ezrender18OrthoCameraSettingFffffff create__Q34nrel8ezrender18OrthoCameraSettingFffffff: /* 8014C440 00148280 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/nrel/Render2D.s b/asm/nrel/Render2D.s index ff65a8c7..34fd188d 100644 --- a/asm/nrel/Render2D.s +++ b/asm/nrel/Render2D.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setupGX__Q34nrel8ezrender8Render2DFRCQ34nrel8ezrender14GXSettingFor2D setupGX__Q34nrel8ezrender8Render2DFRCQ34nrel8ezrender14GXSettingFor2D: /* 8014C4AC 001482EC 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -143,7 +143,7 @@ renderRect__Q34nrel8ezrender8Render2DFRCQ34nw4r2ut4RectRC8_GXColor: /* 8014C6B4 001484F4 38 21 00 20 */ addi r1, r1, 0x20 /* 8014C6B8 001484F8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$24710 $$24710: .incbin "baserom.dol", 0x49A0B8, 0x8 diff --git a/asm/nrel/StringStyle.s b/asm/nrel/StringStyle.s index ee4a9098..e227570c 100644 --- a/asm/nrel/StringStyle.s +++ b/asm/nrel/StringStyle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r2ut5ColorFiiii __ct__Q34nw4r2ut5ColorFiiii: /* 8014C098 00147ED8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/nrel/TextWriter.s b/asm/nrel/TextWriter.s index 735bdf43..9f813416 100644 --- a/asm/nrel/TextWriter.s +++ b/asm/nrel/TextWriter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font: /* 8014C0EC 00147F2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -150,7 +150,7 @@ lbl_8014C2E0: /* 8014C2F4 00148134 38 21 00 10 */ addi r1, r1, 0x10 /* 8014C2F8 00148138 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc$$22 $$2STRING$$2Print__Q34nw4r2ut17TextWriterBase$$0c$$1FPCc$$22: .incbin "baserom.dol", 0x442F68, 0x34 diff --git a/asm/nrel/ViewportSetting.s b/asm/nrel/ViewportSetting.s index ef22b375..4d8a6c31 100644 --- a/asm/nrel/ViewportSetting.s +++ b/asm/nrel/ViewportSetting.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global execute__Q34nrel8ezrender15ViewportSettingCFv execute__Q34nrel8ezrender15ViewportSettingCFv: /* 8014C6BC 001484FC C0 23 00 00 */ lfs f1, 0(r3) diff --git a/asm/os/OS.s b/asm/os/OS.s index e6265c0d..6e552ed2 100644 --- a/asm/os/OS.s +++ b/asm/os/OS.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSFPRInit __OSFPRInit: /* 8001A2C0 00016100 7C 60 00 A6 */ mfmsr r3 @@ -1520,7 +1520,7 @@ lbl_8001B794: /* 8001B798 000175D8 88 63 31 84 */ lbz r3, 0x80003184@l(r3) /* 8001B79C 000175DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x41DED8, 0x48 @@ -1609,7 +1609,7 @@ $$21853: __OSExceptionLocations: .incbin "baserom.dol", 0x41E2A8, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSVersion __OSVersion: .incbin "baserom.dol", 0x492868, 0x4 @@ -1632,7 +1632,7 @@ $$21187: AppGameNameForSysMenu: .incbin "baserom.dol", 0x492890, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21010 $$21010: .incbin "baserom.dol", 0x499008, 0x4 diff --git a/asm/os/OSAlarm.s b/asm/os/OSAlarm.s index 1676c19e..38eba279 100644 --- a/asm/os/OSAlarm.s +++ b/asm/os/OSAlarm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSInitAlarm __OSInitAlarm: /* 8001B7A0 000175E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -632,7 +632,7 @@ lbl_8001C01C: /* 8001C048 00017E88 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8001C04C 00017E8C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global ShutdownFunctionInfo ShutdownFunctionInfo: .incbin "baserom.dol", 0x41E2E8, 0x10 diff --git a/asm/os/OSAlloc.s b/asm/os/OSAlloc.s index 550952ed..17ead55e 100644 --- a/asm/os/OSAlloc.s +++ b/asm/os/OSAlloc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DLInsert DLInsert: /* 8001C050 00017E90 7C 67 1B 78 */ mr r7, r3 @@ -244,7 +244,7 @@ lbl_8001C368: /* 8001C368 000181A8 38 60 FF FF */ li r3, -1 /* 8001C36C 000181AC 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSCurrHeap __OSCurrHeap: .incbin "baserom.dol", 0x492898, 0x8 diff --git a/asm/os/OSArena.s b/asm/os/OSArena.s index 1b9046ac..3338c5cb 100644 --- a/asm/os/OSArena.s +++ b/asm/os/OSArena.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSGetMEM1ArenaHi OSGetMEM1ArenaHi: /* 8001C370 000181B0 80 6D E3 B8 */ lwz r3, __OSArenaHi-_SDA_BASE_(r13) @@ -95,7 +95,7 @@ OSAllocFromMEM2ArenaLo: /* 8001C468 000182A8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8001C46C 000182AC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSArenaLo __OSArenaLo: .incbin "baserom.dol", 0x4928A0, 0x4 diff --git a/asm/os/OSAudioSystem.s b/asm/os/OSAudioSystem.s index b250d042..05d63ba1 100644 --- a/asm/os/OSAudioSystem.s +++ b/asm/os/OSAudioSystem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __AIClockInit __AIClockInit: /* 8001C470 000182B0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -341,7 +341,7 @@ lbl_8001C914: /* 8001C928 00018768 38 21 00 10 */ addi r1, r1, 0x10 /* 8001C92C 0001876C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global DSPInitCode DSPInitCode: .incbin "baserom.dol", 0x41E2F8, 0x80 diff --git a/asm/os/OSCache.s b/asm/os/OSCache.s index 00f1f0f7..81f5dbd1 100644 --- a/asm/os/OSCache.s +++ b/asm/os/OSCache.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DCEnable DCEnable: /* 8001C930 00018770 7C 00 04 AC */ sync 0 @@ -494,7 +494,7 @@ lbl_8001CF64: /* 8001CF88 00018DC8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8001CF8C 00018DCC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2909 $$2909: .incbin "baserom.dol", 0x41E378, 0x18 diff --git a/asm/os/OSContext.s b/asm/os/OSContext.s index 3af94c68..4f544416 100644 --- a/asm/os/OSContext.s +++ b/asm/os/OSContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSLoadFPUContext __OSLoadFPUContext: /* 8001CF90 00018DD0 A0 A4 01 A2 */ lhz r5, 0x1a2(r4) @@ -709,7 +709,7 @@ lbl_8001D988: /* 8001D988 000197C8 4E 80 00 20 */ blr /* 8001D98C 000197CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2715 $$2715: .incbin "baserom.dol", 0x41E500, 0x48 diff --git a/asm/os/OSCrc.s b/asm/os/OSCrc.s index dc1b9c0f..51915324 100644 --- a/asm/os/OSCrc.s +++ b/asm/os/OSCrc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSCalcCRC32 OSCalcCRC32: /* 800281E0 00024020 2C 04 00 00 */ cmpwi r4, 0 @@ -88,7 +88,7 @@ lbl_8002830C: /* 80028318 00024158 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8002831C 0002415C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2OSCalcCRC32__FPCvUl$$2crc32_table $$2LOCAL$$2OSCalcCRC32__FPCvUl$$2crc32_table: .incbin "baserom.dol", 0x403900, 0x40 diff --git a/asm/os/OSError.s b/asm/os/OSError.s index 36884dfb..0e3ecaf8 100644 --- a/asm/os/OSError.s +++ b/asm/os/OSError.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSReport OSReport: /* 8001D990 000197D0 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -429,7 +429,7 @@ lbl_8001DF74: /* 8001DFA8 00019DE8 4E 80 00 20 */ blr /* 8001DFAC 00019DEC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2641 $$2641: .incbin "baserom.dol", 0x41E6B8, 0x18 @@ -476,7 +476,7 @@ $$2712: $$2713: .incbin "baserom.dol", 0x41E95C, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __OSFpscrEnableBits __OSFpscrEnableBits: .incbin "baserom.dol", 0x4928A8, 0x4 diff --git a/asm/os/OSExec.s b/asm/os/OSExec.s index 40dba2dd..1d3a7268 100644 --- a/asm/os/OSExec.s +++ b/asm/os/OSExec.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PackArgs PackArgs: /* 8001DFB0 00019DF0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1782,7 +1782,7 @@ lbl_8001F838: /* 8001F858 0001B698 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8001F85C 0001B69C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$23219 $$23219: .incbin "baserom.dol", 0x41E998, 0x18 @@ -1838,7 +1838,7 @@ $$23520: $$23521: .incbin "baserom.dol", 0x41ECB0, 0x38 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$23377 $$23377: .incbin "baserom.dol", 0x4928B0, 0x8 diff --git a/asm/os/OSFatal.s b/asm/os/OSFatal.s index f3342f60..3942d068 100644 --- a/asm/os/OSFatal.s +++ b/asm/os/OSFatal.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ScreenReport ScreenReport: /* 8001F860 0001B6A0 94 21 FE 80 */ stwu r1, -0x180(r1) @@ -842,12 +842,12 @@ lbl_80020440: /* 80020488 0001C2C8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8002048C 0001C2CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$22599 $$22599: .incbin "baserom.dol", 0x4928C0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22586 $$22586: .incbin "baserom.dol", 0x499010, 0x4 diff --git a/asm/os/OSFont.s b/asm/os/OSFont.s index 3c1b384e..72272307 100644 --- a/asm/os/OSFont.s +++ b/asm/os/OSFont.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetFontCode GetFontCode: /* 80020490 0001C2D0 28 03 00 01 */ cmplwi r3, 1 @@ -1403,7 +1403,7 @@ lbl_8002180C: /* 80021818 0001D658 38 21 00 20 */ addi r1, r1, 0x20 /* 8002181C 0001D65C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global HankakuToCode HankakuToCode: .incbin "baserom.dol", 0x41ECE8, 0x180 @@ -1411,12 +1411,12 @@ HankakuToCode: Zenkaku2Code: .incbin "baserom.dol", 0x41EE68, 0x990 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global FontEncode FontEncode: .incbin "baserom.dol", 0x4928C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21601 $$21601: .incbin "baserom.dol", 0x499050, 0x4 diff --git a/asm/os/OSInterrupt.s b/asm/os/OSInterrupt.s index 3844a1c7..8eec07ad 100644 --- a/asm/os/OSInterrupt.s +++ b/asm/os/OSInterrupt.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSDisableInterrupts OSDisableInterrupts: /* 80021820 0001D660 7C 60 00 A6 */ mfmsr r3 @@ -615,7 +615,7 @@ ExternalInterruptHandler: /* 80021FE8 0001DE28 94 21 FF F8 */ stwu r1, -8(r1) /* 80021FEC 0001DE2C 4B FF FD 04 */ b __OSDispatchInterrupt -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global InterruptPrioTable InterruptPrioTable: .incbin "baserom.dol", 0x41F7F8, 0x30 diff --git a/asm/os/OSIpc.s b/asm/os/OSIpc.s index b69fca26..c549979d 100644 --- a/asm/os/OSIpc.s +++ b/asm/os/OSIpc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSGetIPCBufferHi __OSGetIPCBufferHi: /* 800261C0 00022000 80 6D E4 30 */ lwz r3, IpcBufferHi-_SDA_BASE_(r13) @@ -26,7 +26,7 @@ __OSInitIPCBuffer: /* 800261F8 00022038 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800261FC 0002203C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global IpcBufferLo IpcBufferLo: .incbin "baserom.dol", 0x4928D8, 0x8 diff --git a/asm/os/OSLaunch.s b/asm/os/OSLaunch.s index 64ceb65e..19c03a31 100644 --- a/asm/os/OSLaunch.s +++ b/asm/os/OSLaunch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSRelaunchTitle __OSRelaunchTitle: /* 80028320 00024160 54 2B 06 FE */ clrlwi r11, r1, 0x1b diff --git a/asm/os/OSLink.s b/asm/os/OSLink.s index 49af4f04..45b03128 100644 --- a/asm/os/OSLink.s +++ b/asm/os/OSLink.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSModuleInit __OSModuleInit: /* 80021FF0 0001DE30 3C 60 80 00 */ lis r3, 0x800030CC@ha diff --git a/asm/os/OSMemory.s b/asm/os/OSMemory.s index 2ba6e7c0..3ccb3acf 100644 --- a/asm/os/OSMemory.s +++ b/asm/os/OSMemory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSGetPhysicalMem2Size OSGetPhysicalMem2Size: /* 800222F0 0001E130 3C 60 80 00 */ lis r3, 0x80003118@ha @@ -603,7 +603,7 @@ lbl_80022B44: /* 80022B58 0001E998 4E 80 00 20 */ blr /* 80022B5C 0001E99C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global ShutdownFunctionInfo ShutdownFunctionInfo: .incbin "baserom.dol", 0x41F828, 0x10 diff --git a/asm/os/OSMessage.s b/asm/os/OSMessage.s index a227f506..f46ab41e 100644 --- a/asm/os/OSMessage.s +++ b/asm/os/OSMessage.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSInitMessageQueue OSInitMessageQueue: /* 80022010 0001DE50 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/os/OSMutex.s b/asm/os/OSMutex.s index e74c80f1..e55771d7 100644 --- a/asm/os/OSMutex.s +++ b/asm/os/OSMutex.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSInitMutex OSInitMutex: /* 80022B60 0001E9A0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/os/OSNandbootInfo.s b/asm/os/OSNandbootInfo.s index abf168c8..7fde2dfb 100644 --- a/asm/os/OSNandbootInfo.s +++ b/asm/os/OSNandbootInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSCreateNandbootInfo __OSCreateNandbootInfo: /* 800277F0 00023630 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -148,7 +148,7 @@ lbl_800279E4: /* 800279F8 00023838 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800279FC 0002383C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21058 $$21058: .incbin "baserom.dol", 0x42BBE0, 0x20 diff --git a/asm/os/OSNet.s b/asm/os/OSNet.s index 31ee6148..feb7a8e3 100644 --- a/asm/os/OSNet.s +++ b/asm/os/OSNet.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSInitNet __OSInitNet: /* 80027250 00023090 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -435,7 +435,7 @@ lbl_800277DC: /* 800277E8 00023628 4E 80 00 20 */ blr /* 800277EC 0002362C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21053 $$21053: .incbin "baserom.dol", 0x42BA78, 0x34 @@ -470,7 +470,7 @@ __FUNCTION__$756: $$21137: .incbin "baserom.dol", 0x42BBC8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global nwc24ShtFd nwc24ShtFd: .incbin "baserom.dol", 0x4928E8, 0x8 diff --git a/asm/os/OSPlayRecord.s b/asm/os/OSPlayRecord.s index b7ab46a2..41b5a8ef 100644 --- a/asm/os/OSPlayRecord.s +++ b/asm/os/OSPlayRecord.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PlayRecordAlarmCallback PlayRecordAlarmCallback: /* 80026910 00022750 38 60 00 00 */ li r3, 0 @@ -510,7 +510,7 @@ lbl_80027014: /* 80027028 00022E68 4E 80 00 20 */ blr /* 8002702C 00022E6C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2933 $$2933: .incbin "baserom.dol", 0x42BA08, 0x2C @@ -518,7 +518,7 @@ $$2933: $$2983: .incbin "baserom.dol", 0x42BA34, 0x1C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global PlayRecordState PlayRecordState: .incbin "baserom.dol", 0x4928E0, 0x8 diff --git a/asm/os/OSPlayTime.s b/asm/os/OSPlayTime.s index 50d6f82b..0c37c15e 100644 --- a/asm/os/OSPlayTime.s +++ b/asm/os/OSPlayTime.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSPlayTimeIsLimited OSPlayTimeIsLimited: /* 80027A00 00023840 80 0D E4 A0 */ lwz r0, __OSExpireTime-_SDA_BASE_(r13) @@ -567,7 +567,7 @@ lbl_800281BC: /* 800281D8 00024018 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 800281DC 0002401C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21461 $$21461: .incbin "baserom.dol", 0x42BC00, 0x14 @@ -578,12 +578,12 @@ $$21519: $$21521: .incbin "baserom.dol", 0x42BC24, 0x1C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21520 $$21520: .incbin "baserom.dol", 0x4928F0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$21446 $$21446: .incbin "baserom.dol", 0x499058, 0x8 diff --git a/asm/os/OSReboot.s b/asm/os/OSReboot.s index 5e032962..296fd807 100644 --- a/asm/os/OSReboot.s +++ b/asm/os/OSReboot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSReboot __OSReboot: /* 80022E80 0001ECC0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/os/OSReset.s b/asm/os/OSReset.s index 431889c0..4c6bb49c 100644 --- a/asm/os/OSReset.s +++ b/asm/os/OSReset.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSRegisterShutdownFunction OSRegisterShutdownFunction: /* 80022F10 0001ED50 80 AD E4 18 */ lwz r5, ShutdownFunctionQueue-_SDA_BASE_(r13) @@ -683,7 +683,7 @@ OSResetSystem: /* 80023838 0001F678 48 16 6F B8 */ b OSPanic /* 8002383C 0001F67C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22083 $$22083: .incbin "baserom.dol", 0x41F838, 0xC diff --git a/asm/os/OSRtc.s b/asm/os/OSRtc.s index 5fd7d671..b95ac399 100644 --- a/asm/os/OSRtc.s +++ b/asm/os/OSRtc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WriteSramCallback WriteSramCallback: /* 80023840 0001F680 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/os/OSSemaphore.s b/asm/os/OSSemaphore.s index 703a9505..329debe2 100644 --- a/asm/os/OSSemaphore.s +++ b/asm/os/OSSemaphore.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSInitSemaphore OSInitSemaphore: /* 800242F0 00020130 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/os/OSStateFlags.s b/asm/os/OSStateFlags.s index f57070d1..09eee878 100644 --- a/asm/os/OSStateFlags.s +++ b/asm/os/OSStateFlags.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __OSWriteStateFlags __OSWriteStateFlags: /* 80027030 00022E70 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -151,7 +151,7 @@ lbl_80027228: /* 80027248 00023088 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8002724C 0002308C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2709 $$2709: .incbin "baserom.dol", 0x42BA50, 0x28 diff --git a/asm/os/OSStateTM.s b/asm/os/OSStateTM.s index 86efa199..dc3008e5 100644 --- a/asm/os/OSStateTM.s +++ b/asm/os/OSStateTM.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSSetResetCallback OSSetResetCallback: /* 80026200 00022040 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -525,7 +525,7 @@ lbl_800268EC: /* 80026908 00022748 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8002690C 0002274C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2980 $$2980: .incbin "baserom.dol", 0x42B940, 0x14 diff --git a/asm/os/OSSync.s b/asm/os/OSSync.s index a87a2cb0..2ced42da 100644 --- a/asm/os/OSSync.s +++ b/asm/os/OSSync.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SystemCallVector SystemCallVector: /* 80024420 00020260 7D 30 FA A6 */ mfspr r9, 0x3f0 diff --git a/asm/os/OSThread.s b/asm/os/OSThread.s index e2f20c64..c9a6e366 100644 --- a/asm/os/OSThread.s +++ b/asm/os/OSThread.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DefaultSwitchThreadCallback DefaultSwitchThreadCallback: /* 800244A0 000202E0 4E 80 00 20 */ blr @@ -1692,7 +1692,7 @@ lbl_80025B18: /* 80025B38 00021978 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80025B3C 0002197C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global SwitchThreadCallback SwitchThreadCallback: .incbin "baserom.dol", 0x4928D0, 0x8 diff --git a/asm/os/OSTime.s b/asm/os/OSTime.s index a741b6b4..974a65f2 100644 --- a/asm/os/OSTime.s +++ b/asm/os/OSTime.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSGetTime OSGetTime: /* 80025B40 00021980 7C 6D 42 E6 */ mftbu r3 @@ -295,7 +295,7 @@ lbl_80025EC8: /* 80025F68 00021DA8 4E 80 00 20 */ blr /* 80025F6C 00021DAC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global YearDays YearDays: .incbin "baserom.dol", 0x41FAA0, 0x30 diff --git a/asm/os/OSUtf.s b/asm/os/OSUtf.s index fadcf7a1..38a90657 100644 --- a/asm/os/OSUtf.s +++ b/asm/os/OSUtf.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OSUTF8to32 OSUTF8to32: /* 80025F70 00021DB0 88 C3 00 00 */ lbz r6, 0(r3) @@ -188,7 +188,7 @@ lbl_800261B8: /* 800261B8 00021FF8 38 60 00 00 */ li r3, 0 /* 800261BC 00021FFC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global UcsAnsiTable UcsAnsiTable: .incbin "baserom.dol", 0x41FB00, 0x40 diff --git a/asm/os/__ppc_eabi_init.s b/asm/os/__ppc_eabi_init.s index 4dfe8a54..c188ecc3 100644 --- a/asm/os/__ppc_eabi_init.s +++ b/asm/os/__ppc_eabi_init.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text0, "ax" # 0x80004000 - 0x80006740 +.section .init, "ax" # 0x80004000 - 0x80006740 .global __init_hardware __init_hardware: /* 80006620 00002720 7C 00 00 A6 */ mfmsr r0 @@ -33,7 +33,7 @@ lbl_80006664: /* 8000667C 0000277C 4C 00 01 2C */ isync /* 80006680 00002780 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __init_user __init_user: /* 80028530 00024370 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/os/__start.s b/asm/os/__start.s index da082937..7d3eb2b4 100644 --- a/asm/os/__start.s +++ b/asm/os/__start.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text0, "ax" # 0x80004000 - 0x80006740 +.section .init, "ax" # 0x80004000 - 0x80006740 .global __check_pad3 __check_pad3: /* 800062C0 000023C0 3C 60 80 00 */ lis r3, 0x800030E4@ha diff --git a/asm/pad/Pad.s b/asm/pad/Pad.s index 1d4fe8de..98821b4c 100644 --- a/asm/pad/Pad.s +++ b/asm/pad/Pad.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global UpdateOrigin UpdateOrigin: /* 800524C0 0004E300 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1751,7 +1751,7 @@ lbl_80053DD0: /* 80053DE8 0004FC28 4E 80 00 20 */ blr /* 80053DEC 0004FC2C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x434630, 0x48 @@ -1759,7 +1759,7 @@ $$21: ShutdownFunctionInfo: .incbin "baserom.dol", 0x434678, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __PADVersion __PADVersion: .incbin "baserom.dol", 0x492BA0, 0x4 diff --git a/asm/pad/Padclamp.s b/asm/pad/Padclamp.s index e67b8ec3..c6965f6e 100644 --- a/asm/pad/Padclamp.s +++ b/asm/pad/Padclamp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ClampStick ClampStick: /* 800522A0 0004E0E0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/sc/scapi.s b/asm/sc/scapi.s index 82be7595..28f6c46e 100644 --- a/asm/sc/scapi.s +++ b/asm/sc/scapi.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SCGetAspectRatio SCGetAspectRatio: /* 8004CCE0 00048B20 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/sc/scapi_prdinfo.s b/asm/sc/scapi_prdinfo.s index cba37363..014bbc70 100644 --- a/asm/sc/scapi_prdinfo.s +++ b/asm/sc/scapi_prdinfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __SCF1 __SCF1: /* 8004D1F0 00049030 3C C0 73 B6 */ lis r6, 0x73B5DBFA@ha @@ -193,7 +193,7 @@ lbl_8004D45C: /* 8004D46C 000492AC 38 21 00 20 */ addi r1, r1, 0x20 /* 8004D470 000492B0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global ProductAreaAndStringTbl ProductAreaAndStringTbl: .incbin "baserom.dol", 0x4344F0, 0x48 @@ -201,7 +201,7 @@ ProductAreaAndStringTbl: ProductGameRegionAndStringTbl: .incbin "baserom.dol", 0x434538, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$21016 $$21016: .incbin "baserom.dol", 0x492B68, 0x8 diff --git a/asm/sc/scsystem.s b/asm/sc/scsystem.s index 53cd61d2..b411afba 100644 --- a/asm/sc/scsystem.s +++ b/asm/sc/scsystem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SCInit SCInit: /* 8004B430 00047270 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1769,7 +1769,7 @@ lbl_8004CCC0: /* 8004CCD8 00048B18 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8004CCDC 00048B1C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global ConfDirName ConfDirName: .incbin "baserom.dol", 0x403D50, 0x10 @@ -1780,7 +1780,7 @@ ConfFileName: ProductInfoFileName: .incbin "baserom.dol", 0x403D78, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x4342F8, 0x48 @@ -1812,7 +1812,7 @@ NameAndIDTbl: $$22788: .incbin "baserom.dol", 0x4344C8, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __SCVersion __SCVersion: .incbin "baserom.dol", 0x492A58, 0x4 diff --git a/asm/si/SIBios.s b/asm/si/SIBios.s index 7eb6dcfa..a88ad62f 100644 --- a/asm/si/SIBios.s +++ b/asm/si/SIBios.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SIBusy SIBusy: /* 8002A3C0 00026200 3C 60 80 43 */ lis r3, Si@ha @@ -1556,7 +1556,7 @@ lbl_8002B994: /* 8002B9B8 000277F8 38 21 00 20 */ addi r1, r1, 0x20 /* 8002B9BC 000277FC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x42BC88, 0x48 @@ -1567,7 +1567,7 @@ Si: Type: .incbin "baserom.dol", 0x42BCE8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __SIVersion __SIVersion: .incbin "baserom.dol", 0x492900, 0x8 diff --git a/asm/si/SISamplingRate.s b/asm/si/SISamplingRate.s index 2cb47db9..d398b316 100644 --- a/asm/si/SISamplingRate.s +++ b/asm/si/SISamplingRate.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SISetSamplingRate SISetSamplingRate: /* 8002B9C0 00027800 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -72,7 +72,7 @@ SIRefreshSamplingRate: /* 8002BAA8 000278E8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8002BAAC 000278EC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global XYNTSC XYNTSC: .incbin "baserom.dol", 0x42BCF8, 0x30 diff --git a/asm/snd_adpcm.s b/asm/snd_adpcm.s index 0b2f6cd9..a0f7826d 100644 --- a/asm/snd_adpcm.s +++ b/asm/snd_adpcm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DecodeDspAdpcm__Q34nw4r3snd6detailFP10_AXPBADPCMUc DecodeDspAdpcm__Q34nw4r3snd6detailFP10_AXPBADPCMUc: /* 80006A00 00002840 A0 E3 00 22 */ lhz r7, 0x22(r3) diff --git a/asm/src/AABBox.s b/asm/src/AABBox.s index 3eab14a6..7afcff35 100644 --- a/asm/src/AABBox.s +++ b/asm/src/AABBox.s @@ -1,12 +1,12 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __mi__Q33hel4math7Vector3CFv __mi__Q33hel4math7Vector3CFv: /* 8019FD4C 0019BB8C C0 22 99 20 */ lfs f1, $$252182-_SDA2_BASE_(r2) /* 8019FD50 0019BB90 4B FD C8 18 */ b __ml__Q33hel4math7Vector3CFf -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252182 $$252182: .incbin "baserom.dol", 0x49A3E0, 0x8 diff --git a/asm/src/AbilityBase.s b/asm/src/AbilityBase.s index 80af2d0f..1dbcda50 100644 --- a/asm/src/AbilityBase.s +++ b/asm/src/AbilityBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11AbilityBaseFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q43scn4step4hero11AbilityBaseFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 8032B780 003275C0 3C C0 80 48 */ lis r6, __vt__Q43scn4step4hero11AbilityBase@ha @@ -94,7 +94,7 @@ procObjCollReact__Q43scn4step4hero11AbilityBaseFv: isDepleted__Q43scn4step4hero11AbilityBaseCFv: /* 8032B7E8 00327628 4B D2 86 08 */ b __wpadNoAlloc -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero11AbilityBase __vt__Q43scn4step4hero11AbilityBase: .incbin "baserom.dol", 0x47E810, 0x60 diff --git a/asm/src/AbilityCursor.s b/asm/src/AbilityCursor.s index 94c2c9ba..3ef2dd05 100644 --- a/asm/src/AbilityCursor.s +++ b/asm/src/AbilityCursor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn17challengetutorial4info13AbilityCursorFRCQ43scn17challengetutorial4info19AbilityPanelContext __ct__Q43scn17challengetutorial4info13AbilityCursorFRCQ43scn17challengetutorial4info19AbilityPanelContext: /* 801F7048 001F2E88 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -444,7 +444,7 @@ lbl_801F765C: /* 801F7668 001F34A8 38 21 00 10 */ addi r1, r1, 0x10 /* 801F766C 001F34AC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252276 $$252276: .incbin "baserom.dol", 0x45BAB0, 0x18 @@ -452,7 +452,7 @@ $$252276: $$252277: .incbin "baserom.dol", 0x45BAC8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252278 $$252278: .incbin "baserom.dol", 0x4943E0, 0x8 @@ -475,7 +475,7 @@ $$252326: $$252329: .incbin "baserom.dol", 0x494410, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252281 $$252281: .incbin "baserom.dol", 0x49AA00, 0x8 diff --git a/asm/src/AbilityCustomBase.s b/asm/src/AbilityCustomBase.s index fb5ec47b..49ced960 100644 --- a/asm/src/AbilityCustomBase.s +++ b/asm/src/AbilityCustomBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero17AbilityCustomBaseFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero17AbilityCustomBaseFRQ43scn4step4hero4Hero: /* 8032B7EC 0032762C 3C A0 80 48 */ lis r5, __vt__Q43scn4step4hero17AbilityCustomBase@ha @@ -17,7 +17,7 @@ __dt__Q43scn4step4hero17AbilityCustomBaseFv: GetRuntimeTypeInfo__Q43scn4step4hero17AbilityCustomBaseCFv: /* 8032B804 00327644 4B F0 55 94 */ b RuntimeTypeInfoImpl$$0Q43scn4step4hero17AbilityCustomBase$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero17AbilityCustomBase __vt__Q43scn4step4hero17AbilityCustomBase: .incbin "baserom.dol", 0x47E870, 0x10 diff --git a/asm/src/AbilityGetFade.s b/asm/src/AbilityGetFade.s index c7f266bb..c9b9f3f6 100644 --- a/asm/src/AbilityGetFade.s +++ b/asm/src/AbilityGetFade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle14AbilityGetFadeFRQ33scn10grandtitle9Component __ct__Q33scn10grandtitle14AbilityGetFadeFRQ33scn10grandtitle9Component: /* 802006E0 001FC520 90 83 00 00 */ stw r4, 0(r3) @@ -117,7 +117,7 @@ lbl_80200860: /* 8020086C 001FC6AC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80200870 001FC6B0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx14AbilityGetFadeFRQ33scn4step9Component __ct__Q43scn4step3sfx14AbilityGetFadeFRQ33scn4step9Component: /* 803CC8A4 003C86E4 90 83 00 00 */ stw r4, 0(r3) @@ -262,7 +262,7 @@ lbl_803CCA98: /* 803CCAA4 003C88E4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 803CCAA8 003C88E8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251579 $$251579: .incbin "baserom.dol", 0x49AA48, 0x4 @@ -282,7 +282,7 @@ $$251603: $$251606: .incbin "baserom.dol", 0x49AA60, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252679 $$252679: .incbin "baserom.dol", 0x49E6A0, 0x4 diff --git a/asm/src/AbilityKindUtil.s b/asm/src/AbilityKindUtil.s index 438db655..790f0efd 100644 --- a/asm/src/AbilityKindUtil.s +++ b/asm/src/AbilityKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsUseGear__Q33scn14challengetitle15AbilityKindUtilFQ33scn14challengetitle11AbilityKind IsUseGear__Q33scn14challengetitle15AbilityKindUtilFQ33scn14challengetitle11AbilityKind: /* 801EA168 001E5FA8 38 80 00 00 */ li r4, 0 @@ -334,7 +334,7 @@ __vc__Q33hel6common25Array$$0Q28dynamics4Desc$$42$$1FUl: /* 801EA594 001E63D4 38 21 00 10 */ addi r1, r1, 0x10 /* 801EA598 001E63D8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global FDNName__Q43scn4step4hero15AbilityKindUtilFQ43scn4step4hero11AbilityKind FDNName__Q43scn4step4hero15AbilityKindUtilFQ43scn4step4hero11AbilityKind: /* 8032B808 00327648 54 60 10 3A */ slwi r0, r3, 2 @@ -359,12 +359,12 @@ lbl_8032B844: /* 8032B844 00327684 38 60 00 01 */ li r3, 1 /* 8032B848 00327688 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_MANUAL_KIND_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2 T_MANUAL_KIND_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2: .incbin "baserom.dol", 0x415CC0, 0x90 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249295 $$249295: .incbin "baserom.dol", 0x45AA98, 0x28 @@ -390,7 +390,7 @@ $$249324: $$249325: .incbin "baserom.dol", 0x45AB88, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248725 $$248725: .incbin "baserom.dol", 0x47E880, 0x18 @@ -440,7 +440,7 @@ $$248739: T_FDN_NAME_TABLE__Q43scn4step4hero29$$2unnamed$$2AbilityKindUtil_cpp$$2: .incbin "baserom.dol", 0x47E9D8, 0x90 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249304 $$249304: .incbin "baserom.dol", 0x494078, 0x4 @@ -451,7 +451,7 @@ $$249305: $$249306: .incbin "baserom.dol", 0x494084, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249353 $$249353: .incbin "baserom.dol", 0x49A8E0, 0x8 diff --git a/asm/src/AbilityManager.s b/asm/src/AbilityManager.s index 58d5f2c5..e36f25b5 100644 --- a/asm/src/AbilityManager.s +++ b/asm/src/AbilityManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step4hero5spark6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step4hero5spark6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 8032B84C 0032768C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1449,7 +1449,7 @@ lbl_8032CB2C: /* 8032CB3C 0032897C 38 21 00 20 */ addi r1, r1, 0x20 /* 8032CB40 00328980 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$261578 $$261578: .incbin "baserom.dol", 0x47EA68, 0x68 diff --git a/asm/src/AbilityPanel.s b/asm/src/AbilityPanel.s index c6c614a9..198fbc7d 100644 --- a/asm/src/AbilityPanel.s +++ b/asm/src/AbilityPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn17challengetutorial4info12AbilityPanelFRCQ43scn17challengetutorial4info19AbilityPanelContext __ct__Q43scn17challengetutorial4info12AbilityPanelFRCQ43scn17challengetutorial4info19AbilityPanelContext: /* 801F7670 001F34B0 94 21 FE 60 */ stwu r1, -0x1a0(r1) @@ -460,7 +460,7 @@ lbl_801F7CF8: /* 801F7D08 001F3B48 38 21 02 40 */ addi r1, r1, 0x240 /* 801F7D0C 001F3B4C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251791 $$251791: .incbin "baserom.dol", 0x4119F0, 0x20 @@ -468,7 +468,7 @@ $$251791: $$251826: .incbin "baserom.dol", 0x411A10, 0x38 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251574 $$251574: .incbin "baserom.dol", 0x45BAD8, 0x14 @@ -530,7 +530,7 @@ $$252783: $$252784: .incbin "baserom.dol", 0x45BC18, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252688 $$252688: .incbin "baserom.dol", 0x494418, 0x8 diff --git a/asm/src/AbilityPanelContext.s b/asm/src/AbilityPanelContext.s index cadb7749..c831c337 100644 --- a/asm/src/AbilityPanelContext.s +++ b/asm/src/AbilityPanelContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn17challengetutorial4info19AbilityPanelContextFRQ23lyt6LayoutPCcRQ23mem10IAllocator __ct__Q43scn17challengetutorial4info19AbilityPanelContextFRQ23lyt6LayoutPCcRQ23mem10IAllocator: /* 801F7D10 001F3B50 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/AbilitySelect.s b/asm/src/AbilitySelect.s index 14419ed5..3de2264d 100644 --- a/asm/src/AbilitySelect.s +++ b/asm/src/AbilitySelect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn17challengetutorial4info13AbilitySelectFRQ23snd11SERequestorRQ23mem10IAllocatorRQ23lyt6Layout __ct__Q43scn17challengetutorial4info13AbilitySelectFRQ23snd11SERequestorRQ23mem10IAllocatorRQ23lyt6Layout: /* 801F7D7C 001F3BBC 94 21 FE 00 */ stwu r1, -0x200(r1) @@ -1690,7 +1690,7 @@ lbl_801F94E8: /* 801F94EC 001F532C 42 00 FF FC */ bdnz lbl_801F94E8 /* 801F94F0 001F5330 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global area1Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 area1Panel__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: .incbin "baserom.dol", 0x411A48, 0x38 @@ -1707,7 +1707,7 @@ abilityNumTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 panelOffsTbl__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: .incbin "baserom.dol", 0x411AFC, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global panelPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2 panelPosName__Q43scn17challengetutorial4info27$$2unnamed$$2AbilitySelect_cpp$$2: .incbin "baserom.dol", 0x45BC58, 0x1C @@ -1757,7 +1757,7 @@ $$253891: $$254084: .incbin "baserom.dol", 0x45BD44, 0x54 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251749 $$251749: .incbin "baserom.dol", 0x4944D0, 0x8 @@ -1795,7 +1795,7 @@ $$254128: $$254157: .incbin "baserom.dol", 0x494524, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254129 $$254129: .incbin "baserom.dol", 0x49AA08, 0x4 diff --git a/asm/src/Accel.s b/asm/src/Accel.s index 49b4fbf0..1264154b 100644 --- a/asm/src/Accel.s +++ b/asm/src/Accel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hid5AccelFv __ct__Q23hid5AccelFv: /* 801A21FC 0019E03C 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/Accessor.s b/asm/src/Accessor.s index ae93596c..016e7e2f 100644 --- a/asm/src/Accessor.s +++ b/asm/src/Accessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q43scn4step4boss7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q43scn4step4boss7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 802276D4 00223514 88 0D EF D8 */ lbz r0, $$2GUARD$$2RuntimeTypeInfoImpl$$0Q43scn4step4boss7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo$$2ti-_SDA_BASE_(r13) @@ -251,7 +251,7 @@ __ct__Q43scn4step4boss8AccessorFRCQ43scn4step4boss8Accessor: isValid__Q43scn4step4boss8AccessorCFv: /* 80227A10 00223850 4B F6 0C B8 */ b wasSetParent__Q24file8FileTreeCFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy8AccessorFv __ct__Q43scn4step5enemy8AccessorFv: /* 8027E25C 0027A09C 4B FB E9 B8 */ b __ct__Q63scn4step4boss15challengemaster15EnemySummonCtrl7ReqDataFv @@ -305,7 +305,7 @@ lbl_8027E2DC: isValid__Q43scn4step5enemy8AccessorCFv: /* 8027E2F8 0027A138 4B F0 A3 D0 */ b wasSetParent__Q24file8FileTreeCFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x45FEC8, 0x24 diff --git a/asm/src/ActionAttack.s b/asm/src/ActionAttack.s index 4732f3a5..e1db9bcd 100644 --- a/asm/src/ActionAttack.s +++ b/asm/src/ActionAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard12ActionAttackFRQ53scn4step7gimmick10guideboard10GuideBoard __ct__Q53scn4step7gimmick10guideboard12ActionAttackFRQ53scn4step7gimmick10guideboard10GuideBoard: /* 80310230 0030C070 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -278,7 +278,7 @@ onAttack__Q53scn4step7gimmick10guideboard6ActionFRCQ33hel4math7Vector3: isInitState__Q53scn4step7gimmick10guideboard6ActionCFv: /* 80310578 0030C3B8 4B DF 84 88 */ b CanCancel__Q34nw4r2ut13DvdFileStreamCFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252816 $$252816: .incbin "baserom.dol", 0x47D428, 0xC @@ -286,7 +286,7 @@ $$252816: __vt__Q53scn4step7gimmick10guideboard12ActionAttack: .incbin "baserom.dol", 0x47D434, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252801 $$252801: .incbin "baserom.dol", 0x496AF8, 0x8 @@ -294,7 +294,7 @@ $$252801: $$252805: .incbin "baserom.dol", 0x496B00, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252848 $$252848: .incbin "baserom.dol", 0x49D408, 0x8 diff --git a/asm/src/ActionDrink.s b/asm/src/ActionDrink.s index 7ee7d888..8a99b118 100644 --- a/asm/src/ActionDrink.s +++ b/asm/src/ActionDrink.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard11ActionDrinkFRQ53scn4step7gimmick10guideboard10GuideBoard __ct__Q53scn4step7gimmick10guideboard11ActionDrinkFRQ53scn4step7gimmick10guideboard10GuideBoard: /* 8031057C 0030C3BC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -323,7 +323,7 @@ lbl_803109C0: /* 803109F4 0030C834 38 21 00 70 */ addi r1, r1, 0x70 /* 803109F8 0030C838 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252912 $$252912: .incbin "baserom.dol", 0x47D478, 0xC @@ -334,7 +334,7 @@ $$252932: __vt__Q53scn4step7gimmick10guideboard11ActionDrink: .incbin "baserom.dol", 0x47D490, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252894 $$252894: .incbin "baserom.dol", 0x496B08, 0x8 diff --git a/asm/src/ActionHover.s b/asm/src/ActionHover.s index 1ef7e54c..e9e0fac6 100644 --- a/asm/src/ActionHover.s +++ b/asm/src/ActionHover.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard11ActionHoverFRQ53scn4step7gimmick10guideboard10GuideBoard __ct__Q53scn4step7gimmick10guideboard11ActionHoverFRQ53scn4step7gimmick10guideboard10GuideBoard: /* 803109FC 0030C83C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -198,7 +198,7 @@ lbl_80310C68: /* 80310C9C 0030CADC 38 21 00 70 */ addi r1, r1, 0x70 /* 80310CA0 0030CAE0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252816 $$252816: .incbin "baserom.dol", 0x47D4D8, 0xC @@ -206,7 +206,7 @@ $$252816: __vt__Q53scn4step7gimmick10guideboard11ActionHover: .incbin "baserom.dol", 0x47D4E4, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252801 $$252801: .incbin "baserom.dol", 0x496B20, 0x8 @@ -214,7 +214,7 @@ $$252801: $$252805: .incbin "baserom.dol", 0x496B28, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252848 $$252848: .incbin "baserom.dol", 0x49D410, 0x8 diff --git a/asm/src/ActionRun.s b/asm/src/ActionRun.s index 11d84a03..2e3fdd8e 100644 --- a/asm/src/ActionRun.s +++ b/asm/src/ActionRun.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard9ActionRunFRQ53scn4step7gimmick10guideboard10GuideBoard __ct__Q53scn4step7gimmick10guideboard9ActionRunFRQ53scn4step7gimmick10guideboard10GuideBoard: /* 80310CA4 0030CAE4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -299,7 +299,7 @@ lbl_80311084: /* 803110B4 0030CEF4 38 21 00 90 */ addi r1, r1, 0x90 /* 803110B8 0030CEF8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253279 $$253279: .incbin "baserom.dol", 0x47D528, 0xC @@ -307,7 +307,7 @@ $$253279: __vt__Q53scn4step7gimmick10guideboard9ActionRun: .incbin "baserom.dol", 0x47D534, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253250 $$253250: .incbin "baserom.dol", 0x496B30, 0x8 @@ -315,7 +315,7 @@ $$253250: $$253254: .incbin "baserom.dol", 0x496B38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253344 $$253344: .incbin "baserom.dol", 0x49D418, 0x8 diff --git a/asm/src/ActionThroughLand.s b/asm/src/ActionThroughLand.s index cc7abd00..957b86ba 100644 --- a/asm/src/ActionThroughLand.s +++ b/asm/src/ActionThroughLand.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard17ActionThroughLandFRQ53scn4step7gimmick10guideboard10GuideBoard __ct__Q53scn4step7gimmick10guideboard17ActionThroughLandFRQ53scn4step7gimmick10guideboard10GuideBoard: /* 803110BC 0030CEFC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -304,7 +304,7 @@ lbl_803114B0: /* 803114E4 0030D324 38 21 00 70 */ addi r1, r1, 0x70 /* 803114E8 0030D328 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253269 $$253269: .incbin "baserom.dol", 0x47D578, 0xC @@ -312,7 +312,7 @@ $$253269: __vt__Q53scn4step7gimmick10guideboard17ActionThroughLand: .incbin "baserom.dol", 0x47D584, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253223 $$253223: .incbin "baserom.dol", 0x496B40, 0x8 @@ -320,7 +320,7 @@ $$253223: $$253236: .incbin "baserom.dol", 0x496B48, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253318 $$253318: .incbin "baserom.dol", 0x49D420, 0x8 diff --git a/asm/src/ActionVacuumSuper.s b/asm/src/ActionVacuumSuper.s index 060f1b64..e28c3413 100644 --- a/asm/src/ActionVacuumSuper.s +++ b/asm/src/ActionVacuumSuper.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFRQ53scn4step7gimmick10guideboard10GuideBoard __ct__Q53scn4step7gimmick10guideboard17ActionVacuumSuperFRQ53scn4step7gimmick10guideboard10GuideBoard: /* 803114EC 0030D32C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -298,7 +298,7 @@ lbl_803118CC: /* 80311900 0030D740 38 21 00 70 */ addi r1, r1, 0x70 /* 80311904 0030D744 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252897 $$252897: .incbin "baserom.dol", 0x47D5C8, 0xC @@ -309,7 +309,7 @@ $$252901: __vt__Q53scn4step7gimmick10guideboard17ActionVacuumSuper: .incbin "baserom.dol", 0x47D5E0, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252880 $$252880: .incbin "baserom.dol", 0x496B50, 0x8 @@ -320,7 +320,7 @@ $$252882: $$252892: .incbin "baserom.dol", 0x496B60, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252902 $$252902: .incbin "baserom.dol", 0x49D428, 0x4 diff --git a/asm/src/ActionVomit.s b/asm/src/ActionVomit.s index 71089d3d..7584c6a2 100644 --- a/asm/src/ActionVomit.s +++ b/asm/src/ActionVomit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard11ActionVomitFRQ53scn4step7gimmick10guideboard10GuideBoard __ct__Q53scn4step7gimmick10guideboard11ActionVomitFRQ53scn4step7gimmick10guideboard10GuideBoard: /* 80311908 0030D748 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -323,7 +323,7 @@ lbl_80311D4C: /* 80311D80 0030DBC0 38 21 00 70 */ addi r1, r1, 0x70 /* 80311D84 0030DBC4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252912 $$252912: .incbin "baserom.dol", 0x47D628, 0xC @@ -334,7 +334,7 @@ $$252932: __vt__Q53scn4step7gimmick10guideboard11ActionVomit: .incbin "baserom.dol", 0x47D640, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252894 $$252894: .incbin "baserom.dol", 0x496B68, 0x8 diff --git a/asm/src/Actor.s b/asm/src/Actor.s index 6556627a..4755f568 100644 --- a/asm/src/Actor.s +++ b/asm/src/Actor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25mcoll5ActorFRQ25mcoll11LandManagerRCQ35mcoll6detail19ActorDiamondContext __ct__Q25mcoll5ActorFRQ25mcoll11LandManagerRCQ35mcoll6detail19ActorDiamondContext: /* 801B13B0 001AD1F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -235,7 +235,7 @@ shapeContext__Q25mcoll5ActorCFv: /* 801B16D0 001AD510 38 21 00 10 */ addi r1, r1, 0x10 /* 801B16D4 001AD514 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ostop5ActorFRQ25ostop7ManagerUl __ct__Q25ostop5ActorFRQ25ostop7ManagerUl: /* 801D98A4 001D56E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -464,7 +464,7 @@ lbl_801D9B8C: /* 801D9B9C 001D59DC 38 21 00 20 */ addi r1, r1, 0x20 /* 801D9BA0 001D59E0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5ostop5ActorFRQ43scn4step5ostop7ManagerQ43scn4step5ostop4Flag __ct__Q43scn4step5ostop5ActorFRQ43scn4step5ostop7ManagerQ43scn4step5ostop4Flag: /* 803CABBC 003C69FC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/ActorDetectOption.s b/asm/src/ActorDetectOption.s index b5616f22..08ee64a4 100644 --- a/asm/src/ActorDetectOption.s +++ b/asm/src/ActorDetectOption.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail17ActorDetectOptionFv __ct__Q35mcoll6detail17ActorDetectOptionFv: /* 801B27E8 001AE628 38 00 00 00 */ li r0, 0 diff --git a/asm/src/ActorDiamond.s b/asm/src/ActorDiamond.s index 85e6eefa..84d8ec29 100644 --- a/asm/src/ActorDiamond.s +++ b/asm/src/ActorDiamond.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_earlyCollidedInfo__Q35mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$2FRCQ35mcoll6detail21CollidedDetectionInfoRCQ35mcoll6detail21CollidedDetectionInfo t_earlyCollidedInfo__Q35mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$2FRCQ35mcoll6detail21CollidedDetectionInfoRCQ35mcoll6detail21CollidedDetectionInfo: /* 801B287C 001AE6BC 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -4235,17 +4235,17 @@ isSpine__Q35mcoll6detail12LandGridDataCFv: /* 801B6528 001B2368 7C 60 19 10 */ subfe r3, r0, r3 /* 801B652C 001B236C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BELTCONVEYOR_SPEED__Q35mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$2 T_BELTCONVEYOR_SPEED__Q35mcoll6detail26$$2unnamed$$2ActorDiamond_cpp$$2: .incbin "baserom.dol", 0x410D30, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q35mcoll6detail12ActorDiamond __vt__Q35mcoll6detail12ActorDiamond: .incbin "baserom.dol", 0x454178, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253991 $$253991: .incbin "baserom.dol", 0x4935E0, 0x4 @@ -4319,7 +4319,7 @@ $$254030: $$254031: .incbin "baserom.dol", 0x49363C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259613 $$259613: .incbin "baserom.dol", 0x49A530, 0x4 diff --git a/asm/src/ActorDiamondContext.s b/asm/src/ActorDiamondContext.s index a3d5de5b..716a54be 100644 --- a/asm/src/ActorDiamondContext.s +++ b/asm/src/ActorDiamondContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail19ActorDiamondContextFRCQ33hel4math7Vector2RCQ35mcoll6detail19ShapeDiamondContext __ct__Q35mcoll6detail19ActorDiamondContextFRCQ33hel4math7Vector2RCQ35mcoll6detail19ShapeDiamondContext: /* 801B6530 001B2370 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/ActorInfo.s b/asm/src/ActorInfo.s index 61dbcc75..09cb93ff 100644 --- a/asm/src/ActorInfo.s +++ b/asm/src/ActorInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail9ActorInfoFv __ct__Q35mcoll6detail9ActorInfoFv: /* 801B65A8 001B23E8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/AddOnCast.s b/asm/src/AddOnCast.s index 2081adbe..79ed8645 100644 --- a/asm/src/AddOnCast.s +++ b/asm/src/AddOnCast.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_I2F__Q33hel4mint23$$2unnamed$$2AddOnCast_cpp$$2Fi t_I2F__Q33hel4mint23$$2unnamed$$2AddOnCast_cpp$$2Fi: /* 801A0D9C 0019CBDC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -107,7 +107,7 @@ lbl_801A0EE8: /* 801A0EF8 0019CD38 38 21 00 10 */ addi r1, r1, 0x10 /* 801A0EFC 0019CD3C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252192 $$252192: .incbin "baserom.dol", 0x452AE0, 0xC @@ -118,7 +118,7 @@ $$252193: $$252194: .incbin "baserom.dol", 0x452AFC, 0x64 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252188 $$252188: .incbin "baserom.dol", 0x49A420, 0x8 diff --git a/asm/src/AddOnMathDirection3.s b/asm/src/AddOnMathDirection3.s index eef118a4..2ad1a596 100644 --- a/asm/src/AddOnMathDirection3.s +++ b/asm/src/AddOnMathDirection3.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q33hel4mint33$$2unnamed$$2AddOnMathDirection3_cpp$$2Fv t_obj__Q33hel4mint33$$2unnamed$$2AddOnMathDirection3_cpp$$2Fv: /* 801A0F00 0019CD40 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -960,7 +960,7 @@ Basis__Q33hel4mint19AddOnMathDirection3Fv: Create__Q33hel4mint19AddOnMathDirection3FRCQ33hel4math7Vector3RCQ33hel4math7Vector3RCQ33hel4math7Vector3: /* 801A1B18 0019D958 4B FF C5 D8 */ b __ct__Q33hel4math10Direction3FRCQ33hel4math7Vector3RCQ33hel4math7Vector3RCQ33hel4math7Vector3 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254658 $$254658: .incbin "baserom.dol", 0x452B60, 0x14 @@ -1061,7 +1061,7 @@ $$254854: $$254863: .incbin "baserom.dol", 0x452EB4, 0x84 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254659 $$254659: .incbin "baserom.dol", 0x493268, 0x8 diff --git a/asm/src/AddOnMathMath.s b/asm/src/AddOnMathMath.s index 8b04f7e9..281b321f 100644 --- a/asm/src/AddOnMathMath.s +++ b/asm/src/AddOnMathMath.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SinRadF__Q33hel4mint27$$2unnamed$$2AddOnMathMath_cpp$$2Ff t_SinRadF__Q33hel4mint27$$2unnamed$$2AddOnMathMath_cpp$$2Ff: /* 801A1B1C 0019D95C 4B FF 3A 3C */ b SinF__Q33hel4math4MathFf @@ -221,7 +221,7 @@ Func__Q43hel4mint13AddOnMathMath37Mint_SinRadF_0$52440AddOnMathMath_cppFRQ26mint /* 801A1DAC 0019DBEC 38 63 1B 1C */ addi r3, r3, t_SinRadF__Q33hel4mint27$$2unnamed$$2AddOnMathMath_cpp$$2Ff@l /* 801A1DB0 0019DBF0 4B FF FF 44 */ b mintCallWrappedFunc$$0f$$4f$$1__FPFf_fPQ26mintvm13MintFuncProxy_v -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252822 $$252822: .incbin "baserom.dol", 0x452F38, 0x10 @@ -247,7 +247,7 @@ $$252828: $$252829: .incbin "baserom.dol", 0x452FD8, 0x68 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252792 $$252792: .incbin "baserom.dol", 0x49A428, 0x4 diff --git a/asm/src/AddOnMathVector3.s b/asm/src/AddOnMathVector3.s index 41204923..48287cc8 100644 --- a/asm/src/AddOnMathVector3.s +++ b/asm/src/AddOnMathVector3.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q33hel4mint30$$2unnamed$$2AddOnMathVector3_cpp$$2Fv t_obj__Q33hel4mint30$$2unnamed$$2AddOnMathVector3_cpp$$2Fv: /* 801A1DB4 0019DBF4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -329,7 +329,7 @@ SlotSub__Q33hel4mint16AddOnMathVector3FUl: /* 801A21F4 0019E034 38 21 00 10 */ addi r1, r1, 0x10 /* 801A21F8 0019E038 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253590 $$253590: .incbin "baserom.dol", 0x49A440, 0x8 diff --git a/asm/src/AddOnMint.s b/asm/src/AddOnMint.s index a6ae21aa..48bd9adf 100644 --- a/asm/src/AddOnMint.s +++ b/asm/src/AddOnMint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q23app9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q23app9AddOnMintFRQ26mintvm6VMCore: /* 80174CB8 00170AF8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -17,7 +17,7 @@ RegisterAll__Q23app9AddOnMintFRQ26mintvm6VMCore: /* 80174CE4 00170B24 38 21 00 10 */ addi r1, r1, 0x10 /* 80174CE8 00170B28 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q23g3d9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q23g3d9AddOnMintFRQ26mintvm6VMCore: /* 8018B6A8 001874E8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -207,7 +207,7 @@ Func__Q33g3d9AddOnMint41Mint_LoadWorldRotate_0$51898AddOnMint_cppFRQ26mintvm13Mi Func__Q33g3d9AddOnMint40Mint_LoadWorldTrans_0$51896AddOnMint_cppFRQ26mintvm13MintFuncProxy: /* 8018B90C 0018774C 48 00 31 30 */ b LoadWorldTrans__Q23g3d16MintNodeAccessorFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q24gobj9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q24gobj9AddOnMintFRQ26mintvm6VMCore: /* 80197EF4 00193D34 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1777,7 +1777,7 @@ Func__Q34gobj9AddOnMint31Mint_Start_0$53466AddOnMint_cppFRQ26mintvm13MintFuncPro /* 8019931C 0019515C 38 63 AB D8 */ addi r3, r3, Start__Q24gobj8MintAnimFUl@l /* 80199320 00195160 4B FF F4 CC */ b mintCallWrappedFunc$$0Ul$$1__FPFUl_vPQ26mintvm13MintFuncProxy_v -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q33scn4step9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q33scn4step9AddOnMintFRQ26mintvm6VMCore: /* 8021CCC8 00218B08 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1810,7 +1810,7 @@ RegisterAll__Q33scn4step9AddOnMintFRQ26mintvm6VMCore: /* 8021CD34 00218B74 38 21 00 10 */ addi r1, r1, 0x10 /* 8021CD38 00218B78 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Effect_BindSuper__Q43scn4step4boss23$$2unnamed$$2AddOnMint_cpp$$2Fv t_Effect_BindSuper__Q43scn4step4boss23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80227A14 00223854 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3442,7 +3442,7 @@ Func__Q53scn4step4boss9AddOnMint36Mint_BindNormal_0$56519AddOnMint_cppFRQ26mintv Func__Q53scn4step4boss9AddOnMint35Mint_BindSuper_0$56517AddOnMint_cppFRQ26mintvm13MintFuncProxy: /* 80228EDC 00224D1C 4B FF EB 38 */ b t_Effect_BindSuper__Q43scn4step4boss23$$2unnamed$$2AddOnMint_cpp$$2Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_AttackHammer__Q53scn4step4boss7bonkers23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_AttackHammer__Q53scn4step4boss7bonkers23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802366BC 002324FC 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -4413,7 +4413,7 @@ __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers9Sta __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers18StateRainBombStart$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv: /* 802373A0 002331E0 4B FF 73 00 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_custom__Q53scn4step4boss15challengemaster23$$2unnamed$$2AddOnMint_cpp$$2Fv t_custom__Q53scn4step4boss15challengemaster23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80239B20 00235960 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -4665,7 +4665,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challeng __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1Fv: /* 80239E2C 00235C6C 4B FF 48 74 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Call__Q53scn4step4boss6dubior23$$2unnamed$$2AddOnMint_cpp$$2Fi t_SetNextState_Call__Q53scn4step4boss6dubior23$$2unnamed$$2AddOnMint_cpp$$2Fi: /* 8024C390 002481D0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -5158,7 +5158,7 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior21Sta __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateShot$$4PQ43scn4step4boss4Boss$$4f$$1Fv: /* 8024C990 002487D0 4B FE 1D 10 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack1__Q53scn4step4boss10gigantedge23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack1__Q53scn4step4boss10gigantedge23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80250EA0 0024CCE0 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -6082,7 +6082,7 @@ __dt__Q24util140StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10gigantedge __dt__Q24util228StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common20StateJumpAttackStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$4Q53scn4step4boss10gigantedge10ScriptKind$$1Fv: /* 80251B40 0024D980 4B FD CB 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step4boss8kingsdoo23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step4boss8kingsdoo23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80252800 0024E640 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -7043,7 +7043,7 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo22S __dt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo17StateChargeAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss8kingsdoo17StateChargeAttack6Config$$1Fv: /* 802534E0 0024F320 4B FD B1 C0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_MoveStart__Q53scn4step4boss9moundeath23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_MoveStart__Q53scn4step4boss9moundeath23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802549C8 00250808 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -8008,7 +8008,7 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16StateTornadoRise$$4PQ43scn4step4boss4Boss$$1Fv: /* 80255638 00251478 4B FD 90 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_custom__Q53scn4step4boss13watergalboros23$$2unnamed$$2AddOnMint_cpp$$2Fv t_custom__Q53scn4step4boss13watergalboros23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80258964 002547A4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -8960,7 +8960,7 @@ __dt__Q24util260StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros18StateCaptureAttack$$4PQ43scn4step4boss4Boss$$1Fv: /* 80259630 00255470 4B FD 50 70 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_custom__Q53scn4step4boss6whispy23$$2unnamed$$2AddOnMint_cpp$$2Fv t_custom__Q53scn4step4boss6whispy23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 8025B0A0 00256EE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -9619,7 +9619,7 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy16Stat __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy15StateRootAttack$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025B8EC 0025772C 4B FD 2D B4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_MoveStart__Q53scn4step4boss9zankibble23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_MoveStart__Q53scn4step4boss9zankibble23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 8025F540 0025B380 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -10661,7 +10661,7 @@ __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble20 __dt__Q24util212StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv: /* 80260384 0025C1C4 4B FC E3 1C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_CameraController_ReqQuake__Q43scn4step6camera23$$2unnamed$$2AddOnMint_cpp$$2Fi t_CameraController_ReqQuake__Q43scn4step6camera23$$2unnamed$$2AddOnMint_cpp$$2Fi: /* 80261F8C 0025DDCC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -10772,7 +10772,7 @@ Func__Q53scn4step6camera9AddOnMint34Mint_ReqQuake_0$53080AddOnMint_cppFRQ26mintv /* 802620E8 0025DF28 38 63 1F 8C */ addi r3, r3, t_CameraController_ReqQuake__Q43scn4step6camera23$$2unnamed$$2AddOnMint_cpp$$2Fi@l /* 802620EC 0025DF2C 4B F3 67 00 */ b mintCallWrappedFunc$$0Ul$$1__FPFUl_vPQ26mintvm13MintFuncProxy_v -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q43scn4step5chara9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q43scn4step5chara9AddOnMintFRQ26mintvm6VMCore: /* 8026A144 00265F84 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -13521,7 +13521,7 @@ requestP__Q43scn4step5chara10MintEffectCFQ43scn4step6effect4KindRCQ33hel4math7Ve /* 8026C634 00268474 80 63 00 00 */ lwz r3, 0(r3) /* 8026C638 00268478 48 00 19 20 */ b requestP__Q43scn4step5chara6EffectFQ43scn4step6effect4KindRCQ33hel4math7Vector3 -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q43scn4step4core9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q43scn4step4core9AddOnMintFRQ26mintvm6VMCore: /* 802739E0 0026F820 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -13668,7 +13668,7 @@ Func__Q53scn4step4core9AddOnMint33Mint_Request_0$51904AddOnMint_cppFRQ26mintvm13 /* 80273BC0 0026FA00 38 21 00 20 */ addi r1, r1, 0x20 /* 80273BC4 0026FA04 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Effect_BindNormal__Q43scn4step5enemy23$$2unnamed$$2AddOnMint_cpp$$2Fv t_Effect_BindNormal__Q43scn4step5enemy23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 8027E2FC 0027A13C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -14549,7 +14549,7 @@ Func__Q53scn4step5enemy9AddOnMint35Mint_BindState_0$55718AddOnMint_cppFRQ26mintv Func__Q53scn4step5enemy9AddOnMint36Mint_BindNormal_0$55716AddOnMint_cppFRQ26mintvm13MintFuncProxy: /* 8027EE10 0027AC50 4B FF F4 EC */ b t_Effect_BindNormal__Q43scn4step5enemy23$$2unnamed$$2AddOnMint_cpp$$2Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Wait__Q53scn4step5enemy6common23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Wait__Q53scn4step5enemy6common23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80290B18 0028C958 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -14908,7 +14908,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15Sta __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80290F8C 0028CDCC 4B F9 D7 14 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_GetFrameRate__Q53scn4step5enemy8armordee23$$2unnamed$$2AddOnMint_cpp$$2Fv t_GetFrameRate__Q53scn4step5enemy8armordee23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802960E0 00291F20 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -15013,7 +15013,7 @@ lbl_80296220: /* 8029622C 0029206C 38 21 00 10 */ addi r1, r1, 0x10 /* 80296230 00292070 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step5enemy11bladeknight23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step5enemy11bladeknight23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80296978 002927B8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -15310,7 +15310,7 @@ __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknig __dt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80296D04 00292B44 4B F9 79 9C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q53scn4step5enemy7blipper9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q53scn4step5enemy7blipper9AddOnMintFRQ26mintvm6VMCore: /* 80298498 002942D8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -15775,7 +15775,7 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9Sta __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80298A28 00294868 4B F9 5C 78 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Custom_SetSpeedH__Q53scn4step5enemy6bouncy23$$2unnamed$$2AddOnMint_cpp$$2Ff t_Custom_SetSpeedH__Q53scn4step5enemy6bouncy23$$2unnamed$$2AddOnMint_cpp$$2Ff: /* 8029C848 00298688 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -16020,7 +16020,7 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12Sta __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029CB3C 0029897C 4B F9 1B 64 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step5enemy5bowby23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step5enemy5bowby23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 8029DFDC 00299E1C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -16218,7 +16218,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11St __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029E240 0029A080 4B F9 04 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Custom_IsHitFloor__Q53scn4step5enemy10brontoburt23$$2unnamed$$2AddOnMint_cpp$$2Fv t_Custom_IsHitFloor__Q53scn4step5enemy10brontoburt23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 8029EC18 0029AA58 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -16293,7 +16293,7 @@ Func__Q63scn4step5enemy10brontoburt9AddOnMint36Mint_IsHitFloor_0$53960AddOnMint_ /* 8029ECFC 0029AB3C 38 63 EC 18 */ addi r3, r3, t_Custom_IsHitFloor__Q53scn4step5enemy10brontoburt23$$2unnamed$$2AddOnMint_cpp$$2Fv@l /* 8029ED00 0029AB40 4B EF 99 18 */ b mintCallWrappedFunc$$0b$$1__FPFv_bPQ26mintvm13MintFuncProxy_v -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q53scn4step5enemy11broomhatter9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q53scn4step5enemy11broomhatter9AddOnMintFRQ26mintvm6VMCore: /* 802A090C 0029C74C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -16520,7 +16520,7 @@ __dt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatt __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A0BCC 0029CA0C 4B F8 DA D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_custom__Q53scn4step5enemy5cappy23$$2unnamed$$2AddOnMint_cpp$$2Fv t_custom__Q53scn4step5enemy5cappy23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802A2104 0029DF44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -16759,7 +16759,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11St __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A2404 0029E244 4B F8 C2 9C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q53scn4step5enemy6chilly9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q53scn4step5enemy6chilly9AddOnMintFRQ26mintvm6VMCore: /* 802A5C7C 002A1ABC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -17020,7 +17020,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15Sta __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A5F94 002A1DD4 4B F8 87 0C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Dive__Q53scn4step5enemy4como23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Dive__Q53scn4step5enemy4como23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802A6BD0 002A2A10 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -17083,7 +17083,7 @@ create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9Stat __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A6C84 002A2AC4 4B F8 7A 1C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Chase__Q53scn4step5enemy6degout23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Chase__Q53scn4step5enemy6degout23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802ACD04 002A8B44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -17258,7 +17258,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10S __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802ACF38 002A8D78 4B F8 17 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Fly__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2AddOnMint_cpp$$2Ff t_SetNextState_Fly__Q53scn4step5enemy8dubiorjr23$$2unnamed$$2AddOnMint_cpp$$2Ff: /* 802ADB38 002A9978 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -17546,7 +17546,7 @@ __dt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9St __dt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9StateBack$$4PQ43scn4step5enemy5Enemy$$4f$$1Fv: /* 802ADEE4 002A9D24 4B F8 07 BC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Custom_SetViewOffset__Q53scn4step5enemy4elec23$$2unnamed$$2AddOnMint_cpp$$2Fff t_Custom_SetViewOffset__Q53scn4step5enemy4elec23$$2unnamed$$2AddOnMint_cpp$$2Fff: /* 802AF168 002AAFA8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -17731,7 +17731,7 @@ Func__Q63scn4step5enemy4elec9AddOnMint39Mint_SetViewOffset_0$56476AddOnMint_cppF /* 802AF3EC 002AB22C 38 21 00 10 */ addi r1, r1, 0x10 /* 802AF3F0 002AB230 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_ChaseOrAgony__Q53scn4step5enemy6flamer23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_ChaseOrAgony__Q53scn4step5enemy6flamer23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802B125C 002AD09C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -18482,7 +18482,7 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12Sta __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6flamer12StateMoveCWR$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B1BBC 002AD9FC 4B F7 CA E4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Fly__Q53scn4step5enemy5gemra23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Fly__Q53scn4step5enemy5gemra23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802B54FC 002B133C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -18611,7 +18611,7 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8State __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B5684 002B14C4 4B F7 90 1C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step5enemy7gigatzo23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step5enemy7gigatzo23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802B6624 002B2464 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -18907,7 +18907,7 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11St __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B69C0 002B2800 4B F7 7C E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_AttackBreath__Q53scn4step5enemy7hothead23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_AttackBreath__Q53scn4step5enemy7hothead23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802B9DB4 002B5BF4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -19176,7 +19176,7 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17S __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15StateAttackShot$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802BA0FC 002B5F3C 4B F7 45 A4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step5enemy6juckle23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step5enemy6juckle23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802BAE48 002B6C88 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -19405,7 +19405,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11Sta __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateFollow$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802BB120 002B6F60 4B F7 35 80 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Jump__Q53scn4step5enemy4kabu23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Jump__Q53scn4step5enemy4kabu23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802BC190 002B7FD0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -19746,7 +19746,7 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu15State __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802BC5C0 002B8400 4B F7 20 E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Walk__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Walk__Q53scn4step5enemy10knucklejoe23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802BEC5C 002BAA9C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -20081,7 +20081,7 @@ __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejo __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802BF09C 002BAEDC 4B F6 F6 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Wait__Q53scn4step5enemy6lanzer23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Wait__Q53scn4step5enemy6lanzer23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802C1740 002BD580 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -20384,7 +20384,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer15Sta __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C1B00 002BD940 4B F6 CB A0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Jump__Q53scn4step5enemy6leafan23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Jump__Q53scn4step5enemy6leafan23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802C3270 002BF0B0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -20513,7 +20513,7 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9Stat __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C33F8 002BF238 4B F6 B2 A8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Chase__Q53scn4step5enemy7mumbies23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Chase__Q53scn4step5enemy7mumbies23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802C4C34 002C0A74 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -20576,7 +20576,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C4CE8 002C0B28 4B F6 99 B8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Walk__Q53scn4step5enemy5noddy23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Walk__Q53scn4step5enemy5noddy23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802C70EC 002C2F2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -20639,7 +20639,7 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9Sta __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C71A0 002C2FE0 4B F6 75 00 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Walk__Q53scn4step5enemy5nruff23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Walk__Q53scn4step5enemy5nruff23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802C74F0 002C3330 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -20848,7 +20848,7 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9State __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C776C 002C35AC 4B F6 6F 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step5enemy6owgulf23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step5enemy6owgulf23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802C97F0 002C5630 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -21086,7 +21086,7 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf16St __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateFlyWaitFix$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C9AC8 002C5908 4B F6 4B D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Custom_SetWaitTime__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2AddOnMint_cpp$$2Fv t_Custom_SetWaitTime__Q53scn4step5enemy10poppybrojr23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802D11F4 002CD034 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21367,7 +21367,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D1568 002CD3A8 4B F5 D1 38 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_WalkStart__Q53scn4step5enemy5rocky23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_WalkStart__Q53scn4step5enemy5rocky23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802D33F8 002CF238 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -21538,7 +21538,7 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14Stat __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateStay$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D360C 002CF44C 4B F5 B0 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_IsAnger__Q53scn4step5enemy6scarfy23$$2unnamed$$2AddOnMint_cpp$$2Fv t_IsAnger__Q53scn4step5enemy6scarfy23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802D9268 002D50A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21713,7 +21713,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11S __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D949C 002D52DC 4B F5 52 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Dash__Q53scn4step5enemy5sheld23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Dash__Q53scn4step5enemy5sheld23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802DC558 002D8398 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -21954,7 +21954,7 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld11Stat __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DC838 002D8678 4B F5 1E 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Custom_IsPlayerInAimArea__Q53scn4step5enemy6shotzo23$$2unnamed$$2AddOnMint_cpp$$2Fv t_Custom_IsPlayerInAimArea__Q53scn4step5enemy6shotzo23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802DFAE0 002DB920 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -22181,7 +22181,7 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8Stat __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DFD9C 002DBBDC 4B F4 E9 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step5enemy9sirkibble23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step5enemy9sirkibble23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802E0EF0 002DCD30 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -22432,7 +22432,7 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E11F4 002DD034 4B F4 D4 AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_JumpStart__Q53scn4step5enemy11sisterbound23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_JumpStart__Q53scn4step5enemy11sisterbound23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802E22C4 002DE104 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -22661,7 +22661,7 @@ __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbou __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E259C 002DE3DC 4B F4 C1 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Wait__Q53scn4step5enemy6sodory23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Wait__Q53scn4step5enemy6sodory23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802E42EC 002E012C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -23077,7 +23077,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory11Sta __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory17StateGroundAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E480C 002E064C 4B F4 9E 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Jump__Q53scn4step5enemy6sparky23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Jump__Q53scn4step5enemy6sparky23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802E6A60 002E28A0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -23206,7 +23206,7 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9Stat __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E6BE8 002E2A28 4B F4 7A B8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Jump__Q53scn4step5enemy9tsukikage23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Jump__Q53scn4step5enemy9tsukikage23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802E9D54 002E5B94 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -23767,7 +23767,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9S __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateWall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EA414 002E6254 4B F4 42 8C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_GrandLowperEscape__Q53scn4step5enemy9waddledee23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_GrandLowperEscape__Q53scn4step5enemy9waddledee23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802ED0E4 002E8F24 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -23850,7 +23850,7 @@ create__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddlede __dt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802ED1DC 002E901C 4B F4 14 C4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Jump__Q53scn4step5enemy9waddledoo23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Jump__Q53scn4step5enemy9waddledoo23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802EF7CC 002EB60C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -23979,7 +23979,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9S __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EF954 002EB794 4B F3 ED 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step5enemy10watergalbo23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step5enemy10watergalbo23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802EFFA8 002EBDE8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -24042,7 +24042,7 @@ create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10waterga __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802F005C 002EBE9C 4B F3 E6 44 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SetNextState_Attack__Q53scn4step5enemy6whippy23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SetNextState_Attack__Q53scn4step5enemy6whippy23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802F0680 002EC4C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -24105,7 +24105,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11S __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802F0734 002EC574 4B F3 DF 6C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q43scn4step7gimmick9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q43scn4step7gimmick9AddOnMintFRQ26mintvm6VMCore: /* 802F395C 002EF79C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -24126,7 +24126,7 @@ RegisterAll__Q43scn4step7gimmick9AddOnMintFRQ26mintvm6VMCore: /* 802F3998 002EF7D8 38 21 00 10 */ addi r1, r1, 0x10 /* 802F399C 002EF7DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SoundSE_BindNormal__Q53scn4step7gimmick11areamapdemo23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SoundSE_BindNormal__Q53scn4step7gimmick11areamapdemo23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 802F99E4 002F5824 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -25006,7 +25006,7 @@ Func__Q63scn4step7gimmick11areamapdemo9AddOnMint36Mint_UnpauseBGM_0$54914AddOnMi Func__Q63scn4step7gimmick11areamapdemo9AddOnMint36Mint_BindNormal_0$54912AddOnMint_cppFRQ26mintvm13MintFuncProxy: /* 802FA444 002F6284 4B FF F5 A0 */ b t_SoundSE_BindNormal__Q53scn4step7gimmick11areamapdemo23$$2unnamed$$2AddOnMint_cpp$$2Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_SoundSE_BindNormal__Q53scn4step7gimmick13challengedoor23$$2unnamed$$2AddOnMint_cpp$$2Fv t_SoundSE_BindNormal__Q53scn4step7gimmick13challengedoor23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80305AFC 0030193C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -25769,7 +25769,7 @@ Func__Q63scn4step7gimmick13challengedoor9AddOnMint33Mint_FadeOut_0$55581AddOnMin Func__Q63scn4step7gimmick13challengedoor9AddOnMint36Mint_BindNormal_0$55579AddOnMint_cppFRQ26mintvm13MintFuncProxy: /* 80306474 003022B4 4B FF F6 88 */ b t_SoundSE_BindNormal__Q53scn4step7gimmick13challengedoor23$$2unnamed$$2AddOnMint_cpp$$2Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_seReq__Q53scn4step7gimmick7monitor23$$2unnamed$$2AddOnMint_cpp$$2Fv t_seReq__Q53scn4step7gimmick7monitor23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 80319278 003150B8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -25896,7 +25896,7 @@ Func__Q63scn4step7gimmick7monitor9AddOnMint35Mint_ViewNoise_0$54784AddOnMint_cpp Func__Q63scn4step7gimmick7monitor9AddOnMint31Mint_SeReq_0$54782AddOnMint_cppFRQ26mintvm13MintFuncProxy: /* 803193E8 00315228 4B FF FE 90 */ b t_seReq__Q53scn4step7gimmick7monitor23$$2unnamed$$2AddOnMint_cpp$$2Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_cCtrl_SeenPhoto__Q53scn4step7gimmick9shipevent23$$2unnamed$$2AddOnMint_cpp$$2Fv t_cCtrl_SeenPhoto__Q53scn4step7gimmick9shipevent23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 8031E3E8 0031A228 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -27120,7 +27120,7 @@ Func__Q63scn4step7gimmick9shipevent9AddOnMint44Mint_CCtrl_SeenTalkZoom_0$56766Ad Func__Q63scn4step7gimmick9shipevent9AddOnMint41Mint_CCtrl_SeenPhoto_0$56764AddOnMint_cppFRQ26mintvm13MintFuncProxy: /* 8031F210 0031B050 4B FF F1 D8 */ b t_cCtrl_SeenPhoto__Q53scn4step7gimmick9shipevent23$$2unnamed$$2AddOnMint_cpp$$2Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Effect_BindNormal__Q43scn4step4hero23$$2unnamed$$2AddOnMint_cpp$$2Fv t_Effect_BindNormal__Q43scn4step4hero23$$2unnamed$$2AddOnMint_cpp$$2Fv: /* 8032DF04 00329D44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -30224,7 +30224,7 @@ Func__Q53scn4step4hero9AddOnMint40Mint_BindNormalWarp_0$56583AddOnMint_cppFRQ26m Func__Q53scn4step4hero9AddOnMint36Mint_BindNormal_0$56581AddOnMint_cppFRQ26mintvm13MintFuncProxy: /* 80330564 0032C3A4 4B FF D9 A0 */ b t_Effect_BindNormal__Q43scn4step4hero23$$2unnamed$$2AddOnMint_cpp$$2Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_AttackData_Register__Q43scn4step5ocoll23$$2unnamed$$2AddOnMint_cpp$$2Fiiiiiffffiii t_AttackData_Register__Q43scn4step5ocoll23$$2unnamed$$2AddOnMint_cpp$$2Fiiiiiffffiii: /* 803CA898 003C66D8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -30381,7 +30381,7 @@ Func__Q53scn4step5ocoll9AddOnMint34Mint_Register_0$52049AddOnMint_cppFRQ26mintvm /* 803CAADC 003C691C 38 21 00 40 */ addi r1, r1, 0x40 /* 803CAAE0 003C6920 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q43scn4step3sfx9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q43scn4step3sfx9AddOnMintFRQ26mintvm6VMCore: /* 803CCAAC 003C88EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -30562,7 +30562,7 @@ Func__Q53scn4step3sfx9AddOnMint33Mint_SetBack_0$51895AddOnMint_cppFRQ26mintvm13M /* 803CCCCC 003C8B0C 38 21 00 10 */ addi r1, r1, 0x10 /* 803CCCD0 003C8B10 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q43scn4step6vacuum9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q43scn4step6vacuum9AddOnMintFRQ26mintvm6VMCore: /* 803D0E90 003CCCD0 3C 80 80 49 */ lis r4, $$252118@ha @@ -30620,7 +30620,7 @@ lbl_803D0F38: /* 803D0F44 003CCD84 38 21 00 10 */ addi r1, r1, 0x10 /* 803D0F48 003CCD88 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Utility_SendHeroSignal__Q33scn11staffcredit23$$2unnamed$$2AddOnMint_cpp$$2Fi t_Utility_SendHeroSignal__Q33scn11staffcredit23$$2unnamed$$2AddOnMint_cpp$$2Fi: /* 803F7FC8 003F3E08 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -31305,7 +31305,7 @@ Func__Q43scn11staffcredit9AddOnMint40Mint_SendHeroSignal_0$55674AddOnMint_cppFRQ /* 803F886C 003F46AC 38 63 7F C8 */ addi r3, r3, t_Utility_SendHeroSignal__Q33scn11staffcredit23$$2unnamed$$2AddOnMint_cpp$$2Fi@l /* 803F8870 003F46B0 4B D9 FF 7C */ b mintCallWrappedFunc$$0Ul$$1__FPFUl_vPQ26mintvm13MintFuncProxy_v -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterAll__Q23snd9AddOnMintFRQ26mintvm6VMCore RegisterAll__Q23snd9AddOnMintFRQ26mintvm6VMCore: /* 8040257C 003FE3BC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -31370,7 +31370,7 @@ lbl_8040262C: /* 8040264C 003FE48C 38 21 00 10 */ addi r1, r1, 0x10 /* 80402650 003FE490 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252191 $$252191: .incbin "baserom.dol", 0x450148, 0x14 @@ -31408,7 +31408,7 @@ $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1FUl$$20: $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1FUl: .incbin "baserom.dol", 0x450248, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255014 $$255014: .incbin "baserom.dol", 0x450AE0, 0x10 @@ -31620,7 +31620,7 @@ $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1CFUl$$20: $$2STRING$$2at__Q26mintvm24MArray$$0Q26mintvm6MValue$$1CFUl: .incbin "baserom.dol", 0x451098, 0x38 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257683 $$257683: .incbin "baserom.dol", 0x45FEF8, 0x18 @@ -31781,7 +31781,7 @@ $$257734: $$257735: .incbin "baserom.dol", 0x460448, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255586 $$255586: .incbin "baserom.dol", 0x460A88, 0x24 @@ -31843,7 +31843,7 @@ __vt__Q24util173StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16Sta __vt__Q24util170StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss7bonkers10ScriptKind$$1: .incbin "baserom.dol", 0x460C08, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254522 $$254522: .incbin "baserom.dol", 0x4613F0, 0x2C @@ -31872,7 +31872,7 @@ $$254529: __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSummon$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4614C8, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255073 $$255073: .incbin "baserom.dol", 0x463338, 0x24 @@ -31925,7 +31925,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior20Sta __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6dubior9StateCall$$4PQ43scn4step4boss4Boss$$4Ul$$1: .incbin "baserom.dol", 0x463460, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254625 $$254625: .incbin "baserom.dol", 0x463A10, 0x28 @@ -31975,7 +31975,7 @@ __vt__Q24util177StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16Sta __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss10gigantedge10ScriptKind$$1: .incbin "baserom.dol", 0x463B28, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255274 $$255274: .incbin "baserom.dol", 0x464150, 0x24 @@ -32037,7 +32037,7 @@ __vt__Q24util174StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16Sta __vt__Q24util171StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common11StateAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common15StateAttackDesc$$4Q53scn4step4boss8kingsdoo10ScriptKind$$1: .incbin "baserom.dol", 0x4642D8, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254406 $$254406: .incbin "baserom.dol", 0x4648E8, 0x28 @@ -32114,7 +32114,7 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath16 __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9moundeath10ScriptKind$$1: .incbin "baserom.dol", 0x464AA0, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254862 $$254862: .incbin "baserom.dol", 0x465360, 0x2C @@ -32173,7 +32173,7 @@ __vt__Q24util149StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalbo __vt__Q24util222StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6common14StateJumpStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Q53scn4step4boss13watergalboros10ScriptKind$$4Q53scn4step4boss13watergalboros10ScriptKind$$1: .incbin "baserom.dol", 0x4654E0, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254699 $$254699: .incbin "baserom.dol", 0x465C00, 0x24 @@ -32235,7 +32235,7 @@ __vt__Q24util109StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy19Sta __vt__Q24util106StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4boss6whispy16StateShotAirBall$$4PQ43scn4step4boss4Boss$$4Ul$$4Ul$$4Ul$$1: .incbin "baserom.dol", 0x465DC8, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256474 $$256474: .incbin "baserom.dol", 0x4668E8, 0x28 @@ -32288,7 +32288,7 @@ __vt__Q24util175StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16Sta __vt__Q24util178StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common14StateMoveJoint$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common18StateMoveJointDesc$$4Q53scn4step4boss9zankibble10ScriptKind$$1: .incbin "baserom.dol", 0x466A50, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253242 $$253242: .incbin "baserom.dol", 0x467140, 0x24 @@ -32305,7 +32305,7 @@ $$253245: $$253246: .incbin "baserom.dol", 0x4671B4, 0x3C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258827 $$258827: .incbin "baserom.dol", 0x467498, 0x18 @@ -32676,7 +32676,7 @@ $$259302: $$259310: .incbin "baserom.dol", 0x468700, 0x88 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252121 $$252121: .incbin "baserom.dol", 0x4687A0, 0x1C @@ -32702,7 +32702,7 @@ $$252127: $$252128: .incbin "baserom.dol", 0x468840, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256469 $$256469: .incbin "baserom.dol", 0x46C300, 0x18 @@ -32791,7 +32791,7 @@ $$256496: $$256497: .incbin "baserom.dol", 0x46C5CC, 0x74 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256079 $$256079: .incbin "baserom.dol", 0x46EE38, 0x24 @@ -32829,7 +32829,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17St __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46EF18, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254073 $$254073: .incbin "baserom.dol", 0x46F4C8, 0x20 @@ -32837,7 +32837,7 @@ $$254073: $$254074: .incbin "baserom.dol", 0x46F4E8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255899 $$255899: .incbin "baserom.dol", 0x46F6B0, 0x28 @@ -32872,7 +32872,7 @@ __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknig __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46F778, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256078 $$256078: .incbin "baserom.dol", 0x46FBC8, 0x24 @@ -32925,7 +32925,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper9Sta __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46FCE0, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255833 $$255833: .incbin "baserom.dol", 0x470158, 0x24 @@ -32957,7 +32957,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy12Sta __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470228, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255839 $$255839: .incbin "baserom.dol", 0x470588, 0x24 @@ -32980,7 +32980,7 @@ $$255844: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5bowby11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470618, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254184 $$254184: .incbin "baserom.dol", 0x470860, 0x24 @@ -32991,7 +32991,7 @@ $$254185: $$254186: .incbin "baserom.dol", 0x470898, 0x78 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255719 $$255719: .incbin "baserom.dol", 0x470C58, 0x28 @@ -33017,7 +33017,7 @@ __vt__Q24util117StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatt __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470CF0, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255979 $$255979: .incbin "baserom.dol", 0x471068, 0x24 @@ -33040,7 +33040,7 @@ $$255984: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4710F8, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255881 $$255881: .incbin "baserom.dol", 0x4716D0, 0x24 @@ -33075,7 +33075,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly11Sta __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6chilly15StateCreditMove$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471798, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255521 $$255521: .incbin "baserom.dol", 0x471A70, 0x24 @@ -33086,7 +33086,7 @@ $$255522: __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateDive$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471AA0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255869 $$255869: .incbin "baserom.dol", 0x471EA0, 0x24 @@ -33103,7 +33103,7 @@ $$255872: __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471F08, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255902 $$255902: .incbin "baserom.dol", 0x4721A0, 0x28 @@ -33129,7 +33129,7 @@ __vt__Q24util98StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr9St __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8dubiorjr8StateFly$$4PQ43scn4step5enemy5Enemy$$4f$$1: .incbin "baserom.dol", 0x472238, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256662 $$256662: .incbin "baserom.dol", 0x472508, 0x20 @@ -33143,7 +33143,7 @@ $$256664: $$256665: .incbin "baserom.dol", 0x472560, 0x50 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256629 $$256629: .incbin "baserom.dol", 0x4728B0, 0x24 @@ -33214,7 +33214,7 @@ __vt__Q53scn4step5enemy6flamer12StateMoveCCW: __vt__Q53scn4step5enemy6flamer12StateMoveCWR: .incbin "baserom.dol", 0x472A94, 0x84 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255574 $$255574: .incbin "baserom.dol", 0x472FF0, 0x24 @@ -33231,7 +33231,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra11Stat __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gemra8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x473040, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255988 $$255988: .incbin "baserom.dol", 0x473238, 0x24 @@ -33263,7 +33263,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo8Sta __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x473320, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255976 $$255976: .incbin "baserom.dol", 0x4737E8, 0x24 @@ -33292,7 +33292,7 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead15S __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7hothead17StateAttackBreath$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4738B0, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255955 $$255955: .incbin "baserom.dol", 0x473B58, 0x24 @@ -33315,7 +33315,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11Sta __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6juckle11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x473BE8, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256136 $$256136: .incbin "baserom.dol", 0x473E20, 0x24 @@ -33350,7 +33350,7 @@ __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateM __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x473EF0, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256081 $$256081: .incbin "baserom.dol", 0x474358, 0x28 @@ -33382,7 +33382,7 @@ __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejo __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x474418, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255828 $$255828: .incbin "baserom.dol", 0x474B10, 0x24 @@ -33417,7 +33417,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9Stat __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6lanzer9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x474BD8, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255605 $$255605: .incbin "baserom.dol", 0x474EB0, 0x24 @@ -33434,7 +33434,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan11Sta __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x474F00, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255631 $$255631: .incbin "baserom.dol", 0x475190, 0x24 @@ -33445,7 +33445,7 @@ $$255632: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4751C8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255490 $$255490: .incbin "baserom.dol", 0x4755F0, 0x24 @@ -33456,7 +33456,7 @@ $$255491: __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5noddy9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475620, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255673 $$255673: .incbin "baserom.dol", 0x475740, 0x24 @@ -33485,7 +33485,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9State __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4757F0, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255889 $$255889: .incbin "baserom.dol", 0x475B78, 0x24 @@ -33514,7 +33514,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15Sta __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6owgulf15StateAttack3Way$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475C20, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255979 $$255979: .incbin "baserom.dol", 0x4766B0, 0x28 @@ -33543,7 +33543,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10poppybrojr10StateThrow$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476768, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255661 $$255661: .incbin "baserom.dol", 0x476BB0, 0x24 @@ -33563,7 +33563,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9State __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateWalkStart$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476C30, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255890 $$255890: .incbin "baserom.dol", 0x477350, 0x24 @@ -33580,7 +33580,7 @@ $$255893: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy11StateEscape$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4773B8, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255748 $$255748: .incbin "baserom.dol", 0x4779D0, 0x24 @@ -33609,7 +33609,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld10Stat __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateDash$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477A70, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255896 $$255896: .incbin "baserom.dol", 0x477FB0, 0x24 @@ -33635,7 +33635,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9Stat __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo8StateAim$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x478048, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255925 $$255925: .incbin "baserom.dol", 0x4782D0, 0x28 @@ -33664,7 +33664,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9S __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x478390, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255955 $$255955: .incbin "baserom.dol", 0x478730, 0x28 @@ -33687,7 +33687,7 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbou __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4787C8, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256129 $$256129: .incbin "baserom.dol", 0x478C60, 0x24 @@ -33731,7 +33731,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory15Sta __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sodory9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x478D60, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255574 $$255574: .incbin "baserom.dol", 0x479078, 0x24 @@ -33748,7 +33748,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky11Sta __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6sparky9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4790C8, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256382 $$256382: .incbin "baserom.dol", 0x4795E8, 0x28 @@ -33810,7 +33810,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage11 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479748, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255574 $$255574: .incbin "baserom.dol", 0x479B80, 0x28 @@ -33824,7 +33824,7 @@ $$255576: __vt__Q24util114StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStart$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479BE8, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255574 $$255574: .incbin "baserom.dol", 0x47A468, 0x28 @@ -33841,7 +33841,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo11 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledoo9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47A4C0, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255490 $$255490: .incbin "baserom.dol", 0x47A910, 0x28 @@ -33852,7 +33852,7 @@ $$255491: __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10watergalbo11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47A948, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255490 $$255490: .incbin "baserom.dol", 0x47AAC8, 0x24 @@ -33863,7 +33863,7 @@ $$255491: __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6whippy11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47AB00, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255444 $$255444: .incbin "baserom.dol", 0x47B130, 0x28 @@ -33973,7 +33973,7 @@ $$255478: $$255479: .incbin "baserom.dol", 0x47B5A4, 0x74 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256126 $$256126: .incbin "baserom.dol", 0x47C5E0, 0x28 @@ -34053,7 +34053,7 @@ $$256150: $$256151: .incbin "baserom.dol", 0x47C898, 0x68 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254867 $$254867: .incbin "baserom.dol", 0x47DBC0, 0x20 @@ -34073,7 +34073,7 @@ $$254871: $$254872: .incbin "baserom.dol", 0x47DC28, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257355 $$257355: .incbin "baserom.dol", 0x47DCE0, 0x24 @@ -34234,7 +34234,7 @@ $$257406: $$257407: .incbin "baserom.dol", 0x47E1C8, 0x60 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$259268 $$259268: .incbin "baserom.dol", 0x47EAE0, 0x18 @@ -34755,7 +34755,7 @@ $$259683: $$259690: .incbin "baserom.dol", 0x47FC48, 0x88 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252285 $$252285: .incbin "baserom.dol", 0x48EA88, 0x1C @@ -34763,7 +34763,7 @@ $$252285: $$252286: .incbin "baserom.dol", 0x48EAA4, 0x4C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252096 $$252096: .incbin "baserom.dol", 0x48EB30, 0x18 @@ -34810,7 +34810,7 @@ $$252109: $$252110: .incbin "baserom.dol", 0x48ECC4, 0x4C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252118 $$252118: .incbin "baserom.dol", 0x48EE90, 0x1C @@ -34818,7 +34818,7 @@ $$252118: $$252119: .incbin "baserom.dol", 0x48EEAC, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256232 $$256232: .incbin "baserom.dol", 0x491D38, 0x18 @@ -34886,7 +34886,7 @@ $$256252: $$256253: .incbin "baserom.dol", 0x491FB4, 0x6C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252053 $$252053: .incbin "baserom.dol", 0x492678, 0x10 @@ -34897,32 +34897,32 @@ $$252054: $$252055: .incbin "baserom.dol", 0x492698, 0x38 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255346 $$255346: .incbin "baserom.dol", 0x49A2B8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255473 $$255473: .incbin "baserom.dol", 0x49AF20, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255121 $$255121: .incbin "baserom.dol", 0x49B398, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254743 $$254743: .incbin "baserom.dol", 0x49B4C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256317 $$256317: .incbin "baserom.dol", 0x49B590, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256635 $$256635: .incbin "baserom.dol", 0x49C330, 0x4 @@ -34930,7 +34930,7 @@ $$256635: $$256647: .incbin "baserom.dol", 0x49C334, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256592 $$256592: .incbin "baserom.dol", 0x49C3B8, 0x4 @@ -34941,7 +34941,7 @@ $$256607: $$256627: .incbin "baserom.dol", 0x49C3C0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256059 $$256059: .incbin "baserom.dol", 0x49C6B0, 0x4 @@ -34949,7 +34949,7 @@ $$256059: $$256060: .incbin "baserom.dol", 0x49C6B4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255820 $$255820: .incbin "baserom.dol", 0x49C790, 0x4 @@ -34957,7 +34957,7 @@ $$255820: $$255821: .incbin "baserom.dol", 0x49C794, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256107 $$256107: .incbin "baserom.dol", 0x49CE60, 0x4 diff --git a/asm/src/AddWiiRemote.s b/asm/src/AddWiiRemote.s index e77c6e76..172f314d 100644 --- a/asm/src/AddWiiRemote.s +++ b/asm/src/AddWiiRemote.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info6common12AddWiiRemoteFRQ23mem10IAllocator __ct__Q34info6common12AddWiiRemoteFRQ23mem10IAllocator: /* 801A701C 001A2E5C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -979,7 +979,7 @@ setPhaseOn__Q44info6common12AddWiiRemote6RemoteFv: /* 801A7DA8 001A3BE8 38 21 00 40 */ addi r1, r1, 0x40 /* 801A7DAC 001A3BEC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252041 $$252041: .incbin "baserom.dol", 0x4533A8, 0x10 @@ -1002,7 +1002,7 @@ $$253755: $$253756: .incbin "baserom.dol", 0x453400, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_RES_PATH__Q34info6common26$$2unnamed$$2AddWiiRemote_cpp$$2 T_RES_PATH__Q34info6common26$$2unnamed$$2AddWiiRemote_cpp$$2: .incbin "baserom.dol", 0x493308, 0x4 @@ -1052,7 +1052,7 @@ $$253807: $$253810: .incbin "baserom.dol", 0x493370, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253693 $$253693: .incbin "baserom.dol", 0x49A480, 0x8 diff --git a/asm/src/AdditionalMove.s b/asm/src/AdditionalMove.s index e2f61e3d..f2c01934 100644 --- a/asm/src/AdditionalMove.s +++ b/asm/src/AdditionalMove.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero14AdditionalMoveFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero14AdditionalMoveFRQ43scn4step4hero4Hero: /* 8032CB44 00328984 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1381,12 +1381,12 @@ create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9Sta __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1Fv: /* 8032DF00 00329D40 4B F0 07 A0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x47EAD0, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260222 $$260222: .incbin "baserom.dol", 0x49D610, 0x4 diff --git a/asm/src/AirFlow.s b/asm/src/AirFlow.s index 0d8a65b9..7557277a 100644 --- a/asm/src/AirFlow.s +++ b/asm/src/AirFlow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick7airflow7AirFlowFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRQ43scn4step7gimmick21FlowEffectManager$$024$$1 __ct__Q53scn4step7gimmick7airflow7AirFlowFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRQ43scn4step7gimmick21FlowEffectManager$$024$$1: /* 802F83B8 002F41F8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1029,22 +1029,22 @@ lbl_802F9258: /* 802F9264 002F50A4 38 21 00 20 */ addi r1, r1, 0x20 /* 802F9268 002F50A8 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global DIR_ROTATION__Q53scn4step7gimmick7airflow21$$2unnamed$$2AirFlow_cpp$$2 DIR_ROTATION__Q53scn4step7gimmick7airflow21$$2unnamed$$2AirFlow_cpp$$2: .incbin "baserom.dol", 0x4157A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253529 $$253529: .incbin "baserom.dol", 0x47B0F0, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253684 $$253684: .incbin "baserom.dol", 0x4968C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253530 $$253530: .incbin "baserom.dol", 0x49D120, 0x4 diff --git a/asm/src/Alarm.s b/asm/src/Alarm.s index 35ff1ad2..5aaf6996 100644 --- a/asm/src/Alarm.s +++ b/asm/src/Alarm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_handler__19$$2unnamed$$2Alarm_cpp$$2FP7OSAlarmP9OSContext t_handler__19$$2unnamed$$2Alarm_cpp$$2FP7OSAlarmP9OSContext: /* 80405514 00401354 4E 80 00 20 */ blr @@ -127,15 +127,15 @@ __sinit_$$3Alarm_cpp: /* 804056B8 004014F8 38 21 00 10 */ addi r1, r1, 0x10 /* 804056BC 004014FC 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402628, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util5Alarm __vt__Q24util5Alarm: .incbin "baserom.dol", 0x4927E0, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248922 $$248922: .incbin "baserom.dol", 0x49EEB8, 0x8 diff --git a/asm/src/AlgorithmGrandLowperAppear.s b/asm/src/AlgorithmGrandLowperAppear.s index 8d26f3a6..58313fba 100644 --- a/asm/src/AlgorithmGrandLowperAppear.s +++ b/asm/src/AlgorithmGrandLowperAppear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9algorithm26AlgorithmGrandLowperAppearFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9algorithm26AlgorithmGrandLowperAppearFRQ43scn4step5enemy5Enemy: /* 80295F30 00291D70 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -123,7 +123,7 @@ updateHoldFrameRate__Q53scn4step5enemy9algorithm26AlgorithmGrandLowperAppearFv: /* 802960D8 00291F18 38 21 00 10 */ addi r1, r1, 0x10 /* 802960DC 00291F1C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250840 $$250840: .incbin "baserom.dol", 0x49BC90, 0x4 diff --git a/asm/src/AllStageClear.s b/asm/src/AllStageClear.s index 62c3ba2e..0ba65c90 100644 --- a/asm/src/AllStageClear.s +++ b/asm/src/AllStageClear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap13AllStageClearFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component __ct__Q53scn4step4info5lvmap13AllStageClearFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component: /* 803B9934 003B5774 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -320,7 +320,7 @@ constraintPos__Q53scn4step4info5lvmap13AllStageClearFv: /* 803B9DD4 003B5C14 38 21 00 60 */ addi r1, r1, 0x60 /* 803B9DD8 003B5C18 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253621 $$253621: .incbin "baserom.dol", 0x48CFA8, 0x10 @@ -352,7 +352,7 @@ $$253672: $$253678: .incbin "baserom.dol", 0x48D034, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253625 $$253625: .incbin "baserom.dol", 0x497E28, 0x8 @@ -363,7 +363,7 @@ $$253666: $$253691: .incbin "baserom.dol", 0x497E38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253624 $$253624: .incbin "baserom.dol", 0x49E4D0, 0x4 diff --git a/asm/src/AllocatorChanger.s b/asm/src/AllocatorChanger.s index 2e35ffdd..cf37f012 100644 --- a/asm/src/AllocatorChanger.s +++ b/asm/src/AllocatorChanger.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23lyt16AllocatorChangerFRQ23mem10IAllocator __ct__Q23lyt16AllocatorChangerFRQ23mem10IAllocator: /* 801AC0D8 001A7F18 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Angry.s b/asm/src/Angry.s index c4e495d8..cc2db59f 100644 --- a/asm/src/Angry.s +++ b/asm/src/Angry.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss5AngryFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss5AngryFRQ43scn4step4boss4Boss: /* 80228EE0 00224D20 90 83 00 00 */ stw r4, 0(r3) @@ -77,7 +77,7 @@ setChangeBrain__Q43scn4step4boss5AngryFPCc: /* 80228FCC 00224E0C 38 A0 00 80 */ li r5, 0x80 /* 80228FD0 00224E10 4B F7 49 EC */ b Strncpy__Q33hel6common9Traits$$0c$$1FPcPCcUl -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252593 $$252593: .incbin "baserom.dol", 0x49ADA0, 0x8 diff --git a/asm/src/Anim.s b/asm/src/Anim.s index b68384bf..a15055a7 100644 --- a/asm/src/Anim.s +++ b/asm/src/Anim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj4AnimFRCQ24gobj8AnimDescRQ23mem10IAllocatorRQ24gobj5ModelRQ26effect9Requestor __ct__Q24gobj4AnimFRCQ24gobj8AnimDescRQ23mem10IAllocatorRQ24gobj5ModelRQ26effect9Requestor: /* 80199324 00195164 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -452,7 +452,7 @@ mainAnim__Q24gobj4AnimCFv: /* 8019990C 0019574C 38 21 00 10 */ addi r1, r1, 0x10 /* 80199910 00195750 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252554 $$252554: .incbin "baserom.dol", 0x49A2C0, 0x8 diff --git a/asm/src/AnimController.s b/asm/src/AnimController.s index 4f2046ac..57b63762 100644 --- a/asm/src/AnimController.s +++ b/asm/src/AnimController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24util14AnimControllerFf __ct__Q24util14AnimControllerFf: /* 804056C0 00401500 D0 23 00 00 */ stfs f1, 0(r3) @@ -142,7 +142,7 @@ lbl_80405858: /* 80405864 004016A4 38 21 00 10 */ addi r1, r1, 0x10 /* 80405868 004016A8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248941 $$248941: .incbin "baserom.dol", 0x49EEC8, 0x4 diff --git a/asm/src/AnimScript.s b/asm/src/AnimScript.s index 031ef479..f387261d 100644 --- a/asm/src/AnimScript.s +++ b/asm/src/AnimScript.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248723 $$248723: .incbin "baserom.dol", 0x4510D0, 0x24 @@ -8,7 +8,7 @@ $$248723: $$248724: .incbin "baserom.dol", 0x4510F4, 0x2C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global PLAY_LOOP__Q24gobj10AnimScript PLAY_LOOP__Q24gobj10AnimScript: .incbin "baserom.dol", 0x4931E0, 0x4 diff --git a/asm/src/AppImpl.s b/asm/src/AppImpl.s index d1f35aa6..ffbac206 100644 --- a/asm/src/AppImpl.s +++ b/asm/src/AppImpl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q23scn6IScene$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q23scn6IScene$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80174CEC 00170B2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1555,7 +1555,7 @@ $$24$$2__dt__Q23app7AppImplFv: /* 80176260 001720A0 38 63 FF FC */ addi r3, r3, -4 /* 80176264 001720A4 4B FF F1 00 */ b __dt__Q23app7AppImplFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23app7AppImpl __vt__Q23app7AppImpl: .incbin "baserom.dol", 0x44EC00, 0x1C diff --git a/asm/src/App__Alert.s b/asm/src/App__Alert.s index 6e7947cf..b7853647 100644 --- a/asm/src/App__Alert.s +++ b/asm/src/App__Alert.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue10App__AlertFRQ26mintvm6VMCore AddOn__Q28mintglue10App__AlertFRQ26mintvm6VMCore: /* 801C0C5C 001BCA9C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -667,7 +667,7 @@ Func__Q38mintglue10App__Alert32Mint_Print_0$53247App__Alert_cppFRQ26mintvm13Mint /* 801C15C0 001BD400 38 21 00 10 */ addi r1, r1, 0x10 /* 801C15C4 001BD404 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253984 $$253984: .incbin "baserom.dol", 0x455F28, 0xC diff --git a/asm/src/App__Random.s b/asm/src/App__Random.s index 8f581cfc..4bb60188 100644 --- a/asm/src/App__Random.s +++ b/asm/src/App__Random.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue11App__RandomFRQ26mintvm6VMCore AddOn__Q28mintglue11App__RandomFRQ26mintvm6VMCore: /* 801C15C8 001BD408 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -194,7 +194,7 @@ lbl_801C1850: /* 801C1860 001BD6A0 38 21 00 10 */ addi r1, r1, 0x10 /* 801C1864 001BD6A4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252401 $$252401: .incbin "baserom.dol", 0x4561E8, 0xC diff --git a/asm/src/Application.s b/asm/src/Application.s index 0efb259b..1ec01b42 100644 --- a/asm/src/Application.s +++ b/asm/src/Application.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Run__Q23app11ApplicationFRQ23app6Systembbb Run__Q23app11ApplicationFRQ23app6Systembbb: /* 80176268 001720A8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/AreaLight.s b/asm/src/AreaLight.s index 34255d43..97920ba5 100644 --- a/asm/src/AreaLight.s +++ b/asm/src/AreaLight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara9AreaLightFRQ33scn4step9ComponentRCQ43scn4step5chara8Location __ct__Q43scn4step5chara9AreaLightFRQ33scn4step9ComponentRCQ43scn4step5chara8Location: /* 8026C63C 0026847C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -517,7 +517,7 @@ lbl_8026CD94: /* 8026CDAC 00268BEC 38 21 00 50 */ addi r1, r1, 0x50 /* 8026CDB0 00268BF0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252145 $$252145: .incbin "baserom.dol", 0x49B748, 0x4 diff --git a/asm/src/AreaLightInfo.s b/asm/src/AreaLightInfo.s index 694394f3..846bd8d8 100644 --- a/asm/src/AreaLightInfo.s +++ b/asm/src/AreaLightInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core13AreaLightInfoFv __ct__Q43scn4step4core13AreaLightInfoFv: /* 80273BC8 0026FA08 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -205,7 +205,7 @@ LinearInterpolation$$0Q33hel6common6ColorF$$1__Q33hel4math4MathFRCQ33hel6common6 /* 80273ECC 0026FD0C 38 21 00 70 */ addi r1, r1, 0x70 /* 80273ED0 0026FD10 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250391 $$250391: .incbin "baserom.dol", 0x49B8C0, 0x8 diff --git a/asm/src/AreaLightManager.s b/asm/src/AreaLightManager.s index 13dd0b42..179909cd 100644 --- a/asm/src/AreaLightManager.s +++ b/asm/src/AreaLightManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global lightInfo__Q43scn4step4core16AreaLightManagerCFRCQ33hel4math7Vector2 lightInfo__Q43scn4step4core16AreaLightManagerCFRCQ33hel4math7Vector2: /* 80273ED4 0026FD14 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/AreaOperation.s b/asm/src/AreaOperation.s index 8b1890bf..a3cdb21b 100644 --- a/asm/src/AreaOperation.s +++ b/asm/src/AreaOperation.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core13AreaOperationFv __ct__Q43scn4step4core13AreaOperationFv: /* 802740A4 0026FEE4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -388,7 +388,7 @@ lbl_802745CC: /* 802745DC 0027041C 38 21 00 20 */ addi r1, r1, 0x20 /* 802745E0 00270420 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250432 $$250432: .incbin "baserom.dol", 0x49B8C8, 0x8 diff --git a/asm/src/AreaSE.s b/asm/src/AreaSE.s index e875baf1..57b63439 100644 --- a/asm/src/AreaSE.s +++ b/asm/src/AreaSE.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick6arease6AreaSEFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick6arease6AreaSEFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 802FDDB8 002F9BF8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -219,12 +219,12 @@ lbl_802FE0B8: /* 802FE0C4 002F9F04 38 21 00 40 */ addi r1, r1, 0x40 /* 802FE0C8 002F9F08 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global SE_LABEL_TABLE__Q53scn4step7gimmick6arease20$$2unnamed$$2AreaSE_cpp$$2 SE_LABEL_TABLE__Q53scn4step7gimmick6arease20$$2unnamed$$2AreaSE_cpp$$2: .incbin "baserom.dol", 0x496900, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251649 $$251649: .incbin "baserom.dol", 0x49D1C8, 0x8 diff --git a/asm/src/ArenaCtrl.s b/asm/src/ArenaCtrl.s index 5d4cbfc7..1c0e3611 100644 --- a/asm/src/ArenaCtrl.s +++ b/asm/src/ArenaCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss9ArenaCtrlFRQ33scn4step9Component __ct__Q43scn4step4boss9ArenaCtrlFRQ33scn4step9Component: /* 80228FD4 00224E14 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/ArrowBoard.s b/asm/src/ArrowBoard.s index 211ebcfc..b356b1e1 100644 --- a/asm/src/ArrowBoard.s +++ b/asm/src/ArrowBoard.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10arrowboard10ArrowBoardFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick10arrowboard10ArrowBoardFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 802FE3A4 002FA1E4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -520,12 +520,12 @@ lbl_802FEAF4: /* 802FEB00 002FA940 38 21 00 10 */ addi r1, r1, 0x10 /* 802FEB04 002FA944 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$253055 $$253055: .incbin "baserom.dol", 0x4157E8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254295 $$254295: .incbin "baserom.dol", 0x47BA70, 0x18 @@ -539,7 +539,7 @@ $$254467: $$254468: .incbin "baserom.dol", 0x47BAD0, 0x50 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253051 $$253051: .incbin "baserom.dol", 0x496908, 0x8 @@ -559,7 +559,7 @@ $$254296: $$254469: .incbin "baserom.dol", 0x49692C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254369 $$254369: .incbin "baserom.dol", 0x49D1D8, 0x8 diff --git a/asm/src/Assert.s b/asm/src/Assert.s index f382cd93..c43523f0 100644 --- a/asm/src/Assert.s +++ b/asm/src/Assert.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsPointerValid__Q33hel5debug6AssertFPCv IsPointerValid__Q33hel5debug6AssertFPCv: /* 8019DE24 00199C64 54 64 00 0E */ rlwinm r4, r3, 0, 0, 7 diff --git a/asm/src/Attack.s b/asm/src/Attack.s index 49dd4542..af4b8cc5 100644 --- a/asm/src/Attack.s +++ b/asm/src/Attack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll6AttackFRQ25ocoll7ManagerRQ25ocoll5OwnerUl __ct__Q25ocoll6AttackFRQ25ocoll7ManagerRQ25ocoll5OwnerUl: /* 801D3A10 001CF850 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/AttackBallCtrl.s b/asm/src/AttackBallCtrl.s index 40d7941c..3c3a7586 100644 --- a/asm/src/AttackBallCtrl.s +++ b/asm/src/AttackBallCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q43scn4step6weapon7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q43scn4step6weapon7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80239E30 00235C70 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1171,7 +1171,7 @@ lbl_8023AE40: /* 8023AE50 00236C90 38 21 00 20 */ addi r1, r1, 0x20 /* 8023AE54 00236C94 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x461548, 0x24 @@ -1179,7 +1179,7 @@ $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q4 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1: .incbin "baserom.dol", 0x46156C, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259619 $$259619: .incbin "baserom.dol", 0x49AFA8, 0x4 diff --git a/asm/src/AttackCenter.s b/asm/src/AttackCenter.s index 12c602d0..df9b16c2 100644 --- a/asm/src/AttackCenter.s +++ b/asm/src/AttackCenter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll12AttackCenterFRQ25ocoll6Attack __ct__Q25ocoll12AttackCenterFRQ25ocoll6Attack: /* 801D450C 001D034C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/AttackFlash.s b/asm/src/AttackFlash.s index 4d91b025..89a62ed5 100644 --- a/asm/src/AttackFlash.s +++ b/asm/src/AttackFlash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss11AttackFlashFv __ct__Q43scn4step4boss11AttackFlashFv: /* 802290C0 00224F00 80 02 A2 E8 */ lwz r0, $$249397-_SDA2_BASE_(r2) @@ -133,7 +133,7 @@ setEnd__Q43scn4step4boss11AttackFlashF8_GXColor: /* 80229268 002250A8 90 03 00 04 */ stw r0, 4(r3) /* 8022926C 002250AC 4B F2 26 A8 */ b __as__8_GXColorFRC8_GXColor -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249258 $$249258: .incbin "baserom.dol", 0x4952B0, 0x4 @@ -141,7 +141,7 @@ $$249258: $$249259: .incbin "baserom.dol", 0x4952B4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249397 $$249397: .incbin "baserom.dol", 0x49ADA8, 0x4 diff --git a/asm/src/AttackLog.s b/asm/src/AttackLog.s index 10222bef..5ef21f3e 100644 --- a/asm/src/AttackLog.s +++ b/asm/src/AttackLog.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q25ocoll9AttackLogFv update__Q25ocoll9AttackLogFv: /* 801D475C 001D059C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/AttackNode.s b/asm/src/AttackNode.s index 39bb34ec..80bb99b4 100644 --- a/asm/src/AttackNode.s +++ b/asm/src/AttackNode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll10AttackNodeFRCQ25ocoll8NodeDesc __ct__Q25ocoll10AttackNodeFRCQ25ocoll8NodeDesc: /* 801D4A38 001D0878 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -232,7 +232,7 @@ lbl_801D4D78: /* 801D4D84 001D0BC4 38 21 01 D0 */ addi r1, r1, 0x1d0 /* 801D4D88 001D0BC8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252016 $$252016: .incbin "baserom.dol", 0x49A7B0, 0x8 diff --git a/asm/src/AttackResult.s b/asm/src/AttackResult.s index c077ce7a..efa9a2a1 100644 --- a/asm/src/AttackResult.s +++ b/asm/src/AttackResult.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll12AttackResultFv __ct__Q25ocoll12AttackResultFv: /* 801D4D8C 001D0BCC 38 80 00 00 */ li r4, 0 @@ -268,7 +268,7 @@ __vc__Q33hel6common45MutableArray$$0Q35ocoll12AttackResult5Datum$$410$$1FUl: /* 801D5118 001D0F58 38 21 00 10 */ addi r1, r1, 0x10 /* 801D511C 001D0F5C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250282 $$250282: .incbin "baserom.dol", 0x49A7B8, 0x8 diff --git a/asm/src/AttackResultGimmick.s b/asm/src/AttackResultGimmick.s index 181b0b82..7192c913 100644 --- a/asm/src/AttackResultGimmick.s +++ b/asm/src/AttackResultGimmick.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll19AttackResultGimmickFv __ct__Q25ocoll19AttackResultGimmickFv: /* 801D5120 001D0F60 38 80 00 00 */ li r4, 0 @@ -52,7 +52,7 @@ lbl_801D51B4: /* 801D51C4 001D1004 38 21 00 20 */ addi r1, r1, 0x20 /* 801D51C8 001D1008 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250024 $$250024: .incbin "baserom.dol", 0x49A7C0, 0x8 diff --git a/asm/src/AttackRoot.s b/asm/src/AttackRoot.s index f312f1fb..aef72c85 100644 --- a/asm/src/AttackRoot.s +++ b/asm/src/AttackRoot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll10AttackRootFRQ25ocoll6AttackUl __ct__Q25ocoll10AttackRootFRQ25ocoll6AttackUl: /* 801D51CC 001D100C 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/Attacker.s b/asm/src/Attacker.s index 5b3064d7..037ad62a 100644 --- a/asm/src/Attacker.s +++ b/asm/src/Attacker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6vacuum8AttackerFRQ25ocoll5Owner __ct__Q43scn4step6vacuum8AttackerFRQ25ocoll5Owner: /* 803D0F4C 003CCD8C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1850,7 +1850,7 @@ vacuumedPri__Q43scn4step6vacuum8AttackerCFv: /* 803D2750 003CE590 80 63 09 44 */ lwz r3, 0x944(r3) /* 803D2754 003CE594 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254544 $$254544: .incbin "baserom.dol", 0x49E810, 0x4 diff --git a/asm/src/AutoHeapExp.s b/asm/src/AutoHeapExp.s index e29a25ef..5f596f08 100644 --- a/asm/src/AutoHeapExp.s +++ b/asm/src/AutoHeapExp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem11AutoHeapExpFRQ23mem10IAllocatorUlPCc __ct__Q23mem11AutoHeapExpFRQ23mem10IAllocatorUlPCc: /* 801BD204 001B9044 94 21 FF C0 */ stwu r1, -0x40(r1) diff --git a/asm/src/AutoReqAnim.s b/asm/src/AutoReqAnim.s index 85fcb1e2..90610623 100644 --- a/asm/src/AutoReqAnim.s +++ b/asm/src/AutoReqAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d11AutoReqAnimFRCQ23g3d13ResAnmAutoReq __ct__Q23g3d11AutoReqAnimFRCQ23g3d13ResAnmAutoReq: /* 8018B910 00187750 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -173,7 +173,7 @@ headerRef__Q23g3d11AutoReqAnimCFv: /* 8018BB38 00187978 4B FF FF F1 */ bl xdata__Q23g3d11AutoReqAnimCFv /* 8018BB3C 0018797C 90 61 00 08 */ stw r3, 8(r1) /* 8018BB40 00187980 38 61 00 08 */ addi r3, r1, 8 -/* 8018BB44 00187984 4B FF B6 29 */ bl isValidData__Q25xdata5XDataCFv +/* 8018BB44 00187984 4B FF B6 29 */ bl isValidData__Q25.dataXDataCFv /* 8018BB48 00187988 2C 03 00 00 */ cmpwi r3, 0 /* 8018BB4C 0018798C 41 82 00 10 */ beq lbl_8018BB5C /* 8018BB50 00187990 80 61 00 08 */ lwz r3, 8(r1) @@ -248,7 +248,7 @@ reference__Q23g3d11AutoReqAnimCFUi: /* 8018BC20 00187A60 4B FF FF 09 */ bl xdata__Q23g3d11AutoReqAnimCFv /* 8018BC24 00187A64 90 61 00 08 */ stw r3, 8(r1) /* 8018BC28 00187A68 38 61 00 08 */ addi r3, r1, 8 -/* 8018BC2C 00187A6C 4B FF B5 41 */ bl isValidData__Q25xdata5XDataCFv +/* 8018BC2C 00187A6C 4B FF B5 41 */ bl isValidData__Q25.dataXDataCFv /* 8018BC30 00187A70 2C 03 00 00 */ cmpwi r3, 0 /* 8018BC34 00187A74 40 82 00 0C */ bne lbl_8018BC40 /* 8018BC38 00187A78 38 60 00 00 */ li r3, 0 @@ -394,7 +394,7 @@ lbl_8018BE04: /* 8018BE2C 00187C6C 38 21 00 10 */ addi r1, r1, 0x10 /* 8018BE30 00187C70 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249161 $$249161: .incbin "baserom.dol", 0x49A1A0, 0x8 diff --git a/asm/src/AutoReqAnimReqInfo.s b/asm/src/AutoReqAnimReqInfo.s index ba80e4a2..29f26aed 100644 --- a/asm/src/AutoReqAnimReqInfo.s +++ b/asm/src/AutoReqAnimReqInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d18AutoReqAnimReqInfoFv __ct__Q23g3d18AutoReqAnimReqInfoFv: /* 8018BE34 00187C74 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/AutoResetTimer.s b/asm/src/AutoResetTimer.s index 40ed9f54..f4113f66 100644 --- a/asm/src/AutoResetTimer.s +++ b/asm/src/AutoResetTimer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23app14AutoResetTimerFv __ct__Q23app14AutoResetTimerFv: /* 80176714 00172554 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/AvoidEnemyCtrl.s b/asm/src/AvoidEnemyCtrl.s index fe9fcc82..771d9515 100644 --- a/asm/src/AvoidEnemyCtrl.s +++ b/asm/src/AvoidEnemyCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster14AvoidEnemyCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster14AvoidEnemyCtrlFRQ43scn4step4boss4Boss: /* 8023AE58 00236C98 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -497,7 +497,7 @@ lbl_8023B4F8: /* 8023B508 00237348 38 21 00 10 */ addi r1, r1, 0x10 /* 8023B50C 0023734C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252973 $$252973: .incbin "baserom.dol", 0x49AFB0, 0x8 diff --git a/asm/src/BCModule.s b/asm/src/BCModule.s index 185ac240..cc29c1a8 100644 --- a/asm/src/BCModule.s +++ b/asm/src/BCModule.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isValidData__Q25mintx5XDataCFv isValidData__Q25mintx5XDataCFv: /* 801C54D0 001C1310 38 80 00 00 */ li r4, 0 diff --git a/asm/src/BCOpCode.s b/asm/src/BCOpCode.s index a064e1a1..3d4ad052 100644 --- a/asm/src/BCOpCode.s +++ b/asm/src/BCOpCode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global dump__Q26mintvm8BCOpCodeFv dump__Q26mintvm8BCOpCodeFv: /* 801C55DC 001C141C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -356,7 +356,7 @@ getOpTypeName__Q26mintvm8BCOpCodeCFQ36mintvm8BCOpCode6OpType: /* 801C5AE8 001C1928 7C 63 00 2E */ lwzx r3, r3, r0 /* 801C5AEC 001C192C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249613 $$249613: .incbin "baserom.dol", 0x457728, 0x10 @@ -442,7 +442,7 @@ $$2STRING$$2getSTI__Q26mintvm8BCOpCodeCFv$$20: $$2STRING$$2getSTI__Q26mintvm8BCOpCodeCFv: .incbin "baserom.dol", 0x457B20, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249614 $$249614: .incbin "baserom.dol", 0x4936F0, 0x8 diff --git a/asm/src/BG.s b/asm/src/BG.s index 24e07365..43d09028 100644 --- a/asm/src/BG.s +++ b/asm/src/BG.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history2BGFRQ33scn7history9ComponentRQ23g3d4Root __ct__Q33scn7history2BGFRQ33scn7history9ComponentRQ23g3d4Root: /* 80206F4C 00202D8C 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -226,7 +226,7 @@ __sinit_$$3BG_cpp: /* 80207294 002030D4 C0 62 A0 94 */ lfs f3, $$253254-_SDA2_BASE_(r2) /* 80207298 002030D8 4B EB 6E 28 */ b __ct__Q34nw4r4math4VEC3Ffff -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn9grandmenu4menu2BGFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q43scn9grandmenu4menu2BGFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803F49F8 003F0838 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -312,20 +312,20 @@ startAnim__Q43scn9grandmenu4menu2BGFv: /* 803F4B1C 003F095C 38 21 00 10 */ addi r1, r1, 0x10 /* 803F4B20 003F0960 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402454, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253189 $$253189: .incbin "baserom.dol", 0x45CDC0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251625 $$251625: .incbin "baserom.dol", 0x491890, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253190 $$253190: .incbin "baserom.dol", 0x494868, 0x8 @@ -333,7 +333,7 @@ $$253190: $$253192: .incbin "baserom.dol", 0x494870, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251626 $$251626: .incbin "baserom.dol", 0x498888, 0x4 @@ -344,7 +344,7 @@ $$251637: $$251640: .incbin "baserom.dol", 0x498894, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253191 $$253191: .incbin "baserom.dol", 0x49AB48, 0x4 diff --git a/asm/src/BGFade.s b/asm/src/BGFade.s index dd6cfcdc..60d86935 100644 --- a/asm/src/BGFade.s +++ b/asm/src/BGFade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx6BGFadeFv __ct__Q43scn4step3sfx6BGFadeFv: /* 803CCCD4 003C8B14 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/BGLayout.s b/asm/src/BGLayout.s index 8d0db581..7fb90312 100644 --- a/asm/src/BGLayout.s +++ b/asm/src/BGLayout.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle8BGLayoutFRQ33scn10grandtitle9Component __ct__Q33scn10grandtitle8BGLayoutFRQ33scn10grandtitle9Component: /* 80200874 001FC6B4 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -130,12 +130,12 @@ lbl_80200A20: /* 80200A2C 001FC86C 38 21 00 30 */ addi r1, r1, 0x30 /* 80200A30 001FC870 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251541 $$251541: .incbin "baserom.dol", 0x45C568, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251954 $$251954: .incbin "baserom.dol", 0x4946F8, 0x4 @@ -146,7 +146,7 @@ $$251993: $$251999: .incbin "baserom.dol", 0x494704, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn10grandtitle22$$2unnamed$$2BGLayout_cpp$$2 T_LYT_RES_PATH__Q33scn10grandtitle22$$2unnamed$$2BGLayout_cpp$$2: .incbin "baserom.dol", 0x49AA68, 0x8 diff --git a/asm/src/BGM.s b/asm/src/BGM.s index 1d45e3c5..dc0db6fa 100644 --- a/asm/src/BGM.s +++ b/asm/src/BGM.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Label__Q43scn7history6detail3BGMFi Label__Q43scn7history6detail3BGMFi: /* 8021124C 0020D08C 54 60 10 3A */ slwi r0, r3, 2 @@ -9,7 +9,7 @@ Label__Q43scn7history6detail3BGMFi: /* 80211258 0020D098 7C 63 00 2E */ lwzx r3, r3, r0 /* 8021125C 0020D09C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global BGM_LABEL_TABLE__Q43scn7history6detail17$$2unnamed$$2BGM_cpp$$2 BGM_LABEL_TABLE__Q43scn7history6detail17$$2unnamed$$2BGM_cpp$$2: .incbin "baserom.dol", 0x411CD0, 0x78 diff --git a/asm/src/BGMController.s b/asm/src/BGMController.s index 132cfa72..f2d77979 100644 --- a/asm/src/BGMController.s +++ b/asm/src/BGMController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core13BGMControllerFv __ct__Q43scn4step4core13BGMControllerFv: /* 802745E4 00270424 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -462,7 +462,7 @@ __ct__Q53scn4step4core13BGMController4MemoFv: /* 80274BEC 00270A2C 98 03 00 12 */ stb r0, 0x12(r3) /* 80274BF0 00270A30 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249495 $$249495: .incbin "baserom.dol", 0x495848, 0x4 @@ -470,7 +470,7 @@ $$249495: $$249496: .incbin "baserom.dol", 0x49584C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249732 $$249732: .incbin "baserom.dol", 0x49B8D0, 0x4 diff --git a/asm/src/BGMCtrl.s b/asm/src/BGMCtrl.s index fbcd39d3..9f6f1bcb 100644 --- a/asm/src/BGMCtrl.s +++ b/asm/src/BGMCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q43scn4step4boss7BGMCtrlFv update__Q43scn4step4boss7BGMCtrlFv: /* 802292C8 00225108 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/BGModel.s b/asm/src/BGModel.s index e1135cac..377b3b8a 100644 --- a/asm/src/BGModel.s +++ b/asm/src/BGModel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle7BGModelFRQ33scn14challengetitle9Component __ct__Q33scn14challengetitle7BGModelFRQ33scn14challengetitle9Component: /* 801EA59C 001E63DC 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -58,7 +58,7 @@ __ct__Q33scn14challengetitle7BGModelFRQ33scn14challengetitle9Component: /* 801EA66C 001E64AC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801EA670 001E64B0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle7BGModelFRQ33scn10grandtitle9Component __ct__Q33scn10grandtitle7BGModelFRQ33scn10grandtitle9Component: /* 80200A34 001FC874 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -134,17 +134,17 @@ __ct__Q33scn10grandtitle7BGModelFRQ33scn10grandtitle9Component: update__Q33scn10grandtitle7BGModelFv: /* 80200B44 001FC984 4B F9 43 58 */ b updateFrame__Q23g3d8StdModelFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251709 $$251709: .incbin "baserom.dol", 0x45ABB0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251679 $$251679: .incbin "baserom.dol", 0x45C578, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn14challengetitle21$$2unnamed$$2BGModel_cpp$$2 G3D_RES_FILE_PATH__Q33scn14challengetitle21$$2unnamed$$2BGModel_cpp$$2: .incbin "baserom.dol", 0x494090, 0x4 @@ -152,7 +152,7 @@ G3D_RES_FILE_PATH__Q33scn14challengetitle21$$2unnamed$$2BGModel_cpp$$2: $$251840: .incbin "baserom.dol", 0x494094, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle21$$2unnamed$$2BGModel_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle21$$2unnamed$$2BGModel_cpp$$2: .incbin "baserom.dol", 0x494710, 0x4 diff --git a/asm/src/BackButton.s b/asm/src/BackButton.s index 610fd80c..3b6b99ca 100644 --- a/asm/src/BackButton.s +++ b/asm/src/BackButton.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn9grandmenu4menu10BackButtonFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q43scn9grandmenu4menu10BackButtonFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803F4608 003F0448 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -288,7 +288,7 @@ isPushEnd__Q43scn9grandmenu4menu10BackButtonCFv: /* 803F49F0 003F0830 38 21 00 10 */ addi r1, r1, 0x10 /* 803F49F4 003F0834 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252290 $$252290: .incbin "baserom.dol", 0x491838, 0x10 @@ -299,7 +299,7 @@ $$252291: $$252292: .incbin "baserom.dol", 0x491854, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252293 $$252293: .incbin "baserom.dol", 0x498870, 0x8 diff --git a/asm/src/BackupData.s b/asm/src/BackupData.s index 0a4e4861..02675315 100644 --- a/asm/src/BackupData.s +++ b/asm/src/BackupData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global init__Q27storage10BackupDataFv init__Q27storage10BackupDataFv: /* 8040429C 004000DC 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/BackupFileAccessor.s b/asm/src/BackupFileAccessor.s index 86b213b9..6571cfb7 100644 --- a/asm/src/BackupFileAccessor.s +++ b/asm/src/BackupFileAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Save__Q23app18BackupFileAccessorFQ23app18SaveInfoLayoutKind Save__Q23app18BackupFileAccessorFQ23app18SaveInfoLayoutKind: /* 80176804 00172644 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/BackupFileData2.s b/asm/src/BackupFileData2.s index a5d3641a..b06159aa 100644 --- a/asm/src/BackupFileData2.s +++ b/asm/src/BackupFileData2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global init__Q27storage15BackupFileData2Fv init__Q27storage15BackupFileData2Fv: /* 804042FC 0040013C 38 80 00 00 */ li r4, 0 @@ -393,7 +393,7 @@ lbl_804047DC: /* 804047DC 0040061C 38 21 00 20 */ addi r1, r1, 0x20 /* 804047E0 00400620 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global UseMaster1AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2 UseMaster1AbilityTbl__Q27storage29$$2unnamed$$2BackupFileData2_cpp$$2: .incbin "baserom.dol", 0x41D0C8, 0xC diff --git a/asm/src/Barrier.s b/asm/src/Barrier.s index 2975b02e..a3c1cfca 100644 --- a/asm/src/Barrier.s +++ b/asm/src/Barrier.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetValid__Q53scn4step4hero7parasol7BarrierFRQ43scn4step4hero4Herob SetValid__Q53scn4step4hero7parasol7BarrierFRQ43scn4step4hero4Herob: /* 8039211C 0038DF5C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -228,7 +228,7 @@ lbl_8039240C: /* 80392464 0038E2A4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80392468 0038E2A8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259019 $$259019: .incbin "baserom.dol", 0x49E150, 0x8 diff --git a/asm/src/BarrierInvincible.s b/asm/src/BarrierInvincible.s index 1c072106..10c09dd4 100644 --- a/asm/src/BarrierInvincible.s +++ b/asm/src/BarrierInvincible.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss17BarrierInvincibleFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss17BarrierInvincibleFRQ43scn4step4boss4Boss: /* 80229270 002250B0 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/BgCamera.s b/asm/src/BgCamera.s index f0fd700b..32dd6835 100644 --- a/asm/src/BgCamera.s +++ b/asm/src/BgCamera.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera8BgCameraFRQ33scn4step9Component __ct__Q43scn4step6camera8BgCameraFRQ33scn4step9Component: /* 802620F0 0025DF30 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -644,7 +644,7 @@ lbl_802629F8: /* 80262A10 0025E850 38 21 00 30 */ addi r1, r1, 0x30 /* 80262A14 0025E854 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2AsinDeg__Q24nw4r4mathFf$$20 $$2STRING$$2AsinDeg__Q24nw4r4mathFf$$20: .incbin "baserom.dol", 0x4671F0, 0x28 @@ -652,12 +652,12 @@ $$2STRING$$2AsinDeg__Q24nw4r4mathFf$$20: $$2STRING$$2AsinDeg__Q24nw4r4mathFf: .incbin "baserom.dol", 0x467218, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251615 $$251615: .incbin "baserom.dol", 0x495810, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252471 $$252471: .incbin "baserom.dol", 0x49B5D8, 0x4 diff --git a/asm/src/BgManager.s b/asm/src/BgManager.s index 4ebb4b77..baac1e58 100644 --- a/asm/src/BgManager.s +++ b/asm/src/BgManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn11staffcredit9BgManagerFRQ33scn4step9Component __ct__Q33scn11staffcredit9BgManagerFRQ33scn4step9Component: /* 803F8874 003F46B4 90 83 00 00 */ stw r4, 0(r3) @@ -256,12 +256,12 @@ lbl_803F8AD8: /* 803F8C0C 003F4A4C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 803F8C10 003F4A50 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BG_DATA_TABLE__Q33scn11staffcredit23$$2unnamed$$2BgManager_cpp$$2 T_BG_DATA_TABLE__Q33scn11staffcredit23$$2unnamed$$2BgManager_cpp$$2: .incbin "baserom.dol", 0x41CCF0, 0x118 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252626 $$252626: .incbin "baserom.dol", 0x49ED88, 0x4 diff --git a/asm/src/BgmPlayer.s b/asm/src/BgmPlayer.s index d0f2d4d5..c4ec30b0 100644 --- a/asm/src/BgmPlayer.s +++ b/asm/src/BgmPlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23snd9BgmPlayerFRQ34nw4r3snd15DvdSoundArchiveRQ34nw4r3snd18SoundArchivePlayer __ct__Q23snd9BgmPlayerFRQ34nw4r3snd15DvdSoundArchiveRQ34nw4r3snd18SoundArchivePlayer: /* 80402654 003FE494 90 83 00 00 */ stw r4, 0(r3) @@ -321,7 +321,7 @@ volumeFade__Q23snd9BgmPlayerFfi: /* 80402A34 003FE874 38 63 00 08 */ addi r3, r3, 8 /* 80402A38 003FE878 4B FF FF D8 */ b SetVolume__Q34nw4r3snd11SoundHandleFfi -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249146 $$249146: .incbin "baserom.dol", 0x49EE98, 0x4 diff --git a/asm/src/BinCarryItemKindUtil.s b/asm/src/BinCarryItemKindUtil.s index 640877e1..21e386c7 100644 --- a/asm/src/BinCarryItemKindUtil.s +++ b/asm/src/BinCarryItemKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global FDNName__Q43scn4step3map20BinCarryItemKindUtilFQ43scn4step3map16BinCarryItemKind FDNName__Q43scn4step3map20BinCarryItemKindUtilFQ43scn4step3map16BinCarryItemKind: /* 803C8E48 003C4C88 54 60 10 3A */ slwi r0, r3, 2 @@ -9,7 +9,7 @@ FDNName__Q43scn4step3map20BinCarryItemKindUtilFQ43scn4step3map16BinCarryItemKind /* 803C8E54 003C4C94 7C 63 00 2E */ lwzx r3, r3, r0 /* 803C8E58 003C4C98 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248723 $$248723: .incbin "baserom.dol", 0x48E770, 0x18 diff --git a/asm/src/BinDecorationKindUtil.s b/asm/src/BinDecorationKindUtil.s index 81cf092b..02316d4e 100644 --- a/asm/src/BinDecorationKindUtil.s +++ b/asm/src/BinDecorationKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ToCharPointer__Q43scn4step3map21BinDecorationKindUtilFQ43scn4step3map17BinDecorationKind ToCharPointer__Q43scn4step3map21BinDecorationKindUtilFQ43scn4step3map17BinDecorationKind: /* 803C8E5C 003C4C9C 1C 03 00 0C */ mulli r0, r3, 0xc @@ -121,12 +121,12 @@ IsMonotoneIncludeFore__Q43scn4step3map21BinDecorationKindUtilFQ43scn4step3map17B /* 803C8FD4 003C4E14 7C 60 19 10 */ subfe r3, r0, r3 /* 803C8FD8 003C4E18 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INFOS__Q43scn4step3map35$$2unnamed$$2BinDecorationKindUtil_cpp$$2 T_INFOS__Q43scn4step3map35$$2unnamed$$2BinDecorationKindUtil_cpp$$2: .incbin "baserom.dol", 0x41C3C0, 0x178 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248877 $$248877: .incbin "baserom.dol", 0x48E878, 0xC @@ -203,7 +203,7 @@ $$248902: $$249156: .incbin "baserom.dol", 0x48E9AC, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248900 $$248900: .incbin "baserom.dol", 0x4982E0, 0x8 diff --git a/asm/src/BinMaproPos.s b/asm/src/BinMaproPos.s index a2e6d3ef..f1850da7 100644 --- a/asm/src/BinMaproPos.s +++ b/asm/src/BinMaproPos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global toMaproPos__Q43scn4step3map11BinMaproPosCFv toMaproPos__Q43scn4step3map11BinMaproPosCFv: /* 803C8FDC 003C4E1C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/BinMaproRect.s b/asm/src/BinMaproRect.s index ec5128ce..fbe063c3 100644 --- a/asm/src/BinMaproRect.s +++ b/asm/src/BinMaproRect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global toMaproRect__Q43scn4step3map12BinMaproRectCFv toMaproRect__Q43scn4step3map12BinMaproRectCFv: /* 803C9018 003C4E58 7C 87 23 78 */ mr r7, r4 diff --git a/asm/src/Blink.s b/asm/src/Blink.s index 81e6d0c3..8a5f66e6 100644 --- a/asm/src/Blink.s +++ b/asm/src/Blink.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero5BlinkFv __ct__Q43scn4step4hero5BlinkFv: /* 80330568 0032C3A8 38 00 00 00 */ li r0, 0 @@ -150,7 +150,7 @@ getColor__Q43scn4step4hero5BlinkCFv: /* 80330768 0032C5A8 38 63 00 01 */ addi r3, r3, 1 /* 8033076C 0032C5AC 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248855 $$248855: .incbin "baserom.dol", 0x49D640, 0x4 diff --git a/asm/src/Block.s b/asm/src/Block.s index 8dde9edf..b83d38ca 100644 --- a/asm/src/Block.s +++ b/asm/src/Block.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle5BlockFRQ33scn10grandtitle9ComponentRQ23g3d8StdModelUl __ct__Q33scn10grandtitle5BlockFRQ33scn10grandtitle9ComponentRQ23g3d8StdModelUl: /* 80200B48 001FC988 94 21 FF 10 */ stwu r1, -0xf0(r1) @@ -198,7 +198,7 @@ setVacuumed__Q33scn10grandtitle5BlockFfi: /* 80200E28 001FCC68 98 03 01 D0 */ stb r0, 0x1d0(r3) /* 80200E2C 001FCC6C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5block5BlockFRQ33scn4step9ComponentRQ23mem10IAllocatorRQ25mcoll11LandManagerRQ53scn4step7gimmick5block13BlockResFilesQ43scn4step3map15BinGmkBlockKindRCQ33scn4step7GridPosRQ43scn4step7gimmick6EffectRQ43scn4step7gimmick46ParamAccessor$$0Q53scn4step7gimmick5block5Param$$1 __ct__Q53scn4step7gimmick5block5BlockFRQ33scn4step9ComponentRQ23mem10IAllocatorRQ25mcoll11LandManagerRQ53scn4step7gimmick5block13BlockResFilesQ43scn4step3map15BinGmkBlockKindRCQ33scn4step7GridPosRQ43scn4step7gimmick6EffectRQ43scn4step7gimmick46ParamAccessor$$0Q53scn4step7gimmick5block5Param$$1: /* 802FEE98 002FACD8 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -1617,7 +1617,7 @@ lbl_8030021C: /* 8030022C 002FC06C 38 21 00 10 */ addi r1, r1, 0x10 /* 80300230 002FC070 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251712 $$251712: .incbin "baserom.dol", 0x45C590, 0x18 @@ -1709,7 +1709,7 @@ $$251750: T_PARENT_NODE_NAME__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2: .incbin "baserom.dol", 0x45C6F8, 0x98 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256431 $$256431: .incbin "baserom.dol", 0x47BB20, 0xF0 @@ -1741,7 +1741,7 @@ $$256695: $$256822: .incbin "baserom.dol", 0x47BF80, 0xF0 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle19$$2unnamed$$2Block_cpp$$2: .incbin "baserom.dol", 0x494718, 0x8 @@ -1782,7 +1782,7 @@ $$252315: $$251987: .incbin "baserom.dol", 0x494778, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256613 $$256613: .incbin "baserom.dol", 0x496930, 0x8 @@ -1793,7 +1793,7 @@ $$256658: $$256889: .incbin "baserom.dol", 0x496940, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252316 $$252316: .incbin "baserom.dol", 0x49AA70, 0x4 @@ -1807,7 +1807,7 @@ $$252318: $$252369: .incbin "baserom.dol", 0x49AA80, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256372 $$256372: .incbin "baserom.dol", 0x49D1E0, 0x8 diff --git a/asm/src/BlockAttackResult.s b/asm/src/BlockAttackResult.s index e0671000..ba765433 100644 --- a/asm/src/BlockAttackResult.s +++ b/asm/src/BlockAttackResult.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5block17BlockAttackResultFv __ct__Q53scn4step7gimmick5block17BlockAttackResultFv: /* 80300234 002FC074 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/BlockEffRequestInfo.s b/asm/src/BlockEffRequestInfo.s index 36a18c06..1cc32477 100644 --- a/asm/src/BlockEffRequestInfo.s +++ b/asm/src/BlockEffRequestInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5block19BlockEffRequestInfoFv __ct__Q53scn4step7gimmick5block19BlockEffRequestInfoFv: /* 8030041C 002FC25C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -212,7 +212,7 @@ __ct__Q63scn4step7gimmick5block19BlockEffRequestInfo4InfoFUlfRCQ33hel4math4Vec3U /* 803006F8 002FC538 38 21 00 20 */ addi r1, r1, 0x20 /* 803006FC 002FC53C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250372 $$250372: .incbin "baserom.dol", 0x49D1F0, 0x4 diff --git a/asm/src/BlockInfo.s b/asm/src/BlockInfo.s index 6a77c4e4..f8902c6f 100644 --- a/asm/src/BlockInfo.s +++ b/asm/src/BlockInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5block9BlockInfoFv __ct__Q53scn4step7gimmick5block9BlockInfoFv: /* 80300700 002FC540 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/BlockManager.s b/asm/src/BlockManager.s index 585c4a5b..817bc7dc 100644 --- a/asm/src/BlockManager.s +++ b/asm/src/BlockManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5block12BlockManagerFRQ33scn4step9ComponentRQ23mem10IAllocatorRQ25mcoll11LandManagerRCQ43scn4step3map12DataAccessorRQ23g3d17ResFileRepositoryRQ26effect7ManagerQ43scn4step3map4Kind __ct__Q53scn4step7gimmick5block12BlockManagerFRQ33scn4step9ComponentRQ23mem10IAllocatorRQ25mcoll11LandManagerRCQ43scn4step3map12DataAccessorRQ23g3d17ResFileRepositoryRQ26effect7ManagerQ43scn4step3map4Kind: /* 80300760 002FC5A0 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -2601,7 +2601,7 @@ lbl_80302C24: /* 80302C30 002FEA70 38 21 00 30 */ addi r1, r1, 0x30 /* 80302C34 002FEA74 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$256150 $$256150: .incbin "baserom.dol", 0x4157F8, 0x50 @@ -2615,12 +2615,12 @@ $$256156: $$256159: .incbin "baserom.dol", 0x415948, 0xB0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$259290 $$259290: .incbin "baserom.dol", 0x47C070, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256309 $$256309: .incbin "baserom.dol", 0x496948, 0x4 @@ -2628,7 +2628,7 @@ $$256309: $$256310: .incbin "baserom.dol", 0x49694C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256162 $$256162: .incbin "baserom.dol", 0x49D1F8, 0x4 diff --git a/asm/src/BlockResFiles.s b/asm/src/BlockResFiles.s index 212d5707..7da9241b 100644 --- a/asm/src/BlockResFiles.s +++ b/asm/src/BlockResFiles.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5block13BlockResFilesFRQ23g3d17ResFileRepository __ct__Q53scn4step7gimmick5block13BlockResFilesFRQ23g3d17ResFileRepository: /* 80302C38 002FEA78 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -163,10 +163,10 @@ __sinit_$$3BlockResFiles_cpp: /* 80302E5C 002FEC9C 90 03 01 14 */ stw r0, 0x114(r3) /* 80302E60 002FECA0 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025A0, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248773 $$248773: .incbin "baserom.dol", 0x47C088, 0x18 @@ -213,7 +213,7 @@ $$248793: T_CONTEXT_TABLE__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2: .incbin "baserom.dol", 0x47C1B0, 0x1E0 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248772 $$248772: .incbin "baserom.dol", 0x496950, 0x8 @@ -239,7 +239,7 @@ $$248786: $$248787: .incbin "baserom.dol", 0x496988, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_DEFAULT_ENTRY_NAME__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2 T_DEFAULT_ENTRY_NAME__Q53scn4step7gimmick5block27$$2unnamed$$2BlockResFiles_cpp$$2: .incbin "baserom.dol", 0x49D238, 0x8 diff --git a/asm/src/BodyColl.s b/asm/src/BodyColl.s index 80275ad8..d02bd018 100644 --- a/asm/src/BodyColl.s +++ b/asm/src/BodyColl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara8BodyCollFRQ33scn4step9ComponentRQ25ocoll5Owner __ct__Q43scn4step5chara8BodyCollFRQ33scn4step9ComponentRQ25ocoll5Owner: /* 8026CDB4 00268BF4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Boss.s b/asm/src/Boss.s index 11e801a7..b80b2552 100644 --- a/asm/src/Boss.s +++ b/asm/src/Boss.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss4BossFRQ33scn4step9ComponentRQ23mem12HeapExpArrayRCQ43scn4step4boss4Desc __ct__Q43scn4step4boss4BossFRQ33scn4step9ComponentRQ23mem12HeapExpArrayRCQ43scn4step4boss4Desc: /* 80229698 002254D8 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -4186,7 +4186,7 @@ stateChanger__Q43scn4step4boss4BossFv: /* 8022D018 00228E58 38 63 02 64 */ addi r3, r3, 0x264 /* 8022D01C 00228E5C 4B F4 AB D0 */ b __rf__Q23mem43ExplicitScopedPtr$$0Q23app16HIDErrorMenuImpl$$1CFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util41StateChanger$$0Q43scn4step4boss6IState$$4256$$1 __vt__Q24util41StateChanger$$0Q43scn4step4boss6IState$$4256$$1: .incbin "baserom.dol", 0x4604C8, 0xC @@ -4209,7 +4209,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4b $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4boss4Boss$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x460558, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$269815 $$269815: .incbin "baserom.dol", 0x49ADD0, 0x4 diff --git a/asm/src/BossDataAccessor.s b/asm/src/BossDataAccessor.s index 65c0d435..13d55b73 100644 --- a/asm/src/BossDataAccessor.s +++ b/asm/src/BossDataAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global count__Q43scn4step3map16BossDataAccessorCFv count__Q43scn4step3map16BossDataAccessorCFv: /* 803C9030 003C4E70 80 63 00 00 */ lwz r3, 0(r3) diff --git a/asm/src/BossDemoCtrl.s b/asm/src/BossDemoCtrl.s index de56bc3c..033d694e 100644 --- a/asm/src/BossDemoCtrl.s +++ b/asm/src/BossDemoCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero12BossDemoCtrlFv __ct__Q43scn4step4hero12BossDemoCtrlFv: /* 80330770 0032C5B0 38 00 00 00 */ li r0, 0 @@ -64,7 +64,7 @@ setSignal__Q43scn4step4hero12BossDemoCtrlFQ43scn4step4hero18BossDemoSignalKind: /* 8033081C 0032C65C 90 03 00 08 */ stw r0, 8(r3) /* 80330820 0032C660 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248846 $$248846: .incbin "baserom.dol", 0x49D650, 0x8 diff --git a/asm/src/BossPanel.s b/asm/src/BossPanel.s index 34731f2d..4d8680a8 100644 --- a/asm/src/BossPanel.s +++ b/asm/src/BossPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global parentPaneFormat__Q43scn4step4info23$$2unnamed$$2BossPanel_cpp$$2FQ53scn4step4info9BossPanel9GuardKind parentPaneFormat__Q43scn4step4info23$$2unnamed$$2BossPanel_cpp$$2FQ53scn4step4info9BossPanel9GuardKind: /* 803A5584 003A13C4 28 03 00 01 */ cmplwi r3, 1 @@ -1420,7 +1420,7 @@ __dt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$ __dt__Q43std3tr16detail289function_imp$$0PFv_v$$4Q43std3tr16detail245bound_func$$0v$$4Q43std3tr16detail41mem_fn_1$$0v$$4Q43scn4step4info9BossPanel$$4Ul$$1$$4Q33std3tr1157tuple$$0PQ43scn4step4info9BossPanel$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv: /* 803A691C 003A275C 4B E4 28 64 */ b __dt__Q43std3tr16detail360function_imp$$0PFv_v$$4Q43std3tr16detail316bound_func$$0v$$4Q43std3tr16detail54mem_fn_0$$0v$$4Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr1215tuple$$0Q33std3tr161reference_wrapper$$0Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257129 $$257129: .incbin "baserom.dol", 0x48B200, 0xC @@ -1587,7 +1587,7 @@ __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$ __vt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$$0v$$4Q43std3tr16detail34mem_fn_1$$0v$$4Q23snd11SERequestor$$4Ul$$1$$4Q33std3tr1150tuple$$0PQ23snd11SERequestor$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .incbin "baserom.dol", 0x48B688, 0xA0 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257131 $$257131: .incbin "baserom.dol", 0x497878, 0x4 @@ -1619,7 +1619,7 @@ $$257573: $$257588: .incbin "baserom.dol", 0x4978C0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257175 $$257175: .incbin "baserom.dol", 0x49E3D0, 0x4 diff --git a/asm/src/BrainAttack.s b/asm/src/BrainAttack.s index 12dedba4..5f456e37 100644 --- a/asm/src/BrainAttack.s +++ b/asm/src/BrainAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5cappy11BrainAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5cappy11BrainAttackFRQ43scn4step5enemy5Enemy: /* 802A2408 0029E248 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -230,7 +230,7 @@ __dt__Q53scn4step5enemy5cappy11BrainAttackFv: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A2700 0029E540 4B F8 BF A0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4elec11BrainAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4elec11BrainAttackFRQ43scn4step5enemy5Enemy: /* 802AF3F4 002AB234 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -308,7 +308,7 @@ __dt__Q53scn4step5enemy4elec11BrainAttackFv: __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802AF4D8 002AB318 4B F7 F1 C8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6flamer11BrainAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6flamer11BrainAttackFRQ43scn4step5enemy5Enemy: /* 802B1BC0 002ADA00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -465,7 +465,7 @@ lbl_802B1DAC: __dt__Q53scn4step5enemy6flamer11BrainAttackFv: /* 802B1DC8 002ADC08 4B FD F2 A4 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7gigatzo11BrainAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7gigatzo11BrainAttackFRQ43scn4step5enemy5Enemy: /* 802B69C4 002B2804 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -539,7 +539,7 @@ __dt__Q53scn4step5enemy7gigatzo11BrainAttackFv: __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B6AA4 002B28E4 4B F7 7B FC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7hothead11BrainAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7hothead11BrainAttackFRQ43scn4step5enemy5Enemy: /* 802BA100 002B5F40 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -652,7 +652,7 @@ lbl_802BA248: __dt__Q53scn4step5enemy7hothead11BrainAttackFv: /* 802BA25C 002B609C 4B FD 6E 10 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6leafan11BrainAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6leafan11BrainAttackFRQ43scn4step5enemy5Enemy: /* 802C33FC 002BF23C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -730,7 +730,7 @@ __dt__Q53scn4step5enemy6leafan11BrainAttackFv: __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C34E0 002BF320 4B F6 B1 C0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10watergalbo11BrainAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10watergalbo11BrainAttackFRQ43scn4step5enemy5Enemy: /* 802F0060 002EBEA0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -796,7 +796,7 @@ lbl_802F0118: __dt__Q53scn4step5enemy10watergalbo11BrainAttackFv: /* 802F0130 002EBF70 4B FA 0F 3C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6whippy11BrainAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6whippy11BrainAttackFRQ43scn4step5enemy5Enemy: /* 802F0738 002EC578 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -823,7 +823,7 @@ onStart__Q53scn4step5enemy6whippy11BrainAttackFv: __dt__Q53scn4step5enemy6whippy11BrainAttackFv: /* 802F0778 002EC5B8 4B FA 08 F4 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateLostHat$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471178, 0x10 @@ -831,7 +831,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12Stat __vt__Q53scn4step5enemy5cappy11BrainAttack: .incbin "baserom.dol", 0x471188, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10StateChase$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4725B0, 0x10 @@ -839,12 +839,12 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec10State __vt__Q53scn4step5enemy4elec11BrainAttack: .incbin "baserom.dol", 0x4725C0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer11BrainAttack __vt__Q53scn4step5enemy6flamer11BrainAttack: .incbin "baserom.dol", 0x472B18, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4733A0, 0x10 @@ -852,12 +852,12 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7gigatzo9Sta __vt__Q53scn4step5enemy7gigatzo11BrainAttack: .incbin "baserom.dol", 0x4733B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7hothead11BrainAttack __vt__Q53scn4step5enemy7hothead11BrainAttack: .incbin "baserom.dol", 0x473930, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x474F30, 0x10 @@ -865,12 +865,12 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9Stat __vt__Q53scn4step5enemy6leafan11BrainAttack: .incbin "baserom.dol", 0x474F40, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10watergalbo11BrainAttack __vt__Q53scn4step5enemy10watergalbo11BrainAttack: .incbin "baserom.dol", 0x47A958, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6whippy11BrainAttack __vt__Q53scn4step5enemy6whippy11BrainAttack: .incbin "baserom.dol", 0x47AB10, 0x20 diff --git a/asm/src/BrainAttackStraight.s b/asm/src/BrainAttackStraight.s index 30bcf26a..b5f2a7bb 100644 --- a/asm/src/BrainAttackStraight.s +++ b/asm/src/BrainAttackStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8needlous19BrainAttackStraightFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8needlous19BrainAttackStraightFRQ43scn4step5enemy5Enemy: /* 802C5A3C 002C187C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -221,7 +221,7 @@ __dt__Q53scn4step5enemy8needlous19BrainAttackStraightFv: __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C5D18 002C1B58 4B F6 89 88 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4753C0, 0x10 @@ -229,7 +229,7 @@ __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous17 __vt__Q53scn4step5enemy8needlous19BrainAttackStraight: .incbin "baserom.dol", 0x4753D0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256259 $$256259: .incbin "baserom.dol", 0x49C840, 0x4 diff --git a/asm/src/BrainBase.s b/asm/src/BrainBase.s index 17faf2ed..0e50cb5c 100644 --- a/asm/src/BrainBase.s +++ b/asm/src/BrainBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy9BrainBaseFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy9BrainBaseFRQ43scn4step5enemy5Enemy: /* 8027EE14 0027AC54 3C A0 80 47 */ lis r5, __vt__Q43scn4step5enemy9BrainBase@ha @@ -52,7 +52,7 @@ lbl_8027EE78: /* 8027EE8C 0027ACCC 38 21 00 10 */ addi r1, r1, 0x10 /* 8027EE90 0027ACD0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy9BrainBase __vt__Q43scn4step5enemy9BrainBase: .incbin "baserom.dol", 0x46C640, 0x20 diff --git a/asm/src/BrainBound.s b/asm/src/BrainBound.s index 50080378..833ffc8d 100644 --- a/asm/src/BrainBound.s +++ b/asm/src/BrainBound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10stareffect10BrainBoundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10stareffect10BrainBoundFRQ43scn4step5enemy5Enemy: /* 802E77E0 002E3620 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -74,7 +74,7 @@ __dt__Q53scn4step5enemy10stareffect10BrainBoundFv: __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E78C0 002E3700 4B F4 6D E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect10StateBound$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479368, 0x10 diff --git a/asm/src/BrainChase.s b/asm/src/BrainChase.s index 4d5d8d8a..1ada7162 100644 --- a/asm/src/BrainChase.s +++ b/asm/src/BrainChase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper10BrainChaseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper10BrainChaseFRQ43scn4step5enemy5Enemy: /* 80298A2C 0029486C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -91,7 +91,7 @@ onRecover__Q53scn4step5enemy7blipper10BrainChaseFv: __dt__Q53scn4step5enemy7blipper10BrainChaseFv: /* 80298B50 00294990 4B FF 85 1C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6degout10BrainChaseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6degout10BrainChaseFRQ43scn4step5enemy5Enemy: /* 802ACF3C 002A8D7C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -221,7 +221,7 @@ lbl_802AD0CC: __dt__Q53scn4step5enemy6degout10BrainChaseFv: /* 802AD0EC 002A8F2C 4B FE 3F 80 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7mumbies10BrainChaseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7mumbies10BrainChaseFRQ43scn4step5enemy5Enemy: /* 802C4CEC 002C0B2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -285,7 +285,7 @@ onRecover__Q53scn4step5enemy7mumbies10BrainChaseFv: __dt__Q53scn4step5enemy7mumbies10BrainChaseFv: /* 802C4DB0 002C0BF0 4B FC C2 BC */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy10BrainChaseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy10BrainChaseFRQ43scn4step5enemy5Enemy: /* 802D94A0 002D52E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -479,7 +479,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15Sta __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D96FC 002D553C 4B F5 4F A4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld10BrainChaseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld10BrainChaseFRQ43scn4step5enemy5Enemy: /* 802DC83C 002D867C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -616,22 +616,22 @@ lbl_802DC9E4: __dt__Q53scn4step5enemy5sheld10BrainChaseFv: /* 802DCA00 002D8840 4B FB 46 6C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper10BrainChase __vt__Q53scn4step5enemy7blipper10BrainChase: .incbin "baserom.dol", 0x46FD10, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout10BrainChase __vt__Q53scn4step5enemy6degout10BrainChase: .incbin "baserom.dol", 0x471F88, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7mumbies10BrainChase __vt__Q53scn4step5enemy7mumbies10BrainChase: .incbin "baserom.dol", 0x4751D8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy15StateAngerChase$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477438, 0x10 @@ -645,7 +645,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy10Sta __vt__Q53scn4step5enemy6scarfy10BrainChase: .incbin "baserom.dol", 0x477468, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld10BrainChase __vt__Q53scn4step5enemy5sheld10BrainChase: .incbin "baserom.dol", 0x477AA0, 0x20 diff --git a/asm/src/BrainCreditFallToGoodbye.s b/asm/src/BrainCreditFallToGoodbye.s index 6e669e14..0ee42cac 100644 --- a/asm/src/BrainCreditFallToGoodbye.s +++ b/asm/src/BrainCreditFallToGoodbye.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFRQ43scn4step5enemy5Enemy: /* 802D3610 002CF450 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -109,7 +109,7 @@ __dt__Q53scn4step5enemy5rocky24BrainCreditFallToGoodbyeFv: __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D3764 002CF5A4 4B F5 AF 3C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476C60, 0x10 diff --git a/asm/src/BrainCreditPraise.s b/asm/src/BrainCreditPraise.s index e3f8373b..8ca5ab32 100644 --- a/asm/src/BrainCreditPraise.s +++ b/asm/src/BrainCreditPraise.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common17BrainCreditPraiseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common17BrainCreditPraiseFRQ43scn4step5enemy5Enemy: /* 80290F90 0028CDD0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -97,7 +97,7 @@ lbl_802910AC: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802910C8 0028CF08 4B F9 D5 D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy17BrainCreditPraiseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy17BrainCreditPraiseFRQ43scn4step5enemy5Enemy: /* 8029CB40 00298980 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -159,7 +159,7 @@ lbl_8029CBE8: __dt__Q53scn4step5enemy6bouncy17BrainCreditPraiseFv: /* 8029CC08 00298A48 4B FF 44 64 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sparky17BrainCreditPraiseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sparky17BrainCreditPraiseFRQ43scn4step5enemy5Enemy: /* 802E6BEC 002E2A2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -221,7 +221,7 @@ lbl_802E6C94: __dt__Q53scn4step5enemy6sparky17BrainCreditPraiseFv: /* 802E6CB4 002E2AF4 4B FA A3 B8 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11StatePraise$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46EF98, 0x10 @@ -229,12 +229,12 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common11Sta __vt__Q53scn4step5enemy6common17BrainCreditPraise: .incbin "baserom.dol", 0x46EFA8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy17BrainCreditPraise __vt__Q53scn4step5enemy6bouncy17BrainCreditPraise: .incbin "baserom.dol", 0x470280, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky17BrainCreditPraise __vt__Q53scn4step5enemy6sparky17BrainCreditPraise: .incbin "baserom.dol", 0x4790F8, 0x20 diff --git a/asm/src/BrainCreditWalkToPraise.s b/asm/src/BrainCreditWalkToPraise.s index a5aa74c2..901e49b7 100644 --- a/asm/src/BrainCreditWalkToPraise.s +++ b/asm/src/BrainCreditWalkToPraise.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFRQ43scn4step5enemy5Enemy: /* 802A0BD0 0029CA10 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -60,7 +60,7 @@ lbl_802A0C70: __dt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraiseFv: /* 802A0C90 0029CAD0 4B FF 03 DC */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFRQ43scn4step5enemy5Enemy: /* 802A5F98 002A1DD8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -120,7 +120,7 @@ lbl_802A6038: __dt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraiseFv: /* 802A6058 002A1E98 4B FE B0 14 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFRQ43scn4step5enemy5Enemy: /* 802ED1E0 002E9020 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -194,17 +194,17 @@ __dt__Q53scn4step5enemy9waddledee23BrainCreditWalkToPraiseFv: __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802ED2C0 002E9100 4B F4 13 E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraise __vt__Q53scn4step5enemy11broomhatter23BrainCreditWalkToPraise: .incbin "baserom.dol", 0x470D30, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraise __vt__Q53scn4step5enemy6chilly23BrainCreditWalkToPraise: .incbin "baserom.dol", 0x4717D8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common15StateCreditWalk$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479C18, 0x10 diff --git a/asm/src/BrainCtrl.s b/asm/src/BrainCtrl.s index 514bd288..174a3f35 100644 --- a/asm/src/BrainCtrl.s +++ b/asm/src/BrainCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss9BrainCtrlFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss9BrainCtrlFRQ43scn4step4boss4Boss: /* 8022D020 00228E60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -95,7 +95,7 @@ onExecPost__Q43scn4step4boss9BrainCtrlFv: /* 8022D12C 00228F6C 80 63 00 00 */ lwz r3, 0(r3) /* 8022D130 00228F70 48 00 77 A4 */ b MintUnregister__Q43scn4step4boss7UtilityFRQ43scn4step4boss4Boss -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy9BrainCtrlFRQ43scn4step5enemy5EnemyRQ23mem10IAllocator __ct__Q43scn4step5enemy9BrainCtrlFRQ43scn4step5enemy5EnemyRQ23mem10IAllocator: /* 8027EE94 0027ACD4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -274,7 +274,7 @@ onLanding__Q43scn4step5enemy9BrainCtrlFv: /* 8027F0E8 0027AF28 38 21 00 10 */ addi r1, r1, 0x10 /* 8027F0EC 0027AF2C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253447 $$253447: .incbin "baserom.dol", 0x46C660, 0x18 diff --git a/asm/src/BrainDash.s b/asm/src/BrainDash.s index bf67b929..863912d8 100644 --- a/asm/src/BrainDash.s +++ b/asm/src/BrainDash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld9BrainDashFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld9BrainDashFRQ43scn4step5enemy5Enemy: /* 802DCA04 002D8844 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -121,7 +121,7 @@ update__Q53scn4step5enemy5sheld9BrainDashFv: __dt__Q53scn4step5enemy5sheld9BrainDashFv: /* 802DCB88 002D89C8 4B FB 44 E4 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9BrainDash __vt__Q53scn4step5enemy5sheld9BrainDash: .incbin "baserom.dol", 0x477AC0, 0x20 diff --git a/asm/src/BrainDive.s b/asm/src/BrainDive.s index 73a5f2d3..b18296e7 100644 --- a/asm/src/BrainDive.s +++ b/asm/src/BrainDive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como9BrainDiveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como9BrainDiveFRQ43scn4step5enemy5Enemy: /* 802A6C88 002A2AC8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -203,7 +203,7 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12State __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A6F14 002A2D54 4B F8 77 8C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateBack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471AB0, 0x10 @@ -214,7 +214,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como12State __vt__Q53scn4step5enemy4como9BrainDive: .incbin "baserom.dol", 0x471AD0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255290 $$255290: .incbin "baserom.dol", 0x49C0A0, 0x8 diff --git a/asm/src/BrainEscape.s b/asm/src/BrainEscape.s index 8616e275..ebec5907 100644 --- a/asm/src/BrainEscape.s +++ b/asm/src/BrainEscape.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld11BrainEscapeFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld11BrainEscapeFRQ43scn4step5enemy5Enemy: /* 802DCB8C 002D89CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -60,7 +60,7 @@ lbl_802DCC2C: __dt__Q53scn4step5enemy5sheld11BrainEscapeFv: /* 802DCC4C 002D8A8C 4B FB 44 20 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld11BrainEscape __vt__Q53scn4step5enemy5sheld11BrainEscape: .incbin "baserom.dol", 0x477AE0, 0x20 diff --git a/asm/src/BrainFactory.s b/asm/src/BrainFactory.s index 0de49ff1..d58cb7ae 100644 --- a/asm/src/BrainFactory.s +++ b/asm/src/BrainFactory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q43scn4step5enemy12BrainFactoryFRQ43scn4step5enemy5EnemyRQ23mem43ExplicitScopedPtr$$0Q43scn4step5enemy6IBrain$$1 Create__Q43scn4step5enemy12BrainFactoryFRQ43scn4step5enemy5EnemyRQ23mem43ExplicitScopedPtr$$0Q43scn4step5enemy6IBrain$$1: /* 8027F0F0 0027AF30 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2200,12 +2200,12 @@ ScriptPath__Q43scn4step5enemy12BrainFactoryFRQ43scn4step5enemy5Enemy: /* 802810F8 0027CF38 38 21 00 10 */ addi r1, r1, 0x10 /* 802810FC 0027CF3C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SCRIPT_PATHS__Q43scn4step5enemy26$$2unnamed$$2BrainFactory_cpp$$2 T_SCRIPT_PATHS__Q43scn4step5enemy26$$2unnamed$$2BrainFactory_cpp$$2: .incbin "baserom.dol", 0x413DD8, 0x6A8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257656 $$257656: .incbin "baserom.dol", 0x46C678, 0x6A4 diff --git a/asm/src/BrainFattyBuffer.s b/asm/src/BrainFattyBuffer.s index 5fc05467..5be872a7 100644 --- a/asm/src/BrainFattyBuffer.s +++ b/asm/src/BrainFattyBuffer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper16BrainFattyBufferFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper16BrainFattyBufferFRQ43scn4step5enemy5Enemy: /* 80298B54 00294994 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -78,7 +78,7 @@ __dt__Q53scn4step5enemy7blipper16BrainFattyBufferFv: __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80298C38 00294A78 4B F9 5A 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7blipper26StateFattyBufferAppearFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46FD30, 0x10 diff --git a/asm/src/BrainFix.s b/asm/src/BrainFix.s index 54f7036e..8fe9151f 100644 --- a/asm/src/BrainFix.s +++ b/asm/src/BrainFix.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6shotzo8BrainFixFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6shotzo8BrainFixFRQ43scn4step5enemy5Enemy: /* 802DFDA0 002DBBE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -111,7 +111,7 @@ __dt__Q53scn4step5enemy6shotzo8BrainFixFv: __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DFEFC 002DBD3C 4B F4 E7 A4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6shotzo9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4780C8, 0x10 diff --git a/asm/src/BrainFixCeil.s b/asm/src/BrainFixCeil.s index 12d70a5d..4f9850ab 100644 --- a/asm/src/BrainFixCeil.s +++ b/asm/src/BrainFixCeil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6shotzo12BrainFixCeilFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6shotzo12BrainFixCeilFRQ43scn4step5enemy5Enemy: /* 802DFF00 002DBD40 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -136,12 +136,12 @@ lbl_802E0094: __dt__Q53scn4step5enemy6shotzo12BrainFixCeilFv: /* 802E00D4 002DBF14 4B FB 0F 98 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo12BrainFixCeil __vt__Q53scn4step5enemy6shotzo12BrainFixCeil: .incbin "baserom.dol", 0x4780F8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255186 $$255186: .incbin "baserom.dol", 0x49CD80, 0x4 diff --git a/asm/src/BrainFlushPursuit.s b/asm/src/BrainFlushPursuit.s index e398ed8a..3f4b8d9d 100644 --- a/asm/src/BrainFlushPursuit.s +++ b/asm/src/BrainFlushPursuit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common17BrainFlushPursuitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common17BrainFlushPursuitFRQ43scn4step5enemy5Enemy: /* 802910CC 0028CF0C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -121,7 +121,7 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14Sta __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80291240 0028D080 4B F9 D4 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46EFC8, 0x10 diff --git a/asm/src/BrainFly.s b/asm/src/BrainFly.s index ebb894cf..021eb41d 100644 --- a/asm/src/BrainFly.s +++ b/asm/src/BrainFly.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common8BrainFlyFRQ43scn4step5enemy5Enemy: /* 80291244 0028D084 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -82,7 +82,7 @@ onLanding__Q53scn4step5enemy6common8BrainFlyFv: __dt__Q53scn4step5enemy6common8BrainFlyFv: /* 80291338 0028D178 4B FF FD 34 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5bowby8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5bowby8BrainFlyFRQ43scn4step5enemy5Enemy: /* 8029E244 0029A084 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -146,7 +146,7 @@ onRecover__Q53scn4step5enemy5bowby8BrainFlyFv: __dt__Q53scn4step5enemy5bowby8BrainFlyFv: /* 8029E308 0029A148 4B FF 2D 64 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt8BrainFlyFRQ43scn4step5enemy5Enemy: /* 8029ED04 0029AB44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -224,7 +224,7 @@ __dt__Q53scn4step5enemy10brontoburt8BrainFlyFv: __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029EDE8 0029AC28 4B F8 F8 B8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8cerulean8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8cerulean8BrainFlyFRQ43scn4step5enemy5Enemy: /* 802A5410 002A1250 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -302,7 +302,7 @@ __dt__Q53scn4step5enemy8cerulean8BrainFlyFv: __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A54F4 002A1334 4B F8 91 AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6juckle8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6juckle8BrainFlyFRQ43scn4step5enemy5Enemy: /* 802BB124 002B6F64 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -333,7 +333,7 @@ onRecover__Q53scn4step5enemy6juckle8BrainFlyFv: __dt__Q53scn4step5enemy6juckle8BrainFlyFv: /* 802BB168 002B6FA8 4B FD 5F 04 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6pierce8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6pierce8BrainFlyFRQ43scn4step5enemy5Enemy: /* 802CF63C 002CB47C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -527,7 +527,7 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce14Sta __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CF88C 002CB6CC 4B F5 EE 14 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy8BrainFlyFRQ43scn4step5enemy5Enemy: /* 802D9700 002D5540 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -558,7 +558,7 @@ onRecover__Q53scn4step5enemy6scarfy8BrainFlyFv: __dt__Q53scn4step5enemy6scarfy8BrainFlyFv: /* 802D9744 002D5584 4B FB 79 28 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8searches8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8searches8BrainFlyFRQ43scn4step5enemy5Enemy: /* 802DBA18 002D7858 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -677,7 +677,7 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9St __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DBB7C 002D79BC 4B F5 2B 24 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5snowl8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5snowl8BrainFlyFRQ43scn4step5enemy5Enemy: /* 802E3540 002DF380 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -795,7 +795,7 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14Stat __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E36A0 002DF4E0 4B F4 B0 00 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory8BrainFlyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory8BrainFlyFRQ43scn4step5enemy5Enemy: /* 802E4810 002E0650 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -898,17 +898,17 @@ onRecover__Q53scn4step5enemy6sodory8BrainFlyFv: __dt__Q53scn4step5enemy6sodory8BrainFlyFv: /* 802E4958 002E0798 4B FA C7 14 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common8BrainFly __vt__Q53scn4step5enemy6common8BrainFly: .incbin "baserom.dol", 0x46F008, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5bowby8BrainFly __vt__Q53scn4step5enemy5bowby8BrainFly: .incbin "baserom.dol", 0x470698, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470910, 0x10 @@ -916,7 +916,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt __vt__Q53scn4step5enemy10brontoburt8BrainFly: .incbin "baserom.dol", 0x470920, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471578, 0x10 @@ -924,12 +924,12 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8cerulean8St __vt__Q53scn4step5enemy8cerulean8BrainFly: .incbin "baserom.dol", 0x471588, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle8BrainFly __vt__Q53scn4step5enemy6juckle8BrainFly: .incbin "baserom.dol", 0x473C68, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce12StateFlyWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4763F8, 0x10 @@ -946,12 +946,12 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6pierce16St __vt__Q53scn4step5enemy6pierce8BrainFly: .incbin "baserom.dol", 0x476438, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy8BrainFly __vt__Q53scn4step5enemy6scarfy8BrainFly: .incbin "baserom.dol", 0x477488, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4777D8, 0x10 @@ -962,7 +962,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches9St __vt__Q53scn4step5enemy8searches8BrainFly: .incbin "baserom.dol", 0x4777F8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl16StateFlyStraight$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x478AC0, 0x10 @@ -973,7 +973,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5snowl14Stat __vt__Q53scn4step5enemy5snowl8BrainFly: .incbin "baserom.dol", 0x478AE0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory8BrainFly __vt__Q53scn4step5enemy6sodory8BrainFly: .incbin "baserom.dol", 0x478D90, 0x20 diff --git a/asm/src/BrainFlyAround.s b/asm/src/BrainFlyAround.s index b476c87b..927e7503 100644 --- a/asm/src/BrainFlyAround.s +++ b/asm/src/BrainFlyAround.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6owgulf14BrainFlyAroundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6owgulf14BrainFlyAroundFRQ43scn4step5enemy5Enemy: /* 802C9ACC 002C590C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -150,7 +150,7 @@ lbl_802C9CBC: __dt__Q53scn4step5enemy6owgulf14BrainFlyAroundFv: /* 802C9CD4 002C5B14 4B FC 73 98 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf14BrainFlyAround __vt__Q53scn4step5enemy6owgulf14BrainFlyAround: .incbin "baserom.dol", 0x475C50, 0x20 diff --git a/asm/src/BrainFlyFarSinCurve.s b/asm/src/BrainFlyFarSinCurve.s index 2136b99b..609848e2 100644 --- a/asm/src/BrainFlyFarSinCurve.s +++ b/asm/src/BrainFlyFarSinCurve.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFRQ43scn4step5enemy5Enemy: /* 8029EDEC 0029AC2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -79,7 +79,7 @@ __dt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurveFv: __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029EEE0 0029AD20 4B F8 F7 C0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470940, 0x10 @@ -87,7 +87,7 @@ __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontobur __vt__Q53scn4step5enemy10brontoburt19BrainFlyFarSinCurve: .incbin "baserom.dol", 0x470950, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254881 $$254881: .incbin "baserom.dol", 0x49BEC8, 0x8 diff --git a/asm/src/BrainFlySinCurve.s b/asm/src/BrainFlySinCurve.s index abb6dab3..42fd9959 100644 --- a/asm/src/BrainFlySinCurve.s +++ b/asm/src/BrainFlySinCurve.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common16BrainFlySinCurveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common16BrainFlySinCurveFRQ43scn4step5enemy5Enemy: /* 8029133C 0028D17C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -96,7 +96,7 @@ __dt__Q53scn4step5enemy6common16BrainFlySinCurveFv: __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80291450 0028D290 4B F9 D2 50 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFlySinCurve$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46F028, 0x10 diff --git a/asm/src/BrainFlyStraight.s b/asm/src/BrainFlyStraight.s index 603b146b..ca4f38f8 100644 --- a/asm/src/BrainFlyStraight.s +++ b/asm/src/BrainFlyStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6owgulf16BrainFlyStraightFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6owgulf16BrainFlyStraightFRQ43scn4step5enemy5Enemy: /* 802C9CD8 002C5B18 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -31,7 +31,7 @@ onRecover__Q53scn4step5enemy6owgulf16BrainFlyStraightFv: __dt__Q53scn4step5enemy6owgulf16BrainFlyStraightFv: /* 802C9D1C 002C5B5C 4B FC 73 50 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf16BrainFlyStraight __vt__Q53scn4step5enemy6owgulf16BrainFlyStraight: .incbin "baserom.dol", 0x475C70, 0x20 diff --git a/asm/src/BrainFlyUpDown.s b/asm/src/BrainFlyUpDown.s index 03cb9ada..f9254189 100644 --- a/asm/src/BrainFlyUpDown.s +++ b/asm/src/BrainFlyUpDown.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common14BrainFlyUpDownFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common14BrainFlyUpDownFRQ43scn4step5enemy5Enemy: /* 80291454 0028D294 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -96,7 +96,7 @@ __dt__Q53scn4step5enemy6common14BrainFlyUpDownFv: __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80291568 0028D3A8 4B F9 D1 38 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy14BrainFlyUpDownFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy14BrainFlyUpDownFRQ43scn4step5enemy5Enemy: /* 802D9748 002D5588 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -172,7 +172,7 @@ __dt__Q53scn4step5enemy6scarfy14BrainFlyUpDownFv: __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D9824 002D5664 4B F5 4E 7C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46F058, 0x10 @@ -180,7 +180,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common14Sta __vt__Q53scn4step5enemy6common14BrainFlyUpDown: .incbin "baserom.dol", 0x46F068, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy14StateFlyUpDown$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4774A8, 0x10 diff --git a/asm/src/BrainFlyWait.s b/asm/src/BrainFlyWait.s index 678d27d7..da2c8aba 100644 --- a/asm/src/BrainFlyWait.s +++ b/asm/src/BrainFlyWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6owgulf12BrainFlyWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6owgulf12BrainFlyWaitFRQ43scn4step5enemy5Enemy: /* 802C9D20 002C5B60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -31,7 +31,7 @@ onRecover__Q53scn4step5enemy6owgulf12BrainFlyWaitFv: __dt__Q53scn4step5enemy6owgulf12BrainFlyWaitFv: /* 802C9D64 002C5BA4 4B FC 73 08 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf12BrainFlyWait __vt__Q53scn4step5enemy6owgulf12BrainFlyWait: .incbin "baserom.dol", 0x475C90, 0x20 diff --git a/asm/src/BrainFollow.s b/asm/src/BrainFollow.s index 8468a523..fd2bc7d8 100644 --- a/asm/src/BrainFollow.s +++ b/asm/src/BrainFollow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6juckle11BrainFollowFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6juckle11BrainFollowFRQ43scn4step5enemy5Enemy: /* 802BB16C 002B6FAC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -84,7 +84,7 @@ onRecover__Q53scn4step5enemy6juckle11BrainFollowFv: __dt__Q53scn4step5enemy6juckle11BrainFollowFv: /* 802BB26C 002B70AC 4B FD 5E 00 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle11BrainFollow __vt__Q53scn4step5enemy6juckle11BrainFollow: .incbin "baserom.dol", 0x473C88, 0x20 diff --git a/asm/src/BrainGrandLowper.s b/asm/src/BrainGrandLowper.s index c68666bc..eac17e12 100644 --- a/asm/src/BrainGrandLowper.s +++ b/asm/src/BrainGrandLowper.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8armordee16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8armordee16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 80296234 00292074 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -107,7 +107,7 @@ __dt__Q53scn4step5enemy8armordee16BrainGrandLowperFv: __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80296388 002921C8 4B F9 83 18 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 80296D08 00292B48 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -181,7 +181,7 @@ __dt__Q53scn4step5enemy11bladeknight16BrainGrandLowperFv: __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80296DE8 00292C28 4B F9 78 B8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 8029CC0C 00298A4C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -316,7 +316,7 @@ __dt__Q53scn4step5enemy6bouncy16BrainGrandLowperFv: __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029CDD0 00298C10 4B F9 18 D0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 802A0C94 0029CAD4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -394,7 +394,7 @@ __dt__Q53scn4step5enemy11broomhatter16BrainGrandLowperFv: __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A0D78 0029CBB8 4B F8 D9 28 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 802BC5C4 002B8404 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -495,7 +495,7 @@ __dt__Q53scn4step5enemy4kabu16BrainGrandLowperFv: __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802BC704 002B8544 4B F7 1F 9C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 802C7770 002C35B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -661,7 +661,7 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22Sta __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C7988 002C37C8 4B F6 6D 18 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 802D9828 002D5668 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -737,7 +737,7 @@ __dt__Q53scn4step5enemy6scarfy16BrainGrandLowperFv: __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D9904 002D5744 4B F5 4D 9C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 802DCC50 002D8A90 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -905,7 +905,7 @@ __dt__Q53scn4step5enemy5sheld16BrainGrandLowperFv: __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DCE74 002D8CB4 4B F5 18 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee16BrainGrandLowperFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee16BrainGrandLowperFRQ43scn4step5enemy5Enemy: /* 802ED2C4 002E9104 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -981,7 +981,7 @@ __dt__Q53scn4step5enemy9waddledee16BrainGrandLowperFv: __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802ED3A0 002E91E0 4B F4 13 00 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46F500, 0x10 @@ -989,7 +989,7 @@ __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8armordee22 __vt__Q53scn4step5enemy8armordee16BrainGrandLowper: .incbin "baserom.dol", 0x46F510, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46F7A8, 0x10 @@ -997,7 +997,7 @@ __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknig __vt__Q53scn4step5enemy11bladeknight16BrainGrandLowper: .incbin "baserom.dol", 0x46F7B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4702A0, 0x10 @@ -1005,7 +1005,7 @@ __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22St __vt__Q53scn4step5enemy6bouncy16BrainGrandLowper: .incbin "baserom.dol", 0x4702B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470D50, 0x10 @@ -1013,7 +1013,7 @@ __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatt __vt__Q53scn4step5enemy11broomhatter16BrainGrandLowper: .incbin "baserom.dol", 0x470D60, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x473F70, 0x10 @@ -1021,7 +1021,7 @@ __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22Stat __vt__Q53scn4step5enemy4kabu16BrainGrandLowper: .incbin "baserom.dol", 0x473F80, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475820, 0x10 @@ -1032,7 +1032,7 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22Sta __vt__Q53scn4step5enemy5nruff16BrainGrandLowper: .incbin "baserom.dol", 0x475840, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4774D8, 0x10 @@ -1040,7 +1040,7 @@ __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy22St __vt__Q53scn4step5enemy6scarfy16BrainGrandLowper: .incbin "baserom.dol", 0x4774E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477B00, 0x10 @@ -1048,7 +1048,7 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22Sta __vt__Q53scn4step5enemy5sheld16BrainGrandLowper: .incbin "baserom.dol", 0x477B10, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479C48, 0x10 @@ -1056,12 +1056,12 @@ __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee2 __vt__Q53scn4step5enemy9waddledee16BrainGrandLowper: .incbin "baserom.dol", 0x479C58, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254927 $$254927: .incbin "baserom.dol", 0x49C648, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255058 $$255058: .incbin "baserom.dol", 0x49C8B0, 0x8 diff --git a/asm/src/BrainGround.s b/asm/src/BrainGround.s index 01f53bb9..24aa71b6 100644 --- a/asm/src/BrainGround.s +++ b/asm/src/BrainGround.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage11BrainGroundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage11BrainGroundFRQ43scn4step5enemy5Enemy: /* 802EA418 002E6258 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -60,7 +60,7 @@ lbl_802EA4B8: __dt__Q53scn4step5enemy9tsukikage11BrainGroundFv: /* 802EA4D8 002E6318 4B FA 6B 94 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage11BrainGround __vt__Q53scn4step5enemy9tsukikage11BrainGround: .incbin "baserom.dol", 0x4797C8, 0x20 diff --git a/asm/src/BrainHang.s b/asm/src/BrainHang.s index a627b0d9..8c27edb9 100644 --- a/asm/src/BrainHang.s +++ b/asm/src/BrainHang.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como9BrainHangFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como9BrainHangFRQ43scn4step5enemy5Enemy: /* 802A6F18 002A2D58 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -132,7 +132,7 @@ __dt__Q53scn4step5enemy4como9BrainHangFv: __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A70C4 002A2F04 4B F8 75 DC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateHang$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471AF0, 0x10 @@ -140,7 +140,7 @@ __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como9StateH __vt__Q53scn4step5enemy4como9BrainHang: .incbin "baserom.dol", 0x471B00, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255208 $$255208: .incbin "baserom.dol", 0x49C0A8, 0x8 diff --git a/asm/src/BrainJump.s b/asm/src/BrainJump.s index 8ee6bd30..78a241fa 100644 --- a/asm/src/BrainJump.s +++ b/asm/src/BrainJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper9BrainJumpFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper9BrainJumpFRQ43scn4step5enemy5Enemy: /* 80298C3C 00294A7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -91,7 +91,7 @@ onRecover__Q53scn4step5enemy7blipper9BrainJumpFv: __dt__Q53scn4step5enemy7blipper9BrainJumpFv: /* 80298D60 00294BA0 4B FF 83 0C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu9BrainJumpFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu9BrainJumpFRQ43scn4step5enemy5Enemy: /* 802BC708 002B8548 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -118,12 +118,12 @@ onStart__Q53scn4step5enemy4kabu9BrainJumpFv: __dt__Q53scn4step5enemy4kabu9BrainJumpFv: /* 802BC748 002B8588 4B FD 49 24 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9BrainJump __vt__Q53scn4step5enemy7blipper9BrainJump: .incbin "baserom.dol", 0x46FD60, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9BrainJump __vt__Q53scn4step5enemy4kabu9BrainJump: .incbin "baserom.dol", 0x473FA0, 0x20 diff --git a/asm/src/BrainJumpAttack.s b/asm/src/BrainJumpAttack.s index 52bdacb9..cece006f 100644 --- a/asm/src/BrainJumpAttack.s +++ b/asm/src/BrainJumpAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9sirkibble15BrainJumpAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9sirkibble15BrainJumpAttackFRQ43scn4step5enemy5Enemy: /* 802E11F8 002DD038 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -74,7 +74,7 @@ __dt__Q53scn4step5enemy9sirkibble15BrainJumpAttackFv: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E12D8 002DD118 4B F4 D3 C8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x478410, 0x10 diff --git a/asm/src/BrainJumpOrAttack.s b/asm/src/BrainJumpOrAttack.s index d625befa..0650fc36 100644 --- a/asm/src/BrainJumpOrAttack.s +++ b/asm/src/BrainJumpOrAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFRQ43scn4step5enemy5Enemy: /* 802EF958 002EB798 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -45,7 +45,7 @@ update__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv: __dt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttackFv: /* 802EF9D4 002EB814 4B FA 16 98 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttack __vt__Q53scn4step5enemy9waddledoo17BrainJumpOrAttack: .incbin "baserom.dol", 0x47A4F0, 0x20 diff --git a/asm/src/BrainMain.s b/asm/src/BrainMain.s index 565d6ecb..f8b73ec0 100644 --- a/asm/src/BrainMain.s +++ b/asm/src/BrainMain.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8dubiorjr9BrainMainFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8dubiorjr9BrainMainFRQ43scn4step5enemy5Enemy: /* 802ADEE8 002A9D28 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -66,12 +66,12 @@ onRecover__Q53scn4step5enemy8dubiorjr9BrainMainFv: __dt__Q53scn4step5enemy8dubiorjr9BrainMainFv: /* 802ADFB4 002A9DF4 4B FE 30 B8 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9BrainMain __vt__Q53scn4step5enemy8dubiorjr9BrainMain: .incbin "baserom.dol", 0x472290, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254871 $$254871: .incbin "baserom.dol", 0x49C2E8, 0x8 diff --git a/asm/src/BrainMove.s b/asm/src/BrainMove.s index b381e291..3bc10896 100644 --- a/asm/src/BrainMove.s +++ b/asm/src/BrainMove.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper9BrainMoveFRQ43scn4step5enemy5Enemy: /* 80298D64 00294BA4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -91,7 +91,7 @@ onRecover__Q53scn4step5enemy7blipper9BrainMoveFv: __dt__Q53scn4step5enemy7blipper9BrainMoveFv: /* 80298E88 00294CC8 4B FF 81 E4 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy9BrainMoveFRQ43scn4step5enemy5Enemy: /* 8029CDD4 00298C14 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -196,7 +196,7 @@ onRecover__Q53scn4step5enemy6bouncy9BrainMoveFv: __dt__Q53scn4step5enemy6bouncy9BrainMoveFv: /* 8029CF3C 00298D7C 4B FF 41 30 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6chilly9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6chilly9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802A605C 002A1E9C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -256,7 +256,7 @@ lbl_802A60FC: __dt__Q53scn4step5enemy6chilly9BrainMoveFv: /* 802A611C 002A1F5C 4B FE AF 50 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4elec9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4elec9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802AF4DC 002AB31C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -478,7 +478,7 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12State __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802AF79C 002AB5DC 4B F7 EF 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6flamer9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6flamer9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802B1DCC 002ADC0C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -586,7 +586,7 @@ onRecover__Q53scn4step5enemy6flamer9BrainMoveFv: __dt__Q53scn4step5enemy6flamer9BrainMoveFv: /* 802B1F34 002ADD74 4B FD F1 38 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5foley9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5foley9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802B42D4 002B0114 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -660,7 +660,7 @@ __dt__Q53scn4step5enemy5foley9BrainMoveFv: __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B43B4 002B01F4 4B F7 A2 EC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gordo9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gordo9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802B8A40 002B4880 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -818,7 +818,7 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17Sta __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B8C28 002B4A68 4B F7 5A 78 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802D3768 002CF5A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -932,7 +932,7 @@ lbl_802D38A4: __dt__Q53scn4step5enemy5rocky9BrainMoveFv: /* 802D38DC 002CF71C 4B FB D7 90 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8rollball9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8rollball9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802D608C 002D1ECC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1006,7 +1006,7 @@ __dt__Q53scn4step5enemy8rollball9BrainMoveFv: __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D616C 002D1FAC 4B F5 85 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11sisterbound9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11sisterbound9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802E25A0 002DE3E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1130,7 +1130,7 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterboun __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E2720 002DE560 4B F4 BF 80 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy3sun9BrainMoveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy3sun9BrainMoveFRQ43scn4step5enemy5Enemy: /* 802E86D0 002E4510 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1204,22 +1204,22 @@ __dt__Q53scn4step5enemy3sun9BrainMoveFv: __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E87B0 002E45F0 4B F4 5E F0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9BrainMove __vt__Q53scn4step5enemy7blipper9BrainMove: .incbin "baserom.dol", 0x46FD80, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy9BrainMove __vt__Q53scn4step5enemy6bouncy9BrainMove: .incbin "baserom.dol", 0x4702D0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly9BrainMove __vt__Q53scn4step5enemy6chilly9BrainMove: .incbin "baserom.dol", 0x4717F8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec12StateMoveCCW$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4725E0, 0x10 @@ -1236,12 +1236,12 @@ __vt__Q53scn4step5enemy4elec12StateMoveCWR: __vt__Q53scn4step5enemy4elec9BrainMove: .incbin "baserom.dol", 0x472648, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer9BrainMove __vt__Q53scn4step5enemy6flamer9BrainMove: .incbin "baserom.dol", 0x472B38, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x472DD8, 0x10 @@ -1249,7 +1249,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9State __vt__Q53scn4step5enemy5foley9BrainMove: .incbin "baserom.dol", 0x472DE8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo15StateMoveCircle$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4735E8, 0x10 @@ -1263,12 +1263,12 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17Sta __vt__Q53scn4step5enemy5gordo9BrainMove: .incbin "baserom.dol", 0x473618, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky9BrainMove __vt__Q53scn4step5enemy5rocky9BrainMove: .incbin "baserom.dol", 0x476C90, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477098, 0x10 @@ -1276,7 +1276,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball9St __vt__Q53scn4step5enemy8rollball9BrainMove: .incbin "baserom.dol", 0x4770A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterbound9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x478848, 0x10 @@ -1287,7 +1287,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11sisterboun __vt__Q53scn4step5enemy11sisterbound9BrainMove: .incbin "baserom.dol", 0x478868, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy3sun9StateMove$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479478, 0x10 diff --git a/asm/src/BrainMoveAround.s b/asm/src/BrainMoveAround.s index a4a3b459..a9f6d1e6 100644 --- a/asm/src/BrainMoveAround.s +++ b/asm/src/BrainMoveAround.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu15BrainMoveAroundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu15BrainMoveAroundFRQ43scn4step5enemy5Enemy: /* 802BC74C 002B858C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -115,7 +115,7 @@ __dt__Q53scn4step5enemy4kabu15BrainMoveAroundFv: __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802BC8C0 002B8700 4B F7 1D E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x473FC0, 0x10 diff --git a/asm/src/BrainMoveAttack.s b/asm/src/BrainMoveAttack.s index 0df636bd..ba62efc9 100644 --- a/asm/src/BrainMoveAttack.s +++ b/asm/src/BrainMoveAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4elec15BrainMoveAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4elec15BrainMoveAttackFRQ43scn4step5enemy5Enemy: /* 802AF7A0 002AB5E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -177,7 +177,7 @@ lbl_802AF9E4: __dt__Q53scn4step5enemy4elec15BrainMoveAttackFv: /* 802AF9FC 002AB83C 4B FE 16 70 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6flamer15BrainMoveAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6flamer15BrainMoveAttackFRQ43scn4step5enemy5Enemy: /* 802B1F38 002ADD78 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -338,7 +338,7 @@ lbl_802B213C: __dt__Q53scn4step5enemy6flamer15BrainMoveAttackFv: /* 802B2164 002ADFA4 4B FD EF 08 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFRQ43scn4step5enemy5Enemy: /* 802D156C 002CD3AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -402,22 +402,22 @@ onRecover__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv: __dt__Q53scn4step5enemy10poppybrojr15BrainMoveAttackFv: /* 802D1630 002CD470 4B FB FA 3C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec15BrainMoveAttack __vt__Q53scn4step5enemy4elec15BrainMoveAttack: .incbin "baserom.dol", 0x472668, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer15BrainMoveAttack __vt__Q53scn4step5enemy6flamer15BrainMoveAttack: .incbin "baserom.dol", 0x472B58, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr15BrainMoveAttack __vt__Q53scn4step5enemy10poppybrojr15BrainMoveAttack: .incbin "baserom.dol", 0x4767E8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255142 $$255142: .incbin "baserom.dol", 0x49C338, 0x4 diff --git a/asm/src/BrainMoveStraight.s b/asm/src/BrainMoveStraight.s index 522d103d..5b3f3a92 100644 --- a/asm/src/BrainMoveStraight.s +++ b/asm/src/BrainMoveStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu17BrainMoveStraightFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu17BrainMoveStraightFRQ43scn4step5enemy5Enemy: /* 802BC8C4 002B8704 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -65,7 +65,7 @@ onRecover__Q53scn4step5enemy4kabu17BrainMoveStraightFv: __dt__Q53scn4step5enemy4kabu17BrainMoveStraightFv: /* 802BC98C 002B87CC 4B FD 46 E0 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu17BrainMoveStraight __vt__Q53scn4step5enemy4kabu17BrainMoveStraight: .incbin "baserom.dol", 0x473FF0, 0x20 diff --git a/asm/src/BrainNoseDive.s b/asm/src/BrainNoseDive.s index 34b3adc4..a1059840 100644 --- a/asm/src/BrainNoseDive.s +++ b/asm/src/BrainNoseDive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee13BrainNoseDiveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee13BrainNoseDiveFRQ43scn4step5enemy5Enemy: /* 802CB6E0 002C7520 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -125,7 +125,7 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasolde __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CB858 002C7698 4B F6 2E 48 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo13BrainNoseDiveFRQ43scn4step5enemy5Enemy: /* 802CD80C 002C964C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -250,7 +250,7 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldo __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CD984 002C97C4 4B F6 0D 1C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476098, 0x10 @@ -261,7 +261,7 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasolde __vt__Q53scn4step5enemy10parasoldee13BrainNoseDive: .incbin "baserom.dol", 0x4760B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476248, 0x10 diff --git a/asm/src/BrainPuff.s b/asm/src/BrainPuff.s index cd1b3ecb..08aa893c 100644 --- a/asm/src/BrainPuff.s +++ b/asm/src/BrainPuff.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10stareffect9BrainPuffFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10stareffect9BrainPuffFRQ43scn4step5enemy5Enemy: /* 802E78C4 002E3704 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -74,7 +74,7 @@ __dt__Q53scn4step5enemy10stareffect9BrainPuffFv: __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E79A4 002E37E4 4B F4 6C FC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10stareffect9StatePuff$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479398, 0x10 diff --git a/asm/src/BrainPursuit.s b/asm/src/BrainPursuit.s index 085dbaf0..3282b266 100644 --- a/asm/src/BrainPursuit.s +++ b/asm/src/BrainPursuit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt12BrainPursuitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt12BrainPursuitFRQ43scn4step5enemy5Enemy: /* 8029EEE4 0029AD24 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -78,7 +78,7 @@ __dt__Q53scn4step5enemy10brontoburt12BrainPursuitFv: __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029EFC8 0029AE08 4B F8 F6 D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6shotzo12BrainPursuitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6shotzo12BrainPursuitFRQ43scn4step5enemy5Enemy: /* 802E00D8 002DBF18 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -138,7 +138,7 @@ lbl_802E0178: __dt__Q53scn4step5enemy6shotzo12BrainPursuitFv: /* 802E0198 002DBFD8 4B FB 0E D4 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StatePursuit$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470970, 0x10 @@ -146,7 +146,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontobur __vt__Q53scn4step5enemy10brontoburt12BrainPursuit: .incbin "baserom.dol", 0x470980, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo12BrainPursuit __vt__Q53scn4step5enemy6shotzo12BrainPursuit: .incbin "baserom.dol", 0x478118, 0x20 diff --git a/asm/src/BrainPursuitCeil.s b/asm/src/BrainPursuitCeil.s index 1cf05253..9d4406fb 100644 --- a/asm/src/BrainPursuitCeil.s +++ b/asm/src/BrainPursuitCeil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6shotzo16BrainPursuitCeilFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6shotzo16BrainPursuitCeilFRQ43scn4step5enemy5Enemy: /* 802E019C 002DBFDC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -27,7 +27,7 @@ onStart__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv: __dt__Q53scn4step5enemy6shotzo16BrainPursuitCeilFv: /* 802E01DC 002DC01C 4B FB 0E 90 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo16BrainPursuitCeil __vt__Q53scn4step5enemy6shotzo16BrainPursuitCeil: .incbin "baserom.dol", 0x478138, 0x20 diff --git a/asm/src/BrainRelease.s b/asm/src/BrainRelease.s index 3f7680c2..a2b3a615 100644 --- a/asm/src/BrainRelease.s +++ b/asm/src/BrainRelease.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee12BrainReleaseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee12BrainReleaseFRQ43scn4step5enemy5Enemy: /* 802CB85C 002C769C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -114,7 +114,7 @@ __dt__Q53scn4step5enemy10parasoldee12BrainReleaseFv: __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CB9AC 002C77EC 4B F6 2C F4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo12BrainReleaseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo12BrainReleaseFRQ43scn4step5enemy5Enemy: /* 802CD988 002C97C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -228,7 +228,7 @@ __dt__Q53scn4step5enemy10parasoldoo12BrainReleaseFv: __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CDAD8 002C9918 4B F6 0B C8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4760D8, 0x10 @@ -236,7 +236,7 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasolde __vt__Q53scn4step5enemy10parasoldee12BrainRelease: .incbin "baserom.dol", 0x4760E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo16StateParasolFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476288, 0x10 diff --git a/asm/src/BrainRise.s b/asm/src/BrainRise.s index 5f49d08b..40a7edae 100644 --- a/asm/src/BrainRise.s +++ b/asm/src/BrainRise.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7parasol9BrainRiseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7parasol9BrainRiseFRQ43scn4step5enemy5Enemy: /* 802CAA14 002C6854 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -74,7 +74,7 @@ __dt__Q53scn4step5enemy7parasol9BrainRiseFv: __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CAAF4 002C6934 4B F6 3B AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateLink$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475E98, 0x10 diff --git a/asm/src/BrainRun.s b/asm/src/BrainRun.s index c44c0b9b..ca112c79 100644 --- a/asm/src/BrainRun.s +++ b/asm/src/BrainRun.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff8BrainRunFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff8BrainRunFRQ43scn4step5enemy5Enemy: /* 802C798C 002C37CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -69,7 +69,7 @@ onRecover__Q53scn4step5enemy5nruff8BrainRunFv: __dt__Q53scn4step5enemy5nruff8BrainRunFv: /* 802C7A64 002C38A4 4B FC 96 08 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff8BrainRun __vt__Q53scn4step5enemy5nruff8BrainRun: .incbin "baserom.dol", 0x475860, 0x20 diff --git a/asm/src/BrainShot.s b/asm/src/BrainShot.s index 0be3c588..06bd5a92 100644 --- a/asm/src/BrainShot.s +++ b/asm/src/BrainShot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy14poppybrojrbomb9BrainShotFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy14poppybrojrbomb9BrainShotFRQ43scn4step5enemy5Enemy: /* 802D274C 002CE58C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -74,7 +74,7 @@ __dt__Q53scn4step5enemy14poppybrojrbomb9BrainShotFv: __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D282C 002CE66C 4B F5 BE 74 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4769C0, 0x10 diff --git a/asm/src/BrainSmoke.s b/asm/src/BrainSmoke.s index 9a24b46b..36070dfb 100644 --- a/asm/src/BrainSmoke.s +++ b/asm/src/BrainSmoke.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage10BrainSmokeFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage10BrainSmokeFRQ43scn4step5enemy5Enemy: /* 802EA4DC 002E631C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -60,7 +60,7 @@ lbl_802EA57C: __dt__Q53scn4step5enemy9tsukikage10BrainSmokeFv: /* 802EA59C 002E63DC 4B FA 6A D0 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage10BrainSmoke __vt__Q53scn4step5enemy9tsukikage10BrainSmoke: .incbin "baserom.dol", 0x4797E8, 0x20 diff --git a/asm/src/BrainTeleport.s b/asm/src/BrainTeleport.s index f43d7cf2..4ba4287d 100644 --- a/asm/src/BrainTeleport.s +++ b/asm/src/BrainTeleport.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu13BrainTeleportFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu13BrainTeleportFRQ43scn4step5enemy5Enemy: /* 802BC990 002B87D0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -77,7 +77,7 @@ __dt__Q53scn4step5enemy4kabu13BrainTeleportFv: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802BCA7C 002B88BC 4B F7 1C 24 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu13StateTeleport$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x474010, 0x10 diff --git a/asm/src/BrainTeleportRepeat.s b/asm/src/BrainTeleportRepeat.s index 6c3e9ac4..170ae485 100644 --- a/asm/src/BrainTeleportRepeat.s +++ b/asm/src/BrainTeleportRepeat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu19BrainTeleportRepeatFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu19BrainTeleportRepeatFRQ43scn4step5enemy5Enemy: /* 802BCA80 002B88C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ onRecover__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv: __dt__Q53scn4step5enemy4kabu19BrainTeleportRepeatFv: /* 802BCBE8 002B8A28 4B FD 44 84 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu19BrainTeleportRepeat __vt__Q53scn4step5enemy4kabu19BrainTeleportRepeat: .incbin "baserom.dol", 0x474040, 0x20 diff --git a/asm/src/BrainWait.s b/asm/src/BrainWait.s index 50cf1426..be18d272 100644 --- a/asm/src/BrainWait.s +++ b/asm/src/BrainWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy9BrainWaitFRQ43scn4step5enemy5Enemy: /* 8029CF40 00298D80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -100,7 +100,7 @@ onRecover__Q53scn4step5enemy6bouncy9BrainWaitFv: __dt__Q53scn4step5enemy6bouncy9BrainWaitFv: /* 8029D094 00298ED4 4B FF 3F D8 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6chilly9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6chilly9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802A6120 002A1F60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -160,7 +160,7 @@ lbl_802A61C0: __dt__Q53scn4step5enemy6chilly9BrainWaitFv: /* 802A61E0 002A2020 4B FE AE 8C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6degout9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6degout9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802AD0F0 002A8F30 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -236,7 +236,7 @@ __dt__Q53scn4step5enemy6degout9BrainWaitFv: __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802AD1CC 002A900C 4B F8 14 D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5foley9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5foley9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802B43B8 002B01F8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -310,7 +310,7 @@ __dt__Q53scn4step5enemy5foley9BrainWaitFv: __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B4498 002B02D8 4B F7 A2 08 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gemra9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gemra9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802B5688 002B14C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -449,7 +449,7 @@ update__Q53scn4step5enemy5gemra9BrainWaitFv: __dt__Q53scn4step5enemy5gemra9BrainWaitFv: /* 802B583C 002B167C 4B FD B8 30 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6lanzer9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6lanzer9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802C1B04 002BD944 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -557,7 +557,7 @@ lbl_802C1C4C: __dt__Q53scn4step5enemy6lanzer9BrainWaitFv: /* 802C1C60 002BDAA0 4B FC F4 0C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5noddy9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5noddy9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802C71A4 002C2FE4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -588,7 +588,7 @@ onLanding__Q53scn4step5enemy5noddy9BrainWaitFv: __dt__Q53scn4step5enemy5noddy9BrainWaitFv: /* 802C71E8 002C3028 4B FC 9E 84 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11sisterbound9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11sisterbound9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802E2724 002DE564 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -696,7 +696,7 @@ onRecover__Q53scn4step5enemy11sisterbound9BrainWaitFv: __dt__Q53scn4step5enemy11sisterbound9BrainWaitFv: /* 802E288C 002DE6CC 4B FA E7 E0 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802E495C 002E079C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -829,7 +829,7 @@ onRecover__Q53scn4step5enemy6sodory9BrainWaitFv: __dt__Q53scn4step5enemy6sodory9BrainWaitFv: /* 802E4B04 002E0944 4B FA C5 68 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee9BrainWaitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee9BrainWaitFRQ43scn4step5enemy5Enemy: /* 802ED3A4 002E91E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -968,17 +968,17 @@ __dt__Q53scn4step5enemy9waddledee9BrainWaitFv: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802ED574 002E93B4 4B F4 11 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy9BrainWait __vt__Q53scn4step5enemy6bouncy9BrainWait: .incbin "baserom.dol", 0x4702F0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly9BrainWait __vt__Q53scn4step5enemy6chilly9BrainWait: .incbin "baserom.dol", 0x471818, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8StateFly$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471FA8, 0x10 @@ -986,7 +986,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6degout8Stat __vt__Q53scn4step5enemy6degout9BrainWait: .incbin "baserom.dol", 0x471FB8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x472E08, 0x10 @@ -994,32 +994,32 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley9State __vt__Q53scn4step5enemy5foley9BrainWait: .incbin "baserom.dol", 0x472E18, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra9BrainWait __vt__Q53scn4step5enemy5gemra9BrainWait: .incbin "baserom.dol", 0x473070, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9BrainWait __vt__Q53scn4step5enemy6lanzer9BrainWait: .incbin "baserom.dol", 0x474C08, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5noddy9BrainWait __vt__Q53scn4step5enemy5noddy9BrainWait: .incbin "baserom.dol", 0x475630, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9BrainWait __vt__Q53scn4step5enemy11sisterbound9BrainWait: .incbin "baserom.dol", 0x478888, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory9BrainWait __vt__Q53scn4step5enemy6sodory9BrainWait: .incbin "baserom.dol", 0x478DB0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479C78, 0x10 diff --git a/asm/src/BrainWaitAndChase.s b/asm/src/BrainWaitAndChase.s index fbf03cfb..47add544 100644 --- a/asm/src/BrainWaitAndChase.s +++ b/asm/src/BrainWaitAndChase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6degout17BrainWaitAndChaseFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6degout17BrainWaitAndChaseFRQ43scn4step5enemy5Enemy: /* 802AD1D0 002A9010 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -31,7 +31,7 @@ onRecover__Q53scn4step5enemy6degout17BrainWaitAndChaseFv: __dt__Q53scn4step5enemy6degout17BrainWaitAndChaseFv: /* 802AD214 002A9054 4B FE 3E 58 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout17BrainWaitAndChase __vt__Q53scn4step5enemy6degout17BrainWaitAndChase: .incbin "baserom.dol", 0x471FD8, 0x20 diff --git a/asm/src/BrainWaitAttack.s b/asm/src/BrainWaitAttack.s index 7d271acb..7ba220d5 100644 --- a/asm/src/BrainWaitAttack.s +++ b/asm/src/BrainWaitAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFRQ43scn4step5enemy5Enemy: /* 802D1634 002CD474 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -31,7 +31,7 @@ onRecover__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv: __dt__Q53scn4step5enemy10poppybrojr15BrainWaitAttackFv: /* 802D1678 002CD4B8 4B FB F9 F4 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr15BrainWaitAttack __vt__Q53scn4step5enemy10poppybrojr15BrainWaitAttack: .incbin "baserom.dol", 0x476808, 0x20 diff --git a/asm/src/BrainWaitFlyStraight.s b/asm/src/BrainWaitFlyStraight.s index 8bc5bea2..0ddc7743 100644 --- a/asm/src/BrainWaitFlyStraight.s +++ b/asm/src/BrainWaitFlyStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFRQ43scn4step5enemy5Enemy: /* 8029EFCC 0029AE0C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -107,7 +107,7 @@ __dt__Q53scn4step5enemy10brontoburt20BrainWaitFlyStraightFv: __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029F120 0029AF60 4B F8 F5 80 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4709A0, 0x10 diff --git a/asm/src/BrainWaitPursuit.s b/asm/src/BrainWaitPursuit.s index 195f771f..7ba4f6e7 100644 --- a/asm/src/BrainWaitPursuit.s +++ b/asm/src/BrainWaitPursuit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFRQ43scn4step5enemy5Enemy: /* 8029F124 0029AF64 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -62,7 +62,7 @@ lbl_8029F1C0: __dt__Q53scn4step5enemy10brontoburt16BrainWaitPursuitFv: /* 8029F1E0 0029B020 4B FF 1E 8C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt16BrainWaitPursuit __vt__Q53scn4step5enemy10brontoburt16BrainWaitPursuit: .incbin "baserom.dol", 0x4709D0, 0x20 diff --git a/asm/src/BrainWalk.s b/asm/src/BrainWalk.s index 34b13610..89f6492b 100644 --- a/asm/src/BrainWalk.s +++ b/asm/src/BrainWalk.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight9BrainWalkFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight9BrainWalkFRQ43scn4step5enemy5Enemy: /* 80296DEC 00292C2C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -100,7 +100,7 @@ onLanding__Q53scn4step5enemy11bladeknight9BrainWalkFv: __dt__Q53scn4step5enemy11bladeknight9BrainWalkFv: /* 80296F28 00292D68 4B FF A1 44 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe9BrainWalkFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe9BrainWalkFRQ43scn4step5enemy5Enemy: /* 802BF0A0 002BAEE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -164,7 +164,7 @@ onLanding__Q53scn4step5enemy10knucklejoe9BrainWalkFv: __dt__Q53scn4step5enemy10knucklejoe9BrainWalkFv: /* 802BF164 002BAFA4 4B FD 1F 08 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6lanzer9BrainWalkFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6lanzer9BrainWalkFRQ43scn4step5enemy5Enemy: /* 802C1C64 002BDAA4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -228,7 +228,7 @@ onLanding__Q53scn4step5enemy6lanzer9BrainWalkFv: __dt__Q53scn4step5enemy6lanzer9BrainWalkFv: /* 802C1D28 002BDB68 4B FC F3 44 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5noddy9BrainWalkFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5noddy9BrainWalkFRQ43scn4step5enemy5Enemy: /* 802C71EC 002C302C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -288,7 +288,7 @@ lbl_802C728C: __dt__Q53scn4step5enemy5noddy9BrainWalkFv: /* 802C72AC 002C30EC 4B FC 9D C0 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee9BrainWalkFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee9BrainWalkFRQ43scn4step5enemy5Enemy: /* 802CB9B0 002C77F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -354,7 +354,7 @@ update__Q53scn4step5enemy10parasoldee9BrainWalkFv: __dt__Q53scn4step5enemy10parasoldee9BrainWalkFv: /* 802CBA70 002C78B0 4B FC 55 FC */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo9BrainWalkFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo9BrainWalkFRQ43scn4step5enemy5Enemy: /* 802CDADC 002C991C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -420,7 +420,7 @@ update__Q53scn4step5enemy10parasoldoo9BrainWalkFv: __dt__Q53scn4step5enemy10parasoldoo9BrainWalkFv: /* 802CDB9C 002C99DC 4B FC 34 D0 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky9BrainWalkFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky9BrainWalkFRQ43scn4step5enemy5Enemy: /* 802D38E0 002CF720 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -451,37 +451,37 @@ onRecover__Q53scn4step5enemy5rocky9BrainWalkFv: __dt__Q53scn4step5enemy5rocky9BrainWalkFv: /* 802D3924 002CF764 4B FB D7 48 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight9BrainWalk __vt__Q53scn4step5enemy11bladeknight9BrainWalk: .incbin "baserom.dol", 0x46F7D8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe9BrainWalk __vt__Q53scn4step5enemy10knucklejoe9BrainWalk: .incbin "baserom.dol", 0x474470, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9BrainWalk __vt__Q53scn4step5enemy6lanzer9BrainWalk: .incbin "baserom.dol", 0x474C28, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5noddy9BrainWalk __vt__Q53scn4step5enemy5noddy9BrainWalk: .incbin "baserom.dol", 0x475650, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee9BrainWalk __vt__Q53scn4step5enemy10parasoldee9BrainWalk: .incbin "baserom.dol", 0x476108, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo9BrainWalk __vt__Q53scn4step5enemy10parasoldoo9BrainWalk: .incbin "baserom.dol", 0x4762B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky9BrainWalk __vt__Q53scn4step5enemy5rocky9BrainWalk: .incbin "baserom.dol", 0x476CB0, 0x20 diff --git a/asm/src/BrainWalkAround.s b/asm/src/BrainWalkAround.s index 990e5375..10d7554d 100644 --- a/asm/src/BrainWalkAround.s +++ b/asm/src/BrainWalkAround.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common15BrainWalkAroundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common15BrainWalkAroundFRQ43scn4step5enemy5Enemy: /* 8029156C 0028D3AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -60,7 +60,7 @@ lbl_8029160C: __dt__Q53scn4step5enemy6common15BrainWalkAroundFv: /* 8029162C 0028D46C 4B FF FA 40 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter15BrainWalkAroundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter15BrainWalkAroundFRQ43scn4step5enemy5Enemy: /* 802A0D7C 0029CBBC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -134,7 +134,7 @@ __dt__Q53scn4step5enemy11broomhatter15BrainWalkAroundFv: __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A0E5C 0029CC9C 4B F8 D8 44 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6lanzer15BrainWalkAroundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6lanzer15BrainWalkAroundFRQ43scn4step5enemy5Enemy: /* 802C1D2C 002BDB6C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -270,7 +270,7 @@ onRecover__Q53scn4step5enemy6lanzer15BrainWalkAroundFv: __dt__Q53scn4step5enemy6lanzer15BrainWalkAroundFv: /* 802C1EE0 002BDD20 4B FC F1 8C */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory15BrainWalkAroundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory15BrainWalkAroundFRQ43scn4step5enemy5Enemy: /* 802E4B08 002E0948 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -364,7 +364,7 @@ onRecover__Q53scn4step5enemy6sodory15BrainWalkAroundFv: __dt__Q53scn4step5enemy6sodory15BrainWalkAroundFv: /* 802E4C38 002E0A78 4B FA C4 34 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledoo15BrainWalkAroundFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledoo15BrainWalkAroundFRQ43scn4step5enemy5Enemy: /* 802EF9D8 002EB818 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -395,12 +395,12 @@ update__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv: __dt__Q53scn4step5enemy9waddledoo15BrainWalkAroundFv: /* 802EFA1C 002EB85C 4B FA 16 50 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common15BrainWalkAround __vt__Q53scn4step5enemy6common15BrainWalkAround: .incbin "baserom.dol", 0x46F088, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter15StateWalkAround$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470D80, 0x10 @@ -408,17 +408,17 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatt __vt__Q53scn4step5enemy11broomhatter15BrainWalkAround: .incbin "baserom.dol", 0x470D90, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer15BrainWalkAround __vt__Q53scn4step5enemy6lanzer15BrainWalkAround: .incbin "baserom.dol", 0x474C48, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory15BrainWalkAround __vt__Q53scn4step5enemy6sodory15BrainWalkAround: .incbin "baserom.dol", 0x478DD0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo15BrainWalkAround __vt__Q53scn4step5enemy9waddledoo15BrainWalkAround: .incbin "baserom.dol", 0x47A510, 0x20 diff --git a/asm/src/BrainWalkStepBack.s b/asm/src/BrainWalkStepBack.s index 2cbbaf21..2a02d656 100644 --- a/asm/src/BrainWalkStepBack.s +++ b/asm/src/BrainWalkStepBack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFRQ43scn4step5enemy5Enemy: /* 802BF168 002BAFA8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -111,7 +111,7 @@ update__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv: __dt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBackFv: /* 802BF2C4 002BB104 4B FD 1D A8 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBack __vt__Q53scn4step5enemy10knucklejoe17BrainWalkStepBack: .incbin "baserom.dol", 0x474490, 0x20 diff --git a/asm/src/BrainWalkStraight.s b/asm/src/BrainWalkStraight.s index b4571607..af3c98c3 100644 --- a/asm/src/BrainWalkStraight.s +++ b/asm/src/BrainWalkStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common17BrainWalkStraightFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common17BrainWalkStraightFRQ43scn4step5enemy5Enemy: /* 80291630 0028D470 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -65,7 +65,7 @@ lbl_802916E4: __dt__Q53scn4step5enemy6common17BrainWalkStraightFv: /* 80291704 0028D544 4B FF F9 68 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledoo17BrainWalkStraightFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledoo17BrainWalkStraightFRQ43scn4step5enemy5Enemy: /* 802EFA20 002EB860 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -96,12 +96,12 @@ update__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv: __dt__Q53scn4step5enemy9waddledoo17BrainWalkStraightFv: /* 802EFA64 002EB8A4 4B FA 16 08 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common17BrainWalkStraight __vt__Q53scn4step5enemy6common17BrainWalkStraight: .incbin "baserom.dol", 0x46F0A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo17BrainWalkStraight __vt__Q53scn4step5enemy9waddledoo17BrainWalkStraight: .incbin "baserom.dol", 0x47A530, 0x20 diff --git a/asm/src/BrainWalkTurnCliff.s b/asm/src/BrainWalkTurnCliff.s index 36a3ee3a..4efed0b9 100644 --- a/asm/src/BrainWalkTurnCliff.s +++ b/asm/src/BrainWalkTurnCliff.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common18BrainWalkTurnCliffFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common18BrainWalkTurnCliffFRQ43scn4step5enemy5Enemy: /* 80291708 0028D548 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -27,7 +27,7 @@ onLanding__Q53scn4step5enemy6common18BrainWalkTurnCliffFv: __dt__Q53scn4step5enemy6common18BrainWalkTurnCliffFv: /* 80291748 0028D588 4B FF F9 24 */ b __dt__Q53scn4step5enemy6common17BrainCreditPraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common18BrainWalkTurnCliff __vt__Q53scn4step5enemy6common18BrainWalkTurnCliff: .incbin "baserom.dol", 0x46F0C8, 0x20 diff --git a/asm/src/BrainWall.s b/asm/src/BrainWall.s index 3ad4ab48..7b8bae6f 100644 --- a/asm/src/BrainWall.s +++ b/asm/src/BrainWall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage9BrainWallFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage9BrainWallFRQ43scn4step5enemy5Enemy: /* 802EA5A0 002E63E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -107,7 +107,7 @@ __dt__Q53scn4step5enemy9tsukikage9BrainWallFv: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EA6F4 002E6534 4B F4 3F AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479808, 0x10 diff --git a/asm/src/BrainWhispy.s b/asm/src/BrainWhispy.s index 959d52c9..d83237ac 100644 --- a/asm/src/BrainWhispy.s +++ b/asm/src/BrainWhispy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt11BrainWhispyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt11BrainWhispyFRQ43scn4step5enemy5Enemy: /* 8029F1E4 0029B024 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -82,7 +82,7 @@ __dt__Q53scn4step5enemy10brontoburt11BrainWhispyFv: __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029F2D8 0029B118 4B F8 F3 C8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como11BrainWhispyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como11BrainWhispyFRQ43scn4step5enemy5Enemy: /* 802A70C8 002A2F08 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -195,7 +195,7 @@ __dt__Q53scn4step5enemy4como11BrainWhispyFv: __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A7234 002A3074 4B F8 74 6C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gordo11BrainWhispyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gordo11BrainWhispyFRQ43scn4step5enemy5Enemy: /* 802B8C2C 002B4A6C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -275,7 +275,7 @@ __dt__Q53scn4step5enemy5gordo11BrainWhispyFv: __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B8D24 002B4B64 4B F7 59 7C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy11BrainWhispyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy11BrainWhispyFRQ43scn4step5enemy5Enemy: /* 802D9908 002D5748 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -357,7 +357,7 @@ __dt__Q53scn4step5enemy6scarfy11BrainWhispyFv: __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D99FC 002D583C 4B F5 4C A4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee11BrainWhispyFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee11BrainWhispyFRQ43scn4step5enemy5Enemy: /* 802ED578 002E93B8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -439,7 +439,7 @@ __dt__Q53scn4step5enemy9waddledee11BrainWhispyFv: __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802ED66C 002E94AC 4B F4 10 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4709F0, 0x10 @@ -447,7 +447,7 @@ __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontobur __vt__Q53scn4step5enemy10brontoburt11BrainWhispy: .incbin "baserom.dol", 0x470A00, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11StateAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471B20, 0x10 @@ -455,7 +455,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como11State __vt__Q53scn4step5enemy4como11BrainWhispy: .incbin "baserom.dol", 0x471B30, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x473638, 0x10 @@ -463,7 +463,7 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5gordo17Sta __vt__Q53scn4step5enemy5gordo11BrainWhispy: .incbin "baserom.dol", 0x473648, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477508, 0x10 @@ -471,7 +471,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6scarfy17St __vt__Q53scn4step5enemy6scarfy11BrainWhispy: .incbin "baserom.dol", 0x477518, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee17StateWhispyAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479CA8, 0x10 diff --git a/asm/src/Button.s b/asm/src/Button.s index 3fb33e92..21481833 100644 --- a/asm/src/Button.s +++ b/asm/src/Button.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q23hid6ButtonFUl update__Q23hid6ButtonFUl: /* 801A2224 0019E064 80 A3 00 00 */ lwz r5, 0(r3) @@ -27,7 +27,7 @@ isTrigger__Q23hid6ButtonCFUl: /* 801A2260 0019E0A0 7C 60 19 10 */ subfe r3, r0, r3 /* 801A2264 0019E0A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info6common6ButtonFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorbb __ct__Q34info6common6ButtonFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorbb: /* 801A7DB0 001A3BF0 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -419,7 +419,7 @@ lbl_801A82F0: /* 801A8304 001A4144 38 21 00 10 */ addi r1, r1, 0x10 /* 801A8308 001A4148 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail6ButtonFRQ23mem10IAllocatorQ23lyt12PaneAccessorQ43scn7history6detail10ButtonKindb __ct__Q43scn7history6detail6ButtonFRQ23mem10IAllocatorQ23lyt12PaneAccessorQ43scn7history6detail10ButtonKindb: /* 80211260 0020D0A0 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -615,17 +615,17 @@ canCursorMoveRight__Q43scn7history6detail6ButtonCFv: /* 802114D4 0020D314 88 63 00 03 */ lbz r3, 3(r3) /* 802114D8 0020D318 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251957 $$251957: .incbin "baserom.dol", 0x410C60, 0x10 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global MOVE_TABLE__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2 MOVE_TABLE__Q43scn7history6detail20$$2unnamed$$2Button_cpp$$2: .incbin "baserom.dol", 0x411D48, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252299 $$252299: .incbin "baserom.dol", 0x453440, 0xC @@ -648,7 +648,7 @@ $$252361: $$252370: .incbin "baserom.dol", 0x45348C, 0x3C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251572 $$251572: .incbin "baserom.dol", 0x45D7A0, 0x10 @@ -722,7 +722,7 @@ $$252203: $$252204: .incbin "baserom.dol", 0x45D960, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252301 $$252301: .incbin "baserom.dol", 0x493378, 0x8 @@ -748,12 +748,12 @@ $$251956: $$251965: .incbin "baserom.dol", 0x4933B0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252265 $$252265: .incbin "baserom.dol", 0x494AB8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252388 $$252388: .incbin "baserom.dol", 0x49A488, 0x8 diff --git a/asm/src/ButtonHelp.s b/asm/src/ButtonHelp.s index ffc2be1f..b09d1125 100644 --- a/asm/src/ButtonHelp.s +++ b/asm/src/ButtonHelp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info6common10ButtonHelpFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ44info6common9WiiButton4Kind __ct__Q34info6common10ButtonHelpFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ44info6common9WiiButton4Kind: /* 801A830C 001A414C 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -181,7 +181,7 @@ init__Q34info6common10ButtonHelpFRCQ23lyt12PaneAccessor: /* 801A8574 001A43B4 38 21 00 30 */ addi r1, r1, 0x30 /* 801A8578 001A43B8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252014 $$252014: .incbin "baserom.dol", 0x4534C8, 0xC @@ -195,7 +195,7 @@ $$252016: $$252073: .incbin "baserom.dol", 0x4534F0, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252060 $$252060: .incbin "baserom.dol", 0x4933B8, 0x8 diff --git a/asm/src/ButtonPanel.s b/asm/src/ButtonPanel.s index 6ed63aa4..c53032ee 100644 --- a/asm/src/ButtonPanel.s +++ b/asm/src/ButtonPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause11ButtonPanelFRQ25pause9ComponentPCcRCQ23lyt12PaneAccessorPCwb __ct__Q25pause11ButtonPanelFRQ25pause9ComponentPCcRCQ23lyt12PaneAccessorPCwb: /* 801DA574 001D63B4 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -145,7 +145,7 @@ lbl_801DA740: /* 801DA74C 001D658C 38 21 00 10 */ addi r1, r1, 0x10 /* 801DA750 001D6590 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252079 $$252079: .incbin "baserom.dol", 0x459520, 0xC @@ -162,7 +162,7 @@ $$252130: $$252131: .incbin "baserom.dol", 0x459550, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252122 $$252122: .incbin "baserom.dol", 0x493A40, 0x8 diff --git a/asm/src/Camera.s b/asm/src/Camera.s index a0fde2d1..e8b48974 100644 --- a/asm/src/Camera.s +++ b/asm/src/Camera.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn9grandmenu6CameraFff __ct__Q33scn9grandmenu6CameraFff: /* 803F2B1C 003EE95C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -122,7 +122,7 @@ viewMtx__Q33scn9grandmenu6CameraFv: /* 803F2CBC 003EEAFC 38 21 00 40 */ addi r1, r1, 0x40 /* 803F2CC0 003EEB00 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251509 $$251509: .incbin "baserom.dol", 0x49ED30, 0x4 diff --git a/asm/src/CameraAccessor.s b/asm/src/CameraAccessor.s index f1ee0c0d..2486975d 100644 --- a/asm/src/CameraAccessor.s +++ b/asm/src/CameraAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global viewMtx__Q23g3d14CameraAccessorCFv viewMtx__Q23g3d14CameraAccessorCFv: /* 8018BE84 00187CC4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -124,7 +124,7 @@ getProjFar__Q23g3d14CameraAccessorCFv: /* 8018BFD4 00187E14 38 21 00 10 */ addi r1, r1, 0x10 /* 8018BFD8 00187E18 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera14CameraAccessorFRQ33scn4step9Component __ct__Q43scn4step6camera14CameraAccessorFRQ33scn4step9Component: /* 80262A18 0025E858 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -602,7 +602,7 @@ toLayoutPos__Q43scn4step6camera14CameraAccessorCFQ43scn4step6camera4KindRCQ33hel /* 8026308C 0025EECC 38 21 00 50 */ addi r1, r1, 0x50 /* 80263090 0025EED0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2ref__Q34nw4r3g3d34ResCommon$$0Q34nw4r3g3d10CameraData$$1Fv$$20 $$2STRING$$2ref__Q34nw4r3g3d34ResCommon$$0Q34nw4r3g3d10CameraData$$1Fv$$20: .incbin "baserom.dol", 0x450258, 0x28 @@ -610,12 +610,12 @@ $$2STRING$$2ref__Q34nw4r3g3d34ResCommon$$0Q34nw4r3g3d10CameraData$$1Fv$$20: $$2STRING$$2ref__Q34nw4r3g3d34ResCommon$$0Q34nw4r3g3d10CameraData$$1Fv: .incbin "baserom.dol", 0x450280, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2__ct__Q43scn4step6camera13ParamAccessorFv $$2STRING$$2__ct__Q43scn4step6camera13ParamAccessorFv: .incbin "baserom.dol", 0x467228, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252507 $$252507: .incbin "baserom.dol", 0x49B5F8, 0x4 diff --git a/asm/src/CameraController.s b/asm/src/CameraController.s index b6243c67..27bb3e11 100644 --- a/asm/src/CameraController.s +++ b/asm/src/CameraController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera16CameraControllerFRQ33scn4step9Component __ct__Q43scn4step6camera16CameraControllerFRQ33scn4step9Component: /* 80263094 0025EED4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1896,7 +1896,7 @@ lbl_80264A1C: /* 80264A48 00260888 38 21 00 40 */ addi r1, r1, 0x40 /* 80264A4C 0026088C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258912 $$258912: .incbin "baserom.dol", 0x49B600, 0x4 diff --git a/asm/src/CameraCtrl.s b/asm/src/CameraCtrl.s index c717cf43..a1384537 100644 --- a/asm/src/CameraCtrl.s +++ b/asm/src/CameraCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history10CameraCtrlFQ23g3d14CameraAccessor __ct__Q33scn7history10CameraCtrlFQ23g3d14CameraAccessor: /* 8020729C 002030DC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -121,7 +121,7 @@ update__Q33scn7history10CameraCtrlFRCQ33hel4math7Vector3: /* 8020745C 0020329C 38 21 00 90 */ addi r1, r1, 0x90 /* 80207460 002032A0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo10CameraCtrlFRQ33scn4step9Componentff __ct__Q53scn4step7gimmick11areamapdemo10CameraCtrlFRQ33scn4step9Componentff: /* 802FA448 002F6288 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -744,7 +744,7 @@ __vc__Q33hel6common75MutableArray$$0Q63scn4step7gimmick11areamapdemo10CameraCtrl /* 802FACFC 002F6B3C 38 21 00 10 */ addi r1, r1, 0x10 /* 802FAD00 002F6B40 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252141 $$252141: .incbin "baserom.dol", 0x49AB58, 0x4 @@ -767,7 +767,7 @@ $$252146: $$252147: .incbin "baserom.dol", 0x49AB70, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254595 $$254595: .incbin "baserom.dol", 0x49D130, 0x4 diff --git a/asm/src/CameraInfo.s b/asm/src/CameraInfo.s index 663b3509..306d97bf 100644 --- a/asm/src/CameraInfo.s +++ b/asm/src/CameraInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail10CameraInfoFv __ct__Q36effect6detail10CameraInfoFv: /* 8017F338 0017B178 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -25,7 +25,7 @@ __ct__Q36effect6detail10CameraInfoFv: /* 8017F384 0017B1C4 38 21 00 10 */ addi r1, r1, 0x10 /* 8017F388 0017B1C8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251288 $$251288: .incbin "baserom.dol", 0x49A170, 0x4 diff --git a/asm/src/CameraLock.s b/asm/src/CameraLock.s index cbfaf104..731de5f8 100644 --- a/asm/src/CameraLock.s +++ b/asm/src/CameraLock.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock10CameraLockFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick10cameralock10CameraLockFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80302E64 002FECA4 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -404,7 +404,7 @@ lbl_803033F0: /* 803033FC 002FF23C 38 21 00 10 */ addi r1, r1, 0x10 /* 80303400 002FF240 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251420 $$251420: .incbin "baserom.dol", 0x47C390, 0x18 diff --git a/asm/src/CameraLockPauseRequestor.s b/asm/src/CameraLockPauseRequestor.s index 173d6dc9..bcf24b1a 100644 --- a/asm/src/CameraLockPauseRequestor.s +++ b/asm/src/CameraLockPauseRequestor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q43scn4step6camera24CameraLockPauseRequestorFv __dt__Q43scn4step6camera24CameraLockPauseRequestorFv: /* 80264A50 00260890 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/CameraManager.s b/asm/src/CameraManager.s index f8d8d960..b691c9bf 100644 --- a/asm/src/CameraManager.s +++ b/asm/src/CameraManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn11staffcredit13CameraManagerFRQ33scn11staffcredit9Component __ct__Q33scn11staffcredit13CameraManagerFRQ33scn11staffcredit9Component: /* 803F8C14 003F4A54 90 83 00 00 */ stw r4, 0(r3) @@ -342,7 +342,7 @@ lbl_803F90DC: /* 803F90E8 003F4F28 38 21 00 10 */ addi r1, r1, 0x10 /* 803F90EC 003F4F2C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254825 $$254825: .incbin "baserom.dol", 0x49ED90, 0x4 diff --git a/asm/src/CameraSet.s b/asm/src/CameraSet.s index 76f9f044..ee7554bd 100644 --- a/asm/src/CameraSet.s +++ b/asm/src/CameraSet.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn9grandmenu9CameraSetFRQ33scn9grandmenu9Component __ct__Q33scn9grandmenu9CameraSetFRQ33scn9grandmenu9Component: /* 803F2CC4 003EEB04 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -129,7 +129,7 @@ camera__Q33scn9grandmenu9CameraSetFQ33scn9grandmenu13DrawLayerKind: /* 803F2E78 003EECB8 38 21 00 10 */ addi r1, r1, 0x10 /* 803F2E7C 003EECBC 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251461 $$251461: .incbin "baserom.dol", 0x49ED50, 0x4 diff --git a/asm/src/CameraTarget.s b/asm/src/CameraTarget.s index 713dcfe5..6697de1c 100644 --- a/asm/src/CameraTarget.s +++ b/asm/src/CameraTarget.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero12CameraTargetFRQ43scn4step4hero4HeroRCQ33hel4math7Vector2 __ct__Q43scn4step4hero12CameraTargetFRQ43scn4step4hero4HeroRCQ33hel4math7Vector2: /* 80330824 0032C664 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -978,7 +978,7 @@ lbl_803315C4: /* 803315F8 0032D438 38 21 00 40 */ addi r1, r1, 0x40 /* 803315FC 0032D43C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon12CameraTargetFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon12CameraTargetFRQ43scn4step6weapon6Weapon: /* 803D36B0 003CF4F0 90 83 00 00 */ stw r4, 0(r3) @@ -1026,7 +1026,7 @@ lbl_803D373C: /* 803D3748 003CF588 38 21 00 30 */ addi r1, r1, 0x30 /* 803D374C 003CF58C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256033 $$256033: .incbin "baserom.dol", 0x49D658, 0x4 @@ -1076,7 +1076,7 @@ $$256126: $$256203: .incbin "baserom.dol", 0x49D694, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253235 $$253235: .incbin "baserom.dol", 0x49E840, 0x8 diff --git a/asm/src/CaptureAttacker.s b/asm/src/CaptureAttacker.s index 31e7bed6..217f1670 100644 --- a/asm/src/CaptureAttacker.s +++ b/asm/src/CaptureAttacker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero15CaptureAttackerFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero15CaptureAttackerFRQ43scn4step4hero4Hero: /* 80331600 0032D440 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -957,7 +957,7 @@ setIgnoreMapColl__Q43scn4step4hero15CaptureAttackerFb: /* 80332300 0032E140 98 83 00 44 */ stb r4, 0x44(r3) /* 80332304 0032E144 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .incbin "baserom.dol", 0x47FCD0, 0x24 @@ -977,7 +977,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4h $$2STRING$$2GetBack__Q34nw4r2ut93LinkList$$0Q24util72ObjListNode$$0Q43scn4step4hero15CaptureAttacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x47FD54, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257629 $$257629: .incbin "baserom.dol", 0x49D698, 0x4 diff --git a/asm/src/CaptureCtrl.s b/asm/src/CaptureCtrl.s index b924869b..e8c94af4 100644 --- a/asm/src/CaptureCtrl.s +++ b/asm/src/CaptureCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss13watergalboros11CaptureCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss13watergalboros11CaptureCtrlFRQ43scn4step4boss4Boss: /* 80259634 00255474 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -184,7 +184,7 @@ getResistPower__Q53scn4step4boss13watergalboros11CaptureCtrlCFv: /* 80259894 002556D4 38 63 00 04 */ addi r3, r3, 4 /* 80259898 002556D8 48 0D 93 D8 */ b getResistPower__Q43scn4step4hero19CaptureHeroAttackerCFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy11CaptureCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy11CaptureCtrlFRQ43scn4step4boss4Boss: /* 8025B8F0 00257730 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/CaptureHeroAttacker.s b/asm/src/CaptureHeroAttacker.s index 5232ac0f..514e4c20 100644 --- a/asm/src/CaptureHeroAttacker.s +++ b/asm/src/CaptureHeroAttacker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero19CaptureHeroAttackerFRQ33scn4step9ComponentRQ25ocoll9SearchHit __ct__Q43scn4step4hero19CaptureHeroAttackerFRQ33scn4step9ComponentRQ25ocoll9SearchHit: /* 80332308 0032E148 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -780,7 +780,7 @@ lbl_80332D5C: /* 80332D6C 0032EBAC 38 21 00 20 */ addi r1, r1, 0x20 /* 80332D70 0032EBB0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroAttacker$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x47FD60, 0x24 diff --git a/asm/src/CaptureHeroReceiver.s b/asm/src/CaptureHeroReceiver.s index 831a2d1f..55bc008b 100644 --- a/asm/src/CaptureHeroReceiver.s +++ b/asm/src/CaptureHeroReceiver.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero19CaptureHeroReceiverFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero19CaptureHeroReceiverFRQ43scn4step4hero4Hero: /* 80332D74 0032EBB4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1030,7 +1030,7 @@ __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured24S __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1Fv: /* 80333B0C 0032F94C 4B EF AB 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured25StateCapturedWhispyVacuum$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x47FE50, 0x10 @@ -1068,7 +1068,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4h $$2STRING$$2GetBack__Q34nw4r2ut97LinkList$$0Q24util76ObjListNode$$0Q43scn4step4hero19CaptureHeroReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x47FF34, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259086 $$259086: .incbin "baserom.dol", 0x49D6A8, 0x4 diff --git a/asm/src/CaptureReceiver.s b/asm/src/CaptureReceiver.s index 85993cbc..b558db3d 100644 --- a/asm/src/CaptureReceiver.s +++ b/asm/src/CaptureReceiver.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy15CaptureReceiverFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy15CaptureReceiverFRQ43scn4step5enemy5Enemy: /* 80281100 0027CF40 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -785,7 +785,7 @@ isIgnoredNonSuper__Q43scn4step5enemy15CaptureReceiverCFv: /* 80281B4C 0027D98C 88 63 00 2D */ lbz r3, 0x2d(r3) /* 80281B50 0027D990 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x46DB90, 0x24 @@ -817,7 +817,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5e $$2STRING$$2GetBack__Q34nw4r2ut94LinkList$$0Q24util73ObjListNode$$0Q43scn4step5enemy15CaptureReceiver$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x46DC74, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258668 $$258668: .incbin "baserom.dol", 0x49B930, 0x8 diff --git a/asm/src/CarryBlock.s b/asm/src/CarryBlock.s index 960f75ff..f7bb2d77 100644 --- a/asm/src/CarryBlock.s +++ b/asm/src/CarryBlock.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle10CarryBlockFRQ33scn10grandtitle9ComponentRQ23g3d10CharaModel __ct__Q33scn10grandtitle10CarryBlockFRQ33scn10grandtitle9ComponentRQ23g3d10CharaModel: /* 80200E30 001FCC70 94 21 FE E0 */ stwu r1, -0x120(r1) @@ -108,7 +108,7 @@ update__Q33scn10grandtitle10CarryBlockFv: /* 80200FBC 001FCDFC 38 21 00 50 */ addi r1, r1, 0x50 /* 80200FC0 001FCE00 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251790 $$251790: .incbin "baserom.dol", 0x45C790, 0x18 @@ -116,7 +116,7 @@ $$251790: $$252260: .incbin "baserom.dol", 0x45C7A8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle24$$2unnamed$$2CarryBlock_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle24$$2unnamed$$2CarryBlock_cpp$$2: .incbin "baserom.dol", 0x494780, 0x4 @@ -124,7 +124,7 @@ G3D_RES_FILE_PATH__Q33scn10grandtitle24$$2unnamed$$2CarryBlock_cpp$$2: $$252259: .incbin "baserom.dol", 0x494784, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252261 $$252261: .incbin "baserom.dol", 0x49AA88, 0x4 diff --git a/asm/src/Catcher.s b/asm/src/Catcher.s index ae358e59..edf26d9b 100644 --- a/asm/src/Catcher.s +++ b/asm/src/Catcher.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item7CatcherFRQ33scn4step9ComponentUl __ct__Q43scn4step4item7CatcherFRQ33scn4step9ComponentUl: /* 803C0740 003BC580 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -542,7 +542,7 @@ setIsOwnerHero__Q43scn4step4item7CatcherFb: /* 803C0E38 003BCC78 98 83 01 30 */ stb r4, 0x130(r3) /* 803C0E3C 003BCC7C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .incbin "baserom.dol", 0x48DDB8, 0x24 @@ -562,7 +562,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4i $$2STRING$$2GetBack__Q34nw4r2ut84LinkList$$0Q24util63ObjListNode$$0Q43scn4step4item7Catcher$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x48DE3C, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251966 $$251966: .incbin "baserom.dol", 0x49E4E8, 0x8 diff --git a/asm/src/ChainStarter.s b/asm/src/ChainStarter.s index a0e435ea..b48c9a7c 100644 --- a/asm/src/ChainStarter.s +++ b/asm/src/ChainStarter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick12chainstarter12ChainStarterFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager __ct__Q53scn4step7gimmick12chainstarter12ChainStarterFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager: /* 80305780 003015C0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -89,7 +89,7 @@ onSwitchOn__Q53scn4step7gimmick12chainstarter12ChainStarterFv: /* 803058B0 003016F0 38 21 00 20 */ addi r1, r1, 0x20 /* 803058B4 003016F4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick12chainstarter12ChainStarter __vt__Q53scn4step7gimmick12chainstarter12ChainStarter: .incbin "baserom.dol", 0x47C5C0, 0x20 diff --git a/asm/src/Challenge.s b/asm/src/Challenge.s index 4061bfae..10837d24 100644 --- a/asm/src/Challenge.s +++ b/asm/src/Challenge.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge9ChallengeFRQ33scn4step9ComponentRQ23mem10IAllocator __ct__Q53scn4step4info9challenge9ChallengeFRQ33scn4step9ComponentRQ23mem10IAllocator: /* 803B0F44 003ACD84 94 21 FA 60 */ stwu r1, -0x5a0(r1) @@ -976,7 +976,7 @@ masterResult__Q53scn4step4info9challenge9ChallengeFv: /* 803B1D50 003ADB90 38 21 00 10 */ addi r1, r1, 0x10 /* 803B1D54 003ADB94 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253888 $$253888: .incbin "baserom.dol", 0x48C260, 0x14 @@ -1038,7 +1038,7 @@ $$253910: $$253911: .incbin "baserom.dol", 0x48C39C, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253889 $$253889: .incbin "baserom.dol", 0x497B18, 0x8 diff --git a/asm/src/ChallengeBattleCtrl.s b/asm/src/ChallengeBattleCtrl.s index bf8801de..fc97d88d 100644 --- a/asm/src/ChallengeBattleCtrl.s +++ b/asm/src/ChallengeBattleCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero19ChallengeBattleCtrlFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero19ChallengeBattleCtrlFRQ43scn4step4hero4Hero: /* 80333B10 0032F950 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -220,7 +220,7 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick23St __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1Fv: /* 80333E00 0032FC40 4B EF A8 A0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick24StateChallengeBattleLose$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x47FF40, 0x10 diff --git a/asm/src/ChallengeDoor.s b/asm/src/ChallengeDoor.s index 8eadf400..c1c61956 100644 --- a/asm/src/ChallengeDoor.s +++ b/asm/src/ChallengeDoor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRCQ53scn4step7gimmick13challengedoor20ChallengeDoorContext __ct__Q53scn4step7gimmick13challengedoor13ChallengeDoorFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRCQ53scn4step7gimmick13challengedoor20ChallengeDoorContext: /* 80306478 003022B8 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -1910,7 +1910,7 @@ create__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23 __dt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateEnterChallengeDoor$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$4Q33scn4step13ChallengeKind$$4b$$1Fv: /* 80307ECC 00303D0C 4B F2 67 D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257573 $$257573: .incbin "baserom.dol", 0x47C900, 0x10 @@ -1963,7 +1963,7 @@ __vt__Q24util154StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick23St __vt__Q53scn4step7gimmick13challengedoor13ChallengeDoor: .incbin "baserom.dol", 0x47CA20, 0x88 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$260205 $$260205: .incbin "baserom.dol", 0x496990, 0x8 @@ -1992,7 +1992,7 @@ $$260503: $$260504: .incbin "baserom.dol", 0x4969D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260317 $$260317: .incbin "baserom.dol", 0x49D2D0, 0x4 diff --git a/asm/src/ChallengeDoorMaster.s b/asm/src/ChallengeDoorMaster.s index 3655b652..2bfa8345 100644 --- a/asm/src/ChallengeDoorMaster.s +++ b/asm/src/ChallengeDoorMaster.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80307ED0 00303D10 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -858,7 +858,7 @@ lbl_80308A3C: kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorMasterCFv: /* 80308A50 00304890 4B DF FF B0 */ b CanCancel__Q34nw4r2ut13DvdFileStreamCFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$255380 $$255380: .incbin "baserom.dol", 0x415AA8, 0x34 @@ -866,7 +866,7 @@ $$255380: $$255490: .incbin "baserom.dol", 0x415ADC, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256036 $$256036: .incbin "baserom.dol", 0x47CAA8, 0x24 @@ -955,7 +955,7 @@ $$256299: __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorMaster: .incbin "baserom.dol", 0x47CC5C, 0x84 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256037 $$256037: .incbin "baserom.dol", 0x4969D8, 0x4 @@ -975,7 +975,7 @@ $$255488: $$255489: .incbin "baserom.dol", 0x4969FC, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256039 $$256039: .incbin "baserom.dol", 0x49D2F0, 0x4 diff --git a/asm/src/ChallengeDoorMasterEx.s b/asm/src/ChallengeDoorMasterEx.s index b892876d..6b6411ec 100644 --- a/asm/src/ChallengeDoorMasterEx.s +++ b/asm/src/ChallengeDoorMasterEx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80308A54 00304894 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -469,7 +469,7 @@ mfCreateMoveLand__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExFv: kind__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterExCFv: /* 803090CC 00304F0C 4B E1 8C 04 */ b GetType__Q44nw4r2ut6detail11ResFontBaseCFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256569 $$256569: .incbin "baserom.dol", 0x47CCE0, 0x24 @@ -498,7 +498,7 @@ $$256693: __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorMasterEx: .incbin "baserom.dol", 0x47CDAC, 0x84 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256570 $$256570: .incbin "baserom.dol", 0x496A08, 0x8 diff --git a/asm/src/ChallengeDoorMusou.s b/asm/src/ChallengeDoorMusou.s index 26a1e094..8ec34f27 100644 --- a/asm/src/ChallengeDoorMusou.s +++ b/asm/src/ChallengeDoorMusou.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_GetUnlockAnimName__32$$2unnamed$$2ChallengeDoorMusou_cpp$$2FQ33scn4step13ChallengeKind t_GetUnlockAnimName__32$$2unnamed$$2ChallengeDoorMusou_cpp$$2FQ33scn4step13ChallengeKind: /* 803090D0 00304F10 2C 03 00 05 */ cmpwi r3, 5 @@ -250,7 +250,7 @@ lbl_803093D4: kind__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusouCFv: /* 80309410 00305250 4B EC 51 78 */ b GetStatus__FPvPv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254958 $$254958: .incbin "baserom.dol", 0x47CE30, 0x18 @@ -273,12 +273,12 @@ $$255023: __vt__Q53scn4step7gimmick13challengedoor18ChallengeDoorMusou: .incbin "baserom.dol", 0x47CEFC, 0x84 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254960 $$254960: .incbin "baserom.dol", 0x496A28, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255018 $$255018: .incbin "baserom.dol", 0x49D308, 0x8 diff --git a/asm/src/ChallengeDoorMusouEx.s b/asm/src/ChallengeDoorMusouEx.s index 77bf7a0e..3f6e67b6 100644 --- a/asm/src/ChallengeDoorMusouEx.s +++ b/asm/src/ChallengeDoorMusouEx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80309414 00305254 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -351,7 +351,7 @@ reqDoorCloseSE__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExFv: kind__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouExCFv: /* 803098D4 00305714 4B DF F1 1C */ b GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256569 $$256569: .incbin "baserom.dol", 0x47CF80, 0x24 @@ -380,7 +380,7 @@ $$256697: __vt__Q53scn4step7gimmick13challengedoor20ChallengeDoorMusouEx: .incbin "baserom.dol", 0x47D040, 0x88 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256570 $$256570: .incbin "baserom.dol", 0x496A30, 0x8 diff --git a/asm/src/ChallengeDoorNormal.s b/asm/src/ChallengeDoorNormal.s index 368af9a9..6cc4aba1 100644 --- a/asm/src/ChallengeDoorNormal.s +++ b/asm/src/ChallengeDoorNormal.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_GetUnlockAnimName__33$$2unnamed$$2ChallengeDoorNormal_cpp$$2FQ33scn4step13ChallengeKind t_GetUnlockAnimName__33$$2unnamed$$2ChallengeDoorNormal_cpp$$2FQ33scn4step13ChallengeKind: /* 803098D8 00305718 3C 80 80 48 */ lis r4, $$254974@ha @@ -173,7 +173,7 @@ canEnter__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalCFv: kind__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormalCFv: /* 80309AF8 00305938 4B D4 A2 F8 */ b __wpadNoAlloc -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254974 $$254974: .incbin "baserom.dol", 0x47D0C8, 0x18 @@ -208,12 +208,12 @@ $$255043: __vt__Q53scn4step7gimmick13challengedoor19ChallengeDoorNormal: .incbin "baserom.dol", 0x47D1E0, 0x88 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254980 $$254980: .incbin "baserom.dol", 0x496A50, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255038 $$255038: .incbin "baserom.dol", 0x49D310, 0x8 diff --git a/asm/src/ChallengeDoorTraining.s b/asm/src/ChallengeDoorTraining.s index b1d62fb7..7f2f8441 100644 --- a/asm/src/ChallengeDoorTraining.s +++ b/asm/src/ChallengeDoorTraining.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80309AFC 0030593C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -169,7 +169,7 @@ kind__Q53scn4step7gimmick13challengedoor21ChallengeDoorTrainingCFv: /* 80309D08 00305B48 38 60 00 05 */ li r3, 5 /* 80309D0C 00305B4C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254623 $$254623: .incbin "baserom.dol", 0x47D268, 0x24 @@ -183,7 +183,7 @@ $$254641: __vt__Q53scn4step7gimmick13challengedoor21ChallengeDoorTraining: .incbin "baserom.dol", 0x47D2D4, 0x54 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254622 $$254622: .incbin "baserom.dol", 0x496A58, 0x8 diff --git a/asm/src/ChallengeKindUtil.s b/asm/src/ChallengeKindUtil.s index 76e3392f..9af3c6e2 100644 --- a/asm/src/ChallengeKindUtil.s +++ b/asm/src/ChallengeKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_info__Q33scn4step31$$2unnamed$$2ChallengeKindUtil_cpp$$2FQ33scn4step13ChallengeKind t_info__Q33scn4step31$$2unnamed$$2ChallengeKindUtil_cpp$$2FQ33scn4step13ChallengeKind: /* 8021CD3C 00218B7C 54 86 28 34 */ slwi r6, r4, 5 @@ -274,12 +274,12 @@ TitleLayoutContext__Q33scn4step17ChallengeKindUtilFQ33scn4step13ChallengeKindRQ2 /* 8021D0CC 00218F0C 38 21 00 60 */ addi r1, r1, 0x60 /* 8021D0D0 00218F10 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INFOS__Q33scn4step31$$2unnamed$$2ChallengeKindUtil_cpp$$2 T_INFOS__Q33scn4step31$$2unnamed$$2ChallengeKindUtil_cpp$$2: .incbin "baserom.dol", 0x412288, 0x200 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248772 $$248772: .incbin "baserom.dol", 0x45FAF8, 0xC @@ -302,7 +302,7 @@ $$249157: $$249159: .incbin "baserom.dol", 0x45FBF4, 0x1C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248746 $$248746: .incbin "baserom.dol", 0x495180, 0x8 diff --git a/asm/src/ChallengeUtil.s b/asm/src/ChallengeUtil.s index b5b53d14..465585d2 100644 --- a/asm/src/ChallengeUtil.s +++ b/asm/src/ChallengeUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isChallengStage__Q53scn4step5enemy9challenge4UtilFRQ43scn4step5enemy5Enemy isChallengStage__Q53scn4step5enemy9challenge4UtilFRQ43scn4step5enemy5Enemy: /* 80281B54 0027D994 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Chara.s b/asm/src/Chara.s index ae6b3f94..fa473c8f 100644 --- a/asm/src/Chara.s +++ b/asm/src/Chara.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle5CharaFRQ33scn14challengetitle9ComponentRQ23g3d8StdModelQ33scn14challengetitle9CharaKind __ct__Q33scn14challengetitle5CharaFRQ33scn14challengetitle9ComponentRQ23g3d8StdModelQ33scn14challengetitle9CharaKind: /* 801EA674 001E64B4 94 21 FE 80 */ stwu r1, -0x180(r1) @@ -889,7 +889,7 @@ setRandomFrame__Q33scn14challengetitle5CharaFv: /* 801EB278 001E70B8 38 21 00 30 */ addi r1, r1, 0x30 /* 801EB27C 001E70BC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_LoopAnimCount__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2Fv t_LoopAnimCount__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2Fv: /* 80200FC4 001FCE04 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2349,7 +2349,7 @@ lbl_8020243C: /* 8020244C 001FE28C 38 21 00 30 */ addi r1, r1, 0x30 /* 80202450 001FE290 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CHARA_INFO_TABLE__Q33scn14challengetitle19$$2unnamed$$2Chara_cpp$$2 T_CHARA_INFO_TABLE__Q33scn14challengetitle19$$2unnamed$$2Chara_cpp$$2: .incbin "baserom.dol", 0x411720, 0x54 @@ -2357,7 +2357,7 @@ T_CHARA_INFO_TABLE__Q33scn14challengetitle19$$2unnamed$$2Chara_cpp$$2: $$253282: .incbin "baserom.dol", 0x411774, 0x14 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CHARA_INFO_TABLE__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2 T_CHARA_INFO_TABLE__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2: .incbin "baserom.dol", 0x411BF0, 0x84 @@ -2365,7 +2365,7 @@ T_CHARA_INFO_TABLE__Q33scn10grandtitle19$$2unnamed$$2Chara_cpp$$2: $$253204: .incbin "baserom.dol", 0x411C74, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253229 $$253229: .incbin "baserom.dol", 0x45ABD0, 0x20 @@ -2394,7 +2394,7 @@ $$255175: $$255176: .incbin "baserom.dol", 0x45AC6C, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253144 $$253144: .incbin "baserom.dol", 0x45C7B8, 0x14 @@ -2471,7 +2471,7 @@ $$255637: $$255638: .incbin "baserom.dol", 0x45C980, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253228 $$253228: .incbin "baserom.dol", 0x494098, 0x8 @@ -2497,7 +2497,7 @@ $$253236: $$254998: .incbin "baserom.dol", 0x4940D0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253143 $$253143: .incbin "baserom.dol", 0x494790, 0x8 @@ -2532,7 +2532,7 @@ $$255639: $$255640: .incbin "baserom.dol", 0x4947E0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255165 $$255165: .incbin "baserom.dol", 0x49A8E8, 0x8 @@ -2540,7 +2540,7 @@ $$255165: $$255253: .incbin "baserom.dol", 0x49A8F0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255335 $$255335: .incbin "baserom.dol", 0x49AA90, 0x4 diff --git a/asm/src/CharaAnimBlender.s b/asm/src/CharaAnimBlender.s index 62c512ba..09dbe216 100644 --- a/asm/src/CharaAnimBlender.s +++ b/asm/src/CharaAnimBlender.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Construct__Q23g3d16CharaAnimBlenderFP12MEMAllocatorQ34nw4r3g3d6ResMdl Construct__Q23g3d16CharaAnimBlenderFP12MEMAllocatorQ34nw4r3g3d6ResMdl: /* 8018BFDC 00187E1C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -909,7 +909,7 @@ lbl_8018CC6C: /* 8018CC7C 00188ABC 38 21 00 10 */ addi r1, r1, 0x10 /* 8018CC80 00188AC0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249791 $$249791: .incbin "baserom.dol", 0x450298, 0x18 @@ -938,7 +938,7 @@ $$2STRING$$2FLog__Q24nw4r4mathFf$$20: $$2STRING$$2FLog__Q24nw4r4mathFf: .incbin "baserom.dol", 0x45046C, 0x14 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249901 $$249901: .incbin "baserom.dol", 0x49A1B0, 0x4 diff --git a/asm/src/CharaAnimInterpolation.s b/asm/src/CharaAnimInterpolation.s index a064a330..85eb25b3 100644 --- a/asm/src/CharaAnimInterpolation.s +++ b/asm/src/CharaAnimInterpolation.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d22CharaAnimInterpolationFRCQ23g3d29CharaAnimInterpolationContext __ct__Q23g3d22CharaAnimInterpolationFRCQ23g3d29CharaAnimInterpolationContext: /* 8018CC84 00188AC4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -226,7 +226,7 @@ lbl_8018CF48: /* 8018CF54 00188D94 38 21 00 10 */ addi r1, r1, 0x10 /* 8018CF58 00188D98 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250437 $$250437: .incbin "baserom.dol", 0x49A1C0, 0x4 diff --git a/asm/src/CharaAnimInterpolationContext.s b/asm/src/CharaAnimInterpolationContext.s index 41ca5363..ff351962 100644 --- a/asm/src/CharaAnimInterpolationContext.s +++ b/asm/src/CharaAnimInterpolationContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d29CharaAnimInterpolationContextFRCQ23g3d15ResModelContextRQ23mem10IAllocator __ct__Q23g3d29CharaAnimInterpolationContextFRCQ23g3d15ResModelContextRQ23mem10IAllocator: /* 8018CF5C 00188D9C 80 04 00 00 */ lwz r0, 0(r4) diff --git a/asm/src/CharaManager.s b/asm/src/CharaManager.s index 60e66907..8db4c49a 100644 --- a/asm/src/CharaManager.s +++ b/asm/src/CharaManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle12CharaManagerFRQ33scn14challengetitle9Component __ct__Q33scn14challengetitle12CharaManagerFRQ33scn14challengetitle9Component: /* 801EB280 001E70C0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -736,7 +736,7 @@ mahoroa__Q33scn14challengetitle12CharaManagerFv: /* 801EBC5C 001E7A9C 38 21 00 10 */ addi r1, r1, 0x10 /* 801EBC60 001E7AA0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle12CharaManagerFRQ33scn10grandtitle9Component __ct__Q33scn10grandtitle12CharaManagerFRQ33scn10grandtitle9Component: /* 80202454 001FE294 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1498,12 +1498,12 @@ block__Q33scn10grandtitle12CharaManagerFUl: /* 80202EBC 001FECFC 38 63 01 F0 */ addi r3, r3, 0x1f0 /* 80202EC0 001FED00 4B FF FC D4 */ b __vc__Q33hel6common44AutoDeleteArray$$0Q33scn10grandtitle5Block$$438$$1FUl -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253270 $$253270: .incbin "baserom.dol", 0x45AC78, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254349 $$254349: .incbin "baserom.dol", 0x45C9C0, 0x18 @@ -1511,7 +1511,7 @@ $$254349: $$254457: .incbin "baserom.dol", 0x45C9D8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253271 $$253271: .incbin "baserom.dol", 0x4940D8, 0x8 @@ -1534,12 +1534,12 @@ $$253385: $$253386: .incbin "baserom.dol", 0x494108, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254350 $$254350: .incbin "baserom.dol", 0x4947E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253326 $$253326: .incbin "baserom.dol", 0x49A8F8, 0x8 @@ -1547,7 +1547,7 @@ $$253326: $$253366: .incbin "baserom.dol", 0x49A900, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254420 $$254420: .incbin "baserom.dol", 0x49AAC0, 0x8 diff --git a/asm/src/CharaModel.s b/asm/src/CharaModel.s index 44a28a41..155e61db 100644 --- a/asm/src/CharaModel.s +++ b/asm/src/CharaModel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d10CharaModelFRCQ23g3d17CharaModelContext __ct__Q23g3d10CharaModelFRCQ23g3d17CharaModelContext: /* 8018CF8C 00188DCC 94 21 FF 10 */ stwu r1, -0xf0(r1) @@ -610,7 +610,7 @@ onDirty__Q23g3d10CharaModelFv: /* 8018D758 00189598 98 03 01 60 */ stb r0, 0x160(r3) /* 8018D75C 0018959C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23g3d10CharaModel __vt__Q23g3d10CharaModel: .incbin "baserom.dol", 0x450480, 0x10 diff --git a/asm/src/CharaModelContext.s b/asm/src/CharaModelContext.s index fd279a82..bee72d5a 100644 --- a/asm/src/CharaModelContext.s +++ b/asm/src/CharaModelContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DefaultAllocator__Q23g3d17CharaModelContextFv DefaultAllocator__Q23g3d17CharaModelContextFv: /* 8018D760 001895A0 48 00 49 88 */ b DefaultAllocator__Q23g3d12ModelContextFv diff --git a/asm/src/CharaParam.s b/asm/src/CharaParam.s index 85139835..fda4f32a 100644 --- a/asm/src/CharaParam.s +++ b/asm/src/CharaParam.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8armordee10CharaParamFv Create__Q53scn4step5enemy8armordee10CharaParamFv: /* 8029638C 002921CC 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -61,7 +61,7 @@ lbl_80296440: /* 80296460 002922A0 38 21 00 C0 */ addi r1, r1, 0xc0 /* 80296464 002922A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11bladeknight10CharaParamFv Create__Q53scn4step5enemy11bladeknight10CharaParamFv: /* 80296F2C 00292D6C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -101,7 +101,7 @@ lbl_80296F8C: /* 80296FAC 00292DEC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80296FB0 00292DF0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7blipper10CharaParamFv Create__Q53scn4step5enemy7blipper10CharaParamFv: /* 80298E8C 00294CCC 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -141,7 +141,7 @@ lbl_80298EEC: /* 80298F0C 00294D4C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80298F10 00294D50 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11bonkersbomb10CharaParamFv Create__Q53scn4step5enemy11bonkersbomb10CharaParamFv: /* 8029BB80 002979C0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -184,7 +184,7 @@ lbl_8029BBEC: /* 8029BC0C 00297A4C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8029BC10 00297A50 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6bouncy10CharaParamFv Create__Q53scn4step5enemy6bouncy10CharaParamFv: /* 8029D098 00298ED8 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -222,7 +222,7 @@ lbl_8029D0F0: /* 8029D110 00298F50 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8029D114 00298F54 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5bowby10CharaParamFv Create__Q53scn4step5enemy5bowby10CharaParamFv: /* 8029E30C 0029A14C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -262,7 +262,7 @@ lbl_8029E36C: /* 8029E38C 0029A1CC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8029E390 0029A1D0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10brontoburt10CharaParamFv Create__Q53scn4step5enemy10brontoburt10CharaParamFv: /* 8029F2DC 0029B11C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -302,7 +302,7 @@ lbl_8029F33C: /* 8029F35C 0029B19C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8029F360 0029B1A0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11broomhatter10CharaParamFv Create__Q53scn4step5enemy11broomhatter10CharaParamFv: /* 802A0E60 0029CCA0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -342,7 +342,7 @@ lbl_802A0EC0: /* 802A0EE0 0029CD20 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802A0EE4 0029CD24 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5cappy10CharaParamFv Create__Q53scn4step5enemy5cappy10CharaParamFv: /* 802A2704 0029E544 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -439,7 +439,7 @@ lbl_802A2834: /* 802A2854 0029E694 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802A2858 0029E698 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8cappyhat10CharaParamFv Create__Q53scn4step5enemy8cappyhat10CharaParamFv: /* 802A3918 0029F758 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -489,7 +489,7 @@ lbl_802A39A0: /* 802A39C0 0029F800 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802A39C4 0029F804 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8cerulean10CharaParamFv Create__Q53scn4step5enemy8cerulean10CharaParamFv: /* 802A54F8 002A1338 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -529,7 +529,7 @@ lbl_802A5558: /* 802A5578 002A13B8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802A557C 002A13BC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6chilly10CharaParamFv Create__Q53scn4step5enemy6chilly10CharaParamFv: /* 802A61E4 002A2024 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -569,7 +569,7 @@ lbl_802A6244: /* 802A6264 002A20A4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802A6268 002A20A8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy4como10CharaParamFv Create__Q53scn4step5enemy4como10CharaParamFv: /* 802A7238 002A3078 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -623,7 +623,7 @@ lbl_802A72D0: /* 802A72F0 002A3130 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802A72F4 002A3134 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6degout10CharaParamFv Create__Q53scn4step5enemy6degout10CharaParamFv: /* 802AD218 002A9058 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -663,7 +663,7 @@ lbl_802AD278: /* 802AD298 002A90D8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802AD29C 002A90DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8dubiorjr10CharaParamFv Create__Q53scn4step5enemy8dubiorjr10CharaParamFv: /* 802ADFB8 002A9DF8 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -710,7 +710,7 @@ lbl_802AE034: /* 802AE054 002A9E94 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802AE058 002A9E98 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11dubiorspark10CharaParamFv Create__Q53scn4step5enemy11dubiorspark10CharaParamFv: /* 802AEC08 002AAA48 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -762,7 +762,7 @@ lbl_802AEC98: /* 802AECB8 002AAAF8 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802AECBC 002AAAFC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy4elec10CharaParamFv Create__Q53scn4step5enemy4elec10CharaParamFv: /* 802AFA00 002AB840 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -808,7 +808,7 @@ lbl_802AFA78: /* 802AFA98 002AB8D8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802AFA9C 002AB8DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6flamer10CharaParamFv Create__Q53scn4step5enemy6flamer10CharaParamFv: /* 802B2168 002ADFA8 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -852,7 +852,7 @@ lbl_802B21D8: /* 802B21F8 002AE038 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802B21FC 002AE03C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5foley10CharaParamFv Create__Q53scn4step5enemy5foley10CharaParamFv: /* 802B449C 002B02DC 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -892,7 +892,7 @@ lbl_802B44FC: /* 802B451C 002B035C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802B4520 002B0360 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5gemra10CharaParamFv Create__Q53scn4step5enemy5gemra10CharaParamFv: /* 802B5840 002B1680 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -934,7 +934,7 @@ lbl_802B58A8: /* 802B58C8 002B1708 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802B58CC 002B170C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7gigatzo10CharaParamFv Create__Q53scn4step5enemy7gigatzo10CharaParamFv: /* 802B6AA8 002B28E8 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -986,7 +986,7 @@ lbl_802B6B38: /* 802B6B58 002B2998 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802B6B5C 002B299C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5gordo10CharaParamFv Create__Q53scn4step5enemy5gordo10CharaParamFv: /* 802B8D28 002B4B68 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1034,7 +1034,7 @@ lbl_802B8DA8: /* 802B8DC8 002B4C08 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802B8DCC 002B4C0C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7hothead10CharaParamFv Create__Q53scn4step5enemy7hothead10CharaParamFv: /* 802BA260 002B60A0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1074,7 +1074,7 @@ lbl_802BA2C0: /* 802BA2E0 002B6120 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802BA2E4 002B6124 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6juckle10CharaParamFv Create__Q53scn4step5enemy6juckle10CharaParamFv: /* 802BB270 002B70B0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1120,7 +1120,7 @@ lbl_802BB2E8: /* 802BB308 002B7148 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802BB30C 002B714C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy4kabu10CharaParamFv Create__Q53scn4step5enemy4kabu10CharaParamFv: /* 802BCBEC 002B8A2C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1158,7 +1158,7 @@ lbl_802BCC44: /* 802BCC64 002B8AA4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802BCC68 002B8AA8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10knucklejoe10CharaParamFv Create__Q53scn4step5enemy10knucklejoe10CharaParamFv: /* 802BF2C8 002BB108 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1198,7 +1198,7 @@ lbl_802BF328: /* 802BF348 002BB188 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802BF34C 002BB18C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6lanzer10CharaParamFv Create__Q53scn4step5enemy6lanzer10CharaParamFv: /* 802C1EE4 002BDD24 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1238,7 +1238,7 @@ lbl_802C1F44: /* 802C1F64 002BDDA4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802C1F68 002BDDA8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6leafan10CharaParamFv Create__Q53scn4step5enemy6leafan10CharaParamFv: /* 802C34E4 002BF324 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1276,7 +1276,7 @@ lbl_802C353C: /* 802C355C 002BF39C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802C3560 002BF3A0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9mbossdead10CharaParamFv Create__Q53scn4step5enemy9mbossdead10CharaParamFv: /* 802C4154 002BFF94 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -1339,7 +1339,7 @@ lbl_802C4210: /* 802C4230 002C0070 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802C4234 002C0074 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7mumbies10CharaParamFv Create__Q53scn4step5enemy7mumbies10CharaParamFv: /* 802C4DB4 002C0BF4 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1377,7 +1377,7 @@ lbl_802C4E0C: /* 802C4E2C 002C0C6C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802C4E30 002C0C70 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8needlous10CharaParamFv Create__Q53scn4step5enemy8needlous10CharaParamFv: /* 802C5D1C 002C1B5C 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -1425,7 +1425,7 @@ lbl_802C5D9C: /* 802C5DBC 002C1BFC 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802C5DC0 002C1C00 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5noddy10CharaParamFv Create__Q53scn4step5enemy5noddy10CharaParamFv: /* 802C72B0 002C30F0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1462,7 +1462,7 @@ lbl_802C7304: /* 802C7324 002C3164 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802C7328 002C3168 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5nruff10CharaParamFv Create__Q53scn4step5enemy5nruff10CharaParamFv: /* 802C7A68 002C38A8 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1502,7 +1502,7 @@ lbl_802C7AC8: /* 802C7AE8 002C3928 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802C7AEC 002C392C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6owgulf10CharaParamFv Create__Q53scn4step5enemy6owgulf10CharaParamFv: /* 802C9D68 002C5BA8 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1544,7 +1544,7 @@ lbl_802C9DD0: /* 802C9DF0 002C5C30 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802C9DF4 002C5C34 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7parasol10CharaParamFv Create__Q53scn4step5enemy7parasol10CharaParamFv: /* 802CAAF8 002C6938 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1587,7 +1587,7 @@ lbl_802CAB64: /* 802CAB84 002C69C4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802CAB88 002C69C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10parasoldee10CharaParamFv Create__Q53scn4step5enemy10parasoldee10CharaParamFv: /* 802CBA74 002C78B4 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1627,7 +1627,7 @@ lbl_802CBAD4: /* 802CBAF4 002C7934 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802CBAF8 002C7938 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10parasoldoo10CharaParamFv Create__Q53scn4step5enemy10parasoldoo10CharaParamFv: /* 802CDBA0 002C99E0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1668,7 +1668,7 @@ lbl_802CDC04: /* 802CDC24 002C9A64 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802CDC28 002C9A68 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6pierce10CharaParamFv Create__Q53scn4step5enemy6pierce10CharaParamFv: /* 802CF890 002CB6D0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1708,7 +1708,7 @@ lbl_802CF8F0: /* 802CF910 002CB750 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802CF914 002CB754 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10poppybrojr10CharaParamFv Create__Q53scn4step5enemy10poppybrojr10CharaParamFv: /* 802D167C 002CD4BC 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -1756,7 +1756,7 @@ lbl_802D16FC: /* 802D171C 002CD55C 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802D1720 002CD560 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy14poppybrojrbomb10CharaParamFv Create__Q53scn4step5enemy14poppybrojrbomb10CharaParamFv: /* 802D2830 002CE670 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1802,7 +1802,7 @@ lbl_802D28A8: /* 802D28C8 002CE708 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802D28CC 002CE70C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9puppetdee10CharaParamFv Create__Q53scn4step5enemy9puppetdee10CharaParamFv: /* 802D3198 002CEFD8 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -1862,7 +1862,7 @@ lbl_802D3248: /* 802D3268 002CF0A8 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802D326C 002CF0AC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5rocky10CharaParamFv Create__Q53scn4step5enemy5rocky10CharaParamFv: /* 802D3928 002CF768 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1902,7 +1902,7 @@ lbl_802D3988: /* 802D39A8 002CF7E8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802D39AC 002CF7EC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8rollball10CharaParamFv Create__Q53scn4step5enemy8rollball10CharaParamFv: /* 802D6170 002D1FB0 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -1954,7 +1954,7 @@ lbl_802D6200: /* 802D6220 002D2060 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802D6224 002D2064 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7sandbag10CharaParamFv Create__Q53scn4step5enemy7sandbag10CharaParamFv: /* 802D87F8 002D4638 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1994,7 +1994,7 @@ lbl_802D8858: /* 802D8878 002D46B8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802D887C 002D46BC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6scarfy10CharaParamFv Create__Q53scn4step5enemy6scarfy10CharaParamFv: /* 802D9A00 002D5840 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2034,7 +2034,7 @@ lbl_802D9A60: /* 802D9A80 002D58C0 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802D9A84 002D58C4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8searches10CharaParamFv Create__Q53scn4step5enemy8searches10CharaParamFv: /* 802DBB80 002D79C0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2076,7 +2076,7 @@ lbl_802DBBE8: /* 802DBC08 002D7A48 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802DBC0C 002D7A4C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5sheld10CharaParamFv Create__Q53scn4step5enemy5sheld10CharaParamFv: /* 802DCE78 002D8CB8 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2118,7 +2118,7 @@ lbl_802DCEE0: /* 802DCF00 002D8D40 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802DCF04 002D8D44 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6shotzo10CharaParamFv Create__Q53scn4step5enemy6shotzo10CharaParamFv: /* 802E01E0 002DC020 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -2172,7 +2172,7 @@ lbl_802E0278: /* 802E0298 002DC0D8 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802E029C 002DC0DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9sirkibble10CharaParamFv Create__Q53scn4step5enemy9sirkibble10CharaParamFv: /* 802E12DC 002DD11C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2214,7 +2214,7 @@ lbl_802E1344: /* 802E1364 002DD1A4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802E1368 002DD1A8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11sisterbound10CharaParamFv Create__Q53scn4step5enemy11sisterbound10CharaParamFv: /* 802E2890 002DE6D0 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2260,7 +2260,7 @@ lbl_802E2908: /* 802E2928 002DE768 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802E292C 002DE76C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5snowl10CharaParamFv Create__Q53scn4step5enemy5snowl10CharaParamFv: /* 802E36A4 002DF4E4 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2300,7 +2300,7 @@ lbl_802E3704: /* 802E3724 002DF564 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802E3728 002DF568 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6sodory10CharaParamFv Create__Q53scn4step5enemy6sodory10CharaParamFv: /* 802E4C3C 002E0A7C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2342,7 +2342,7 @@ lbl_802E4CA4: /* 802E4CC4 002E0B04 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802E4CC8 002E0B08 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6sparky10CharaParamFv Create__Q53scn4step5enemy6sparky10CharaParamFv: /* 802E6CB8 002E2AF8 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2384,7 +2384,7 @@ lbl_802E6D20: /* 802E6D40 002E2B80 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802E6D44 002E2B84 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10stareffect10CharaParamFv Create__Q53scn4step5enemy10stareffect10CharaParamFv: /* 802E79A8 002E37E8 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -2435,7 +2435,7 @@ lbl_802E7A34: /* 802E7A54 002E3894 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802E7A58 002E3898 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy3sun10CharaParamFv Create__Q53scn4step5enemy3sun10CharaParamFv: /* 802E87B4 002E45F4 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -2490,7 +2490,7 @@ lbl_802E8850: /* 802E8870 002E46B0 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802E8874 002E46B4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8toughdee10CharaParamFv Create__Q53scn4step5enemy8toughdee10CharaParamFv: /* 802E9CD4 002E5B14 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2528,7 +2528,7 @@ lbl_802E9D2C: /* 802E9D4C 002E5B8C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802E9D50 002E5B90 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9tsukikage10CharaParamFv Create__Q53scn4step5enemy9tsukikage10CharaParamFv: /* 802EA6F8 002E6538 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2570,7 +2570,7 @@ lbl_802EA760: /* 802EA780 002E65C0 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802EA784 002E65C4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9waddledee10CharaParamFv Create__Q53scn4step5enemy9waddledee10CharaParamFv: /* 802ED670 002E94B0 4B FA FA 28 */ b Create__Q53scn4step5enemy6bouncy10CharaParamFv @@ -2612,7 +2612,7 @@ lbl_802ED6CC: /* 802ED6EC 002E952C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802ED6F0 002E9530 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9waddledoo10CharaParamFv Create__Q53scn4step5enemy9waddledoo10CharaParamFv: /* 802EFA68 002EB8A8 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2652,7 +2652,7 @@ lbl_802EFAC8: /* 802EFAE8 002EB928 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802EFAEC 002EB92C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10watergalbo10CharaParamFv Create__Q53scn4step5enemy10watergalbo10CharaParamFv: /* 802F0134 002EBF74 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2692,7 +2692,7 @@ lbl_802F0194: /* 802F01B4 002EBFF4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802F01B8 002EBFF8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6whippy10CharaParamFv Create__Q53scn4step5enemy6whippy10CharaParamFv: /* 802F077C 002EC5BC 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2732,7 +2732,7 @@ lbl_802F07DC: /* 802F07FC 002EC63C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802F0800 002EC640 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11whispyapple10CharaParamFv Create__Q53scn4step5enemy11whispyapple10CharaParamFv: /* 802F0C94 002ECAD4 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2781,7 +2781,7 @@ lbl_802F0D18: /* 802F0D38 002ECB78 38 21 00 B0 */ addi r1, r1, 0xb0 /* 802F0D3C 002ECB7C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy15zankibblecutter10CharaParamFv Create__Q53scn4step5enemy15zankibblecutter10CharaParamFv: /* 802F22D4 002EE114 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -2831,7 +2831,7 @@ lbl_802F235C: /* 802F237C 002EE1BC 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802F2380 002EE1C0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49BCB8, 0x4 @@ -2848,32 +2848,32 @@ $$248790: $$248791: .incbin "baserom.dol", 0x49BCC8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49BD68, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49BE50, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49BE90, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49BED0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49BF48, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49BFA0, 0x4 @@ -2890,17 +2890,17 @@ $$248748: lbl_80561474: .incbin "baserom.dol", 0x49BFB4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248789 $$248789: .incbin "baserom.dol", 0x49BFC0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C060, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49C0B0, 0x4 @@ -2914,17 +2914,17 @@ $$248789: $$248790: .incbin "baserom.dol", 0x49C0BC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C2F0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248789 $$248789: .incbin "baserom.dol", 0x49C320, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C348, 0x4 @@ -2932,7 +2932,7 @@ $$248778: $$248779: .incbin "baserom.dol", 0x49C34C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C3C8, 0x4 @@ -2940,7 +2940,7 @@ $$248778: $$248779: .incbin "baserom.dol", 0x49C3CC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49C4F8, 0x4 @@ -2951,7 +2951,7 @@ lbl_805619BC: $$248789: .incbin "baserom.dol", 0x49C500, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C588, 0x4 @@ -2959,7 +2959,7 @@ $$248778: $$248779: .incbin "baserom.dol", 0x49C58C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C5E8, 0x4 @@ -2967,12 +2967,12 @@ $$248778: $$248779: .incbin "baserom.dol", 0x49C5EC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C650, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49C7F0, 0x4 @@ -2989,7 +2989,7 @@ $$248790: $$248791: .incbin "baserom.dol", 0x49C800, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49C850, 0x4 @@ -3000,17 +3000,17 @@ lbl_80561D14: $$248789: .incbin "baserom.dol", 0x49C858, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C8B8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49C918, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49CA90, 0x4 @@ -3021,7 +3021,7 @@ lbl_80561F54: $$248789: .incbin "baserom.dol", 0x49CA98, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49CB10, 0x4 @@ -3038,7 +3038,7 @@ $$248790: $$248791: .incbin "baserom.dol", 0x49CB20, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49CB80, 0x4 @@ -3049,17 +3049,17 @@ lbl_80562044: $$248789: .incbin "baserom.dol", 0x49CB88, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49CCB8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49CCD8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49CD90, 0x4 @@ -3073,27 +3073,27 @@ $$248789: $$248790: .incbin "baserom.dol", 0x49CD9C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49CDF8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49CE10, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49CE68, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248789 $$248789: .incbin "baserom.dol", 0x49CEF0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248730 $$248730: .incbin "baserom.dol", 0x49CF28, 0x4 @@ -3107,22 +3107,22 @@ $$248789: $$248790: .incbin "baserom.dol", 0x49CF34, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248789 $$248789: .incbin "baserom.dol", 0x49CFF0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49D068, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248778 $$248778: .incbin "baserom.dol", 0x49D078, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248787 $$248787: .incbin "baserom.dol", 0x49D090, 0x4 diff --git a/asm/src/CharacterEncodeUtil.s b/asm/src/CharacterEncodeUtil.s index 0af527a7..dab8f315 100644 --- a/asm/src/CharacterEncodeUtil.s +++ b/asm/src/CharacterEncodeUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global UTF8ToUTF16__Q24util19CharacterEncodeUtilFPwUlPCc UTF8ToUTF16__Q24util19CharacterEncodeUtilFPwUlPCc: /* 8040586C 004016AC 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/ChargeFlash.s b/asm/src/ChargeFlash.s index 74aa62ac..f9f758cf 100644 --- a/asm/src/ChargeFlash.s +++ b/asm/src/ChargeFlash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11ChargeFlashFv __ct__Q43scn4step4hero11ChargeFlashFv: /* 80333E04 0032FC44 80 02 CB F8 */ lwz r0, $$249325-_SDA2_BASE_(r2) @@ -51,12 +51,12 @@ lbl_80333E80: /* 80333E90 0032FCD0 98 03 00 03 */ stb r0, 3(r3) /* 80333E94 0032FCD4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__Q43scn4step4hero25$$2unnamed$$2ChargeFlash_cpp$$2 T_ALPHA_TABLE__Q43scn4step4hero25$$2unnamed$$2ChargeFlash_cpp$$2: .incbin "baserom.dol", 0x415D50, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249325 $$249325: .incbin "baserom.dol", 0x49D6B8, 0x8 diff --git a/asm/src/CheckWindow.s b/asm/src/CheckWindow.s index adbf39c3..9231db30 100644 --- a/asm/src/CheckWindow.s +++ b/asm/src/CheckWindow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info6common11CheckWindowFRQ23mem10IAllocator __ct__Q34info6common11CheckWindowFRQ23mem10IAllocator: /* 801A857C 001A43BC 94 21 FD 40 */ stwu r1, -0x2c0(r1) @@ -984,7 +984,7 @@ lbl_801A9330: /* 801A9340 001A5180 38 21 00 40 */ addi r1, r1, 0x40 /* 801A9344 001A5184 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253274 $$253274: .incbin "baserom.dol", 0x453530, 0x14 @@ -1022,7 +1022,7 @@ $$253392: $$253458: .incbin "baserom.dol", 0x4535D8, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253280 $$253280: .incbin "baserom.dol", 0x4933D0, 0x8 diff --git a/asm/src/ChoseAbility.s b/asm/src/ChoseAbility.s index a49fa9ce..f3c97ab4 100644 --- a/asm/src/ChoseAbility.s +++ b/asm/src/ChoseAbility.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn17challengetutorial4info12ChoseAbilityFRQ43scn17challengetutorial4info7ManagerRQ23mem10IAllocatorRQ23lyt6Layout __ct__Q43scn17challengetutorial4info12ChoseAbilityFRQ43scn17challengetutorial4info7ManagerRQ23mem10IAllocatorRQ23lyt6Layout: /* 801F94F4 001F5334 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -315,7 +315,7 @@ preLoadStage__Q43scn17challengetutorial4info12ChoseAbilityFv: /* 801F9938 001F5778 38 21 00 20 */ addi r1, r1, 0x20 /* 801F993C 001F577C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253002 $$253002: .incbin "baserom.dol", 0x45BD98, 0x18 @@ -326,7 +326,7 @@ $$253003: $$253105: .incbin "baserom.dol", 0x45BDC0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253004 $$253004: .incbin "baserom.dol", 0x494530, 0x8 diff --git a/asm/src/Chronology.s b/asm/src/Chronology.s index f0267d76..dc512873 100644 --- a/asm/src/Chronology.s +++ b/asm/src/Chronology.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Products__Q33scn7history10ChronologyFv Products__Q33scn7history10ChronologyFv: /* 80207464 002032A4 3C 60 80 46 */ lis r3, PRODUCTS__Q33scn7history24$$2unnamed$$2Chronology_cpp$$2@ha @@ -118,7 +118,7 @@ lbl_802075C8: /* 802075D8 00203418 38 21 00 30 */ addi r1, r1, 0x30 /* 802075DC 0020341C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248725 $$248725: .incbin "baserom.dol", 0x45CDD0, 0xC @@ -153,7 +153,7 @@ $$248900: $$248904: .incbin "baserom.dol", 0x45D088, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248724 $$248724: .incbin "baserom.dol", 0x494878, 0x4 diff --git a/asm/src/CinemaScope.s b/asm/src/CinemaScope.s index 886341dd..819f84c9 100644 --- a/asm/src/CinemaScope.s +++ b/asm/src/CinemaScope.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle11CinemaScopeFRQ33scn14challengetitle9Component __ct__Q33scn14challengetitle11CinemaScopeFRQ33scn14challengetitle9Component: /* 801EBC64 001E7AA4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -54,7 +54,7 @@ hide__Q33scn14challengetitle11CinemaScopeFv: /* 801EBCE8 001E7B28 98 03 02 80 */ stb r0, 0x280(r3) /* 801EBCEC 001E7B2C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle11CinemaScopeFRQ33scn10grandtitle9Component __ct__Q33scn10grandtitle11CinemaScopeFRQ33scn10grandtitle9Component: /* 80202EC4 001FED04 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -83,7 +83,7 @@ startIn__Q33scn10grandtitle11CinemaScopeFv: /* 80202F14 001FED54 80 8D 9F F0 */ lwz r4, T_CINEMASCOPE_FILE_PATH__Q33scn10grandtitle25$$2unnamed$$2CinemaScope_cpp$$2-_SDA_BASE_(r13) /* 80202F18 001FED58 48 1F D6 A8 */ b requestIn__Q23sfx16CinemaScopeModelFPCc -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tCinemaScopeFilePath__Q43scn4step3sfx25$$2unnamed$$2CinemaScope_cpp$$2FQ43scn4step3sfx15CinemaScopeKind tCinemaScopeFilePath__Q43scn4step3sfx25$$2unnamed$$2CinemaScope_cpp$$2FQ43scn4step3sfx15CinemaScopeKind: /* 803CCD20 003C8B60 54 60 10 3A */ slwi r0, r3, 2 @@ -162,17 +162,17 @@ isNeedToDraw__Q43scn4step3sfx11CinemaScopeCFv: draw__Q43scn4step3sfx11CinemaScopeFv: /* 803CCDE8 003C8C28 48 03 39 8C */ b draw__Q23sfx16CinemaScopeModelFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251854 $$251854: .incbin "baserom.dol", 0x45AC98, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251791 $$251791: .incbin "baserom.dol", 0x45C9E8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251630 $$251630: .incbin "baserom.dol", 0x48ED10, 0x18 @@ -180,12 +180,12 @@ $$251630: $$251631: .incbin "baserom.dol", 0x48ED28, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_CINEMASCOPE_FILE_PATH__Q33scn10grandtitle25$$2unnamed$$2CinemaScope_cpp$$2 T_CINEMASCOPE_FILE_PATH__Q33scn10grandtitle25$$2unnamed$$2CinemaScope_cpp$$2: .incbin "baserom.dol", 0x4947F0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_CINEMASCOPE_FILE_PATH_TABLE__Q43scn4step3sfx25$$2unnamed$$2CinemaScope_cpp$$2 T_CINEMASCOPE_FILE_PATH_TABLE__Q43scn4step3sfx25$$2unnamed$$2CinemaScope_cpp$$2: .incbin "baserom.dol", 0x4983D8, 0x8 diff --git a/asm/src/CinemaScopeModel.s b/asm/src/CinemaScopeModel.s index 3a043e4d..960adc25 100644 --- a/asm/src/CinemaScopeModel.s +++ b/asm/src/CinemaScopeModel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23sfx16CinemaScopeModelFv __ct__Q23sfx16CinemaScopeModelFv: /* 80400510 003FC350 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -190,12 +190,12 @@ draw__Q23sfx16CinemaScopeModelFv: /* 80400784 003FC5C4 48 00 0A 18 */ b draw__Q23sfx15FullScreenModelFv /* 80400788 003FC5C8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251766 $$251766: .incbin "baserom.dol", 0x492668, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251772 $$251772: .incbin "baserom.dol", 0x498A80, 0x8 diff --git a/asm/src/ClearDanceSync.s b/asm/src/ClearDanceSync.s index 893ab648..750019d2 100644 --- a/asm/src/ClearDanceSync.s +++ b/asm/src/ClearDanceSync.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero14ClearDanceSyncFRQ33scn4step9Component __ct__Q43scn4step4hero14ClearDanceSyncFRQ33scn4step9Component: /* 80333E98 0032FCD8 90 83 00 00 */ stw r4, 0(r3) @@ -153,7 +153,7 @@ lbl_80334080: /* 80334090 0032FED0 38 21 00 20 */ addi r1, r1, 0x20 /* 80334094 0032FED4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global ANIM_KIND_TABLE_A__Q43scn4step4hero28$$2unnamed$$2ClearDanceSync_cpp$$2 ANIM_KIND_TABLE_A__Q43scn4step4hero28$$2unnamed$$2ClearDanceSync_cpp$$2: .incbin "baserom.dol", 0x415D68, 0x10 diff --git a/asm/src/ClearDanceUtil.s b/asm/src/ClearDanceUtil.s index d64f716e..b66c31a7 100644 --- a/asm/src/ClearDanceUtil.s +++ b/asm/src/ClearDanceUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetZoom__Q43scn4step4hero14ClearDanceUtilFRQ43scn4step4hero4Hero SetZoom__Q43scn4step4hero14ClearDanceUtilFRQ43scn4step4hero4Hero: /* 80334098 0032FED8 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/CliffChecker.s b/asm/src/CliffChecker.s index 86397ef9..378e0638 100644 --- a/asm/src/CliffChecker.s +++ b/asm/src/CliffChecker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara12CliffCheckerFRQ33scn4step9ComponentRQ24gobj8LocationRQ24gobj9FootStateRQ24gobj6Targetf __ct__Q43scn4step5chara12CliffCheckerFRQ33scn4step9ComponentRQ24gobj8LocationRQ24gobj9FootStateRQ24gobj6Targetf: /* 8026D514 00269354 90 83 00 00 */ stw r4, 0(r3) @@ -151,7 +151,7 @@ setValid__Q43scn4step5chara12CliffCheckerFb: /* 8026D720 00269560 98 83 00 15 */ stb r4, 0x15(r3) /* 8026D724 00269564 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252371 $$252371: .incbin "baserom.dol", 0x49B760, 0x4 diff --git a/asm/src/CliffEdgeBoundCtrl.s b/asm/src/CliffEdgeBoundCtrl.s index b4c93761..6da748a7 100644 --- a/asm/src/CliffEdgeBoundCtrl.s +++ b/asm/src/CliffEdgeBoundCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item18CliffEdgeBoundCtrlFRQ43scn4step4item4Itemff __ct__Q43scn4step4item18CliffEdgeBoundCtrlFRQ43scn4step4item4Itemff: /* 803C0E40 003BCC80 90 83 00 00 */ stw r4, 0(r3) @@ -74,7 +74,7 @@ lbl_803C0F0C: /* 803C0F24 003BCD64 38 21 00 20 */ addi r1, r1, 0x20 /* 803C0F28 003BCD68 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252540 $$252540: .incbin "baserom.dol", 0x49E4F0, 0x4 diff --git a/asm/src/ClosePanel.s b/asm/src/ClosePanel.s index 5d1124d4..20226db7 100644 --- a/asm/src/ClosePanel.s +++ b/asm/src/ClosePanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause10ClosePanelFRQ25pause9Component __ct__Q25pause10ClosePanelFRQ25pause9Component: /* 801DA754 001D6594 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -113,7 +113,7 @@ isDecideAnimating__Q25pause10ClosePanelCFv: /* 801DA8C8 001D6708 88 63 03 A8 */ lbz r3, 0x3a8(r3) /* 801DA8CC 001D670C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252084 $$252084: .incbin "baserom.dol", 0x459560, 0x10 diff --git a/asm/src/Closest.s b/asm/src/Closest.s index 92372e45..01ccac2f 100644 --- a/asm/src/Closest.s +++ b/asm/src/Closest.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __mi__Q33hel4math7Vector2CFRCQ33hel4math7Vector2 __mi__Q33hel4math7Vector2CFRCQ33hel4math7Vector2: /* 801A01FC 0019C03C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -276,7 +276,7 @@ __pl__Q33hel4math7Vector2CFRCQ33hel4math7Vector2: /* 801A05D8 0019C418 38 21 00 20 */ addi r1, r1, 0x20 /* 801A05DC 0019C41C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250353 $$250353: .incbin "baserom.dol", 0x49A3F8, 0x4 diff --git a/asm/src/CollDataTable.s b/asm/src/CollDataTable.s index c6cf0450..36803385 100644 --- a/asm/src/CollDataTable.s +++ b/asm/src/CollDataTable.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll13CollDataTableFRQ23mem10IAllocatorUl __ct__Q25ocoll13CollDataTableFRQ23mem10IAllocatorUl: /* 801D57FC 001D163C 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/CollUtil.s b/asm/src/CollUtil.s index af0da51a..5b93b816 100644 --- a/asm/src/CollUtil.s +++ b/asm/src/CollUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetBodyCollDefault__Q53scn4step4boss6common8CollUtilFRQ43scn4step4boss4BossUlfQ33hel4math7Vector2 SetBodyCollDefault__Q53scn4step4boss6common8CollUtilFRQ43scn4step4boss4BossUlfQ33hel4math7Vector2: /* 802442F8 00240138 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/CollideTarget.s b/asm/src/CollideTarget.s index 53b55fb1..25606204 100644 --- a/asm/src/CollideTarget.s +++ b/asm/src/CollideTarget.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail13CollideTargetFRCQ33hel5geo2d4EdgeRCQ35mcoll6detail12LandPropertyQ35mcoll6detail13LandAttributeQ35mcoll6detail15LandThroughType __ct__Q35mcoll6detail13CollideTargetFRCQ33hel5geo2d4EdgeRCQ35mcoll6detail12LandPropertyQ35mcoll6detail13LandAttributeQ35mcoll6detail15LandThroughType: /* 801B6C84 001B2AC4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/CollideTargetRepos.s b/asm/src/CollideTargetRepos.s index cd23a9af..7309b49d 100644 --- a/asm/src/CollideTargetRepos.s +++ b/asm/src/CollideTargetRepos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail18CollideTargetReposFv __ct__Q35mcoll6detail18CollideTargetReposFv: /* 801B6D10 001B2B50 38 A0 00 00 */ li r5, 0 diff --git a/asm/src/CollideTargetReposSet.s b/asm/src/CollideTargetReposSet.s index 03951e6c..3bafc3b7 100644 --- a/asm/src/CollideTargetReposSet.s +++ b/asm/src/CollideTargetReposSet.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail21CollideTargetReposSetFv __ct__Q35mcoll6detail21CollideTargetReposSetFv: /* 801B6DFC 001B2C3C 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/CollidedAction.s b/asm/src/CollidedAction.s index f902d30f..922ab245 100644 --- a/asm/src/CollidedAction.s +++ b/asm/src/CollidedAction.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateAbort__Q35mcoll6detail14CollidedActionFv CreateAbort__Q35mcoll6detail14CollidedActionFv: /* 801B6698 001B24D8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -31,7 +31,7 @@ __ct__Q35mcoll6detail14CollidedActionFv: /* 801B66E4 001B2524 D0 03 00 04 */ stfs f0, 4(r3) /* 801B66E8 001B2528 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248848 $$248848: .incbin "baserom.dol", 0x49A578, 0x4 diff --git a/asm/src/CollidedDetectionInfo.s b/asm/src/CollidedDetectionInfo.s index 94036f3d..f5f3b445 100644 --- a/asm/src/CollidedDetectionInfo.s +++ b/asm/src/CollidedDetectionInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail21CollidedDetectionInfoFv __ct__Q35mcoll6detail21CollidedDetectionInfoFv: /* 801B66EC 001B252C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/CollidedInfo.s b/asm/src/CollidedInfo.s index c429bff6..5843dfae 100644 --- a/asm/src/CollidedInfo.s +++ b/asm/src/CollidedInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail12CollidedInfoFv __ct__Q35mcoll6detail12CollidedInfoFv: /* 801B68C8 001B2708 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -173,7 +173,7 @@ landVelocity__Q35mcoll6detail12CollidedInfoCFv: /* 801B6B04 001B2944 38 84 00 48 */ addi r4, r4, 0x48 /* 801B6B08 001B2948 4B F9 4E 60 */ b __as__Q34nw4r4math5_VEC2FRCQ34nw4r4math5_VEC2 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250421 $$250421: .incbin "baserom.dol", 0x49A580, 0x8 diff --git a/asm/src/CollidedLog.s b/asm/src/CollidedLog.s index 03280a7d..ffb3ec5c 100644 --- a/asm/src/CollidedLog.s +++ b/asm/src/CollidedLog.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail11CollidedLogFv __ct__Q35mcoll6detail11CollidedLogFv: /* 801B6B0C 001B294C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Color.s b/asm/src/Color.s index b0a0a5d7..f67fa2fa 100644 --- a/asm/src/Color.s +++ b/asm/src/Color.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __sinit_$$3Color_cpp __sinit_$$3Color_cpp: /* 8019D88C 001996CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -73,7 +73,7 @@ __ct__Q33hel6common5ColorFUcUcUcUc: /* 8019D98C 001997CC 98 E3 00 03 */ stb r7, 3(r3) /* 8019D990 001997D0 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402414, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/ColorAnim.s b/asm/src/ColorAnim.s index 0f34ebe7..69e1bf87 100644 --- a/asm/src/ColorAnim.s +++ b/asm/src/ColorAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d9ColorAnimFRCQ23g3d16ColorAnimContext __ct__Q23g3d9ColorAnimFRCQ23g3d16ColorAnimContext: /* 8018D888 001896C8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -130,7 +130,7 @@ updateFlash__Q23g3d9ColorAnimFRCQ23g3d14ColorAnimFlash: /* 8018DA4C 0018988C 38 A5 00 60 */ addi r5, r5, 0x60 /* 8018DA50 00189890 48 00 00 E4 */ b reflectToMaterial__Q23g3d14ColorAnimFlashCFRCQ23g3d16MaterialAccessorRCQ23g3d23ColorAnimMaterialTarget -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj9ColorAnimFRCQ24gobj13ColorAnimDescRQ23mem10IAllocatorRQ24gobj9IG3DModel __ct__Q24gobj9ColorAnimFRCQ24gobj13ColorAnimDescRQ23mem10IAllocatorRQ24gobj9IG3DModel: /* 80199914 00195754 94 21 F8 40 */ stwu r1, -0x7c0(r1) @@ -551,7 +551,7 @@ setFlash__Q24gobj9ColorAnimFRCQ23g3d14ColorAnimFlash: /* 80199EB0 00195CF0 90 03 00 20 */ stw r0, 0x20(r3) /* 80199EB4 00195CF4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251917 $$251917: .incbin "baserom.dol", 0x49A2C8, 0x8 diff --git a/asm/src/ColorAnimContext.s b/asm/src/ColorAnimContext.s index 20c9f7ea..6af5d4c2 100644 --- a/asm/src/ColorAnimContext.s +++ b/asm/src/ColorAnimContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d16ColorAnimContextFRCQ23g3d16MaterialAccessorb __ct__Q23g3d16ColorAnimContextFRCQ23g3d16MaterialAccessorb: /* 8018DA54 00189894 39 03 FF FC */ addi r8, r3, -4 diff --git a/asm/src/ColorAnimFlash.s b/asm/src/ColorAnimFlash.s index a50e7088..fe1d37be 100644 --- a/asm/src/ColorAnimFlash.s +++ b/asm/src/ColorAnimFlash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateMaterialTarget__Q23g3d14ColorAnimFlashFRQ23g3d19ColorAnimTevManager CreateMaterialTarget__Q23g3d14ColorAnimFlashFRQ23g3d19ColorAnimTevManager: /* 8018DA90 001898D0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/ColorAnimMaterialTarget.s b/asm/src/ColorAnimMaterialTarget.s index 1003bd04..a57ae011 100644 --- a/asm/src/ColorAnimMaterialTarget.s +++ b/asm/src/ColorAnimMaterialTarget.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d23ColorAnimMaterialTargetFv __ct__Q23g3d23ColorAnimMaterialTargetFv: /* 8018DD4C 00189B8C 38 00 00 00 */ li r0, 0 @@ -40,7 +40,7 @@ tevRegId2GXTevColorArgAlpha__Q23g3d23ColorAnimMaterialTargetCFv: /* 8018DDB0 00189BF0 7C 63 00 2E */ lwzx r3, r3, r0 /* 8018DDB4 00189BF4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_TEV_REG_ID_2_TEV_COLOR_ARG__Q23g3d37$$2unnamed$$2ColorAnimMaterialTarget_cpp$$2 T_TEV_REG_ID_2_TEV_COLOR_ARG__Q23g3d37$$2unnamed$$2ColorAnimMaterialTarget_cpp$$2: .incbin "baserom.dol", 0x410698, 0x10 diff --git a/asm/src/ColorAnimTevManager.s b/asm/src/ColorAnimTevManager.s index 309866f6..d966a6b4 100644 --- a/asm/src/ColorAnimTevManager.s +++ b/asm/src/ColorAnimTevManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d19ColorAnimTevManagerFRCQ34nw4r3g3d6ResTev __ct__Q23g3d19ColorAnimTevManagerFRCQ34nw4r3g3d6ResTev: /* 8018DDB8 00189BF8 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -479,7 +479,7 @@ reserveWithTevRegID__Q23g3d19ColorAnimTevManagerF11_GXTevRegID: /* 8018E444 0018A284 38 21 00 10 */ addi r1, r1, 0x10 /* 8018E448 0018A288 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249444 $$249444: .incbin "baserom.dol", 0x450490, 0x50 @@ -493,7 +493,7 @@ $$2STRING$$2ref__Q34nw4r3g3d6ResTevCFv$$20: $$2STRING$$2ref__Q34nw4r3g3d6ResTevCFv: .incbin "baserom.dol", 0x450540, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2GetClassName__Q34nw4r3g3d6ResTevFv $$2STRING$$2GetClassName__Q34nw4r3g3d6ResTevFv: .incbin "baserom.dol", 0x493160, 0x8 diff --git a/asm/src/CommandManager.s b/asm/src/CommandManager.s index 6170fd6e..e1d47b46 100644 --- a/asm/src/CommandManager.s +++ b/asm/src/CommandManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero14CommandManagerFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero14CommandManagerFRQ43scn4step4hero4Hero: /* 80334230 00330070 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -227,7 +227,7 @@ lbl_80334518: /* 80334538 00330378 38 21 00 20 */ addi r1, r1, 0x20 /* 8033453C 0033037C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter14CommandManagerFRQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter14CommandManagerFRQ43scn4step4hero4Hero: /* 8039B2A4 003970E4 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/Commander.s b/asm/src/Commander.s index 71642f8d..1f27f2d8 100644 --- a/asm/src/Commander.s +++ b/asm/src/Commander.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CurrentFrame__Q33scn14challengetitle9CommanderFv CurrentFrame__Q33scn14challengetitle9CommanderFv: /* 801EBCF0 001E7B30 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -568,7 +568,7 @@ __sinit_$$3Commander_cpp: /* 801EC444 001E8284 38 6D EE F8 */ addi r3, r13, t_obj__Q33scn14challengetitle23$$2unnamed$$2Commander_cpp$$2-_SDA_BASE_ /* 801EC448 001E8288 4B EF 0F 98 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CurrentFrame__Q33scn10grandtitle9CommanderFv CurrentFrame__Q33scn10grandtitle9CommanderFv: /* 80202F1C 001FED5C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1291,7 +1291,7 @@ __sinit_$$3Commander_cpp: /* 80203844 001FF684 38 6D EF 50 */ addi r3, r13, t_obj__Q33scn10grandtitle23$$2unnamed$$2Commander_cpp$$2-_SDA_BASE_ /* 80203848 001FF688 4B ED 9B 98 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss9CommanderFRQ33scn4step9ComponentUl __ct__Q43scn4step4boss9CommanderFRQ33scn4step9ComponentUl: /* 8022D134 00228F74 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2707,7 +2707,7 @@ lbl_8022E4D0: /* 8022E4E8 0022A328 38 21 00 50 */ addi r1, r1, 0x50 /* 8022E4EC 0022A32C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn11staffcredit9CommanderFRQ33scn11staffcredit9Component __ct__Q33scn11staffcredit9CommanderFRQ33scn11staffcredit9Component: /* 803F90F0 003F4F30 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3077,15 +3077,15 @@ requestEfConfetti__Q33scn11staffcredit9CommanderFv: /* 803F95D8 003F5418 38 21 00 10 */ addi r1, r1, 0x10 /* 803F95DC 003F541C 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40244C, 0x8 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_RETRY_HP_RATE_TABLE__Q43scn4step4boss23$$2unnamed$$2Commander_cpp$$2 T_RETRY_HP_RATE_TABLE__Q43scn4step4boss23$$2unnamed$$2Commander_cpp$$2: .incbin "baserom.dol", 0x412488, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255882 $$255882: .incbin "baserom.dol", 0x45ACA8, 0x1C @@ -3102,7 +3102,7 @@ $$255900: $$255901: .incbin "baserom.dol", 0x45AD10, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255960 $$255960: .incbin "baserom.dol", 0x45CA00, 0x18 @@ -3119,22 +3119,22 @@ $$255977: $$255978: .incbin "baserom.dol", 0x45CA5C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256622 $$256622: .incbin "baserom.dol", 0x492020, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255800 $$255800: .incbin "baserom.dol", 0x49A908, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255828 $$255828: .incbin "baserom.dol", 0x49AAC8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259289 $$259289: .incbin "baserom.dol", 0x49ADE8, 0x4 @@ -3184,7 +3184,7 @@ $$259613: $$259625: .incbin "baserom.dol", 0x49AE30, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256621 $$256621: .incbin "baserom.dol", 0x49ED98, 0x4 diff --git a/asm/src/Common.s b/asm/src/Common.s index 94a96a61..17317713 100644 --- a/asm/src/Common.s +++ b/asm/src/Common.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Script__Q53scn4step4hero9modeldesc6CommonFv Script__Q53scn4step4hero9modeldesc6CommonFv: /* 8035BBAC 003579EC 3C 60 80 49 */ lis r3, $$249133@ha @@ -15,12 +15,12 @@ Script__Q53scn4step4hero9modeldesc6CommonFv: /* 8035BBD0 00357A10 90 03 00 08 */ stw r0, 8(r3) /* 8035BBD4 00357A14 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Script__Q53scn4step4hero9modeldesc6CommonFv$$2ENTRIES$$20 $$2LOCAL$$2Script__Q53scn4step4hero9modeldesc6CommonFv$$2ENTRIES$$20: .incbin "baserom.dol", 0x4164C0, 0x1C20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248726 $$248726: .incbin "baserom.dol", 0x4818A0, 0x20 diff --git a/asm/src/Component.s b/asm/src/Component.s index 55d1ce3e..bfc7d1e2 100644 --- a/asm/src/Component.s +++ b/asm/src/Component.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause9ComponentFRCQ25pause11ContextInitPQ25pause9ICallback __ct__Q25pause9ComponentFRCQ25pause11ContextInitPQ25pause9ICallback: /* 801DA8D0 001D6710 94 21 FE 40 */ stwu r1, -0x1c0(r1) @@ -726,7 +726,7 @@ pageManager__Q25pause9ComponentFv: /* 801DB284 001D70C4 38 63 00 C0 */ addi r3, r3, 0xc0 /* 801DB288 001D70C8 4B F9 C9 64 */ b __rf__Q23mem43ExplicitScopedPtr$$0Q23app16HIDErrorMenuImpl$$1CFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle9ComponentFv __ct__Q33scn14challengetitle9ComponentFv: /* 801EC44C 001E828C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1612,7 +1612,7 @@ lbl_801ED0C8: /* 801ED0D4 001E8F14 38 21 00 10 */ addi r1, r1, 0x10 /* 801ED0D8 001E8F18 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle9ComponentFb __ct__Q33scn10grandtitle9ComponentFb: /* 8020384C 001FF68C 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -2415,7 +2415,7 @@ lbl_802043C8: /* 802043DC 0020021C 38 21 00 10 */ addi r1, r1, 0x10 /* 802043E0 00200220 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history9ComponentFv __ct__Q33scn7history9ComponentFv: /* 802075E0 00203420 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2699,7 +2699,7 @@ lbl_802079D8: /* 802079EC 0020382C 38 21 00 10 */ addi r1, r1, 0x10 /* 802079F0 00203830 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn4step9ComponentFRCQ33scn4step7Context __ct__Q33scn4step9ComponentFRCQ33scn4step7Context: /* 8021D0D4 00218F14 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -7187,7 +7187,7 @@ debugObjInfoRepos__Q33scn4step9ComponentFv: /* 80220F64 0021CDA4 38 21 00 10 */ addi r1, r1, 0x10 /* 80220F68 0021CDA8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn9grandmenu9ComponentFv __ct__Q33scn9grandmenu9ComponentFv: /* 803F2E80 003EECC0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -7504,7 +7504,7 @@ lbl_803F32EC: /* 803F3300 003EF140 38 21 00 10 */ addi r1, r1, 0x10 /* 803F3304 003EF144 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn11staffcredit9ComponentFRCQ33scn4step7Context __ct__Q33scn11staffcredit9ComponentFRCQ33scn4step7Context: /* 803F95E0 003F5420 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -7887,17 +7887,17 @@ lbl_803F9B3C: /* 803F9B50 003F5990 38 21 00 10 */ addi r1, r1, 0x10 /* 803F9B54 003F5994 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257322 $$257322: .incbin "baserom.dol", 0x45AD30, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257925 $$257925: .incbin "baserom.dol", 0x45CA78, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255625 $$255625: .incbin "baserom.dol", 0x492040, 0x14 @@ -7908,7 +7908,7 @@ $$255626: $$255628: .incbin "baserom.dol", 0x492068, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253837 $$253837: .incbin "baserom.dol", 0x493A50, 0x8 @@ -7922,12 +7922,12 @@ $$253839: $$253840: .incbin "baserom.dol", 0x493A60, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255627 $$255627: .incbin "baserom.dol", 0x498A00, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256022 $$256022: .incbin "baserom.dol", 0x49A910, 0x4 @@ -7935,7 +7935,7 @@ $$256022: $$256026: .incbin "baserom.dol", 0x49A914, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255954 $$255954: .incbin "baserom.dol", 0x49AAD0, 0x4 @@ -7946,7 +7946,7 @@ $$255959: $$255962: .incbin "baserom.dol", 0x49AAD8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252828 $$252828: .incbin "baserom.dol", 0x49AB78, 0x4 @@ -7954,7 +7954,7 @@ $$252828: $$252833: .incbin "baserom.dol", 0x49AB7C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252815 $$252815: .incbin "baserom.dol", 0x49ED58, 0x4 diff --git a/asm/src/Confirm.s b/asm/src/Confirm.s index 14feae6f..61a151f6 100644 --- a/asm/src/Confirm.s +++ b/asm/src/Confirm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info6common7ConfirmFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorPCwPCwPCwPCwbbPCcPCc __ct__Q34info6common7ConfirmFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorPCwPCwPCwPCwbbPCcPCc: /* 801A9348 001A5188 94 21 FE 60 */ stwu r1, -0x1a0(r1) @@ -785,7 +785,7 @@ lbl_801A9DB8: /* 801A9DB8 001A5BF8 38 63 03 A0 */ addi r3, r3, 0x3a0 /* 801A9DBC 001A5BFC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252873 $$252873: .incbin "baserom.dol", 0x453618, 0xC @@ -820,7 +820,7 @@ $$252885: $$252886: .incbin "baserom.dol", 0x453690, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252874 $$252874: .incbin "baserom.dol", 0x493440, 0x8 @@ -846,7 +846,7 @@ $$253036: $$253048: .incbin "baserom.dol", 0x493470, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253005 $$253005: .incbin "baserom.dol", 0x49A490, 0x8 diff --git a/asm/src/ConsecutiveBattle.s b/asm/src/ConsecutiveBattle.s index 7d42c304..0da1f1e5 100644 --- a/asm/src/ConsecutiveBattle.s +++ b/asm/src/ConsecutiveBattle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick17consecutivebattle17ConsecutiveBattleFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick17consecutivebattle17ConsecutiveBattleFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8030B098 00306ED8 94 21 FE 20 */ stwu r1, -0x1e0(r1) @@ -423,12 +423,12 @@ lbl_8030B644: /* 8030B678 003074B8 38 21 00 70 */ addi r1, r1, 0x70 /* 8030B67C 003074BC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251712 $$251712: .incbin "baserom.dol", 0x47D350, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251713 $$251713: .incbin "baserom.dol", 0x49D348, 0x4 diff --git a/asm/src/Console.s b/asm/src/Console.s index 80bbfae9..7fbd03d3 100644 --- a/asm/src/Console.s +++ b/asm/src/Console.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global construct__Q26freeze7ConsoleFv construct__Q26freeze7ConsoleFv: /* 80189648 00185488 38 80 00 16 */ li r4, 0x16 @@ -259,7 +259,7 @@ lbl_80189954: /* 801899C8 00185808 38 21 00 90 */ addi r1, r1, 0x90 /* 801899CC 0018580C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2Console_GetBufferHeadLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead$$20 $$2STRING$$2Console_GetBufferHeadLine__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHead$$20: .incbin "baserom.dol", 0x44F9A0, 0x24 diff --git a/asm/src/Constant.s b/asm/src/Constant.s index 451f9a40..ee663c2f 100644 --- a/asm/src/Constant.s +++ b/asm/src/Constant.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LytResPathMain__Q25pause8ConstantFv LytResPathMain__Q25pause8ConstantFv: /* 801DB28C 001D70CC 3C 60 80 46 */ lis r3, $$248784@ha @@ -15,12 +15,12 @@ LytResPathPage__Q25pause8ConstantFQ25pause11PageResKind: /* 801DB2A4 001D70E4 7C 63 00 2E */ lwzx r3, r3, r0 /* 801DB2A8 001D70E8 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PAGE_RES_PATH__Q25pause22$$2unnamed$$2Constant_cpp$$2 T_PAGE_RES_PATH__Q25pause22$$2unnamed$$2Constant_cpp$$2: .incbin "baserom.dol", 0x411168, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248724 $$248724: .incbin "baserom.dol", 0x459570, 0x14 @@ -31,7 +31,7 @@ $$248725: $$248784: .incbin "baserom.dol", 0x459598, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global ERROR_BG_COLOR__Q23app8Constant ERROR_BG_COLOR__Q23app8Constant: .incbin "baserom.dol", 0x49A0E0, 0x4 @@ -39,7 +39,7 @@ ERROR_BG_COLOR__Q23app8Constant: ERROR_FONT_COLOR__Q23app8Constant: .incbin "baserom.dol", 0x49A0E4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global LIFE_BAR_LENGTH_MAIN__Q43scn4step4hero8Constant LIFE_BAR_LENGTH_MAIN__Q43scn4step4hero8Constant: .incbin "baserom.dol", 0x49D6C0, 0x4 @@ -47,7 +47,7 @@ LIFE_BAR_LENGTH_MAIN__Q43scn4step4hero8Constant: LIFE_BAR_LENGTH_EXTRA__Q43scn4step4hero8Constant: .incbin "baserom.dol", 0x49D6C4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global ONE_GRID_SIZE_ON_MAPRO_POS__Q43scn4step3map8Constant ONE_GRID_SIZE_ON_MAPRO_POS__Q43scn4step3map8Constant: .incbin "baserom.dol", 0x49E660, 0x8 diff --git a/asm/src/Context.s b/asm/src/Context.s index b2d27596..fe7fb484 100644 --- a/asm/src/Context.s +++ b/asm/src/Context.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone7ContextFRQ53scn4step4hero5stone21GearNodeRandomChanger __ct__Q53scn4step4hero5stone7ContextFRQ53scn4step4hero5stone21GearNodeRandomChanger: /* 8038F948 0038B788 90 83 00 00 */ stw r4, 0(r3) @@ -16,7 +16,7 @@ __ct__Q53scn4step4hero5stone7ContextFRQ53scn4step4hero5stone21GearNodeRandomChan /* 8038F970 0038B7B0 98 03 00 14 */ stb r0, 0x14(r3) /* 8038F974 0038B7B4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248858 $$248858: .incbin "baserom.dol", 0x49E100, 0x8 diff --git a/asm/src/ContextChallenge.s b/asm/src/ContextChallenge.s index 63498d49..9571dcf5 100644 --- a/asm/src/ContextChallenge.s +++ b/asm/src/ContextChallenge.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q33scn4step16ContextChallengeFv Create__Q33scn4step16ContextChallengeFv: /* 80220F6C 0021CDAC 94 21 FF 60 */ stwu r1, -0xa0(r1) diff --git a/asm/src/ContextGhost.s b/asm/src/ContextGhost.s index 1ddcbeca..12656463 100644 --- a/asm/src/ContextGhost.s +++ b/asm/src/ContextGhost.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q33scn4step12ContextGhostFv Create__Q33scn4step12ContextGhostFv: /* 802210C4 0021CF04 38 83 FF FC */ addi r4, r3, -4 diff --git a/asm/src/ContextHero.s b/asm/src/ContextHero.s index 3fc39130..36e8601a 100644 --- a/asm/src/ContextHero.s +++ b/asm/src/ContextHero.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q33scn4step17ContextHeroIndiviFv Create__Q33scn4step17ContextHeroIndiviFv: /* 802210E8 0021CF28 94 21 FF B0 */ stwu r1, -0x50(r1) diff --git a/asm/src/ContextInit.s b/asm/src/ContextInit.s index fb9831ef..f2ab9272 100644 --- a/asm/src/ContextInit.s +++ b/asm/src/ContextInit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q25pause11ContextInitFQ27storage9StoryModeQ25pause8ModeKind Create__Q25pause11ContextInitFQ27storage9StoryModeQ25pause8ModeKind: /* 801DB2AC 001D70EC 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/ContextLvMap.s b/asm/src/ContextLvMap.s index 8812b6da..4c43ca3f 100644 --- a/asm/src/ContextLvMap.s +++ b/asm/src/ContextLvMap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q33scn4step12ContextLvMapFv Create__Q33scn4step12ContextLvMapFv: /* 80221338 0021D178 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/ContextMode.s b/asm/src/ContextMode.s index 5197e397..4d1b4eea 100644 --- a/asm/src/ContextMode.s +++ b/asm/src/ContextMode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q33scn4step11ContextModeFv Create__Q33scn4step11ContextModeFv: /* 802213BC 0021D1FC 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/ContextOpen.s b/asm/src/ContextOpen.s index fe7c0c81..30c9ac79 100644 --- a/asm/src/ContextOpen.s +++ b/asm/src/ContextOpen.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q25pause11ContextOpenFUlRCQ25pause15PlayerEntryInfoQ25pause10ManualKindb Create__Q25pause11ContextOpenFUlRCQ25pause15PlayerEntryInfoQ25pause10ManualKindb: /* 801DB318 001D7158 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/ContextStory.s b/asm/src/ContextStory.s index e479f835..dcb53ce8 100644 --- a/asm/src/ContextStory.s +++ b/asm/src/ContextStory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q23seq12ContextStoryFv Create__Q23seq12ContextStoryFv: /* 803FCB20 003F8960 94 21 FB F0 */ stwu r1, -0x410(r1) diff --git a/asm/src/ControlIcon.s b/asm/src/ControlIcon.s index 4a8ca983..302cfb14 100644 --- a/asm/src/ControlIcon.s +++ b/asm/src/ControlIcon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn5anime11ControlIconFQ23lyt12PaneAccessorb __ct__Q33scn5anime11ControlIconFQ23lyt12PaneAccessorb: /* 801DFC90 001DBAD0 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -265,7 +265,7 @@ lbl_801E0008: /* 801E0014 001DBE54 38 21 00 10 */ addi r1, r1, 0x10 /* 801E0018 001DBE58 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251820 $$251820: .incbin "baserom.dol", 0x459C88, 0x10 @@ -285,7 +285,7 @@ $$252410: $$252469: .incbin "baserom.dol", 0x459CE0, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251817 $$251817: .incbin "baserom.dol", 0x493D10, 0x8 diff --git a/asm/src/ControlPanel.s b/asm/src/ControlPanel.s index bbc3d36a..cb844312 100644 --- a/asm/src/ControlPanel.s +++ b/asm/src/ControlPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn5anime12ControlPanelFQ23lyt12PaneAccessorb __ct__Q33scn5anime12ControlPanelFQ23lyt12PaneAccessorb: /* 801E001C 001DBE5C 94 21 FB B0 */ stwu r1, -0x450(r1) @@ -836,7 +836,7 @@ unselectAllCursor__Q33scn5anime12ControlPanelFv: /* 801E0BB8 001DC9F8 38 21 00 10 */ addi r1, r1, 0x10 /* 801E0BBC 001DC9FC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252991 $$252991: .incbin "baserom.dol", 0x459D20, 0x14 @@ -886,7 +886,7 @@ $$253096: $$253145: .incbin "baserom.dol", 0x459E04, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252999 $$252999: .incbin "baserom.dol", 0x493D38, 0x8 @@ -942,7 +942,7 @@ $$253121: $$253139: .incbin "baserom.dol", 0x493DB8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253102 $$253102: .incbin "baserom.dol", 0x49A820, 0x4 diff --git a/asm/src/Controller.s b/asm/src/Controller.s index 8c765005..c378494f 100644 --- a/asm/src/Controller.s +++ b/asm/src/Controller.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history10ControllerFv __ct__Q33scn7history10ControllerFv: /* 802079F4 00203834 38 00 00 00 */ li r0, 0 diff --git a/asm/src/CountDown.s b/asm/src/CountDown.s index c9d7522f..20808c4a 100644 --- a/asm/src/CountDown.s +++ b/asm/src/CountDown.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge9CountDownFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge9CountDownFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B1D58 003ADB98 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -183,7 +183,7 @@ lbl_803B1FE4: /* 803B1FF0 003ADE30 38 21 00 40 */ addi r1, r1, 0x40 /* 803B1FF4 003ADE34 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252118 $$252118: .incbin "baserom.dol", 0x48C3D8, 0x14 @@ -200,7 +200,7 @@ $$252122: $$252124: .incbin "baserom.dol", 0x48C418, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252121 $$252121: .incbin "baserom.dol", 0x497B48, 0x8 diff --git a/asm/src/Counter.s b/asm/src/Counter.s index 63178e0e..d1a25220 100644 --- a/asm/src/Counter.s +++ b/asm/src/Counter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7CounterFUlUl __ct__Q43scn4step4hero7CounterFUlUl: /* 80334540 00330380 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -69,7 +69,7 @@ addPointStarCount__Q43scn4step4hero7CounterFUl: /* 80334624 00330464 38 21 00 20 */ addi r1, r1, 0x20 /* 80334628 00330468 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_COUNT_MAX__Q43scn4step4hero21$$2unnamed$$2Counter_cpp$$2 T_COUNT_MAX__Q43scn4step4hero21$$2unnamed$$2Counter_cpp$$2: .incbin "baserom.dol", 0x49D6C8, 0x8 diff --git a/asm/src/Cry.s b/asm/src/Cry.s index a72a3870..28577226 100644 --- a/asm/src/Cry.s +++ b/asm/src/Cry.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero3CryFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero3CryFRQ43scn4step4hero4Hero: /* 8033462C 0033046C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -332,7 +332,7 @@ lbl_80334A98: /* 80334AA8 003308E8 38 21 00 20 */ addi r1, r1, 0x20 /* 80334AAC 003308EC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global CRY_TABLE_KIRBY__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2 CRY_TABLE_KIRBY__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2: .incbin "baserom.dol", 0x415D90, 0x20 @@ -343,7 +343,7 @@ CRY_TABLE_META__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2: CRY_TABLE_DEDEDE__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2: .incbin "baserom.dol", 0x415DCC, 0x1C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global SHOUT_TABLE_KIRBY__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2 SHOUT_TABLE_KIRBY__Q43scn4step4hero17$$2unnamed$$2Cry_cpp$$2: .incbin "baserom.dol", 0x49D6D0, 0x8 diff --git a/asm/src/Culling.s b/asm/src/Culling.s index e01c2a37..60003040 100644 --- a/asm/src/Culling.s +++ b/asm/src/Culling.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara7CullingFRQ33scn4step9ComponentRQ24gobj8Locationfffb __ct__Q43scn4step5chara7CullingFRQ33scn4step9ComponentRQ24gobj8Locationfffb: /* 8026D728 00269568 90 83 00 00 */ stw r4, 0(r3) @@ -298,7 +298,7 @@ lbl_8026DAD4: /* 8026DB58 00269998 38 21 00 90 */ addi r1, r1, 0x90 /* 8026DB5C 0026999C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256037 $$256037: .incbin "baserom.dol", 0x49B778, 0x8 diff --git a/asm/src/Cursor.s b/asm/src/Cursor.s index 428c877c..d11b89cb 100644 --- a/asm/src/Cursor.s +++ b/asm/src/Cursor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect6CursorFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn19challengefileselect6CursorFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 801E2F84 001DEDC4 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -177,7 +177,7 @@ decide__Q33scn19challengefileselect6CursorFRCQ23lyt12PaneAccessor: /* 801E31F8 001DF038 38 21 00 80 */ addi r1, r1, 0x80 /* 801E31FC 001DF03C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail6CursorFRQ23mem10IAllocator __ct__Q43scn7history6detail6CursorFRQ23mem10IAllocator: /* 802114DC 0020D31C 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -392,12 +392,12 @@ playChoice__Q43scn7history6detail6CursorFv: /* 802117C8 0020D608 38 8D A2 C8 */ addi r4, r13, $$252560-_SDA_BASE_ /* 802117CC 0020D60C 4B F9 B7 C8 */ b play__Q23lyt6LayoutFPCc -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251586 $$251586: .incbin "baserom.dol", 0x4115C8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251991 $$251991: .incbin "baserom.dol", 0x45A030, 0x1C @@ -408,7 +408,7 @@ $$251582: __vt__Q33scn19challengefileselect6Cursor: .incbin "baserom.dol", 0x45A058, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251547 $$251547: .incbin "baserom.dol", 0x45D9A0, 0x10 @@ -452,7 +452,7 @@ $$252454: $$252455: .incbin "baserom.dol", 0x45DAC0, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251992 $$251992: .incbin "baserom.dol", 0x493DF8, 0x8 @@ -487,7 +487,7 @@ $$252034: $$252044: .incbin "baserom.dol", 0x493E48, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252551 $$252551: .incbin "baserom.dol", 0x494AC0, 0x8 diff --git a/asm/src/CursorPanel.s b/asm/src/CursorPanel.s index b7e8bfe1..3db6ed6e 100644 --- a/asm/src/CursorPanel.s +++ b/asm/src/CursorPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause11CursorPanelFPCcRCQ23lyt6LayoutRCQ23lyt12PaneAccessorRQ23mem10IAllocator __ct__Q25pause11CursorPanelFPCcRCQ23lyt6LayoutRCQ23lyt12PaneAccessorRQ23mem10IAllocator: /* 801DB404 001D7244 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -132,7 +132,7 @@ lbl_801DB5BC: /* 801DB5C8 001D7408 38 21 00 10 */ addi r1, r1, 0x10 /* 801DB5CC 001D740C 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251812 $$251812: .incbin "baserom.dol", 0x493A68, 0x8 diff --git a/asm/src/Curtain.s b/asm/src/Curtain.s index 1265572c..6ee7ad2b 100644 --- a/asm/src/Curtain.s +++ b/asm/src/Curtain.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn9grandmenu4menu7CurtainFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q43scn9grandmenu4menu7CurtainFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803F4B24 003F0964 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -216,12 +216,12 @@ isOpening__Q43scn9grandmenu4menu7CurtainCFv: /* 803F4DEC 003F0C2C 54 03 D9 7E */ srwi r3, r0, 5 /* 803F4DF0 003F0C30 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251703 $$251703: .incbin "baserom.dol", 0x4918A0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251704 $$251704: .incbin "baserom.dol", 0x4988A0, 0x8 diff --git a/asm/src/CurveUtility.s b/asm/src/CurveUtility.s index 889f1b6d..501b2e86 100644 --- a/asm/src/CurveUtility.s +++ b/asm/src/CurveUtility.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global square__Q24util12CurveUtilityFf square__Q24util12CurveUtilityFf: /* 80405948 00401788 EC 21 00 72 */ fmuls f1, f1, f1 @@ -21,7 +21,7 @@ invSquare__Q24util12CurveUtilityFf: /* 80405978 004017B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8040597C 004017BC 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249344 $$249344: .incbin "baserom.dol", 0x49EED0, 0x8 diff --git a/asm/src/Custom.s b/asm/src/Custom.s index c78d2711..35e1c2fd 100644 --- a/asm/src/Custom.s +++ b/asm/src/Custom.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss7bonkers6CustomFRQ43scn4step4boss4Boss: /* 802373A4 002331E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -606,7 +606,7 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11Stat __dt__Q24util123StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss7bonkers8NodeKind$$1Fv: /* 80237C04 00233A44 4B FF 6A 9C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster6CustomFRQ43scn4step4boss4Boss: /* 8023B510 00237350 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1719,7 +1719,7 @@ __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateSCHide$$4PQ43scn4step4boss4Boss$$1Fv: /* 8023C438 00238278 4B FF 22 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss12creditdedede6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss12creditdedede6CustomFRQ43scn4step4boss4Boss: /* 80247B0C 0024394C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1840,7 +1840,7 @@ __dt__Q53scn4step4boss12creditdedede6CustomFv: __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1Fv: /* 80247C54 00243A94 4B FE 6A 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9creditdee6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss9creditdee6CustomFRQ43scn4step4boss4Boss: /* 8024855C 0024439C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1961,7 +1961,7 @@ __dt__Q53scn4step4boss9creditdee6CustomFv: __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1Fv: /* 802486A4 002444E4 4B FE 5F FC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss10creditmeta6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss10creditmeta6CustomFRQ43scn4step4boss4Boss: /* 80249BF8 00245A38 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2082,7 +2082,7 @@ __dt__Q53scn4step4boss10creditmeta6CustomFv: __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1Fv: /* 80249D40 00245B80 4B FE 49 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss10creditroah6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss10creditroah6CustomFRQ43scn4step4boss4Boss: /* 8024B394 002471D4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2339,7 +2339,7 @@ __dt__Q53scn4step4boss10creditroah6CustomFv: __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1Fv: /* 8024B6D0 00247510 4B FE 2F D0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior6CustomFRQ43scn4step4boss4Boss: /* 8024C994 002487D4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3106,7 +3106,7 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9State __dt__Q24util122StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6dubior8NodeKind$$1Fv: /* 8024D418 00249258 4B FE 12 88 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss10gigantedge6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss10gigantedge6CustomFRQ43scn4step4boss4Boss: /* 80251B44 0024D984 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3637,7 +3637,7 @@ __dt__Q53scn4step4boss10gigantedge6CustomFv: __dt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss10gigantedge8NodeKind$$1Fv: /* 802522B4 0024E0F4 4B FD C3 EC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss8kingsdoo6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss8kingsdoo6CustomFRQ43scn4step4boss4Boss: /* 802534E4 0024F324 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3915,7 +3915,7 @@ __dt__Q53scn4step4boss8kingsdoo6CustomFv: __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss8kingsdoo8NodeKind$$1Fv: /* 80253888 0024F6C8 4B FD AE 18 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss9moundeath6CustomFRQ43scn4step4boss4Boss: /* 8025563C 0025147C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -4256,7 +4256,7 @@ __dt__Q53scn4step4boss9moundeath6CustomFv: __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8NodeKind$$1Fv: /* 80255AC4 00251904 4B FD 8B DC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss13watergalboros6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss13watergalboros6CustomFRQ43scn4step4boss4Boss: /* 8025989C 002556DC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -4650,7 +4650,7 @@ lbl_80259DC4: __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss13watergalboros8NodeKind$$1Fv: /* 80259DE0 00255C20 4B FD 48 C0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy6CustomFRQ43scn4step4boss4Boss: /* 8025BB08 00257948 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5142,7 +5142,7 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9State __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateDamageL$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025C168 00257FA8 4B FD 25 38 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9zankibble6CustomFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss9zankibble6CustomFRQ43scn4step4boss4Boss: /* 80260388 0025C1C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5481,7 +5481,7 @@ lbl_802607F0: __dt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9StateDead$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble8NodeKind$$1Fv: /* 8026080C 0025C64C 4B FC DE 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8armordee6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8armordee6CustomFRQ43scn4step5enemy5Enemy: /* 80296468 002922A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5619,7 +5619,7 @@ lbl_80296610: /* 80296624 00292464 38 21 00 10 */ addi r1, r1, 0x10 /* 80296628 00292468 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight6CustomFRQ43scn4step5enemy5Enemy: /* 80296FB4 00292DF4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5770,7 +5770,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy11bladeknight6CustomCFv: __dt__Q53scn4step5enemy11bladeknight6CustomFv: /* 802971C0 00293000 4B FF F4 10 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper6CustomFRQ43scn4step5enemy5Enemy: /* 80298F14 00294D54 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -6099,7 +6099,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy7blipper6CustomCFv: __dt__Q53scn4step5enemy7blipper6CustomFv: /* 80299394 002951D4 4B FF D2 3C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step6weapon7rollexp6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step6weapon7rollexp6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 8029BC14 00297A54 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -6457,7 +6457,7 @@ __dt__Q53scn4step5enemy11bonkersbomb6CustomFv: __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029C0DC 00297F1C 4B F9 25 C4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy6CustomFRQ43scn4step5enemy5Enemy: /* 8029D118 00298F58 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -6517,7 +6517,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6bouncy6CustomCFv: __dt__Q53scn4step5enemy6bouncy6CustomFv: /* 8029D1D0 00299010 4B FF 94 00 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5bowby6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5bowby6CustomFRQ43scn4step5enemy5Enemy: /* 8029E394 0029A1D4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -6804,7 +6804,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy5bowby6CustomCFv: __dt__Q53scn4step5enemy5bowby6CustomFv: /* 8029E784 0029A5C4 4B FF 7E 4C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5cappy6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5cappy6CustomFRQ43scn4step5enemy5Enemy: /* 802A285C 0029E69C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7196,7 +7196,7 @@ __dt__Q53scn4step5enemy5cappy6CustomFv: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A2DA0 0029EBE0 4B F8 B9 00 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8cappyhat6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8cappyhat6CustomFRQ43scn4step5enemy5Enemy: /* 802A39C8 0029F808 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7433,7 +7433,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy8cappyhat6CustomCFv: __dt__Q53scn4step5enemy8cappyhat6CustomFv: /* 802A3D10 0029FB50 4B FF 28 C0 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6chilly6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6chilly6CustomFRQ43scn4step5enemy5Enemy: /* 802A626C 002A20AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7476,7 +7476,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6chilly6CustomCFv: __dt__Q53scn4step5enemy6chilly6CustomFv: /* 802A62E0 002A2120 4B FF 02 F0 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como6CustomFRQ43scn4step5enemy5Enemy: /* 802A72F8 002A3138 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7595,7 +7595,7 @@ lbl_802A7454: /* 802A7468 002A32A8 38 21 00 10 */ addi r1, r1, 0x10 /* 802A746C 002A32AC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6degout6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6degout6CustomFRQ43scn4step5enemy5Enemy: /* 802AD2A0 002A90E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7653,7 +7653,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6degout6CustomCFv: __dt__Q53scn4step5enemy6degout6CustomFv: /* 802AD340 002A9180 4B FE 92 90 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8dubiorjr6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8dubiorjr6CustomFRQ43scn4step5enemy5Enemy: /* 802AE05C 002A9E9C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7753,7 +7753,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy8dubiorjr6CustomCFv: __dt__Q53scn4step5enemy8dubiorjr6CustomFv: /* 802AE190 002A9FD0 4B FE 84 40 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11dubiorspark6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11dubiorspark6CustomFRQ43scn4step5enemy5Enemy: /* 802AECC0 002AAB00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7894,7 +7894,7 @@ __dt__Q53scn4step5enemy11dubiorspark6CustomFv: __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802AEE7C 002AACBC 4B F7 F8 24 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4elec6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4elec6CustomFRQ43scn4step5enemy5Enemy: /* 802AFAA0 002AB8E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -8011,7 +8011,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy4elec6CustomCFv: __dt__Q53scn4step5enemy4elec6CustomFv: /* 802AFC3C 002ABA7C 4B FE 69 94 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6flamer6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6flamer6CustomFRQ43scn4step5enemy5Enemy: /* 802B2200 002AE040 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -8081,7 +8081,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6flamer6CustomCFv: __dt__Q53scn4step5enemy6flamer6CustomFv: /* 802B22D4 002AE114 4B FE 42 FC */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5foley6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5foley6CustomFRQ43scn4step5enemy5Enemy: /* 802B4524 002B0364 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -8417,7 +8417,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy5foley6CustomCFv: __dt__Q53scn4step5enemy5foley6CustomFv: /* 802B49C4 002B0804 4B FE 1C 0C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gemra6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gemra6CustomFRQ43scn4step5enemy5Enemy: /* 802B58D0 002B1710 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -9062,7 +9062,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy5gemra6CustomCFv: __dt__Q53scn4step5enemy5gemra6CustomFv: /* 802B61A8 002B1FE8 4B FE 04 28 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7gigatzo6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7gigatzo6CustomFRQ43scn4step5enemy5Enemy: /* 802B6B60 002B29A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -9892,7 +9892,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy7gigatzo6CustomCFv: __dt__Q53scn4step5enemy7gigatzo6CustomFv: /* 802B76B4 002B34F4 4B FD EF 1C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gordo6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gordo6CustomFRQ43scn4step5enemy5Enemy: /* 802B8DD0 002B4C10 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -10086,7 +10086,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy5gordo6CustomCFv: __dt__Q53scn4step5enemy5gordo6CustomFv: /* 802B9054 002B4E94 4B FD D5 7C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7hothead6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7hothead6CustomFRQ43scn4step5enemy5Enemy: /* 802BA2E8 002B6128 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -10359,7 +10359,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy7hothead6CustomCFv: __dt__Q53scn4step5enemy7hothead6CustomFv: /* 802BA668 002B64A8 4B FD BF 68 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6juckle6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6juckle6CustomFRQ43scn4step5enemy5Enemy: /* 802BB310 002B7150 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -10687,7 +10687,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6juckle6CustomCFv: __dt__Q53scn4step5enemy6juckle6CustomFv: /* 802BB79C 002B75DC 4B FD AE 34 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu6CustomFRQ43scn4step5enemy5Enemy: /* 802BCC6C 002B8AAC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -10794,7 +10794,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy4kabu6CustomCFv: __dt__Q53scn4step5enemy4kabu6CustomFv: /* 802BCDC4 002B8C04 4B FD 98 0C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe6CustomFRQ43scn4step5enemy5Enemy: /* 802BF350 002BB190 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -11196,7 +11196,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy10knucklejoe6CustomCFv: __dt__Q53scn4step5enemy10knucklejoe6CustomFv: /* 802BF8BC 002BB6FC 4B FD 6D 14 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6lanzer6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6lanzer6CustomFRQ43scn4step5enemy5Enemy: /* 802C1F6C 002BDDAC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -11367,7 +11367,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6lanzer6CustomCFv: __dt__Q53scn4step5enemy6lanzer6CustomFv: /* 802C2184 002BDFC4 4B FD 44 4C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9mbossdead6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9mbossdead6CustomFRQ43scn4step5enemy5Enemy: /* 802C4238 002C0078 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -11694,7 +11694,7 @@ lbl_802C4678: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C4694 002C04D4 4B F6 A0 0C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7mumbies6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7mumbies6CustomFRQ43scn4step5enemy5Enemy: /* 802C4E34 002C0C74 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -11846,7 +11846,7 @@ __dt__Q53scn4step5enemy7mumbies6CustomFv: __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C4FFC 002C0E3C 4B F6 96 A4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8needlous6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8needlous6CustomFRQ43scn4step5enemy5Enemy: /* 802C5DC4 002C1C04 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -12170,7 +12170,7 @@ lbl_802C61E8: /* 802C61FC 002C203C 38 21 00 10 */ addi r1, r1, 0x10 /* 802C6200 002C2040 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff6CustomFRQ43scn4step5enemy5Enemy: /* 802C7AF0 002C3930 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -12412,7 +12412,7 @@ lbl_802C7DC4: GetRuntimeTypeInfo__Q53scn4step5enemy5nruff6CustomCFv: /* 802C7DFC 002C3C3C 4B FB A3 00 */ b RuntimeTypeInfoImpl$$0Q53scn4step5enemy5nruff6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6owgulf6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6owgulf6CustomFRQ43scn4step5enemy5Enemy: /* 802C9DF8 002C5C38 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -12498,7 +12498,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6owgulf6CustomCFv: __dt__Q53scn4step5enemy6owgulf6CustomFv: /* 802C9F14 002C5D54 4B FC C6 BC */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7parasol6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7parasol6CustomFRQ43scn4step5enemy5Enemy: /* 802CAB8C 002C69CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -12900,7 +12900,7 @@ addParasolFallBodyColl__Q53scn4step5enemy7parasol6CustomFv: GetRuntimeTypeInfo__Q53scn4step5enemy7parasol6CustomCFv: /* 802CB100 002C6F40 4B FB 6F 0C */ b RuntimeTypeInfoImpl$$0Q53scn4step5enemy7parasol6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee6CustomFRQ43scn4step5enemy5Enemy: /* 802CBAFC 002C793C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -13663,7 +13663,7 @@ $$28$$2__dt__Q53scn4step5enemy10parasoldee6CustomFv: /* 802CC54C 002C838C 38 63 FF F8 */ addi r3, r3, -8 /* 802CC550 002C8390 4B FF F6 20 */ b __dt__Q53scn4step5enemy10parasoldee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo6CustomFRQ43scn4step5enemy5Enemy: /* 802CDC2C 002C9A6C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -14275,7 +14275,7 @@ $$28$$2__dt__Q53scn4step5enemy10parasoldoo6CustomFv: /* 802CE474 002CA2B4 38 63 FF F8 */ addi r3, r3, -8 /* 802CE478 002CA2B8 4B FF F8 24 */ b __dt__Q53scn4step5enemy10parasoldoo6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6pierce6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6pierce6CustomFRQ43scn4step5enemy5Enemy: /* 802CF918 002CB758 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -14433,7 +14433,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6pierce6CustomCFv: __dt__Q53scn4step5enemy6pierce6CustomFv: /* 802CFB38 002CB978 4B FC 6A 98 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10poppybrojr6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10poppybrojr6CustomFRQ43scn4step5enemy5Enemy: /* 802D1724 002CD564 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -14872,7 +14872,7 @@ lbl_802D1D08: __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D1D24 002CDB64 4B F5 C9 7C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy14poppybrojrbomb6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy14poppybrojrbomb6CustomFRQ43scn4step5enemy5Enemy: /* 802D28D0 002CE710 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -15111,7 +15111,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy14poppybrojrbomb6CustomCFv: __dt__Q53scn4step5enemy14poppybrojrbomb6CustomFv: /* 802D2C08 002CEA48 4B FC 39 C8 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9puppetdee6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9puppetdee6CustomFRQ43scn4step5enemy5Enemy: /* 802D3270 002CF0B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -15166,7 +15166,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy9puppetdee6CustomCFv: __dt__Q53scn4step5enemy9puppetdee6CustomFv: /* 802D3314 002CF154 4B FC 32 BC */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky6CustomFRQ43scn4step5enemy5Enemy: /* 802D39B0 002CF7F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -15233,7 +15233,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy5rocky6CustomCFv: __dt__Q53scn4step5enemy5rocky6CustomFv: /* 802D3A84 002CF8C4 4B FC 2B 4C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8rollball6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8rollball6CustomFRQ43scn4step5enemy5Enemy: /* 802D6228 002D2068 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -15522,7 +15522,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy8rollball6CustomCFv: __dt__Q53scn4step5enemy8rollball6CustomFv: /* 802D6628 002D2468 4B FB FF A8 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7sandbag6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7sandbag6CustomFRQ43scn4step5enemy5Enemy: /* 802D8880 002D46C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -16175,7 +16175,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy7sandbag6CustomCFv: __dt__Q53scn4step5enemy7sandbag6CustomFv: /* 802D9184 002D4FC4 4B FB D4 4C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy6CustomFRQ43scn4step5enemy5Enemy: /* 802D9A88 002D58C8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -16386,7 +16386,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6scarfy6CustomCFv: __dt__Q53scn4step5enemy6scarfy6CustomFv: /* 802D9D54 002D5B94 4B FB C8 7C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8searches6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8searches6CustomFRQ43scn4step5enemy5Enemy: /* 802DBC10 002D7A50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -16530,7 +16530,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy8searches6CustomCFv: __dt__Q53scn4step5enemy8searches6CustomFv: /* 802DBDEC 002D7C2C 4B FB A7 E4 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld6CustomFRQ43scn4step5enemy5Enemy: /* 802DCF08 002D8D48 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -17227,7 +17227,7 @@ __dt__Q53scn4step5enemy5sheld6CustomFv: __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DD8F4 002D9734 4B F5 0D AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6shotzo6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6shotzo6CustomFRQ43scn4step5enemy5Enemy: /* 802E02A0 002DC0E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -17564,7 +17564,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6shotzo6CustomCFv: __dt__Q53scn4step5enemy6shotzo6CustomFv: /* 802E073C 002DC57C 4B FB 5E 94 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9sirkibble6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9sirkibble6CustomFRQ43scn4step5enemy5Enemy: /* 802E136C 002DD1AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -17823,7 +17823,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy9sirkibble6CustomCFv: __dt__Q53scn4step5enemy9sirkibble6CustomFv: /* 802E16E0 002DD520 4B FB 4E F0 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11sisterbound6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11sisterbound6CustomFRQ43scn4step5enemy5Enemy: /* 802E2930 002DE770 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -17958,7 +17958,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy11sisterbound6CustomCFv: __dt__Q53scn4step5enemy11sisterbound6CustomFv: /* 802E2AF0 002DE930 4B FB 3A E0 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5snowl6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5snowl6CustomFRQ43scn4step5enemy5Enemy: /* 802E372C 002DF56C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -18043,7 +18043,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy5snowl6CustomCFv: __dt__Q53scn4step5enemy5snowl6CustomFv: /* 802E383C 002DF67C 4B FB 2D 94 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory6CustomFRQ43scn4step5enemy5Enemy: /* 802E4CCC 002E0B0C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -18547,7 +18547,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6sodory6CustomCFv: __dt__Q53scn4step5enemy6sodory6CustomFv: /* 802E53CC 002E120C 4B FB 12 04 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sparky6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sparky6CustomFRQ43scn4step5enemy5Enemy: /* 802E6D48 002E2B88 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -18637,7 +18637,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy6sparky6CustomCFv: __dt__Q53scn4step5enemy6sparky6CustomFv: /* 802E6E74 002E2CB4 4B FA F7 5C */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10stareffect6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10stareffect6CustomFRQ43scn4step5enemy5Enemy: /* 802E7A5C 002E389C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -18928,7 +18928,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy10stareffect6CustomCFv: __dt__Q53scn4step5enemy10stareffect6CustomFv: /* 802E7E80 002E3CC0 4B FA E7 50 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy3sun6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy3sun6CustomFRQ43scn4step5enemy5Enemy: /* 802E8878 002E46B8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -19206,7 +19206,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy3sun6CustomCFv: __dt__Q53scn4step5enemy3sun6CustomFv: /* 802E8C40 002E4A80 4B FA D9 90 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage6CustomFRQ43scn4step5enemy5Enemy: /* 802EA788 002E65C8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -19819,7 +19819,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy9tsukikage6CustomCFv: __dt__Q53scn4step5enemy9tsukikage6CustomFv: /* 802EAFF8 002E6E38 4B FA B5 D8 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledoo6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledoo6CustomFRQ43scn4step5enemy5Enemy: /* 802EFAF0 002EB930 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -19846,7 +19846,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy9waddledoo6CustomCFv: __dt__Q53scn4step5enemy9waddledoo6CustomFv: /* 802EFB30 002EB970 4B FA 6A A0 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11whispyapple6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11whispyapple6CustomFRQ43scn4step5enemy5Enemy: /* 802F0D40 002ECB80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -20099,7 +20099,7 @@ __dt__Q53scn4step5enemy11whispyapple6CustomFv: __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802F10A4 002ECEE4 4B F3 D5 FC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy15zankibblecutter6CustomFRQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy15zankibblecutter6CustomFRQ43scn4step5enemy5Enemy: /* 802F2384 002EE1C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -20243,7 +20243,7 @@ GetRuntimeTypeInfo__Q53scn4step5enemy15zankibblecutter6CustomCFv: __dt__Q53scn4step5enemy15zankibblecutter6CustomFv: /* 802F256C 002EE3AC 4B FA 40 64 */ b __dt__Q53scn4step5enemy8armordee6CustomFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5spark6CustomFRQ43scn4step4hero4Hero __ct__Q53scn4step4hero5spark6CustomFRQ43scn4step4hero4Hero: /* 8038CCD4 00388B14 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -20305,7 +20305,7 @@ lbl_8038CD80: GetRuntimeTypeInfo__Q53scn4step4hero5spark6CustomCFv: /* 8038CD9C 00388BDC 4B F9 EA B0 */ b RuntimeTypeInfoImpl$$0Q53scn4step4hero5spark6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7parasol6CustomFRQ43scn4step4hero4Hero __ct__Q53scn4step4hero7parasol6CustomFRQ43scn4step4hero4Hero: /* 8039246C 0038E2AC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -20375,7 +20375,7 @@ lbl_80392538: GetRuntimeTypeInfo__Q53scn4step4hero7parasol6CustomCFv: /* 80392554 0038E394 4B F9 93 48 */ b RuntimeTypeInfoImpl$$0Q53scn4step4hero7parasol6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter6CustomFRQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter6CustomFRQ43scn4step4hero4Hero: /* 8039B400 00397240 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -20435,7 +20435,7 @@ lbl_8039B4A4: GetRuntimeTypeInfo__Q53scn4step4hero7fighter6CustomCFv: /* 8039B4C0 00397300 4B F9 04 2C */ b RuntimeTypeInfoImpl$$0Q53scn4step4hero7fighter6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon11starshotlv16CustomFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon11starshotlv16CustomFRQ43scn4step6weapon6Weapon: /* 803DBC08 003D7A48 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -20909,7 +20909,7 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshot __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803DC22C 003D806C 4B E5 24 74 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon7rollexp6CustomFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon7rollexp6CustomFRQ43scn4step6weapon6Weapon: /* 803DEA40 003DA880 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -20993,7 +20993,7 @@ __dt__Q53scn4step6weapon7rollexp6CustomFv: __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803DEB3C 003DA97C 4B E4 FB 64 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon13gigatzobullet6CustomFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon13gigatzobullet6CustomFRQ43scn4step6weapon6Weapon: /* 803E0174 003DBFB4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21095,7 +21095,7 @@ __dt__Q53scn4step6weapon13gigatzobullet6CustomFv: __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803E02B4 003DC0F4 4B E4 E3 EC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10comothread6CustomFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon10comothread6CustomFRQ43scn4step6weapon6Weapon: /* 803E1F4C 003DDD8C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21331,7 +21331,7 @@ lbl_803E2258: __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803E2274 003DE0B4 4B E4 C4 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon16fighterhadoushot6CustomFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon16fighterhadoushot6CustomFRQ43scn4step6weapon6Weapon: /* 803E6AB4 003E28F4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21461,7 +21461,7 @@ __dt__Q53scn4step6weapon16fighterhadoushot6CustomFv: __dt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv: /* 803E6C4C 003E2A8C 4B E4 7A 54 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon13vacuumedblock6CustomFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon13vacuumedblock6CustomFRQ43scn4step6weapon6Weapon: /* 803EE29C 003EA0DC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21669,7 +21669,7 @@ lbl_803EE548: __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803EE564 003EA3A4 4B E4 01 3C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon26challengemastersummonlight6CustomFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon26challengemastersummonlight6CustomFRQ43scn4step6weapon6Weapon: /* 803EF98C 003EB7CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21749,7 +21749,7 @@ __dt__Q53scn4step6weapon26challengemastersummonlight6CustomFv: __dt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803EFA78 003EB8B8 4B E3 EC 28 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon19challengemastershot6CustomFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon19challengemastershot6CustomFRQ43scn4step6weapon6Weapon: /* 803F0214 003EC054 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -21964,7 +21964,7 @@ __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challeng __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803F04D8 003EC318 4B E3 E1 C8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE_1__20$$2unnamed$$2Custom_cpp$$2 T_ALPHA_TABLE_1__20$$2unnamed$$2Custom_cpp$$2: .incbin "baserom.dol", 0x415008, 0x80 @@ -21972,7 +21972,7 @@ T_ALPHA_TABLE_1__20$$2unnamed$$2Custom_cpp$$2: T_ALPHA_TABLE_2__20$$2unnamed$$2Custom_cpp$$2: .incbin "baserom.dol", 0x415088, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257947 $$257947: .incbin "baserom.dol", 0x460C60, 0x2C @@ -22001,7 +22001,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common11Stat __vt__Q53scn4step4boss7bonkers6Custom: .incbin "baserom.dol", 0x460D90, 0x98 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257944 $$257944: .incbin "baserom.dol", 0x461578, 0x34 @@ -22024,7 +22024,7 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q53scn4step4boss15challengemaster6Custom: .incbin "baserom.dol", 0x461678, 0xC8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede9StateHide$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4625F0, 0x10 @@ -22032,7 +22032,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdeded __vt__Q53scn4step4boss12creditdedede6Custom: .incbin "baserom.dol", 0x462600, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StateHide$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4628C0, 0x10 @@ -22040,7 +22040,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9St __vt__Q53scn4step4boss9creditdee6Custom: .incbin "baserom.dol", 0x4628D0, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9StateHide$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462D20, 0x10 @@ -22048,7 +22048,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta9 __vt__Q53scn4step4boss10creditmeta6Custom: .incbin "baserom.dol", 0x462D30, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9StateHide$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4630B0, 0x10 @@ -22056,7 +22056,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah9 __vt__Q53scn4step4boss10creditroah6Custom: .incbin "baserom.dol", 0x4630C0, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258559 $$258559: .incbin "baserom.dol", 0x4634B8, 0x2C @@ -22085,7 +22085,7 @@ __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior9State __vt__Q53scn4step4boss6dubior6Custom: .incbin "baserom.dol", 0x4635E0, 0x98 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257877 $$257877: .incbin "baserom.dol", 0x463B80, 0x30 @@ -22111,7 +22111,7 @@ __vt__Q24util127StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss10gigantedge6Custom: .incbin "baserom.dol", 0x463CC0, 0x98 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256375 $$256375: .incbin "baserom.dol", 0x464330, 0x2C @@ -22137,7 +22137,7 @@ __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss8kingsdoo6Custom: .incbin "baserom.dol", 0x464468, 0x68 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257220 $$257220: .incbin "baserom.dol", 0x464AD0, 0x30 @@ -22163,7 +22163,7 @@ __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss9moundeath6Custom: .incbin "baserom.dol", 0x464C10, 0x68 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256473 $$256473: .incbin "baserom.dol", 0x465538, 0x34 @@ -22189,7 +22189,7 @@ __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss13watergalboros6Custom: .incbin "baserom.dol", 0x465690, 0x68 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257035 $$257035: .incbin "baserom.dol", 0x465E20, 0x24 @@ -22215,7 +22215,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy10Stat __vt__Q53scn4step4boss6whispy6Custom: .incbin "baserom.dol", 0x465EF8, 0x98 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256693 $$256693: .incbin "baserom.dol", 0x466AA8, 0x30 @@ -22241,22 +22241,22 @@ __vt__Q24util125StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss9zankibble6Custom: .incbin "baserom.dol", 0x466BE8, 0x98 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8armordee6Custom __vt__Q53scn4step5enemy8armordee6Custom: .incbin "baserom.dol", 0x46F530, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight6Custom __vt__Q53scn4step5enemy11bladeknight6Custom: .incbin "baserom.dol", 0x46F7F8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper6Custom __vt__Q53scn4step5enemy7blipper6Custom: .incbin "baserom.dol", 0x46FDA0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470060, 0x10 @@ -22264,17 +22264,17 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbom __vt__Q53scn4step5enemy11bonkersbomb6Custom: .incbin "baserom.dol", 0x470070, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy6Custom __vt__Q53scn4step5enemy6bouncy6Custom: .incbin "baserom.dol", 0x470310, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5bowby6Custom __vt__Q53scn4step5enemy5bowby6Custom: .incbin "baserom.dol", 0x4706B8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12StateSkinned$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4711A8, 0x10 @@ -22282,32 +22282,32 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5cappy12Stat __vt__Q53scn4step5enemy5cappy6Custom: .incbin "baserom.dol", 0x4711B8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8cappyhat6Custom __vt__Q53scn4step5enemy8cappyhat6Custom: .incbin "baserom.dol", 0x471398, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly6Custom __vt__Q53scn4step5enemy6chilly6Custom: .incbin "baserom.dol", 0x471838, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como6Custom __vt__Q53scn4step5enemy4como6Custom: .incbin "baserom.dol", 0x471B50, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout6Custom __vt__Q53scn4step5enemy6degout6Custom: .incbin "baserom.dol", 0x471FF8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr6Custom __vt__Q53scn4step5enemy8dubiorjr6Custom: .incbin "baserom.dol", 0x4722B0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspark9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x472468, 0x10 @@ -22315,42 +22315,42 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11dubiorspar __vt__Q53scn4step5enemy11dubiorspark6Custom: .incbin "baserom.dol", 0x472478, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec6Custom __vt__Q53scn4step5enemy4elec6Custom: .incbin "baserom.dol", 0x472688, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer6Custom __vt__Q53scn4step5enemy6flamer6Custom: .incbin "baserom.dol", 0x472B78, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley6Custom __vt__Q53scn4step5enemy5foley6Custom: .incbin "baserom.dol", 0x472E38, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra6Custom __vt__Q53scn4step5enemy5gemra6Custom: .incbin "baserom.dol", 0x473090, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo6Custom __vt__Q53scn4step5enemy7gigatzo6Custom: .incbin "baserom.dol", 0x4733D0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gordo6Custom __vt__Q53scn4step5enemy5gordo6Custom: .incbin "baserom.dol", 0x473668, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7hothead6Custom __vt__Q53scn4step5enemy7hothead6Custom: .incbin "baserom.dol", 0x473950, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255360 $$255360: .incbin "baserom.dol", 0x473CA8, 0x28 @@ -22358,22 +22358,22 @@ $$255360: __vt__Q53scn4step5enemy6juckle6Custom: .incbin "baserom.dol", 0x473CD0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu6Custom __vt__Q53scn4step5enemy4kabu6Custom: .incbin "baserom.dol", 0x474060, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe6Custom __vt__Q53scn4step5enemy10knucklejoe6Custom: .incbin "baserom.dol", 0x4744B0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer6Custom __vt__Q53scn4step5enemy6lanzer6Custom: .incbin "baserom.dol", 0x474C68, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9StateMain$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4750E8, 0x10 @@ -22381,7 +22381,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9mbossdead9S __vt__Q53scn4step5enemy9mbossdead6Custom: .incbin "baserom.dol", 0x4750F8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11StateEndure$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4751F8, 0x10 @@ -22389,42 +22389,42 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7mumbies11St __vt__Q53scn4step5enemy7mumbies6Custom: .incbin "baserom.dol", 0x475208, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8needlous6Custom __vt__Q53scn4step5enemy8needlous6Custom: .incbin "baserom.dol", 0x4753F0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff6Custom __vt__Q53scn4step5enemy5nruff6Custom: .incbin "baserom.dol", 0x475880, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf6Custom __vt__Q53scn4step5enemy6owgulf6Custom: .incbin "baserom.dol", 0x475CB0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7parasol6Custom __vt__Q53scn4step5enemy7parasol6Custom: .incbin "baserom.dol", 0x475EC8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee6Custom __vt__Q53scn4step5enemy10parasoldee6Custom: .incbin "baserom.dol", 0x476128, 0x60 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo6Custom __vt__Q53scn4step5enemy10parasoldoo6Custom: .incbin "baserom.dol", 0x4762D8, 0x60 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce6Custom __vt__Q53scn4step5enemy6pierce6Custom: .incbin "baserom.dol", 0x476458, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybrojrbomb9StateShot$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476828, 0x10 @@ -22432,42 +22432,42 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy14poppybroj __vt__Q53scn4step5enemy10poppybrojr6Custom: .incbin "baserom.dol", 0x476838, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb6Custom __vt__Q53scn4step5enemy14poppybrojrbomb6Custom: .incbin "baserom.dol", 0x4769F0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9puppetdee6Custom __vt__Q53scn4step5enemy9puppetdee6Custom: .incbin "baserom.dol", 0x476AA8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky6Custom __vt__Q53scn4step5enemy5rocky6Custom: .incbin "baserom.dol", 0x476CD0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8rollball6Custom __vt__Q53scn4step5enemy8rollball6Custom: .incbin "baserom.dol", 0x4770C8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7sandbag6Custom __vt__Q53scn4step5enemy7sandbag6Custom: .incbin "baserom.dol", 0x477250, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy6Custom __vt__Q53scn4step5enemy6scarfy6Custom: .incbin "baserom.dol", 0x477538, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches6Custom __vt__Q53scn4step5enemy8searches6Custom: .incbin "baserom.dol", 0x477818, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477B30, 0x10 @@ -22475,57 +22475,57 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld12Stat __vt__Q53scn4step5enemy5sheld6Custom: .incbin "baserom.dol", 0x477B40, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo6Custom __vt__Q53scn4step5enemy6shotzo6Custom: .incbin "baserom.dol", 0x478158, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble6Custom __vt__Q53scn4step5enemy9sirkibble6Custom: .incbin "baserom.dol", 0x478440, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound6Custom __vt__Q53scn4step5enemy11sisterbound6Custom: .incbin "baserom.dol", 0x4788A8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl6Custom __vt__Q53scn4step5enemy5snowl6Custom: .incbin "baserom.dol", 0x478B00, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory6Custom __vt__Q53scn4step5enemy6sodory6Custom: .incbin "baserom.dol", 0x478DF0, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky6Custom __vt__Q53scn4step5enemy6sparky6Custom: .incbin "baserom.dol", 0x479118, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10stareffect6Custom __vt__Q53scn4step5enemy10stareffect6Custom: .incbin "baserom.dol", 0x4793C8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy3sun6Custom __vt__Q53scn4step5enemy3sun6Custom: .incbin "baserom.dol", 0x4794A8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage6Custom __vt__Q53scn4step5enemy9tsukikage6Custom: .incbin "baserom.dol", 0x479838, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo6Custom __vt__Q53scn4step5enemy9waddledoo6Custom: .incbin "baserom.dol", 0x47A550, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateAppear$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47AC78, 0x10 @@ -22533,27 +22533,27 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapp __vt__Q53scn4step5enemy11whispyapple6Custom: .incbin "baserom.dol", 0x47AC88, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter6Custom __vt__Q53scn4step5enemy15zankibblecutter6Custom: .incbin "baserom.dol", 0x47AF08, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5spark6Custom __vt__Q53scn4step4hero5spark6Custom: .incbin "baserom.dol", 0x489850, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol6Custom __vt__Q53scn4step4hero7parasol6Custom: .incbin "baserom.dol", 0x489C48, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter6Custom __vt__Q53scn4step4hero7fighter6Custom: .incbin "baserom.dol", 0x48A2F0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshotlv19StateMain$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x490008, 0x10 @@ -22567,7 +22567,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11starshot __vt__Q53scn4step6weapon11starshotlv16Custom: .incbin "baserom.dol", 0x490038, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x4902C0, 0x10 @@ -22575,7 +22575,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon7rollexp9St __vt__Q53scn4step6weapon7rollexp6Custom: .incbin "baserom.dol", 0x4902D0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzobullet9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x4903A8, 0x10 @@ -22583,7 +22583,7 @@ __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13gigatzob __vt__Q53scn4step6weapon13gigatzobullet6Custom: .incbin "baserom.dol", 0x4903B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothread9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x4904A0, 0x10 @@ -22591,7 +22591,7 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10comothre __vt__Q53scn4step6weapon10comothread6Custom: .incbin "baserom.dol", 0x4904B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1 __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot9StateMain$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1: .incbin "baserom.dol", 0x490A08, 0x10 @@ -22599,7 +22599,7 @@ __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterh __vt__Q53scn4step6weapon16fighterhadoushot6Custom: .incbin "baserom.dol", 0x490A18, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256603 $$256603: .incbin "baserom.dol", 0x491128, 0x30 @@ -22610,7 +22610,7 @@ __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon13vacuumed __vt__Q53scn4step6weapon13vacuumedblock6Custom: .incbin "baserom.dol", 0x491168, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challengemastersummonlight9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x4913F0, 0x10 @@ -22618,7 +22618,7 @@ __vt__Q24util116StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon26challeng __vt__Q53scn4step6weapon26challengemastersummonlight6Custom: .incbin "baserom.dol", 0x491400, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot10StateReady$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x491440, 0x10 @@ -22629,7 +22629,7 @@ __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challeng __vt__Q53scn4step6weapon19challengemastershot6Custom: .incbin "baserom.dol", 0x491460, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256394 $$256394: .incbin "baserom.dol", 0x495510, 0x4 @@ -22637,7 +22637,7 @@ $$256394: $$256395: .incbin "baserom.dol", 0x495514, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255826 $$255826: .incbin "baserom.dol", 0x496510, 0x4 @@ -22645,12 +22645,12 @@ $$255826: $$255827: .incbin "baserom.dol", 0x496514, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256737 $$256737: .incbin "baserom.dol", 0x496690, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss7bonkers6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss7bonkers6CustomFv$$2maxLevel: .incbin "baserom.dol", 0x49AF28, 0x8 @@ -22661,7 +22661,7 @@ $$257955: $$257997: .incbin "baserom.dol", 0x49AF38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257942 $$257942: .incbin "baserom.dol", 0x49AFB8, 0x4 @@ -22672,22 +22672,22 @@ $$257943: $$258040: .incbin "baserom.dol", 0x49AFC0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256572 $$256572: .incbin "baserom.dol", 0x49B190, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256572 $$256572: .incbin "baserom.dol", 0x49B1A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256572 $$256572: .incbin "baserom.dol", 0x49B1D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256676 $$256676: .incbin "baserom.dol", 0x49B238, 0x4 @@ -22701,7 +22701,7 @@ $$256720: $$256721: .incbin "baserom.dol", 0x49B244, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss6dubior6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss6dubior6CustomFv$$2maxLevel: .incbin "baserom.dol", 0x49B278, 0x8 @@ -22715,7 +22715,7 @@ $$258587: $$258618: .incbin "baserom.dol", 0x49B28C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss10gigantedge6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss10gigantedge6CustomFv$$2maxLevel: .incbin "baserom.dol", 0x49B380, 0x8 @@ -22726,7 +22726,7 @@ $$257885: $$257942: .incbin "baserom.dol", 0x49B390, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss8kingsdoo6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss8kingsdoo6CustomFv$$2maxLevel: .incbin "baserom.dol", 0x49B3A0, 0x8 @@ -22734,7 +22734,7 @@ $$2LOCAL$$2onInit__Q53scn4step4boss8kingsdoo6CustomFv$$2maxLevel: $$256383: .incbin "baserom.dol", 0x49B3A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss9moundeath6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss9moundeath6CustomFv$$2maxLevel: .incbin "baserom.dol", 0x49B3F0, 0x8 @@ -22742,7 +22742,7 @@ $$2LOCAL$$2onInit__Q53scn4step4boss9moundeath6CustomFv$$2maxLevel: $$257228: .incbin "baserom.dol", 0x49B3F8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss13watergalboros6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss13watergalboros6CustomFv$$2maxLevel: .incbin "baserom.dol", 0x49B4D0, 0x4 @@ -22753,12 +22753,12 @@ $$256479: $$256482: .incbin "baserom.dol", 0x49B4D8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257034 $$257034: .incbin "baserom.dol", 0x49B4F8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2onInit__Q53scn4step4boss9zankibble6CustomFv$$2maxLevel $$2LOCAL$$2onInit__Q53scn4step4boss9zankibble6CustomFv$$2maxLevel: .incbin "baserom.dol", 0x49B598, 0x8 @@ -22766,7 +22766,7 @@ $$2LOCAL$$2onInit__Q53scn4step4boss9zankibble6CustomFv$$2maxLevel: $$256701: .incbin "baserom.dol", 0x49B5A0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251899 $$251899: .incbin "baserom.dol", 0x49BCD0, 0x4 @@ -22780,7 +22780,7 @@ $$251901: $$251902: .incbin "baserom.dol", 0x49BCDC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256347 $$256347: .incbin "baserom.dol", 0x49BCF8, 0x4 @@ -22797,7 +22797,7 @@ $$256350: $$256351: .incbin "baserom.dol", 0x49BD08, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256686 $$256686: .incbin "baserom.dol", 0x49BD70, 0x4 @@ -22811,12 +22811,12 @@ $$256688: $$256715: .incbin "baserom.dol", 0x49BD7C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252926 $$252926: .incbin "baserom.dol", 0x49BE68, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256241 $$256241: .incbin "baserom.dol", 0x49BE98, 0x4 @@ -22848,7 +22848,7 @@ $$256301: $$256302: .incbin "baserom.dol", 0x49BEBC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255998 $$255998: .incbin "baserom.dol", 0x49BFC8, 0x8 @@ -22874,7 +22874,7 @@ $$256007: $$256008: .incbin "baserom.dol", 0x49BFEC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255268 $$255268: .incbin "baserom.dol", 0x49C350, 0x4 @@ -22882,12 +22882,12 @@ $$255268: $$255269: .incbin "baserom.dol", 0x49C354, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257219 $$257219: .incbin "baserom.dol", 0x49C4A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252709 $$252709: .incbin "baserom.dol", 0x49C4D0, 0x4 @@ -22913,7 +22913,7 @@ $$252802: $$252841: .incbin "baserom.dol", 0x49C4EC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258787 $$258787: .incbin "baserom.dol", 0x49C508, 0x4 @@ -22948,7 +22948,7 @@ $$258885: $$258954: .incbin "baserom.dol", 0x49C538, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252107 $$252107: .incbin "baserom.dol", 0x49C590, 0x4 @@ -22956,12 +22956,12 @@ $$252107: $$252119: .incbin "baserom.dol", 0x49C594, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255322 $$255322: .incbin "baserom.dol", 0x49C5D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255324 $$255324: .incbin "baserom.dol", 0x49C5F0, 0x4 @@ -22978,7 +22978,7 @@ $$255327: $$255376: .incbin "baserom.dol", 0x49C600, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257018 $$257018: .incbin "baserom.dol", 0x49C6B8, 0x4 @@ -22998,7 +22998,7 @@ $$257100: $$257101: .incbin "baserom.dol", 0x49C6CC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251376 $$251376: .incbin "baserom.dol", 0x49C798, 0x4 @@ -23006,7 +23006,7 @@ $$251376: $$251377: .incbin "baserom.dol", 0x49C79C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256157 $$256157: .incbin "baserom.dol", 0x49C808, 0x4 @@ -23017,7 +23017,7 @@ $$256158: $$256159: .incbin "baserom.dol", 0x49C810, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252122 $$252122: .incbin "baserom.dol", 0x49C860, 0x4 @@ -23040,12 +23040,12 @@ $$252145: $$252148: .incbin "baserom.dol", 0x49C878, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256294 $$256294: .incbin "baserom.dol", 0x49C8C0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257038 $$257038: .incbin "baserom.dol", 0x49C960, 0x4 @@ -23065,27 +23065,27 @@ $$257076: $$257077: .incbin "baserom.dol", 0x49C974, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257162 $$257162: .incbin "baserom.dol", 0x49C9A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257142 $$257142: .incbin "baserom.dol", 0x49C9F8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258242 $$258242: .incbin "baserom.dol", 0x49CAA0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256930 $$256930: .incbin "baserom.dol", 0x49CAE8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256764 $$256764: .incbin "baserom.dol", 0x49CB90, 0x4 @@ -23099,7 +23099,7 @@ $$256766: $$256794: .incbin "baserom.dol", 0x49CB9C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257890 $$257890: .incbin "baserom.dol", 0x49CC00, 0x4 @@ -23119,12 +23119,12 @@ $$256578: $$256579: .incbin "baserom.dol", 0x49CC14, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253480 $$253480: .incbin "baserom.dol", 0x49CCC0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258052 $$258052: .incbin "baserom.dol", 0x49CCE0, 0x4 @@ -23135,7 +23135,7 @@ $$258209: $$258232: .incbin "baserom.dol", 0x49CCE8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256292 $$256292: .incbin "baserom.dol", 0x49CDA0, 0x4 @@ -23170,7 +23170,7 @@ $$256334: $$256388: .incbin "baserom.dol", 0x49CDC8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253526 $$253526: .incbin "baserom.dol", 0x49CE00, 0x4 @@ -23178,12 +23178,12 @@ $$253526: $$253559: .incbin "baserom.dol", 0x49CE04, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253005 $$253005: .incbin "baserom.dol", 0x49CE18, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256937 $$256937: .incbin "baserom.dol", 0x49CE70, 0x4 @@ -23203,7 +23203,7 @@ $$256974: $$257049: .incbin "baserom.dol", 0x49CE84, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257134 $$257134: .incbin "baserom.dol", 0x49CEF8, 0x4 @@ -23220,7 +23220,7 @@ $$257184: $$257188: .incbin "baserom.dol", 0x49CF08, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256256 $$256256: .incbin "baserom.dol", 0x49CF38, 0x4 @@ -23246,7 +23246,7 @@ $$256286: $$256287: .incbin "baserom.dol", 0x49CF54, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257004 $$257004: .incbin "baserom.dol", 0x49CF90, 0x8 @@ -23257,7 +23257,7 @@ $$257030: $$257034: .incbin "baserom.dol", 0x49CFA0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257054 $$257054: .incbin "baserom.dol", 0x49D098, 0x4 @@ -23271,12 +23271,12 @@ $$257056: $$257059: .incbin "baserom.dol", 0x49D0A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256310 $$256310: .incbin "baserom.dol", 0x49E980, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256594 $$256594: .incbin "baserom.dol", 0x49ECB8, 0x8 diff --git a/asm/src/CustomBase.s b/asm/src/CustomBase.s index deacd345..c228c999 100644 --- a/asm/src/CustomBase.s +++ b/asm/src/CustomBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q43scn4step4boss10CustomBase$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q43scn4step4boss10CustomBase$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 8022E4F0 0022A330 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -205,7 +205,7 @@ lbl_8022E6E0: /* 8022E6F4 0022A534 38 21 00 10 */ addi r1, r1, 0x10 /* 8022E6F8 0022A538 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q43scn4step5enemy10CustomBase$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q43scn4step5enemy10CustomBase$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80281E20 0027DC60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -369,7 +369,7 @@ lbl_80281F9C: __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80281FB8 0027DDF8 4B FA C6 E8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon10CustomBaseFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon10CustomBaseFRQ43scn4step6weapon6Weapon: /* 803D3750 003CF590 3C A0 80 49 */ lis r5, __vt__Q43scn4step6weapon10CustomBase@ha @@ -425,7 +425,7 @@ lbl_803D37C4: /* 803D37D8 003CF618 38 21 00 10 */ addi r1, r1, 0x10 /* 803D37DC 003CF61C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x460568, 0x10 @@ -436,7 +436,7 @@ __vt__Q24util28StateFactory$$0Q24util6IState$$1: __vt__Q43scn4step4boss10CustomBase: .incbin "baserom.dol", 0x460588, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadInWater$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46DC80, 0x10 @@ -444,12 +444,12 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage16St __vt__Q43scn4step5enemy10CustomBase: .incbin "baserom.dol", 0x46DC90, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon10CustomBase __vt__Q43scn4step6weapon10CustomBase: .incbin "baserom.dol", 0x48F018, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250257 $$250257: .incbin "baserom.dol", 0x49AE38, 0x8 diff --git a/asm/src/CustomFactory.s b/asm/src/CustomFactory.s index e1137612..c08223e9 100644 --- a/asm/src/CustomFactory.s +++ b/asm/src/CustomFactory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step4boss7bonkers6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step4boss7bonkers6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 8022E6FC 0022A53C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -563,7 +563,7 @@ lbl_8022EE90: /* 8022EEA0 0022ACE0 38 21 00 10 */ addi r1, r1, 0x10 /* 8022EEA4 0022ACE4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step5enemy4kabu6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step5enemy4kabu6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80281FBC 0027DDFC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2792,7 +2792,7 @@ lbl_80283E10: /* 80283E28 0027FC68 38 21 00 10 */ addi r1, r1, 0x10 /* 80283E2C 0027FC6C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step6weapon16fighterhadoushot6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step6weapon16fighterhadoushot6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803D37E0 003CF620 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -6000,17 +6000,17 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear9S __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon11hotheadfire9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803D6060 003D1EA0 4B E5 86 40 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252639 $$252639: .incbin "baserom.dol", 0x4605E0, 0x70 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256431 $$256431: .incbin "baserom.dol", 0x46DCD8, 0x258 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$264044 $$264044: .incbin "baserom.dol", 0x48F038, 0x108 diff --git a/asm/src/CustomFlash.s b/asm/src/CustomFlash.s index 1e448064..60142f18 100644 --- a/asm/src/CustomFlash.s +++ b/asm/src/CustomFlash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss11CustomFlashFv __ct__Q43scn4step4boss11CustomFlashFv: /* 8022EEA8 0022ACE8 38 00 00 00 */ li r0, 0 diff --git a/asm/src/CutIn.s b/asm/src/CutIn.s index b72a955e..2344a9ca 100644 --- a/asm/src/CutIn.s +++ b/asm/src/CutIn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info5cutin5CutInFRQ23mem10IAllocatorQ33scn4step9LevelKind __ct__Q34info5cutin5CutInFRQ23mem10IAllocatorQ33scn4step9LevelKind: /* 801AB11C 001A6F5C 94 21 FC 40 */ stwu r1, -0x3c0(r1) @@ -340,7 +340,7 @@ procReadyToRender__Q34info5cutin5CutInFv: draw__Q34info5cutin5CutInCFv: /* 801AB600 001A7440 48 00 1D 78 */ b draw__Q23lyt6LayoutCFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge5CutInFRQ33scn4step9ComponentRQ23mem10IAllocator __ct__Q53scn4step4info9challenge5CutInFRQ33scn4step9ComponentRQ23mem10IAllocator: /* 803B1FF8 003ADE38 94 21 FB 90 */ stwu r1, -0x470(r1) @@ -725,7 +725,7 @@ lbl_803B255C: /* 803B2570 003AE3B0 38 21 00 10 */ addi r1, r1, 0x10 /* 803B2574 003AE3B4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252354 $$252354: .incbin "baserom.dol", 0x453868, 0x18 @@ -766,7 +766,7 @@ $$252447: $$252449: .incbin "baserom.dol", 0x453930, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252734 $$252734: .incbin "baserom.dol", 0x48C458, 0x14 @@ -792,7 +792,7 @@ $$252741: $$252742: .incbin "baserom.dol", 0x48C4DC, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252448 $$252448: .incbin "baserom.dol", 0x493518, 0x8 @@ -806,7 +806,7 @@ $$252455: $$252458: .incbin "baserom.dol", 0x49352C, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252736 $$252736: .incbin "baserom.dol", 0x497B60, 0x8 @@ -820,7 +820,7 @@ $$252744: $$252745: .incbin "baserom.dol", 0x497B78, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251802 $$251802: .incbin "baserom.dol", 0x49E458, 0x8 diff --git a/asm/src/CutRopeStep.s b/asm/src/CutRopeStep.s index 1e917ddb..bbddad1a 100644 --- a/asm/src/CutRopeStep.s +++ b/asm/src/CutRopeStep.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetIndexPos__Q53scn4step7gimmick11cutropestep25$$2unnamed$$2CutRopeStep_cpp$$2FRCQ33hel4math7Vector2Ulf GetIndexPos__Q53scn4step7gimmick11cutropestep25$$2unnamed$$2CutRopeStep_cpp$$2FRCQ33hel4math7Vector2Ulf: /* 8030B888 003076C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1966,7 +1966,7 @@ lbl_8030D4B0: /* 8030D4D8 00309318 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8030D4DC 0030931C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256444 $$256444: .incbin "baserom.dol", 0x47D370, 0x1C @@ -1980,7 +1980,7 @@ $$259529: $$259530: .incbin "baserom.dol", 0x47D3C8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256456 $$256456: .incbin "baserom.dol", 0x496A80, 0x8 @@ -2006,7 +2006,7 @@ $$259531: $$259853: .incbin "baserom.dol", 0x496AB8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259467 $$259467: .incbin "baserom.dol", 0x49D358, 0x8 diff --git a/asm/src/Cutter.s b/asm/src/Cutter.s index 7378623b..5aebd666 100644 --- a/asm/src/Cutter.s +++ b/asm/src/Cutter.s @@ -1,13 +1,13 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CutterPath__Q53scn4step4hero9modeldesc6CutterFv CutterPath__Q53scn4step4hero9modeldesc6CutterFv: /* 8035BBD8 00357A18 3C 60 80 49 */ lis r3, $$248792@ha /* 8035BBDC 00357A1C 38 63 8C D0 */ addi r3, r3, $$248792@l /* 8035BBE0 00357A20 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248792 $$248792: .incbin "baserom.dol", 0x484DD0, 0x28 diff --git a/asm/src/DNOption.s b/asm/src/DNOption.s index 429d10ca..7b4b54f8 100644 --- a/asm/src/DNOption.s +++ b/asm/src/DNOption.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24file8DNOptionFv __ct__Q24file8DNOptionFv: /* 80187538 00183378 38 00 00 00 */ li r0, 0 diff --git a/asm/src/DPD.s b/asm/src/DPD.s index 90327844..da68d78b 100644 --- a/asm/src/DPD.s +++ b/asm/src/DPD.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hid3DPDFv __ct__Q23hid3DPDFv: /* 801A2268 0019E0A8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -40,7 +40,7 @@ update__Q23hid3DPDFfRC4Vec2RC4Vec2: /* 801A22E4 0019E124 38 21 00 10 */ addi r1, r1, 0x10 /* 801A22E8 0019E128 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248825 $$248825: .incbin "baserom.dol", 0x49A448, 0x8 diff --git a/asm/src/DamageEyeCtrl.s b/asm/src/DamageEyeCtrl.s index a95c32f2..fd99b67a 100644 --- a/asm/src/DamageEyeCtrl.s +++ b/asm/src/DamageEyeCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q53scn4step4boss6whispy13DamageEyeCtrlFv update__Q53scn4step4boss6whispy13DamageEyeCtrlFv: /* 8025C16C 00257FAC 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/DamageFeedback.s b/asm/src/DamageFeedback.s index 6f646c91..10d4cafc 100644 --- a/asm/src/DamageFeedback.s +++ b/asm/src/DamageFeedback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global getDamageRate__Q43scn4step4hero14DamageFeedbackCFv getDamageRate__Q43scn4step4hero14DamageFeedbackCFv: /* 80334AB0 003308F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -40,7 +40,7 @@ lbl_80334B14: /* 80334B2C 0033096C 38 21 00 20 */ addi r1, r1, 0x20 /* 80334B30 00330970 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250097 $$250097: .incbin "baserom.dol", 0x49D6D8, 0x4 diff --git a/asm/src/DamageFieldReact.s b/asm/src/DamageFieldReact.s index 231658f8..29d82153 100644 --- a/asm/src/DamageFieldReact.s +++ b/asm/src/DamageFieldReact.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global procObjCollReact__Q43scn4step5enemy16DamageFieldReactFv procObjCollReact__Q43scn4step5enemy16DamageFieldReactFv: /* 80283E30 0027FC70 94 21 FD A0 */ stwu r1, -0x260(r1) @@ -354,7 +354,7 @@ attackPower__Q43scn4step5chara10DamageInfoCFv: /* 80284358 00280198 38 21 00 10 */ addi r1, r1, 0x10 /* 8028435C 0028019C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero16DamageFieldReactFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero16DamageFieldReactFRQ43scn4step4hero4Hero: /* 80334B34 00330974 90 83 00 00 */ stw r4, 0(r3) @@ -737,7 +737,7 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10Stat __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1Fv: /* 80335074 00330EB4 4B EF 96 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14StateFireBlock$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x47FF60, 0x10 @@ -745,7 +745,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage14Stat __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10StateSpine$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x47FF70, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256861 $$256861: .incbin "baserom.dol", 0x49B938, 0x4 @@ -756,7 +756,7 @@ $$256862: $$256863: .incbin "baserom.dol", 0x49B940, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258791 $$258791: .incbin "baserom.dol", 0x49D6E0, 0x8 diff --git a/asm/src/DamageFlash.s b/asm/src/DamageFlash.s index fc932154..21fe069c 100644 --- a/asm/src/DamageFlash.s +++ b/asm/src/DamageFlash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q43scn4step4boss11DamageFlashFv update__Q43scn4step4boss11DamageFlashFv: /* 8022EF14 0022AD54 80 83 00 04 */ lwz r4, 4(r3) @@ -141,7 +141,7 @@ lbl_8022F0B8: /* 8022F0E4 0022AF24 38 21 00 30 */ addi r1, r1, 0x30 /* 8022F0E8 0022AF28 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy11DamageFlashFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy11DamageFlashFRQ43scn4step5enemy5Enemy: /* 80284360 002801A0 90 83 00 00 */ stw r4, 0(r3) @@ -330,7 +330,7 @@ getColor__Q43scn4step5enemy11DamageFlashCFv: /* 802845D8 00280418 80 63 00 06 */ lwz r3, 6(r3) /* 802845DC 0028041C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11DamageFlashFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero11DamageFlashFRQ43scn4step4hero4Hero: /* 80335078 00330EB8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -447,22 +447,22 @@ getColor__Q43scn4step4hero11DamageFlashCFv: /* 803351F4 00331034 80 63 00 05 */ lwz r3, 5(r3) /* 803351F8 00331038 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__Q43scn4step4boss25$$2unnamed$$2DamageFlash_cpp$$2 T_ALPHA_TABLE__Q43scn4step4boss25$$2unnamed$$2DamageFlash_cpp$$2: .incbin "baserom.dol", 0x4124A8, 0x10 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__25$$2unnamed$$2DamageFlash_cpp$$2 T_ALPHA_TABLE__25$$2unnamed$$2DamageFlash_cpp$$2: .incbin "baserom.dol", 0x415DE8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250026 $$250026: .incbin "baserom.dol", 0x495A00, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248757 $$248757: .incbin "baserom.dol", 0x49AE40, 0x4 @@ -479,7 +479,7 @@ $$248770: $$248775: .incbin "baserom.dol", 0x49AE50, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_COLOR_TABLE__Q43scn4step5enemy25$$2unnamed$$2DamageFlash_cpp$$2 T_COLOR_TABLE__Q43scn4step5enemy25$$2unnamed$$2DamageFlash_cpp$$2: .incbin "baserom.dol", 0x49B948, 0x4 diff --git a/asm/src/DamageInfo.s b/asm/src/DamageInfo.s index 015028a4..9e7eb721 100644 --- a/asm/src/DamageInfo.s +++ b/asm/src/DamageInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara10DamageInfoFv __ct__Q43scn4step5chara10DamageInfoFv: /* 8026DB60 002699A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -220,7 +220,7 @@ __ct__Q53scn4step5chara10DamageInfo4DataFv: /* 8026DE9C 00269CDC 38 21 00 10 */ addi r1, r1, 0x10 /* 8026DEA0 00269CE0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249900 $$249900: .incbin "baserom.dol", 0x49B798, 0x8 diff --git a/asm/src/DamageInvincible.s b/asm/src/DamageInvincible.s index 02890d31..71782f15 100644 --- a/asm/src/DamageInvincible.s +++ b/asm/src/DamageInvincible.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q43scn4step4boss16DamageInvincibleFv update__Q43scn4step4boss16DamageInvincibleFv: /* 8022F0EC 0022AF2C 80 83 00 04 */ lwz r4, 4(r3) @@ -106,7 +106,7 @@ lbl_8022F228: /* 8022F238 0022B078 38 21 00 10 */ addi r1, r1, 0x10 /* 8022F23C 0022B07C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_FRAME_BY_DAMAGE_TABLE__Q43scn4step4boss30$$2unnamed$$2DamageInvincible_cpp$$2 T_FRAME_BY_DAMAGE_TABLE__Q43scn4step4boss30$$2unnamed$$2DamageInvincible_cpp$$2: .incbin "baserom.dol", 0x460650, 0x38 diff --git a/asm/src/DamagePrevent.s b/asm/src/DamagePrevent.s index f8392c2c..5f8b1738 100644 --- a/asm/src/DamagePrevent.s +++ b/asm/src/DamagePrevent.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q43scn4step4boss13DamagePreventFv __dt__Q43scn4step4boss13DamagePreventFv: /* 8022F240 0022B080 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ __vc__Q33hel6common67MutableArray$$0Q53scn4step4boss13DamagePrevent17PreventTarg /* 8022F3A4 0022B1E4 38 21 00 10 */ addi r1, r1, 0x10 /* 8022F3A8 0022B1E8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250316 $$250316: .incbin "baserom.dol", 0x49AE58, 0x8 diff --git a/asm/src/DarknessAdjust.s b/asm/src/DarknessAdjust.s index df68f163..e755391e 100644 --- a/asm/src/DarknessAdjust.s +++ b/asm/src/DarknessAdjust.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx14DarknessAdjustFRQ33scn4step9Component __ct__Q43scn4step3sfx14DarknessAdjustFRQ33scn4step9Component: /* 803CCDEC 003C8C2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -120,12 +120,12 @@ draw__Q43scn4step3sfx14DarknessAdjustFv: /* 803CCFA4 003C8DE4 38 21 01 00 */ addi r1, r1, 0x100 /* 803CCFA8 003C8DE8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252031 $$252031: .incbin "baserom.dol", 0x48ED38, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252071 $$252071: .incbin "baserom.dol", 0x49E6C0, 0x4 diff --git a/asm/src/DarknessLight.s b/asm/src/DarknessLight.s index 3eaf49ac..f0a7dc8d 100644 --- a/asm/src/DarknessLight.s +++ b/asm/src/DarknessLight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx13DarknessLightFRQ33scn4step9ComponentbQ43scn4step3sfx21DarknessLightSizeKind __ct__Q43scn4step3sfx13DarknessLightFRQ33scn4step9ComponentbQ43scn4step3sfx21DarknessLightSizeKind: /* 803CCFAC 003C8DEC 94 21 FE 30 */ stwu r1, -0x1d0(r1) @@ -387,7 +387,7 @@ lbl_803CD504: /* 803CD504 003C9344 C0 22 DC 10 */ lfs f1, $$252572-_SDA2_BASE_(r2) /* 803CD508 003C9348 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252574 $$252574: .incbin "baserom.dol", 0x48ED50, 0x18 @@ -395,7 +395,7 @@ $$252574: $$252694: .incbin "baserom.dol", 0x48ED68, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252675 $$252675: .incbin "baserom.dol", 0x4983E0, 0x8 @@ -403,7 +403,7 @@ $$252675: $$252676: .incbin "baserom.dol", 0x4983E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252572 $$252572: .incbin "baserom.dol", 0x49E6D0, 0x4 diff --git a/asm/src/DarknessRoot.s b/asm/src/DarknessRoot.s index 963d3692..212e8640 100644 --- a/asm/src/DarknessRoot.s +++ b/asm/src/DarknessRoot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx12DarknessRootFRQ33scn4step9Component __ct__Q43scn4step3sfx12DarknessRootFRQ33scn4step9Component: /* 803CD50C 003C934C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -391,7 +391,7 @@ lbl_803CDA70: /* 803CDA90 003C98D0 38 21 00 90 */ addi r1, r1, 0x90 /* 803CDA94 003C98D4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252364 $$252364: .incbin "baserom.dol", 0x49E708, 0x4 diff --git a/asm/src/DataAccessor.s b/asm/src/DataAccessor.s index 13cbec4c..6753b187 100644 --- a/asm/src/DataAccessor.s +++ b/asm/src/DataAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isValid__Q43scn4step3map12DataAccessorCFv isValid__Q43scn4step3map12DataAccessorCFv: /* 803C9050 003C4E90 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -741,7 +741,7 @@ header__Q43scn4step3map12DataAccessorCFv: /* 803C9A34 003C5874 80 63 00 00 */ lwz r3, 0(r3) /* 803C9A38 003C5878 4B DF 71 DC */ b header__Q24mint13ScriptArchiveCFv -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253264 $$253264: .incbin "baserom.dol", 0x49E668, 0x8 diff --git a/asm/src/DataBlock.s b/asm/src/DataBlock.s index f4e6d3f2..69614472 100644 --- a/asm/src/DataBlock.s +++ b/asm/src/DataBlock.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem9DataBlockFUllRQ23mem10IAllocator __ct__Q23mem9DataBlockFUllRQ23mem10IAllocator: /* 801BD2A4 001B90E4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/DataFile.s b/asm/src/DataFile.s index 081973a4..d7321592 100644 --- a/asm/src/DataFile.s +++ b/asm/src/DataFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3map8DataFileFQ43scn4step3map4Kind __ct__Q43scn4step3map8DataFileFQ43scn4step3map4Kind: /* 803C9A3C 003C587C 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -28,7 +28,7 @@ __ct__Q43scn4step3map8DataFileFQ43scn4step3map4Kind: .global isValid__Q43scn4step3map8DataFileCFv isValid__Q43scn4step3map8DataFileCFv: /* 803C9A90 003C58D0 38 63 00 04 */ addi r3, r3, 4 -/* 803C9A94 003C58D4 4B DB D6 D8 */ b isValidData__Q25xdata5XDataCFv +/* 803C9A94 003C58D4 4B DB D6 D8 */ b isValidData__Q25.dataXDataCFv .global accessor__Q43scn4step3map8DataFileCFv accessor__Q43scn4step3map8DataFileCFv: @@ -54,7 +54,7 @@ reference__Q43scn4step3map8DataFileCFUi: /* 803C9AD8 003C5918 7C 7E 1B 78 */ mr r30, r3 /* 803C9ADC 003C591C 7C 9F 23 78 */ mr r31, r4 /* 803C9AE0 003C5920 38 63 00 04 */ addi r3, r3, 4 -/* 803C9AE4 003C5924 4B DB D6 89 */ bl isValidData__Q25xdata5XDataCFv +/* 803C9AE4 003C5924 4B DB D6 89 */ bl isValidData__Q25.dataXDataCFv /* 803C9AE8 003C5928 2C 03 00 00 */ cmpwi r3, 0 /* 803C9AEC 003C592C 40 82 00 0C */ bne lbl_803C9AF8 /* 803C9AF0 003C5930 38 60 00 00 */ li r3, 0 @@ -98,7 +98,7 @@ construct__Q43scn4step3map8DataFileFv: /* 803C9B6C 003C59AC 38 81 00 0C */ addi r4, r1, 0xc /* 803C9B70 003C59B0 4B D8 24 ED */ bl __ct__Q34nw4r2ut5ColorFRCQ34nw4r2ut5Color /* 803C9B74 003C59B4 38 7F 00 04 */ addi r3, r31, 4 -/* 803C9B78 003C59B8 4B DB D5 F5 */ bl isValidData__Q25xdata5XDataCFv +/* 803C9B78 003C59B8 4B DB D5 F5 */ bl isValidData__Q25.dataXDataCFv /* 803C9B7C 003C59BC 2C 03 00 00 */ cmpwi r3, 0 /* 803C9B80 003C59C0 41 82 00 44 */ beq lbl_803C9BC4 /* 803C9B84 003C59C4 7F E3 FB 78 */ mr r3, r31 diff --git a/asm/src/Dead.s b/asm/src/Dead.s index 7a9fe3b1..c2a24435 100644 --- a/asm/src/Dead.s +++ b/asm/src/Dead.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero4DeadFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero4DeadFRQ43scn4step4hero4Hero: /* 803351FC 0033103C 90 83 00 00 */ stw r4, 0(r3) @@ -357,7 +357,7 @@ __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9State __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1Fv: /* 803356E0 00331520 4B EF 8F C0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateDead$$4PQ43scn4step4hero4Hero$$4f$$1: .incbin "baserom.dol", 0x47FF80, 0x10 diff --git a/asm/src/DeadFlash.s b/asm/src/DeadFlash.s index c84761a2..d5719ec2 100644 --- a/asm/src/DeadFlash.s +++ b/asm/src/DeadFlash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss9DeadFlashFv __ct__Q43scn4step4boss9DeadFlashFv: /* 8022F3AC 0022B1EC 80 02 A3 A0 */ lwz r0, $$248801-_SDA2_BASE_(r2) @@ -30,12 +30,12 @@ lbl_8022F3EC: /* 8022F3FC 0022B23C 98 03 00 03 */ stb r0, 3(r3) /* 8022F400 0022B240 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__Q43scn4step4boss23$$2unnamed$$2DeadFlash_cpp$$2 T_ALPHA_TABLE__Q43scn4step4boss23$$2unnamed$$2DeadFlash_cpp$$2: .incbin "baserom.dol", 0x4124B8, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248801 $$248801: .incbin "baserom.dol", 0x49AE60, 0x8 diff --git a/asm/src/DeadUtil.s b/asm/src/DeadUtil.s index 83110f40..86de54a9 100644 --- a/asm/src/DeadUtil.s +++ b/asm/src/DeadUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RequestDeadEffect__Q53scn4step4boss6common8DeadUtilFRQ43scn4step4boss4Bossb RequestDeadEffect__Q53scn4step4boss6common8DeadUtilFRQ43scn4step4boss4Bossb: /* 80244408 00240248 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -98,7 +98,7 @@ lbl_80244538: /* 80244570 002403B0 38 21 00 50 */ addi r1, r1, 0x50 /* 80244574 002403B4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254560 $$254560: .incbin "baserom.dol", 0x49B108, 0x4 diff --git a/asm/src/DebugCamera.s b/asm/src/DebugCamera.s index d5958ccb..75b89d24 100644 --- a/asm/src/DebugCamera.s +++ b/asm/src/DebugCamera.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera11DebugCameraFRQ33scn4step9Component __ct__Q43scn4step6camera11DebugCameraFRQ33scn4step9Component: /* 80264AE8 00260928 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -460,7 +460,7 @@ getBGFovy__Q43scn4step6camera11DebugCameraCFv: /* 80265138 00260F78 C0 23 00 58 */ lfs f1, 0x58(r3) /* 8026513C 00260F7C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253482 $$253482: .incbin "baserom.dol", 0x49B640, 0x4 diff --git a/asm/src/DecorationBG.s b/asm/src/DecorationBG.s index 569e0e6a..24351760 100644 --- a/asm/src/DecorationBG.s +++ b/asm/src/DecorationBG.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step2bg12DecorationBGFRQ23mem10IAllocatorRQ26effect9RequestorQ43scn4step3map17BinDecorationKind __ct__Q43scn4step2bg12DecorationBGFRQ23mem10IAllocatorRQ26effect9RequestorQ43scn4step3map17BinDecorationKind: /* 802224A4 0021E2E4 94 21 FE E0 */ stwu r1, -0x120(r1) @@ -335,7 +335,7 @@ registerToRoot__Q43scn4step2bg12DecorationBGFRQ23g3d4Root: /* 80222940 0021E780 38 21 00 10 */ addi r1, r1, 0x10 /* 80222944 0021E784 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252617 $$252617: .incbin "baserom.dol", 0x45FD68, 0x10 @@ -349,7 +349,7 @@ $$2STRING$$2ref__Q34nw4r3g3d6ResMdlCFv$$20: $$2STRING$$2ref__Q34nw4r3g3d6ResMdlCFv: .incbin "baserom.dol", 0x45FDA0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252618 $$252618: .incbin "baserom.dol", 0x495248, 0x8 diff --git a/asm/src/DecorationDataAccessor.s b/asm/src/DecorationDataAccessor.s index c6b27f50..2b0bf543 100644 --- a/asm/src/DecorationDataAccessor.s +++ b/asm/src/DecorationDataAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global areaLightAmbientEntryCount__Q43scn4step3map22DecorationDataAccessorCFv areaLightAmbientEntryCount__Q43scn4step3map22DecorationDataAccessorCFv: /* 803C9BD8 003C5A18 38 80 00 02 */ li r4, 2 diff --git a/asm/src/DecorationManager.s b/asm/src/DecorationManager.s index 99c00265..08f0b2c5 100644 --- a/asm/src/DecorationManager.s +++ b/asm/src/DecorationManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step2bg17DecorationManagerFRCQ43scn4step3map12DataAccessorRQ23mem10IAllocatorRQ26effect7ManagerRQ26effect5Groupb __ct__Q43scn4step2bg17DecorationManagerFRCQ43scn4step3map12DataAccessorRQ23mem10IAllocatorRQ26effect7ManagerRQ26effect5Groupb: /* 80222948 0021E788 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1273,7 +1273,7 @@ createAABBox__Q43scn4step2bg17DecorationManagerCFv: /* 80223AC4 0021F904 38 21 00 90 */ addi r1, r1, 0x90 /* 80223AC8 0021F908 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254496 $$254496: .incbin "baserom.dol", 0x49AD68, 0x4 diff --git a/asm/src/DecorationMapro.s b/asm/src/DecorationMapro.s index d7437b3e..62597e42 100644 --- a/asm/src/DecorationMapro.s +++ b/asm/src/DecorationMapro.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step2bg15DecorationMaproFRQ23mem10IAllocatorRCQ43scn4step3map12DataAccessor __ct__Q43scn4step2bg15DecorationMaproFRQ23mem10IAllocatorRCQ43scn4step3map12DataAccessor: /* 80223ACC 0021F90C 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -459,7 +459,7 @@ drawFrontXlu__Q43scn4step2bg15DecorationMaproCFv: /* 802240FC 0021FF3C 38 63 CF 9C */ addi r3, r3, -12388 /* 80224100 0021FF40 48 00 15 C0 */ b drawXlu__Q43scn4step2bg19DecorationMaproCollCFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252744 $$252744: .incbin "baserom.dol", 0x45FDB0, 0x14 @@ -467,7 +467,7 @@ $$252744: $$252770: .incbin "baserom.dol", 0x45FDC4, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252745 $$252745: .incbin "baserom.dol", 0x495260, 0x8 diff --git a/asm/src/DecorationMaproColl.s b/asm/src/DecorationMaproColl.s index cf7de2a0..a8ccba9e 100644 --- a/asm/src/DecorationMaproColl.s +++ b/asm/src/DecorationMaproColl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_isIncludeNode__Q43scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$2FRCQ34nw4r3g3d7ResNodeRCQ34nw4r3g3d7ResNode t_isIncludeNode__Q43scn4step2bg33$$2unnamed$$2DecorationMaproColl_cpp$$2FRCQ34nw4r3g3d7ResNodeRCQ34nw4r3g3d7ResNode: /* 80224104 0021FF44 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -3601,7 +3601,7 @@ gridHeight__Q43scn4step2bg7ResPartCFv: /* 80227258 00223098 88 63 00 1D */ lbz r3, 0x1d(r3) /* 8022725C 0022309C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResVtxPosFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResVtxPosFv: .incbin "baserom.dol", 0x45FDD0, 0xC @@ -3633,7 +3633,7 @@ $$2STRING$$2ref__Q34nw4r3g3d10ResMdlInfoCFv$$20: $$2STRING$$2ref__Q34nw4r3g3d10ResMdlInfoCFv: .incbin "baserom.dol", 0x45FE98, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253352 $$253352: .incbin "baserom.dol", 0x495278, 0x4 @@ -3674,7 +3674,7 @@ __FUNCTION__$30538: __FUNCTION__$30525: .incbin "baserom.dol", 0x4952AC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257830 $$257830: .incbin "baserom.dol", 0x49AD98, 0x8 diff --git a/asm/src/Dedede.s b/asm/src/Dedede.s index 354a1d18..7aa4580d 100644 --- a/asm/src/Dedede.s +++ b/asm/src/Dedede.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Anim__Q53scn4step4hero9modeldesc6DededeFv Anim__Q53scn4step4hero9modeldesc6DededeFv: /* 8035BBE4 00357A24 38 00 00 0F */ li r0, 0xf @@ -81,12 +81,12 @@ lbl_8035BC84: Script__Q53scn4step4hero9modeldesc6DededeFv: /* 8035BCE4 00357B24 4B FF FE C8 */ b Script__Q53scn4step4hero9modeldesc6CommonFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc6DededeFv$$2ENTRIES$$20: .incbin "baserom.dol", 0x4180E0, 0xE38 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248734 $$248734: .incbin "baserom.dol", 0x484DF8, 0xC @@ -370,7 +370,7 @@ $$248881: $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc6DededeFv$$2NAMES$$20: .incbin "baserom.dol", 0x485360, 0x78 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 $$248727: .incbin "baserom.dol", 0x496E30, 0x8 diff --git a/asm/src/Dee.s b/asm/src/Dee.s index 4661781b..1982f96a 100644 --- a/asm/src/Dee.s +++ b/asm/src/Dee.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global T_PARAM__Q53scn4step4hero9modeldesc17$$2unnamed$$2Dee_cpp$$2Fv T_PARAM__Q53scn4step4hero9modeldesc17$$2unnamed$$2Dee_cpp$$2Fv: /* 8035BCE8 00357B28 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -301,12 +301,12 @@ lbl_8035C0B8: /* 8035C0F4 00357F34 38 21 00 90 */ addi r1, r1, 0x90 /* 8035C0F8 00357F38 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc3DeeFv$$2ENTRIES$$20: .incbin "baserom.dol", 0x418F18, 0xE38 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249987 $$249987: .incbin "baserom.dol", 0x4853D8, 0x18 @@ -602,7 +602,7 @@ $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc3DeeFv$$2NAMES$$20: $$250026: .incbin "baserom.dol", 0x485A98, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249527 $$249527: .incbin "baserom.dol", 0x496FD8, 0x8 @@ -769,7 +769,7 @@ $$249685: $$250011: .incbin "baserom.dol", 0x497180, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250025 $$250025: .incbin "baserom.dol", 0x49DAE0, 0x8 diff --git a/asm/src/Delete.s b/asm/src/Delete.s index 96adeb78..e1f20558 100644 --- a/asm/src/Delete.s +++ b/asm/src/Delete.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect6DeleteFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn19challengefileselect6DeleteFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 801E3200 001DF040 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -122,7 +122,7 @@ lbl_801E334C: /* 801E3360 001DF1A0 38 21 00 10 */ addi r1, r1, 0x10 /* 801E3364 001DF1A4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251963 $$251963: .incbin "baserom.dol", 0x45A068, 0x1C @@ -136,7 +136,7 @@ $$252004: __vt__Q33scn19challengefileselect6Delete: .incbin "baserom.dol", 0x45A09C, 0x2C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251964 $$251964: .incbin "baserom.dol", 0x493E50, 0x8 diff --git a/asm/src/DeleteConfirm.s b/asm/src/DeleteConfirm.s index f0f142c7..5a9bc652 100644 --- a/asm/src/DeleteConfirm.s +++ b/asm/src/DeleteConfirm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect13DeleteConfirmFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn19challengefileselect13DeleteConfirmFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 801E3368 001DF1A8 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -457,7 +457,7 @@ lbl_801E39D0: /* 801E39D0 001DF810 38 63 01 D8 */ addi r3, r3, 0x1d8 /* 801E39D4 001DF814 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252625 $$252625: .incbin "baserom.dol", 0x45A0C8, 0x1C @@ -501,7 +501,7 @@ $$252702: $$252703: .incbin "baserom.dol", 0x45A198, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252689 $$252689: .incbin "baserom.dol", 0x493E78, 0x8 diff --git a/asm/src/Demo.s b/asm/src/Demo.s index 49028240..174df29f 100644 --- a/asm/src/Demo.s +++ b/asm/src/Demo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo4DemoFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1 __ct__Q53scn4step7gimmick11areamapdemo4DemoFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1: /* 802FAD04 002F6B44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -127,12 +127,12 @@ unsetZoomAll__Q53scn4step7gimmick11areamapdemo4DemoFv: /* 802FAE90 002F6CD0 38 63 00 CC */ addi r3, r3, 0xcc /* 802FAE94 002F6CD4 4B FF FA E8 */ b unsetZoom__Q53scn4step7gimmick11areamapdemo10CameraCtrlFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick11areamapdemo4Demo __vt__Q53scn4step7gimmick11areamapdemo4Demo: .incbin "baserom.dol", 0x47B618, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252595 $$252595: .incbin "baserom.dol", 0x49D140, 0x4 diff --git a/asm/src/DemoAllStageClear.s b/asm/src/DemoAllStageClear.s index 945399bc..1e5825e0 100644 --- a/asm/src/DemoAllStageClear.s +++ b/asm/src/DemoAllStageClear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1 __ct__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1: /* 802FAE98 002F6CD8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -262,7 +262,7 @@ mfGetBasePos__Q53scn4step7gimmick11areamapdemo17DemoAllStageClearFv: /* 802FB220 002F7060 38 21 00 10 */ addi r1, r1, 0x10 /* 802FB224 002F7064 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257907 $$257907: .incbin "baserom.dol", 0x47B640, 0x38 @@ -270,7 +270,7 @@ $$257907: __vt__Q53scn4step7gimmick11areamapdemo17DemoAllStageClear: .incbin "baserom.dol", 0x47B678, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257905 $$257905: .incbin "baserom.dol", 0x49D148, 0x4 diff --git a/asm/src/DemoAppearWarpStar.s b/asm/src/DemoAppearWarpStar.s index 31257f3a..155a095c 100644 --- a/asm/src/DemoAppearWarpStar.s +++ b/asm/src/DemoAppearWarpStar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1Q33scn4step9LevelKind __ct__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1Q33scn4step9LevelKind: /* 802FB228 002F7068 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -278,7 +278,7 @@ endCameraMove__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStarFif: /* 802FB5EC 002F742C 38 21 00 10 */ addi r1, r1, 0x10 /* 802FB5F0 002F7430 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256147 $$256147: .incbin "baserom.dol", 0x47B6A0, 0x38 @@ -286,7 +286,7 @@ $$256147: __vt__Q53scn4step7gimmick11areamapdemo18DemoAppearWarpStar: .incbin "baserom.dol", 0x47B6D8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256125 $$256125: .incbin "baserom.dol", 0x49D158, 0x4 diff --git a/asm/src/DemoChangeGrade.s b/asm/src/DemoChangeGrade.s index 4c7ef469..e0222215 100644 --- a/asm/src/DemoChangeGrade.s +++ b/asm/src/DemoChangeGrade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1Q27storage14ChallengeGrade __ct__Q53scn4step7gimmick11areamapdemo15DemoChangeGradeFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1Q27storage14ChallengeGrade: /* 802FB5F4 002F7434 94 21 FE 20 */ stwu r1, -0x1e0(r1) @@ -675,7 +675,7 @@ lbl_802FBF78: /* 802FBF78 002F7DB8 38 60 00 00 */ li r3, 0 /* 802FBF7C 002F7DBC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257294 $$257294: .incbin "baserom.dol", 0x47B700, 0x24 @@ -707,7 +707,7 @@ $$258879: __vt__Q53scn4step7gimmick11areamapdemo15DemoChangeGrade: .incbin "baserom.dol", 0x47B828, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257293 $$257293: .incbin "baserom.dol", 0x4968D8, 0x4 @@ -724,7 +724,7 @@ $$258871: $$258872: .incbin "baserom.dol", 0x4968F4, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258841 $$258841: .incbin "baserom.dol", 0x49D168, 0x4 diff --git a/asm/src/DemoFirstLvIn.s b/asm/src/DemoFirstLvIn.s index d055aad5..a2db60e4 100644 --- a/asm/src/DemoFirstLvIn.s +++ b/asm/src/DemoFirstLvIn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1RCQ33hel6common66MutableArray$$0PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$43$$1 __ct__Q53scn4step7gimmick11areamapdemo13DemoFirstLvInFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1RCQ33hel6common66MutableArray$$0PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$43$$1: /* 802FBF80 002F7DC0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -328,7 +328,7 @@ lbl_802FC354: /* 802FC3F4 002F8234 38 21 00 50 */ addi r1, r1, 0x50 /* 802FC3F8 002F8238 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255389 $$255389: .incbin "baserom.dol", 0x47B850, 0x30 @@ -336,7 +336,7 @@ $$255389: __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstLvIn: .incbin "baserom.dol", 0x47B880, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255356 $$255356: .incbin "baserom.dol", 0x49D178, 0x4 diff --git a/asm/src/DemoFirstPlay.s b/asm/src/DemoFirstPlay.s index cdb42e06..f6535362 100644 --- a/asm/src/DemoFirstPlay.s +++ b/asm/src/DemoFirstPlay.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1RCQ33hel6common66MutableArray$$0PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$42$$1 __ct__Q53scn4step7gimmick11areamapdemo13DemoFirstPlayFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1RCQ33hel6common66MutableArray$$0PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$42$$1: /* 802FC3FC 002F823C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -319,7 +319,7 @@ lbl_802FC820: /* 802FC860 002F86A0 38 21 00 70 */ addi r1, r1, 0x70 /* 802FC864 002F86A4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255320 $$255320: .incbin "baserom.dol", 0x47B8A8, 0x30 @@ -327,7 +327,7 @@ $$255320: __vt__Q53scn4step7gimmick11areamapdemo13DemoFirstPlay: .incbin "baserom.dol", 0x47B8D8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255319 $$255319: .incbin "baserom.dol", 0x49D190, 0x4 diff --git a/asm/src/DemoUnlockMaster.s b/asm/src/DemoUnlockMaster.s index 9f198d2f..1c2570d4 100644 --- a/asm/src/DemoUnlockMaster.s +++ b/asm/src/DemoUnlockMaster.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1RQ53scn4step7gimmick13challengedoor19ChallengeDoorMasterRCQ33hel6common66MutableArray$$0PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$42$$1 __ct__Q53scn4step7gimmick11areamapdemo16DemoUnlockMasterFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1RQ53scn4step7gimmick13challengedoor19ChallengeDoorMasterRCQ33hel6common66MutableArray$$0PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$42$$1: /* 802FC868 002F86A8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -303,7 +303,7 @@ lbl_802FCC4C: /* 802FCC5C 002F8A9C 38 21 00 20 */ addi r1, r1, 0x20 /* 802FCC60 002F8AA0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255141 $$255141: .incbin "baserom.dol", 0x47B900, 0x38 @@ -311,7 +311,7 @@ $$255141: __vt__Q53scn4step7gimmick11areamapdemo16DemoUnlockMaster: .incbin "baserom.dol", 0x47B938, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255199 $$255199: .incbin "baserom.dol", 0x49D1A0, 0x4 diff --git a/asm/src/DemoUnlockMasterEx.s b/asm/src/DemoUnlockMasterEx.s index 3e9f3aa3..f09a356e 100644 --- a/asm/src/DemoUnlockMasterEx.s +++ b/asm/src/DemoUnlockMasterEx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1RQ53scn4step7gimmick13challengedoor20ChallengeDoorMusouExRQ53scn4step7gimmick13challengedoor21ChallengeDoorMasterEx __ct__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExFRQ33scn4step9ComponentRQ43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11areamapdemo5Param$$1RQ53scn4step7gimmick13challengedoor20ChallengeDoorMusouExRQ53scn4step7gimmick13challengedoor21ChallengeDoorMasterEx: /* 802FCC64 002F8AA4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -132,7 +132,7 @@ isMasterDoorUnlockDemoEnd__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterExC /* 802FCDF0 002F8C30 38 21 00 10 */ addi r1, r1, 0x10 /* 802FCDF4 002F8C34 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254711 $$254711: .incbin "baserom.dol", 0x47B960, 0x38 @@ -140,7 +140,7 @@ $$254711: __vt__Q53scn4step7gimmick11areamapdemo18DemoUnlockMasterEx: .incbin "baserom.dol", 0x47B998, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254729 $$254729: .incbin "baserom.dol", 0x49D1B0, 0x8 diff --git a/asm/src/Desc.s b/asm/src/Desc.s index 3fe23bc0..5a33c7a8 100644 --- a/asm/src/Desc.s +++ b/asm/src/Desc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss4DescFv __ct__Q43scn4step4boss4DescFv: /* 8022F404 0022B244 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -61,7 +61,7 @@ __ct__Q43scn4step4boss4DescFQ43scn4step3map11BinBossKindQ43scn4step3map16BinBoss /* 8022F4D4 0022B314 38 21 00 10 */ addi r1, r1, 0x10 /* 8022F4D8 0022B318 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy4DescFv __ct__Q43scn4step5enemy4DescFv: /* 802845E0 00280420 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -136,7 +136,7 @@ __ct__Q43scn4step5enemy4DescFQ43scn4step3map12BinEnemyKindQ43scn4step3map17BinEn /* 802846E8 00280528 38 21 00 10 */ addi r1, r1, 0x10 /* 802846EC 0028052C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item4DescFQ43scn4step3map11BinItemKindUlbQ43scn4step3map16BinItemVariationRCQ33hel4math7Vector2 __ct__Q43scn4step4item4DescFQ43scn4step3map11BinItemKindUlbQ43scn4step3map16BinItemVariationRCQ33hel4math7Vector2: /* 803C0F2C 003BCD6C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -166,7 +166,7 @@ __ct__Q43scn4step4item4DescFQ43scn4step3map11BinItemKindUlbQ43scn4step3map16BinI /* 803C0F8C 003BCDCC 38 21 00 10 */ addi r1, r1, 0x10 /* 803C0F90 003BCDD0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon4DescFv __ct__Q43scn4step6weapon4DescFv: /* 803D6064 003D1EA4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Detail.s b/asm/src/Detail.s index 53922c97..a77ce32d 100644 --- a/asm/src/Detail.s +++ b/asm/src/Detail.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __vc__Q33hel6common43MutableArray$$0Q33scn7history11ProductKind$$43$$1CFUl __vc__Q33hel6common43MutableArray$$0Q33scn7history11ProductKind$$43$$1CFUl: /* 802117D0 0020D610 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3607,7 +3607,7 @@ canRemove__Q43scn7history6detail6DetailFv: /* 80214B10 00210950 38 63 24 E0 */ addi r3, r3, 0x24e0 /* 80214B14 00210954 48 00 29 A8 */ b canRemove__Q43scn7history6detail11MovieWindowFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252852 $$252852: .incbin "baserom.dol", 0x411D78, 0xC @@ -3615,7 +3615,7 @@ $$252852: $$252854: .incbin "baserom.dol", 0x411D84, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252845 $$252845: .incbin "baserom.dol", 0x45DB08, 0xC @@ -3722,7 +3722,7 @@ $$259151: $$259152: .incbin "baserom.dol", 0x45DD34, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258575 $$258575: .incbin "baserom.dol", 0x494AD0, 0x8 @@ -3796,7 +3796,7 @@ $$259187: $$259188: .incbin "baserom.dol", 0x494B70, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252847 $$252847: .incbin "baserom.dol", 0x49ACB0, 0x4 diff --git a/asm/src/DetailContext.s b/asm/src/DetailContext.s index 00837d02..f53abc2d 100644 --- a/asm/src/DetailContext.s +++ b/asm/src/DetailContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateFromYear__Q43scn7history6detail13DetailContextFRQ23mem10IAllocatori CreateFromYear__Q43scn7history6detail13DetailContextFRQ23mem10IAllocatori: /* 80214B18 00210958 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -117,7 +117,7 @@ __ct__Q43scn7history6detail13DetailContextFRQ23mem10IAllocatorRCQ33hel6common43M /* 80214CA8 00210AE8 38 21 00 10 */ addi r1, r1, 0x10 /* 80214CAC 00210AEC 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248752 $$248752: .incbin "baserom.dol", 0x494B78, 0x8 diff --git a/asm/src/DetectArg.s b/asm/src/DetectArg.s index e6af4b2c..f543c1e8 100644 --- a/asm/src/DetectArg.s +++ b/asm/src/DetectArg.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail9DetectArgFv __ct__Q35mcoll6detail9DetectArgFv: /* 801B71C4 001B3004 C0 02 9A C8 */ lfs f0, $$249806-_SDA2_BASE_(r2) @@ -103,7 +103,7 @@ toActorDetectOption__Q35mcoll6detail9DetectArgCFv: /* 801B72C4 001B3104 38 21 00 10 */ addi r1, r1, 0x10 /* 801B72C8 001B3108 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249806 $$249806: .incbin "baserom.dol", 0x49A588, 0x8 diff --git a/asm/src/DetectResult.s b/asm/src/DetectResult.s index 5f38342e..4c162279 100644 --- a/asm/src/DetectResult.s +++ b/asm/src/DetectResult.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail12DetectResultFv __ct__Q35mcoll6detail12DetectResultFv: /* 801B72CC 001B310C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/DetectResultContext.s b/asm/src/DetectResultContext.s index d401be7a..17ca2c15 100644 --- a/asm/src/DetectResultContext.s +++ b/asm/src/DetectResultContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail19DetectResultContextFv __ct__Q35mcoll6detail19DetectResultContextFv: /* 801B7558 001B3398 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -32,7 +32,7 @@ lbl_801B7594: /* 801B75BC 001B33FC 38 21 00 20 */ addi r1, r1, 0x20 /* 801B75C0 001B3400 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250294 $$250294: .incbin "baserom.dol", 0x49A590, 0x8 diff --git a/asm/src/Direction3.s b/asm/src/Direction3.s index d370c32c..cb3ee723 100644 --- a/asm/src/Direction3.s +++ b/asm/src/Direction3.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global normalize__Q33hel4math10Direction3Fv normalize__Q33hel4math10Direction3Fv: /* 8019DF7C 00199DBC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -442,10 +442,10 @@ __sinit_$$3Direction3_cpp: /* 8019E588 0019A3C8 38 21 00 90 */ addi r1, r1, 0x90 /* 8019E58C 0019A3CC 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402418, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255184 $$255184: .incbin "baserom.dol", 0x49A368, 0x4 diff --git a/asm/src/DisableIcon.s b/asm/src/DisableIcon.s index 3c6a47eb..b64f885b 100644 --- a/asm/src/DisableIcon.s +++ b/asm/src/DisableIcon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hbm11DisableIconFv __ct__Q23hbm11DisableIconFv: /* 8019C158 00197F98 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -169,10 +169,10 @@ __sinit_$$3DisableIcon_cpp: /* 8019C388 001981C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8019C38C 001981CC 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402410, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250030 $$250030: .incbin "baserom.dol", 0x49A2F8, 0x4 diff --git a/asm/src/DisableIconResource.s b/asm/src/DisableIconResource.s index 2e799afb..31b4c7f2 100644 --- a/asm/src/DisableIconResource.s +++ b/asm/src/DisableIconResource.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global DISABLE_ICON_TPL_RESOURCE__3hbm DISABLE_ICON_TPL_RESOURCE__3hbm: .incbin "baserom.dol", 0x451160, 0x18C0 diff --git a/asm/src/Door.s b/asm/src/Door.s index fb5718e2..417d8c81 100644 --- a/asm/src/Door.s +++ b/asm/src/Door.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick4door4DoorFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick4door4DoorFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8030D910 00309750 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -885,7 +885,7 @@ mfReleasePtclEffect__Q53scn4step7gimmick4door4DoorFv: /* 8030E548 0030A388 38 21 00 10 */ addi r1, r1, 0x10 /* 8030E54C 0030A38C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero4DoorFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero4DoorFRQ43scn4step4hero4Hero: /* 803356E4 00331524 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1465,12 +1465,12 @@ lbl_80335E7C: /* 80335E8C 00331CCC 38 21 00 10 */ addi r1, r1, 0x10 /* 80335E90 00331CD0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254039 $$254039: .incbin "baserom.dol", 0x47D3E0, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254159 $$254159: .incbin "baserom.dol", 0x49D3B0, 0x4 diff --git a/asm/src/DoorUnlockStar.s b/asm/src/DoorUnlockStar.s index 3295892f..98ea20c7 100644 --- a/asm/src/DoorUnlockStar.s +++ b/asm/src/DoorUnlockStar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13challengedoor14DoorUnlockStarFRQ33scn4step9Component __ct__Q53scn4step7gimmick13challengedoor14DoorUnlockStarFRQ33scn4step9Component: /* 80309D10 00305B50 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -608,7 +608,7 @@ mfSetupEffect__Q53scn4step7gimmick13challengedoor14DoorUnlockStarFv: /* 8030A5B8 003063F8 38 21 00 40 */ addi r1, r1, 0x40 /* 8030A5BC 003063FC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256175 $$256175: .incbin "baserom.dol", 0x47D328, 0x18 @@ -616,7 +616,7 @@ $$256175: $$256289: .incbin "baserom.dol", 0x47D340, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256176 $$256176: .incbin "baserom.dol", 0x496A60, 0x8 @@ -630,7 +630,7 @@ $$256288: $$256309: .incbin "baserom.dol", 0x496A78, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256174 $$256174: .incbin "baserom.dol", 0x49D318, 0x4 diff --git a/asm/src/DrawInfo.s b/asm/src/DrawInfo.s index dc7f1cf1..d311c8aa 100644 --- a/asm/src/DrawInfo.s +++ b/asm/src/DrawInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail8DrawInfoFv __ct__Q36effect6detail8DrawInfoFv: /* 8017F38C 0017B1CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -131,7 +131,7 @@ lbl_8017F538: /* 8017F548 0017B388 42 00 FF F0 */ bdnz lbl_8017F538 /* 8017F54C 0017B38C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251405 $$251405: .incbin "baserom.dol", 0x49A178, 0x4 diff --git a/asm/src/DrawLayerKindUtil.s b/asm/src/DrawLayerKindUtil.s index 0101992b..afed3d0a 100644 --- a/asm/src/DrawLayerKindUtil.s +++ b/asm/src/DrawLayerKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CameraKind__Q43scn4step4core17DrawLayerKindUtilFQ43scn4step4core13DrawLayerKind CameraKind__Q43scn4step4core17DrawLayerKindUtilFQ43scn4step4core13DrawLayerKind: /* 80275F7C 00271DBC 1C 03 00 0C */ mulli r0, r3, 0xc @@ -27,7 +27,7 @@ G3DLightSetCount__Q43scn4step4core17DrawLayerKindUtilFQ43scn4step4core13DrawLaye /* 80275FB8 00271DF8 80 63 00 08 */ lwz r3, 8(r3) /* 80275FBC 00271DFC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ENTRIES__Q43scn4step4core31$$2unnamed$$2DrawLayerKindUtil_cpp$$2 T_ENTRIES__Q43scn4step4core31$$2unnamed$$2DrawLayerKindUtil_cpp$$2: .incbin "baserom.dol", 0x413B60, 0xA0 diff --git a/asm/src/Drawer.s b/asm/src/Drawer.s index 5116b28b..71872c86 100644 --- a/asm/src/Drawer.s +++ b/asm/src/Drawer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core6DrawerFRQ33scn4step9Component __ct__Q43scn4step4core6DrawerFRQ33scn4step9Component: /* 80274BF4 00270A34 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1438,12 +1438,12 @@ lbl_80275F60: /* 80275F74 00271DB4 38 21 00 20 */ addi r1, r1, 0x20 /* 80275F78 00271DB8 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global VIEW_PORT_SETTINGS__Q43scn4step4core20$$2unnamed$$2Drawer_cpp$$2 VIEW_PORT_SETTINGS__Q43scn4step4core20$$2unnamed$$2Drawer_cpp$$2: .incbin "baserom.dol", 0x413B20, 0x40 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258077 $$258077: .incbin "baserom.dol", 0x49B8E0, 0x4 diff --git a/asm/src/DvdControl.s b/asm/src/DvdControl.s index cfbb0972..197fdf34 100644 --- a/asm/src/DvdControl.s +++ b/asm/src/DvdControl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ReadCallback__FlP11DVDFileInfo ReadCallback__FlP11DVDFileInfo: /* 801CDF28 001C9D68 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -490,10 +490,10 @@ __sinit_$$3DvdControl_cpp: /* 801CE5BC 001CA3FC 38 21 00 10 */ addi r1, r1, 0x10 /* 801CE5C0 001CA400 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40243C, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249342 $$249342: .incbin "baserom.dol", 0x458DA8, 0x10 diff --git a/asm/src/DvdWatch.s b/asm/src/DvdWatch.s index ee2c9671..52a2ba35 100644 --- a/asm/src/DvdWatch.s +++ b/asm/src/DvdWatch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsExist__Q33hel6common37ExplicitSingleton$$0Q23hid10HIDManager$$1Fv IsExist__Q33hel6common37ExplicitSingleton$$0Q23hid10HIDManager$$1Fv: /* 801768B4 001726F4 80 6D ED 18 */ lwz r3, object___Q33hel6common37ExplicitSingleton$$0Q23hid10HIDManager$$1-_SDA_BASE_(r13) @@ -1006,7 +1006,7 @@ lbl_8017769C: /* 801776B4 001734F4 38 21 01 00 */ addi r1, r1, 0x100 /* 801776B8 001734F8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0c$$1FUl$$20 $$2STRING$$2SetDrawFlag__Q34nw4r2ut17TextWriterBase$$0c$$1FUl$$20: .incbin "baserom.dol", 0x44EC30, 0x34 @@ -1020,7 +1020,7 @@ $$2STRING$$2SetCursor__Q34nw4r2ut10CharWriterFff$$20: $$2STRING$$2SetCursor__Q34nw4r2ut10CharWriterFff: .incbin "baserom.dol", 0x44ECAC, 0x14 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253258 $$253258: .incbin "baserom.dol", 0x49A0E8, 0x4 diff --git a/asm/src/DvdWatch_ENG.s b/asm/src/DvdWatch_ENG.s index d8c8bcdc..a141a2e7 100644 --- a/asm/src/DvdWatch_ENG.s +++ b/asm/src/DvdWatch_ENG.s @@ -1,11 +1,11 @@ .include "macros.inc" -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global ERROR_MSG_ENG__Q23app8DvdWatch ERROR_MSG_ENG__Q23app8DvdWatch: .incbin "baserom.dol", 0x4105C8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248837 $$248837: .incbin "baserom.dol", 0x44ECC0, 0x44 @@ -16,7 +16,7 @@ $$248838: $$248839: .incbin "baserom.dol", 0x44ED50, 0xA8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248836 $$248836: .incbin "baserom.dol", 0x492F58, 0x8 diff --git a/asm/src/Dynamics.s b/asm/src/Dynamics.s index b785bdcd..4a04a3d7 100644 --- a/asm/src/Dynamics.s +++ b/asm/src/Dynamics.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q28dynamics8DynamicsFRCQ23mem15AllocatorHandle __ct__Q28dynamics8DynamicsFRCQ23mem15AllocatorHandle: /* 8017BD88 00177BC8 38 C0 00 00 */ li r6, 0 @@ -387,7 +387,7 @@ freeModelTree__Q28dynamics8DynamicsFPQ28dynamics9ModelTree: /* 8017C2A0 001780E0 38 21 00 10 */ addi r1, r1, 0x10 /* 8017C2A4 001780E4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetDescNode__Q53scn4step4hero9modeldesc8DynamicsFRQ28dynamics8DescNodeRCQ63scn4step4hero9modeldesc8Dynamics9NodeParam SetDescNode__Q53scn4step4hero9modeldesc8DynamicsFRQ28dynamics8DescNodeRCQ63scn4step4hero9modeldesc8Dynamics9NodeParam: /* 8035C0FC 00357F3C C1 04 00 20 */ lfs f8, 0x20(r4) @@ -416,7 +416,7 @@ SetDescNode__Q53scn4step4hero9modeldesc8DynamicsFRQ28dynamics8DescNodeRCQ63scn4s /* 8035C158 00357F98 D1 03 00 20 */ stfs f8, 0x20(r3) /* 8035C15C 00357F9C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x44F200, 0x24 @@ -424,7 +424,7 @@ $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q2 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut72LinkList$$0Q24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util51ObjListNode$$0Q23g3d5Model$$4Q24util16ObjListDummyType$$1: .incbin "baserom.dol", 0x44F224, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249488 $$249488: .incbin "baserom.dol", 0x49DAE8, 0x8 diff --git a/asm/src/EFBToLetterBox.s b/asm/src/EFBToLetterBox.s index 90637d55..b00b9c10 100644 --- a/asm/src/EFBToLetterBox.s +++ b/asm/src/EFBToLetterBox.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_capture__Q23gfx28$$2unnamed$$2EFBToLetterBox_cpp$$2FRCQ23gfx9TexBufferUsUsUsb t_capture__Q23gfx28$$2unnamed$$2EFBToLetterBox_cpp$$2FRCQ23gfx9TexBufferUsUsUsb: /* 80195934 00191774 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -417,7 +417,7 @@ RoundUp$$0Us$$1__Q34nw4r2ut24$$2unnamed$$2Precompile_pch$$2FUsUi_Us: /* 80195F50 00191D90 54 03 04 3E */ clrlwi r3, r0, 0x10 /* 80195F54 00191D94 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251900 $$251900: .incbin "baserom.dol", 0x49A230, 0x4 diff --git a/asm/src/EasyRender3D.s b/asm/src/EasyRender3D.s index e5c5105d..741fa445 100644 --- a/asm/src/EasyRender3D.s +++ b/asm/src/EasyRender3D.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_loadPosMtx__26$$2unnamed$$2EasyRender3D_cpp$$2FRCQ33hel4math8Matrix34 t_loadPosMtx__26$$2unnamed$$2EasyRender3D_cpp$$2FRCQ33hel4math8Matrix34: /* 80194FC4 00190E04 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -595,10 +595,10 @@ __sinit_$$3EasyRender3D_cpp: /* 8019584C 0019168C 38 63 48 28 */ addi r3, r3, t_viewMtx__26$$2unnamed$$2EasyRender3D_cpp$$2@l /* 80195850 00191690 4B FF F7 D4 */ b __ct__Q33hel4math8Matrix34Fv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023E8, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251446 $$251446: .incbin "baserom.dol", 0x49A208, 0x4 diff --git a/asm/src/EasyTex3D.s b/asm/src/EasyTex3D.s index aef9e8e4..fcfd9a94 100644 --- a/asm/src/EasyTex3D.s +++ b/asm/src/EasyTex3D.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q23gfx10TPLTextureFv __dt__Q23gfx10TPLTextureFv: /* 80195854 00191694 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Effect.s b/asm/src/Effect.s index 5b6f411b..41ea790c 100644 --- a/asm/src/Effect.s +++ b/asm/src/Effect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail6EffectFv __ct__Q36effect6detail6EffectFv: /* 8017F550 0017B390 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1106,7 +1106,7 @@ lbl_801803FC: /* 80180408 0017C248 38 21 00 10 */ addi r1, r1, 0x10 /* 8018040C 0017C24C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss6EffectFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss6EffectFRQ43scn4step4boss4Boss: /* 8022F4DC 0022B31C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1341,7 +1341,7 @@ onObjStopStarted__Q43scn4step4boss6EffectFv: onObjStopFinished__Q43scn4step4boss6EffectFv: /* 8022F808 0022B648 4B FF FF 94 */ b onHitStopEnd__Q43scn4step4boss6EffectFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara6EffectFRQ33scn4step9ComponentQ43scn4step6effect12DrawPriority __ct__Q43scn4step5chara6EffectFRQ33scn4step9ComponentQ43scn4step6effect12DrawPriority: /* 8026DEA4 00269CE4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1728,7 +1728,7 @@ node__Q43scn4step5chara6EffectFUl: /* 8026E348 0026A188 80 84 00 04 */ lwz r4, 4(r4) /* 8026E34C 0026A18C 4B F2 D9 80 */ b at__Q24gobj9NodeReposCFUl -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy6EffectFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy6EffectFRQ43scn4step5enemy5Enemy: /* 802846F0 00280530 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1853,7 +1853,7 @@ onObjStopStarted__Q43scn4step5enemy6EffectFv: onObjStopFinished__Q43scn4step5enemy6EffectFv: /* 80284894 002806D4 4B FF FF B4 */ b onHitStopEnd__Q43scn4step5enemy6EffectFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick6EffectFRQ33scn4step9Component __ct__Q43scn4step7gimmick6EffectFRQ33scn4step9Component: /* 802F39A0 002EF7E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2341,7 +2341,7 @@ lbl_802F4044: /* 802F4050 002EFE90 38 21 00 10 */ addi r1, r1, 0x10 /* 802F4054 002EFE94 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero6EffectFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q43scn4step4hero6EffectFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 80335E94 00331CD4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2774,7 +2774,7 @@ setViewOffsetTrans__Q43scn4step4hero6EffectFRCQ33hel4math7Vector3: /* 803364E8 00332328 38 21 00 10 */ addi r1, r1, 0x10 /* 803364EC 0033232C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon6EffectFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon6EffectFRQ43scn4step6weapon6Weapon: /* 803D6230 003D2070 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2862,7 +2862,7 @@ onObjStopStarted__Q43scn4step6weapon6EffectFv: onObjStopFinished__Q43scn4step6weapon6EffectFv: /* 803D634C 003D218C 4B FF FF C4 */ b onHitStopEnd__Q43scn4step6weapon6EffectFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x44F3F0, 0x24 diff --git a/asm/src/EffectComponent.s b/asm/src/EffectComponent.s index a37827d7..0a7a69b7 100644 --- a/asm/src/EffectComponent.s +++ b/asm/src/EffectComponent.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail15EffectComponentFRQ36effect6detail15GenContextTableRQ36effect6detail17PolyEffectManagerRQ36effect6detail17PtclEffectManager __ct__Q36effect6detail15EffectComponentFRQ36effect6detail15GenContextTableRQ36effect6detail17PolyEffectManagerRQ36effect6detail17PtclEffectManager: /* 80180410 0017C250 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/EffectLocatorModelDesc.s b/asm/src/EffectLocatorModelDesc.s index e0a86673..b6e2fed8 100644 --- a/asm/src/EffectLocatorModelDesc.s +++ b/asm/src/EffectLocatorModelDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q43scn4step6weapon22EffectLocatorModelDescFv Create__Q43scn4step6weapon22EffectLocatorModelDescFv: /* 803D6350 003D2190 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -46,7 +46,7 @@ lbl_803D6398: /* 803D63EC 003D222C 38 21 00 30 */ addi r1, r1, 0x30 /* 803D63F0 003D2230 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250196 $$250196: .incbin "baserom.dol", 0x48F878, 0x10 @@ -54,7 +54,7 @@ $$250196: $$250197: .incbin "baserom.dol", 0x48F888, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x498418, 0x8 diff --git a/asm/src/EffectManager.s b/asm/src/EffectManager.s index ea73938b..9dfdb0f0 100644 --- a/asm/src/EffectManager.s +++ b/asm/src/EffectManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail13EffectManagerFRCQ36effect6detail14ManagerContext __ct__Q36effect6detail13EffectManagerFRCQ36effect6detail14ManagerContext: /* 80180420 0017C260 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -886,7 +886,7 @@ drawPtclAll__Q36effect6detail13EffectManagerCFRCQ36effect6detail8DrawInfo: /* 80180FF0 0017CE30 38 21 00 10 */ addi r1, r1, 0x10 /* 80180FF4 0017CE34 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_lytMatrix__Q33scn14challengetitle27$$2unnamed$$2EffectManager_cpp$$2Fv t_lytMatrix__Q33scn14challengetitle27$$2unnamed$$2EffectManager_cpp$$2Fv: /* 801ED0DC 001E8F1C 4B FC 41 A4 */ b ViewMtx__Q23lyt7UtilityFv @@ -1157,7 +1157,7 @@ drawLYT__Q33scn14challengetitle13EffectManagerFv: /* 801ED498 001E92D8 38 21 00 E0 */ addi r1, r1, 0xe0 /* 801ED49C 001E92DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle13EffectManagerFRQ33scn10grandtitle9Component __ct__Q33scn10grandtitle13EffectManagerFRQ33scn10grandtitle9Component: /* 802043E4 00200224 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -1560,7 +1560,7 @@ drawLYT__Q33scn10grandtitle13EffectManagerFv: /* 802049A4 002007E4 38 21 00 E0 */ addi r1, r1, 0xe0 /* 802049A8 002007E8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history13EffectManagerFRQ33scn7history9Component __ct__Q33scn7history13EffectManagerFRQ33scn7history9Component: /* 80207AB0 002038F0 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -1873,7 +1873,7 @@ drawWarp__Q33scn7history13EffectManagerFv: /* 80207F34 00203D74 38 21 00 F0 */ addi r1, r1, 0xf0 /* 80207F38 00203D78 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn9grandmenu13EffectManagerFRQ33scn9grandmenu9Component __ct__Q33scn9grandmenu13EffectManagerFRQ33scn9grandmenu9Component: /* 803F3308 003EF148 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -2091,7 +2091,7 @@ drawLYT__Q33scn9grandmenu13EffectManagerFv: /* 803F3630 003EF470 38 21 00 E0 */ addi r1, r1, 0xe0 /* 803F3634 003EF474 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .incbin "baserom.dol", 0x44F450, 0x24 @@ -2111,7 +2111,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6det $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x44F4D4, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253266 $$253266: .incbin "baserom.dol", 0x49A918, 0x4 @@ -2119,7 +2119,7 @@ $$253266: $$253267: .incbin "baserom.dol", 0x49A91C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253568 $$253568: .incbin "baserom.dol", 0x49AAE0, 0x4 @@ -2127,7 +2127,7 @@ $$253568: $$253569: .incbin "baserom.dol", 0x49AAE4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253274 $$253274: .incbin "baserom.dol", 0x49AB80, 0x4 @@ -2135,7 +2135,7 @@ $$253274: $$253275: .incbin "baserom.dol", 0x49AB84, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253185 $$253185: .incbin "baserom.dol", 0x49ED60, 0x4 diff --git a/asm/src/EffectObjListUtil.s b/asm/src/EffectObjListUtil.s index 31b3c620..273ac6eb 100644 --- a/asm/src/EffectObjListUtil.s +++ b/asm/src/EffectObjListUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Insert__Q36effect6detail17EffectObjListUtilFRQ24util58ObjList$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1RQ24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1 Insert__Q36effect6detail17EffectObjListUtilFRQ24util58ObjList$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1RQ24util62ObjListNode$$0Q36effect6detail6Effect$$4Q24util16ObjListDummyType$$1: /* 80180FF8 0017CE38 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/EmotionCtrl.s b/asm/src/EmotionCtrl.s index 87df31fe..50d8a09f 100644 --- a/asm/src/EmotionCtrl.s +++ b/asm/src/EmotionCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster11EmotionCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster11EmotionCtrlFRQ43scn4step4boss4Boss: /* 8023C43C 0023827C 90 83 00 00 */ stw r4, 0(r3) @@ -452,12 +452,12 @@ lbl_8023CA54: /* 8023CA6C 002388AC 38 21 00 20 */ addi r1, r1, 0x20 /* 8023CA70 002388B0 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255334 $$255334: .incbin "baserom.dol", 0x495330, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255774 $$255774: .incbin "baserom.dol", 0x49AFC8, 0x4 diff --git a/asm/src/Enemy.s b/asm/src/Enemy.s index 17e84644..fe461512 100644 --- a/asm/src/Enemy.s +++ b/asm/src/Enemy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy5EnemyFRQ33scn4step9ComponentRQ23mem12HeapExpArrayRCQ43scn4step5enemy4DescUl __ct__Q43scn4step5enemy5EnemyFRQ33scn4step9ComponentRQ23mem12HeapExpArrayRCQ43scn4step5enemy4DescUl: /* 80284898 002806D8 94 21 FD F0 */ stwu r1, -0x210(r1) @@ -4196,7 +4196,7 @@ __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common9Stat __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80288210 00284050 4B FA 64 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common21StateMasterSummonWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46DF30, 0x10 @@ -4228,7 +4228,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5e $$2STRING$$2GetBack__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x46DFF0, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$270296 $$270296: .incbin "baserom.dol", 0x49B990, 0x4 diff --git a/asm/src/EnemyCtrl.s b/asm/src/EnemyCtrl.s index 4c7965ad..4b296f7d 100644 --- a/asm/src/EnemyCtrl.s +++ b/asm/src/EnemyCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior9EnemyCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior9EnemyCtrlFRQ43scn4step4boss4Boss: /* 8024D41C 0024925C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -236,7 +236,7 @@ lbl_8024D744: /* 8024D754 00249594 38 21 00 20 */ addi r1, r1, 0x20 /* 8024D758 00249598 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy9EnemyCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy9EnemyCtrlFRQ43scn4step4boss4Boss: /* 8025C25C 0025809C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -453,7 +453,7 @@ lbl_8025C50C: /* 8025C564 002583A4 38 21 00 20 */ addi r1, r1, 0x20 /* 8025C568 002583A8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9zankibble9EnemyCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss9zankibble9EnemyCtrlFRQ43scn4step4boss4Boss: /* 80260810 0025C650 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -859,12 +859,12 @@ lbl_80260D4C: /* 80260D60 0025CBA0 38 21 00 10 */ addi r1, r1, 0x10 /* 80260D64 0025CBA4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_OBVERSE_TABLE__Q53scn4step4boss6whispy23$$2unnamed$$2EnemyCtrl_cpp$$2 T_OBVERSE_TABLE__Q53scn4step4boss6whispy23$$2unnamed$$2EnemyCtrl_cpp$$2: .incbin "baserom.dol", 0x413650, 0x58 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1 __vt__Q24util133StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter13StateStraight$$4PQ43scn4step5enemy5Enemy$$4Q43scn4step4boss8Accessor$$1: .incbin "baserom.dol", 0x466C80, 0x10 @@ -878,7 +878,7 @@ __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibble __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy15zankibblecutter10StateSlant$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x466CB0, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252522 $$252522: .incbin "baserom.dol", 0x49B500, 0x4 diff --git a/asm/src/EnemyDataAccessor.s b/asm/src/EnemyDataAccessor.s index 61dd1f4b..75e31c2b 100644 --- a/asm/src/EnemyDataAccessor.s +++ b/asm/src/EnemyDataAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global at__Q43scn4step3map17EnemyDataAccessorCFUl at__Q43scn4step3map17EnemyDataAccessorCFUl: /* 803C9D34 003C5B74 80 63 00 00 */ lwz r3, 0(r3) diff --git a/asm/src/EnemyKiller.s b/asm/src/EnemyKiller.s index b7a81086..ad5cf043 100644 --- a/asm/src/EnemyKiller.s +++ b/asm/src/EnemyKiller.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5debug11EnemyKillerFRQ33scn4step9ComponentRQ25ocoll5OwnerQ23g3d12NodeAccessorUl __ct__Q43scn4step5debug11EnemyKillerFRQ33scn4step9ComponentRQ25ocoll5OwnerQ23g3d12NodeAccessorUl: /* 8027A434 00276274 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -114,7 +114,7 @@ lbl_8027A5B4: /* 8027A5C8 00276408 38 21 00 10 */ addi r1, r1, 0x10 /* 8027A5CC 0027640C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252852 $$252852: .incbin "baserom.dol", 0x49B918, 0x8 diff --git a/asm/src/EnemyList.s b/asm/src/EnemyList.s index 2f2a51c2..3bb1c86e 100644 --- a/asm/src/EnemyList.s +++ b/asm/src/EnemyList.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick9enemylist9EnemyListFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick9enemylist9EnemyListFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8030EA60 0030A8A0 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/EnemyReqBuff.s b/asm/src/EnemyReqBuff.s index 983df1e8..5064d7d7 100644 --- a/asm/src/EnemyReqBuff.s +++ b/asm/src/EnemyReqBuff.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global add__Q53scn4step4boss6whispy12EnemyReqBuffFRCQ63scn4step4boss6whispy12EnemyReqBuff7ReqData add__Q53scn4step4boss6whispy12EnemyReqBuffFRCQ63scn4step4boss6whispy12EnemyReqBuff7ReqData: /* 8025C56C 002583AC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/EnemySummonCtrl.s b/asm/src/EnemySummonCtrl.s index 291a6401..e2a362a3 100644 --- a/asm/src/EnemySummonCtrl.s +++ b/asm/src/EnemySummonCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step6weapon26challengemastersummonlight6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step6weapon26challengemastersummonlight6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 8023CA74 002388B4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -827,12 +827,12 @@ create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8023D5B0 002393F0 4B FF 10 F0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common17StateMasterSummon$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x461740, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259024 $$259024: .incbin "baserom.dol", 0x49AFF0, 0x4 diff --git a/asm/src/Engine.s b/asm/src/Engine.s index f50a073c..126db7b6 100644 --- a/asm/src/Engine.s +++ b/asm/src/Engine.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24mint6EngineFRQ24mint7Manager __ct__Q24mint6EngineFRQ24mint7Manager: /* 801BFAD4 001BB914 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -149,7 +149,7 @@ lbl_801BFCC4: /* 801BFCE4 001BBB24 38 21 00 A0 */ addi r1, r1, 0xa0 /* 801BFCE8 001BBB28 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251818 $$251818: .incbin "baserom.dol", 0x493698, 0x8 diff --git a/asm/src/EntryPoint.s b/asm/src/EntryPoint.s index 2ff5217d..568a3a90 100644 --- a/asm/src/EntryPoint.s +++ b/asm/src/EntryPoint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Run__Q23app10EntryPointFbPCc Run__Q23app10EntryPointFbPCc: /* 801776BC 001734FC 94 21 FC 50 */ stwu r1, -0x3b0(r1) @@ -182,7 +182,7 @@ lbl_80177920: /* 80177934 00173774 38 21 00 10 */ addi r1, r1, 0x10 /* 80177938 00173778 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249240 $$249240: .incbin "baserom.dol", 0x44EDF8, 0x10 diff --git a/asm/src/ExUtil.s b/asm/src/ExUtil.s index 2e284684..b99b2adc 100644 --- a/asm/src/ExUtil.s +++ b/asm/src/ExUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsMainPlayerRunning__Q43scn4step4hero6ExUtilFRQ33scn4step9Component IsMainPlayerRunning__Q43scn4step4hero6ExUtilFRQ33scn4step9Component: /* 803364F0 00332330 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Exception.s b/asm/src/Exception.s index 0a83852d..ca66692e 100644 --- a/asm/src/Exception.s +++ b/asm/src/Exception.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26freeze9ExceptionFRQ26freeze7Console __ct__Q26freeze9ExceptionFRQ26freeze7Console: /* 801899D0 00185810 90 83 00 00 */ stw r4, 0(r3) @@ -635,7 +635,7 @@ lbl_8018A1F0: /* 8018A2C8 00186108 38 21 00 20 */ addi r1, r1, 0x20 /* 8018A2CC 0018610C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248845 $$248845: .incbin "baserom.dol", 0x44FA90, 0x10 @@ -796,7 +796,7 @@ $$249355: $$249364: .incbin "baserom.dol", 0x44FF90, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248847 $$248847: .incbin "baserom.dol", 0x493118, 0x4 @@ -822,7 +822,7 @@ $$249365: $$249366: .incbin "baserom.dol", 0x493144, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249353 $$249353: .incbin "baserom.dol", 0x49A198, 0x8 diff --git a/asm/src/Explain.s b/asm/src/Explain.s index e978353f..e1217de2 100644 --- a/asm/src/Explain.s +++ b/asm/src/Explain.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap7ExplainFRQ33scn4step9ComponentRQ23mem10IAllocator __ct__Q53scn4step4info5lvmap7ExplainFRQ33scn4step9ComponentRQ23mem10IAllocator: /* 803B9DDC 003B5C1C 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/ExplainBase.s b/asm/src/ExplainBase.s index e9524744..d0077814 100644 --- a/asm/src/ExplainBase.s +++ b/asm/src/ExplainBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap11ExplainBaseFRQ33scn4step9ComponentRQ23mem10IAllocator __ct__Q53scn4step4info5lvmap11ExplainBaseFRQ33scn4step9ComponentRQ23mem10IAllocator: /* 803BA630 003B6470 94 21 FE B0 */ stwu r1, -0x150(r1) @@ -1553,7 +1553,7 @@ lbl_803BBC98: /* 803BBCB0 003B7AF0 38 21 00 40 */ addi r1, r1, 0x40 /* 803BBCB4 003B7AF4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256661 $$256661: .incbin "baserom.dol", 0x48D070, 0x14 @@ -1639,7 +1639,7 @@ $$257195: $$257196: .incbin "baserom.dol", 0x48D278, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256660 $$256660: .incbin "baserom.dol", 0x497E40, 0x8 diff --git a/asm/src/ExplainButton.s b/asm/src/ExplainButton.s index 94ac2981..4051a3f7 100644 --- a/asm/src/ExplainButton.s +++ b/asm/src/ExplainButton.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap13ExplainButtonFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator __ct__Q53scn4step4info5lvmap13ExplainButtonFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator: /* 803BBCB8 003B7AF8 94 21 FE 80 */ stwu r1, -0x180(r1) @@ -330,7 +330,7 @@ lbl_803BC15C: /* 803BC168 003B7FA8 38 21 00 10 */ addi r1, r1, 0x10 /* 803BC16C 003B7FAC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251576 $$251576: .incbin "baserom.dol", 0x48D2C0, 0x10 @@ -395,7 +395,7 @@ $$252521: $$252522: .incbin "baserom.dol", 0x48D46C, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251589 $$251589: .incbin "baserom.dol", 0x497EB8, 0x8 diff --git a/asm/src/ExplainConsole.s b/asm/src/ExplainConsole.s index 92f56208..90ae051a 100644 --- a/asm/src/ExplainConsole.s +++ b/asm/src/ExplainConsole.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap14ExplainConsoleFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator __ct__Q53scn4step4info5lvmap14ExplainConsoleFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator: /* 803BC170 003B7FB0 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -983,7 +983,7 @@ lbl_803BCF40: /* 803BCF50 003B8D90 38 21 00 10 */ addi r1, r1, 0x10 /* 803BCF54 003B8D94 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global cdDataTbl__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 cdDataTbl__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: .incbin "baserom.dol", 0x41BF28, 0x80 @@ -991,7 +991,7 @@ cdDataTbl__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: cdDataTblG__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: .incbin "baserom.dol", 0x41BFA8, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdChallenge__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: .incbin "baserom.dol", 0x48D4A8, 0x10 @@ -1035,7 +1035,7 @@ $$253695: $$253696: .incbin "baserom.dol", 0x48D550, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2 bIdMaster__Q53scn4step4info5lvmap28$$2unnamed$$2ExplainConsole_cpp$$2: .incbin "baserom.dol", 0x497F18, 0x8 @@ -1049,7 +1049,7 @@ $$253494: $$253693: .incbin "baserom.dol", 0x497F30, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253495 $$253495: .incbin "baserom.dol", 0x49E4D8, 0x4 diff --git a/asm/src/ExplainCursor.s b/asm/src/ExplainCursor.s index c85b2a55..97480bd0 100644 --- a/asm/src/ExplainCursor.s +++ b/asm/src/ExplainCursor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap13ExplainCursorFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator __ct__Q53scn4step4info5lvmap13ExplainCursorFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator: /* 803BCF58 003B8D98 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -286,12 +286,12 @@ lbl_803BD324: /* 803BD330 003B9170 38 21 00 40 */ addi r1, r1, 0x40 /* 803BD334 003B9174 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252146 $$252146: .incbin "baserom.dol", 0x48D590, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252181 $$252181: .incbin "baserom.dol", 0x497F38, 0x8 diff --git a/asm/src/ExplainUtil.s b/asm/src/ExplainUtil.s index 9877b356..2e09efa5 100644 --- a/asm/src/ExplainUtil.s +++ b/asm/src/ExplainUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global explainData__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2FQ33scn4step13ChallengeKind explainData__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2FQ33scn4step13ChallengeKind: /* 803BD338 003B9178 1C C4 00 14 */ mulli r6, r4, 0x14 @@ -188,7 +188,7 @@ MedalToGrade__Q53scn4step4info5lvmap11ExplainUtilFQ33scn4step18ChallengeMedalKin /* 803BD580 003B93C0 7C 63 00 2E */ lwzx r3, r3, r0 /* 803BD584 003B93C4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global explainDataTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2 explainDataTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: .incbin "baserom.dol", 0x41C028, 0x140 @@ -199,7 +199,7 @@ explainPathTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: medalToGradeTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: .incbin "baserom.dol", 0x41C1E8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248733 $$248733: .incbin "baserom.dol", 0x48D5A0, 0xC @@ -336,7 +336,7 @@ medalNameTbl__Q53scn4step4info5lvmap25$$2unnamed$$2ExplainUtil_cpp$$2: $$249054: .incbin "baserom.dol", 0x48D7F8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248736 $$248736: .incbin "baserom.dol", 0x497F50, 0x8 diff --git a/asm/src/Explanation.s b/asm/src/Explanation.s index 2bc95135..9eee6b43 100644 --- a/asm/src/Explanation.s +++ b/asm/src/Explanation.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn9grandmenu4menu11ExplanationFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q43scn9grandmenu4menu11ExplanationFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803F4DF4 003F0C34 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -482,7 +482,7 @@ lbl_803F542C: /* 803F54A8 003F12E8 38 21 00 D0 */ addi r1, r1, 0xd0 /* 803F54AC 003F12EC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global t_ItemInfoTable__25$$2unnamed$$2Explanation_cpp$$2 t_ItemInfoTable__25$$2unnamed$$2Explanation_cpp$$2: .incbin "baserom.dol", 0x41CC40, 0x90 @@ -490,7 +490,7 @@ t_ItemInfoTable__25$$2unnamed$$2Explanation_cpp$$2: $$252218: .incbin "baserom.dol", 0x41CCD0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251882 $$251882: .incbin "baserom.dol", 0x4918B0, 0x18 @@ -540,7 +540,7 @@ $$252216: $$252217: .incbin "baserom.dol", 0x491990, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251885 $$251885: .incbin "baserom.dol", 0x4988D0, 0x8 diff --git a/asm/src/EyeCtrl.s b/asm/src/EyeCtrl.s index 97fcc2cb..4eb3ea13 100644 --- a/asm/src/EyeCtrl.s +++ b/asm/src/EyeCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster7EyeCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster7EyeCtrlFRQ43scn4step4boss4Boss: /* 8023D5B4 002393F4 90 83 00 00 */ stw r4, 0(r3) @@ -149,7 +149,7 @@ lbl_8023D794: /* 8023D79C 002395DC 38 21 00 10 */ addi r1, r1, 0x10 /* 8023D7A0 002395E0 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_WAIT_FRAME_TABLE__Q53scn4step4boss15challengemaster21$$2unnamed$$2EyeCtrl_cpp$$2 T_WAIT_FRAME_TABLE__Q53scn4step4boss15challengemaster21$$2unnamed$$2EyeCtrl_cpp$$2: .incbin "baserom.dol", 0x412898, 0x18 diff --git a/asm/src/FDGAccessor.s b/asm/src/FDGAccessor.s index 059e3b67..9169f957 100644 --- a/asm/src/FDGAccessor.s +++ b/asm/src/FDGAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23fdg11FDGAccessorFPCv __ct__Q23fdg11FDGAccessorFPCv: /* 801870EC 00182F2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -9,7 +9,7 @@ __ct__Q23fdg11FDGAccessorFPCv: /* 801870F8 00182F38 93 E1 00 0C */ stw r31, 0xc(r1) /* 801870FC 00182F3C 7C 7F 1B 78 */ mr r31, r3 /* 80187100 00182F40 90 83 00 00 */ stw r4, 0(r3) -/* 80187104 00182F44 48 00 00 69 */ bl isValidData__Q25xdata5XDataCFv +/* 80187104 00182F44 48 00 00 69 */ bl isValidData__Q25.dataXDataCFv /* 80187108 00182F48 2C 03 00 00 */ cmpwi r3, 0 /* 8018710C 00182F4C 40 82 00 14 */ bne lbl_80187120 /* 80187110 00182F50 38 00 00 00 */ li r0, 0 @@ -40,8 +40,8 @@ lbl_80187158: /* 80187164 00182FA4 38 21 00 10 */ addi r1, r1, 0x10 /* 80187168 00182FA8 4E 80 00 20 */ blr -.global isValidData__Q25xdata5XDataCFv -isValidData__Q25xdata5XDataCFv: +.global isValidData__Q25.dataXDataCFv +isValidData__Q25.dataXDataCFv: /* 8018716C 00182FAC 38 80 00 00 */ li r4, 0 /* 80187170 00182FB0 38 A0 00 00 */ li r5, 0 /* 80187174 00182FB4 38 C0 00 00 */ li r6, 0 @@ -145,7 +145,7 @@ header__Q23fdg11FDGAccessorCFv: /* 801872C4 00183104 90 01 00 14 */ stw r0, 0x14(r1) /* 801872C8 00183108 93 E1 00 0C */ stw r31, 0xc(r1) /* 801872CC 0018310C 7C 7F 1B 78 */ mr r31, r3 -/* 801872D0 00183110 4B FF FE 9D */ bl isValidData__Q25xdata5XDataCFv +/* 801872D0 00183110 4B FF FE 9D */ bl isValidData__Q25.dataXDataCFv /* 801872D4 00183114 2C 03 00 00 */ cmpwi r3, 0 /* 801872D8 00183118 41 82 00 10 */ beq lbl_801872E8 /* 801872DC 0018311C 80 7F 00 00 */ lwz r3, 0(r31) @@ -173,7 +173,7 @@ nodeAtIndex__Q23fdg11FDGAccessorCFUl: /* 80187320 00183160 7C 64 1B 78 */ mr r4, r3 /* 80187324 00183164 7F C3 F3 78 */ mr r3, r30 /* 80187328 00183168 80 84 00 0C */ lwz r4, 0xc(r4) -/* 8018732C 0018316C 48 00 00 29 */ bl labelAddressWithReference__Q25xdata5XDataCFUi +/* 8018732C 0018316C 48 00 00 29 */ bl labelAddressWithReference__Q25.dataXDataCFUi /* 80187330 00183170 1C 1F 00 0C */ mulli r0, r31, 0xc /* 80187334 00183174 7C 63 02 14 */ add r3, r3, r0 /* 80187338 00183178 38 63 00 04 */ addi r3, r3, 4 @@ -184,8 +184,8 @@ nodeAtIndex__Q23fdg11FDGAccessorCFUl: /* 8018734C 0018318C 38 21 00 10 */ addi r1, r1, 0x10 /* 80187350 00183190 4E 80 00 20 */ blr -.global labelAddressWithReference__Q25xdata5XDataCFUi -labelAddressWithReference__Q25xdata5XDataCFUi: +.global labelAddressWithReference__Q25.dataXDataCFUi +labelAddressWithReference__Q25.dataXDataCFUi: /* 80187354 00183194 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80187358 00183198 7C 08 02 A6 */ mflr r0 /* 8018735C 0018319C 90 01 00 14 */ stw r0, 0x14(r1) @@ -193,7 +193,7 @@ labelAddressWithReference__Q25xdata5XDataCFUi: /* 80187364 001831A4 93 C1 00 08 */ stw r30, 8(r1) /* 80187368 001831A8 7C 7E 1B 78 */ mr r30, r3 /* 8018736C 001831AC 7C 9F 23 78 */ mr r31, r4 -/* 80187370 001831B0 4B FF FD FD */ bl isValidData__Q25xdata5XDataCFv +/* 80187370 001831B0 4B FF FD FD */ bl isValidData__Q25.dataXDataCFv /* 80187374 001831B4 2C 03 00 00 */ cmpwi r3, 0 /* 80187378 001831B8 40 82 00 0C */ bne lbl_80187384 /* 8018737C 001831BC 38 60 00 00 */ li r3, 0 @@ -327,4 +327,4 @@ stringRef__Q23fdg11FDGAccessorCFUi: .global getRef__Q23fdg11FDGAccessorCFUi getRef__Q23fdg11FDGAccessorCFUi: -/* 80187534 00183374 4B FF FE 20 */ b labelAddressWithReference__Q25xdata5XDataCFUi +/* 80187534 00183374 4B FF FE 20 */ b labelAddressWithReference__Q25.dataXDataCFUi diff --git a/asm/src/FDGManager.s b/asm/src/FDGManager.s index 5b1f1035..07af6906 100644 --- a/asm/src/FDGManager.s +++ b/asm/src/FDGManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_isStartOf__Q24file24$$2unnamed$$2FDGManager_cpp$$2FPCcPCc t_isStartOf__Q24file24$$2unnamed$$2FDGManager_cpp$$2FPCcPCc: /* 80187544 00183384 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -375,22 +375,22 @@ reset__Q24file10FDGManagerFv: /* 80187A48 00183888 38 21 00 20 */ addi r1, r1, 0x20 /* 80187A4C 0018388C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PREFIX_EXFLAG__Q24file24$$2unnamed$$2FDGManager_cpp$$2 T_PREFIX_EXFLAG__Q24file24$$2unnamed$$2FDGManager_cpp$$2: .incbin "baserom.dol", 0x410618, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249254 $$249254: .incbin "baserom.dol", 0x44F8E0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_FILE_PATH__Q24file24$$2unnamed$$2FDGManager_cpp$$2 T_FILE_PATH__Q24file24$$2unnamed$$2FDGManager_cpp$$2: .incbin "baserom.dol", 0x4930F0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PREFIX_MSG__Q24file24$$2unnamed$$2FDGManager_cpp$$2 T_PREFIX_MSG__Q24file24$$2unnamed$$2FDGManager_cpp$$2: .incbin "baserom.dol", 0x49A190, 0x8 diff --git a/asm/src/FGFade.s b/asm/src/FGFade.s index b68774ca..b13a96e2 100644 --- a/asm/src/FGFade.s +++ b/asm/src/FGFade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global draw__Q43scn4step3sfx6FGFadeCFff draw__Q43scn4step3sfx6FGFadeCFff: /* 803CDA98 003C98D8 48 03 2E E8 */ b draw__Q23sfx4FadeCFff diff --git a/asm/src/FaceRotCtrl.s b/asm/src/FaceRotCtrl.s index 8aa2b18b..9e388fbf 100644 --- a/asm/src/FaceRotCtrl.s +++ b/asm/src/FaceRotCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setRotate__Q53scn4step4boss6whispy11FaceRotCtrlFf setRotate__Q53scn4step4boss6whispy11FaceRotCtrlFf: /* 8025C6A4 002584E4 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -104,12 +104,12 @@ lbl_8025C7A8: /* 8025C808 00258648 38 21 00 30 */ addi r1, r1, 0x30 /* 8025C80C 0025864C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_TARGET_NODE__Q53scn4step4boss6whispy25$$2unnamed$$2FaceRotCtrl_cpp$$2 T_TARGET_NODE__Q53scn4step4boss6whispy25$$2unnamed$$2FaceRotCtrl_cpp$$2: .incbin "baserom.dol", 0x4136A8, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254989 $$254989: .incbin "baserom.dol", 0x49B518, 0x4 diff --git a/asm/src/Fade.s b/asm/src/Fade.s index e77ea840..6c2b1321 100644 --- a/asm/src/Fade.s +++ b/asm/src/Fade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23sfx4FadeFv __ct__Q23sfx4FadeFv: /* 8040078C 003FC5CC 38 80 00 00 */ li r4, 0 @@ -357,7 +357,7 @@ lbl_80400C30: /* 80400C64 003FCAA4 38 21 01 90 */ addi r1, r1, 0x190 /* 80400C68 003FCAA8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251794 $$251794: .incbin "baserom.dol", 0x49EDE8, 0x4 diff --git a/asm/src/FallLandController.s b/asm/src/FallLandController.s index 02924899..63534d97 100644 --- a/asm/src/FallLandController.s +++ b/asm/src/FallLandController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick18FallLandControllerFRQ33scn4step9ComponentRCQ35mcoll6detail15MoveGridGroupIdfb __ct__Q43scn4step7gimmick18FallLandControllerFRQ33scn4step9ComponentRCQ35mcoll6detail15MoveGridGroupIdfb: /* 802F4058 002EFE98 90 83 00 00 */ stw r4, 0(r3) @@ -151,7 +151,7 @@ setInvalid__Q43scn4step7gimmick18FallLandControllerFv: /* 802F424C 002F008C 98 03 00 24 */ stb r0, 0x24(r3) /* 802F4250 002F0090 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253415 $$253415: .incbin "baserom.dol", 0x49D110, 0x8 diff --git a/asm/src/Fighter.s b/asm/src/Fighter.s index 5911e09d..14764424 100644 --- a/asm/src/Fighter.s +++ b/asm/src/Fighter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global T_PARAM__Q53scn4step4hero9modeldesc21$$2unnamed$$2Fighter_cpp$$2Fv T_PARAM__Q53scn4step4hero9modeldesc21$$2unnamed$$2Fighter_cpp$$2Fv: /* 8035C160 00357FA0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -299,7 +299,7 @@ lbl_8035C534: /* 8035C570 003583B0 38 21 00 B0 */ addi r1, r1, 0xb0 /* 8035C574 003583B4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter7FighterFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter7FighterFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 8039B4C4 00397304 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -494,7 +494,7 @@ procAnim__Q53scn4step4hero7fighter7FighterFv: /* 8039B76C 003975AC 38 21 00 10 */ addi r1, r1, 0x10 /* 8039B770 003975B0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249834 $$249834: .incbin "baserom.dol", 0x485AA8, 0x1C @@ -502,7 +502,7 @@ $$249834: $$249851: .incbin "baserom.dol", 0x485AC4, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256343 $$256343: .incbin "baserom.dol", 0x48A300, 0x20 @@ -513,7 +513,7 @@ $$256344: __vt__Q53scn4step4hero7fighter7Fighter: .incbin "baserom.dol", 0x48A348, 0x60 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249541 $$249541: .incbin "baserom.dol", 0x497188, 0x8 @@ -530,7 +530,7 @@ $$249857: $$249888: .incbin "baserom.dol", 0x4971A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249856 $$249856: .incbin "baserom.dol", 0x49DAF0, 0x8 diff --git a/asm/src/File.s b/asm/src/File.s index 1f5e509f..370ae067 100644 --- a/asm/src/File.s +++ b/asm/src/File.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect4FileFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ43scn19challengefileselect4File2No __ct__Q33scn19challengefileselect4FileFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ43scn19challengefileselect4File2No: /* 801E39D8 001DF818 94 21 FB F0 */ stwu r1, -0x410(r1) @@ -561,12 +561,12 @@ lbl_801E4194: /* 801E41A8 001DFFE8 38 21 00 10 */ addi r1, r1, 0x10 /* 801E41AC 001DFFEC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252047 $$252047: .incbin "baserom.dol", 0x4115F0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252743 $$252743: .incbin "baserom.dol", 0x45A1D8, 0x20 @@ -604,7 +604,7 @@ $$252898: __vt__Q33scn19challengefileselect4File: .incbin "baserom.dol", 0x45A278, 0x88 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252744 $$252744: .incbin "baserom.dol", 0x493E90, 0x8 diff --git a/asm/src/FileAccessor.s b/asm/src/FileAccessor.s index 435bb2f3..6dc355ab 100644 --- a/asm/src/FileAccessor.s +++ b/asm/src/FileAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24file12FileAccessorFPCcb __ct__Q24file12FileAccessorFPCcb: /* 80187A50 00183890 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/FileClearDisableScope.s b/asm/src/FileClearDisableScope.s index 06ab6912..3a90802f 100644 --- a/asm/src/FileClearDisableScope.s +++ b/asm/src/FileClearDisableScope.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24file21FileClearDisableScopeFv __ct__Q24file21FileClearDisableScopeFv: /* 80187B5C 0018399C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/FileLoader.s b/asm/src/FileLoader.s index 8d7c15ea..70b27647 100644 --- a/asm/src/FileLoader.s +++ b/asm/src/FileLoader.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24file10FileLoaderFv __ct__Q24file10FileLoaderFv: /* 80187C00 00183A40 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -440,7 +440,7 @@ lbl_801881EC: /* 801881FC 0018403C 38 21 00 F0 */ addi r1, r1, 0xf0 /* 80188200 00184040 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249818 $$249818: .incbin "baserom.dol", 0x4930F8, 0x8 diff --git a/asm/src/FileManager.s b/asm/src/FileManager.s index 04f7574b..f42c1755 100644 --- a/asm/src/FileManager.s +++ b/asm/src/FileManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24file11FileManagerFv __ct__Q24file11FileManagerFv: /* 80188204 00184044 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/FileTree.s b/asm/src/FileTree.s index 59e6514d..6dba85db 100644 --- a/asm/src/FileTree.s +++ b/asm/src/FileTree.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24file8FileTreeFRQ23mem10IAllocatorRQ23mem10IAllocatorUlUl __ct__Q24file8FileTreeFRQ23mem10IAllocatorRQ23mem10IAllocatorUlUl: /* 801882BC 001840FC 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/FixedGridManager.s b/asm/src/FixedGridManager.s index 0eb2d0c4..328bec82 100644 --- a/asm/src/FixedGridManager.s +++ b/asm/src/FixedGridManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global clear__Q23mem52ExplicitAutoDeleteArray$$0Q35mcoll6detail9LandLayer$$42$$1Fv clear__Q23mem52ExplicitAutoDeleteArray$$0Q35mcoll6detail9LandLayer$$42$$1Fv: /* 801B75C4 001B3404 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -206,7 +206,7 @@ gatherCollideTarget__Q35mcoll6detail16FixedGridManagerCFRQ35mcoll6detail18Collid /* 801B7894 001B36D4 38 21 00 70 */ addi r1, r1, 0x70 /* 801B7898 001B36D8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251044 $$251044: .incbin "baserom.dol", 0x49A598, 0x8 diff --git a/asm/src/FixedString.s b/asm/src/FixedString.s index 1a36790b..ab888e63 100644 --- a/asm/src/FixedString.s +++ b/asm/src/FixedString.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global FixedStringVPrintfFunc__Q23hel6commonFPcUlP16__va_list_structPCc FixedStringVPrintfFunc__Q23hel6commonFPcUlP16__va_list_structPCc: /* 8019D994 001997D4 7C A0 2B 78 */ mr r0, r5 diff --git a/asm/src/Flash.s b/asm/src/Flash.s index cbed7acf..6de90ccd 100644 --- a/asm/src/Flash.s +++ b/asm/src/Flash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle5FlashFRQ23g3d10CharaModel __ct__Q33scn14challengetitle5FlashFRQ23g3d10CharaModel: /* 801ED4A0 001E92E0 94 21 F8 80 */ stwu r1, -0x780(r1) @@ -315,7 +315,7 @@ flashReset__Q33scn14challengetitle5FlashFv: /* 801ED8F8 001E9738 38 21 00 20 */ addi r1, r1, 0x20 /* 801ED8FC 001E973C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle5FlashFRQ23g3d10CharaModelb __ct__Q33scn10grandtitle5FlashFRQ23g3d10CharaModelb: /* 802049AC 002007EC 94 21 F8 80 */ stwu r1, -0x780(r1) @@ -785,7 +785,7 @@ flashReset__Q33scn10grandtitle5FlashFv: /* 80205018 00200E58 38 21 00 20 */ addi r1, r1, 0x20 /* 8020501C 00200E5C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss5FlashFRQ43scn4step4boss4BossRQ23mem10IAllocator __ct__Q43scn4step4boss5FlashFRQ43scn4step4boss4BossRQ23mem10IAllocator: /* 8022F80C 0022B64C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1039,7 +1039,7 @@ custom__Q43scn4step4boss5FlashFv: /* 8022FB70 0022B9B0 38 63 00 68 */ addi r3, r3, 0x68 /* 8022FB74 0022B9B4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy5FlashFRQ43scn4step5enemy5EnemyRQ23mem10IAllocatorb __ct__Q43scn4step5enemy5FlashFRQ43scn4step5enemy5EnemyRQ23mem10IAllocatorb: /* 80288214 00284054 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1333,7 +1333,7 @@ setEnfAlways__Q43scn4step5enemy5FlashFRC8_GXColorQ23g3d16ColorAnimFlashOp: /* 80288624 00284464 38 21 00 10 */ addi r1, r1, 0x10 /* 80288628 00284468 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero5FlashFRQ43scn4step4hero4HeroRQ23mem10IAllocator __ct__Q43scn4step4hero5FlashFRQ43scn4step4hero4HeroRQ23mem10IAllocator: /* 803365A0 003323E0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1824,7 +1824,7 @@ lbl_80336C4C: /* 80336C68 00332AA8 38 21 00 20 */ addi r1, r1, 0x20 /* 80336C6C 00332AAC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon5FlashFRQ43scn4step6weapon6WeaponRQ23mem10IAllocatorb __ct__Q43scn4step6weapon5FlashFRQ43scn4step6weapon6WeaponRQ23mem10IAllocatorb: /* 803D63F4 003D2234 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1887,12 +1887,12 @@ updateUseGPU__Q43scn4step6weapon5FlashFv: /* 803D64C4 003D2304 4B DC 39 5C */ b updateUseGPU__Q24gobj9ColorAnimFv /* 803D64C8 003D2308 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global COLOR_TABLE__Q33scn14challengetitle19$$2unnamed$$2Flash_cpp$$2 COLOR_TABLE__Q33scn14challengetitle19$$2unnamed$$2Flash_cpp$$2: .incbin "baserom.dol", 0x411788, 0x240 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252135 $$252135: .incbin "baserom.dol", 0x49A920, 0x4 @@ -1909,7 +1909,7 @@ $$253769: $$252808: .incbin "baserom.dol", 0x49A938, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252172 $$252172: .incbin "baserom.dol", 0x49AAE8, 0x4 @@ -1935,12 +1935,12 @@ $$253903: $$252931: .incbin "baserom.dol", 0x49AB08, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255122 $$255122: .incbin "baserom.dol", 0x49AE68, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255211 $$255211: .incbin "baserom.dol", 0x49B9A8, 0x4 @@ -1978,7 +1978,7 @@ $$255697: $$255700: .incbin "baserom.dol", 0x49B9D8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255587 $$255587: .incbin "baserom.dol", 0x49D6E8, 0x4 diff --git a/asm/src/FloaterRotCtrl.s b/asm/src/FloaterRotCtrl.s index 568c545e..0705d683 100644 --- a/asm/src/FloaterRotCtrl.s +++ b/asm/src/FloaterRotCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero14FloaterRotCtrlFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero14FloaterRotCtrlFRQ43scn4step4hero4Hero: /* 80336C70 00332AB0 90 83 00 00 */ stw r4, 0(r3) @@ -41,7 +41,7 @@ resetRotVIntpRate__Q43scn4step4hero14FloaterRotCtrlFv: /* 80336CCC 00332B0C D0 03 00 0C */ stfs f0, 0xc(r3) /* 80336CD0 00332B10 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250072 $$250072: .incbin "baserom.dol", 0x49D6F8, 0x4 diff --git a/asm/src/FlowSoundCtrl.s b/asm/src/FlowSoundCtrl.s index 0e1c1270..2540f52a 100644 --- a/asm/src/FlowSoundCtrl.s +++ b/asm/src/FlowSoundCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero13FlowSoundCtrlFv __ct__Q43scn4step4hero13FlowSoundCtrlFv: /* 80336CD4 00332B14 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/FogAccessor.s b/asm/src/FogAccessor.s index 28b4b36b..27c7d8b5 100644 --- a/asm/src/FogAccessor.s +++ b/asm/src/FogAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d11FogAccessorFRCQ34nw4r3g3d3Fog __ct__Q23g3d11FogAccessorFRCQ34nw4r3g3d3Fog: /* 8018E44C 0018A28C 80 04 00 00 */ lwz r0, 0(r4) @@ -148,7 +148,7 @@ lbl_8018E624: /* 8018E634 0018A474 38 21 00 10 */ addi r1, r1, 0x10 /* 8018E638 0018A478 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2SetFogType__Q34nw4r3g3d3FogF10_GXFogType$$20 $$2STRING$$2SetFogType__Q34nw4r3g3d3FogF10_GXFogType$$20: .incbin "baserom.dol", 0x450550, 0x20 diff --git a/asm/src/Font.s b/asm/src/Font.s index 83a33687..19a580fb 100644 --- a/asm/src/Font.s +++ b/asm/src/Font.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24font4FontFPCcPCc __ct__Q24font4FontFPCcPCc: /* 8018917C 00184FBC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/FontKindUtil.s b/asm/src/FontKindUtil.s index 435409cb..d1fa6c33 100644 --- a/asm/src/FontKindUtil.s +++ b/asm/src/FontKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_context__Q24font26$$2unnamed$$2FontKindUtil_cpp$$2FQ24font8FontKind t_context__Q24font26$$2unnamed$$2FontKindUtil_cpp$$2FQ24font8FontKind: /* 8018933C 0018517C 54 64 18 38 */ slwi r4, r3, 3 @@ -59,12 +59,12 @@ Name__Q24font12FontKindUtilFQ24font8FontKind: /* 801893F4 00185234 38 21 00 10 */ addi r1, r1, 0x10 /* 801893F8 00185238 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_FONT_CONTEXT_TABLE__Q24font26$$2unnamed$$2FontKindUtil_cpp$$2 T_FONT_CONTEXT_TABLE__Q24font26$$2unnamed$$2FontKindUtil_cpp$$2: .incbin "baserom.dol", 0x410628, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248724 $$248724: .incbin "baserom.dol", 0x44F8F0, 0x10 @@ -96,7 +96,7 @@ $$248732: $$248861: .incbin "baserom.dol", 0x44F994, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248723 $$248723: .incbin "baserom.dol", 0x493108, 0x8 diff --git a/asm/src/FontLoader.s b/asm/src/FontLoader.s index 5a6823bb..e082eeae 100644 --- a/asm/src/FontLoader.s +++ b/asm/src/FontLoader.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24font10FontLoaderFQ24font8FontKind __ct__Q24font10FontLoaderFQ24font8FontKind: /* 801893FC 0018523C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/FontManager.s b/asm/src/FontManager.s index fd5d3b03..a4522fc3 100644 --- a/asm/src/FontManager.s +++ b/asm/src/FontManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24font11FontManagerFv __ct__Q24font11FontManagerFv: /* 801894A8 001852E8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -124,7 +124,7 @@ font__Q24font11FontManagerFQ24font8FontKind: /* 80189640 00185480 38 63 00 60 */ addi r3, r3, 0x60 /* 80189644 00185484 4B FF FF 9C */ b __vc__Q23mem39ExplicitAutoDeleteArray$$0Q24font4Font$$49$$1FUl -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249284 $$249284: .incbin "baserom.dol", 0x493110, 0x8 diff --git a/asm/src/Food.s b/asm/src/Food.s index 4a40028c..5c224977 100644 --- a/asm/src/Food.s +++ b/asm/src/Food.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4item9modeldesc4FoodFUl Create__Q53scn4step4item9modeldesc4FoodFUl: /* 803C5BE8 003C1A28 94 21 FA 90 */ stwu r1, -0x570(r1) @@ -1379,7 +1379,7 @@ lbl_803C7050: /* 803C70BC 003C2EFC 38 21 00 50 */ addi r1, r1, 0x50 /* 803C70C0 003C2F00 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252580 $$252580: .incbin "baserom.dol", 0x48E0A0, 0xC @@ -1567,7 +1567,7 @@ $$252650: $$252651: .incbin "baserom.dol", 0x48E568, 0x90 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252582 $$252582: .incbin "baserom.dol", 0x498160, 0x8 diff --git a/asm/src/FoodTableKindUtil.s b/asm/src/FoodTableKindUtil.s index d3e8a614..bb908823 100644 --- a/asm/src/FoodTableKindUtil.s +++ b/asm/src/FoodTableKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RandomFoodKind__Q43scn4step4item17FoodTableKindUtilFQ43scn4step4item13FoodTableKind RandomFoodKind__Q43scn4step4item17FoodTableKindUtilFQ43scn4step4item13FoodTableKind: /* 803C0F94 003BCDD4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -22,7 +22,7 @@ RandomFoodKind__Q43scn4step4item17FoodTableKindUtilFQ43scn4step4item13FoodTableK /* 803C0FD4 003BCE14 38 21 00 10 */ addi r1, r1, 0x10 /* 803C0FD8 003BCE18 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_TABLE_STANDARD__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2 T_TABLE_STANDARD__Q43scn4step4item31$$2unnamed$$2FoodTableKindUtil_cpp$$2: .incbin "baserom.dol", 0x41C228, 0x14 diff --git a/asm/src/FootState.s b/asm/src/FootState.s index 4bc31e90..2e240a91 100644 --- a/asm/src/FootState.s +++ b/asm/src/FootState.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isAir__Q24gobj9FootStateCFv isAir__Q24gobj9FootStateCFv: /* 80199EB8 00195CF8 88 03 00 00 */ lbz r0, 0(r3) diff --git a/asm/src/FormationUtil.s b/asm/src/FormationUtil.s index 01a188aa..63cad9cc 100644 --- a/asm/src/FormationUtil.s +++ b/asm/src/FormationUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isDefaultPosKind__Q43scn4step4hero27$$2unnamed$$2FormationUtil_cpp$$2FQ43scn4step4hero4Kind isDefaultPosKind__Q43scn4step4hero27$$2unnamed$$2FormationUtil_cpp$$2FQ43scn4step4hero4Kind: /* 80336F48 00332D88 38 03 FF FC */ addi r0, r3, -4 diff --git a/asm/src/Frame.s b/asm/src/Frame.s index a30d33d1..d9525de7 100644 --- a/asm/src/Frame.s +++ b/asm/src/Frame.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect5FrameFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn19challengefileselect5FrameFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 801E41B0 001DFFF0 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -99,7 +99,7 @@ isBackEnd__Q33scn19challengefileselect5FrameCFv: /* 801E42F4 001E0134 38 63 01 D0 */ addi r3, r3, 0x1d0 /* 801E42F8 001E0138 4B FC 41 AC */ b isPushEnd__Q34info6common10ButtonHelpCFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap5FrameFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component __ct__Q53scn4step4info5lvmap5FrameFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component: /* 803BD588 003B93C8 94 21 EC 90 */ stwu r1, -0x1370(r1) @@ -765,7 +765,7 @@ isTargetScoreEnd__Q53scn4step4info5lvmap5FrameCFv: /* 803BDF10 003B9D50 38 21 00 10 */ addi r1, r1, 0x10 /* 803BDF14 003B9D54 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251962 $$251962: .incbin "baserom.dol", 0x45A300, 0x1C @@ -779,7 +779,7 @@ $$251965: $$251966: .incbin "baserom.dol", 0x45A338, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253212 $$253212: .incbin "baserom.dol", 0x48D810, 0x18 @@ -817,7 +817,7 @@ $$253224: $$253225: .incbin "baserom.dol", 0x48D8BC, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251963 $$251963: .incbin "baserom.dol", 0x493F28, 0x8 @@ -825,7 +825,7 @@ $$251963: $$252008: .incbin "baserom.dol", 0x493F30, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253213 $$253213: .incbin "baserom.dol", 0x497FD0, 0x8 diff --git a/asm/src/FrameControl.s b/asm/src/FrameControl.s index e3d85fbd..4bb9b648 100644 --- a/asm/src/FrameControl.s +++ b/asm/src/FrameControl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global frameOutStart__Q53scn4step4info5lvmap12FrameControlFv frameOutStart__Q53scn4step4info5lvmap12FrameControlFv: /* 803BDF18 003B9D58 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/FrameCounter.s b/asm/src/FrameCounter.s index cb91f94c..8c32423e 100644 --- a/asm/src/FrameCounter.s +++ b/asm/src/FrameCounter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global reset__Q24util12FrameCounterFUl reset__Q24util12FrameCounterFUl: /* 80405980 004017C0 90 83 00 00 */ stw r4, 0(r3) @@ -97,7 +97,7 @@ inversedNormalizedFrame__Q24util12FrameCounterCFv: /* 80405A94 004018D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80405A98 004018D8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248873 $$248873: .incbin "baserom.dol", 0x49EED8, 0x8 diff --git a/asm/src/FramePanel.s b/asm/src/FramePanel.s index 3136a762..678c891a 100644 --- a/asm/src/FramePanel.s +++ b/asm/src/FramePanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause10FramePanelFRQ25pause9Component __ct__Q25pause10FramePanelFRQ25pause9Component: /* 801DB5D0 001D7410 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -525,7 +525,7 @@ lbl_801DBD2C: /* 801DBD38 001D7B78 38 21 00 10 */ addi r1, r1, 0x10 /* 801DBD3C 001D7B7C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251725 $$251725: .incbin "baserom.dol", 0x4595A8, 0xC @@ -554,7 +554,7 @@ $$252853: $$252854: .incbin "baserom.dol", 0x459618, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251724 $$251724: .incbin "baserom.dol", 0x493A80, 0x8 @@ -598,7 +598,7 @@ $$252850: $$252851: .incbin "baserom.dol", 0x493AE8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MOVE_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2 T_MOVE_NODE__Q25pause24$$2unnamed$$2FramePanel_cpp$$2: .incbin "baserom.dol", 0x49A7F8, 0x4 diff --git a/asm/src/FreeRotController.s b/asm/src/FreeRotController.s index 71d0aa2b..8735cd84 100644 --- a/asm/src/FreeRotController.s +++ b/asm/src/FreeRotController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara17FreeRotControllerFv __ct__Q43scn4step5chara17FreeRotControllerFv: /* 8026E350 0026A190 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -235,7 +235,7 @@ lbl_8026E5EC: /* 8026E6B4 0026A4F4 38 21 01 40 */ addi r1, r1, 0x140 /* 8026E6B8 0026A4F8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251588 $$251588: .incbin "baserom.dol", 0x49B7A0, 0x4 diff --git a/asm/src/FreezeHandler.s b/asm/src/FreezeHandler.s index 09119263..4a403107 100644 --- a/asm/src/FreezeHandler.s +++ b/asm/src/FreezeHandler.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26freeze13FreezeHandlerFRQ26freeze7ConsolePUcPUc __ct__Q26freeze13FreezeHandlerFRQ26freeze7ConsolePUcPUc: /* 8018A2D0 00186110 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -180,7 +180,7 @@ lbl_8018A538: /* 8018A540 00186380 7C C3 33 78 */ mr r3, r6 /* 8018A544 00186384 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2Console_SetVisible__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadb$$20 $$2STRING$$2Console_SetVisible__Q24nw4r2dbFPQ44nw4r2db6detail11ConsoleHeadb$$20: .incbin "baserom.dol", 0x44FFB8, 0x24 diff --git a/asm/src/FreezeManager.s b/asm/src/FreezeManager.s index 69546617..72913f67 100644 --- a/asm/src/FreezeManager.s +++ b/asm/src/FreezeManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HSD_SaveContext__27$$2unnamed$$2FreezeManager_cpp$$2Fv HSD_SaveContext__27$$2unnamed$$2FreezeManager_cpp$$2Fv: /* 8018A548 00186388 7C 70 43 A6 */ mtspr 0x110, r3 @@ -491,7 +491,7 @@ VReport__Q26freeze13FreezeManagerFPCcP16__va_list_struct: /* 8018AC08 00186A48 38 21 00 20 */ addi r1, r1, 0x20 /* 8018AC0C 00186A4C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249629 $$249629: .incbin "baserom.dol", 0x44FFE8, 0x18 @@ -499,7 +499,7 @@ $$249629: $$249630: .incbin "baserom.dol", 0x450000, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global doSerialReport doSerialReport: .incbin "baserom.dol", 0x493148, 0x8 diff --git a/asm/src/FreezeThread.s b/asm/src/FreezeThread.s index 381c0c77..88a5fb4e 100644 --- a/asm/src/FreezeThread.s +++ b/asm/src/FreezeThread.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global stackTrace__26$$2unnamed$$2FreezeThread_cpp$$2FRQ26freeze7ConsoleUl stackTrace__26$$2unnamed$$2FreezeThread_cpp$$2FRQ26freeze7ConsoleUl: /* 8018AC10 00186A50 94 21 FB E0 */ stwu r1, -0x420(r1) @@ -392,12 +392,12 @@ run__Q26freeze12FreezeThreadFv: /* 8018B164 00186FA4 38 63 43 20 */ addi r3, r3, 0x4320 /* 8018B168 00186FA8 48 00 03 68 */ b send__Q26freeze7MessageFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$248997 $$248997: .incbin "baserom.dol", 0x410670, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249333 $$249333: .incbin "baserom.dol", 0x450020, 0x20 @@ -423,7 +423,7 @@ $$249436: $$249437: .incbin "baserom.dol", 0x45010C, 0x2C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249335 $$249335: .incbin "baserom.dol", 0x493150, 0x4 diff --git a/asm/src/FullScreenModel.s b/asm/src/FullScreenModel.s index a012baee..6bfa7ea5 100644 --- a/asm/src/FullScreenModel.s +++ b/asm/src/FullScreenModel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23sfx15FullScreenModelFPCc __ct__Q23sfx15FullScreenModelFPCc: /* 80400C6C 003FCAAC 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -404,12 +404,12 @@ draw__Q23sfx15FullScreenModelFv: /* 804011CC 003FD00C 38 21 00 10 */ addi r1, r1, 0x10 /* 804011D0 003FD010 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252811 $$252811: .incbin "baserom.dol", 0x498A98, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252748 $$252748: .incbin "baserom.dol", 0x49EE10, 0x4 diff --git a/asm/src/FullScreenPlate.s b/asm/src/FullScreenPlate.s index 8e55b7e4..5afedc9a 100644 --- a/asm/src/FullScreenPlate.s +++ b/asm/src/FullScreenPlate.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23gfx15FullScreenPlateFRC8_GXColor __ct__Q23gfx15FullScreenPlateFRC8_GXColor: /* 80195F58 00191D98 80 04 00 00 */ lwz r0, 0(r4) @@ -69,7 +69,7 @@ draw__Q23gfx15FullScreenPlateCFv: /* 80196048 00191E88 38 21 00 60 */ addi r1, r1, 0x60 /* 8019604C 00191E8C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249012 $$249012: .incbin "baserom.dol", 0x49A250, 0x4 diff --git a/asm/src/G3DAnimData.s b/asm/src/G3DAnimData.s index 42acccbc..d079e9e3 100644 --- a/asm/src/G3DAnimData.s +++ b/asm/src/G3DAnimData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj11G3DAnimDataFPCcRCQ23g3d15ResFileAccessor __ct__Q24gobj11G3DAnimDataFPCcRCQ23g3d15ResFileAccessor: /* 80199ED4 00195D14 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/G3DAnimDataRepos.s b/asm/src/G3DAnimDataRepos.s index a80434da..ea3ca2c0 100644 --- a/asm/src/G3DAnimDataRepos.s +++ b/asm/src/G3DAnimDataRepos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj16G3DAnimDataReposFRCQ24gobj20G3DAnimDataReposDescRQ23mem10IAllocator __ct__Q24gobj16G3DAnimDataReposFRCQ24gobj20G3DAnimDataReposDescRQ23mem10IAllocator: /* 80199EE4 00195D24 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/G3DAutoReqAnimCallback.s b/asm/src/G3DAutoReqAnimCallback.s index ba5076d7..a0b179d7 100644 --- a/asm/src/G3DAutoReqAnimCallback.s +++ b/asm/src/G3DAutoReqAnimCallback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail22G3DAutoReqAnimCallbackFRQ36effect6detail13EffectManagerRCQ23g3d13ModelAccessorPQ26effect9RequestorPQ26effect5GroupSc __ct__Q36effect6detail22G3DAutoReqAnimCallbackFRQ36effect6detail13EffectManagerRCQ23g3d13ModelAccessorPQ26effect9RequestorPQ26effect5GroupSc: /* 801812B0 0017D0F0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -85,7 +85,7 @@ request__Q36effect6detail22G3DAutoReqAnimCallbackFRCQ23g3d18AutoReqAnimReqInfo: /* 801813CC 0017D20C 7C 08 07 74 */ extsb r8, r0 /* 801813D0 0017D210 4B FF F6 E8 */ b autoRequest__Q36effect6detail13EffectManagerFRCQ23g3d18AutoReqAnimReqInfoRCQ23g3d13ModelAccessorPQ26effect9RequestorPQ26effect5GroupSc -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q36effect6detail22G3DAutoReqAnimCallback __vt__Q36effect6detail22G3DAutoReqAnimCallback: .incbin "baserom.dol", 0x44F4E0, 0x10 diff --git a/asm/src/G3DLightSet.s b/asm/src/G3DLightSet.s index 08d73915..ddeb34aa 100644 --- a/asm/src/G3DLightSet.s +++ b/asm/src/G3DLightSet.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core11G3DLightSetFv __ct__Q43scn4step4core11G3DLightSetFv: /* 80275FC0 00271E00 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/G3DLightSetManager.s b/asm/src/G3DLightSetManager.s index 23ba6484..483be0e0 100644 --- a/asm/src/G3DLightSetManager.s +++ b/asm/src/G3DLightSetManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core18G3DLightSetManagerFRQ23g3d4RootUl __ct__Q43scn4step4core18G3DLightSetManagerFRQ23g3d4RootUl: /* 8027602C 00271E6C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/G3DRootSet.s b/asm/src/G3DRootSet.s index 0b490bf2..3078b49c 100644 --- a/asm/src/G3DRootSet.s +++ b/asm/src/G3DRootSet.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle10G3DRootSetFRQ33scn14challengetitle9Component __ct__Q33scn14challengetitle10G3DRootSetFRQ33scn14challengetitle9Component: /* 801ED900 001E9740 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -420,7 +420,7 @@ setViewMtx__Q33scn14challengetitle10G3DRootSetFv: /* 801EDEA0 001E9CE0 38 21 00 50 */ addi r1, r1, 0x50 /* 801EDEA4 001E9CE4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle10G3DRootSetFRQ33scn10grandtitle9Component __ct__Q33scn10grandtitle10G3DRootSetFRQ33scn10grandtitle9Component: /* 80205020 00200E60 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -756,7 +756,7 @@ lbl_8020547C: /* 80205498 002012D8 38 21 00 50 */ addi r1, r1, 0x50 /* 8020549C 002012DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history10G3DRootSetFRQ33scn7history9Component __ct__Q33scn7history10G3DRootSetFRQ33scn7history9Component: /* 80207F3C 00203D7C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -845,7 +845,7 @@ lbl_80208050: /* 8020806C 00203EAC 38 21 00 20 */ addi r1, r1, 0x20 /* 80208070 00203EB0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core10G3DRootSetFRQ33scn4step9Component __ct__Q43scn4step4core10G3DRootSetFRQ33scn4step9Component: /* 802760DC 00271F1C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1521,7 +1521,7 @@ lbl_802769F4: /* 80276A10 00272850 38 21 00 30 */ addi r1, r1, 0x30 /* 80276A14 00272854 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn9grandmenu10G3DRootSetFRQ33scn9grandmenu9Component __ct__Q33scn9grandmenu10G3DRootSetFRQ33scn9grandmenu9Component: /* 803F3638 003EF478 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1797,12 +1797,12 @@ setViewMtx__Q33scn9grandmenu10G3DRootSetFv: /* 803F39EC 003EF82C 38 21 00 50 */ addi r1, r1, 0x50 /* 803F39F0 003EF830 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252374 $$252374: .incbin "baserom.dol", 0x495850, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253282 $$253282: .incbin "baserom.dol", 0x49B8F8, 0x8 diff --git a/asm/src/GXFifoMemoryManager.s b/asm/src/GXFifoMemoryManager.s index 24d79405..86618aff 100644 --- a/asm/src/GXFifoMemoryManager.s +++ b/asm/src/GXFifoMemoryManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23gfx19GXFifoMemoryManagerFUlUl __ct__Q23gfx19GXFifoMemoryManagerFUlUl: /* 8019607C 00191EBC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/GXFifoProtectCanceler.s b/asm/src/GXFifoProtectCanceler.s index 6acde316..a696e537 100644 --- a/asm/src/GXFifoProtectCanceler.s +++ b/asm/src/GXFifoProtectCanceler.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23gfx21GXFifoProtectCancelerFRQ23gfx19GXFifoMemoryManager __ct__Q23gfx21GXFifoProtectCancelerFRQ23gfx19GXFifoMemoryManager: /* 801961FC 0019203C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/GameCheckWindow.s b/asm/src/GameCheckWindow.s index 4390a775..fcdcb290 100644 --- a/asm/src/GameCheckWindow.s +++ b/asm/src/GameCheckWindow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail15GameCheckWindowFRQ23mem10IAllocator __ct__Q43scn7history6detail15GameCheckWindowFRQ23mem10IAllocator: /* 80214CB0 00210AF0 94 21 FD 40 */ stwu r1, -0x2c0(r1) @@ -773,7 +773,7 @@ lbl_802157B4: /* 802157C4 00211604 38 21 00 40 */ addi r1, r1, 0x40 /* 802157C8 00211608 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253205 $$253205: .incbin "baserom.dol", 0x45DD70, 0x14 @@ -814,7 +814,7 @@ $$253321: $$253387: .incbin "baserom.dol", 0x45DE24, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253211 $$253211: .incbin "baserom.dol", 0x494B80, 0x8 diff --git a/asm/src/GameScreen.s b/asm/src/GameScreen.s index 58457a23..6f6653d2 100644 --- a/asm/src/GameScreen.s +++ b/asm/src/GameScreen.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23gfx10GameScreenFv __ct__Q23gfx10GameScreenFv: /* 80196050 00191E90 38 00 00 01 */ li r0, 1 diff --git a/asm/src/GatherItem.s b/asm/src/GatherItem.s index 24ca8ebb..e4636dac 100644 --- a/asm/src/GatherItem.s +++ b/asm/src/GatherItem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero10GatherItemFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero10GatherItemFRQ43scn4step4hero4Hero: /* 80337138 00332F78 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Gear.s b/asm/src/Gear.s index a4fd4c14..1ecc2a70 100644 --- a/asm/src/Gear.s +++ b/asm/src/Gear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle4GearFRQ33scn14challengetitle9ComponentRQ23g3d10CharaModelQ33scn14challengetitle11AbilityKind __ct__Q33scn14challengetitle4GearFRQ33scn14challengetitle9ComponentRQ23g3d10CharaModelQ33scn14challengetitle11AbilityKind: /* 801EDEA8 001E9CE8 94 21 FE C0 */ stwu r1, -0x140(r1) @@ -222,7 +222,7 @@ lbl_801EE1B8: /* 801EE1D4 001EA014 38 21 00 60 */ addi r1, r1, 0x60 /* 801EE1D8 001EA018 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q24util31PlacementNew$$0Q24gobj9GearModel$$1Fv __dt__Q24util31PlacementNew$$0Q24gobj9GearModel$$1Fv: /* 8022FB78 0022B9B8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -518,7 +518,7 @@ anim__Q43scn4step4boss4GearFv: /* 8022FF28 0022BD68 80 63 01 A0 */ lwz r3, 0x1a0(r3) /* 8022FF2C 0022BD6C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero4GearFRQ43scn4step4hero4Heroi __ct__Q43scn4step4hero4GearFRQ43scn4step4hero4Heroi: /* 80337428 00333268 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1855,12 +1855,12 @@ allocator__Q43scn4step4hero4GearFv: /* 803385F0 00334430 38 21 00 10 */ addi r1, r1, 0x10 /* 803385F4 00334434 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252434 $$252434: .incbin "baserom.dol", 0x45AD48, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252432 $$252432: .incbin "baserom.dol", 0x494110, 0x8 @@ -1868,7 +1868,7 @@ $$252432: $$252433: .incbin "baserom.dol", 0x494118, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252435 $$252435: .incbin "baserom.dol", 0x49A940, 0x8 diff --git a/asm/src/GearAnim.s b/asm/src/GearAnim.s index 54bdcf72..b6759c0f 100644 --- a/asm/src/GearAnim.s +++ b/asm/src/GearAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj8GearAnimFRCQ24gobj12GearAnimDescRQ23mem10IAllocatorRQ24gobj9GearModelRCQ23g3d15ResFileAccessorRQ26effect9Requestor __ct__Q24gobj8GearAnimFRCQ24gobj12GearAnimDescRQ23mem10IAllocatorRQ24gobj9GearModelRCQ23g3d15ResFileAccessorRQ26effect9Requestor: /* 8019A224 00196064 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/GearManager.s b/asm/src/GearManager.s index 1162f077..4a602a59 100644 --- a/asm/src/GearManager.s +++ b/asm/src/GearManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss11GearManagerFRQ43scn4step4boss4BossRQ23mem10IAllocator __ct__Q43scn4step4boss11GearManagerFRQ43scn4step4boss4BossRQ23mem10IAllocator: /* 8022FF30 0022BD70 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/GearModel.s b/asm/src/GearModel.s index 084cf921..178aeaf2 100644 --- a/asm/src/GearModel.s +++ b/asm/src/GearModel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj9GearModelFRCQ24gobj13GearModelDescRQ23mem10IAllocatorRCQ23g3d15ResFileAccessorRQ24gobj5Model __ct__Q24gobj9GearModelFRCQ24gobj13GearModelDescRQ23mem10IAllocatorRCQ23g3d15ResFileAccessorRQ24gobj5Model: /* 8019A5F4 00196434 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -196,7 +196,7 @@ lbl_8019A88C: /* 8019A898 001966D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8019A89C 001966DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24gobj9GearModel __vt__Q24gobj9GearModel: .incbin "baserom.dol", 0x451120, 0x10 diff --git a/asm/src/GearModelDesc.s b/asm/src/GearModelDesc.s index aad96154..7a989532 100644 --- a/asm/src/GearModelDesc.s +++ b/asm/src/GearModelDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj13GearModelDescFv __ct__Q24gobj13GearModelDescFv: /* 8019A8A0 001966E0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -51,7 +51,7 @@ lbl_8019A8F4: /* 8019A94C 0019678C 38 21 00 20 */ addi r1, r1, 0x20 /* 8019A950 00196790 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248848 $$248848: .incbin "baserom.dol", 0x4931E8, 0x8 diff --git a/asm/src/GearNodeRandomChanger.s b/asm/src/GearNodeRandomChanger.s index 6f69926f..fbec9ce4 100644 --- a/asm/src/GearNodeRandomChanger.s +++ b/asm/src/GearNodeRandomChanger.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone21GearNodeRandomChangerFRQ43scn4step4hero4Gear __ct__Q53scn4step4hero5stone21GearNodeRandomChangerFRQ43scn4step4hero4Gear: /* 8038F978 0038B7B8 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/GenContext.s b/asm/src/GenContext.s index 4673c2a5..238160ed 100644 --- a/asm/src/GenContext.s +++ b/asm/src/GenContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreatePtcl__Q36effect6detail10GenContextFUlPCcQ36effect6detail14ConstraintType CreatePtcl__Q36effect6detail10GenContextFUlPCcQ36effect6detail14ConstraintType: /* 801813D4 0017D214 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -253,7 +253,7 @@ polyModelPrefixRef__Q36effect6detail10GenContextCFv: /* 80181704 0017D544 38 63 00 06 */ addi r3, r3, 6 /* 80181708 0017D548 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249006 $$249006: .incbin "baserom.dol", 0x4930B8, 0x8 diff --git a/asm/src/GenContextTable.s b/asm/src/GenContextTable.s index c5f3a167..dbf07382 100644 --- a/asm/src/GenContextTable.s +++ b/asm/src/GenContextTable.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail15GenContextTableFRQ23mem10IAllocatorUl __ct__Q36effect6detail15GenContextTableFRQ23mem10IAllocatorUl: /* 8018170C 0017D54C 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -341,7 +341,7 @@ lbl_80181B84: /* 80181B98 0017D9D8 38 21 00 10 */ addi r1, r1, 0x10 /* 80181B9C 0017D9DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249762 $$249762: .incbin "baserom.dol", 0x44F4F0, 0x18 diff --git a/asm/src/GeneralDrawer.s b/asm/src/GeneralDrawer.s index 145636ef..117c0c7a 100644 --- a/asm/src/GeneralDrawer.s +++ b/asm/src/GeneralDrawer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5debug13GeneralDrawerFRQ33scn4step9Component __ct__Q43scn4step5debug13GeneralDrawerFRQ33scn4step9Component: /* 8027A5D0 00276410 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -286,7 +286,7 @@ lbl_8027A994: /* 8027A9A4 002767E4 38 21 00 40 */ addi r1, r1, 0x40 /* 8027A9A8 002767E8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global DEFAULT_COLOR__Q43scn4step5debug27$$2unnamed$$2GeneralDrawer_cpp$$2 DEFAULT_COLOR__Q43scn4step5debug27$$2unnamed$$2GeneralDrawer_cpp$$2: .incbin "baserom.dol", 0x49B920, 0x4 diff --git a/asm/src/GenerateFromObj.s b/asm/src/GenerateFromObj.s index a2352a07..44203be3 100644 --- a/asm/src/GenerateFromObj.s +++ b/asm/src/GenerateFromObj.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global requestFromEnemy__Q43scn4step4item15GenerateFromObjFRCQ33hel4math7Vector2 requestFromEnemy__Q43scn4step4item15GenerateFromObjFRCQ33hel4math7Vector2: /* 803C0FDC 003BCE1C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -306,7 +306,7 @@ lbl_803C13EC: /* 803C13FC 003BD23C 38 21 00 60 */ addi r1, r1, 0x60 /* 803C1400 003BD240 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ODDS_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDS_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: .incbin "baserom.dol", 0x41C308, 0x44 @@ -317,7 +317,7 @@ T_ODDS_ENEMY_2__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: T_ODDS_ENEMY_3__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: .incbin "baserom.dol", 0x41C380, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ODDSTABLE_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2 T_ODDSTABLE_ENEMY_1__Q43scn4step4item29$$2unnamed$$2GenerateFromObj_cpp$$2: .incbin "baserom.dol", 0x49E4F8, 0x8 diff --git a/asm/src/GenerateUtil.s b/asm/src/GenerateUtil.s index ec5e000a..04671d7d 100644 --- a/asm/src/GenerateUtil.s +++ b/asm/src/GenerateUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global otherObjRequest__Q53scn4step5enemy8generate12GenerateUtilFRQ43scn4step5enemy5Enemy otherObjRequest__Q53scn4step5enemy8generate12GenerateUtilFRQ43scn4step5enemy5Enemy: /* 8028862C 0028446C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Generator.s b/asm/src/Generator.s index 1266006e..4ec38fc9 100644 --- a/asm/src/Generator.s +++ b/asm/src/Generator.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4ogen9GeneratorFRQ33scn4step9ComponentUlUlUlUlUlUlUlbbRCQ33hel4math7Vector2RCQ33hel4math7Vector2RCQ35mcoll6detail15MoveGridGroupId __ct__Q43scn4step4ogen9GeneratorFRQ33scn4step9ComponentUlUlUlUlUlUlUlbbRCQ33hel4math7Vector2RCQ33hel4math7Vector2RCQ35mcoll6detail15MoveGridGroupId: /* 803CAF38 003C6D78 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1125,7 +1125,7 @@ isInRoomGuarder__Q43scn4step4ogen9GeneratorCFRCQ33hel4math7Vector2: /* 803CBEE8 003C7D28 38 21 00 10 */ addi r1, r1, 0x10 /* 803CBEEC 003C7D2C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global HALF_HEIGHT__Q43scn4step4ogen9Generator HALF_HEIGHT__Q43scn4step4ogen9Generator: .incbin "baserom.dol", 0x49E670, 0x4 diff --git a/asm/src/GetInfo.s b/asm/src/GetInfo.s index c67bfcb9..69a48856 100644 --- a/asm/src/GetInfo.s +++ b/asm/src/GetInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item7GetInfoFv __ct__Q43scn4step4item7GetInfoFv: /* 803C1404 003BD244 38 00 00 0F */ li r0, 0xf diff --git a/asm/src/Ghost.s b/asm/src/Ghost.s index 7399c634..0aacb1e5 100644 --- a/asm/src/Ghost.s +++ b/asm/src/Ghost.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5ghost5GhostFRQ33scn4step9Component __ct__Q53scn4step7gimmick5ghost5GhostFRQ33scn4step9Component: /* 8030F2D0 0030B110 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -610,15 +610,15 @@ __sinit_$$3Ghost_cpp: /* 8030FB94 0030B9D4 C0 62 C9 3C */ lfs f3, $$254588-_SDA2_BASE_(r2) /* 8030FB98 0030B9D8 4B DA E5 28 */ b __ct__Q34nw4r4math4VEC3Ffff -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025AC, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254434 $$254434: .incbin "baserom.dol", 0x47D3F8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254435 $$254435: .incbin "baserom.dol", 0x496AC0, 0x8 @@ -635,7 +635,7 @@ $$254506: $$254507: .incbin "baserom.dol", 0x496AE0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254436 $$254436: .incbin "baserom.dol", 0x49D3D0, 0x4 diff --git a/asm/src/GhostData.s b/asm/src/GhostData.s index b989b2b8..2ec2a239 100644 --- a/asm/src/GhostData.s +++ b/asm/src/GhostData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global init__Q27storage9GhostDataFv init__Q27storage9GhostDataFv: /* 804047E4 00400624 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/GhostFileData.s b/asm/src/GhostFileData.s index fc50d7f5..249ff145 100644 --- a/asm/src/GhostFileData.s +++ b/asm/src/GhostFileData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global init__Q27storage13GhostFileDataFv init__Q27storage13GhostFileDataFv: /* 80404824 00400664 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/GhostIcon.s b/asm/src/GhostIcon.s index 4237b486..5b3a30e8 100644 --- a/asm/src/GhostIcon.s +++ b/asm/src/GhostIcon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge9GhostIconFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge9GhostIconFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B2578 003AE3B8 94 21 FD E0 */ stwu r1, -0x220(r1) @@ -1058,7 +1058,7 @@ lbl_803B3484: /* 803B3490 003AF2D0 38 21 00 30 */ addi r1, r1, 0x30 /* 803B3494 003AF2D4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257163 $$257163: .incbin "baserom.dol", 0x48C520, 0x14 @@ -1093,7 +1093,7 @@ $$257173: $$257174: .incbin "baserom.dol", 0x48C5C0, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257169 $$257169: .incbin "baserom.dol", 0x497B80, 0x8 @@ -1107,7 +1107,7 @@ $$257333: $$257340: .incbin "baserom.dol", 0x497B94, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257175 $$257175: .incbin "baserom.dol", 0x49E460, 0x4 diff --git a/asm/src/Gimmick.s b/asm/src/Gimmick.s index e579f4c5..4d964da0 100644 --- a/asm/src/Gimmick.s +++ b/asm/src/Gimmick.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll7GimmickFRQ25ocoll7Manager __ct__Q25ocoll7GimmickFRQ25ocoll7Manager: /* 801D5C28 001D1A68 90 83 00 00 */ stw r4, 0(r3) @@ -264,7 +264,7 @@ mfIsBreakGold__Q25ocoll7GimmickCFRCQ25ocoll10AttackData: /* 801D5FB0 001D1DF0 7C 60 19 10 */ subfe r3, r0, r3 /* 801D5FB4 001D1DF4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BLOCK_CENTER_OFFS__21$$2unnamed$$2Gimmick_cpp$$2 T_BLOCK_CENTER_OFFS__21$$2unnamed$$2Gimmick_cpp$$2: .incbin "baserom.dol", 0x410F88, 0x1E0 diff --git a/asm/src/GimmickDataAccessor.s b/asm/src/GimmickDataAccessor.s index 6ce24aa9..67970b47 100644 --- a/asm/src/GimmickDataAccessor.s +++ b/asm/src/GimmickDataAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global airFlowEntryCount__Q43scn4step3map19GimmickDataAccessorCFv airFlowEntryCount__Q43scn4step3map19GimmickDataAccessorCFv: /* 803C9D48 003C5B88 38 80 00 2A */ li r4, 0x2a diff --git a/asm/src/GlobalNewDeleteChanger.s b/asm/src/GlobalNewDeleteChanger.s index 1d55b48a..556d048d 100644 --- a/asm/src/GlobalNewDeleteChanger.s +++ b/asm/src/GlobalNewDeleteChanger.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem22GlobalNewDeleteChangerFRQ23mem10IAllocator __ct__Q23mem22GlobalNewDeleteChangerFRQ23mem10IAllocator: /* 801BD370 001B91B0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Goal.s b/asm/src/Goal.s index f1a0e37d..2f123fe6 100644 --- a/asm/src/Goal.s +++ b/asm/src/Goal.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge4GoalFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge4GoalFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B3498 003AF2D8 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -155,12 +155,12 @@ lbl_803B36B4: /* 803B36C0 003AF500 38 21 00 30 */ addi r1, r1, 0x30 /* 803B36C4 003AF504 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253424 $$253424: .incbin "baserom.dol", 0x48C600, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253425 $$253425: .incbin "baserom.dol", 0x497B98, 0x8 diff --git a/asm/src/GoalFlag.s b/asm/src/GoalFlag.s index 4165098c..a18a6a7b 100644 --- a/asm/src/GoalFlag.s +++ b/asm/src/GoalFlag.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8goalflag8GoalFlagFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick8goalflag8GoalFlagFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8030FD90 0030BBD0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -110,12 +110,12 @@ lbl_8030FEF4: /* 8030FF04 0030BD44 38 21 00 10 */ addi r1, r1, 0x10 /* 8030FF08 0030BD48 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252652 $$252652: .incbin "baserom.dol", 0x47D410, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252653 $$252653: .incbin "baserom.dol", 0x496AE8, 0x8 @@ -123,7 +123,7 @@ $$252653: $$252655: .incbin "baserom.dol", 0x496AF0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252654 $$252654: .incbin "baserom.dol", 0x49D400, 0x4 diff --git a/asm/src/GridPos.s b/asm/src/GridPos.s index f6855c29..88322e07 100644 --- a/asm/src/GridPos.s +++ b/asm/src/GridPos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn4step7GridPosFRCQ33hel4math7Vector2 __ct__Q33scn4step7GridPosFRCQ33hel4math7Vector2: /* 802214BC 0021D2FC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -121,7 +121,7 @@ lbl_80221660: /* 80221660 0021D4A0 7C 83 23 78 */ mr r3, r4 /* 80221664 0021D4A4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249743 $$249743: .incbin "baserom.dol", 0x49AD40, 0x8 diff --git a/asm/src/GroundChecker.s b/asm/src/GroundChecker.s index 3832da1d..2ee0d2f2 100644 --- a/asm/src/GroundChecker.s +++ b/asm/src/GroundChecker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara13GroundCheckerFRQ33scn4step9ComponentRCQ23g3d12NodeAccessorRQ24gobj8LocationRQ24gobj9FootStateRCQ33hel4math7Vector3 __ct__Q43scn4step5chara13GroundCheckerFRQ33scn4step9ComponentRCQ23g3d12NodeAccessorRQ24gobj8LocationRQ24gobj9FootStateRCQ33hel4math7Vector3: /* 8026E6BC 0026A4FC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -284,7 +284,7 @@ getFloorPosVector3__Q43scn4step5chara13GroundCheckerCFv: /* 8026EAD8 0026A918 38 21 00 30 */ addi r1, r1, 0x30 /* 8026EADC 0026A91C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253931 $$253931: .incbin "baserom.dol", 0x49B7B8, 0x4 diff --git a/asm/src/Group.s b/asm/src/Group.s index c9f723e9..a29b6214 100644 --- a/asm/src/Group.s +++ b/asm/src/Group.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26effect5GroupFRQ26effect7Manager __ct__Q26effect5GroupFRQ26effect7Manager: /* 8017DE08 00179C48 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -555,7 +555,7 @@ lbl_8017E518: /* 8017E534 0017A374 38 21 00 20 */ addi r1, r1, 0x20 /* 8017E538 0017A378 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Empty__Q34nw4r3g3d8ScnGroupCFv Empty__Q34nw4r3g3d8ScnGroupCFv: /* 8018E63C 0018A47C 80 03 00 E4 */ lwz r0, 0xe4(r3) @@ -563,7 +563,7 @@ Empty__Q34nw4r3g3d8ScnGroupCFv: /* 8018E644 0018A484 54 03 D9 7E */ srwi r3, r0, 5 /* 8018E648 0018A488 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$40$$1FPQ24util52ObjListNode$$0Q36effect6detail6Effect$$4Q26effect5Group$$1$$20: .incbin "baserom.dol", 0x44F2A0, 0x24 diff --git a/asm/src/Guard.s b/asm/src/Guard.s index 48674a7c..214d9e9f 100644 --- a/asm/src/Guard.s +++ b/asm/src/Guard.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global calcDamage__Q43scn4step4boss5GuardFUlf calcDamage__Q43scn4step4boss5GuardFUlf: /* 802303C8 0022C208 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -68,7 +68,7 @@ lbl_80230494: /* 802304B0 0022C2F0 38 21 00 40 */ addi r1, r1, 0x40 /* 802304B4 0022C2F4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero5GuardFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero5GuardFRQ43scn4step4hero4Hero: /* 803385F8 00334438 90 83 00 00 */ stw r4, 0(r3) @@ -130,17 +130,17 @@ lbl_80338690: /* 803386AC 003344EC 38 21 00 10 */ addi r1, r1, 0x10 /* 803386B0 003344F0 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DAMAGE_PASS_RATE_TABLE__Q43scn4step4boss19$$2unnamed$$2Guard_cpp$$2 T_DAMAGE_PASS_RATE_TABLE__Q43scn4step4boss19$$2unnamed$$2Guard_cpp$$2: .incbin "baserom.dol", 0x4124D0, 0x20 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE__19$$2unnamed$$2Guard_cpp$$2 T_ALPHA_TABLE__19$$2unnamed$$2Guard_cpp$$2: .incbin "baserom.dol", 0x415E00, 0x50 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249320 $$249320: .incbin "baserom.dol", 0x49AE70, 0x4 diff --git a/asm/src/GuardFlash.s b/asm/src/GuardFlash.s index 0cea1fc9..cbbf7f97 100644 --- a/asm/src/GuardFlash.s +++ b/asm/src/GuardFlash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss10GuardFlashFv __ct__Q43scn4step4boss10GuardFlashFv: /* 802304B8 0022C2F8 80 02 A3 C4 */ lwz r0, $$249319-_SDA2_BASE_(r2) @@ -29,7 +29,7 @@ lbl_802304F8: /* 80230504 0022C344 98 03 00 03 */ stb r0, 3(r3) /* 80230508 0022C348 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ALPHA_TABLE__Q43scn4step4boss24$$2unnamed$$2GuardFlash_cpp$$2 T_ALPHA_TABLE__Q43scn4step4boss24$$2unnamed$$2GuardFlash_cpp$$2: .incbin "baserom.dol", 0x49AE80, 0x4 diff --git a/asm/src/GuideBoard.s b/asm/src/GuideBoard.s index d2458644..fe3a0791 100644 --- a/asm/src/GuideBoard.s +++ b/asm/src/GuideBoard.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard10GuideBoardFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick10guideboard10GuideBoardFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80311D88 0030DBC8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -990,7 +990,7 @@ lbl_80312B48: /* 80312B50 0030E990 38 21 00 10 */ addi r1, r1, 0x10 /* 80312B54 0030E994 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255157 $$255157: .incbin "baserom.dol", 0x47D688, 0x18 @@ -998,12 +998,12 @@ $$255157: $$255422: .incbin "baserom.dol", 0x47D6A0, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255290 $$255290: .incbin "baserom.dol", 0x496B80, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255276 $$255276: .incbin "baserom.dol", 0x49D430, 0x4 diff --git a/asm/src/HEL__Math__Vector2.s b/asm/src/HEL__Math__Vector2.s index fb767bb8..66fbb23c 100644 --- a/asm/src/HEL__Math__Vector2.s +++ b/asm/src/HEL__Math__Vector2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue18HEL__Math__Vector2FRQ26mintvm6VMCore AddOn__Q28mintglue18HEL__Math__Vector2FRQ26mintvm6VMCore: /* 801C1868 001BD6A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -773,7 +773,7 @@ lbl_801C231C: /* 801C2338 001BE178 38 21 00 20 */ addi r1, r1, 0x20 /* 801C233C 001BE17C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254029 $$254029: .incbin "baserom.dol", 0x4562C0, 0x14 @@ -865,7 +865,7 @@ $$254244: $$254265: .incbin "baserom.dol", 0x456588, 0x88 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254030 $$254030: .incbin "baserom.dol", 0x4936C0, 0x4 diff --git a/asm/src/HEL__Math__Vector3.s b/asm/src/HEL__Math__Vector3.s index 239c069e..1f1ad5d4 100644 --- a/asm/src/HEL__Math__Vector3.s +++ b/asm/src/HEL__Math__Vector3.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue18HEL__Math__Vector3FRQ26mintvm6VMCore AddOn__Q28mintglue18HEL__Math__Vector3FRQ26mintvm6VMCore: /* 801C2340 001BE180 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1260,7 +1260,7 @@ lbl_801C3434: /* 801C345C 001BF29C 38 21 00 30 */ addi r1, r1, 0x30 /* 801C3460 001BF2A0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254520 $$254520: .incbin "baserom.dol", 0x456610, 0x14 @@ -1424,7 +1424,7 @@ $$254880: $$254904: .incbin "baserom.dol", 0x456B00, 0x88 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254521 $$254521: .incbin "baserom.dol", 0x4936C8, 0x4 diff --git a/asm/src/HID.s b/asm/src/HID.s index 8dc9a116..e079bd2e 100644 --- a/asm/src/HID.s +++ b/asm/src/HID.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause3HIDFv __ct__Q25pause3HIDFv: /* 801DBD40 001D7B80 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/HIDAccessor.s b/asm/src/HIDAccessor.s index 25bc6bc3..2c0b177f 100644 --- a/asm/src/HIDAccessor.s +++ b/asm/src/HIDAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_dstBit__25$$2unnamed$$2HIDAccessor_cpp$$2FRCQ225$$2unnamed$$2HIDAccessor_cpp$$214ButtonConvData t_dstBit__25$$2unnamed$$2HIDAccessor_cpp$$2FRCQ225$$2unnamed$$2HIDAccessor_cpp$$214ButtonConvData: /* 801A22EC 0019E12C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -462,7 +462,7 @@ checkInputSubStick__Q23hid11HIDAccessorCFRCQ33hel4math7Vector2f: /* 801A2930 0019E770 54 63 17 FE */ rlwinm r3, r3, 2, 0x1f, 0x1f /* 801A2934 0019E774 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BUTTON_CONVDATA_CL__25$$2unnamed$$2HIDAccessor_cpp$$2 T_BUTTON_CONVDATA_CL__25$$2unnamed$$2HIDAccessor_cpp$$2: .incbin "baserom.dol", 0x410A70, 0xF0 @@ -473,7 +473,7 @@ T_BUTTON_CONVDATA_GC__25$$2unnamed$$2HIDAccessor_cpp$$2: T_STICK_CONVDATA__25$$2unnamed$$2HIDAccessor_cpp$$2: .incbin "baserom.dol", 0x410C20, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250596 $$250596: .incbin "baserom.dol", 0x49A450, 0x4 diff --git a/asm/src/HIDErrorMenu.s b/asm/src/HIDErrorMenu.s index 13fc810f..a278807c 100644 --- a/asm/src/HIDErrorMenu.s +++ b/asm/src/HIDErrorMenu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23app12HIDErrorMenuFv __ct__Q23app12HIDErrorMenuFv: /* 8017793C 0017377C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1934,7 +1934,7 @@ lbl_801793A0: /* 801793A4 001751E4 38 80 00 01 */ li r4, 1 /* 801793A8 001751E8 48 02 8E AC */ b isTrigger__Q23hid6ButtonCFUl -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252181 $$252181: .incbin "baserom.dol", 0x44EE18, 0x10 @@ -2014,7 +2014,7 @@ $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q2 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1: .incbin "baserom.dol", 0x44EFD0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254615 $$254615: .incbin "baserom.dol", 0x492F60, 0x8 diff --git a/asm/src/HIDManager.s b/asm/src/HIDManager.s index ea0ada41..9f33fdb9 100644 --- a/asm/src/HIDManager.s +++ b/asm/src/HIDManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_createWRUpdateData__24$$2unnamed$$2HIDManager_cpp$$2FlRC10KPADStatusRCQ23hid12WRUpdateData t_createWRUpdateData__24$$2unnamed$$2HIDManager_cpp$$2FlRC10KPADStatusRCQ23hid12WRUpdateData: /* 801A2938 0019E778 94 21 FE 90 */ stwu r1, -0x170(r1) @@ -1106,7 +1106,7 @@ __sinit_$$3HIDManager_cpp: /* 801A3834 0019F674 38 21 00 10 */ addi r1, r1, 0x10 /* 801A3838 0019F678 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402428, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/Hammer.s b/asm/src/Hammer.s index 30bf62c4..a93c5931 100644 --- a/asm/src/Hammer.s +++ b/asm/src/Hammer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HammerPath__Q53scn4step4hero9modeldesc6HammerFv HammerPath__Q53scn4step4hero9modeldesc6HammerFv: /* 8035C578 003583B8 3C 60 80 49 */ lis r3, $$248814@ha @@ -58,12 +58,12 @@ HammerAnim__Q53scn4step4hero9modeldesc6HammerFv: /* 8035C62C 0035846C 90 03 00 08 */ stw r0, 8(r3) /* 8035C630 00358470 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2HammerAnim__Q53scn4step4hero9modeldesc6HammerFv$$2entries$$21 $$2LOCAL$$2HammerAnim__Q53scn4step4hero9modeldesc6HammerFv$$2entries$$21: .incbin "baserom.dol", 0x419D50, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248814 $$248814: .incbin "baserom.dol", 0x485AE8, 0x24 @@ -119,7 +119,7 @@ $$248758: $$248759: .incbin "baserom.dol", 0x485C30, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248735 $$248735: .incbin "baserom.dol", 0x4971B0, 0x8 diff --git a/asm/src/Hang.s b/asm/src/Hang.s index b3dc7dac..04107263 100644 --- a/asm/src/Hang.s +++ b/asm/src/Hang.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero4HangFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero4HangFRQ43scn4step4hero4Hero: /* 803386B4 003344F4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -472,7 +472,7 @@ param__Q43scn4step4hero4HangCFv: /* 80338CF4 00334B34 38 21 00 10 */ addi r1, r1, 0x10 /* 80338CF8 00334B38 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256705 $$256705: .incbin "baserom.dol", 0x49D708, 0x4 diff --git a/asm/src/Hat.s b/asm/src/Hat.s index 700351c9..46249211 100644 --- a/asm/src/Hat.s +++ b/asm/src/Hat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle3HatFRQ33scn14challengetitle9ComponentRQ23g3d10CharaModelQ33scn14challengetitle11AbilityKind __ct__Q33scn14challengetitle3HatFRQ33scn14challengetitle9ComponentRQ23g3d10CharaModelQ33scn14challengetitle11AbilityKind: /* 801EE1DC 001EA01C 94 21 FE 30 */ stwu r1, -0x1d0(r1) @@ -357,7 +357,7 @@ procReadyToRender__Q33scn14challengetitle3HatFv: /* 801EE6F0 001EA530 4B F8 DA 88 */ b update__Q28dynamics8DynamicsFv /* 801EE6F4 001EA534 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setNormal__Q43scn4step4hero3HatFv setNormal__Q43scn4step4hero3HatFv: /* 80338CFC 00334B3C 38 80 00 00 */ li r4, 0 @@ -403,7 +403,7 @@ lbl_80338D70: /* 80338D80 00334BC0 38 21 00 10 */ addi r1, r1, 0x10 /* 80338D84 00334BC4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253823 $$253823: .incbin "baserom.dol", 0x45AD58, 0xC @@ -411,7 +411,7 @@ $$253823: $$253825: .incbin "baserom.dol", 0x45AD64, 0x14 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253819 $$253819: .incbin "baserom.dol", 0x494120, 0x4 diff --git a/asm/src/HateCtrl.s b/asm/src/HateCtrl.s index 55923e8a..397a5e53 100644 --- a/asm/src/HateCtrl.s +++ b/asm/src/HateCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss8HateCtrlFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss8HateCtrlFRQ43scn4step4boss4Boss: /* 8023050C 0022C34C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -412,7 +412,7 @@ lbl_80230A5C: /* 80230A8C 0022C8CC 38 21 00 30 */ addi r1, r1, 0x30 /* 80230A90 0022C8D0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4hero4Hero$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x460688, 0x24 diff --git a/asm/src/Heap.s b/asm/src/Heap.s index 1d4313a2..a2f199cb 100644 --- a/asm/src/Heap.s +++ b/asm/src/Heap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_MemoryAlloc__Q24mint18$$2unnamed$$2Heap_cpp$$2FUl t_MemoryAlloc__Q24mint18$$2unnamed$$2Heap_cpp$$2FUl: /* 801BFCEC 001BBB2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -679,7 +679,7 @@ __opPQ23std39__tree_node_base$$0Q23std13allocator$$0Pv$$1$$1__Q23std68__pointer_ /* 801C05F4 001BC434 54 03 00 3C */ rlwinm r3, r0, 0, 0, 0x1e /* 801C05F8 001BC438 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero4HeapFRQ23mem16HeapExpArrayUserUl __ct__Q43scn4step4hero4HeapFRQ23mem16HeapExpArrayUserUl: /* 80338D88 00334BC8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -786,17 +786,17 @@ lbl_80338ED4: /* 80338EDC 00334D1C 38 21 00 10 */ addi r1, r1, 0x10 /* 80338EE0 00334D20 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252930 $$252930: .incbin "baserom.dol", 0x455EB0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250138 $$250138: .incbin "baserom.dol", 0x47FFA0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252931 $$252931: .incbin "baserom.dol", 0x4936A8, 0x8 diff --git a/asm/src/HeapCompaction.s b/asm/src/HeapCompaction.s index 04024748..eb52a9a1 100644 --- a/asm/src/HeapCompaction.s +++ b/asm/src/HeapCompaction.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tLinkNext__Q23mem28$$2unnamed$$2HeapCompaction_cpp$$2FPQ23mem18HeapCompactionNodePQ23mem18HeapCompactionNode tLinkNext__Q23mem28$$2unnamed$$2HeapCompaction_cpp$$2FPQ23mem18HeapCompactionNodePQ23mem18HeapCompactionNode: /* 801BD404 001B9244 80 A3 00 0C */ lwz r5, 0xc(r3) @@ -1069,7 +1069,7 @@ $$24$$2__dt__Q23mem14HeapCompactionFv: /* 801BE1F0 001BA030 38 63 FF FC */ addi r3, r3, -4 /* 801BE1F4 001BA034 4B FF F5 2C */ b __dt__Q23mem14HeapCompactionFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mem14HeapCompaction __vt__Q23mem14HeapCompaction: .incbin "baserom.dol", 0x455DB0, 0x4C @@ -1077,7 +1077,7 @@ __vt__Q23mem14HeapCompaction: __vt__Q33mem14HeapCompaction22AllocFromTailAllocator: .incbin "baserom.dol", 0x455DFC, 0x14 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249358 $$249358: .incbin "baserom.dol", 0x493648, 0x8 diff --git a/asm/src/HeapCompactionNode.s b/asm/src/HeapCompactionNode.s index 74318bf2..d0dc22de 100644 --- a/asm/src/HeapCompactionNode.s +++ b/asm/src/HeapCompactionNode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global block__Q23mem18HeapCompactionNodeCFv block__Q23mem18HeapCompactionNodeCFv: /* 801BE1F8 001BA038 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/HeapCompactionNodeHandle.s b/asm/src/HeapCompactionNodeHandle.s index 03c4a601..32669284 100644 --- a/asm/src/HeapCompactionNodeHandle.s +++ b/asm/src/HeapCompactionNodeHandle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global block__Q23mem24HeapCompactionNodeHandleCFv block__Q23mem24HeapCompactionNodeHandleCFv: /* 801BE2A8 001BA0E8 80 63 00 00 */ lwz r3, 0(r3) diff --git a/asm/src/HeapExp.s b/asm/src/HeapExp.s index bd3fd81a..0d3d3d4a 100644 --- a/asm/src/HeapExp.s +++ b/asm/src/HeapExp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem7HeapExpFRCQ33hel6common15FixedString$$032$$1RCQ23mem8MemBlockbb __ct__Q23mem7HeapExpFRCQ33hel6common15FixedString$$032$$1RCQ23mem8MemBlockbb: /* 801BE2B0 001BA0F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -293,7 +293,7 @@ allocatorFree__Q33mem7HeapExp22AllocFromTailAllocatorFPv: /* 801BE638 001BA478 80 63 00 04 */ lwz r3, 4(r3) /* 801BE63C 001BA47C 4B FF FF 64 */ b free__Q23mem7HeapExpFPv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mem7HeapExp __vt__Q23mem7HeapExp: .incbin "baserom.dol", 0x455E10, 0x24 diff --git a/asm/src/HeapExpArray.s b/asm/src/HeapExpArray.s index 078d52bc..b9c4bd05 100644 --- a/asm/src/HeapExpArray.s +++ b/asm/src/HeapExpArray.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem12HeapExpArrayFRQ23mem10IAllocatorUlUlPCc __ct__Q23mem12HeapExpArrayFRQ23mem10IAllocatorUlUlPCc: /* 801BE640 001BA480 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -452,7 +452,7 @@ clearIfUsing__Q33mem12HeapExpArray5BlockFv: /* 801BEC1C 001BAA5C 4B FF FF E4 */ b unref__Q33mem12HeapExpArray5BlockFRQ23mem10IAllocator /* 801BEC20 001BAA60 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249831 $$249831: .incbin "baserom.dol", 0x493650, 0x8 diff --git a/asm/src/HeapExpArrayUser.s b/asm/src/HeapExpArrayUser.s index 9032b53a..cc0c5281 100644 --- a/asm/src/HeapExpArrayUser.s +++ b/asm/src/HeapExpArrayUser.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem16HeapExpArrayUserFRQ23mem12HeapExpArray __ct__Q23mem16HeapExpArrayUserFRQ23mem12HeapExpArray: /* 801BEC24 001BAA64 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/HeapMapUserRepos.s b/asm/src/HeapMapUserRepos.s index a10741aa..5ae48158 100644 --- a/asm/src/HeapMapUserRepos.s +++ b/asm/src/HeapMapUserRepos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q23mem16HeapMapUserReposFRQ44nrel6devkit7heapmap12IHeapMapUser Register__Q23mem16HeapMapUserReposFRQ44nrel6devkit7heapmap12IHeapMapUser: /* 801BECC0 001BAB00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -154,7 +154,7 @@ lbl_801BEEA4: __dt__Q33hel6common55MutableArray$$0PQ44nrel6devkit7heapmap12IHeapMapUser$$4512$$1Fv: /* 801BEEB4 001BACF4 4B FB 6C B4 */ b __dt__Q23scn6ISceneFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402434, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/HeapUnit.s b/asm/src/HeapUnit.s index c5d4c714..1a57a6fd 100644 --- a/asm/src/HeapUnit.s +++ b/asm/src/HeapUnit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem8HeapUnitFRCQ33hel6common15FixedString$$032$$1RQ23mem10IAllocatorUlUli __ct__Q23mem8HeapUnitFRCQ33hel6common15FixedString$$032$$1RQ23mem10IAllocatorUlUli: /* 801BEEB8 001BACF8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -241,7 +241,7 @@ heapUsingBlockCount__Q23mem8HeapUnitCFv: heapDump__Q23mem8HeapUnitCFv: /* 801BF1B0 001BAFF0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mem8HeapUnit __vt__Q23mem8HeapUnit: .incbin "baserom.dol", 0x455E48, 0x28 diff --git a/asm/src/HelpPushAll.s b/asm/src/HelpPushAll.s index 4d8e3e44..a69191d0 100644 --- a/asm/src/HelpPushAll.s +++ b/asm/src/HelpPushAll.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info11HelpPushAllFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q43scn4step4info11HelpPushAllFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803A6920 003A2760 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -155,7 +155,7 @@ onObjStopChanged__Q43scn4step4info11HelpPushAllFb: /* 803A6B4C 003A298C 38 21 00 30 */ addi r1, r1, 0x30 /* 803A6B50 003A2990 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252048 $$252048: .incbin "baserom.dol", 0x48B728, 0x10 @@ -163,12 +163,12 @@ $$252048: $$252049: .incbin "baserom.dol", 0x48B738, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252111 $$252111: .incbin "baserom.dol", 0x4978C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252106 $$252106: .incbin "baserom.dol", 0x49E3E0, 0x4 diff --git a/asm/src/HelpPushUp.s b/asm/src/HelpPushUp.s index 7e95df9d..0820a678 100644 --- a/asm/src/HelpPushUp.s +++ b/asm/src/HelpPushUp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info10HelpPushUpFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component __ct__Q43scn4step4info10HelpPushUpFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component: /* 803A6B54 003A2994 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -358,7 +358,7 @@ startDisappearAnim__Q43scn4step4info10HelpPushUpFv: /* 803A7034 003A2E74 38 21 00 10 */ addi r1, r1, 0x10 /* 803A7038 003A2E78 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252107 $$252107: .incbin "baserom.dol", 0x48B748, 0x10 @@ -366,7 +366,7 @@ $$252107: $$252108: .incbin "baserom.dol", 0x48B758, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252109 $$252109: .incbin "baserom.dol", 0x4978D0, 0x8 @@ -380,7 +380,7 @@ $$252192: $$252195: .incbin "baserom.dol", 0x4978E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global APPEAR_WAIT_DEFAULT__Q43scn4step4info10HelpPushUp APPEAR_WAIT_DEFAULT__Q43scn4step4info10HelpPushUp: .incbin "baserom.dol", 0x49E3E8, 0x4 diff --git a/asm/src/HelpShake.s b/asm/src/HelpShake.s index 8f673c55..5dbfb766 100644 --- a/asm/src/HelpShake.s +++ b/asm/src/HelpShake.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info9HelpShakeFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component __ct__Q43scn4step4info9HelpShakeFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component: /* 803A703C 003A2E7C 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -344,7 +344,7 @@ startDisappearAnim__Q43scn4step4info9HelpShakeFv: /* 803A74F0 003A3330 38 21 00 10 */ addi r1, r1, 0x10 /* 803A74F4 003A3334 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252130 $$252130: .incbin "baserom.dol", 0x48B768, 0x10 @@ -352,7 +352,7 @@ $$252130: $$252131: .incbin "baserom.dol", 0x48B778, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252133 $$252133: .incbin "baserom.dol", 0x4978F0, 0x8 @@ -372,7 +372,7 @@ $$252234: $$252237: .incbin "baserom.dol", 0x497918, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252132 $$252132: .incbin "baserom.dol", 0x49E3F8, 0x8 diff --git a/asm/src/Hero.s b/asm/src/Hero.s index 6f52e8b7..6754ebea 100644 --- a/asm/src/Hero.s +++ b/asm/src/Hero.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero4HeroFRQ33scn4step9ComponentRQ23mem12HeapExpArrayUlRCQ33hel4math7Vector2RCQ33hel4math7Vector2bRCQ33scn4step17ContextHeroIndiviUl __ct__Q43scn4step4hero4HeroFRQ33scn4step9ComponentRQ23mem12HeapExpArrayUlRCQ33hel4math7Vector2RCQ33hel4math7Vector2bRCQ33scn4step17ContextHeroIndiviUl: /* 80338EE4 00334D24 94 21 FF 10 */ stwu r1, -0xf0(r1) @@ -8863,7 +8863,7 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference14StatePiggyback$$4PQ43scn4step4hero4Hero$$4b$$1Fv: /* 80340868 0033C6A8 4B EE DE 38 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$287026 $$287026: .incbin "baserom.dol", 0x47FFB0, 0x48 @@ -8961,7 +8961,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6v $$2STRING$$2GetBack__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x480238, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$284672 $$284672: .incbin "baserom.dol", 0x49D718, 0x4 diff --git a/asm/src/HeroLifeBar.s b/asm/src/HeroLifeBar.s index 8127bb93..76a19090 100644 --- a/asm/src/HeroLifeBar.s +++ b/asm/src/HeroLifeBar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info11HeroLifeBarFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q43scn4step4info11HeroLifeBarFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803A74F8 003A3338 94 21 FE 80 */ stwu r1, -0x180(r1) @@ -844,7 +844,7 @@ lbl_803A8074: /* 803A8074 003A3EB4 7C 83 23 78 */ mr r3, r4 /* 803A8078 003A3EB8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253933 $$253933: .incbin "baserom.dol", 0x48B788, 0x10 @@ -882,7 +882,7 @@ $$254025: $$254032: .incbin "baserom.dol", 0x48B828, 0x80 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253937 $$253937: .incbin "baserom.dol", 0x497920, 0x8 @@ -899,7 +899,7 @@ $$254018: $$254091: .incbin "baserom.dol", 0x497940, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253936 $$253936: .incbin "baserom.dol", 0x49E400, 0x4 diff --git a/asm/src/HeroPanel.s b/asm/src/HeroPanel.s index e6696dbe..f1ad4495 100644 --- a/asm/src/HeroPanel.s +++ b/asm/src/HeroPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info9HeroPanelFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessorRQ33scn4step9ComponentUl __ct__Q43scn4step4info9HeroPanelFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessorRQ33scn4step9ComponentUl: /* 803A807C 003A3EBC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1068,12 +1068,12 @@ helpShakeSuccess__Q43scn4step4info9HeroPanelFv: /* 803A8EBC 003A4CFC 38 21 00 10 */ addi r1, r1, 0x10 /* 803A8EC0 003A4D00 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256777 $$256777: .incbin "baserom.dol", 0x48B8A8, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257013 $$257013: .incbin "baserom.dol", 0x49E410, 0x8 diff --git a/asm/src/HeroPanelController.s b/asm/src/HeroPanelController.s index 6f1cdc36..6ff967c8 100644 --- a/asm/src/HeroPanelController.s +++ b/asm/src/HeroPanelController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info19HeroPanelControllerFv __ct__Q43scn4step4info19HeroPanelControllerFv: /* 803A8EC4 003A4D04 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -334,10 +334,10 @@ __sinit_$$3HeroPanelController_cpp: /* 803A9374 003A51B4 38 21 00 10 */ addi r1, r1, 0x10 /* 803A9378 003A51B8 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025D4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252387 $$252387: .incbin "baserom.dol", 0x49E418, 0x4 diff --git a/asm/src/HeroStatus.s b/asm/src/HeroStatus.s index 7506c1d0..5c6fafbe 100644 --- a/asm/src/HeroStatus.s +++ b/asm/src/HeroStatus.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info10HeroStatusFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ43scn4step4hero4KindbbQ43scn4step4hero11AbilityKindRQ26effect7ManagerRQ26effect5GroupQ33scn4step13ChallengeKind __ct__Q43scn4step4info10HeroStatusFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ43scn4step4hero4KindbbQ43scn4step4hero11AbilityKindRQ26effect7ManagerRQ26effect5GroupQ33scn4step13ChallengeKind: /* 803A937C 003A51BC 94 21 FB E0 */ stwu r1, -0x420(r1) @@ -740,7 +740,7 @@ lbl_803A9DB4: /* 803A9DC0 003A5C00 38 21 00 10 */ addi r1, r1, 0x10 /* 803A9DC4 003A5C04 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254295 $$254295: .incbin "baserom.dol", 0x48B8B8, 0x10 @@ -784,7 +784,7 @@ $$254311: $$254460: .incbin "baserom.dol", 0x48B988, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254299 $$254299: .incbin "baserom.dol", 0x497948, 0x8 @@ -795,7 +795,7 @@ $$254303: $$254304: .incbin "baserom.dol", 0x497958, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254301 $$254301: .incbin "baserom.dol", 0x49E428, 0x8 diff --git a/asm/src/HeroStatusIcon.s b/asm/src/HeroStatusIcon.s index 6a51c093..df3240c0 100644 --- a/asm/src/HeroStatusIcon.s +++ b/asm/src/HeroStatusIcon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info14HeroStatusIconFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ43scn4step4hero4Kind __ct__Q43scn4step4info14HeroStatusIconFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ43scn4step4hero4Kind: /* 803A9DC8 003A5C08 94 21 FE 70 */ stwu r1, -0x190(r1) @@ -608,7 +608,7 @@ lbl_803AA5D4: /* 803AA60C 003A644C 38 21 01 20 */ addi r1, r1, 0x120 /* 803AA610 003A6450 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251660 $$251660: .incbin "baserom.dol", 0x48B9C8, 0x10 @@ -700,7 +700,7 @@ $$253210: $$253211: .incbin "baserom.dol", 0x48BD48, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_ARC_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2 T_ARC_PATH__Q43scn4step4info28$$2unnamed$$2HeroStatusIcon_cpp$$2: .incbin "baserom.dol", 0x497960, 0x4 diff --git a/asm/src/HeroStatusIconSyncer.s b/asm/src/HeroStatusIconSyncer.s index 365f21ae..5d761d10 100644 --- a/asm/src/HeroStatusIconSyncer.s +++ b/asm/src/HeroStatusIconSyncer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info20HeroStatusIconSyncerFv __ct__Q43scn4step4info20HeroStatusIconSyncerFv: /* 803AA614 003A6454 38 00 00 00 */ li r0, 0 diff --git a/asm/src/Hid.s b/asm/src/Hid.s index cb48fcac..6c1c7d7b 100644 --- a/asm/src/Hid.s +++ b/asm/src/Hid.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero3HidFRQ43scn4step4hero4HeroQ43scn4step4hero7HidKind __ct__Q43scn4step4hero3HidFRQ43scn4step4hero4HeroQ43scn4step4hero7HidKind: /* 8034086C 0033C6AC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -458,12 +458,12 @@ isEnableInputs__Q43scn4step4hero3HidCFv: /* 80340EB4 0033CCF4 54 03 D9 7E */ srwi r3, r0, 5 /* 80340EB8 0033CCF8 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_BUTTONCONVDATA_WR__17$$2unnamed$$2Hid_cpp$$2 T_BUTTONCONVDATA_WR__17$$2unnamed$$2Hid_cpp$$2: .incbin "baserom.dol", 0x415E50, 0x50 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253822 $$253822: .incbin "baserom.dol", 0x49D740, 0x4 diff --git a/asm/src/HidKindUtil.s b/asm/src/HidKindUtil.s index 66499be9..c1b99161 100644 --- a/asm/src/HidKindUtil.s +++ b/asm/src/HidKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ScriptPath__Q43scn4step4hero11HidKindUtilFQ43scn4step4hero7HidKind ScriptPath__Q43scn4step4hero11HidKindUtilFQ43scn4step4hero7HidKind: /* 80340EBC 0033CCFC 54 60 10 3A */ slwi r0, r3, 2 @@ -9,7 +9,7 @@ ScriptPath__Q43scn4step4hero11HidKindUtilFQ43scn4step4hero7HidKind: /* 80340EC8 0033CD08 7C 63 00 2E */ lwzx r3, r3, r0 /* 80340ECC 0033CD0C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248723 $$248723: .incbin "baserom.dol", 0x480248, 0x2C diff --git a/asm/src/Hit.s b/asm/src/Hit.s index 4efa5cfe..0a45b05c 100644 --- a/asm/src/Hit.s +++ b/asm/src/Hit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll3HitFRQ25ocoll7ManagerRQ25ocoll5Owner __ct__Q25ocoll3HitFRQ25ocoll7ManagerRQ25ocoll5Owner: /* 801D5FB8 001D1DF8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -707,7 +707,7 @@ sortResult__Q25ocoll3HitFv: /* 801D68B4 001D26F4 38 21 00 10 */ addi r1, r1, 0x10 /* 801D68B8 001D26F8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q25ocoll3Hit __vt__Q25ocoll3Hit: .incbin "baserom.dol", 0x4594D8, 0x10 diff --git a/asm/src/HitNode.s b/asm/src/HitNode.s index d9a7b0fc..a1dba0d0 100644 --- a/asm/src/HitNode.s +++ b/asm/src/HitNode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll7HitNodeFRQ25ocoll3HitRCQ25ocoll8NodeDesc __ct__Q25ocoll7HitNodeFRQ25ocoll3HitRCQ25ocoll8NodeDesc: /* 801D68BC 001D26FC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -235,7 +235,7 @@ lbl_801D6C08: /* 801D6C14 001D2A54 38 21 01 D0 */ addi r1, r1, 0x1d0 /* 801D6C18 001D2A58 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252002 $$252002: .incbin "baserom.dol", 0x49A7C8, 0x8 diff --git a/asm/src/HitPoint.s b/asm/src/HitPoint.s index 756f4b91..1341a022 100644 --- a/asm/src/HitPoint.s +++ b/asm/src/HitPoint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara8HitPointFv __ct__Q43scn4step5chara8HitPointFv: /* 8026EAE0 0026A920 38 00 00 00 */ li r0, 0 @@ -168,7 +168,7 @@ rate__Q43scn4step5chara8HitPointCFv: /* 8026ECE0 0026AB20 38 21 00 20 */ addi r1, r1, 0x20 /* 8026ECE4 0026AB24 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249001 $$249001: .incbin "baserom.dol", 0x49B7C8, 0x8 diff --git a/asm/src/HitResult.s b/asm/src/HitResult.s index 4a8b4242..a77b9b91 100644 --- a/asm/src/HitResult.s +++ b/asm/src/HitResult.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll9HitResultFv __ct__Q25ocoll9HitResultFv: /* 801D6C1C 001D2A5C 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/HitStop.s b/asm/src/HitStop.s index 08f41bf7..7e0ef9a2 100644 --- a/asm/src/HitStop.s +++ b/asm/src/HitStop.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara7HitStopFv __ct__Q43scn4step5chara7HitStopFv: /* 8026ECE8 0026AB28 38 00 00 00 */ li r0, 0 diff --git a/asm/src/HitStopCallback.s b/asm/src/HitStopCallback.s index b9868989..aace0dba 100644 --- a/asm/src/HitStopCallback.s +++ b/asm/src/HitStopCallback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss15HitStopCallbackFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss15HitStopCallbackFRQ43scn4step4boss4Boss: /* 80230A94 0022C8D4 3C A0 80 46 */ lis r5, __vt__Q43scn4step4boss15HitStopCallback@ha @@ -98,7 +98,7 @@ onEnd__Q43scn4step4boss15HitStopCallbackFv: /* 80230BDC 0022CA1C 38 21 00 10 */ addi r1, r1, 0x10 /* 80230BE0 0022CA20 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy15HitStopCallbackFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy15HitStopCallbackFRQ43scn4step5enemy5Enemy: /* 80288A20 00284860 3C A0 80 47 */ lis r5, __vt__Q43scn4step5enemy15HitStopCallback@ha @@ -149,7 +149,7 @@ onEnd__Q43scn4step5enemy15HitStopCallbackFv: /* 80288AB0 002848F0 38 21 00 10 */ addi r1, r1, 0x10 /* 80288AB4 002848F4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero15HitStopCallbackFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero15HitStopCallbackFRQ43scn4step4hero4Hero: /* 80340ED0 0033CD10 3C A0 80 48 */ lis r5, __vt__Q43scn4step4hero15HitStopCallback@ha @@ -206,7 +206,7 @@ onEnd__Q43scn4step4hero15HitStopCallbackFv: /* 80340F78 0033CDB8 38 21 00 10 */ addi r1, r1, 0x10 /* 80340F7C 0033CDBC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon15HitStopCallbackFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon15HitStopCallbackFRQ43scn4step6weapon6Weapon: /* 803D64CC 003D230C 3C A0 80 49 */ lis r5, __vt__Q43scn4step6weapon15HitStopCallback@ha @@ -257,22 +257,22 @@ onEnd__Q43scn4step6weapon15HitStopCallbackFv: /* 803D655C 003D239C 38 21 00 10 */ addi r1, r1, 0x10 /* 803D6560 003D23A0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss15HitStopCallback __vt__Q43scn4step4boss15HitStopCallback: .incbin "baserom.dol", 0x4606B8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy15HitStopCallback __vt__Q43scn4step5enemy15HitStopCallback: .incbin "baserom.dol", 0x46E000, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero15HitStopCallback __vt__Q43scn4step4hero15HitStopCallback: .incbin "baserom.dol", 0x480D68, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon15HitStopCallback __vt__Q43scn4step6weapon15HitStopCallback: .incbin "baserom.dol", 0x48F8B0, 0x18 diff --git a/asm/src/HomeButtonMenu.s b/asm/src/HomeButtonMenu.s index d191b603..fb5e0f7b 100644 --- a/asm/src/HomeButtonMenu.s +++ b/asm/src/HomeButtonMenu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isWideMode__28$$2unnamed$$2HomeButtonMenu_cpp$$2Fv isWideMode__28$$2unnamed$$2HomeButtonMenu_cpp$$2Fv: /* 8019C390 001981D0 80 6D ED 08 */ lwz r3, object___Q33hel6common35ExplicitSingleton$$0Q23gfx9VISetting$$1-_SDA_BASE_(r13) @@ -1314,12 +1314,12 @@ lbl_8019D5C0: /* 8019D5D0 00199410 38 21 00 30 */ addi r1, r1, 0x30 /* 8019D5D4 00199414 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252296 $$252296: .incbin "baserom.dol", 0x452A20, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250553 $$250553: .incbin "baserom.dol", 0x493210, 0x4 @@ -1339,7 +1339,7 @@ $$250606: $$250607: .incbin "baserom.dol", 0x493224, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250642 $$250642: .incbin "baserom.dol", 0x49A320, 0x4 diff --git a/asm/src/ISequence.s b/asm/src/ISequence.s index b21ea3ce..8b0f957c 100644 --- a/asm/src/ISequence.s +++ b/asm/src/ISequence.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __nw__Q23seq9ISequenceFUl __nw__Q23seq9ISequenceFUl: /* 803FCBDC 003F8A1C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/IState.s b/asm/src/IState.s index 1d9a170b..5256c7f0 100644 --- a/asm/src/IState.s +++ b/asm/src/IState.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q43scn4step4boss6IStateFv __dt__Q43scn4step4boss6IStateFv: /* 80230D3C 0022CB7C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/InactiveHero.s b/asm/src/InactiveHero.s index 0aaa0854..249851cf 100644 --- a/asm/src/InactiveHero.s +++ b/asm/src/InactiveHero.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero12InactiveHeroFRQ33scn4step9ComponentRQ23mem12HeapExpArrayUlRCQ33scn4step17ContextHeroIndivi __ct__Q43scn4step4hero12InactiveHeroFRQ33scn4step9ComponentRQ23mem12HeapExpArrayUlRCQ33scn4step17ContextHeroIndivi: /* 80340F80 0033CDC0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -642,7 +642,7 @@ __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11S __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1Fv: /* 80341814 0033D654 4B EE CE 8C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8inactive9StateInit$$4PQ43scn4step4hero12InactiveHero$$1: .incbin "baserom.dol", 0x480D80, 0x10 @@ -653,7 +653,7 @@ __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero8inactive11S __vt__Q24util50StateChanger$$0Q43scn4step4hero14IInactiveState$$4256$$1: .incbin "baserom.dol", 0x480DA0, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256074 $$256074: .incbin "baserom.dol", 0x49D748, 0x4 diff --git a/asm/src/InactiveStateBase.s b/asm/src/InactiveStateBase.s index 161730d6..8dbd60a7 100644 --- a/asm/src/InactiveStateBase.s +++ b/asm/src/InactiveStateBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero17InactiveStateBaseFPQ43scn4step4hero12InactiveHero __ct__Q43scn4step4hero17InactiveStateBaseFPQ43scn4step4hero12InactiveHero: /* 80341818 0033D658 3C A0 80 48 */ lis r5, __vt__Q43scn4step4hero17InactiveStateBase@ha @@ -40,7 +40,7 @@ lbl_80341870: /* 80341884 0033D6C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80341888 0033D6C8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero17InactiveStateBase __vt__Q43scn4step4hero17InactiveStateBase: .incbin "baserom.dol", 0x480DB0, 0x10 diff --git a/asm/src/InactiveStateCallback.s b/asm/src/InactiveStateCallback.s index b1aa694e..f9e27de7 100644 --- a/asm/src/InactiveStateCallback.s +++ b/asm/src/InactiveStateCallback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero21InactiveStateCallbackFRQ43scn4step4hero12InactiveHero __ct__Q43scn4step4hero21InactiveStateCallbackFRQ43scn4step4hero12InactiveHero: /* 8034188C 0033D6CC 3C A0 80 48 */ lis r5, __vt__Q43scn4step4hero21InactiveStateCallback@ha @@ -13,7 +13,7 @@ __ct__Q43scn4step4hero21InactiveStateCallbackFRQ43scn4step4hero12InactiveHero: onStateChanged__Q43scn4step4hero21InactiveStateCallbackFRCQ24util13IStateChanger: /* 803418A0 0033D6E0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero21InactiveStateCallback __vt__Q43scn4step4hero21InactiveStateCallback: .incbin "baserom.dol", 0x480DC0, 0x10 diff --git a/asm/src/IndiviCamera.s b/asm/src/IndiviCamera.s index 37a46875..84278b0c 100644 --- a/asm/src/IndiviCamera.s +++ b/asm/src/IndiviCamera.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera12IndiviCameraFRQ33scn4step9Component __ct__Q43scn4step6camera12IndiviCameraFRQ33scn4step9Component: /* 80265140 00260F80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -248,7 +248,7 @@ setCameraRect__Q43scn4step6camera12IndiviCameraFRCQ33hel3geo4Rectf: /* 802654B0 002612F0 38 21 00 50 */ addi r1, r1, 0x50 /* 802654B4 002612F4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251843 $$251843: .incbin "baserom.dol", 0x49B650, 0x4 diff --git a/asm/src/IndiviCameraManager.s b/asm/src/IndiviCameraManager.s index 91cc4b75..bc37d89a 100644 --- a/asm/src/IndiviCameraManager.s +++ b/asm/src/IndiviCameraManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera19IndiviCameraManagerFRQ33scn4step9Component __ct__Q43scn4step6camera19IndiviCameraManagerFRQ33scn4step9Component: /* 802654B8 002612F8 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/IndiviUtil.s b/asm/src/IndiviUtil.s index 93c50341..a4c14308 100644 --- a/asm/src/IndiviUtil.s +++ b/asm/src/IndiviUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ModelDesc__Q43scn4step5enemy10IndiviUtilFQ43scn4step3map12BinEnemyKindbb ModelDesc__Q43scn4step5enemy10IndiviUtilFQ43scn4step3map12BinEnemyKindbb: /* 80288AB8 002848F8 2C 05 00 00 */ cmpwi r5, 0 @@ -192,7 +192,7 @@ __sinit_$$3IndiviUtil_cpp: /* 80288D84 00284BC4 90 83 06 E8 */ stw r4, 0x6e8(r3) /* 80288D88 00284BC8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Param__Q43scn4step4hero10IndiviUtilFRCQ43scn4step4hero4Hero Param__Q43scn4step4hero10IndiviUtilFRCQ43scn4step4hero4Hero: /* 803418A4 0033D6E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -489,7 +489,7 @@ lbl_80341C60: /* 80341C6C 0033DAAC 38 21 00 10 */ addi r1, r1, 0x10 /* 80341C70 0033DAB0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ModelDesc__Q43scn4step4item10IndiviUtilFRQ33scn4step9ComponentQ43scn4step3map11BinItemKindUl ModelDesc__Q43scn4step4item10IndiviUtilFRQ33scn4step9ComponentQ43scn4step3map11BinItemKindUl: /* 803C1418 003BD258 2C 04 00 03 */ cmpwi r4, 3 @@ -539,7 +539,7 @@ CenterOffs__Q43scn4step4item10IndiviUtilFQ43scn4step3map11BinItemKind: /* 803C1480 003BD2C0 D0 03 00 04 */ stfs f0, 4(r3) /* 803C1484 003BD2C4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ModelDesc__Q43scn4step6weapon10IndiviUtilFQ43scn4step6weapon4Kindb ModelDesc__Q43scn4step6weapon10IndiviUtilFQ43scn4step6weapon4Kindb: /* 803D6564 003D23A4 2C 04 00 00 */ cmpwi r4, 0 @@ -561,20 +561,20 @@ lbl_803D6590: /* 803D65A0 003D23E0 7D 89 03 A6 */ mtctr r12 /* 803D65A4 003D23E4 4E 80 04 20 */ bctr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024B8, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INDIVI_TABLE__Q43scn4step6weapon24$$2unnamed$$2IndiviUtil_cpp$$2 T_INDIVI_TABLE__Q43scn4step6weapon24$$2unnamed$$2IndiviUtil_cpp$$2: .incbin "baserom.dol", 0x41C920, 0x210 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2 T_INDIVI_TABLE__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .incbin "baserom.dol", 0x46E018, 0x700 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252523 $$252523: .incbin "baserom.dol", 0x480DD0, 0x1C @@ -585,7 +585,7 @@ $$252524: $$252525: .incbin "baserom.dol", 0x480E08, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MODEL_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2 T_MODEL_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .incbin "baserom.dol", 0x49B9E0, 0x4 @@ -593,7 +593,7 @@ T_MODEL_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: T_CHARA_PARAM_DESC_FUNC_DUMMY__Q43scn4step5enemy24$$2unnamed$$2IndiviUtil_cpp$$2: .incbin "baserom.dol", 0x49B9E4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252509 $$252509: .incbin "baserom.dol", 0x49D750, 0x4 @@ -604,7 +604,7 @@ $$252510: $$252516: .incbin "baserom.dol", 0x49D758, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250317 $$250317: .incbin "baserom.dol", 0x49E528, 0x4 diff --git a/asm/src/InertialMove.s b/asm/src/InertialMove.s index f9326c75..63e4b69a 100644 --- a/asm/src/InertialMove.s +++ b/asm/src/InertialMove.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero12InertialMoveFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero12InertialMoveFRQ43scn4step4hero4Hero: /* 80341C74 0033DAB4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/InfoControl.s b/asm/src/InfoControl.s index 0cb7eff7..ecc4407a 100644 --- a/asm/src/InfoControl.s +++ b/asm/src/InfoControl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info11InfoControlFRQ33scn4step9Component __ct__Q43scn4step4info11InfoControlFRQ33scn4step9Component: /* 803AA930 003A6770 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1024,7 +1024,7 @@ lbl_803AB77C: /* 803AB790 003A75D0 38 21 00 10 */ addi r1, r1, 0x10 /* 803AB794 003A75D4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255923 $$255923: .incbin "baserom.dol", 0x48BD88, 0x20 diff --git a/asm/src/InfoGameStatus.s b/asm/src/InfoGameStatus.s index 8ee99444..98805ac5 100644 --- a/asm/src/InfoGameStatus.s +++ b/asm/src/InfoGameStatus.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info14InfoGameStatusFRQ33scn4step9ComponentRQ23mem10IAllocator __ct__Q43scn4step4info14InfoGameStatusFRQ33scn4step9ComponentRQ23mem10IAllocator: /* 803AB798 003A75D8 94 21 F9 20 */ stwu r1, -0x6e0(r1) @@ -1200,7 +1200,7 @@ lbl_803AC7E4: safeboolFunc__Q24util45PlacementNew$$0Q43scn4step4info13WarpStarPanel$$1CFv: /* 803AC804 003A8644 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254554 $$254554: .incbin "baserom.dol", 0x48BDA8, 0x10 @@ -1241,7 +1241,7 @@ $$254566: $$254817: .incbin "baserom.dol", 0x48BE68, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254555 $$254555: .incbin "baserom.dol", 0x4979D8, 0x8 diff --git a/asm/src/InfoUtil.s b/asm/src/InfoUtil.s index bad2d3e1..a71b3e92 100644 --- a/asm/src/InfoUtil.s +++ b/asm/src/InfoUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global PlayerNumAppearIfNotLonely__Q43scn4step4hero8InfoUtilFRQ43scn4step4hero4Hero PlayerNumAppearIfNotLonely__Q43scn4step4hero8InfoUtilFRQ43scn4step4hero4Hero: /* 80341D64 0033DBA4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -129,7 +129,7 @@ PlayerNumDisappear__Q43scn4step4hero8InfoUtilFRQ43scn4step4hero4Hero: /* 80341F0C 0033DD4C 38 21 00 10 */ addi r1, r1, 0x10 /* 80341F10 0033DD50 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252825 $$252825: .incbin "baserom.dol", 0x49D760, 0x8 diff --git a/asm/src/Initiative.s b/asm/src/Initiative.s index 6ca24f0d..e4ff5a22 100644 --- a/asm/src/Initiative.s +++ b/asm/src/Initiative.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero10InitiativeFRQ33scn4step9Component __ct__Q43scn4step4hero10InitiativeFRQ33scn4step9Component: /* 80341F14 0033DD54 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/InitiativeUtil.s b/asm/src/InitiativeUtil.s index 1cef3a5a..344e7850 100644 --- a/asm/src/InitiativeUtil.s +++ b/asm/src/InitiativeUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryTake__Q43scn4step4hero14InitiativeUtilFRQ43scn4step4hero4Hero TryTake__Q43scn4step4hero14InitiativeUtilFRQ43scn4step4hero4Hero: /* 8034201C 0033DE5C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Input.s b/asm/src/Input.s index d4da0b34..37547cae 100644 --- a/asm/src/Input.s +++ b/asm/src/Input.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history5InputFv __ct__Q33scn7history5InputFv: /* 80208074 00203EB4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -198,7 +198,7 @@ lbl_8020830C: /* 80208338 00204178 38 21 00 40 */ addi r1, r1, 0x40 /* 8020833C 0020417C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn9grandmenu4menu5InputFv __ct__Q43scn9grandmenu4menu5InputFv: /* 803F54B0 003F12F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -676,7 +676,7 @@ isRight__Q43scn9grandmenu4menu5InputCFv: /* 803F5B1C 003F195C 7C 60 19 10 */ subfe r3, r0, r3 /* 803F5B20 003F1960 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251081 $$251081: .incbin "baserom.dol", 0x4919D0, 0x18 diff --git a/asm/src/Intersection.s b/asm/src/Intersection.s index 29054e84..f97bfc64 100644 --- a/asm/src/Intersection.s +++ b/asm/src/Intersection.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_signed2DTriArea__Q33hel5geo2d26$$2unnamed$$2Intersection_cpp$$2FRCQ33hel4math7Vector2RCQ33hel4math7Vector2RCQ33hel4math7Vector2 t_signed2DTriArea__Q33hel5geo2d26$$2unnamed$$2Intersection_cpp$$2FRCQ33hel4math7Vector2RCQ33hel4math7Vector2RCQ33hel4math7Vector2: /* 801A05E0 0019C420 C0 03 00 00 */ lfs f0, 0(r3) @@ -566,7 +566,7 @@ lbl_801A0D7C: /* 801A0D94 0019CBD4 54 03 D9 7E */ srwi r3, r0, 5 /* 801A0D98 0019CBD8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250828 $$250828: .incbin "baserom.dol", 0x49A408, 0x4 diff --git a/asm/src/Invincible.s b/asm/src/Invincible.s index 5eadfca3..8f121e20 100644 --- a/asm/src/Invincible.s +++ b/asm/src/Invincible.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss10InvincibleFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss10InvincibleFRQ43scn4step4boss4Boss: /* 80230BE4 0022CA24 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ lbl_80230D28: /* 80230D34 0022CB74 38 21 00 10 */ addi r1, r1, 0x10 /* 80230D38 0022CB78 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara10InvincibleFv __ct__Q43scn4step5chara10InvincibleFv: /* 8026EE48 0026AC88 38 00 00 00 */ li r0, 0 @@ -233,7 +233,7 @@ updateFrame__Q43scn4step5chara10InvincibleFv: /* 8026EFA0 0026ADE0 90 03 00 00 */ stw r0, 0(r3) /* 8026EFA4 0026ADE4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero10InvincibleFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero10InvincibleFRQ43scn4step4hero4Hero: /* 80342180 0033DFC0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -844,22 +844,22 @@ lbl_803429C0: /* 803429C8 0033E808 38 21 00 10 */ addi r1, r1, 0x10 /* 803429CC 0033E80C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_ANIM_TABLE__Q43scn4step5chara24$$2unnamed$$2Invincible_cpp$$2 T_ALPHA_ANIM_TABLE__Q43scn4step5chara24$$2unnamed$$2Invincible_cpp$$2: .incbin "baserom.dol", 0x413A60, 0x28 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global MIGHTY_COLOR_TABLE__24$$2unnamed$$2Invincible_cpp$$2 MIGHTY_COLOR_TABLE__24$$2unnamed$$2Invincible_cpp$$2: .incbin "baserom.dol", 0x415EA0, 0x240 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250018 $$250018: .incbin "baserom.dol", 0x49AE88, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253735 $$253735: .incbin "baserom.dol", 0x49D768, 0x8 diff --git a/asm/src/InvisibleControl.s b/asm/src/InvisibleControl.s index bce78faa..686831f9 100644 --- a/asm/src/InvisibleControl.s +++ b/asm/src/InvisibleControl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q43scn4step4hero16InvisibleControlFv update__Q43scn4step4hero16InvisibleControlFv: /* 803429D0 0033E810 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Item.s b/asm/src/Item.s index 0046a787..d0f1a454 100644 --- a/asm/src/Item.s +++ b/asm/src/Item.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item4ItemFRQ33scn4step9ComponentRQ23mem12HeapExpArrayRCQ43scn4step4item4DescUl __ct__Q43scn4step4item4ItemFRQ33scn4step9ComponentRQ23mem12HeapExpArrayRCQ43scn4step4item4DescUl: /* 803C1488 003BD2C8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2723,7 +2723,7 @@ __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state10State __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateFall$$4PQ43scn4step4item4Item$$1Fv: /* 803C3970 003BF7B0 4B E6 AD 30 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetParentPaneName__Q43scn9grandmenu4menu4ItemFQ43scn9grandmenu4menu8ItemKindb GetParentPaneName__Q43scn9grandmenu4menu4ItemFQ43scn9grandmenu4menu8ItemKindb: /* 803F5B24 003F1964 54 60 08 3C */ slwi r0, r3, 1 @@ -3177,7 +3177,7 @@ mfReqEffect__Q43scn9grandmenu4menu4ItemFQ43scn9grandmenu6effect4KindRCQ33hel4mat /* 803F6180 003F1FC0 38 21 00 F0 */ addi r1, r1, 0xf0 /* 803F6184 003F1FC4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$266370 $$266370: .incbin "baserom.dol", 0x48DE48, 0x20 @@ -3230,7 +3230,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4i $$2STRING$$2GetBack__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x48DFA8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252783 $$252783: .incbin "baserom.dol", 0x4919E8, 0xC @@ -3301,12 +3301,12 @@ $$253750: $$253828: .incbin "baserom.dol", 0x491B48, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$266368 $$266368: .incbin "baserom.dol", 0x498140, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252776 $$252776: .incbin "baserom.dol", 0x498908, 0x8 @@ -3350,7 +3350,7 @@ $$253818: $$253827: .incbin "baserom.dol", 0x498970, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$265701 $$265701: .incbin "baserom.dol", 0x49E530, 0x4 diff --git a/asm/src/ItemCatcher.s b/asm/src/ItemCatcher.s index 860d70e8..c44ca206 100644 --- a/asm/src/ItemCatcher.s +++ b/asm/src/ItemCatcher.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster11ItemCatcherFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster11ItemCatcherFRQ43scn4step4boss4Boss: /* 8023D7A4 002395E4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -231,7 +231,7 @@ lbl_8023DAA4: /* 8023DAC0 00239900 38 21 00 20 */ addi r1, r1, 0x20 /* 8023DAC4 00239904 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11ItemCatcherFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero11ItemCatcherFRQ43scn4step4hero4Hero: /* 80342AA0 0033E8E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -381,15 +381,15 @@ __sinit_$$3ItemCatcher_cpp: /* 80342C68 0033EAA8 C0 42 CC B4 */ lfs f2, $$253162-_SDA2_BASE_(r2) /* 80342C6C 0033EAAC 4B E5 C7 3C */ b set__Q33hel4math7Vector2Fff -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025BC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254426 $$254426: .incbin "baserom.dol", 0x49B008, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253107 $$253107: .incbin "baserom.dol", 0x49D770, 0x4 diff --git a/asm/src/ItemCollReact.s b/asm/src/ItemCollReact.s index 8d5aac5f..5404e732 100644 --- a/asm/src/ItemCollReact.s +++ b/asm/src/ItemCollReact.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero13ItemCollReactFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero13ItemCollReactFRQ43scn4step4hero4Hero: /* 80342C70 0033EAB0 90 83 00 00 */ stw r4, 0(r3) @@ -493,7 +493,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17Sta __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12StateItemGet$$4PQ43scn4step4hero4Hero$$1Fv: /* 80343374 0033F1B4 4B EE B3 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258446 $$258446: .incbin "baserom.dol", 0x480E28, 0x20 @@ -507,7 +507,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick12Sta __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateGetShipParts$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x480E90, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258474 $$258474: .incbin "baserom.dol", 0x49D778, 0x8 diff --git a/asm/src/ItemDataAccessor.s b/asm/src/ItemDataAccessor.s index 916f08d7..9a96be45 100644 --- a/asm/src/ItemDataAccessor.s +++ b/asm/src/ItemDataAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global at__Q43scn4step3map16ItemDataAccessorCFUl at__Q43scn4step3map16ItemDataAccessorCFUl: /* 803CA19C 003C5FDC 80 63 00 00 */ lwz r3, 0(r3) diff --git a/asm/src/JITParam.s b/asm/src/JITParam.s index 717d4090..0b2babbd 100644 --- a/asm/src/JITParam.s +++ b/asm/src/JITParam.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q24util37PlacementNew$$0Q25param13ParamAccessor$$1Fv __dt__Q24util37PlacementNew$$0Q25param13ParamAccessor$$1Fv: /* 801DA2FC 001D613C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/KindUtil.s b/asm/src/KindUtil.s index 574b6db1..6557d050 100644 --- a/asm/src/KindUtil.s +++ b/asm/src/KindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DNAdd__Q43scn4step3map8KindUtilFRQ33hel6common47MutableArray$$0Q33hel6common15FixedString$$064$$1$$424$$1Q43scn4step3map4Kind DNAdd__Q43scn4step3map8KindUtilFRQ33hel6common47MutableArray$$0Q33hel6common15FixedString$$064$$1$$424$$1Q43scn4step3map4Kind: /* 803CA1B0 003C5FF0 94 21 FE 90 */ stwu r1, -0x170(r1) @@ -383,12 +383,12 @@ lbl_803CA680: ToLevelIndex__Q43scn4step3map8KindUtilFQ43scn4step3map4Kind: /* 803CA688 003C64C8 4B FF FE 80 */ b ToLevelKind__Q43scn4step3map8KindUtilFQ43scn4step3map4Kind -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_INFOS__Q43scn4step3map22$$2unnamed$$2KindUtil_cpp$$2 T_INFOS__Q43scn4step3map22$$2unnamed$$2KindUtil_cpp$$2: .incbin "baserom.dol", 0x41C538, 0x3E8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249154 $$249154: .incbin "baserom.dol", 0x48E9B8, 0xC @@ -429,7 +429,7 @@ $$250094: $$250108: .incbin "baserom.dol", 0x48EA6C, 0x1C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249155 $$249155: .incbin "baserom.dol", 0x498300, 0x8 diff --git a/asm/src/Kirby.s b/asm/src/Kirby.s index 5836f4dc..af2794ec 100644 --- a/asm/src/Kirby.s +++ b/asm/src/Kirby.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history5KirbyFRQ33scn7history9Component __ct__Q33scn7history5KirbyFRQ33scn7history9Component: /* 80208340 00204180 94 21 FE 20 */ stwu r1, -0x1e0(r1) @@ -1729,7 +1729,7 @@ __sinit_$$3Kirby_cpp: /* 80209C5C 00205A9C 38 21 00 10 */ addi r1, r1, 0x10 /* 80209C60 00205AA0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Anim__Q53scn4step4hero9modeldesc5KirbyFv Anim__Q53scn4step4hero9modeldesc5KirbyFv: /* 8035C634 00358474 38 00 00 0F */ li r0, 0xf @@ -1827,15 +1827,15 @@ lbl_8035C728: Script__Q53scn4step4hero9modeldesc5KirbyFv: /* 8035C778 003585B8 4B FF F4 34 */ b Script__Q53scn4step4hero9modeldesc6CommonFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402458, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc5KirbyFv$$2ENTRIES$$20: .incbin "baserom.dol", 0x419DD0, 0xE38 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254770 $$254770: .incbin "baserom.dol", 0x45D098, 0x20 @@ -1870,7 +1870,7 @@ $$254953: $$255043: .incbin "baserom.dol", 0x45D164, 0x3C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248734 $$248734: .incbin "baserom.dol", 0x485C40, 0xC @@ -2673,7 +2673,7 @@ $$249086: $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc5KirbyFv$$2NAMES$$20: .incbin "baserom.dol", 0x486D30, 0x78 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254931 $$254931: .incbin "baserom.dol", 0x4948F8, 0x8 @@ -2714,7 +2714,7 @@ $$254986: $$254995: .incbin "baserom.dol", 0x494954, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 $$248727: .incbin "baserom.dol", 0x4971C8, 0x8 @@ -2971,7 +2971,7 @@ $$249080: $$249176: .incbin "baserom.dol", 0x497460, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global PREV_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2 PREV_ANGLE__Q33scn7history19$$2unnamed$$2Kirby_cpp$$2: .incbin "baserom.dol", 0x49AB88, 0x4 diff --git a/asm/src/Kiss.s b/asm/src/Kiss.s index 310ef9a7..1dca652d 100644 --- a/asm/src/Kiss.s +++ b/asm/src/Kiss.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero4KissFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero4KissFRQ43scn4step4hero4Hero: /* 80343378 0033F1B8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1167,12 +1167,12 @@ lbl_80344378: /* 8034438C 003401CC 38 21 00 10 */ addi r1, r1, 0x10 /* 80344390 003401D0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1 __vt__Q24util211StateFactoryArg5$$0Q24util6IState$$4Q53scn4step4hero12interference9StateKiss$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1$$4Q43scn4step4hero11KissContext$$1: .incbin "baserom.dol", 0x480EA0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256609 $$256609: .incbin "baserom.dol", 0x496DD8, 0x1 @@ -1180,7 +1180,7 @@ $$256609: $$256610: .incbin "baserom.dol", 0x496DD9, 0x7 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258801 $$258801: .incbin "baserom.dol", 0x49D788, 0x4 diff --git a/asm/src/Knockback.s b/asm/src/Knockback.s index 12d7775e..aab66982 100644 --- a/asm/src/Knockback.s +++ b/asm/src/Knockback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara9KnockbackFRQ24gobj8Location __ct__Q43scn4step5chara9KnockbackFRQ24gobj8Location: /* 8026EFA8 0026ADE8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -99,7 +99,7 @@ reset__Q43scn4step5chara9KnockbackFv: /* 8026F0EC 0026AF2C D0 03 00 10 */ stfs f0, 0x10(r3) /* 8026F0F0 0026AF30 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250134 $$250134: .incbin "baserom.dol", 0x49B7D0, 0x4 diff --git a/asm/src/LadderInfo.s b/asm/src/LadderInfo.s index c7cac9d0..fe78b13c 100644 --- a/asm/src/LadderInfo.s +++ b/asm/src/LadderInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail10LadderInfoFv __ct__Q35mcoll6detail10LadderInfoFv: /* 801B789C 001B36DC 38 00 00 00 */ li r0, 0 @@ -33,7 +33,7 @@ leftBottomPos__Q35mcoll6detail10LadderInfoCFv: /* 801B78F0 001B3730 38 84 00 04 */ addi r4, r4, 4 /* 801B78F4 001B3734 4B F9 40 74 */ b __as__Q34nw4r4math5_VEC2FRCQ34nw4r4math5_VEC2 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249664 $$249664: .incbin "baserom.dol", 0x49A5A0, 0x8 diff --git a/asm/src/LandAttribute.s b/asm/src/LandAttribute.s index bde9a9d2..6de11739 100644 --- a/asm/src/LandAttribute.s +++ b/asm/src/LandAttribute.s @@ -1,13 +1,13 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setType__Q35mcoll6detail13LandAttributeFQ35mcoll6detail17LandAttributeType setType__Q35mcoll6detail13LandAttributeFQ35mcoll6detail17LandAttributeType: /* 801B78F8 001B3738 54 80 06 3E */ clrlwi r0, r4, 0x18 /* 801B78FC 001B373C 98 03 00 00 */ stb r0, 0(r3) /* 801B7900 001B3740 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero13LandAttributeFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero13LandAttributeFRQ43scn4step4hero4Hero: /* 80344394 003401D4 90 83 00 00 */ stw r4, 0(r3) @@ -512,7 +512,7 @@ lbl_80344A7C: /* 80344A7C 003408BC 38 60 00 00 */ li r3, 0 /* 80344A80 003408C0 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global EFFECT_TABLE_L__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2 EFFECT_TABLE_L__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2: .incbin "baserom.dol", 0x4160E0, 0x30 @@ -526,12 +526,12 @@ EFFECT_TABLE_LANDING__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2: SE_TABLE__Q43scn4step4hero27$$2unnamed$$2LandAttribute_cpp$$2: .incbin "baserom.dol", 0x416170, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253793 $$253793: .incbin "baserom.dol", 0x480EB0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253684 $$253684: .incbin "baserom.dol", 0x49D798, 0x8 diff --git a/asm/src/LandConstraint.s b/asm/src/LandConstraint.s index f1d9ebeb..37ec5059 100644 --- a/asm/src/LandConstraint.s +++ b/asm/src/LandConstraint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara14LandConstraintFRQ33scn4step9ComponentRQ24gobj8LocationPCQ24gobj9FootStatePCQ43scn4step5ostop5ActorQ53scn4step5chara14LandConstraint4Mode __ct__Q43scn4step5chara14LandConstraintFRQ33scn4step9ComponentRQ24gobj8LocationPCQ24gobj9FootStatePCQ43scn4step5ostop5ActorQ53scn4step5chara14LandConstraint4Mode: /* 8026F0F4 0026AF34 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -379,7 +379,7 @@ lbl_8026F600: /* 8026F610 0026B450 38 21 00 50 */ addi r1, r1, 0x50 /* 8026F614 0026B454 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253036 $$253036: .incbin "baserom.dol", 0x49B7F0, 0x8 diff --git a/asm/src/LandGatherOption.s b/asm/src/LandGatherOption.s index 0734d8dd..21a64e69 100644 --- a/asm/src/LandGatherOption.s +++ b/asm/src/LandGatherOption.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail16LandGatherOptionFv __ct__Q35mcoll6detail16LandGatherOptionFv: /* 801B7904 001B3744 38 00 00 00 */ li r0, 0 diff --git a/asm/src/LandGrid.s b/asm/src/LandGrid.s index 40688c8e..3eb6993a 100644 --- a/asm/src/LandGrid.s +++ b/asm/src/LandGrid.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail8LandGridFv __ct__Q35mcoll6detail8LandGridFv: /* 801B7934 001B3774 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/LandLayer.s b/asm/src/LandLayer.s index 9e0a389a..e2202bd4 100644 --- a/asm/src/LandLayer.s +++ b/asm/src/LandLayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_tryToAddCollideTarget__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2FRCQ35mcoll6detail9LandLayerRQ35mcoll6detail18CollideTargetReposQ35mcoll6detail17LandGridShapeKindRCQ45mcoll6detail23$$2unnamed$$2LandLayer_cpp$$215T_GridShapeInfoQ55mcoll6detail23$$2unnamed$$2LandLayer_cpp$$215T_GridShapeInfo8EdgeKindRCQ33hel4math7Vector2bUlUlRCQ33hel4math7Vector2Q55mcoll6detail23$$2unnamed$$2LandLayer_cpp$$215T_GridShapeInfo8EdgeKindRCQ35mcoll6detail12LandPropertyQ35mcoll6detail13LandAttributeRCQ35mcoll6detail16LandGatherOption t_tryToAddCollideTarget__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2FRCQ35mcoll6detail9LandLayerRQ35mcoll6detail18CollideTargetReposQ35mcoll6detail17LandGridShapeKindRCQ45mcoll6detail23$$2unnamed$$2LandLayer_cpp$$215T_GridShapeInfoQ55mcoll6detail23$$2unnamed$$2LandLayer_cpp$$215T_GridShapeInfo8EdgeKindRCQ33hel4math7Vector2bUlUlRCQ33hel4math7Vector2Q55mcoll6detail23$$2unnamed$$2LandLayer_cpp$$215T_GridShapeInfo8EdgeKindRCQ35mcoll6detail12LandPropertyQ35mcoll6detail13LandAttributeRCQ35mcoll6detail16LandGatherOption: /* 801B80D4 001B3F14 94 21 FF 30 */ stwu r1, -0xd0(r1) @@ -1788,15 +1788,15 @@ __sinit_$$3LandLayer_cpp: /* 801B9AC8 001B5908 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801B9ACC 001B590C 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40242C, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: .incbin "baserom.dol", 0x454198, 0xDD0 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_NORMAL_WALL_L__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2 T_NORMAL_WALL_L__Q35mcoll6detail23$$2unnamed$$2LandLayer_cpp$$2: .incbin "baserom.dol", 0x49A5A8, 0x4 diff --git a/asm/src/LandManager.s b/asm/src/LandManager.s index fe258d22..5c4def99 100644 --- a/asm/src/LandManager.s +++ b/asm/src/LandManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25mcoll11LandManagerFRQ23mem10IAllocator __ct__Q25mcoll11LandManagerFRQ23mem10IAllocator: /* 801B16D8 001AD518 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1257,7 +1257,7 @@ lbl_801B27D0: /* 801B27E0 001AE620 38 21 00 40 */ addi r1, r1, 0x40 /* 801B27E4 001AE624 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3map11LandManagerFRQ23mem10IAllocatorRCQ43scn4step3map12DataAccessor __ct__Q43scn4step3map11LandManagerFRQ23mem10IAllocatorRCQ43scn4step3map12DataAccessor: /* 803CA68C 003C64CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1303,7 +1303,7 @@ mgAccessor__Q43scn4step3map11LandManagerCFv: /* 803CA708 003C6548 38 63 02 2C */ addi r3, r3, 0x22c /* 803CA70C 003C654C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253368 $$253368: .incbin "baserom.dol", 0x49A520, 0x8 diff --git a/asm/src/LandProperty.s b/asm/src/LandProperty.s index 6e790e62..eab9cbe4 100644 --- a/asm/src/LandProperty.s +++ b/asm/src/LandProperty.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail12LandPropertyFv __ct__Q35mcoll6detail12LandPropertyFv: /* 801B9AD0 001B5910 38 00 00 00 */ li r0, 0 diff --git a/asm/src/LandSet.s b/asm/src/LandSet.s index 8cb669da..ecdcfc2c 100644 --- a/asm/src/LandSet.s +++ b/asm/src/LandSet.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail7LandSetFRQ23mem10IAllocator __ct__Q35mcoll6detail7LandSetFRQ23mem10IAllocator: /* 801B9AE0 001B5920 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Landing.s b/asm/src/Landing.s index 7063fbd3..0c69881a 100644 --- a/asm/src/Landing.s +++ b/asm/src/Landing.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setLandingPosForGimmick__Q43scn4step4hero7LandingFv setLandingPosForGimmick__Q43scn4step4hero7LandingFv: /* 80344A84 003408C4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -130,7 +130,7 @@ lbl_80344C24: /* 80344C3C 00340A7C 38 21 00 40 */ addi r1, r1, 0x40 /* 80344C40 00340A80 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252449 $$252449: .incbin "baserom.dol", 0x49D7A0, 0x4 diff --git a/asm/src/Layout.s b/asm/src/Layout.s index 5b8a4545..ea4d87c3 100644 --- a/asm/src/Layout.s +++ b/asm/src/Layout.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23lyt6LayoutFRCQ23lyt13LayoutContext __ct__Q23lyt6LayoutFRCQ23lyt13LayoutContext: /* 801AC190 001A7FD0 94 21 F9 E0 */ stwu r1, -0x620(r1) @@ -2070,7 +2070,7 @@ lbl_801ADCD4: /* 801ADD5C 001A9B9C 38 21 00 20 */ addi r1, r1, 0x20 /* 801ADD60 001A9BA0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255792 $$255792: .incbin "baserom.dol", 0x453970, 0x10 @@ -2111,7 +2111,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout $$2STRING$$2GetBack__Q34nw4r2ut73LinkList$$0Q24util52ObjListNode$$0Q23lyt6Layout$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x453A7C, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255793 $$255793: .incbin "baserom.dol", 0x493538, 0x4 @@ -2125,7 +2125,7 @@ $$256337: $$256338: .incbin "baserom.dol", 0x493548, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256461 $$256461: .incbin "baserom.dol", 0x49A4C0, 0x8 diff --git a/asm/src/LayoutContext.s b/asm/src/LayoutContext.s index 1a6a4423..53254287 100644 --- a/asm/src/LayoutContext.s +++ b/asm/src/LayoutContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23lyt13LayoutContextFPCcPCcRQ23mem10IAllocator __ct__Q23lyt13LayoutContextFPCcPCcRQ23mem10IAllocator: /* 801ADD64 001A9BA4 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/LevelKindUtil.s b/asm/src/LevelKindUtil.s index 2ffe480e..c23c00e8 100644 --- a/asm/src/LevelKindUtil.s +++ b/asm/src/LevelKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ToLevelKind__Q33scn4step13LevelKindUtilFQ43scn4step3map4Kind ToLevelKind__Q33scn4step13LevelKindUtilFQ43scn4step3map4Kind: /* 80221668 0021D4A8 2C 03 00 2D */ cmpwi r3, 0x2d diff --git a/asm/src/LibInitializer.s b/asm/src/LibInitializer.s index 2b63eebf..1f812e3d 100644 --- a/asm/src/LibInitializer.s +++ b/asm/src/LibInitializer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_wpadAlloc__28$$2unnamed$$2LibInitializer_cpp$$2FUl t_wpadAlloc__28$$2unnamed$$2LibInitializer_cpp$$2FUl: /* 801A383C 0019F67C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -155,7 +155,7 @@ lbl_801A3A40: /* 801A3A54 0019F894 38 21 00 10 */ addi r1, r1, 0x10 /* 801A3A58 0019F898 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249040 $$249040: .incbin "baserom.dol", 0x49A458, 0x4 diff --git a/asm/src/Lifetime.s b/asm/src/Lifetime.s index 25abf30a..171ac31d 100644 --- a/asm/src/Lifetime.s +++ b/asm/src/Lifetime.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara8LifetimeFv __ct__Q43scn4step5chara8LifetimeFv: /* 8026F618 0026B458 38 00 00 01 */ li r0, 1 diff --git a/asm/src/LightSetAccessor.s b/asm/src/LightSetAccessor.s index fa982281..25a5b40b 100644 --- a/asm/src/LightSetAccessor.s +++ b/asm/src/LightSetAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isValid__Q23g3d16LightSetAccessorCFv isValid__Q23g3d16LightSetAccessorCFv: /* 8018E64C 0018A48C 38 80 00 00 */ li r4, 0 diff --git a/asm/src/LoadIcon.s b/asm/src/LoadIcon.s index cb0b7942..03e638f3 100644 --- a/asm/src/LoadIcon.s +++ b/asm/src/LoadIcon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn5anime8LoadIconFRQ23mem10IAllocator __ct__Q33scn5anime8LoadIconFRQ23mem10IAllocator: /* 801E0BC0 001DCA00 94 21 FE E0 */ stwu r1, -0x120(r1) @@ -200,7 +200,7 @@ disappear__Q33scn5anime8LoadIconFv: /* 801E0E7C 001DCCBC 90 03 00 00 */ stw r0, 0(r3) /* 801E0E80 001DCCC0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252060 $$252060: .incbin "baserom.dol", 0x459E40, 0xC @@ -211,7 +211,7 @@ $$252061: $$252062: .incbin "baserom.dol", 0x459E58, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252063 $$252063: .incbin "baserom.dol", 0x493DC0, 0x8 @@ -225,7 +225,7 @@ $$252106: $$252107: .incbin "baserom.dol", 0x493DD8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252064 $$252064: .incbin "baserom.dol", 0x49A828, 0x4 diff --git a/asm/src/Loader.s b/asm/src/Loader.s index 957c4397..cec59b8d 100644 --- a/asm/src/Loader.s +++ b/asm/src/Loader.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global load__Q33scn2vc6LoaderFQ33scn2vc11ContentKind load__Q33scn2vc6LoaderFQ33scn2vc11ContentKind: /* 803F2834 003EE674 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -28,7 +28,7 @@ load__Q33scn2vc6LoaderFQ33scn2vc11ContentKind: /* 803F288C 003EE6CC 38 21 00 10 */ addi r1, r1, 0x10 /* 803F2890 003EE6D0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250070 $$250070: .incbin "baserom.dol", 0x491648, 0x18 diff --git a/asm/src/Locale.s b/asm/src/Locale.s index 3ee69933..a4bd6b60 100644 --- a/asm/src/Locale.s +++ b/asm/src/Locale.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global FilePostfix__Q23app6LocaleFv FilePostfix__Q23app6LocaleFv: /* 801793AC 001751EC 3C 60 80 41 */ lis r3, T_POSTS_US__Q23app20$$2unnamed$$2Locale_cpp$$2@ha @@ -8,7 +8,7 @@ FilePostfix__Q23app6LocaleFv: /* 801793B4 001751F4 80 63 00 04 */ lwz r3, 4(r3) /* 801793B8 001751F8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global commify__Q33hel6common6LocaleFiQ43hel6common6Locale8Language commify__Q33hel6common6LocaleFiQ43hel6common6Locale8Language: /* 8019DA54 00199894 94 21 F6 B0 */ stwu r1, -0x950(r1) @@ -287,17 +287,17 @@ lbl_8019DDFC: /* 8019DE1C 00199C5C 38 21 03 10 */ addi r1, r1, 0x310 /* 8019DE20 00199C60 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_POSTS_US__Q23app20$$2unnamed$$2Locale_cpp$$2 T_POSTS_US__Q23app20$$2unnamed$$2Locale_cpp$$2: .incbin "baserom.dol", 0x4105E0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249074 $$249074: .incbin "baserom.dol", 0x452AD0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250071 $$250071: .incbin "baserom.dol", 0x492FD8, 0x8 @@ -320,7 +320,7 @@ $$250076: $$250077: .incbin "baserom.dol", 0x493008, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249050 $$249050: .incbin "baserom.dol", 0x493240, 0x8 diff --git a/asm/src/Location.s b/asm/src/Location.s index 5a2a0db5..f9c8cf99 100644 --- a/asm/src/Location.s +++ b/asm/src/Location.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj8LocationFRCQ24gobj12LocationDesc __ct__Q24gobj8LocationFRCQ24gobj12LocationDesc: /* 8019A954 00196794 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -44,7 +44,7 @@ updatePrevPos__Q24gobj8LocationFv: /* 8019A9C8 00196808 38 63 00 0C */ addi r3, r3, 0xc /* 8019A9CC 0019680C 4B FE 1B 80 */ b __as__Q33hel4math7Vector3FRCQ33hel4math7Vector3 -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara8LocationFRCQ33hel4math7Vector3RCQ33hel4math7Vector3 __ct__Q43scn4step5chara8LocationFRCQ33hel4math7Vector3RCQ33hel4math7Vector3: /* 8026F65C 0026B49C 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/LocationDesc.s b/asm/src/LocationDesc.s index 3f4c480d..b8178710 100644 --- a/asm/src/LocationDesc.s +++ b/asm/src/LocationDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q24gobj12LocationDescFRCQ33hel4math7Vector3 Create__Q24gobj12LocationDescFRCQ33hel4math7Vector3: /* 8019A9D0 00196810 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/LogoutController.s b/asm/src/LogoutController.s index 978cfd6b..046632d2 100644 --- a/asm/src/LogoutController.s +++ b/asm/src/LogoutController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero16LogoutControllerFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero16LogoutControllerFRQ43scn4step4hero4Hero: /* 80344C44 00340A84 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Lose.s b/asm/src/Lose.s index 6b3d49f1..018312f6 100644 --- a/asm/src/Lose.s +++ b/asm/src/Lose.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge4LoseFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge4LoseFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B36C8 003AF508 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -140,12 +140,12 @@ lbl_803B38A4: /* 803B38B0 003AF6F0 38 21 00 30 */ addi r1, r1, 0x30 /* 803B38B4 003AF6F4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253395 $$253395: .incbin "baserom.dol", 0x48C618, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253396 $$253396: .incbin "baserom.dol", 0x497BB8, 0x8 diff --git a/asm/src/LowBattery.s b/asm/src/LowBattery.s index f1ba2e2d..10025458 100644 --- a/asm/src/LowBattery.s +++ b/asm/src/LowBattery.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info6common10LowBatteryFRQ23mem10IAllocatorUl __ct__Q34info6common10LowBatteryFRQ23mem10IAllocatorUl: /* 801A9DC0 001A5C00 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -251,7 +251,7 @@ start__Q34info6common10LowBatteryFv: /* 801AA10C 001A5F4C 38 21 00 30 */ addi r1, r1, 0x30 /* 801AA110 001A5F50 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252080 $$252080: .incbin "baserom.dol", 0x4536D0, 0xC @@ -259,7 +259,7 @@ $$252080: $$252081: .incbin "baserom.dol", 0x4536DC, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252134 $$252134: .incbin "baserom.dol", 0x493478, 0x4 diff --git a/asm/src/LvMap.s b/asm/src/LvMap.s index b6077020..5e5ead2a 100644 --- a/asm/src/LvMap.s +++ b/asm/src/LvMap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap5LvMapFRQ33scn4step9ComponentRQ43scn4step4info14InfoGameStatusRQ23g3d4Root __ct__Q53scn4step4info5lvmap5LvMapFRQ33scn4step9ComponentRQ43scn4step4info14InfoGameStatusRQ23g3d4Root: /* 803BDFD8 003B9E18 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -454,7 +454,7 @@ frameControl__Q53scn4step4info5lvmap5LvMapFv: /* 803BE5F4 003BA434 38 63 04 18 */ addi r3, r3, 0x418 /* 803BE5F8 003BA438 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254826 $$254826: .incbin "baserom.dol", 0x48D900, 0x10 @@ -462,7 +462,7 @@ $$254826: $$254828: .incbin "baserom.dol", 0x48D910, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254825 $$254825: .incbin "baserom.dol", 0x498000, 0x8 diff --git a/asm/src/Mahoroa.s b/asm/src/Mahoroa.s index c2a6565a..d14dfccc 100644 --- a/asm/src/Mahoroa.s +++ b/asm/src/Mahoroa.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle7MahoroaFRQ33scn14challengetitle9ComponentRQ23g3d8StdModel __ct__Q33scn14challengetitle7MahoroaFRQ33scn14challengetitle9ComponentRQ23g3d8StdModel: /* 801EE6F8 001EA538 94 21 FE B0 */ stwu r1, -0x150(r1) @@ -338,7 +338,7 @@ lbl_801EEBAC: /* 801EEBC8 001EAA08 38 21 00 30 */ addi r1, r1, 0x30 /* 801EEBCC 001EAA0C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick7mahoroa7MahoroaFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick7mahoroa7MahoroaFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80313300 0030F140 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1078,7 +1078,7 @@ __sinit_$$3Mahoroa_cpp: /* 80313D78 0030FBB8 90 03 01 40 */ stw r0, 0x140(r3) /* 80313D7C 0030FBBC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7MahoroaFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero7MahoroaFRQ43scn4step4hero4Hero: /* 80344E68 00340CA8 90 83 00 00 */ stw r4, 0(r3) @@ -1193,15 +1193,15 @@ lbl_80344FD4: /* 80344FE0 00340E20 38 21 00 10 */ addi r1, r1, 0x10 /* 80344FE4 00340E24 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025B0, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2 T_ANIM_ENTRIES__Q53scn4step7gimmick7mahoroa21$$2unnamed$$2Mahoroa_cpp$$2: .incbin "baserom.dol", 0x415AE8, 0xB8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253502 $$253502: .incbin "baserom.dol", 0x45AD78, 0x1C @@ -1224,7 +1224,7 @@ $$253579: $$253580: .incbin "baserom.dol", 0x45ADD4, 0x44 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255208 $$255208: .incbin "baserom.dol", 0x47D6B8, 0x10 @@ -1280,12 +1280,12 @@ $$258000: $$258002: .incbin "baserom.dol", 0x47D970, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253503 $$253503: .incbin "baserom.dol", 0x494150, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255203 $$255203: .incbin "baserom.dol", 0x496B88, 0x8 @@ -1335,7 +1335,7 @@ $$255227: $$258001: .incbin "baserom.dol", 0x496C00, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253575 $$253575: .incbin "baserom.dol", 0x49A948, 0x4 @@ -1343,7 +1343,7 @@ $$253575: $$253577: .incbin "baserom.dol", 0x49A94C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257700 $$257700: .incbin "baserom.dol", 0x49D440, 0x4 diff --git a/asm/src/Main.s b/asm/src/Main.s index ecfa58e3..e68eda4d 100644 --- a/asm/src/Main.s +++ b/asm/src/Main.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global main main: /* 80174AD8 00170918 7C 60 1B 78 */ mr r0, r3 @@ -14,7 +14,7 @@ lbl_80174AF0: lbl_80174AF4: /* 80174AF4 00170934 48 00 2B C8 */ b Run__Q23app10EntryPointFbPCc -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn5anime4MainFQ23mov9MovieKind __ct__Q33scn5anime4MainFQ23mov9MovieKind: /* 801E0E84 001DCCC4 94 21 FE 10 */ stwu r1, -0x1f0(r1) @@ -1230,7 +1230,7 @@ lbl_801E1F3C: /* 801E1F3C 001DDD7C 38 60 00 00 */ li r3, 0 /* 801E1F40 001DDD80 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tBGM__Q33scn14challengetitle18$$2unnamed$$2Main_cpp$$2Fv tBGM__Q33scn14challengetitle18$$2unnamed$$2Main_cpp$$2Fv: /* 801EEBD0 001EAA10 80 6D ED 04 */ lwz r3, object___Q33hel6common39ExplicitSingleton$$0Q23snd12SoundManager$$1-_SDA_BASE_(r13) @@ -1847,7 +1847,7 @@ lbl_801EF448: /* 801EF47C 001EB2BC 38 21 00 20 */ addi r1, r1, 0x20 /* 801EF480 001EB2C0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn5comic4MainFQ33scn5comic9ComicKind __ct__Q33scn5comic4MainFQ33scn5comic9ComicKind: /* 801FD0C8 001F8F08 94 21 F7 D0 */ stwu r1, -0x830(r1) @@ -5233,7 +5233,7 @@ lbl_8020015C: /* 80200178 001FBFB8 38 21 00 10 */ addi r1, r1, 0x10 /* 8020017C 001FBFBC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle4MainFbb __ct__Q33scn10grandtitle4MainFbb: /* 802054A0 002012E0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -5801,7 +5801,7 @@ lbl_80205C8C: /* 80205CC0 00201B00 38 21 00 20 */ addi r1, r1, 0x20 /* 80205CC4 00201B04 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history4MainFbbRCQ33scn7history7Memento __ct__Q33scn7history4MainFbbRCQ33scn7history7Memento: /* 80209C64 00205AA4 94 21 FE 20 */ stwu r1, -0x1e0(r1) @@ -9025,7 +9025,7 @@ __dt__Q43std3tr16detail275function_imp$$0PFv_v$$4Q43std3tr16detail231bound_func$ __dt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$$0v$$4Q43std3tr16detail40mem_fn_0$$0v$$4Q33scn7history12PackageHelps$$1$$4Q33std3tr1171tuple$$0PQ33scn7history12PackageHelps$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv: /* 8020CA54 00208894 4B FD C7 2C */ b __dt__Q43std3tr16detail360function_imp$$0PFv_v$$4Q43std3tr16detail316bound_func$$0v$$4Q43std3tr16detail54mem_fn_0$$0v$$4Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr1215tuple$$0Q33std3tr161reference_wrapper$$0Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn11packagelist4MainFv __ct__Q33scn11packagelist4MainFv: /* 8021C05C 00217E9C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -9653,7 +9653,7 @@ __ct__Q43std3tr16detail330function_imp$$0PFv_b$$4Q43std3tr16detail286bound_func$ __dt__Q43std3tr16detail330function_imp$$0PFv_b$$4Q43std3tr16detail286bound_func$$0b$$4Q43std3tr16detail40mem_fn_0_c$$0b$$4Q34info6common10ButtonHelp$$1$$4Q33std3tr1199tuple$$0Q33std3tr145reference_wrapper$$0Q34info6common10ButtonHelp$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv: /* 8021C950 00218790 4B FC C7 D4 */ b __dt__Q43std3tr16detail362function_imp$$0PFv_b$$4Q43std3tr16detail318bound_func$$0b$$4Q43std3tr16detail56mem_fn_0_c$$0b$$4Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr1215tuple$$0Q33std3tr161reference_wrapper$$0Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __vc__Q33hel6common49MutableArray$$0Q43scn4step7gimmick12StepMoveInfo$$48$$1FUl __vc__Q33hel6common49MutableArray$$0Q43scn4step7gimmick12StepMoveInfo$$48$$1FUl: /* 80276A18 00272858 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -10484,7 +10484,7 @@ lbl_80277594: /* 802775A4 002733E4 38 21 00 40 */ addi r1, r1, 0x40 /* 802775A8 002733E8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn2vc4MainFQ33scn2vc11ContentKind __ct__Q33scn2vc4MainFQ33scn2vc11ContentKind: /* 803F2894 003EE6D4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -10511,7 +10511,7 @@ __ct__Q33scn2vc4MainFQ33scn2vc11ContentKind: /* 803F28E8 003EE728 38 21 00 10 */ addi r1, r1, 0x10 /* 803F28EC 003EE72C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn9grandmenu4MainFQ33scn9grandmenu8ModeKindb __ct__Q33scn9grandmenu4MainFQ33scn9grandmenu8ModeKindb: /* 803F39F4 003EF834 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -10919,12 +10919,12 @@ lbl_803F3F7C: /* 803F3F88 003EFDC8 38 21 00 10 */ addi r1, r1, 0x10 /* 803F3F8C 003EFDCC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global COMIC_INFO_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2 COMIC_INFO_TABLE__Q33scn5comic18$$2unnamed$$2Main_cpp$$2: .incbin "baserom.dol", 0x411BD8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254402 $$254402: .incbin "baserom.dol", 0x459E98, 0x10 @@ -10956,7 +10956,7 @@ $$254411: $$254412: .incbin "baserom.dol", 0x459F20, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257307 $$257307: .incbin "baserom.dol", 0x45AE18, 0x14 @@ -10967,7 +10967,7 @@ $$257308: $$257309: .incbin "baserom.dol", 0x45AE44, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251866 $$251866: .incbin "baserom.dol", 0x45C2E8, 0x10 @@ -11029,7 +11029,7 @@ $$258412: $$258413: .incbin "baserom.dol", 0x45C3E8, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$262253 $$262253: .incbin "baserom.dol", 0x45D1A0, 0x10 @@ -11130,7 +11130,7 @@ __vt__Q43std3tr16detail302function_imp$$0PFv_v$$4Q43std3tr16detail258bound_func$ __vt__Q43std3tr16detail288function_imp$$0PFv_b$$4Q43std3tr16detail244bound_func$$0b$$4Q43std3tr16detail34mem_fn_0_c$$0b$$4Q33scn7history5Kirby$$1$$4Q33std3tr1163tuple$$0PQ33scn7history5Kirby$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .incbin "baserom.dol", 0x45D3A0, 0xC0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255596 $$255596: .incbin "baserom.dol", 0x45F900, 0x10 @@ -11156,7 +11156,7 @@ $$255659: __vt__Q43std3tr16detail330function_imp$$0PFv_b$$4Q43std3tr16detail286bound_func$$0b$$4Q43std3tr16detail40mem_fn_0_c$$0b$$4Q34info6common10ButtonHelp$$1$$4Q33std3tr1199tuple$$0Q33std3tr145reference_wrapper$$0Q34info6common10ButtonHelp$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .incbin "baserom.dol", 0x45F960, 0xC0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255477 $$255477: .incbin "baserom.dol", 0x468888, 0x18 @@ -11182,12 +11182,12 @@ $$255529: $$255530: .incbin "baserom.dol", 0x468910, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248781 $$248781: .incbin "baserom.dol", 0x492F50, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254408 $$254408: .incbin "baserom.dol", 0x493DE0, 0x4 @@ -11198,7 +11198,7 @@ $$254413: $$254414: .incbin "baserom.dol", 0x493DE8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257643 $$257643: .incbin "baserom.dol", 0x494628, 0x8 @@ -11281,7 +11281,7 @@ $$258406: $$258419: .incbin "baserom.dol", 0x4946E8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$262255 $$262255: .incbin "baserom.dol", 0x494960, 0x8 @@ -11304,7 +11304,7 @@ $$262269: $$262270: .incbin "baserom.dol", 0x49498C, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255597 $$255597: .incbin "baserom.dol", 0x495160, 0x8 @@ -11318,7 +11318,7 @@ $$255599: $$255602: .incbin "baserom.dol", 0x495178, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254657 $$254657: .incbin "baserom.dol", 0x49A830, 0x4 @@ -11326,12 +11326,12 @@ $$254657: $$254658: .incbin "baserom.dol", 0x49A834, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256391 $$256391: .incbin "baserom.dol", 0x49A950, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251904 $$251904: .incbin "baserom.dol", 0x49AA10, 0x4 @@ -11363,7 +11363,7 @@ $$258106: $$258107: .incbin "baserom.dol", 0x49AA40, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257239 $$257239: .incbin "baserom.dol", 0x49AB10, 0x4 @@ -11377,7 +11377,7 @@ $$257241: $$257242: .incbin "baserom.dol", 0x49AB1C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$262204 $$262204: .incbin "baserom.dol", 0x49AC00, 0x4 @@ -11397,7 +11397,7 @@ $$262264: $$262265: .incbin "baserom.dol", 0x49AC14, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254093 $$254093: .incbin "baserom.dol", 0x49ED68, 0x4 diff --git a/asm/src/MainCamera.s b/asm/src/MainCamera.s index edd8f9cf..0b626031 100644 --- a/asm/src/MainCamera.s +++ b/asm/src/MainCamera.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera10MainCameraFRQ33scn4step9Component __ct__Q43scn4step6camera10MainCameraFRQ33scn4step9Component: /* 8026561C 0026145C 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -942,7 +942,7 @@ lbl_80266268: /* 80266274 002620B4 38 21 00 10 */ addi r1, r1, 0x10 /* 80266278 002620B8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252770 $$252770: .incbin "baserom.dol", 0x49B660, 0x4 diff --git a/asm/src/Manager.s b/asm/src/Manager.s index 7cc54c58..6afd3ba7 100644 --- a/asm/src/Manager.s +++ b/asm/src/Manager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26effect7ManagerFRCQ36effect6detail14ManagerContext __ct__Q26effect7ManagerFRCQ36effect6detail14ManagerContext: /* 8017E53C 0017A37C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -125,7 +125,7 @@ updatePolyMtxAll__Q26effect7ManagerFv: updatePtclAll__Q26effect7ManagerFRCQ36effect6detail10CameraInfo: /* 8017E66C 0017A4AC 48 00 28 C4 */ b updatePtclAll__Q36effect6detail13EffectManagerFRCQ36effect6detail10CameraInfo -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info5cutin7ManagerFRQ33scn4step9ComponentRQ23mem10IAllocator __ct__Q34info5cutin7ManagerFRQ33scn4step9ComponentRQ23mem10IAllocator: /* 801AB604 001A7444 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -447,7 +447,7 @@ lbl_801ABA44: /* 801ABA44 001A7884 7C 83 23 78 */ mr r3, r4 /* 801ABA48 001A7888 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Halt__Q24mint21$$2unnamed$$2Manager_cpp$$2Fv t_Halt__Q24mint21$$2unnamed$$2Manager_cpp$$2Fv: /* 801C05FC 001BC43C 3C 60 80 46 */ lis r3, $$251648@ha @@ -563,7 +563,7 @@ scriptArchive__Q24mint7ManagerCFv: /* 801C0770 001BC5B0 38 63 01 24 */ addi r3, r3, 0x124 /* 801C0774 001BC5B4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23msg7ManagerFv __ct__Q23msg7ManagerFv: /* 801D0E54 001CCC94 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1000,7 +1000,7 @@ __sinit_$$3Manager_cpp: /* 801D13FC 001CD23C 38 6D EE B8 */ addi r3, r13, t_manager__Q23msg21$$2unnamed$$2Manager_cpp$$2-_SDA_BASE_ /* 801D1400 001CD240 4B F0 BF E0 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26nururi7ManagerFv __ct__Q26nururi7ManagerFv: /* 801D3028 001CEE68 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1330,7 +1330,7 @@ getUID__Q26nururi7ManagerFv: /* 801D3474 001CF2B4 7C 03 03 78 */ mr r3, r0 /* 801D3478 001CF2B8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll7ManagerFRQ23mem10IAllocatorUl __ct__Q25ocoll7ManagerFRQ23mem10IAllocatorUl: /* 801D6F9C 001D2DDC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2604,7 +2604,7 @@ registerBlockManager__Q25ocoll7ManagerFRQ53scn4step7gimmick5block12BlockManager: /* 801D8054 001D3E94 38 21 00 10 */ addi r1, r1, 0x10 /* 801D8058 001D3E98 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ostop7ManagerFv __ct__Q25ostop7ManagerFv: /* 801D9BA4 001D59E4 38 A0 00 00 */ li r5, 0 @@ -3165,7 +3165,7 @@ lbl_801DA2C4: /* 801DA2D4 001D6114 38 21 00 20 */ addi r1, r1, 0x20 /* 801DA2D8 001D6118 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn15challengeresult6effect7ManagerFRQ23g3d4RootRQ23g3d4Root __ct__Q43scn15challengeresult6effect7ManagerFRQ23g3d4RootRQ23g3d4Root: /* 801F10C0 001ECF00 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -3431,7 +3431,7 @@ drawFront__Q43scn15challengeresult6effect7ManagerFv: /* 801F147C 001ED2BC 38 21 00 F0 */ addi r1, r1, 0xf0 /* 801F1480 001ED2C0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn15challengeresult4info7ManagerFRQ33scn15challengeresult20SceneChallengeResult __ct__Q43scn15challengeresult4info7ManagerFRQ33scn15challengeresult20SceneChallengeResult: /* 801F1584 001ED3C4 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -3833,7 +3833,7 @@ drawFront__Q43scn15challengeresult4info7ManagerCFv: /* 801F1B24 001ED964 38 21 00 10 */ addi r1, r1, 0x10 /* 801F1B28 001ED968 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn17challengetutorial4info7ManagerFb __ct__Q43scn17challengetutorial4info7ManagerFb: /* 801F9940 001F5780 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -4114,7 +4114,7 @@ draw__Q43scn17challengetutorial4info7ManagerCFv: /* 801F9D20 001F5B60 38 21 00 10 */ addi r1, r1, 0x10 /* 801F9D24 001F5B64 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step2bg7ManagerFRQ33scn4step9Component __ct__Q43scn4step2bg7ManagerFRQ33scn4step9Component: /* 80227260 002230A0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4472,7 +4472,7 @@ onStopPowerfulStarted__Q43scn4step2bg7ManagerFRCQ25ostop5Actor: onStopPowerfulFinished__Q43scn4step2bg7ManagerFRCQ25ostop5Actor: /* 802276D0 00223510 4B EE 27 30 */ b OnShutdownSoundThread__Q44nw4r3snd6detail9SeqPlayerFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q43scn4step4hero17AbilityCustomBase$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q43scn4step4hero17AbilityCustomBase$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80230D98 0022CBD8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5817,7 +5817,7 @@ lbl_80231EF8: /* 80231F10 0022DD50 38 21 00 20 */ addi r1, r1, 0x20 /* 80231F14 0022DD54 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global resFile100Minus__Q43scn4step9challenge7ManagerFv resFile100Minus__Q43scn4step9challenge7ManagerFv: /* 80268224 00264064 80 63 02 58 */ lwz r3, 0x258(r3) @@ -7297,7 +7297,7 @@ lbl_80269634: /* 80269650 00265490 38 21 00 20 */ addi r1, r1, 0x20 /* 80269654 00265494 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6effect7ManagerFRQ33scn4step9Component __ct__Q43scn4step6effect7ManagerFRQ33scn4step9Component: /* 8027AB84 002769C4 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -7630,7 +7630,7 @@ createCameraInfo__Q43scn4step6effect7ManagerFQ43scn4step6camera4Kind: /* 8027AFE4 00276E24 38 21 00 60 */ addi r1, r1, 0x60 /* 8027AFE8 00276E28 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_maxCount__Q43scn4step5enemy21$$2unnamed$$2Manager_cpp$$2FRQ33scn4step9Component t_maxCount__Q43scn4step5enemy21$$2unnamed$$2Manager_cpp$$2FRQ33scn4step9Component: /* 80288D8C 00284BCC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -9179,7 +9179,7 @@ __dt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11Sta __dt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6bouncy11StatePraise$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv: /* 8028A278 002860B8 4B FA 44 28 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick7ManagerFRQ33scn4step9Component __ct__Q43scn4step7gimmick7ManagerFRQ33scn4step9Component: /* 802F4254 002F0094 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -12478,7 +12478,7 @@ isObjNotStoppedCannon__Q43scn4step7gimmick7ManagerFv: /* 802F70C0 002F2F00 38 21 00 10 */ addi r1, r1, 0x10 /* 802F70C4 002F2F04 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick7airflow7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick7airflow7ManagerFRQ33scn4step9Component: /* 802F926C 002F50AC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -13016,7 +13016,7 @@ lbl_802F99C4: /* 802F99DC 002F581C 38 21 00 30 */ addi r1, r1, 0x30 /* 802F99E0 002F5820 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsFirstPlay__Q53scn4step7gimmick11areamapdemo7ManagerFRQ33scn4step9Component IsFirstPlay__Q53scn4step7gimmick11areamapdemo7ManagerFRQ33scn4step9Component: /* 802FCDF8 002F8C38 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -14160,7 +14160,7 @@ lbl_802FDD68: /* 802FDD8C 002F9BCC 38 21 00 90 */ addi r1, r1, 0x90 /* 802FDD90 002F9BD0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick6arease7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick6arease7ManagerFRQ33scn4step9Component: /* 802FE0CC 002F9F0C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -14370,7 +14370,7 @@ __vc__Q23mem60ExplicitAutoDeleteArray$$0Q53scn4step7gimmick6arease6AreaSE$$48$$1 /* 802FE39C 002FA1DC 38 21 00 10 */ addi r1, r1, 0x10 /* 802FE3A0 002FA1E0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10arrowboard7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick10arrowboard7ManagerFRQ33scn4step9Component: /* 802FEB08 002FA948 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -14636,7 +14636,7 @@ lbl_802FEE78: /* 802FEE90 002FACD0 38 21 00 20 */ addi r1, r1, 0x20 /* 802FEE94 002FACD4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick10cameralock7ManagerFRQ33scn4step9Component: /* 80303404 002FF244 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -14899,7 +14899,7 @@ lbl_8030376C: /* 80303784 002FF5C4 38 21 00 20 */ addi r1, r1, 0x20 /* 80303788 002FF5C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick12chainstarter7ManagerFRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager __ct__Q53scn4step7gimmick12chainstarter7ManagerFRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager: /* 803058B8 003016F8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -15064,7 +15064,7 @@ lbl_80305AE0: /* 80305AF4 00301934 38 21 00 10 */ addi r1, r1, 0x10 /* 80305AF8 00301938 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetMasterLockNum__Q53scn4step7gimmick13challengedoor7ManagerFRQ33scn4step9Component GetMasterLockNum__Q53scn4step7gimmick13challengedoor7ManagerFRQ33scn4step9Component: /* 8030A5C0 00306400 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -15840,7 +15840,7 @@ lbl_8030B034: /* 8030B044 00306E84 38 21 00 10 */ addi r1, r1, 0x10 /* 8030B048 00306E88 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick17consecutivebattle7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick17consecutivebattle7ManagerFRQ33scn4step9Component: /* 8030B680 003074C0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -15990,7 +15990,7 @@ lbl_8030B874: /* 8030B880 003076C0 38 21 00 10 */ addi r1, r1, 0x10 /* 8030B884 003076C4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11cutropestep7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick11cutropestep7ManagerFRQ33scn4step9Component: /* 8030D4E0 00309320 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -16304,7 +16304,7 @@ lbl_8030D8F0: /* 8030D908 00309748 38 21 00 20 */ addi r1, r1, 0x20 /* 8030D90C 0030974C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick4door7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick4door7ManagerFRQ33scn4step9Component: /* 8030E550 0030A390 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -16656,7 +16656,7 @@ stepMoveInfo__Q53scn4step7gimmick4door7ManagerCFUl: /* 8030EA08 0030A848 38 21 00 10 */ addi r1, r1, 0x10 /* 8030EA0C 0030A84C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick9enemylist7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick9enemylist7ManagerFRQ33scn4step9Component: /* 8030EB08 0030A948 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -17235,7 +17235,7 @@ lbl_8030F2B8: /* 8030F2C8 0030B108 38 21 00 20 */ addi r1, r1, 0x20 /* 8030F2CC 0030B10C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5ghost7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick5ghost7ManagerFRQ33scn4step9Component: /* 8030FB9C 0030B9DC 90 83 00 00 */ stw r4, 0(r3) @@ -17389,7 +17389,7 @@ registerToRoot__Q53scn4step7gimmick5ghost7ManagerFRQ23g3d4Root: /* 8030FD88 0030BBC8 4B FF FD F4 */ b registerToRoot__Q53scn4step7gimmick5ghost5GhostFRQ23g3d4Root /* 8030FD8C 0030BBCC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8goalflag7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick8goalflag7ManagerFRQ33scn4step9Component: /* 8030FF0C 0030BD4C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -17622,7 +17622,7 @@ lbl_80310210: /* 80310228 0030C068 38 21 00 20 */ addi r1, r1, 0x20 /* 8031022C 0030C06C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10guideboard7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick10guideboard7ManagerFRQ33scn4step9Component: /* 80312B58 0030E998 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -18205,7 +18205,7 @@ lbl_803132E0: /* 803132F8 0030F138 38 21 00 20 */ addi r1, r1, 0x20 /* 803132FC 0030F13C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick7mahoroa7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick7mahoroa7ManagerFRQ33scn4step9Component: /* 80313D80 0030FBC0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -18623,7 +18623,7 @@ setIsTalkMode__Q53scn4step7gimmick7mahoroa7MahoroaFb: /* 8031430C 0031014C 98 83 00 75 */ stb r4, 0x75(r3) /* 80314310 00310150 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick16masterattackarea7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick16masterattackarea7ManagerFRQ33scn4step9Component: /* 80315744 00311584 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -18988,7 +18988,7 @@ setDisableOneTime__Q53scn4step7gimmick16masterattackarea7ManagerFi: /* 80315C0C 00311A4C 38 21 00 10 */ addi r1, r1, 0x10 /* 80315C10 00311A50 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick12mastermarker7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick12mastermarker7ManagerFRQ33scn4step9Component: /* 80315CD0 00311B10 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -20186,7 +20186,7 @@ lbl_80316D34: /* 80316D50 00312B90 38 21 00 20 */ addi r1, r1, 0x20 /* 80316D54 00312B94 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13movegroupctrl7ManagerFRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager __ct__Q53scn4step7gimmick13movegroupctrl7ManagerFRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager: /* 80316E14 00312C54 94 21 FE B0 */ stwu r1, -0x150(r1) @@ -20728,7 +20728,7 @@ lbl_803175C0: /* 803175D8 00313418 38 21 00 30 */ addi r1, r1, 0x30 /* 803175DC 0031341C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick7monitor7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick7monitor7ManagerFRQ33scn4step9Component: /* 803193EC 0031522C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -21037,7 +21037,7 @@ lbl_803197EC: /* 803197F4 00315634 38 21 00 10 */ addi r1, r1, 0x10 /* 803197F8 00315638 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick14movelandattack7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick14movelandattack7ManagerFRQ33scn4step9Component: /* 803199F4 00315834 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -21228,7 +21228,7 @@ lbl_80319C6C: /* 80319C84 00315AC4 38 21 00 20 */ addi r1, r1, 0x20 /* 80319C88 00315AC8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick9otachidai7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick9otachidai7ManagerFRQ33scn4step9Component: /* 8031A06C 00315EAC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -21499,7 +21499,7 @@ getPos__Q53scn4step7gimmick9otachidai7ManagerCFv: /* 8031A408 00316248 38 21 00 10 */ addi r1, r1, 0x10 /* 8031A40C 0031624C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8rollball7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick8rollball7ManagerFRQ33scn4step9Component: /* 8031A6B8 003164F8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -22465,7 +22465,7 @@ lbl_8031B3E8: /* 8031B404 00317244 38 21 00 10 */ addi r1, r1, 0x10 /* 8031B408 00317248 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick17roomguardermarker7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick17roomguardermarker7ManagerFRQ33scn4step9Component: /* 8031E08C 00319ECC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -22678,7 +22678,7 @@ getPosByIndex__Q53scn4step7gimmick17roomguardermarker7ManagerCFUl: /* 8031E358 0031A198 38 21 00 10 */ addi r1, r1, 0x10 /* 8031E35C 0031A19C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick9shipevent7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick9shipevent7ManagerFRQ33scn4step9Component: /* 8031F214 0031B054 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -23108,7 +23108,7 @@ lbl_8031F78C: /* 8031F798 0031B5D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8031F79C 0031B5DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8shooting7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick8shooting7ManagerFRQ33scn4step9Component: /* 80322CD4 0031EB14 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -23323,7 +23323,7 @@ __vc__Q23mem65ExplicitAutoDeleteArray$$0Q53scn4step7gimmick8shooting8Shooting$$4 /* 80322FB8 0031EDF8 38 21 00 10 */ addi r1, r1, 0x10 /* 80322FBC 0031EDFC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick7shutter7ManagerFRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager __ct__Q53scn4step7gimmick7shutter7ManagerFRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager: /* 80323040 0031EE80 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -23663,7 +23663,7 @@ __vc__Q23mem63ExplicitAutoDeleteArray$$0Q53scn4step7gimmick7shutter7Shutter$$416 /* 803234C8 0031F308 38 21 00 10 */ addi r1, r1, 0x10 /* 803234CC 0031F30C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5stake7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick5stake7ManagerFRQ33scn4step9Component: /* 8032514C 00320F8C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -23956,7 +23956,7 @@ lbl_80325514: /* 8032552C 0032136C 38 21 00 20 */ addi r1, r1, 0x20 /* 80325530 00321370 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick3sun7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick3sun7ManagerFRQ33scn4step9Component: /* 80325B94 003219D4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -25833,7 +25833,7 @@ lbl_8032755C: /* 80327574 003233B4 38 21 00 20 */ addi r1, r1, 0x20 /* 80327578 003233B8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8warpstar7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick8warpstar7ManagerFRQ33scn4step9Component: /* 8032864C 0032448C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -26325,7 +26325,7 @@ getPos__Q53scn4step7gimmick8warpstar7ManagerCFi: /* 80328C9C 00324ADC 38 21 00 10 */ addi r1, r1, 0x10 /* 80328CA0 00324AE0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick16warpstarcontinue7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick16warpstarcontinue7ManagerFRQ33scn4step9Component: /* 80329ACC 0032590C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -27078,7 +27078,7 @@ lbl_8032A4E8: /* 8032A500 00326340 38 21 00 30 */ addi r1, r1, 0x30 /* 8032A504 00326344 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10zoneswitch7ManagerFRQ33scn4step9Component __ct__Q53scn4step7gimmick10zoneswitch7ManagerFRQ33scn4step9Component: /* 8032B1D0 00327010 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -27291,7 +27291,7 @@ __vc__Q23mem71ExplicitAutoDeleteArray$$0Q53scn4step7gimmick10zoneswitch10ZoneSwi /* 8032B4A8 003272E8 38 21 00 10 */ addi r1, r1, 0x10 /* 8032B4AC 003272EC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7ManagerFRQ33scn4step9Component __ct__Q43scn4step4hero7ManagerFRQ33scn4step9Component: /* 80344FE8 00340E28 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -31918,7 +31918,7 @@ __dt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interferen __dt__Q24util179StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero12interference14StateSpaceJump$$4PQ43scn4step4hero4Hero$$4Q63scn4step4hero12interference14StateSpaceJump9NextState$$4Q33hel4math7Vector3$$1Fv: /* 80348E2C 00344C6C 4B EE 58 74 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info7ManagerFRQ33scn4step9Component __ct__Q43scn4step4info7ManagerFRQ33scn4step9Component: /* 803AC808 003A8648 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -33280,7 +33280,7 @@ safeboolFunc__Q24util42PlacementNew$$0Q53scn4step4info5lvmap5LvMap$$1CFv: safeboolFunc__Q24util50PlacementNew$$0Q53scn4step4info9challenge9Challenge$$1CFv: /* 803ADA18 003A9858 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item7ManagerFRQ33scn4step9Component __ct__Q43scn4step4item7ManagerFRQ33scn4step9Component: /* 803C3974 003BF7B4 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -34235,7 +34235,7 @@ lbl_803C4648: /* 803C4664 003C04A4 38 21 00 20 */ addi r1, r1, 0x20 /* 803C4668 003C04A8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5ostop7ManagerFv __ct__Q43scn4step5ostop7ManagerFv: /* 803CAC88 003C6AC8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -34316,7 +34316,7 @@ updateForPauseMenu__Q43scn4step5ostop7ManagerFv: /* 803CAD38 003C6B78 38 80 00 00 */ li r4, 0 /* 803CAD3C 003C6B7C 4B E0 F1 50 */ b update__Q25ostop7ManagerFb -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_toMoveGridGroupId__Q43scn4step4ogen21$$2unnamed$$2Manager_cpp$$2Fi t_toMoveGridGroupId__Q43scn4step4ogen21$$2unnamed$$2Manager_cpp$$2Fi: /* 803CBEF0 003C7D30 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -35017,7 +35017,7 @@ lbl_803CC870: /* 803CC89C 003C86DC 38 21 00 80 */ addi r1, r1, 0x80 /* 803CC8A0 003C86E0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx7ManagerFRQ33scn4step9Component __ct__Q43scn4step3sfx7ManagerFRQ33scn4step9Component: /* 803CDA9C 003C98DC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -35077,7 +35077,7 @@ isForbiddenDrawWarp__Q43scn4step3sfx7ManagerCFv: /* 803CDB38 003C9978 88 63 35 24 */ lbz r3, 0x3524(r3) /* 803CDB3C 003C997C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6spstop7ManagerFv __ct__Q43scn4step6spstop7ManagerFv: /* 803D0B9C 003CC9DC 38 A0 00 00 */ li r5, 0 @@ -35305,7 +35305,7 @@ lbl_803D0E78: /* 803D0E88 003CCCC8 38 21 00 20 */ addi r1, r1, 0x20 /* 803D0E8C 003CCCCC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step6weapon13vacuumedblock6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step6weapon13vacuumedblock6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803D2758 003CE598 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -35979,7 +35979,7 @@ lbl_803D3080: /* 803D3090 003CEED0 38 21 00 B0 */ addi r1, r1, 0xb0 /* 803D3094 003CEED4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_maxCount__Q43scn4step6weapon21$$2unnamed$$2Manager_cpp$$2FRQ33scn4step9Component t_maxCount__Q43scn4step6weapon21$$2unnamed$$2Manager_cpp$$2FRQ33scn4step9Component: /* 803D65A8 003D23E8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -36761,7 +36761,7 @@ lbl_803D7028: /* 803D7050 003D2E90 38 21 00 20 */ addi r1, r1, 0x20 /* 803D7054 003D2E94 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_GhostData__21$$2unnamed$$2Manager_cpp$$2Fv t_GhostData__21$$2unnamed$$2Manager_cpp$$2Fv: /* 803F11E0 003ED020 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -37800,7 +37800,7 @@ createContext__Q43scn4step5ghost7ManagerFv: /* 803F20E4 003EDF24 38 21 00 10 */ addi r1, r1, 0x10 /* 803F20E8 003EDF28 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23sfx7ManagerFv __ct__Q23sfx7ManagerFv: /* 804011D4 003FD014 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -37904,10 +37904,10 @@ screenRemapDrawEnd__Q23sfx7ManagerFv: /* 80401304 003FD144 38 63 00 2C */ addi r3, r3, 0x2c /* 80401308 003FD148 4B C2 31 98 */ b DefaultSwitchThreadCallback -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402444, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$257185 $$257185: .incbin "baserom.dol", 0x4157C8, 0xC @@ -37915,7 +37915,7 @@ $$257185: $$257316: .incbin "baserom.dol", 0x4157D4, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251648 $$251648: .incbin "baserom.dol", 0x455EC0, 0xC @@ -37923,7 +37923,7 @@ $$251648: $$251649: .incbin "baserom.dol", 0x455ECC, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249094 $$249094: .incbin "baserom.dol", 0x459208, 0xC @@ -37955,12 +37955,12 @@ t_fileNames__Q23msg21$$2unnamed$$2Manager_cpp$$2: $$249787: .incbin "baserom.dol", 0x4592C0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252774 $$252774: .incbin "baserom.dol", 0x45B1E0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252572 $$252572: .incbin "baserom.dol", 0x45BDD0, 0x14 @@ -37968,12 +37968,12 @@ $$252572: $$252573: .incbin "baserom.dol", 0x45BDE4, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step2bg7Manager __vt__Q43scn4step2bg7Manager: .incbin "baserom.dol", 0x45FEA8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255431 $$255431: .incbin "baserom.dol", 0x4606D0, 0xC @@ -37981,7 +37981,7 @@ $$255431: $$255433: .incbin "baserom.dol", 0x4606DC, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_SCORE_KIND_INFO_TABLE__21$$2unnamed$$2Manager_cpp$$2 T_SCORE_KIND_INFO_TABLE__21$$2unnamed$$2Manager_cpp$$2: .incbin "baserom.dol", 0x467340, 0xA0 @@ -38004,7 +38004,7 @@ $$255623: $$255626: .incbin "baserom.dol", 0x467470, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$259391 $$259391: .incbin "baserom.dol", 0x46E718, 0x10 @@ -38018,12 +38018,12 @@ __vt__Q24util97StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6sparky11Sta __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateGoodbye$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46E748, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component: .incbin "baserom.dol", 0x47B108, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257888 $$257888: .incbin "baserom.dol", 0x47B9C0, 0x1C @@ -38043,7 +38043,7 @@ $$257314: $$257315: .incbin "baserom.dol", 0x47BA50, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258399 $$258399: .incbin "baserom.dol", 0x47E5B8, 0x14 @@ -38051,12 +38051,12 @@ $$258399: $$258838: .incbin "baserom.dol", 0x47E5CC, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$032$$1FRQ33scn4step9Component $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$032$$1FRQ33scn4step9Component: .incbin "baserom.dol", 0x47E7D0, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$266848 $$266848: .incbin "baserom.dol", 0x480ED8, 0x10 @@ -38073,7 +38073,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17Sta __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceFall$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x480F18, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256047 $$256047: .incbin "baserom.dol", 0x48BEA8, 0x10 @@ -38099,7 +38099,7 @@ $$256373: $$256384: .incbin "baserom.dol", 0x48BF04, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254030 $$254030: .incbin "baserom.dol", 0x48DFB8, 0xC @@ -38107,27 +38107,27 @@ $$254030: $$254033: .incbin "baserom.dol", 0x48DFC4, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255166 $$255166: .incbin "baserom.dol", 0x48EB20, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255168 $$255168: .incbin "baserom.dol", 0x48EEC0, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257345 $$257345: .incbin "baserom.dol", 0x48F8C8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252659 $$252659: .incbin "baserom.dol", 0x4914F0, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249090 $$249090: .incbin "baserom.dol", 0x4939B0, 0x8 @@ -38165,7 +38165,7 @@ $$249848: $$249870: .incbin "baserom.dol", 0x493A04, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252773 $$252773: .incbin "baserom.dol", 0x4941D8, 0x8 @@ -38173,32 +38173,32 @@ $$252773: $$252775: .incbin "baserom.dol", 0x4941E0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252571 $$252571: .incbin "baserom.dol", 0x494548, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255432 $$255432: .incbin "baserom.dol", 0x4952B8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253081 $$253081: .incbin "baserom.dol", 0x495870, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$259392 $$259392: .incbin "baserom.dol", 0x495A08, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component$$20 $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$024$$1FRQ33scn4step9Component$$20: .incbin "baserom.dol", 0x4968D0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252170 $$252170: .incbin "baserom.dol", 0x496C08, 0x4 @@ -38215,12 +38215,12 @@ $$252204: $$252205: .incbin "baserom.dol", 0x496C18, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$032$$1FRQ33scn4step9Component$$20 $$2STRING$$2__ct__Q43scn4step7gimmick21FlowEffectManager$$032$$1FRQ33scn4step9Component$$20: .incbin "baserom.dol", 0x496DC8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$266847 $$266847: .incbin "baserom.dol", 0x496DE0, 0x5 @@ -38228,7 +38228,7 @@ $$266847: $$260218: .incbin "baserom.dol", 0x496DE5, 0x3 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256046 $$256046: .incbin "baserom.dol", 0x497A00, 0x8 @@ -38236,17 +38236,17 @@ $$256046: $$256048: .incbin "baserom.dol", 0x497A08, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254031 $$254031: .incbin "baserom.dol", 0x498148, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257346 $$257346: .incbin "baserom.dol", 0x498428, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252901 $$252901: .incbin "baserom.dol", 0x49A990, 0x4 @@ -38257,7 +38257,7 @@ $$252902: $$252904: .incbin "baserom.dol", 0x49A998, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255739 $$255739: .incbin "baserom.dol", 0x49B730, 0x4 @@ -38277,12 +38277,12 @@ $$255922: $$255933: .incbin "baserom.dol", 0x49B744, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259636 $$259636: .incbin "baserom.dol", 0x49B9E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256948 $$256948: .incbin "baserom.dol", 0x49D1B8, 0x4 @@ -38296,7 +38296,7 @@ $$257218: lbl_80562684: .incbin "baserom.dol", 0x49D1C4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253517 $$253517: .incbin "baserom.dol", 0x49D488, 0x4 @@ -38310,12 +38310,12 @@ $$253650: $$253651: .incbin "baserom.dol", 0x49D494, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254600 $$254600: .incbin "baserom.dol", 0x49D4A0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253900 $$253900: .incbin "baserom.dol", 0x49D528, 0x4 @@ -38326,7 +38326,7 @@ $$253901: $$253902: .incbin "baserom.dol", 0x49D530, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258587 $$258587: .incbin "baserom.dol", 0x49D5C8, 0x4 @@ -38343,7 +38343,7 @@ $$258590: $$258591: .incbin "baserom.dol", 0x49D5D8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$266891 $$266891: .incbin "baserom.dol", 0x49D7A8, 0x4 @@ -38396,7 +38396,7 @@ $$267945: $$267948: .incbin "baserom.dol", 0x49D7E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256050 $$256050: .incbin "baserom.dol", 0x49E430, 0x4 @@ -38416,7 +38416,7 @@ $$256054: $$256055: .incbin "baserom.dol", 0x49E444, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254032 $$254032: .incbin "baserom.dol", 0x49E550, 0x4 @@ -38430,12 +38430,12 @@ $$254133: $$254187: .incbin "baserom.dol", 0x49E55C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255341 $$255341: .incbin "baserom.dol", 0x49E698, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255090 $$255090: .incbin "baserom.dol", 0x49E820, 0x4 @@ -38443,7 +38443,7 @@ $$255090: $$255165: .incbin "baserom.dol", 0x49E824, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252582 $$252582: .incbin "baserom.dol", 0x49ECF8, 0x4 diff --git a/asm/src/ManagerContext.s b/asm/src/ManagerContext.s index fc2254f0..d4e66938 100644 --- a/asm/src/ManagerContext.s +++ b/asm/src/ManagerContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DefaultEffectObjCountMax__Q36effect6detail14ManagerContextFv DefaultEffectObjCountMax__Q36effect6detail14ManagerContextFv: /* 80181BA0 0017D9E0 38 60 00 64 */ li r3, 0x64 diff --git a/asm/src/ManagerCreator.s b/asm/src/ManagerCreator.s index 6d4ca666..fbb56a50 100644 --- a/asm/src/ManagerCreator.s +++ b/asm/src/ManagerCreator.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q43scn4step5ocoll14ManagerCreatorFRQ33scn4step9Component Create__Q43scn4step5ocoll14ManagerCreatorFRQ33scn4step9Component: /* 803CAAE4 003C6924 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -50,7 +50,7 @@ lbl_803CAB30: /* 803CAB90 003C69D0 38 21 00 70 */ addi r1, r1, 0x70 /* 803CAB94 003C69D4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251813 $$251813: .incbin "baserom.dol", 0x48EAF0, 0x30 diff --git a/asm/src/ManualData.s b/asm/src/ManualData.s index d496713a..7b8ca1ef 100644 --- a/asm/src/ManualData.s +++ b/asm/src/ManualData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_entry__Q25pause24$$2unnamed$$2ManualData_cpp$$2FQ25pause10ManualKind t_entry__Q25pause24$$2unnamed$$2ManualData_cpp$$2FQ25pause10ManualKind: /* 801DBE24 001D7C64 1C C4 00 14 */ mulli r6, r4, 0x14 @@ -464,7 +464,7 @@ IsCommandLineDouble__Q25pause10ManualDataFQ25pause10ManualKindUlUl: /* 801DC450 001D8290 38 21 00 30 */ addi r1, r1, 0x30 /* 801DC454 001D8294 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2 T_CMD_NORMAL__Q25pause24$$2unnamed$$2ManualData_cpp$$2: .incbin "baserom.dol", 0x411180, 0x40 @@ -496,7 +496,7 @@ T_CMD_SMASH__Q25pause24$$2unnamed$$2ManualData_cpp$$2: T_ENTRIES__Q25pause24$$2unnamed$$2ManualData_cpp$$2: .incbin "baserom.dol", 0x411480, 0xB8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248734 $$248734: .incbin "baserom.dol", 0x459658, 0x10 @@ -615,7 +615,7 @@ $$249263: $$249272: .incbin "baserom.dol", 0x45985C, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248732 $$248732: .incbin "baserom.dol", 0x493AF0, 0x8 diff --git a/asm/src/MapColl.s b/asm/src/MapColl.s index afe98e34..003e9bd3 100644 --- a/asm/src/MapColl.s +++ b/asm/src/MapColl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss7MapCollFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss7MapCollFRQ43scn4step4boss4Boss: /* 80231F18 0022DD58 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -742,7 +742,7 @@ lbl_80232994: /* 802329A8 0022E7E8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 802329AC 0022E7EC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_updateDamageInfo__Q43scn4step5enemy21$$2unnamed$$2MapColl_cpp$$2FRQ43scn4step5chara13MapCollResultRCQ35mcoll6detail9ActorInfo t_updateDamageInfo__Q43scn4step5enemy21$$2unnamed$$2MapColl_cpp$$2FRQ43scn4step5chara13MapCollResultRCQ35mcoll6detail9ActorInfo: /* 8028A27C 002860BC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1540,7 +1540,7 @@ initActor__Q43scn4step5enemy7MapCollFv: /* 8028ADB0 00286BF0 38 21 00 30 */ addi r1, r1, 0x30 /* 8028ADB4 00286BF4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7MapCollFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero7MapCollFRQ43scn4step4hero4Hero: /* 80348E30 00344C70 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3935,7 +3935,7 @@ lbl_8034B014: /* 8034B020 00346E60 38 21 00 30 */ addi r1, r1, 0x30 /* 8034B024 00346E64 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item7MapCollFRQ43scn4step4item4Item __ct__Q43scn4step4item7MapCollFRQ43scn4step4item4Item: /* 803C466C 003C04AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -4388,7 +4388,7 @@ isDead__Q43scn4step4item7MapCollCFv: /* 803C4CE8 003C0B28 88 63 00 4C */ lbz r3, 0x4c(r3) /* 803C4CEC 003C0B2C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon7MapCollFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon7MapCollFRQ43scn4step6weapon6Weapon: /* 803D7058 003D2E98 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5090,7 +5090,7 @@ initActor__Q43scn4step6weapon7MapCollFv: /* 803D7A5C 003D389C 38 21 00 30 */ addi r1, r1, 0x30 /* 803D7A60 003D38A0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253609 $$253609: .incbin "baserom.dol", 0x49AE90, 0x4 @@ -5104,7 +5104,7 @@ $$253611: $$253678: .incbin "baserom.dol", 0x49AE9C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253932 $$253932: .incbin "baserom.dol", 0x49B9F0, 0x4 @@ -5124,7 +5124,7 @@ $$254159: $$254160: .incbin "baserom.dol", 0x49BA04, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259351 $$259351: .incbin "baserom.dol", 0x49D7F0, 0x4 @@ -5189,7 +5189,7 @@ $$260018: $$260019: .incbin "baserom.dol", 0x49D840, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254075 $$254075: .incbin "baserom.dol", 0x49E560, 0x4 @@ -5206,7 +5206,7 @@ $$254229: $$254230: .incbin "baserom.dol", 0x49E570, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253837 $$253837: .incbin "baserom.dol", 0x49E848, 0x4 diff --git a/asm/src/MapCollConstant.s b/asm/src/MapCollConstant.s index 7a828812..f6ec2bd9 100644 --- a/asm/src/MapCollConstant.s +++ b/asm/src/MapCollConstant.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global EPSILON__Q43scn4step5chara15MapCollConstant EPSILON__Q43scn4step5chara15MapCollConstant: .incbin "baserom.dol", 0x49B7F8, 0x4 diff --git a/asm/src/MapCollProducer.s b/asm/src/MapCollProducer.s index 3664b36a..be60218d 100644 --- a/asm/src/MapCollProducer.s +++ b/asm/src/MapCollProducer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global chkOnFire__Q43scn4step4hero15MapCollProducerFRCQ33hel4math7Vector2RCQ33hel4math7Vector2Ul chkOnFire__Q43scn4step4hero15MapCollProducerFRCQ33hel4math7Vector2RCQ33hel4math7Vector2Ul: /* 8034B028 00346E68 94 21 F9 30 */ stwu r1, -0x6d0(r1) diff --git a/asm/src/MapCollResult.s b/asm/src/MapCollResult.s index e31a6753..e0571179 100644 --- a/asm/src/MapCollResult.s +++ b/asm/src/MapCollResult.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara13MapCollResultFv __ct__Q43scn4step5chara13MapCollResultFv: /* 8026F748 0026B588 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/MapFile.s b/asm/src/MapFile.s index 5c382537..20792e91 100644 --- a/asm/src/MapFile.s +++ b/asm/src/MapFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MapFile_Exists__6freezeFv MapFile_Exists__6freezeFv: /* 8018B16C 00186FAC 80 6D ED 80 */ lwz r3, sMapFileList__6freeze-_SDA_BASE_(r13) diff --git a/asm/src/MaproPos.s b/asm/src/MaproPos.s index a46076ec..0e8b772c 100644 --- a/asm/src/MaproPos.s +++ b/asm/src/MaproPos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global toWorldPos__Q33scn4step8MaproPosCFv toWorldPos__Q33scn4step8MaproPosCFv: /* 8022169C 0021D4DC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -26,7 +26,7 @@ toWorldPos__Q33scn4step8MaproPosCFv: /* 802216EC 0021D52C 38 21 00 20 */ addi r1, r1, 0x20 /* 802216F0 0021D530 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249677 $$249677: .incbin "baserom.dol", 0x49AD50, 0x8 diff --git a/asm/src/MaproRect.s b/asm/src/MaproRect.s index 61951563..5845d121 100644 --- a/asm/src/MaproRect.s +++ b/asm/src/MaproRect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn4step9MaproRectFllUlUl __ct__Q33scn4step9MaproRectFllUlUl: /* 802216F4 0021D534 90 83 00 00 */ stw r4, 0(r3) @@ -51,7 +51,7 @@ toWorldRect__Q33scn4step9MaproRectCFv: /* 8022179C 0021D5DC 38 21 00 20 */ addi r1, r1, 0x20 /* 802217A0 0021D5E0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249776 $$249776: .incbin "baserom.dol", 0x49AD58, 0x8 diff --git a/asm/src/MasterAttackArea.s b/asm/src/MasterAttackArea.s index 1b200477..93c04439 100644 --- a/asm/src/MasterAttackArea.s +++ b/asm/src/MasterAttackArea.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick16masterattackarea16MasterAttackAreaFRCQ43scn4step3map18BinGmkGeneralEntry __ct__Q53scn4step7gimmick16masterattackarea16MasterAttackAreaFRCQ43scn4step3map18BinGmkGeneralEntry: /* 80315C14 00311A54 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/MasterIcon.s b/asm/src/MasterIcon.s index 885c2e55..83bc4d59 100644 --- a/asm/src/MasterIcon.s +++ b/asm/src/MasterIcon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge10MasterIconFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge10MasterIconFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B38B8 003AF6F8 94 21 FD E0 */ stwu r1, -0x220(r1) @@ -1006,7 +1006,7 @@ lbl_803B4720: /* 803B472C 003B056C 38 21 00 30 */ addi r1, r1, 0x30 /* 803B4730 003B0570 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256921 $$256921: .incbin "baserom.dol", 0x48C630, 0x14 @@ -1041,7 +1041,7 @@ $$256932: $$256933: .incbin "baserom.dol", 0x48C6CC, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256927 $$256927: .incbin "baserom.dol", 0x497BD8, 0x4 @@ -1061,7 +1061,7 @@ $$257098: $$257105: .incbin "baserom.dol", 0x497BF8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257025 $$257025: .incbin "baserom.dol", 0x49E478, 0x4 diff --git a/asm/src/MasterMarker.s b/asm/src/MasterMarker.s index 57e4ccf4..d44af07d 100644 --- a/asm/src/MasterMarker.s +++ b/asm/src/MasterMarker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick12mastermarker12MasterMarkerFRCQ43scn4step3map18BinGmkGeneralEntry __ct__Q53scn4step7gimmick12mastermarker12MasterMarkerFRCQ43scn4step3map18BinGmkGeneralEntry: /* 80316D58 00312B98 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -51,7 +51,7 @@ __ct__Q53scn4step7gimmick12mastermarker12MasterMarkerFRCQ43scn4step3map18BinGmkG /* 80316E0C 00312C4C 38 21 00 20 */ addi r1, r1, 0x20 /* 80316E10 00312C50 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249893 $$249893: .incbin "baserom.dol", 0x49D498, 0x8 diff --git a/asm/src/MaterialAccessor.s b/asm/src/MaterialAccessor.s index 3884d94c..16d96f20 100644 --- a/asm/src/MaterialAccessor.s +++ b/asm/src/MaterialAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d16MaterialAccessorFv __ct__Q23g3d16MaterialAccessorFv: /* 8018E758 0018A598 38 A3 FF FC */ addi r5, r3, -4 @@ -151,7 +151,7 @@ matMiscEndEdit__Q23g3d16MaterialAccessorCFv: /* 8018E93C 0018A77C 38 80 00 00 */ li r4, 0 /* 8018E940 0018A780 4B F5 F9 50 */ b GetResMatMisc__Q44nw4r3g3d6ScnMdl15CopiedMatAccessFb -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23lyt16MaterialAccessorFRCQ23lyt12PaneAccessorRQ34nw4r3lyt8Material __ct__Q23lyt16MaterialAccessorFRCQ23lyt12PaneAccessorRQ34nw4r3lyt8Material: /* 801ADDF8 001A9C38 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -282,7 +282,7 @@ lbl_801ADF98: /* 801ADFC0 001A9E00 38 21 00 20 */ addi r1, r1, 0x20 /* 801ADFC4 001A9E04 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2SetTevColor__Q34nw4r3lyt8MaterialFUlRC11_GXColorS10$$20 $$2STRING$$2SetTevColor__Q34nw4r3lyt8MaterialFUlRC11_GXColorS10$$20: .incbin "baserom.dol", 0x453A88, 0x28 diff --git a/asm/src/Matrix34.s b/asm/src/Matrix34.s index 05203f94..8628f298 100644 --- a/asm/src/Matrix34.s +++ b/asm/src/Matrix34.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateTrans__Q33hel4math8Matrix34FRCQ33hel4math7Vector3 CreateTrans__Q33hel4math8Matrix34FRCQ33hel4math7Vector3: /* 8019E590 0019A3D0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -374,7 +374,7 @@ lbl_8019EACC: /* 8019EAE4 0019A924 38 21 00 50 */ addi r1, r1, 0x50 /* 8019EAE8 0019A928 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251888 $$251888: .incbin "baserom.dol", 0x49A378, 0x4 diff --git a/asm/src/Matrix44.s b/asm/src/Matrix44.s index 3c2c5bc1..51aead4f 100644 --- a/asm/src/Matrix44.s +++ b/asm/src/Matrix44.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreatePerspective__Q33hel4math8Matrix44Fffff CreatePerspective__Q33hel4math8Matrix44Fffff: /* 8019EAEC 0019A92C 94 21 FF B0 */ stwu r1, -0x50(r1) diff --git a/asm/src/Medal.s b/asm/src/Medal.s index 48cb9e6f..2e793e0f 100644 --- a/asm/src/Medal.s +++ b/asm/src/Medal.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge5MedalFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorb __ct__Q53scn4step4info9challenge5MedalFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorb: /* 803B4734 003B0574 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -243,7 +243,7 @@ lbl_803B4A64: /* 803B4A98 003B08D8 38 21 00 80 */ addi r1, r1, 0x80 /* 803B4A9C 003B08DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252254 $$252254: .incbin "baserom.dol", 0x48C710, 0x14 @@ -266,7 +266,7 @@ $$252315: $$252316: .incbin "baserom.dol", 0x48C76C, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252256 $$252256: .incbin "baserom.dol", 0x497C00, 0x8 diff --git a/asm/src/MemBlock.s b/asm/src/MemBlock.s index 8d22a795..e371e386 100644 --- a/asm/src/MemBlock.s +++ b/asm/src/MemBlock.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global EmptyBlock__Q23mem8MemBlockFv EmptyBlock__Q23mem8MemBlockFv: /* 801BF1B4 001BAFF4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MemManager.s b/asm/src/MemManager.s index a7cef74c..a766a92e 100644 --- a/asm/src/MemManager.s +++ b/asm/src/MemManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3map10MemManagerFv __ct__Q43scn4step3map10MemManagerFv: /* 803CA710 003C6550 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -38,7 +38,7 @@ allocatorForBG__Q43scn4step3map10MemManagerFv: /* 803CA778 003C65B8 38 21 00 10 */ addi r1, r1, 0x10 /* 803CA77C 003C65BC 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248975 $$248975: .incbin "baserom.dol", 0x4983D0, 0x8 diff --git a/asm/src/Memory.s b/asm/src/Memory.s index c52163ba..7a4a95f5 100644 --- a/asm/src/Memory.s +++ b/asm/src/Memory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_allocMem__20$$2unnamed$$2Memory_cpp$$2FRQ23mem10IAllocatorUl t_allocMem__20$$2unnamed$$2Memory_cpp$$2FRQ23mem10IAllocatorUl: /* 801BF1F8 001BB038 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -297,12 +297,12 @@ seqHeap__Q23mem6MemoryFv: /* 801BF610 001BB450 38 63 02 78 */ addi r3, r3, 0x278 /* 801BF614 001BB454 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249237 $$249237: .incbin "baserom.dol", 0x455E70, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249232 $$249232: .incbin "baserom.dol", 0x493660, 0x8 diff --git a/asm/src/Menu.s b/asm/src/Menu.s index 8a2d89af..a2a28d5e 100644 --- a/asm/src/Menu.s +++ b/asm/src/Menu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn9grandmenu4menu4MenuFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorQ33scn9grandmenu8ModeKindb __ct__Q43scn9grandmenu4menu4MenuFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorQ33scn9grandmenu8ModeKindb: /* 803F6188 003F1FC8 94 21 FC B0 */ stwu r1, -0x350(r1) @@ -1867,7 +1867,7 @@ lbl_803F7B84: /* 803F7B98 003F39D8 38 21 00 10 */ addi r1, r1, 0x10 /* 803F7B9C 003F39DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global t_ModeItemSetList__18$$2unnamed$$2Menu_cpp$$2 t_ModeItemSetList__18$$2unnamed$$2Menu_cpp$$2: .incbin "baserom.dol", 0x491B58, 0x10 @@ -1905,7 +1905,7 @@ $$255946: $$255947: .incbin "baserom.dol", 0x491C4C, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255668 $$255668: .incbin "baserom.dol", 0x498978, 0x8 @@ -1946,7 +1946,7 @@ $$256101: $$256102: .incbin "baserom.dol", 0x4989D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256090 $$256090: .incbin "baserom.dol", 0x49ED80, 0x8 diff --git a/asm/src/MeshFlip.s b/asm/src/MeshFlip.s index 682896e1..d2f9eb9d 100644 --- a/asm/src/MeshFlip.s +++ b/asm/src/MeshFlip.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj8MeshFlipFRCQ24gobj12MeshFlipDescRQ24gobj5Model __ct__Q24gobj8MeshFlipFRCQ24gobj12MeshFlipDescRQ24gobj5Model: /* 8019AA1C 0019685C 94 21 FF C0 */ stwu r1, -0x40(r1) diff --git a/asm/src/Message.s b/asm/src/Message.s index d2f0ec03..ee79408f 100644 --- a/asm/src/Message.s +++ b/asm/src/Message.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TextName__Q23app7MessageFPCc TextName__Q23app7MessageFPCc: /* 801793BC 001751FC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -379,7 +379,7 @@ UnsafedTextStaffCredit__Q23app7MessageFPCc: /* 801798A0 001756E0 38 21 00 10 */ addi r1, r1, 0x10 /* 801798A4 001756E4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26freeze7MessageFv __ct__Q26freeze7MessageFv: /* 8018B498 001872D8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -416,7 +416,7 @@ receive__Q26freeze7MessageFv: /* 8018B4FC 0018733C 38 21 00 10 */ addi r1, r1, 0x10 /* 8018B500 00187340 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23msg7MessageFPCc __ct__Q23msg7MessageFPCc: /* 801D1404 001CD244 94 21 FE A0 */ stwu r1, -0x160(r1) @@ -602,7 +602,7 @@ lbl_801D1674: /* 801D1684 001CD4C4 38 21 00 10 */ addi r1, r1, 0x10 /* 801D1688 001CD4C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Title__Q43scn7history6detail7MessageFi Title__Q43scn7history6detail7MessageFi: /* 802157CC 0021160C 1C 03 00 1C */ mulli r0, r3, 0x1c @@ -697,12 +697,12 @@ ListenConfirmMusic__Q43scn7history6detail7MessageFv: /* 802158C4 00211704 38 63 24 94 */ addi r3, r3, $$249035@l /* 802158C8 00211708 4B F6 3D 4C */ b TextHistory__Q23app7MessageFPCc -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global MSG_LABEL_ARRAY__Q43scn7history6detail21$$2unnamed$$2Message_cpp$$2 MSG_LABEL_ARRAY__Q43scn7history6detail21$$2unnamed$$2Message_cpp$$2: .incbin "baserom.dol", 0x411D90, 0x330 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248890 $$248890: .incbin "baserom.dol", 0x4592D0, 0xC @@ -746,7 +746,7 @@ DIRS_JP__21$$2unnamed$$2Message_cpp$$2: $$249227: .incbin "baserom.dol", 0x45939C, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248755 $$248755: .incbin "baserom.dol", 0x45DE60, 0x10 @@ -1045,7 +1045,7 @@ $$249027: $$249035: .incbin "baserom.dol", 0x45E594, 0x14 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249207 $$249207: .incbin "baserom.dol", 0x493A08, 0x8 @@ -1053,7 +1053,7 @@ $$249207: $$249208: .incbin "baserom.dol", 0x493A10, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248753 $$248753: .incbin "baserom.dol", 0x494BE8, 0x8 diff --git a/asm/src/MessageWindow.s b/asm/src/MessageWindow.s index 293ff5f0..7360a812 100644 --- a/asm/src/MessageWindow.s +++ b/asm/src/MessageWindow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info13MessageWindowFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ27storage9StoryMode __ct__Q43scn4step4info13MessageWindowFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ27storage9StoryMode: /* 803ADA1C 003A985C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -2054,7 +2054,7 @@ __dt__Q43std3tr16detail298function_imp$$0PFv_v$$4Q43std3tr16detail254bound_func$ __dt__Q43std3tr16detail367function_imp$$0PFPCcPCc_v$$4Q43std3tr16detail318bound_func$$0v$$4Q43std3tr16detail51mem_fn_2$$0v$$4Q43scn4step4info13MessageWindow$$4PCc$$4PCc$$1$$4Q33std3tr1220tuple$$0PQ43scn4step4info13MessageWindow$$4Q53std3tr112placeholders6detail5ph$$01$$1$$4Q53std3tr112placeholders6detail5ph$$02$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$41$$1Fv: /* 803AF644 003AB484 4B F7 36 34 */ b __dt__Q43std3tr16detail383function_imp$$0PFPCcPCc_v$$4Q43std3tr16detail334bound_func$$0v$$4Q43std3tr16detail59mem_fn_2$$0v$$4Q53scn4step7gimmick9shipevent9ShipEvent$$4PCc$$4PCc$$1$$4Q33std3tr1228tuple$$0PQ53scn4step7gimmick9shipevent9ShipEvent$$4Q53std3tr112placeholders6detail5ph$$01$$1$$4Q53std3tr112placeholders6detail5ph$$02$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$41$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257430 $$257430: .incbin "baserom.dol", 0x48BF10, 0x10 @@ -2101,7 +2101,7 @@ __vt__Q43std3tr16detail298function_imp$$0PFv_b$$4Q43std3tr16detail254bound_func$ __vt__Q43std3tr16detail299function_imp$$0PFv_b$$4Q43std3tr16detail255bound_func$$0b$$4Q43std3tr16detail46mem_fn_1$$0b$$4Q43scn4step4info13MessageWindow$$4Ul$$1$$4Q33std3tr1162tuple$$0PQ43scn4step4info13MessageWindow$$4Ul$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1: .incbin "baserom.dol", 0x48C020, 0x78 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257581 $$257581: .incbin "baserom.dol", 0x497A10, 0x8 diff --git a/asm/src/Meta.s b/asm/src/Meta.s index 8d4bb078..5553d555 100644 --- a/asm/src/Meta.s +++ b/asm/src/Meta.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Anim__Q53scn4step4hero9modeldesc4MetaFv Anim__Q53scn4step4hero9modeldesc4MetaFv: /* 8035C77C 003585BC 38 00 00 0F */ li r0, 0xf @@ -92,12 +92,12 @@ lbl_8035C848: Script__Q53scn4step4hero9modeldesc4MetaFv: /* 8035C8A8 003586E8 4B FF F3 04 */ b Script__Q53scn4step4hero9modeldesc6CommonFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20 $$2LOCAL$$2Anim__Q53scn4step4hero9modeldesc4MetaFv$$2ENTRIES$$20: .incbin "baserom.dol", 0x41AC08, 0xE38 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248734 $$248734: .incbin "baserom.dol", 0x486DA8, 0xC @@ -408,7 +408,7 @@ $$248885: $$2LOCAL$$2Model__Q53scn4step4hero9modeldesc4MetaFv$$2NAMES$$20: .incbin "baserom.dol", 0x4873F0, 0x78 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248727 $$248727: .incbin "baserom.dol", 0x497468, 0x8 diff --git a/asm/src/MintAbilityManager.s b/asm/src/MintAbilityManager.s index 7a95927a..e8cae466 100644 --- a/asm/src/MintAbilityManager.s +++ b/asm/src/MintAbilityManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero32$$2unnamed$$2MintAbilityManager_cpp$$2Fv t_obj__Q43scn4step4hero32$$2unnamed$$2MintAbilityManager_cpp$$2Fv: /* 8034B1D8 00347018 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintAnim.s b/asm/src/MintAnim.s index b22341f7..7a5f426d 100644 --- a/asm/src/MintAnim.s +++ b/asm/src/MintAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q24gobj8MintAnimFRQ24gobj4Anim Register__Q24gobj8MintAnimFRQ24gobj4Anim: /* 8019ABC4 00196A04 90 6D ED A0 */ stw r3, t_obj__Q24gobj22$$2unnamed$$2MintAnim_cpp$$2-_SDA_BASE_(r13) @@ -93,7 +93,7 @@ __sinit_$$3MintAnim_cpp: /* 8019AC60 00196AA0 38 6D ED A0 */ addi r3, r13, t_obj__Q24gobj22$$2unnamed$$2MintAnim_cpp$$2-_SDA_BASE_ /* 8019AC64 00196AA4 4B F4 27 7C */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023EC, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintAttacker.s b/asm/src/MintAttacker.s index d94f16ee..44299167 100644 --- a/asm/src/MintAttacker.s +++ b/asm/src/MintAttacker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step6vacuum12MintAttackerFRQ43scn4step6vacuum8Attacker Register__Q43scn4step6vacuum12MintAttackerFRQ43scn4step6vacuum8Attacker: /* 803D3098 003CEED8 90 6D F9 38 */ stw r3, t_obj__Q43scn4step6vacuum26$$2unnamed$$2MintAttacker_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintAttacker_cpp: /* 803D30B4 003CEEF4 38 6D F9 38 */ addi r3, r13, t_obj__Q43scn4step6vacuum26$$2unnamed$$2MintAttacker_cpp$$2-_SDA_BASE_ /* 803D30B8 003CEEF8 4B D0 A3 28 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025E4, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintBGMController.s b/asm/src/MintBGMController.s index 46e8d50d..fe97207c 100644 --- a/asm/src/MintBGMController.s +++ b/asm/src/MintBGMController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step4core17MintBGMControllerFRQ43scn4step4core13BGMController Register__Q43scn4step4core17MintBGMControllerFRQ43scn4step4core13BGMController: /* 802775AC 002733EC 90 6D F1 E8 */ stw r3, t_obj__Q43scn4step4core31$$2unnamed$$2MintBGMController_cpp$$2-_SDA_BASE_(r13) @@ -67,7 +67,7 @@ __sinit_$$3MintBGMController_cpp: /* 80277634 00273474 38 6D F1 E8 */ addi r3, r13, t_obj__Q43scn4step4core31$$2unnamed$$2MintBGMController_cpp$$2-_SDA_BASE_ /* 80277638 00273478 4B E6 5D A8 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024B4, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintBoss.s b/asm/src/MintBoss.s index 2b3d10fe..4e9bdb69 100644 --- a/asm/src/MintBoss.s +++ b/asm/src/MintBoss.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step4boss8MintBossFRQ43scn4step4boss4Boss Register__Q43scn4step4boss8MintBossFRQ43scn4step4boss4Boss: /* 802329B0 0022E7F0 90 6D F0 D8 */ stw r3, t_obj__Q43scn4step4boss22$$2unnamed$$2MintBoss_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintBoss_cpp: /* 802329CC 0022E80C 38 6D F0 D8 */ addi r3, r13, t_obj__Q43scn4step4boss22$$2unnamed$$2MintBoss_cpp$$2-_SDA_BASE_ /* 802329D0 0022E810 4B EA AA 10 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402470, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintCameraController.s b/asm/src/MintCameraController.s index 92ab88c8..d9d2a398 100644 --- a/asm/src/MintCameraController.s +++ b/asm/src/MintCameraController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step6camera20MintCameraControllerFRQ43scn4step6camera16CameraController Register__Q43scn4step6camera20MintCameraControllerFRQ43scn4step6camera16CameraController: /* 8026627C 002620BC 90 6D F1 A8 */ stw r3, t_obj__Q43scn4step6camera34$$2unnamed$$2MintCameraController_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintCameraController_cpp: /* 80266298 002620D8 38 6D F1 A8 */ addi r3, r13, t_obj__Q43scn4step6camera34$$2unnamed$$2MintCameraController_cpp$$2-_SDA_BASE_ /* 8026629C 002620DC 4B E7 71 44 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402494, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintChallengeDoor.s b/asm/src/MintChallengeDoor.s index e73ef88b..e87700f5 100644 --- a/asm/src/MintChallengeDoor.s +++ b/asm/src/MintChallengeDoor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q53scn4step7gimmick13challengedoor17MintChallengeDoorFRQ53scn4step7gimmick13challengedoor13ChallengeDoor Register__Q53scn4step7gimmick13challengedoor17MintChallengeDoorFRQ53scn4step7gimmick13challengedoor13ChallengeDoor: /* 8030B04C 00306E8C 90 6D F7 A8 */ stw r3, t_obj__Q53scn4step7gimmick13challengedoor31$$2unnamed$$2MintChallengeDoor_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintChallengeDoor_cpp: /* 8030B068 00306EA8 38 6D F7 A8 */ addi r3, r13, t_obj__Q53scn4step7gimmick13challengedoor31$$2unnamed$$2MintChallengeDoor_cpp$$2-_SDA_BASE_ /* 8030B06C 00306EAC 4B DD 23 74 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025A8, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintClearDanceSync.s b/asm/src/MintClearDanceSync.s index 1263cdb7..40e91d63 100644 --- a/asm/src/MintClearDanceSync.s +++ b/asm/src/MintClearDanceSync.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero32$$2unnamed$$2MintClearDanceSync_cpp$$2Fv t_obj__Q43scn4step4hero32$$2unnamed$$2MintClearDanceSync_cpp$$2Fv: /* 8034B28C 003470CC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintCommander.s b/asm/src/MintCommander.s index dbd0d51c..24558339 100644 --- a/asm/src/MintCommander.s +++ b/asm/src/MintCommander.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q33scn11staffcredit13MintCommanderFRQ33scn11staffcredit9Commander Register__Q33scn11staffcredit13MintCommanderFRQ33scn11staffcredit9Commander: /* 803F9B58 003F5998 90 6D FA 80 */ stw r3, t_obj__Q33scn11staffcredit27$$2unnamed$$2MintCommander_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintCommander_cpp: /* 803F9B74 003F59B4 38 6D FA 80 */ addi r3, r13, t_obj__Q33scn11staffcredit27$$2unnamed$$2MintCommander_cpp$$2-_SDA_BASE_ /* 803F9B78 003F59B8 4B CE 38 68 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402620, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintDemo.s b/asm/src/MintDemo.s index cca42eb3..637389f0 100644 --- a/asm/src/MintDemo.s +++ b/asm/src/MintDemo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q53scn4step7gimmick11areamapdemo8MintDemoFRQ53scn4step7gimmick11areamapdemo4Demo Register__Q53scn4step7gimmick11areamapdemo8MintDemoFRQ53scn4step7gimmick11areamapdemo4Demo: /* 802FDD94 002F9BD4 90 6D F7 A0 */ stw r3, t_obj__Q53scn4step7gimmick11areamapdemo22$$2unnamed$$2MintDemo_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintDemo_cpp: /* 802FDDB0 002F9BF0 38 6D F7 A0 */ addi r3, r13, t_obj__Q53scn4step7gimmick11areamapdemo22$$2unnamed$$2MintDemo_cpp$$2-_SDA_BASE_ /* 802FDDB4 002F9BF4 4B DD F6 2C */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40259C, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintEffect.s b/asm/src/MintEffect.s index 3a736e14..af5805af 100644 --- a/asm/src/MintEffect.s +++ b/asm/src/MintEffect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterForce__Q43scn4step5chara10MintEffectFRQ43scn4step5chara6Effect RegisterForce__Q43scn4step5chara10MintEffectFRQ43scn4step5chara6Effect: /* 8026F860 0026B6A0 90 6D F1 B8 */ stw r3, t_obj__Q43scn4step5chara24$$2unnamed$$2MintEffect_cpp$$2-_SDA_BASE_(r13) @@ -416,7 +416,7 @@ __sinit_$$3MintEffect_cpp: /* 8026FD78 0026BBB8 38 6D F1 B8 */ addi r3, r13, t_obj__Q43scn4step5chara24$$2unnamed$$2MintEffect_cpp$$2-_SDA_BASE_ /* 8026FD7C 0026BBBC 4B E6 D6 64 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40249C, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintEnemy.s b/asm/src/MintEnemy.s index 3c4769a4..28f4bad6 100644 --- a/asm/src/MintEnemy.s +++ b/asm/src/MintEnemy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step5enemy9MintEnemyFRQ43scn4step5enemy5Enemy Register__Q43scn4step5enemy9MintEnemyFRQ43scn4step5enemy5Enemy: /* 8028ADB8 00286BF8 90 6D F5 68 */ stw r3, t_obj__Q43scn4step5enemy23$$2unnamed$$2MintEnemy_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintEnemy_cpp: /* 8028ADD4 00286C14 38 6D F5 68 */ addi r3, r13, t_obj__Q43scn4step5enemy23$$2unnamed$$2MintEnemy_cpp$$2-_SDA_BASE_ /* 8028ADD8 00286C18 4B E5 26 08 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024BC, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintFloaterRotCtrl.s b/asm/src/MintFloaterRotCtrl.s index 34cb0139..b36d7d46 100644 --- a/asm/src/MintFloaterRotCtrl.s +++ b/asm/src/MintFloaterRotCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero32$$2unnamed$$2MintFloaterRotCtrl_cpp$$2Fv t_obj__Q43scn4step4hero32$$2unnamed$$2MintFloaterRotCtrl_cpp$$2Fv: /* 8034B36C 003471AC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintFootState.s b/asm/src/MintFootState.s index 1214ee58..ba1c58ca 100644 --- a/asm/src/MintFootState.s +++ b/asm/src/MintFootState.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q24gobj13MintFootStateFRQ24gobj9FootState Register__Q24gobj13MintFootStateFRQ24gobj9FootState: /* 8019AC68 00196AA8 90 6D ED A8 */ stw r3, t_obj__Q24gobj27$$2unnamed$$2MintFootState_cpp$$2-_SDA_BASE_(r13) @@ -27,7 +27,7 @@ __sinit_$$3MintFootState_cpp: /* 8019AC8C 00196ACC 38 6D ED A8 */ addi r3, r13, t_obj__Q24gobj27$$2unnamed$$2MintFootState_cpp$$2-_SDA_BASE_ /* 8019AC90 00196AD0 4B F4 27 50 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023F0, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintGatherItem.s b/asm/src/MintGatherItem.s index 8012ffff..8d27d3a1 100644 --- a/asm/src/MintGatherItem.s +++ b/asm/src/MintGatherItem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero28$$2unnamed$$2MintGatherItem_cpp$$2Fv t_obj__Q43scn4step4hero28$$2unnamed$$2MintGatherItem_cpp$$2Fv: /* 8034B49C 003472DC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintGear.s b/asm/src/MintGear.s index 613afd83..ea7b4b7d 100644 --- a/asm/src/MintGear.s +++ b/asm/src/MintGear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterForce__Q43scn4step4hero8MintGearFRQ43scn4step4hero4Gear RegisterForce__Q43scn4step4hero8MintGearFRQ43scn4step4hero4Gear: /* 8034B520 00347360 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -122,7 +122,7 @@ __sinit_$$3MintGear_cpp: /* 8034B68C 003474CC 38 6D F8 00 */ addi r3, r13, t_obj__Q43scn4step4hero22$$2unnamed$$2MintGear_cpp$$2-_SDA_BASE_ /* 8034B690 003474D0 4B D9 1D 50 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025C0, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintGearAnim.s b/asm/src/MintGearAnim.s index 1c047a58..fb0638a6 100644 --- a/asm/src/MintGearAnim.s +++ b/asm/src/MintGearAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Obj__Q24gobj12MintGearAnimFv Obj__Q24gobj12MintGearAnimFv: /* 8019AC94 00196AD4 80 6D ED B0 */ lwz r3, t_obj__Q24gobj26$$2unnamed$$2MintGearAnim_cpp$$2-_SDA_BASE_(r13) @@ -86,7 +86,7 @@ __sinit_$$3MintGearAnim_cpp: /* 8019AD2C 00196B6C 38 6D ED B0 */ addi r3, r13, t_obj__Q24gobj26$$2unnamed$$2MintGearAnim_cpp$$2-_SDA_BASE_ /* 8019AD30 00196B70 4B F4 26 B0 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023F4, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintHero.s b/asm/src/MintHero.s index 210efc58..b451d92f 100644 --- a/asm/src/MintHero.s +++ b/asm/src/MintHero.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step4hero8MintHeroFRQ43scn4step4hero4Hero Register__Q43scn4step4hero8MintHeroFRQ43scn4step4hero4Hero: /* 8034B694 003474D4 90 6D F8 08 */ stw r3, t_obj__Q43scn4step4hero22$$2unnamed$$2MintHero_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintHero_cpp: /* 8034B6B0 003474F0 38 6D F8 08 */ addi r3, r13, t_obj__Q43scn4step4hero22$$2unnamed$$2MintHero_cpp$$2-_SDA_BASE_ /* 8034B6B4 003474F4 4B D9 1D 2C */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025C4, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintHid.s b/asm/src/MintHid.s index 9d6a3330..92a3b5e8 100644 --- a/asm/src/MintHid.s +++ b/asm/src/MintHid.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero21$$2unnamed$$2MintHid_cpp$$2Fv t_obj__Q43scn4step4hero21$$2unnamed$$2MintHid_cpp$$2Fv: /* 8034B6B8 003474F8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintHidRumble.s b/asm/src/MintHidRumble.s index 960aba35..dd280f37 100644 --- a/asm/src/MintHidRumble.s +++ b/asm/src/MintHidRumble.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero27$$2unnamed$$2MintHidRumble_cpp$$2Fv t_obj__Q43scn4step4hero27$$2unnamed$$2MintHidRumble_cpp$$2Fv: /* 8034B778 003475B8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintInvincible.s b/asm/src/MintInvincible.s index 47bcfd28..102afebb 100644 --- a/asm/src/MintInvincible.s +++ b/asm/src/MintInvincible.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero28$$2unnamed$$2MintInvincible_cpp$$2Fv t_obj__Q43scn4step4hero28$$2unnamed$$2MintInvincible_cpp$$2Fv: /* 8034B7F4 00347634 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintLandAttribute.s b/asm/src/MintLandAttribute.s index c05ea680..a5d35d82 100644 --- a/asm/src/MintLandAttribute.s +++ b/asm/src/MintLandAttribute.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero31$$2unnamed$$2MintLandAttribute_cpp$$2Fv t_obj__Q43scn4step4hero31$$2unnamed$$2MintLandAttribute_cpp$$2Fv: /* 8034B8B8 003476F8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintLocation.s b/asm/src/MintLocation.s index af3d9606..b19a55f9 100644 --- a/asm/src/MintLocation.s +++ b/asm/src/MintLocation.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q24gobj12MintLocationFRQ24gobj8Location Register__Q24gobj12MintLocationFRQ24gobj8Location: /* 8019AD34 00196B74 90 6D ED B8 */ stw r3, t_obj__Q24gobj26$$2unnamed$$2MintLocation_cpp$$2-_SDA_BASE_(r13) @@ -57,7 +57,7 @@ __sinit_$$3MintLocation_cpp: /* 8019ADB8 00196BF8 38 6D ED B8 */ addi r3, r13, t_obj__Q24gobj26$$2unnamed$$2MintLocation_cpp$$2-_SDA_BASE_ /* 8019ADBC 00196BFC 4B F4 26 24 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023F8, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintManager.s b/asm/src/MintManager.s index d32fa673..e4aad019 100644 --- a/asm/src/MintManager.s +++ b/asm/src/MintManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle11MintManagerFv __ct__Q33scn14challengetitle11MintManagerFv: /* 801EF484 001EB2C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -66,7 +66,7 @@ lbl_801EF550: /* 801EF564 001EB3A4 38 21 00 10 */ addi r1, r1, 0x10 /* 801EF568 001EB3A8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle11MintManagerFv __ct__Q33scn10grandtitle11MintManagerFv: /* 80205CC8 00201B08 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -101,7 +101,7 @@ __ct__Q33scn10grandtitle11MintManagerFv: /* 80205D3C 00201B7C 38 21 00 10 */ addi r1, r1, 0x10 /* 80205D40 00201B80 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core11MintManagerFv __ct__Q43scn4step4core11MintManagerFv: /* 8027763C 0027347C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -140,17 +140,17 @@ __ct__Q43scn4step4core11MintManagerFv: /* 802776C0 00273500 38 21 00 10 */ addi r1, r1, 0x10 /* 802776C4 00273504 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251597 $$251597: .incbin "baserom.dol", 0x45AE60, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251597 $$251597: .incbin "baserom.dol", 0x45CA90, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251597 $$251597: .incbin "baserom.dol", 0x468928, 0x10 @@ -158,7 +158,7 @@ $$251597: $$251599: .incbin "baserom.dol", 0x468938, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251594 $$251594: .incbin "baserom.dol", 0x494158, 0x4 @@ -172,7 +172,7 @@ $$251596: $$251598: .incbin "baserom.dol", 0x494168, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251594 $$251594: .incbin "baserom.dol", 0x4947F8, 0x4 @@ -186,7 +186,7 @@ $$251596: $$251598: .incbin "baserom.dol", 0x494808, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251594 $$251594: .incbin "baserom.dol", 0x495858, 0x4 diff --git a/asm/src/MintMeshFlip.s b/asm/src/MintMeshFlip.s index acc960e8..9dcb3694 100644 --- a/asm/src/MintMeshFlip.s +++ b/asm/src/MintMeshFlip.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q24gobj12MintMeshFlipFRQ24gobj8MeshFlip Register__Q24gobj12MintMeshFlipFRQ24gobj8MeshFlip: /* 8019ADC0 00196C00 90 6D ED C0 */ stw r3, t_obj__Q24gobj26$$2unnamed$$2MintMeshFlip_cpp$$2-_SDA_BASE_(r13) @@ -23,7 +23,7 @@ __sinit_$$3MintMeshFlip_cpp: /* 8019ADE0 00196C20 38 6D ED C0 */ addi r3, r13, t_obj__Q24gobj26$$2unnamed$$2MintMeshFlip_cpp$$2-_SDA_BASE_ /* 8019ADE4 00196C24 4B F4 25 FC */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023FC, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintModel.s b/asm/src/MintModel.s index 47d619e2..538634e6 100644 --- a/asm/src/MintModel.s +++ b/asm/src/MintModel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q24gobj9MintModelFRQ24gobj5Model Register__Q24gobj9MintModelFRQ24gobj5Model: /* 8019ADE8 00196C28 90 6D ED C8 */ stw r3, t_obj__Q24gobj23$$2unnamed$$2MintModel_cpp$$2-_SDA_BASE_(r13) @@ -57,7 +57,7 @@ __sinit_$$3MintModel_cpp: /* 8019AE84 00196CC4 38 6D ED C8 */ addi r3, r13, t_obj__Q24gobj23$$2unnamed$$2MintModel_cpp$$2-_SDA_BASE_ /* 8019AE88 00196CC8 4B F4 25 58 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step5chara9MintModelFRQ43scn4step5chara5Model Register__Q43scn4step5chara9MintModelFRQ43scn4step5chara5Model: /* 8026FD80 0026BBC0 90 6D F1 C0 */ stw r3, t_obj__Q43scn4step5chara23$$2unnamed$$2MintModel_cpp$$2-_SDA_BASE_(r13) @@ -90,10 +90,10 @@ __sinit_$$3MintModel_cpp: /* 8026FDC8 0026BC08 38 6D F1 C0 */ addi r3, r13, t_obj__Q43scn4step5chara23$$2unnamed$$2MintModel_cpp$$2-_SDA_BASE_ /* 8026FDCC 0026BC0C 4B E6 D6 14 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402400, 0x4 -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024A0, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintModelAccessor.s b/asm/src/MintModelAccessor.s index 43355756..37cbe61b 100644 --- a/asm/src/MintModelAccessor.s +++ b/asm/src/MintModelAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterForce__Q23g3d17MintModelAccessorFRCQ23g3d13ModelAccessor RegisterForce__Q23g3d17MintModelAccessorFRCQ23g3d13ModelAccessor: /* 8018E944 0018A784 7C 64 1B 78 */ mr r4, r3 @@ -55,7 +55,7 @@ __sinit_$$3MintModelAccessor_cpp: /* 8018E9E4 0018A824 38 21 00 10 */ addi r1, r1, 0x10 /* 8018E9E8 0018A828 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023E0, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintModelRotCtrl.s b/asm/src/MintModelRotCtrl.s index 9fcc491b..e1b053fb 100644 --- a/asm/src/MintModelRotCtrl.s +++ b/asm/src/MintModelRotCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step5chara16MintModelRotCtrlFRQ43scn4step5chara12ModelRotCtrl Register__Q43scn4step5chara16MintModelRotCtrlFRQ43scn4step5chara12ModelRotCtrl: /* 8026FDD0 0026BC10 90 6D F1 C8 */ stw r3, t_obj__Q43scn4step5chara30$$2unnamed$$2MintModelRotCtrl_cpp$$2-_SDA_BASE_(r13) @@ -118,7 +118,7 @@ __sinit_$$3MintModelRotCtrl_cpp: /* 8026FE88 0026BCC8 38 6D F1 C8 */ addi r3, r13, t_obj__Q43scn4step5chara30$$2unnamed$$2MintModelRotCtrl_cpp$$2-_SDA_BASE_ /* 8026FE8C 0026BCCC 4B E6 D5 54 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024A4, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintMonitor.s b/asm/src/MintMonitor.s index 924e1ce9..b7063be3 100644 --- a/asm/src/MintMonitor.s +++ b/asm/src/MintMonitor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Obj__Q53scn4step7gimmick7monitor11MintMonitorFv Obj__Q53scn4step7gimmick7monitor11MintMonitorFv: /* 803197FC 0031563C 80 6D F7 B8 */ lwz r3, t_obj__Q53scn4step7gimmick7monitor25$$2unnamed$$2MintMonitor_cpp$$2-_SDA_BASE_(r13) @@ -11,7 +11,7 @@ __sinit_$$3MintMonitor_cpp: /* 80319804 00315644 38 6D F7 B8 */ addi r3, r13, t_obj__Q53scn4step7gimmick7monitor25$$2unnamed$$2MintMonitor_cpp$$2-_SDA_BASE_ /* 80319808 00315648 4B DC 3B D8 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025B4, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintMove.s b/asm/src/MintMove.s index 01227632..07a1c5a1 100644 --- a/asm/src/MintMove.s +++ b/asm/src/MintMove.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q24gobj8MintMoveFRQ24gobj4Move Register__Q24gobj8MintMoveFRQ24gobj4Move: /* 8019AE8C 00196CCC 90 6D ED D0 */ stw r3, t_obj__Q24gobj22$$2unnamed$$2MintMove_cpp$$2-_SDA_BASE_(r13) @@ -74,7 +74,7 @@ __sinit_$$3MintMove_cpp: /* 8019AF3C 00196D7C 38 6D ED D0 */ addi r3, r13, t_obj__Q24gobj22$$2unnamed$$2MintMove_cpp$$2-_SDA_BASE_ /* 8019AF40 00196D80 4B F4 24 A0 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402404, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintNodeAccessor.s b/asm/src/MintNodeAccessor.s index 46b9da4d..a2795e99 100644 --- a/asm/src/MintNodeAccessor.s +++ b/asm/src/MintNodeAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterForce__Q23g3d16MintNodeAccessorFRCQ23g3d12NodeAccessor RegisterForce__Q23g3d16MintNodeAccessorFRCQ23g3d12NodeAccessor: /* 8018E9EC 0018A82C 7C 64 1B 78 */ mr r4, r3 @@ -116,7 +116,7 @@ __sinit_$$3MintNodeAccessor_cpp: /* 8018EB44 0018A984 38 21 00 10 */ addi r1, r1, 0x10 /* 8018EB48 0018A988 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023E4, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintOCollManager.s b/asm/src/MintOCollManager.s index 49147954..5f7d512f 100644 --- a/asm/src/MintOCollManager.s +++ b/asm/src/MintOCollManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step5ocoll16MintOCollManagerFRQ25ocoll7Manager Register__Q43scn4step5ocoll16MintOCollManagerFRQ25ocoll7Manager: /* 803CAB98 003C69D8 90 6D F9 10 */ stw r3, t_manager__Q43scn4step5ocoll30$$2unnamed$$2MintOCollManager_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintOCollManager_cpp: /* 803CABB4 003C69F4 38 6D F9 10 */ addi r3, r13, t_manager__Q43scn4step5ocoll30$$2unnamed$$2MintOCollManager_cpp$$2-_SDA_BASE_ /* 803CABB8 003C69F8 4B D1 28 28 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025D8, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintObjColl.s b/asm/src/MintObjColl.s index c48f53ee..3e630c99 100644 --- a/asm/src/MintObjColl.s +++ b/asm/src/MintObjColl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step5chara11MintObjCollFRQ43scn4step5chara7ObjColl Register__Q43scn4step5chara11MintObjCollFRQ43scn4step5chara7ObjColl: /* 8026FE90 0026BCD0 90 6D F1 D0 */ stw r3, t_obj__Q43scn4step5chara25$$2unnamed$$2MintObjColl_cpp$$2-_SDA_BASE_(r13) @@ -644,7 +644,7 @@ __sinit_$$3MintObjColl_cpp: /* 80270684 0026C4C4 38 6D F1 D0 */ addi r3, r13, t_obj__Q43scn4step5chara25$$2unnamed$$2MintObjColl_cpp$$2-_SDA_BASE_ /* 80270688 0026C4C8 4B E6 CD 58 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero25$$2unnamed$$2MintObjColl_cpp$$2Fv t_obj__Q43scn4step4hero25$$2unnamed$$2MintObjColl_cpp$$2Fv: /* 8034B9F0 00347830 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -705,7 +705,7 @@ SetBodyCollJump__Q43scn4step4hero11MintObjCollFv: /* 8034BA9C 003478DC 38 21 00 10 */ addi r1, r1, 0x10 /* 8034BAA0 003478E0 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024A8, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintSERequestor.s b/asm/src/MintSERequestor.s index 8905ba35..1ca346ff 100644 --- a/asm/src/MintSERequestor.s +++ b/asm/src/MintSERequestor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RegisterForce__Q23snd15MintSERequestorFRQ23snd11SERequestor RegisterForce__Q23snd15MintSERequestorFRQ23snd11SERequestor: /* 80402A3C 003FE87C 90 6D FB 38 */ stw r3, t_obj__Q23snd29$$2unnamed$$2MintSERequestor_cpp$$2-_SDA_BASE_(r13) @@ -28,7 +28,7 @@ __sinit_$$3MintSERequestor_cpp: /* 80402A64 003FE8A4 38 6D FB 38 */ addi r3, r13, t_obj__Q23snd29$$2unnamed$$2MintSERequestor_cpp$$2-_SDA_BASE_ /* 80402A68 003FE8A8 4B CD A9 78 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402624, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintScript.s b/asm/src/MintScript.s index 73a07935..b6593520 100644 --- a/asm/src/MintScript.s +++ b/asm/src/MintScript.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q24gobj10MintScriptFRQ24gobj6Script Register__Q24gobj10MintScriptFRQ24gobj6Script: /* 8019AF44 00196D84 90 6D ED D8 */ stw r3, t_obj__Q24gobj24$$2unnamed$$2MintScript_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintScript_cpp: /* 8019AF60 00196DA0 38 6D ED D8 */ addi r3, r13, t_obj__Q24gobj24$$2unnamed$$2MintScript_cpp$$2-_SDA_BASE_ /* 8019AF64 00196DA4 4B F4 24 7C */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402408, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintScriptData.s b/asm/src/MintScriptData.s index f1476804..9c8549c5 100644 --- a/asm/src/MintScriptData.s +++ b/asm/src/MintScriptData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero28$$2unnamed$$2MintScriptData_cpp$$2Fv t_obj__Q43scn4step4hero28$$2unnamed$$2MintScriptData_cpp$$2Fv: /* 8034BAA4 003478E4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintScriptTrigger.s b/asm/src/MintScriptTrigger.s index 00c60f15..505aa859 100644 --- a/asm/src/MintScriptTrigger.s +++ b/asm/src/MintScriptTrigger.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step5chara17MintScriptTriggerFRQ43scn4step5chara13ScriptTrigger Register__Q43scn4step5chara17MintScriptTriggerFRQ43scn4step5chara13ScriptTrigger: /* 8027068C 0026C4CC 90 6D F1 D8 */ stw r3, t_obj__Q43scn4step5chara31$$2unnamed$$2MintScriptTrigger_cpp$$2-_SDA_BASE_(r13) @@ -23,7 +23,7 @@ __sinit_$$3MintScriptTrigger_cpp: /* 802706AC 0026C4EC 38 6D F1 D8 */ addi r3, r13, t_obj__Q43scn4step5chara31$$2unnamed$$2MintScriptTrigger_cpp$$2-_SDA_BASE_ /* 802706B0 0026C4F0 4B E6 CD 30 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024AC, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintSetting.s b/asm/src/MintSetting.s index 395eff6f..53d3c6a2 100644 --- a/asm/src/MintSetting.s +++ b/asm/src/MintSetting.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm11MintSettingFv __ct__Q26mintvm11MintSettingFv: /* 801C5AF0 001C1930 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -353,7 +353,7 @@ lbl_801C5F7C: /* 801C5F9C 001C1DDC 38 21 00 10 */ addi r1, r1, 0x10 /* 801C5FA0 001C1DE0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249262 $$249262: .incbin "baserom.dol", 0x457B30, 0x10 @@ -436,7 +436,7 @@ $$2STRING$$2verify__Q26mintvm13MintAllocatorFv$$20: $$2STRING$$2verify__Q26mintvm13MintAllocatorFv: .incbin "baserom.dol", 0x457D88, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249286 $$249286: .incbin "baserom.dol", 0x493908, 0x8 diff --git a/asm/src/MintShake.s b/asm/src/MintShake.s index f3287c40..96680c9d 100644 --- a/asm/src/MintShake.s +++ b/asm/src/MintShake.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step5chara9MintShakeFRQ43scn4step5chara5Shake Register__Q43scn4step5chara9MintShakeFRQ43scn4step5chara5Shake: /* 802706B4 0026C4F4 90 6D F1 E0 */ stw r3, t_obj__Q43scn4step5chara23$$2unnamed$$2MintShake_cpp$$2-_SDA_BASE_(r13) @@ -23,7 +23,7 @@ __sinit_$$3MintShake_cpp: /* 802706D4 0026C514 38 6D F1 E0 */ addi r3, r13, t_obj__Q43scn4step5chara23$$2unnamed$$2MintShake_cpp$$2-_SDA_BASE_ /* 802706D8 0026C518 4B E6 CD 08 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024B0, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintShipEvent.s b/asm/src/MintShipEvent.s index 8bc56228..a2312555 100644 --- a/asm/src/MintShipEvent.s +++ b/asm/src/MintShipEvent.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q53scn4step7gimmick9shipevent13MintShipEventFRQ53scn4step7gimmick9shipevent9ShipEvent Register__Q53scn4step7gimmick9shipevent13MintShipEventFRQ53scn4step7gimmick9shipevent9ShipEvent: /* 8031F7A0 0031B5E0 90 6D F7 C0 */ stw r3, t_obj__Q53scn4step7gimmick9shipevent27$$2unnamed$$2MintShipEvent_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintShipEvent_cpp: /* 8031F7BC 0031B5FC 38 6D F7 C0 */ addi r3, r13, t_obj__Q53scn4step7gimmick9shipevent27$$2unnamed$$2MintShipEvent_cpp$$2-_SDA_BASE_ /* 8031F7C0 0031B600 4B DB DC 20 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025B8, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintSlopeFit.s b/asm/src/MintSlopeFit.s index 0866fec8..8b104c89 100644 --- a/asm/src/MintSlopeFit.s +++ b/asm/src/MintSlopeFit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero26$$2unnamed$$2MintSlopeFit_cpp$$2Fv t_obj__Q43scn4step4hero26$$2unnamed$$2MintSlopeFit_cpp$$2Fv: /* 8034BB20 00347960 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintSquash.s b/asm/src/MintSquash.s index 56177750..6cd61e29 100644 --- a/asm/src/MintSquash.s +++ b/asm/src/MintSquash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero24$$2unnamed$$2MintSquash_cpp$$2Fv t_obj__Q43scn4step4hero24$$2unnamed$$2MintSquash_cpp$$2Fv: /* 8034BBE4 00347A24 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintStagingCtrl.s b/asm/src/MintStagingCtrl.s index 23f7762d..fed1327b 100644 --- a/asm/src/MintStagingCtrl.s +++ b/asm/src/MintStagingCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero29$$2unnamed$$2MintStagingCtrl_cpp$$2Fv t_obj__Q43scn4step4hero29$$2unnamed$$2MintStagingCtrl_cpp$$2Fv: /* 8034BC80 00347AC0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintStateChecker.s b/asm/src/MintStateChecker.s index 4e58549f..c702958d 100644 --- a/asm/src/MintStateChecker.s +++ b/asm/src/MintStateChecker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_obj__Q43scn4step4hero30$$2unnamed$$2MintStateChecker_cpp$$2Fv t_obj__Q43scn4step4hero30$$2unnamed$$2MintStateChecker_cpp$$2Fv: /* 8034BDA4 00347BE4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MintSuperBackPicture.s b/asm/src/MintSuperBackPicture.s index e84231fd..7eb2310f 100644 --- a/asm/src/MintSuperBackPicture.s +++ b/asm/src/MintSuperBackPicture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step3sfx20MintSuperBackPictureFRQ43scn4step3sfx16SuperBackPicture Register__Q43scn4step3sfx20MintSuperBackPictureFRQ43scn4step3sfx16SuperBackPicture: /* 803CDB40 003C9980 90 6D F9 18 */ stw r3, t_obj__Q43scn4step3sfx34$$2unnamed$$2MintSuperBackPicture_cpp$$2-_SDA_BASE_(r13) @@ -149,7 +149,7 @@ __sinit_$$3MintSuperBackPicture_cpp: /* 803CDCD4 003C9B14 38 6D F9 18 */ addi r3, r13, t_obj__Q43scn4step3sfx34$$2unnamed$$2MintSuperBackPicture_cpp$$2-_SDA_BASE_ /* 803CDCD8 003C9B18 4B D0 F7 08 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025DC, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintSuperFade.s b/asm/src/MintSuperFade.s index 168d891a..5a6c4474 100644 --- a/asm/src/MintSuperFade.s +++ b/asm/src/MintSuperFade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step3sfx13MintSuperFadeFRQ43scn4step3sfx9SuperFade Register__Q43scn4step3sfx13MintSuperFadeFRQ43scn4step3sfx9SuperFade: /* 803CDCDC 003C9B1C 90 6D F9 20 */ stw r3, t_obj__Q43scn4step3sfx27$$2unnamed$$2MintSuperFade_cpp$$2-_SDA_BASE_(r13) @@ -23,7 +23,7 @@ __sinit_$$3MintSuperFade_cpp: /* 803CDCFC 003C9B3C 38 6D F9 20 */ addi r3, r13, t_obj__Q43scn4step3sfx27$$2unnamed$$2MintSuperFade_cpp$$2-_SDA_BASE_ /* 803CDD00 003C9B40 4B D0 F6 E0 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025E0, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintSystemCall.s b/asm/src/MintSystemCall.s index 93053304..aeda5281 100644 --- a/asm/src/MintSystemCall.s +++ b/asm/src/MintSystemCall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global panic__Q26mintvm14MintSystemCallFPCciPCce panic__Q26mintvm14MintSystemCallFPCciPCce: /* 801C5FA4 001C1DE4 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -116,7 +116,7 @@ lbl_801C611C: /* 801C612C 001C1F6C 38 21 00 20 */ addi r1, r1, 0x20 /* 801C6130 001C1F70 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249097 $$249097: .incbin "baserom.dol", 0x457DA0, 0x28 diff --git a/asm/src/MintTarget.s b/asm/src/MintTarget.s index fdb3c3f7..204fdac7 100644 --- a/asm/src/MintTarget.s +++ b/asm/src/MintTarget.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q24gobj10MintTargetFRQ24gobj6Target Register__Q24gobj10MintTargetFRQ24gobj6Target: /* 8019AF68 00196DA8 90 6D ED E0 */ stw r3, t_obj__Q24gobj24$$2unnamed$$2MintTarget_cpp$$2-_SDA_BASE_(r13) @@ -53,7 +53,7 @@ __sinit_$$3MintTarget_cpp: /* 8019AFD0 00196E10 38 6D ED E0 */ addi r3, r13, t_obj__Q24gobj24$$2unnamed$$2MintTarget_cpp$$2-_SDA_BASE_ /* 8019AFD4 00196E14 4B F4 24 0C */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40240C, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/MintUtility.s b/asm/src/MintUtility.s index dd244a69..35922c4b 100644 --- a/asm/src/MintUtility.s +++ b/asm/src/MintUtility.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsMainPlayer__Q43scn4step4hero11MintUtilityFv IsMainPlayer__Q43scn4step4hero11MintUtilityFv: /* 8034BE58 00347C98 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -940,7 +940,7 @@ RequestEffectGearNodeNDOS__Q43scn4step4hero11MintUtilityFQ43scn4step6effect4Kind /* 8034CAE4 00348924 38 21 00 60 */ addi r1, r1, 0x60 /* 8034CAE8 00348928 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259354 $$259354: .incbin "baserom.dol", 0x49D848, 0x4 diff --git a/asm/src/MintZoomQuake.s b/asm/src/MintZoomQuake.s index f0412189..6f27d88c 100644 --- a/asm/src/MintZoomQuake.s +++ b/asm/src/MintZoomQuake.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Register__Q43scn4step6camera13MintZoomQuakeFRQ43scn4step6camera9ZoomQuake Register__Q43scn4step6camera13MintZoomQuakeFRQ43scn4step6camera9ZoomQuake: /* 802662A0 002620E0 90 6D F1 B0 */ stw r3, t_obj__Q43scn4step6camera27$$2unnamed$$2MintZoomQuake_cpp$$2-_SDA_BASE_(r13) @@ -22,7 +22,7 @@ __sinit_$$3MintZoomQuake_cpp: /* 802662BC 002620FC 38 6D F1 B0 */ addi r3, r13, t_obj__Q43scn4step6camera27$$2unnamed$$2MintZoomQuake_cpp$$2-_SDA_BASE_ /* 802662C0 00262100 4B E7 71 20 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402498, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/Model.s b/asm/src/Model.s index 2781cb27..75b291ea 100644 --- a/asm/src/Model.s +++ b/asm/src/Model.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d5ModelFRCQ23g3d12ModelContext __ct__Q23g3d5ModelFRCQ23g3d12ModelContext: /* 8018EB4C 0018A98C 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -1987,7 +1987,7 @@ lbl_80190618: /* 8019062C 0018C46C 38 21 00 10 */ addi r1, r1, 0x10 /* 80190630 0018C470 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj5ModelFRCQ24gobj9ModelDescRQ23mem10IAllocatorRCQ23g3d15ResFileAccessorRCQ24gobj8Location __ct__Q24gobj5ModelFRCQ24gobj9ModelDescRQ23mem10IAllocatorRCQ23g3d15ResFileAccessorRCQ24gobj8Location: /* 8019AFD8 00196E18 94 21 FE E0 */ stwu r1, -0x120(r1) @@ -2175,7 +2175,7 @@ registerToRoot__Q24gobj5ModelFRQ23g3d4Root: /* 8019B258 00197098 38 63 00 04 */ addi r3, r3, 4 /* 8019B25C 0019709C 4B FF 1E A0 */ b registerToRoot__Q23g3d10CharaModelFRQ23g3d4Root -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara5ModelFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ43scn4step5chara9ModelDescRCQ24gobj8LocationRCQ24gobj6TargetQ43scn4step6effect12DrawPriority __ct__Q43scn4step5chara5ModelFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ43scn4step5chara9ModelDescRCQ24gobj8LocationRCQ24gobj6TargetQ43scn4step6effect12DrawPriority: /* 802706DC 0026C51C 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -3263,7 +3263,7 @@ shake__Q43scn4step5chara5ModelFv: /* 80271508 0026D348 38 63 00 C8 */ addi r3, r3, 0xc8 /* 8027150C 0026D34C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick5ModelFRQ33scn4step9ComponentPCcPCcbb __ct__Q43scn4step7gimmick5ModelFRQ33scn4step9ComponentPCcPCcbb: /* 802F70C8 002F2F08 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -3423,7 +3423,7 @@ updateWorldMtx__Q43scn4step7gimmick5ModelFv: /* 802F728C 002F30CC 38 63 00 08 */ addi r3, r3, 8 /* 802F7290 002F30D0 4B E9 D9 68 */ b updateWorldMtx__Q23g3d8StdModelFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_modelResFile__Q43scn4step4hero19$$2unnamed$$2Model_cpp$$2FRQ33scn4step9ComponentRQ43scn4step4hero4Hero t_modelResFile__Q43scn4step4hero19$$2unnamed$$2Model_cpp$$2FRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 8034CAEC 0034892C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -5313,7 +5313,7 @@ onObjStopFinished__Q43scn4step4hero5ModelFv: /* 8034E5F4 0034A434 38 21 00 10 */ addi r1, r1, 0x10 /* 8034E5F8 0034A438 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$258142 $$258142: .incbin "baserom.dol", 0x4161A0, 0x1C @@ -5342,7 +5342,7 @@ $$258964: $$258967: .incbin "baserom.dol", 0x416278, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256416 $$256416: .incbin "baserom.dol", 0x450610, 0x18 @@ -5389,17 +5389,17 @@ $$2STRING$$2ref__Q34nw4r3g3d7ResNodeFv$$20: $$2STRING$$2ref__Q34nw4r3g3d7ResNodeFv: .incbin "baserom.dol", 0x450778, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24gobj5Model __vt__Q24gobj5Model: .incbin "baserom.dol", 0x451130, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5chara5Model __vt__Q43scn4step5chara5Model: .incbin "baserom.dol", 0x468788, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258183 $$258183: .incbin "baserom.dol", 0x480F28, 0x20 @@ -5473,7 +5473,7 @@ $$258997: __vt__Q43scn4step4hero5Model: .incbin "baserom.dol", 0x481210, 0x48 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2GetClassName__Q34nw4r3g3d6ResMatFv $$2STRING$$2GetClassName__Q34nw4r3g3d6ResMatFv: .incbin "baserom.dol", 0x493170, 0x8 @@ -5487,7 +5487,7 @@ $$2STRING$$2GetClassName__Q34nw4r3g3d7ResNodeFv: __FUNCTION__$30538: .incbin "baserom.dol", 0x493188, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258960 $$258960: .incbin "baserom.dol", 0x496DE8, 0x8 @@ -5495,7 +5495,7 @@ $$258960: $$258993: .incbin "baserom.dol", 0x496DF0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257702 $$257702: .incbin "baserom.dol", 0x49B810, 0x4 @@ -5503,7 +5503,7 @@ $$257702: $$257703: .incbin "baserom.dol", 0x49B814, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260284 $$260284: .incbin "baserom.dol", 0x49D858, 0x4 diff --git a/asm/src/ModelAccessor.s b/asm/src/ModelAccessor.s index 6f24b574..56340bac 100644 --- a/asm/src/ModelAccessor.s +++ b/asm/src/ModelAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d13ModelAccessorFv __ct__Q23g3d13ModelAccessorFv: /* 80190634 0018C474 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/ModelAnim.s b/asm/src/ModelAnim.s index 7354c805..dd4a0149 100644 --- a/asm/src/ModelAnim.s +++ b/asm/src/ModelAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d9ModelAnimFRCQ23g3d16ModelAnimContext __ct__Q23g3d9ModelAnimFRCQ23g3d16ModelAnimContext: /* 80190760 0018C5A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1633,7 +1633,7 @@ lbl_80191C68: /* 80191C88 0018DAC8 38 21 00 20 */ addi r1, r1, 0x20 /* 80191C8C 0018DACC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmShpFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmShpFv: .incbin "baserom.dol", 0x450790, 0xC @@ -1689,7 +1689,7 @@ $$2STRING$$2ref__Q34nw4r3g3d9ResAnmChrCFv$$20: $$2STRING$$2ref__Q34nw4r3g3d9ResAnmChrCFv: .incbin "baserom.dol", 0x4508F4, 0x14 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __FUNCTION__$37026 __FUNCTION__$37026: .incbin "baserom.dol", 0x493190, 0x4 @@ -1709,7 +1709,7 @@ __FUNCTION__$29445: __FUNCTION__$29180: .incbin "baserom.dol", 0x4931A4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253047 $$253047: .incbin "baserom.dol", 0x49A1C8, 0x8 diff --git a/asm/src/ModelAnimAccessor.s b/asm/src/ModelAnimAccessor.s index b3efa939..062bc503 100644 --- a/asm/src/ModelAnimAccessor.s +++ b/asm/src/ModelAnimAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global start__Q23g3d17ModelAnimAccessorCFb start__Q23g3d17ModelAnimAccessorCFb: /* 80191C90 0018DAD0 80 63 00 00 */ lwz r3, 0(r3) @@ -213,7 +213,7 @@ lbl_80191ECC: onFrameChanged__Q23g3d34NullModelAnimAccessorEventReceiverFRCQ23g3d17ModelAnimAccessor: /* 80191EE8 0018DD28 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23g3d34NullModelAnimAccessorEventReceiver __vt__Q23g3d34NullModelAnimAccessorEventReceiver: .incbin "baserom.dol", 0x450908, 0x10 diff --git a/asm/src/ModelAnimContext.s b/asm/src/ModelAnimContext.s index 8022fd7e..fd20c7fc 100644 --- a/asm/src/ModelAnimContext.s +++ b/asm/src/ModelAnimContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d16ModelAnimContextFRCQ23g3d15ResModelContextRQ23mem10IAllocatorRQ23mem10IAllocatorRQ23mem10IAllocatorRQ23mem10IAllocatorRQ23mem10IAllocatorRQ23mem10IAllocator __ct__Q23g3d16ModelAnimContextFRCQ23g3d15ResModelContextRQ23mem10IAllocatorRQ23mem10IAllocatorRQ23mem10IAllocatorRQ23mem10IAllocatorRQ23mem10IAllocatorRQ23mem10IAllocator: /* 80191EEC 0018DD2C 80 04 00 00 */ lwz r0, 0(r4) diff --git a/asm/src/ModelBufferOption.s b/asm/src/ModelBufferOption.s index 3c1f8976..21faa68e 100644 --- a/asm/src/ModelBufferOption.s +++ b/asm/src/ModelBufferOption.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d17ModelBufferOptionFv __ct__Q23g3d17ModelBufferOptionFv: /* 80191F30 0018DD70 38 00 00 00 */ li r0, 0 diff --git a/asm/src/ModelContext.s b/asm/src/ModelContext.s index c66e863c..4ab8c8ec 100644 --- a/asm/src/ModelContext.s +++ b/asm/src/ModelContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DefaultAllocator__Q23g3d12ModelContextFv DefaultAllocator__Q23g3d12ModelContextFv: /* 801920E8 0018DF28 80 6D ED 00 */ lwz r3, object___Q33hel6common32ExplicitSingleton$$0Q23mem6Memory$$1-_SDA_BASE_(r13) diff --git a/asm/src/ModelDesc.s b/asm/src/ModelDesc.s index e5145ea5..f12fdbde 100644 --- a/asm/src/ModelDesc.s +++ b/asm/src/ModelDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj9ModelDescFv __ct__Q24gobj9ModelDescFv: /* 8019B260 001970A0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -51,7 +51,7 @@ lbl_8019B2B4: /* 8019B30C 0019714C 38 21 00 20 */ addi r1, r1, 0x20 /* 8019B310 00197150 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q43scn4step4boss9ModelDescFQ43scn4step3map11BinBossKindUlbb Create__Q43scn4step4boss9ModelDescFQ43scn4step3map11BinBossKindUlbb: /* 802329D4 0022E814 7C 60 1B 78 */ mr r0, r3 @@ -166,7 +166,7 @@ __sinit_$$3ModelDesc_cpp: /* 80232B64 0022E9A4 90 03 00 54 */ stw r0, 0x54(r3) /* 80232B68 0022E9A8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateNormal__Q53scn4step4boss7bonkers9ModelDescFUlb CreateNormal__Q53scn4step4boss7bonkers9ModelDescFUlb: /* 80237C08 00233A48 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -281,7 +281,7 @@ lbl_80237D74: /* 80237DA0 00233BE0 38 21 00 30 */ addi r1, r1, 0x30 /* 80237DA4 00233BE4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss15challengemaster9ModelDescFUlb Create__Q53scn4step4boss15challengemaster9ModelDescFUlb: /* 8023DAC8 00239908 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -343,7 +343,7 @@ __sinit_$$3ModelDesc_cpp: /* 8023DB98 002399D8 90 03 00 50 */ stw r0, 0x50(r3) /* 8023DB9C 002399DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss12creditdedede9ModelDescFUlb Create__Q53scn4step4boss12creditdedede9ModelDescFUlb: /* 80247C58 00243A98 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -408,7 +408,7 @@ __sinit_$$3ModelDesc_cpp: /* 80247D34 00243B74 90 83 00 78 */ stw r4, 0x78(r3) /* 80247D38 00243B78 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss9creditdee9ModelDescFUlb Create__Q53scn4step4boss9creditdee9ModelDescFUlb: /* 802486A8 002444E8 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -580,7 +580,7 @@ __sinit_$$3ModelDesc_cpp: /* 80248914 00244754 90 83 00 3C */ stw r4, 0x3c(r3) /* 80248918 00244758 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss10creditmeta9ModelDescFUlb Create__Q53scn4step4boss10creditmeta9ModelDescFUlb: /* 80249D44 00245B84 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -644,7 +644,7 @@ __sinit_$$3ModelDesc_cpp: /* 80249E1C 00245C5C 90 83 00 C8 */ stw r4, 0xc8(r3) /* 80249E20 00245C60 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss10creditroah9ModelDescFUlb Create__Q53scn4step4boss10creditroah9ModelDescFUlb: /* 8024B6D4 00247514 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -727,7 +727,7 @@ __sinit_$$3ModelDesc_cpp: /* 8024B7F0 00247630 90 03 70 AC */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 8024B7F4 00247634 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss6dubior9ModelDescFUlb Create__Q53scn4step4boss6dubior9ModelDescFUlb: /* 8024D75C 0024959C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -785,7 +785,7 @@ lbl_8024D7F8: /* 8024D824 00249664 38 21 00 30 */ addi r1, r1, 0x30 /* 8024D828 00249668 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss10gigantedge9ModelDescFUlb Create__Q53scn4step4boss10gigantedge9ModelDescFUlb: /* 802522B8 0024E0F8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -843,7 +843,7 @@ lbl_80252354: /* 80252380 0024E1C0 38 21 00 30 */ addi r1, r1, 0x30 /* 80252384 0024E1C4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss8kingsdoo9ModelDescFUlb Create__Q53scn4step4boss8kingsdoo9ModelDescFUlb: /* 8025388C 0024F6CC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -900,7 +900,7 @@ lbl_80253924: /* 80253950 0024F790 38 21 00 30 */ addi r1, r1, 0x30 /* 80253954 0024F794 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss9moundeath9ModelDescFUlb Create__Q53scn4step4boss9moundeath9ModelDescFUlb: /* 80255AC8 00251908 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -958,7 +958,7 @@ lbl_80255B64: /* 80255B90 002519D0 38 21 00 30 */ addi r1, r1, 0x30 /* 80255B94 002519D4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss13watergalboros9ModelDescFUlb Create__Q53scn4step4boss13watergalboros9ModelDescFUlb: /* 80259DE4 00255C24 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1016,7 +1016,7 @@ lbl_80259E80: /* 80259EAC 00255CEC 38 21 00 30 */ addi r1, r1, 0x30 /* 80259EB0 00255CF0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss6whispy9ModelDescFUlb Create__Q53scn4step4boss6whispy9ModelDescFUlb: /* 8025C810 00258650 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1083,7 +1083,7 @@ __sinit_$$3ModelDesc_cpp: /* 8025C8F0 00258730 90 03 01 04 */ stw r0, 0x104(r3) /* 8025C8F4 00258734 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4boss9zankibble9ModelDescFUlb Create__Q53scn4step4boss9zankibble9ModelDescFUlb: /* 80260D68 0025CBA8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1141,7 +1141,7 @@ lbl_80260E04: /* 80260E30 0025CC70 38 21 00 30 */ addi r1, r1, 0x30 /* 80260E34 0025CC74 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara9ModelDescFv __ct__Q43scn4step5chara9ModelDescFv: /* 80271510 0026D350 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1173,7 +1173,7 @@ __ct__Q43scn4step5chara9ModelDescFv: /* 80271578 0026D3B8 38 21 00 10 */ addi r1, r1, 0x10 /* 8027157C 0026D3BC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8armordee9ModelDescFv Create__Q53scn4step5enemy8armordee9ModelDescFv: /* 8029662C 0029246C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1236,7 +1236,7 @@ __sinit_$$3ModelDesc_cpp: /* 80296700 00292540 90 83 00 8C */ stw r4, 0x8c(r3) /* 80296704 00292544 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global init__Q28dynamics8DescNodeFfffffffff init__Q28dynamics8DescNodeFfffffffff: /* 802971C4 00293004 C0 01 00 08 */ lfs f0, 8(r1) @@ -1522,7 +1522,7 @@ __sinit_$$3ModelDesc_cpp: /* 802975DC 0029341C 90 03 01 18 */ stw r0, 0x118(r3) /* 802975E0 00293420 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7blipper9ModelDescFv Create__Q53scn4step5enemy7blipper9ModelDescFv: /* 80299398 002951D8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1591,7 +1591,7 @@ __sinit_$$3ModelDesc_cpp: /* 80299484 002952C4 90 83 00 DC */ stw r4, 0xdc(r3) /* 80299488 002952C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11bonkersbomb9ModelDescFv Create__Q53scn4step5enemy11bonkersbomb9ModelDescFv: /* 8029C0E0 00297F20 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1640,7 +1640,7 @@ lbl_8029C12C: /* 8029C188 00297FC8 38 21 00 30 */ addi r1, r1, 0x30 /* 8029C18C 00297FCC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6bouncy9ModelDescFv Create__Q53scn4step5enemy6bouncy9ModelDescFv: /* 8029D1D4 00299014 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1705,7 +1705,7 @@ __sinit_$$3ModelDesc_cpp: /* 8029D2B0 002990F0 90 83 00 8C */ stw r4, 0x8c(r3) /* 8029D2B4 002990F4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5bowby9ModelDescFv Create__Q53scn4step5enemy5bowby9ModelDescFv: /* 8029E788 0029A5C8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1816,7 +1816,7 @@ __sinit_$$3ModelDesc_cpp: /* 8029E90C 0029A74C 90 83 00 A0 */ stw r4, 0xa0(r3) /* 8029E910 0029A750 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10brontoburt9ModelDescFv Create__Q53scn4step5enemy10brontoburt9ModelDescFv: /* 8029F364 0029B1A4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1927,7 +1927,7 @@ __sinit_$$3ModelDesc_cpp: /* 8029F4E8 0029B328 90 03 00 78 */ stw r0, 0x78(r3) /* 8029F4EC 0029B32C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11broomhatter9ModelDescFv Create__Q53scn4step5enemy11broomhatter9ModelDescFv: /* 802A0EE8 0029CD28 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1991,7 +1991,7 @@ __sinit_$$3ModelDesc_cpp: /* 802A0FC0 0029CE00 90 83 00 A0 */ stw r4, 0xa0(r3) /* 802A0FC4 0029CE04 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5cappy9ModelDescFv Create__Q53scn4step5enemy5cappy9ModelDescFv: /* 802A2DA4 0029EBE4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2058,7 +2058,7 @@ __sinit_$$3ModelDesc_cpp: /* 802A2E88 0029ECC8 90 83 00 B4 */ stw r4, 0xb4(r3) /* 802A2E8C 0029ECCC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8cappyhat9ModelDescFv Create__Q53scn4step5enemy8cappyhat9ModelDescFv: /* 802A3D14 0029FB54 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2123,7 +2123,7 @@ __sinit_$$3ModelDesc_cpp: /* 802A3DF0 0029FC30 90 03 00 8C */ stw r0, 0x8c(r3) /* 802A3DF4 0029FC34 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8cerulean9ModelDescFv Create__Q53scn4step5enemy8cerulean9ModelDescFv: /* 802A5580 002A13C0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2189,7 +2189,7 @@ __sinit_$$3ModelDesc_cpp: /* 802A5660 002A14A0 90 03 00 B4 */ stw r0, 0xb4(r3) /* 802A5664 002A14A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateNormal__Q53scn4step5enemy6chilly9ModelDescFv CreateNormal__Q53scn4step5enemy6chilly9ModelDescFv: /* 802A62E4 002A2124 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2258,7 +2258,7 @@ __sinit_$$3ModelDesc_cpp: /* 802A63D0 002A2210 90 03 00 F0 */ stw r0, 0xf0(r3) /* 802A63D4 002A2214 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy4como9ModelDescFv Create__Q53scn4step5enemy4como9ModelDescFv: /* 802A7470 002A32B0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2322,7 +2322,7 @@ __sinit_$$3ModelDesc_cpp: /* 802A7548 002A3388 90 03 00 78 */ stw r0, 0x78(r3) /* 802A754C 002A338C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6degout9ModelDescFv Create__Q53scn4step5enemy6degout9ModelDescFv: /* 802AD344 002A9184 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2387,7 +2387,7 @@ __sinit_$$3ModelDesc_cpp: /* 802AD420 002A9260 90 03 00 DC */ stw r0, 0xdc(r3) /* 802AD424 002A9264 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8dubiorjr9ModelDescFv Create__Q53scn4step5enemy8dubiorjr9ModelDescFv: /* 802AE194 002A9FD4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2503,7 +2503,7 @@ __sinit_$$3ModelDesc_cpp: /* 802AE324 002AA164 90 03 00 78 */ stw r0, 0x78(r3) /* 802AE328 002AA168 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11dubiorspark9ModelDescFv Create__Q53scn4step5enemy11dubiorspark9ModelDescFv: /* 802AEE80 002AACC0 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -2592,7 +2592,7 @@ __sinit_$$3ModelDesc_cpp: /* 802AEFB4 002AADF4 90 03 00 8C */ stw r0, 0x8c(r3) /* 802AEFB8 002AADF8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy4elec9ModelDescFv Create__Q53scn4step5enemy4elec9ModelDescFv: /* 802AFC40 002ABA80 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2658,7 +2658,7 @@ __sinit_$$3ModelDesc_cpp: /* 802AFD20 002ABB60 90 03 00 A0 */ stw r0, 0xa0(r3) /* 802AFD24 002ABB64 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6flamer9ModelDescFv Create__Q53scn4step5enemy6flamer9ModelDescFv: /* 802B22D8 002AE118 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2724,7 +2724,7 @@ __sinit_$$3ModelDesc_cpp: /* 802B23B8 002AE1F8 90 03 00 A0 */ stw r0, 0xa0(r3) /* 802B23BC 002AE1FC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5foley9ModelDescFv Create__Q53scn4step5enemy5foley9ModelDescFv: /* 802B49C8 002B0808 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2786,7 +2786,7 @@ __sinit_$$3ModelDesc_cpp: /* 802B4A98 002B08D8 90 83 00 A0 */ stw r4, 0xa0(r3) /* 802B4A9C 002B08DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5gemra9ModelDescFv Create__Q53scn4step5enemy5gemra9ModelDescFv: /* 802B61AC 002B1FEC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2850,7 +2850,7 @@ __sinit_$$3ModelDesc_cpp: /* 802B6284 002B20C4 90 03 00 78 */ stw r0, 0x78(r3) /* 802B6288 002B20C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7gigatzo9ModelDescFv Create__Q53scn4step5enemy7gigatzo9ModelDescFv: /* 802B76B8 002B34F8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3011,7 +3011,7 @@ __sinit_$$3ModelDesc_cpp: /* 802B78F4 002B3734 90 03 00 8C */ stw r0, 0x8c(r3) /* 802B78F8 002B3738 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5gordo9ModelDescFv Create__Q53scn4step5enemy5gordo9ModelDescFv: /* 802B9058 002B4E98 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3075,7 +3075,7 @@ __sinit_$$3ModelDesc_cpp: /* 802B9130 002B4F70 90 03 00 78 */ stw r0, 0x78(r3) /* 802B9134 002B4F74 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateNormal__Q53scn4step5enemy7hothead9ModelDescFv CreateNormal__Q53scn4step5enemy7hothead9ModelDescFv: /* 802BA66C 002B64AC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3140,7 +3140,7 @@ __sinit_$$3ModelDesc_cpp: /* 802BA748 002B6588 90 83 00 B4 */ stw r4, 0xb4(r3) /* 802BA74C 002B658C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6juckle9ModelDescFv Create__Q53scn4step5enemy6juckle9ModelDescFv: /* 802BB7A0 002B75E0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3201,7 +3201,7 @@ __sinit_$$3ModelDesc_cpp: /* 802BB86C 002B76AC 90 83 00 8C */ stw r4, 0x8c(r3) /* 802BB870 002B76B0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy4kabu9ModelDescFv Create__Q53scn4step5enemy4kabu9ModelDescFv: /* 802BCDC8 002B8C08 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3270,7 +3270,7 @@ __sinit_$$3ModelDesc_cpp: /* 802BCEB4 002B8CF4 90 83 00 DC */ stw r4, 0xdc(r3) /* 802BCEB8 002B8CF8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10knucklejoe9ModelDescFv Create__Q53scn4step5enemy10knucklejoe9ModelDescFv: /* 802BF8C0 002BB700 94 21 FE 90 */ stwu r1, -0x170(r1) @@ -3511,7 +3511,7 @@ __sinit_$$3ModelDesc_cpp: /* 802BFC50 002BBA90 90 03 00 78 */ stw r0, 0x78(r3) /* 802BFC54 002BBA94 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6lanzer9ModelDescFv Create__Q53scn4step5enemy6lanzer9ModelDescFv: /* 802C2188 002BDFC8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3575,7 +3575,7 @@ __sinit_$$3ModelDesc_cpp: /* 802C2260 002BE0A0 90 03 00 78 */ stw r0, 0x78(r3) /* 802C2264 002BE0A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6leafan9ModelDescFv Create__Q53scn4step5enemy6leafan9ModelDescFv: /* 802C3564 002BF3A4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3640,7 +3640,7 @@ __sinit_$$3ModelDesc_cpp: /* 802C3640 002BF480 90 83 00 8C */ stw r4, 0x8c(r3) /* 802C3644 002BF484 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9mbossdead9ModelDescFv Create__Q53scn4step5enemy9mbossdead9ModelDescFv: /* 802C4698 002C04D8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -3713,7 +3713,7 @@ lbl_802C476C: /* 802C4798 002C05D8 38 21 00 50 */ addi r1, r1, 0x50 /* 802C479C 002C05DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7mumbies9ModelDescFv Create__Q53scn4step5enemy7mumbies9ModelDescFv: /* 802C5000 002C0E40 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3780,7 +3780,7 @@ __sinit_$$3ModelDesc_cpp: /* 802C50E4 002C0F24 90 03 00 C8 */ stw r0, 0xc8(r3) /* 802C50E8 002C0F28 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8needlous9ModelDescFv Create__Q53scn4step5enemy8needlous9ModelDescFv: /* 802C6204 002C2044 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3843,7 +3843,7 @@ __sinit_$$3ModelDesc_cpp: /* 802C62D8 002C2118 90 03 00 78 */ stw r0, 0x78(r3) /* 802C62DC 002C211C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5noddy9ModelDescFv Create__Q53scn4step5enemy5noddy9ModelDescFv: /* 802C732C 002C316C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3907,7 +3907,7 @@ __sinit_$$3ModelDesc_cpp: /* 802C7404 002C3244 90 03 00 78 */ stw r0, 0x78(r3) /* 802C7408 002C3248 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5nruff9ModelDescFv Create__Q53scn4step5enemy5nruff9ModelDescFv: /* 802C7E00 002C3C40 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3972,7 +3972,7 @@ __sinit_$$3ModelDesc_cpp: /* 802C7EDC 002C3D1C 90 83 00 8C */ stw r4, 0x8c(r3) /* 802C7EE0 002C3D20 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6owgulf9ModelDescFv Create__Q53scn4step5enemy6owgulf9ModelDescFv: /* 802C9F18 002C5D58 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4039,7 +4039,7 @@ __sinit_$$3ModelDesc_cpp: /* 802C9FFC 002C5E3C 90 83 00 B4 */ stw r4, 0xb4(r3) /* 802CA000 002C5E40 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7parasol9ModelDescFv Create__Q53scn4step5enemy7parasol9ModelDescFv: /* 802CB104 002C6F44 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4107,7 +4107,7 @@ __sinit_$$3ModelDesc_cpp: /* 802CB1EC 002C702C 90 83 00 C8 */ stw r4, 0xc8(r3) /* 802CB1F0 002C7030 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6pierce9ModelDescFv Create__Q53scn4step5enemy6pierce9ModelDescFv: /* 802CFB3C 002CB97C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4173,7 +4173,7 @@ __sinit_$$3ModelDesc_cpp: /* 802CFC1C 002CBA5C 90 83 00 B4 */ stw r4, 0xb4(r3) /* 802CFC20 002CBA60 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10poppybrojr9ModelDescFv Create__Q53scn4step5enemy10poppybrojr9ModelDescFv: /* 802D1D28 002CDB68 94 21 FF 30 */ stwu r1, -0xd0(r1) @@ -4366,7 +4366,7 @@ __sinit_$$3ModelDesc_cpp: /* 802D1FF0 002CDE30 90 03 00 A0 */ stw r0, 0xa0(r3) /* 802D1FF4 002CDE34 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy14poppybrojrbomb9ModelDescFv Create__Q53scn4step5enemy14poppybrojrbomb9ModelDescFv: /* 802D2C0C 002CEA4C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4415,7 +4415,7 @@ lbl_802D2C58: /* 802D2CB4 002CEAF4 38 21 00 30 */ addi r1, r1, 0x30 /* 802D2CB8 002CEAF8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9puppetdee9ModelDescFv Create__Q53scn4step5enemy9puppetdee9ModelDescFv: /* 802D3318 002CF158 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4479,7 +4479,7 @@ __sinit_$$3ModelDesc_cpp: /* 802D33F0 002CF230 90 03 00 78 */ stw r0, 0x78(r3) /* 802D33F4 002CF234 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5rocky9ModelDescFv Create__Q53scn4step5enemy5rocky9ModelDescFv: /* 802D3A88 002CF8C8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4550,7 +4550,7 @@ __sinit_$$3ModelDesc_cpp: /* 802D3B7C 002CF9BC 90 03 01 04 */ stw r0, 0x104(r3) /* 802D3B80 002CF9C0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8rollball9ModelDescFv Create__Q53scn4step5enemy8rollball9ModelDescFv: /* 802D662C 002D246C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4660,7 +4660,7 @@ __sinit_$$3ModelDesc_cpp: /* 802D67AC 002D25EC 90 03 00 78 */ stw r0, 0x78(r3) /* 802D67B0 002D25F0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy7sandbag9ModelDescFv Create__Q53scn4step5enemy7sandbag9ModelDescFv: /* 802D9188 002D4FC8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4724,7 +4724,7 @@ __sinit_$$3ModelDesc_cpp: /* 802D9260 002D50A0 90 03 00 78 */ stw r0, 0x78(r3) /* 802D9264 002D50A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6scarfy9ModelDescFv Create__Q53scn4step5enemy6scarfy9ModelDescFv: /* 802D9D58 002D5B98 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4803,7 +4803,7 @@ __sinit_$$3ModelDesc_cpp: /* 802D9E6C 002D5CAC 90 03 00 F0 */ stw r0, 0xf0(r3) /* 802D9E70 002D5CB0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy8searches9ModelDescFv Create__Q53scn4step5enemy8searches9ModelDescFv: /* 802DBDF0 002D7C30 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4863,7 +4863,7 @@ __sinit_$$3ModelDesc_cpp: /* 802DBEB8 002D7CF8 90 83 00 78 */ stw r4, 0x78(r3) /* 802DBEBC 002D7CFC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5sheld9ModelDescFv Create__Q53scn4step5enemy5sheld9ModelDescFv: /* 802DD8F8 002D9738 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4930,7 +4930,7 @@ __sinit_$$3ModelDesc_cpp: /* 802DD9DC 002D981C 90 83 00 F0 */ stw r4, 0xf0(r3) /* 802DD9E0 002D9820 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6shotzo9ModelDescFv Create__Q53scn4step5enemy6shotzo9ModelDescFv: /* 802E0740 002DC580 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4995,7 +4995,7 @@ __sinit_$$3ModelDesc_cpp: /* 802E081C 002DC65C 90 83 00 8C */ stw r4, 0x8c(r3) /* 802E0820 002DC660 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9sirkibble9ModelDescFv Create__Q53scn4step5enemy9sirkibble9ModelDescFv: /* 802E16E4 002DD524 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5064,7 +5064,7 @@ __sinit_$$3ModelDesc_cpp: /* 802E17D0 002DD610 90 03 00 F0 */ stw r0, 0xf0(r3) /* 802E17D4 002DD614 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11sisterbound9ModelDescFv Create__Q53scn4step5enemy11sisterbound9ModelDescFv: /* 802E2AF4 002DE934 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5128,7 +5128,7 @@ __sinit_$$3ModelDesc_cpp: /* 802E2BCC 002DEA0C 90 83 00 8C */ stw r4, 0x8c(r3) /* 802E2BD0 002DEA10 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy5snowl9ModelDescFv Create__Q53scn4step5enemy5snowl9ModelDescFv: /* 802E3840 002DF680 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5194,7 +5194,7 @@ __sinit_$$3ModelDesc_cpp: /* 802E3920 002DF760 90 83 00 A0 */ stw r4, 0xa0(r3) /* 802E3924 002DF764 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6sodory9ModelDescFv Create__Q53scn4step5enemy6sodory9ModelDescFv: /* 802E53D0 002E1210 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5258,7 +5258,7 @@ __sinit_$$3ModelDesc_cpp: /* 802E54A8 002E12E8 90 03 00 78 */ stw r0, 0x78(r3) /* 802E54AC 002E12EC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6sparky9ModelDescFv Create__Q53scn4step5enemy6sparky9ModelDescFv: /* 802E6E78 002E2CB8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5327,7 +5327,7 @@ __sinit_$$3ModelDesc_cpp: /* 802E6F64 002E2DA4 90 83 00 DC */ stw r4, 0xdc(r3) /* 802E6F68 002E2DA8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10stareffect9ModelDescFv Create__Q53scn4step5enemy10stareffect9ModelDescFv: /* 802E7E84 002E3CC4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5376,7 +5376,7 @@ lbl_802E7ED0: /* 802E7F2C 002E3D6C 38 21 00 30 */ addi r1, r1, 0x30 /* 802E7F30 002E3D70 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy3sun9ModelDescFv Create__Q53scn4step5enemy3sun9ModelDescFv: /* 802E8C44 002E4A84 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5441,7 +5441,7 @@ __sinit_$$3ModelDesc_cpp: /* 802E8D20 002E4B60 90 03 00 8C */ stw r0, 0x8c(r3) /* 802E8D24 002E4B64 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9tsukikage9ModelDescFv Create__Q53scn4step5enemy9tsukikage9ModelDescFv: /* 802EAFFC 002E6E3C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5513,7 +5513,7 @@ __sinit_$$3ModelDesc_cpp: /* 802EB0F4 002E6F34 90 03 01 18 */ stw r0, 0x118(r3) /* 802EB0F8 002E6F38 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy9waddledee9ModelDescFv Create__Q53scn4step5enemy9waddledee9ModelDescFv: /* 802ED6F4 002E9534 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5697,7 +5697,7 @@ __sinit_$$3ModelDesc_cpp: /* 802ED98C 002E97CC 90 83 02 80 */ stw r4, 0x280(r3) /* 802ED990 002E97D0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateNormal__Q53scn4step5enemy9waddledoo9ModelDescFv CreateNormal__Q53scn4step5enemy9waddledoo9ModelDescFv: /* 802EFB34 002EB974 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5775,7 +5775,7 @@ __sinit_$$3ModelDesc_cpp: /* 802EFC44 002EBA84 90 03 01 90 */ stw r0, 0x190(r3) /* 802EFC48 002EBA88 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy10watergalbo9ModelDescFv Create__Q53scn4step5enemy10watergalbo9ModelDescFv: /* 802F01BC 002EBFFC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5843,7 +5843,7 @@ __sinit_$$3ModelDesc_cpp: /* 802F02A4 002EC0E4 90 83 00 C8 */ stw r4, 0xc8(r3) /* 802F02A8 002EC0E8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6whippy9ModelDescFv Create__Q53scn4step5enemy6whippy9ModelDescFv: /* 802F0804 002EC644 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5907,7 +5907,7 @@ __sinit_$$3ModelDesc_cpp: /* 802F08DC 002EC71C 90 03 00 78 */ stw r0, 0x78(r3) /* 802F08E0 002EC720 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy11whispyapple9ModelDescFv Create__Q53scn4step5enemy11whispyapple9ModelDescFv: /* 802F10A8 002ECEE8 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5973,7 +5973,7 @@ __sinit_$$3ModelDesc_cpp: /* 802F1188 002ECFC8 90 03 00 78 */ stw r0, 0x78(r3) /* 802F118C 002ECFCC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy15zankibblecutter9ModelDescFv Create__Q53scn4step5enemy15zankibblecutter9ModelDescFv: /* 802F2570 002EE3B0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -6022,7 +6022,7 @@ lbl_802F25B8: /* 802F2618 002EE458 38 21 00 30 */ addi r1, r1, 0x30 /* 802F261C 002EE45C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon7airball9ModelDescFv Create__Q53scn4step6weapon7airball9ModelDescFv: /* 803DB1B8 003D6FF8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6102,7 +6102,7 @@ __sinit_$$3ModelDesc_cpp: /* 803DB2C8 003D7108 90 03 4A 50 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803DB2CC 003D710C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon11starshotlv19ModelDescFv Create__Q53scn4step6weapon11starshotlv19ModelDescFv: /* 803DC230 003D8070 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -6148,7 +6148,7 @@ lbl_803DC278: /* 803DC2CC 003D810C 38 21 00 30 */ addi r1, r1, 0x30 /* 803DC2D0 003D8110 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon11starshotlv29ModelDescFv Create__Q53scn4step6weapon11starshotlv29ModelDescFv: /* 803DCAA8 003D88E8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6229,7 +6229,7 @@ __sinit_$$3ModelDesc_cpp: /* 803DCBBC 003D89FC 90 03 4B 98 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803DCBC0 003D8A00 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon11starshotlv39ModelDescFv Create__Q53scn4step6weapon11starshotlv39ModelDescFv: /* 803DD184 003D8FC4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6310,7 +6310,7 @@ __sinit_$$3ModelDesc_cpp: /* 803DD298 003D90D8 90 03 4C 48 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803DD29C 003D90DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon13whispyairball9ModelDescFv Create__Q53scn4step6weapon13whispyairball9ModelDescFv: /* 803DE400 003DA240 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -6440,7 +6440,7 @@ __sinit_$$3ModelDesc_cpp: /* 803DE5C8 003DA408 90 03 00 14 */ stw r0, 0x14(r3) /* 803DE5CC 003DA40C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon12leafanpollen9ModelDescFv Create__Q53scn4step6weapon12leafanpollen9ModelDescFv: /* 803DF078 003DAEB8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6510,7 +6510,7 @@ lbl_803DF140: /* 803DF16C 003DAFAC 38 21 00 50 */ addi r1, r1, 0x50 /* 803DF170 003DAFB0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon13gigatzobullet9ModelDescFv Create__Q53scn4step6weapon13gigatzobullet9ModelDescFv: /* 803E02B8 003DC0F8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6667,7 +6667,7 @@ lbl_803E0480: /* 803E04F0 003DC330 38 21 00 50 */ addi r1, r1, 0x50 /* 803E04F4 003DC334 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon10comothread9ModelDescFv Create__Q53scn4step6weapon10comothread9ModelDescFv: /* 803E2278 003DE0B8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6737,7 +6737,7 @@ lbl_803E2340: /* 803E236C 003DE1AC 38 21 00 50 */ addi r1, r1, 0x50 /* 803E2370 003DE1B0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon16enemywaterbullet9ModelDescFv Create__Q53scn4step6weapon16enemywaterbullet9ModelDescFv: /* 803E2A0C 003DE84C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6818,7 +6818,7 @@ __sinit_$$3ModelDesc_cpp: /* 803E2B20 003DE960 90 03 50 88 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803E2B24 003DE964 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon20enemywaterbulletwarp9ModelDescFv Create__Q53scn4step6weapon20enemywaterbulletwarp9ModelDescFv: /* 803E3668 003DF4A8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6899,7 +6899,7 @@ __sinit_$$3ModelDesc_cpp: /* 803E377C 003DF5BC 90 03 51 38 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803E3780 003DF5C0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon10spearspear9ModelDescFv Create__Q53scn4step6weapon10spearspear9ModelDescFv: /* 803E3F64 003DFDA4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -6984,7 +6984,7 @@ __sinit_$$3ModelDesc_cpp: /* 803E4088 003DFEC8 90 83 00 28 */ stw r4, 0x28(r3) /* 803E408C 003DFECC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon12hammerhammer9ModelDescFv Create__Q53scn4step6weapon12hammerhammer9ModelDescFv: /* 803E5350 003E1190 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7054,7 +7054,7 @@ lbl_803E5418: /* 803E5444 003E1284 38 21 00 50 */ addi r1, r1, 0x50 /* 803E5448 003E1288 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon8wingshot9ModelDescFv Create__Q53scn4step6weapon8wingshot9ModelDescFv: /* 803E5AF4 003E1934 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7135,7 +7135,7 @@ __sinit_$$3ModelDesc_cpp: /* 803E5C08 003E1A48 90 03 53 18 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803E5C0C 003E1A4C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon12shotzobullet9ModelDescFv Create__Q53scn4step6weapon12shotzobullet9ModelDescFv: /* 803E7290 003E30D0 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7205,7 +7205,7 @@ lbl_803E7358: /* 803E7384 003E31C4 38 21 00 50 */ addi r1, r1, 0x50 /* 803E7388 003E31C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon15sirkibblecutter9ModelDescFv Create__Q53scn4step6weapon15sirkibblecutter9ModelDescFv: /* 803E77F4 003E3634 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7286,7 +7286,7 @@ __sinit_$$3ModelDesc_cpp: /* 803E7908 003E3748 90 03 54 60 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803E790C 003E374C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon13owgulffeather9ModelDescFv Create__Q53scn4step6weapon13owgulffeather9ModelDescFv: /* 803E8040 003E3E80 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7356,7 +7356,7 @@ lbl_803E8108: /* 803E8134 003E3F74 38 21 00 50 */ addi r1, r1, 0x50 /* 803E8138 003E3F78 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon9foleyleaf9ModelDescFv Create__Q53scn4step6weapon9foleyleaf9ModelDescFv: /* 803E84A4 003E42E4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7440,7 +7440,7 @@ __sinit_$$3ModelDesc_cpp: /* 803E85C4 003E4404 90 03 00 14 */ stw r0, 0x14(r3) /* 803E85C8 003E4408 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon10bowbyarrow9ModelDescFv Create__Q53scn4step6weapon10bowbyarrow9ModelDescFv: /* 803E87F4 003E4634 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7545,7 +7545,7 @@ lbl_803E88F8: /* 803E896C 003E47AC 38 21 00 50 */ addi r1, r1, 0x50 /* 803E8970 003E47B0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon12jucklecutter9ModelDescFv Create__Q53scn4step6weapon12jucklecutter9ModelDescFv: /* 803E9494 003E52D4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7615,7 +7615,7 @@ lbl_803E955C: /* 803E9588 003E53C8 38 21 00 50 */ addi r1, r1, 0x50 /* 803E958C 003E53CC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon17tsukikageshuriken9ModelDescFv Create__Q53scn4step6weapon17tsukikageshuriken9ModelDescFv: /* 803E98C8 003E5708 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7696,7 +7696,7 @@ __sinit_$$3ModelDesc_cpp: /* 803E99DC 003E581C 90 03 58 08 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803E99E0 003E5820 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon10whispyroot9ModelDescFv Create__Q53scn4step6weapon10whispyroot9ModelDescFv: /* 803EA768 003E65A8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7766,7 +7766,7 @@ lbl_803EA830: /* 803EA85C 003E669C 38 21 00 50 */ addi r1, r1, 0x50 /* 803EA860 003E66A0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon18combinationairball9ModelDescFv Create__Q53scn4step6weapon18combinationairball9ModelDescFv: /* 803EACAC 003E6AEC 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7847,7 +7847,7 @@ __sinit_$$3ModelDesc_cpp: /* 803EADC0 003E6C00 90 03 59 50 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803EADC4 003E6C04 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon18combinationdeeshot9ModelDescFv Create__Q53scn4step6weapon18combinationdeeshot9ModelDescFv: /* 803EBE30 003E7C70 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7917,7 +7917,7 @@ lbl_803EBEF8: /* 803EBF24 003E7D64 38 21 00 50 */ addi r1, r1, 0x50 /* 803EBF28 003E7D68 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon12dededehammer9ModelDescFv Create__Q53scn4step6weapon12dededehammer9ModelDescFv: /* 803EC79C 003E85DC 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -7987,7 +7987,7 @@ lbl_803EC864: /* 803EC890 003E86D0 38 21 00 50 */ addi r1, r1, 0x50 /* 803EC894 003E86D4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon8deespear9ModelDescFv Create__Q53scn4step6weapon8deespear9ModelDescFv: /* 803ECF88 003E8DC8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -8072,7 +8072,7 @@ __sinit_$$3ModelDesc_cpp: /* 803ED0AC 003E8EEC 90 83 00 28 */ stw r4, 0x28(r3) /* 803ED0B0 003E8EF0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv CreateStar__Q53scn4step6weapon13vacuumedblock9ModelDescFv: /* 803EE568 003EA3A8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -8697,7 +8697,7 @@ lbl_803EEDF0: /* 803EEE60 003EACA0 38 21 00 50 */ addi r1, r1, 0x50 /* 803EEE64 003EACA4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step6weapon11hotheadfire9ModelDescFv Create__Q53scn4step6weapon11hotheadfire9ModelDescFv: /* 803EF5EC 003EB42C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -8778,19 +8778,19 @@ __sinit_$$3ModelDesc_cpp: /* 803EF700 003EB540 90 03 62 E8 */ stw r0, T_SCRIPT_ENTRIES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2@l(r3) /* 803EF704 003EB544 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402474, 0x8 -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402480, 0x14 -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4024C0, 0xDC -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025E8, 0x38 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x412668, 0xC8 @@ -8798,7 +8798,7 @@ T_ANIM_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: T_SCRIPT_ENTRIES__Q53scn4step4boss7bonkers23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x412730, 0x168 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss15challengemaster23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x4128B0, 0x100 @@ -8821,7 +8821,7 @@ T_ANIM_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: T_SCRIPT_ENTRIES__Q53scn4step4boss6dubior23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x412BC0, 0x108 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss10gigantedge23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x412CD8, 0xC8 @@ -8847,12 +8847,12 @@ T_ANIM_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: T_SCRIPT_ENTRIES__Q53scn4step4boss13watergalboros23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x4134C0, 0x190 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss6whispy23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x4136B8, 0x110 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x413800, 0xA8 @@ -8860,7 +8860,7 @@ T_ANIM_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: T_SCRIPT_ENTRIES__Q53scn4step4boss9zankibble23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x4138A8, 0x1B8 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy8armordee23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x414520, 0x30 @@ -8982,7 +8982,7 @@ T_ANIM_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2: T_ANIM_ENTRIES__Q53scn4step5enemy8rollball23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x414FF0, 0x18 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x415108, 0x30 @@ -9041,12 +9041,12 @@ T_ANIM_ENTRIES__Q53scn4step5enemy11whispyapple23$$2unnamed$$2ModelDesc_cpp$$2: T_SCRIPT_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x4156E0, 0xC8 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x41CBB8, 0x10 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x41CBE0, 0x18 @@ -9054,12 +9054,12 @@ T_ANIM_ENTRIES__Q53scn4step6weapon10spearspear23$$2unnamed$$2ModelDesc_cpp$$2: T_ANIM_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x41CBF8, 0x10 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ANIM_ENTRIES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon8deespear23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x41CC28, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_INDIVI_TABLE__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2 T_INDIVI_TABLE__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x4606F0, 0x6C @@ -9067,7 +9067,7 @@ T_INDIVI_TABLE__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2: $$250315: .incbin "baserom.dol", 0x46075C, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250133 $$250133: .incbin "baserom.dol", 0x460E28, 0x10 @@ -9201,7 +9201,7 @@ $$250324: $$250325: .incbin "baserom.dol", 0x461258, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250132 $$250132: .incbin "baserom.dol", 0x461750, 0xC @@ -9335,7 +9335,7 @@ $$250286: $$250287: .incbin "baserom.dol", 0x461E18, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: .incbin "baserom.dol", 0x462658, 0xC @@ -9376,7 +9376,7 @@ $$250231: $$250232: .incbin "baserom.dol", 0x462818, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: .incbin "baserom.dol", 0x462928, 0xC @@ -9444,7 +9444,7 @@ $$250361: $$250362: .incbin "baserom.dol", 0x462BEC, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: .incbin "baserom.dol", 0x462D88, 0xC @@ -9494,7 +9494,7 @@ $$250233: $$250234: .incbin "baserom.dol", 0x462FAC, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: .incbin "baserom.dol", 0x463118, 0x10 @@ -9523,7 +9523,7 @@ $$250259: $$250260: .incbin "baserom.dol", 0x463264, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250133 $$250133: .incbin "baserom.dol", 0x463678, 0xC @@ -9585,7 +9585,7 @@ $$250247: $$250248: .incbin "baserom.dol", 0x463840, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250133 $$250133: .incbin "baserom.dol", 0x463D58, 0x10 @@ -9695,7 +9695,7 @@ $$250269: $$250270: .incbin "baserom.dol", 0x4640E8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step4boss8kingsdoo23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x4644D0, 0x14 @@ -9781,7 +9781,7 @@ $$250264: $$250265: .incbin "baserom.dol", 0x464818, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250134 $$250134: .incbin "baserom.dol", 0x464C78, 0x14 @@ -9900,7 +9900,7 @@ $$250269: $$250270: .incbin "baserom.dol", 0x46515C, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250136 $$250136: .incbin "baserom.dol", 0x4656F8, 0xC @@ -10004,7 +10004,7 @@ $$250267: $$250268: .incbin "baserom.dol", 0x465AF8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250134 $$250134: .incbin "baserom.dol", 0x465F90, 0xC @@ -10159,7 +10159,7 @@ $$250292: $$250293: .incbin "baserom.dol", 0x4665E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: .incbin "baserom.dol", 0x466CC0, 0xC @@ -10266,7 +10266,7 @@ $$250266: $$250267: .incbin "baserom.dol", 0x467068, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: .incbin "baserom.dol", 0x46F578, 0xC @@ -10286,7 +10286,7 @@ $$250208: $$250209: .incbin "baserom.dol", 0x46F674, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x46F840, 0xC @@ -10336,7 +10336,7 @@ $$250410: $$250422: .incbin "baserom.dol", 0x46FAC8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x46FDE8, 0xC @@ -10362,7 +10362,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy7blipper23$$2unnamed$$2ModelDesc_cpp$$2: $$250212: .incbin "baserom.dol", 0x46FF20, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: .incbin "baserom.dol", 0x4700B8, 0x24 @@ -10373,7 +10373,7 @@ $$250201: $$250202: .incbin "baserom.dol", 0x4700E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x470358, 0xC @@ -10396,7 +10396,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6bouncy23$$2unnamed$$2ModelDesc_cpp$$2: $$250210: .incbin "baserom.dol", 0x4704A0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: .incbin "baserom.dol", 0x470700, 0xC @@ -10422,7 +10422,7 @@ $$250240: $$250241: .incbin "baserom.dol", 0x47081C, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: .incbin "baserom.dol", 0x470A20, 0xC @@ -10457,7 +10457,7 @@ $$250240: $$250241: .incbin "baserom.dol", 0x470B68, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250131 $$250131: .incbin "baserom.dol", 0x470DB0, 0xC @@ -10489,7 +10489,7 @@ $$250214: $$250215: .incbin "baserom.dol", 0x470F7C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: .incbin "baserom.dol", 0x471200, 0x10 @@ -10512,7 +10512,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5cappy23$$2unnamed$$2ModelDesc_cpp$$2: $$250212: .incbin "baserom.dol", 0x471310, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250122 $$250122: .incbin "baserom.dol", 0x4713E0, 0x10 @@ -10526,7 +10526,7 @@ $$250201: $$250202: .incbin "baserom.dol", 0x47149C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4715A8, 0xC @@ -10543,7 +10543,7 @@ $$250207: $$250208: .incbin "baserom.dol", 0x471694, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: .incbin "baserom.dol", 0x471880, 0xC @@ -10566,7 +10566,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6chilly23$$2unnamed$$2ModelDesc_cpp$$2: $$250214: .incbin "baserom.dol", 0x4719D8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x471B98, 0xC @@ -10583,7 +10583,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy4como23$$2unnamed$$2ModelDesc_cpp$$2: $$250206: .incbin "baserom.dol", 0x471C48, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: .incbin "baserom.dol", 0x472040, 0xC @@ -10597,7 +10597,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6degout23$$2unnamed$$2ModelDesc_cpp$$2: $$250210: .incbin "baserom.dol", 0x472148, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: .incbin "baserom.dol", 0x4722F8, 0xC @@ -10617,7 +10617,7 @@ $$250212: $$250221: .incbin "baserom.dol", 0x4723E0, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: .incbin "baserom.dol", 0x4724C0, 0xC @@ -10625,7 +10625,7 @@ $$250238: $$250239: .incbin "baserom.dol", 0x4724CC, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4726D0, 0xC @@ -10654,7 +10654,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy4elec23$$2unnamed$$2ModelDesc_cpp$$2: $$250214: .incbin "baserom.dol", 0x472820, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x472BC0, 0xC @@ -10680,7 +10680,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6flamer23$$2unnamed$$2ModelDesc_cpp$$2: $$250212: .incbin "baserom.dol", 0x472D38, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x472E80, 0x14 @@ -10697,7 +10697,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5foley23$$2unnamed$$2ModelDesc_cpp$$2: $$250210: .incbin "baserom.dol", 0x472F64, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: .incbin "baserom.dol", 0x4730D8, 0x10 @@ -10720,7 +10720,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5gemra23$$2unnamed$$2ModelDesc_cpp$$2: $$250214: .incbin "baserom.dol", 0x4731E0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES_GIGA__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES_GIGA__Q53scn4step5enemy7gigatzo23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x473418, 0x24 @@ -10746,7 +10746,7 @@ $$250270: $$250274: .incbin "baserom.dol", 0x473568, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_SCRIPT_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x4736B0, 0x8C @@ -10754,7 +10754,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5gordo23$$2unnamed$$2ModelDesc_cpp$$2: $$250202: .incbin "baserom.dol", 0x47373C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x473998, 0xC @@ -10786,7 +10786,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy7hothead23$$2unnamed$$2ModelDesc_cpp$$2: $$250216: .incbin "baserom.dol", 0x473AF8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: .incbin "baserom.dol", 0x473D18, 0x10 @@ -10797,7 +10797,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6juckle23$$2unnamed$$2ModelDesc_cpp$$2: $$250205: .incbin "baserom.dol", 0x473DC8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: .incbin "baserom.dol", 0x4740A8, 0xC @@ -10817,7 +10817,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy4kabu23$$2unnamed$$2ModelDesc_cpp$$2: $$250214: .incbin "baserom.dol", 0x474230, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4744F8, 0xC @@ -10951,7 +10951,7 @@ $$250481: $$250487: .incbin "baserom.dol", 0x4749E0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: .incbin "baserom.dol", 0x474CB0, 0x10 @@ -10983,7 +10983,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6lanzer23$$2unnamed$$2ModelDesc_cpp$$2: $$250217: .incbin "baserom.dol", 0x474E18, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250128 $$250128: .incbin "baserom.dol", 0x474F60, 0x10 @@ -10994,7 +10994,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6leafan23$$2unnamed$$2ModelDesc_cpp$$2: $$250207: .incbin "baserom.dol", 0x475010, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250234 $$250234: .incbin "baserom.dol", 0x475140, 0xC @@ -11002,7 +11002,7 @@ $$250234: $$250235: .incbin "baserom.dol", 0x47514C, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: .incbin "baserom.dol", 0x475250, 0xC @@ -11022,7 +11022,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy7mumbies23$$2unnamed$$2ModelDesc_cpp$$2: $$250208: .incbin "baserom.dol", 0x475360, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy8needlous23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x475438, 0xC @@ -11051,7 +11051,7 @@ $$250213: $$250214: .incbin "baserom.dol", 0x475554, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: .incbin "baserom.dol", 0x475670, 0xC @@ -11062,7 +11062,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5noddy23$$2unnamed$$2ModelDesc_cpp$$2: $$250207: .incbin "baserom.dol", 0x475708, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4758C8, 0xC @@ -11091,7 +11091,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5nruff23$$2unnamed$$2ModelDesc_cpp$$2: $$250212: .incbin "baserom.dol", 0x475A30, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x475CF8, 0xC @@ -11114,7 +11114,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6owgulf23$$2unnamed$$2ModelDesc_cpp$$2: $$250209: .incbin "baserom.dol", 0x475E00, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: .incbin "baserom.dol", 0x475F10, 0xC @@ -11137,7 +11137,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy7parasol23$$2unnamed$$2ModelDesc_cpp$$2: $$250209: .incbin "baserom.dol", 0x47602C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4764A0, 0xC @@ -11163,7 +11163,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6pierce23$$2unnamed$$2ModelDesc_cpp$$2: $$250214: .incbin "baserom.dol", 0x476618, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: .incbin "baserom.dol", 0x476880, 0xC @@ -11183,7 +11183,7 @@ $$250391: $$250402: .incbin "baserom.dol", 0x476974, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250198 $$250198: .incbin "baserom.dol", 0x476A38, 0x10 @@ -11191,7 +11191,7 @@ $$250198: $$250199: .incbin "baserom.dol", 0x476A48, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250129 $$250129: .incbin "baserom.dol", 0x476AF0, 0xC @@ -11205,7 +11205,7 @@ $$250206: $$250207: .incbin "baserom.dol", 0x476B94, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x476D18, 0xC @@ -11240,7 +11240,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5rocky23$$2unnamed$$2ModelDesc_cpp$$2: $$250216: .incbin "baserom.dol", 0x476EA0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x477110, 0xC @@ -11260,7 +11260,7 @@ $$250233: $$250234: .incbin "baserom.dol", 0x4771E0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250128 $$250128: .incbin "baserom.dol", 0x477298, 0xC @@ -11271,7 +11271,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy7sandbag23$$2unnamed$$2ModelDesc_cpp$$2: $$250206: .incbin "baserom.dol", 0x477330, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x477580, 0x10 @@ -11300,7 +11300,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: $$250213: .incbin "baserom.dol", 0x4776E0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: .incbin "baserom.dol", 0x477860, 0xC @@ -11320,7 +11320,7 @@ $$250207: $$250208: .incbin "baserom.dol", 0x477944, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x477B88, 0xC @@ -11361,7 +11361,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5sheld23$$2unnamed$$2ModelDesc_cpp$$2: $$250222: .incbin "baserom.dol", 0x477DD8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4781A0, 0xC @@ -11375,7 +11375,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6shotzo23$$2unnamed$$2ModelDesc_cpp$$2: $$250205: .incbin "baserom.dol", 0x478258, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x478488, 0xC @@ -11422,7 +11422,7 @@ $$250217: $$250218: .incbin "baserom.dol", 0x478650, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4788F0, 0xC @@ -11448,7 +11448,7 @@ $$250210: $$250211: .incbin "baserom.dol", 0x478A20, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: .incbin "baserom.dol", 0x478B48, 0xC @@ -11459,7 +11459,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy5snowl23$$2unnamed$$2ModelDesc_cpp$$2: $$250206: .incbin "baserom.dol", 0x478C08, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: .incbin "baserom.dol", 0x478E38, 0xC @@ -11497,7 +11497,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6sodory23$$2unnamed$$2ModelDesc_cpp$$2: $$250223: .incbin "baserom.dol", 0x478FC0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x479160, 0xC @@ -11532,7 +11532,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6sparky23$$2unnamed$$2ModelDesc_cpp$$2: $$250215: .incbin "baserom.dol", 0x4792F0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250198 $$250198: .incbin "baserom.dol", 0x479410, 0xC @@ -11540,7 +11540,7 @@ $$250198: $$250199: .incbin "baserom.dol", 0x47941C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: .incbin "baserom.dol", 0x4794F0, 0x10 @@ -11554,7 +11554,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy3sun23$$2unnamed$$2ModelDesc_cpp$$2: $$250205: .incbin "baserom.dol", 0x4795B0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: .incbin "baserom.dol", 0x479880, 0xC @@ -11592,7 +11592,7 @@ $$250214: $$250215: .incbin "baserom.dol", 0x479A34, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x479CD8, 0xC @@ -11702,7 +11702,7 @@ $$250305: $$250306: .incbin "baserom.dol", 0x47A2A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x47A598, 0xC @@ -11776,7 +11776,7 @@ $$250233: $$250234: .incbin "baserom.dol", 0x47A8B4, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250128 $$250128: .incbin "baserom.dol", 0x47A978, 0xC @@ -11799,7 +11799,7 @@ $$250209: $$250210: .incbin "baserom.dol", 0x47AA90, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x47AB30, 0x28 @@ -11822,7 +11822,7 @@ T_SCRIPT_ENTRIES__Q53scn4step5enemy6whippy23$$2unnamed$$2ModelDesc_cpp$$2: $$250217: .incbin "baserom.dol", 0x47AC40, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250126 $$250126: .incbin "baserom.dol", 0x47ACD0, 0xC @@ -11848,7 +11848,7 @@ $$250237: $$250238: .incbin "baserom.dol", 0x47AE08, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250127 $$250127: .incbin "baserom.dol", 0x47AF50, 0x2C @@ -11862,12 +11862,12 @@ $$250202: $$250203: .incbin "baserom.dol", 0x47AFB8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250239 $$250239: .incbin "baserom.dol", 0x48FFA8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x490058, 0xC @@ -11881,7 +11881,7 @@ $$250198: $$250199: .incbin "baserom.dol", 0x490080, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4900B8, 0xC @@ -11898,7 +11898,7 @@ $$250241: $$250242: .incbin "baserom.dol", 0x4900EC, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x490130, 0x10 @@ -11918,7 +11918,7 @@ $$250242: $$250243: .incbin "baserom.dol", 0x490178, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_SCRIPT_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step6weapon13whispyairball23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x490200, 0x28 @@ -11935,7 +11935,7 @@ $$250258: $$250277: .incbin "baserom.dol", 0x49027C, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250122 $$250122: .incbin "baserom.dol", 0x490310, 0xC @@ -11946,7 +11946,7 @@ $$250233: $$250234: .incbin "baserom.dol", 0x490328, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: .incbin "baserom.dol", 0x4903D8, 0x10 @@ -11972,7 +11972,7 @@ $$250307: $$250308: .incbin "baserom.dol", 0x490460, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4904D0, 0xC @@ -11989,7 +11989,7 @@ $$250235: $$250236: .incbin "baserom.dol", 0x490500, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x490558, 0xC @@ -12012,7 +12012,7 @@ $$250242: $$250243: .incbin "baserom.dol", 0x4905B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x4905F0, 0xC @@ -12035,7 +12035,7 @@ $$250242: $$250243: .incbin "baserom.dol", 0x490650, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: .incbin "baserom.dol", 0x490710, 0xC @@ -12049,7 +12049,7 @@ $$250241: $$250242: .incbin "baserom.dol", 0x490768, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250124 $$250124: .incbin "baserom.dol", 0x490860, 0xC @@ -12063,7 +12063,7 @@ $$250235: $$250236: .incbin "baserom.dol", 0x490888, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: .incbin "baserom.dol", 0x490900, 0xC @@ -12071,7 +12071,7 @@ $$250238: $$250239: .incbin "baserom.dol", 0x49090C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x490A88, 0x10 @@ -12082,7 +12082,7 @@ $$250234: $$250235: .incbin "baserom.dol", 0x490AA8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250239 $$250239: .incbin "baserom.dol", 0x490AE0, 0x10 @@ -12090,7 +12090,7 @@ $$250239: $$250240: .incbin "baserom.dol", 0x490AF0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250233 $$250233: .incbin "baserom.dol", 0x490B30, 0x10 @@ -12098,7 +12098,7 @@ $$250233: $$250234: .incbin "baserom.dol", 0x490B40, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_SCRIPT_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2 T_SCRIPT_ENTRIES__Q53scn4step6weapon9foleyleaf23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x490B80, 0x28 @@ -12109,7 +12109,7 @@ $$250239: $$250240: .incbin "baserom.dol", 0x490BB4, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: .incbin "baserom.dol", 0x490BF0, 0xC @@ -12123,7 +12123,7 @@ $$250261: $$250275: .incbin "baserom.dol", 0x490C28, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x490C68, 0xC @@ -12134,7 +12134,7 @@ T_NODE_NAMES__Q53scn4step6weapon12jucklecutter23$$2unnamed$$2ModelDesc_cpp$$2: $$250236: .incbin "baserom.dol", 0x490C80, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: .incbin "baserom.dol", 0x490CC0, 0xC @@ -12142,7 +12142,7 @@ $$250238: $$250239: .incbin "baserom.dol", 0x490CCC, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250233 $$250233: .incbin "baserom.dol", 0x490D90, 0x10 @@ -12150,7 +12150,7 @@ $$250233: $$250234: .incbin "baserom.dol", 0x490DA0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: .incbin "baserom.dol", 0x490DD8, 0x14 @@ -12158,7 +12158,7 @@ $$250238: $$250239: .incbin "baserom.dol", 0x490DEC, 0x2C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_NODE_NAMES__Q53scn4step6weapon18combinationdeeshot23$$2unnamed$$2ModelDesc_cpp$$2 T_NODE_NAMES__Q53scn4step6weapon18combinationdeeshot23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x490EA8, 0xC @@ -12169,7 +12169,7 @@ $$250235: $$250236: .incbin "baserom.dol", 0x490EC8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250123 $$250123: .incbin "baserom.dol", 0x490F50, 0xC @@ -12180,7 +12180,7 @@ $$250234: $$250235: .incbin "baserom.dol", 0x490F6C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250125 $$250125: .incbin "baserom.dol", 0x490FD8, 0xC @@ -12194,7 +12194,7 @@ $$250241: $$250242: .incbin "baserom.dol", 0x49102C, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250568 $$250568: .incbin "baserom.dol", 0x491188, 0xC @@ -12268,7 +12268,7 @@ $$250624: $$250625: .incbin "baserom.dol", 0x4912F8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250238 $$250238: .incbin "baserom.dol", 0x4913A0, 0x10 @@ -12276,7 +12276,7 @@ $$250238: $$250239: .incbin "baserom.dol", 0x4913B0, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248848 $$248848: .incbin "baserom.dol", 0x4931F8, 0x8 @@ -12284,7 +12284,7 @@ $$248848: $$248849: .incbin "baserom.dol", 0x493200, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250132 $$250132: .incbin "baserom.dol", 0x4952E0, 0x8 @@ -12316,7 +12316,7 @@ $$250154: $$250314: .incbin "baserom.dol", 0x495328, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: .incbin "baserom.dol", 0x495338, 0x8 @@ -12378,7 +12378,7 @@ $$250161: $$250163: .incbin "baserom.dol", 0x4953D0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: .incbin "baserom.dol", 0x495408, 0x8 @@ -12476,7 +12476,7 @@ $$250141: $$250142: .incbin "baserom.dol", 0x4954FC, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: .incbin "baserom.dol", 0x495518, 0x8 @@ -12499,7 +12499,7 @@ $$250137: $$250261: .incbin "baserom.dol", 0x495548, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: .incbin "baserom.dol", 0x495560, 0x8 @@ -12723,7 +12723,7 @@ $$250175: $$250290: .incbin "baserom.dol", 0x4957A8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250130 $$250130: .incbin "baserom.dol", 0x4957C0, 0x8 @@ -12755,12 +12755,12 @@ $$250143: $$250151: .incbin "baserom.dol", 0x495808, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250160 $$250160: .incbin "baserom.dol", 0x495830, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x495A28, 0x8 @@ -12849,7 +12849,7 @@ $$250123: T_NODE_NAMES__Q53scn4step5enemy11bonkersbomb23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x495B08, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x495B18, 0x8 @@ -12971,7 +12971,7 @@ T_NODE_NAMES__Q53scn4step5enemy8cappyhat23$$2unnamed$$2ModelDesc_cpp$$2: $$250124: .incbin "baserom.dol", 0x495C48, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x495C58, 0x8 @@ -13039,7 +13039,7 @@ $$250127: $$250205: .incbin "baserom.dol", 0x495D00, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x495D10, 0x8 @@ -13083,7 +13083,7 @@ $$250125: $$250126: .incbin "baserom.dol", 0x495D78, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x495D88, 0x8 @@ -13256,7 +13256,7 @@ $$250124: $$250201: .incbin "baserom.dol", 0x495F48, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x495F58, 0x8 @@ -13612,7 +13612,7 @@ $$250128: $$250130: .incbin "baserom.dol", 0x496300, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x496368, 0x8 @@ -13773,7 +13773,7 @@ $$250138: $$250221: .incbin "baserom.dol", 0x496508, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x496518, 0x8 @@ -13916,7 +13916,7 @@ $$250134: $$250214: .incbin "baserom.dol", 0x496688, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x496698, 0x8 @@ -14128,7 +14128,7 @@ T_NODE_NAMES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: $$250125: .incbin "baserom.dol", 0x4968C0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x498430, 0x8 @@ -14151,7 +14151,7 @@ $$250122: $$250124: .incbin "baserom.dol", 0x498460, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x498470, 0x8 @@ -14165,7 +14165,7 @@ $$250127: $$250243: .incbin "baserom.dol", 0x498488, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x498498, 0x8 @@ -14179,7 +14179,7 @@ $$250128: $$250244: .incbin "baserom.dol", 0x4984B0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x4984C0, 0x8 @@ -14388,7 +14388,7 @@ $$250124: $$250240: .incbin "baserom.dol", 0x4986DC, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x498708, 0x8 @@ -14402,7 +14402,7 @@ $$250124: $$250237: .incbin "baserom.dol", 0x498720, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250122 $$250122: .incbin "baserom.dol", 0x498738, 0x8 @@ -14521,7 +14521,7 @@ $$250124: $$250240: .incbin "baserom.dol", 0x498854, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MODEL_DESC_FUNC_DUMMY__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2 T_MODEL_DESC_FUNC_DUMMY__Q43scn4step4boss23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49AEA0, 0x4 @@ -14532,7 +14532,7 @@ $$250316: $$250317: .incbin "baserom.dol", 0x49AEA8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250363 $$250363: .incbin "baserom.dol", 0x49B1B0, 0x4 @@ -14540,17 +14540,17 @@ $$250363: $$250364: .incbin "baserom.dol", 0x49B1B4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step4boss10creditroah23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49B248, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250161 $$250161: .incbin "baserom.dol", 0x49B818, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250411 $$250411: .incbin "baserom.dol", 0x49BD10, 0x4 @@ -14585,12 +14585,12 @@ $$250420: $$250421: .incbin "baserom.dol", 0x49BD38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy11dubiorspark23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49C328, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250471 $$250471: .incbin "baserom.dol", 0x49C6D0, 0x4 @@ -14637,7 +14637,7 @@ $$250485: $$250486: .incbin "baserom.dol", 0x49C708, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250392 $$250392: .incbin "baserom.dol", 0x49CAA8, 0x4 @@ -14669,62 +14669,62 @@ $$250400: $$250401: .incbin "baserom.dol", 0x49CACC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MESHFLIP_NODE_TABLE__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2 T_MESHFLIP_NODE_TABLE__Q53scn4step5enemy6scarfy23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49CC18, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step5enemy15zankibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49D0D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon7airball23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49E890, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv223$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49E8E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11starshotlv323$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49E910, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49EA18, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon20enemywaterbulletwarp23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49EA40, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon8wingshot23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49EAB8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon15sirkibblecutter23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49EB20, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon17tsukikageshuriken23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49EB88, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon18combinationairball23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49EBE0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ANIM_ENTRIES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2 T_ANIM_ENTRIES__Q53scn4step6weapon11hotheadfire23$$2unnamed$$2ModelDesc_cpp$$2: .incbin "baserom.dol", 0x49EC78, 0x8 diff --git a/asm/src/ModelDescUtil.s b/asm/src/ModelDescUtil.s index b6f08fb8..2beae17c 100644 --- a/asm/src/ModelDescUtil.s +++ b/asm/src/ModelDescUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Set__Q43scn4step5enemy13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcUlPPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry Set__Q43scn4step5enemy13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcUlPPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry: /* 8028ADDC 00286C1C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -60,7 +60,7 @@ lbl_8028AE54: /* 8028AEAC 00286CEC 38 21 00 50 */ addi r1, r1, 0x50 /* 8028AEB0 00286CF0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Set__Q43scn4step4item13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry Set__Q43scn4step4item13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry: /* 803C4CF0 003C0B30 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -147,7 +147,7 @@ lbl_803C4DB4: /* 803C4E24 003C0C64 38 21 00 70 */ addi r1, r1, 0x70 /* 803C4E28 003C0C68 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Set__Q43scn4step6weapon13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcUlPPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry Set__Q43scn4step6weapon13ModelDescUtilFRQ43scn4step5chara9ModelDescRQ24gobj8AnimDescRQ24gobj10ScriptDescPCcPCcUlPPCcUlPCQ34gobj20G3DAnimDataReposDesc5EntryUlPCQ34gobj10ScriptDesc5Entry: /* 803D7A64 003D38A4 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -232,27 +232,27 @@ lbl_803D7B30: /* 803D7B90 003D39D0 38 21 00 70 */ addi r1, r1, 0x70 /* 803D7B94 003D39D4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SCRIPT_ENTRIES__Q43scn4step4item27$$2unnamed$$2ModelDescUtil_cpp$$2 T_SCRIPT_ENTRIES__Q43scn4step4item27$$2unnamed$$2ModelDescUtil_cpp$$2: .incbin "baserom.dol", 0x41C398, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250228 $$250228: .incbin "baserom.dol", 0x46E758, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250281 $$250281: .incbin "baserom.dol", 0x48DFD8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250293 $$250293: .incbin "baserom.dol", 0x48F8D8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global SCRIPT_ENTRIES__Q43scn4step4item13ModelDescUtil SCRIPT_ENTRIES__Q43scn4step4item13ModelDescUtil: .incbin "baserom.dol", 0x498150, 0x4 diff --git a/asm/src/ModelMultiAnim.s b/asm/src/ModelMultiAnim.s index b456362b..00c46a5b 100644 --- a/asm/src/ModelMultiAnim.s +++ b/asm/src/ModelMultiAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d14ModelMultiAnimFRCQ23g3d21ModelMultiAnimContext __ct__Q23g3d14ModelMultiAnimFRCQ23g3d21ModelMultiAnimContext: /* 80192208 0018E048 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -736,7 +736,7 @@ __ct__Q33g3d14ModelMultiAnim16ModelAnimWrapperFRCQ23g3d15ResModelContextRCQ23mem /* 80192C18 0018EA58 38 21 00 60 */ addi r1, r1, 0x60 /* 80192C1C 0018EA5C 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251837 $$251837: .incbin "baserom.dol", 0x4931A8, 0x8 diff --git a/asm/src/ModelMultiAnimContext.s b/asm/src/ModelMultiAnimContext.s index aaea0bd6..34715d2e 100644 --- a/asm/src/ModelMultiAnimContext.s +++ b/asm/src/ModelMultiAnimContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DefaultHeapNamePrefix__Q23g3d21ModelMultiAnimContextFv DefaultHeapNamePrefix__Q23g3d21ModelMultiAnimContextFv: /* 80192C20 0018EA60 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -62,7 +62,7 @@ lbl_80192CC8: /* 80192CDC 0018EB1C 91 03 00 54 */ stw r8, 0x54(r3) /* 80192CE0 0018EB20 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248944 $$248944: .incbin "baserom.dol", 0x4931B0, 0x4 diff --git a/asm/src/ModelNode.s b/asm/src/ModelNode.s index a717922c..8f5923c5 100644 --- a/asm/src/ModelNode.s +++ b/asm/src/ModelNode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q28dynamics9ModelNodeFRCQ23g3d13ModelAccessorQ23g3d7ResNodeRCQ28dynamics4DescUl __ct__Q28dynamics9ModelNodeFRCQ23g3d13ModelAccessorQ23g3d7ResNodeRCQ28dynamics4DescUl: /* 8017C2A8 001780E8 94 21 FF 20 */ stwu r1, -0xe0(r1) @@ -1139,7 +1139,7 @@ __md__Q33hel4math7Vector3CFRCQ33hel4math7Vector3: /* 8017D2E4 00179124 D0 C3 00 08 */ stfs f6, 8(r3) /* 8017D2E8 00179128 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2FSqrt__Q24nw4r4mathFf$$20 $$2STRING$$2FSqrt__Q24nw4r4mathFf$$20: .incbin "baserom.dol", 0x44F230, 0x24 @@ -1147,7 +1147,7 @@ $$2STRING$$2FSqrt__Q24nw4r4mathFf$$20: $$2STRING$$2FSqrt__Q24nw4r4mathFf: .incbin "baserom.dol", 0x44F254, 0x14 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253498 $$253498: .incbin "baserom.dol", 0x49A130, 0x4 diff --git a/asm/src/ModelRotCtrl.s b/asm/src/ModelRotCtrl.s index d02a53c1..75530837 100644 --- a/asm/src/ModelRotCtrl.s +++ b/asm/src/ModelRotCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara12ModelRotCtrlFRCQ24gobj6Target __ct__Q43scn4step5chara12ModelRotCtrlFRCQ24gobj6Target: /* 80271580 0026D3C0 90 83 00 00 */ stw r4, 0(r3) @@ -258,7 +258,7 @@ lbl_802718B0: /* 802718C0 0026D700 EC 21 00 2A */ fadds f1, f1, f0 /* 802718C4 0026D704 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global ROT_H_TARGET__Q43scn4step5chara12ModelRotCtrl ROT_H_TARGET__Q43scn4step5chara12ModelRotCtrl: .incbin "baserom.dol", 0x49B820, 0x4 diff --git a/asm/src/ModelTree.s b/asm/src/ModelTree.s index 2fcb1fbb..0205e2f2 100644 --- a/asm/src/ModelTree.s +++ b/asm/src/ModelTree.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q28dynamics9ModelTreeFRQ23mem15AllocatorHandleRCQ23g3d13ModelAccessorRCQ28dynamics4Desc __ct__Q28dynamics9ModelTreeFRQ23mem15AllocatorHandleRCQ23g3d13ModelAccessorRCQ28dynamics4Desc: /* 8017D2EC 0017912C 94 21 FF C0 */ stwu r1, -0x40(r1) diff --git a/asm/src/Monitor.s b/asm/src/Monitor.s index afb8f678..437786e1 100644 --- a/asm/src/Monitor.s +++ b/asm/src/Monitor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_getShowScreenName__Q53scn4step7gimmick7monitor21$$2unnamed$$2Monitor_cpp$$2FUl t_getShowScreenName__Q53scn4step7gimmick7monitor21$$2unnamed$$2Monitor_cpp$$2FUl: /* 8031980C 0031564C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -145,7 +145,7 @@ viewShip__Q53scn4step7gimmick7monitor7MonitorFv: /* 803199EC 0031582C 38 21 00 10 */ addi r1, r1, 0x10 /* 803199F0 00315830 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251935 $$251935: .incbin "baserom.dol", 0x47DC38, 0xC @@ -156,12 +156,12 @@ $$251936: $$252077: .incbin "baserom.dol", 0x47DC50, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252078 $$252078: .incbin "baserom.dol", 0x496C20, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251937 $$251937: .incbin "baserom.dol", 0x49D4F0, 0x4 diff --git a/asm/src/Monotone.s b/asm/src/Monotone.s index 2c6dba81..eef317d4 100644 --- a/asm/src/Monotone.s +++ b/asm/src/Monotone.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_toVector3__Q43scn4step3sfx22$$2unnamed$$2Monotone_cpp$$2FRC8_GXColor t_toVector3__Q43scn4step3sfx22$$2unnamed$$2Monotone_cpp$$2FRC8_GXColor: /* 803CDD04 003C9B44 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -652,7 +652,7 @@ lbl_803CE5F4: /* 803CE600 003CA440 38 21 00 10 */ addi r1, r1, 0x10 /* 803CE604 003CA444 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23sfx8MonotoneFRQ23gfx9TexBuffer __ct__Q23sfx8MonotoneFRQ23gfx9TexBuffer: /* 8040130C 003FD14C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -930,12 +930,12 @@ setupDrawOriginal__Q23sfx8MonotoneFv: /* 80401700 003FD540 38 21 00 40 */ addi r1, r1, 0x40 /* 80401704 003FD544 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253437 $$253437: .incbin "baserom.dol", 0x48ED88, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253430 $$253430: .incbin "baserom.dol", 0x49E738, 0x8 @@ -955,7 +955,7 @@ $$253028: $$253596: .incbin "baserom.dol", 0x49E750, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251472 $$251472: .incbin "baserom.dol", 0x49EE38, 0x4 diff --git a/asm/src/Move.s b/asm/src/Move.s index 8a435a7a..9fe20f2d 100644 --- a/asm/src/Move.s +++ b/asm/src/Move.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj4MoveFRQ24gobj8Location __ct__Q24gobj4MoveFRQ24gobj8Location: /* 8019B314 00197154 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -521,7 +521,7 @@ lbl_8019B98C: /* 8019B99C 001977DC 38 21 00 10 */ addi r1, r1, 0x10 /* 8019B9A0 001977E0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250561 $$250561: .incbin "baserom.dol", 0x49A2D0, 0x4 diff --git a/asm/src/MoveAlgorithmVacuumReceive.s b/asm/src/MoveAlgorithmVacuumReceive.s index a8199eaf..a4e5ca7e 100644 --- a/asm/src/MoveAlgorithmVacuumReceive.s +++ b/asm/src/MoveAlgorithmVacuumReceive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara26MoveAlgorithmVacuumReceiveFv __ct__Q43scn4step5chara26MoveAlgorithmVacuumReceiveFv: /* 802718C8 0026D708 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -310,12 +310,12 @@ lbl_80271D20: /* 80271D2C 0026DB6C 38 21 01 40 */ addi r1, r1, 0x140 /* 80271D30 0026DB70 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251342 $$251342: .incbin "baserom.dol", 0x495838, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251568 $$251568: .incbin "baserom.dol", 0x49B840, 0x4 diff --git a/asm/src/MoveCtrl.s b/asm/src/MoveCtrl.s index 8ace8f4f..10a9ca4c 100644 --- a/asm/src/MoveCtrl.s +++ b/asm/src/MoveCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_lvparam__Q53scn4step4boss15challengemaster22$$2unnamed$$2MoveCtrl_cpp$$2FRQ43scn4step4boss4Boss t_lvparam__Q53scn4step4boss15challengemaster22$$2unnamed$$2MoveCtrl_cpp$$2FRQ43scn4step4boss4Boss: /* 8023DBA0 002399E0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1757,7 +1757,7 @@ lbl_8023F41C: /* 8023F444 0023B284 38 21 00 60 */ addi r1, r1, 0x60 /* 8023F448 0023B288 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257205 $$257205: .incbin "baserom.dol", 0x4953D8, 0x4 @@ -1771,7 +1771,7 @@ $$257626: $$257627: .incbin "baserom.dol", 0x4953E4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258595 $$258595: .incbin "baserom.dol", 0x49B010, 0x4 diff --git a/asm/src/MoveGrid.s b/asm/src/MoveGrid.s index 934f1f3b..0a2dfa24 100644 --- a/asm/src/MoveGrid.s +++ b/asm/src/MoveGrid.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Default__Q35mcoll6detail8MoveGridFv Default__Q35mcoll6detail8MoveGridFv: /* 801B9B6C 001B59AC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MoveGridGroup.s b/asm/src/MoveGridGroup.s index 3ccf6ed8..86f59d37 100644 --- a/asm/src/MoveGridGroup.s +++ b/asm/src/MoveGridGroup.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_tryToAddCollideTarget__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2FRCQ35mcoll6detail13MoveGridGroupRQ35mcoll6detail18CollideTargetReposQ35mcoll6detail17LandGridShapeKindRCQ45mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$215T_GridShapeInfoQ55mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$215T_GridShapeInfo8EdgeKindRCQ33hel4math7Vector2RCQ33hel4math7Vector2RCQ33hel4math7Vector2Q55mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$215T_GridShapeInfo8EdgeKindRCQ35mcoll6detail12LandPropertyQ35mcoll6detail13LandAttributeRCQ35mcoll6detail16LandGatherOption t_tryToAddCollideTarget__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2FRCQ35mcoll6detail13MoveGridGroupRQ35mcoll6detail18CollideTargetReposQ35mcoll6detail17LandGridShapeKindRCQ45mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$215T_GridShapeInfoQ55mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$215T_GridShapeInfo8EdgeKindRCQ33hel4math7Vector2RCQ33hel4math7Vector2RCQ33hel4math7Vector2Q55mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$215T_GridShapeInfo8EdgeKindRCQ35mcoll6detail12LandPropertyQ35mcoll6detail13LandAttributeRCQ35mcoll6detail16LandGatherOption: /* 801B9D78 001B5BB8 94 21 FF 30 */ stwu r1, -0xd0(r1) @@ -2014,15 +2014,15 @@ __sinit_$$3MoveGridGroup_cpp: /* 801BBA64 001B78A4 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801BBA68 001B78A8 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402430, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_GRID_SHAPE_INFO_TABLE__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: .incbin "baserom.dol", 0x454F68, 0xDD0 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253670 $$253670: .incbin "baserom.dol", 0x493640, 0x4 @@ -2030,7 +2030,7 @@ $$253670: $$253673: .incbin "baserom.dol", 0x493644, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_NORMAL_WALL_L__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2 T_NORMAL_WALL_L__Q35mcoll6detail27$$2unnamed$$2MoveGridGroup_cpp$$2: .incbin "baserom.dol", 0x49A638, 0x4 diff --git a/asm/src/MoveGridGroupId.s b/asm/src/MoveGridGroupId.s index 4c77d8b2..9c5628c1 100644 --- a/asm/src/MoveGridGroupId.s +++ b/asm/src/MoveGridGroupId.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateWithIndex__Q35mcoll6detail15MoveGridGroupIdFUl CreateWithIndex__Q35mcoll6detail15MoveGridGroupIdFUl: /* 801BBA6C 001B78AC 4B E6 8A 34 */ b DefaultSwitchThreadCallback diff --git a/asm/src/MoveGridManager.s b/asm/src/MoveGridManager.s index 86dc7b35..b60acb3d 100644 --- a/asm/src/MoveGridManager.s +++ b/asm/src/MoveGridManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_CreateAddGridGroup__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2FUsUsQ35mcoll6detail15MoveGridAddType t_CreateAddGridGroup__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2FUsUsQ35mcoll6detail15MoveGridAddType: /* 801BBA84 001B78C4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -772,7 +772,7 @@ lbl_801BC4FC: /* 801BC50C 001B834C 38 21 00 20 */ addi r1, r1, 0x20 /* 801BC510 001B8350 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global addType_ConditionalStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalStepM__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: .incbin "baserom.dol", 0x410D48, 0xC @@ -804,7 +804,7 @@ addType_ConditionalChallengeMasterExDoor__Q35mcoll6detail29$$2unnamed$$2MoveGrid addType_SIceVolcano__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: .incbin "baserom.dol", 0x410DD8, 0xF8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global addType_Tbl__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_Tbl__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: .incbin "baserom.dol", 0x455D38, 0x30 @@ -812,7 +812,7 @@ addType_Tbl__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: $$252675: .incbin "baserom.dol", 0x455D68, 0x30 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global addType_ConditionalCreditOtachidai__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2 addType_ConditionalCreditOtachidai__Q35mcoll6detail29$$2unnamed$$2MoveGridManager_cpp$$2: .incbin "baserom.dol", 0x49A6D0, 0x8 diff --git a/asm/src/MoveGroupAccessor.s b/asm/src/MoveGroupAccessor.s index 8de234d8..01875779 100644 --- a/asm/src/MoveGroupAccessor.s +++ b/asm/src/MoveGroupAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global deltaSafe__Q43scn4step3map17MoveGroupAccessorCFUl deltaSafe__Q43scn4step3map17MoveGroupAccessorCFUl: /* 803CA780 003C65C0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/MoveGroupCtrl.s b/asm/src/MoveGroupCtrl.s index 3377a7c8..25edf25f 100644 --- a/asm/src/MoveGroupCtrl.s +++ b/asm/src/MoveGroupCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_Velocity__Q53scn4step7gimmick13movegroupctrl27$$2unnamed$$2MoveGroupCtrl_cpp$$2FUcf t_Velocity__Q53scn4step7gimmick13movegroupctrl27$$2unnamed$$2MoveGroupCtrl_cpp$$2FUcf: /* 803175E0 00313420 C0 42 C9 E8 */ lfs f2, $$257160-_SDA2_BASE_(r2) @@ -1968,17 +1968,17 @@ lbl_80319188: /* 80319190 00314FD0 B0 03 00 04 */ sth r0, 4(r3) /* 80319194 00314FD4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global t_VibrationSize__Q53scn4step7gimmick13movegroupctrl27$$2unnamed$$2MoveGroupCtrl_cpp$$2 t_VibrationSize__Q53scn4step7gimmick13movegroupctrl27$$2unnamed$$2MoveGroupCtrl_cpp$$2: .incbin "baserom.dol", 0x415BA0, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrl __vt__Q53scn4step7gimmick13movegroupctrl13MoveGroupCtrl: .incbin "baserom.dol", 0x47DB60, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257160 $$257160: .incbin "baserom.dol", 0x49D4A8, 0x4 diff --git a/asm/src/MoveGroupCtrlOrder.s b/asm/src/MoveGroupCtrlOrder.s index 1254d53a..71fbeef8 100644 --- a/asm/src/MoveGroupCtrlOrder.s +++ b/asm/src/MoveGroupCtrlOrder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13movegroupctrl18MoveGroupCtrlOrderFv __ct__Q53scn4step7gimmick13movegroupctrl18MoveGroupCtrlOrderFv: /* 80319198 00314FD8 94 21 FF C0 */ stwu r1, -0x40(r1) diff --git a/asm/src/MoveLandAttack.s b/asm/src/MoveLandAttack.s index 90068d90..33fb7096 100644 --- a/asm/src/MoveLandAttack.s +++ b/asm/src/MoveLandAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick14movelandattack14MoveLandAttackFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick14movelandattack14MoveLandAttackFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80319C8C 00315ACC 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -265,12 +265,12 @@ lbl_8031A058: /* 8031A064 00315EA4 38 21 00 40 */ addi r1, r1, 0x40 /* 8031A068 00315EA8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254149 $$254149: .incbin "baserom.dol", 0x47DC68, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254150 $$254150: .incbin "baserom.dol", 0x496C28, 0x8 @@ -278,7 +278,7 @@ $$254150: $$254151: .incbin "baserom.dol", 0x496C30, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254152 $$254152: .incbin "baserom.dol", 0x49D500, 0x8 diff --git a/asm/src/MoveLimit.s b/asm/src/MoveLimit.s index 8e4fe451..37268841 100644 --- a/asm/src/MoveLimit.s +++ b/asm/src/MoveLimit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core9MoveLimitFRQ33scn4step9Component __ct__Q43scn4step4core9MoveLimitFRQ33scn4step9Component: /* 802776C8 00273508 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -65,7 +65,7 @@ reset__Q43scn4step4core9MoveLimitFv: /* 802777A8 002735E8 38 21 00 30 */ addi r1, r1, 0x30 /* 802777AC 002735EC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero9MoveLimitFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero9MoveLimitFRQ43scn4step4hero4Hero: /* 8034E5FC 0034A43C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -398,7 +398,7 @@ lbl_8034EA74: /* 8034EA90 0034A8D0 38 21 00 80 */ addi r1, r1, 0x80 /* 8034EA94 0034A8D4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252312 $$252312: .incbin "baserom.dol", 0x49B908, 0x8 @@ -406,7 +406,7 @@ $$252312: $$252315: .incbin "baserom.dol", 0x49B910, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252015 $$252015: .incbin "baserom.dol", 0x49D878, 0x4 diff --git a/asm/src/MoveLimitResponseCtrl.s b/asm/src/MoveLimitResponseCtrl.s index 58993eaf..c9abf5b0 100644 --- a/asm/src/MoveLimitResponseCtrl.s +++ b/asm/src/MoveLimitResponseCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero21MoveLimitResponseCtrlFv __ct__Q43scn4step4hero21MoveLimitResponseCtrlFv: /* 8034EA98 0034A8D8 C0 02 CD C0 */ lfs f0, $$250125-_SDA2_BASE_(r2) @@ -23,7 +23,7 @@ setResponseSpaceJumpToPos__Q43scn4step4hero21MoveLimitResponseCtrlFRCQ33hel4math /* 8034EAD0 0034A910 D0 03 00 0C */ stfs f0, 0xc(r3) /* 8034EAD4 0034A914 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250125 $$250125: .incbin "baserom.dol", 0x49D880, 0x8 diff --git a/asm/src/MoveParamAccel.s b/asm/src/MoveParamAccel.s index 626fb8fc..a1efd2ba 100644 --- a/asm/src/MoveParamAccel.s +++ b/asm/src/MoveParamAccel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Zero__Q24gobj14MoveParamAccelFv Zero__Q24gobj14MoveParamAccelFv: /* 8019B9A4 001977E4 C0 22 98 18 */ lfs f1, $$248787-_SDA2_BASE_(r2) @@ -27,7 +27,7 @@ Create__Q24gobj14MoveParamAccelFfff: /* 8019B9EC 0019782C 38 21 00 20 */ addi r1, r1, 0x20 /* 8019B9F0 00197830 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248787 $$248787: .incbin "baserom.dol", 0x49A2D8, 0x8 diff --git a/asm/src/MoveParamDecel.s b/asm/src/MoveParamDecel.s index 263948fb..f3cf2ed3 100644 --- a/asm/src/MoveParamDecel.s +++ b/asm/src/MoveParamDecel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Zero__Q24gobj14MoveParamDecelFv Zero__Q24gobj14MoveParamDecelFv: /* 8019B9F4 00197834 C0 22 98 20 */ lfs f1, $$248779-_SDA2_BASE_(r2) @@ -14,7 +14,7 @@ Create__Q24gobj14MoveParamDecelFf: /* 8019BA08 00197848 38 21 00 10 */ addi r1, r1, 0x10 /* 8019BA0C 0019784C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248779 $$248779: .incbin "baserom.dol", 0x49A2E0, 0x8 diff --git a/asm/src/MoveParamFall.s b/asm/src/MoveParamFall.s index 4a770967..6246172c 100644 --- a/asm/src/MoveParamFall.s +++ b/asm/src/MoveParamFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Zero__Q24gobj13MoveParamFallFv Zero__Q24gobj13MoveParamFallFv: /* 8019BA10 00197850 C0 22 98 28 */ lfs f1, $$248787-_SDA2_BASE_(r2) @@ -8,7 +8,7 @@ Zero__Q24gobj13MoveParamFallFv: /* 8019BA18 00197858 FC 60 08 90 */ fmr f3, f1 /* 8019BA1C 0019785C 4B FF FF 98 */ b Create__Q24gobj14MoveParamAccelFfff -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248787 $$248787: .incbin "baserom.dol", 0x49A2E8, 0x8 diff --git a/asm/src/MovieAudio.s b/asm/src/MovieAudio.s index 6dee617d..a2ee63e1 100644 --- a/asm/src/MovieAudio.s +++ b/asm/src/MovieAudio.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mov10MovieAudioFUlUl __ct__Q23mov10MovieAudioFUlUl: /* 801CE5C4 001CA404 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/MovieButtonContent.s b/asm/src/MovieButtonContent.s index a48be6a8..2c07f3a4 100644 --- a/asm/src/MovieButtonContent.s +++ b/asm/src/MovieButtonContent.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail18MovieButtonContentFRQ23mem10IAllocator __ct__Q43scn7history6detail18MovieButtonContentFRQ23mem10IAllocator: /* 802158CC 0021170C 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -104,7 +104,7 @@ lbl_80215A30: /* 80215A30 00211870 38 8D A4 E0 */ addi r4, r13, $$252005-_SDA_BASE_ /* 80215A34 00211874 4B F9 75 60 */ b play__Q23lyt6LayoutFPCc -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251550 $$251550: .incbin "baserom.dol", 0x45E5A8, 0xC @@ -136,7 +136,7 @@ $$252003: $$252004: .incbin "baserom.dol", 0x45E6CC, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251545 $$251545: .incbin "baserom.dol", 0x494C60, 0x8 diff --git a/asm/src/MovieCommand.s b/asm/src/MovieCommand.s index be06268c..f89176cc 100644 --- a/asm/src/MovieCommand.s +++ b/asm/src/MovieCommand.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mov12MovieCommandFv __ct__Q23mov12MovieCommandFv: /* 801CE904 001CA744 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/MovieKindUtil.s b/asm/src/MovieKindUtil.s index fefd4e48..9d97d8f3 100644 --- a/asm/src/MovieKindUtil.s +++ b/asm/src/MovieKindUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_info__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2FQ23mov9MovieKind t_info__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2FQ23mov9MovieKind: /* 801CEC80 001CAAC0 1C A4 00 0C */ mulli r5, r4, 0xc @@ -91,10 +91,10 @@ __sinit_$$3MovieKindUtil_cpp: /* 801CEDA4 001CABE4 90 03 01 34 */ stw r0, 0x134(r3) /* 801CEDA8 001CABE8 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402440, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248726 $$248726: .incbin "baserom.dol", 0x458DE8, 0x10 @@ -177,7 +177,7 @@ $$248751: MOVIE_INFO_TABLE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2: .incbin "baserom.dol", 0x458FE0, 0x138 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_WHITE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2 T_WHITE__Q23mov27$$2unnamed$$2MovieKindUtil_cpp$$2: .incbin "baserom.dol", 0x49A740, 0x4 diff --git a/asm/src/MoviePlayer.s b/asm/src/MoviePlayer.s index 1a07db55..6c401253 100644 --- a/asm/src/MoviePlayer.s +++ b/asm/src/MoviePlayer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MoError__3movFPvPCc MoError__3movFPvPCc: /* 801CEDAC 001CABEC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -901,12 +901,12 @@ canRemove__Q23mov11MoviePlayerFv: /* 801CFA20 001CB860 38 21 00 10 */ addi r1, r1, 0x10 /* 801CFA24 001CB864 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250367 $$250367: .incbin "baserom.dol", 0x459118, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250273 $$250273: .incbin "baserom.dol", 0x49A748, 0x4 diff --git a/asm/src/MovieThread.s b/asm/src/MovieThread.s index f6dddd26..3517ceae 100644 --- a/asm/src/MovieThread.s +++ b/asm/src/MovieThread.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global waitReady__Q23mov11MoviePlayerCFv waitReady__Q23mov11MoviePlayerCFv: /* 801CFA28 001CB868 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -824,7 +824,7 @@ lbl_801D0544: /* 801D0554 001CC394 38 21 00 50 */ addi r1, r1, 0x50 /* 801D0558 001CC398 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250121 $$250121: .incbin "baserom.dol", 0x459140, 0x30 diff --git a/asm/src/MovieWindow.s b/asm/src/MovieWindow.s index 46691b47..8c96a06f 100644 --- a/asm/src/MovieWindow.s +++ b/asm/src/MovieWindow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail11MovieWindowFRQ23mem10IAllocator __ct__Q43scn7history6detail11MovieWindowFRQ23mem10IAllocator: /* 80215A38 00211878 94 21 FB E0 */ stwu r1, -0x420(r1) @@ -1864,7 +1864,7 @@ lbl_802174CC: /* 802174CC 0021330C 38 60 00 01 */ li r3, 1 /* 802174D0 00213310 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251646 $$251646: .incbin "baserom.dol", 0x4120C0, 0xC @@ -1878,7 +1878,7 @@ $$251650: MOVIE_KIND_TABLE__Q43scn7history6detail25$$2unnamed$$2MovieWindow_cpp$$2: .incbin "baserom.dol", 0x4120E4, 0x74 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252430 $$252430: .incbin "baserom.dol", 0x45E710, 0x10 @@ -2000,7 +2000,7 @@ $$255213: $$255335: .incbin "baserom.dol", 0x45EA54, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252429 $$252429: .incbin "baserom.dol", 0x494CF0, 0x8 @@ -2044,7 +2044,7 @@ $$255216: $$255332: .incbin "baserom.dol", 0x494D58, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251657 $$251657: .incbin "baserom.dol", 0x49ACC0, 0x4 diff --git a/asm/src/MovieYuv.s b/asm/src/MovieYuv.s index 5fc59fe1..f3a068ba 100644 --- a/asm/src/MovieYuv.s +++ b/asm/src/MovieYuv.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mov8MovieYuvF18MOVideoFrameFormatUlUl __ct__Q23mov8MovieYuvF18MOVideoFrameFormatUlUl: /* 801D055C 001CC39C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -618,12 +618,12 @@ getImage__Q23mov8MovieYuvFPv: /* 801D0E4C 001CCC8C 38 21 00 20 */ addi r1, r1, 0x20 /* 801D0E50 001CCC90 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mov8MovieYuv __vt__Q23mov8MovieYuv: .incbin "baserom.dol", 0x4591E8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249275 $$249275: .incbin "baserom.dol", 0x49A780, 0x4 diff --git a/asm/src/MusicCheckWindow.s b/asm/src/MusicCheckWindow.s index dbd6ccf8..e5aba167 100644 --- a/asm/src/MusicCheckWindow.s +++ b/asm/src/MusicCheckWindow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail16MusicCheckWindowFRQ23mem10IAllocator __ct__Q43scn7history6detail16MusicCheckWindowFRQ23mem10IAllocator: /* 802174D4 00213314 94 21 FD 40 */ stwu r1, -0x2c0(r1) @@ -758,7 +758,7 @@ lbl_80217F9C: /* 80217FAC 00213DEC 38 21 00 40 */ addi r1, r1, 0x40 /* 80217FB0 00213DF0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253274 $$253274: .incbin "baserom.dol", 0x45EA90, 0x14 @@ -796,7 +796,7 @@ $$253392: $$253458: .incbin "baserom.dol", 0x45EB38, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253280 $$253280: .incbin "baserom.dol", 0x494D60, 0x8 diff --git a/asm/src/Mutex.s b/asm/src/Mutex.s index 8c2c28d6..47e2f1c0 100644 --- a/asm/src/Mutex.s +++ b/asm/src/Mutex.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24util5MutexFv __ct__Q24util5MutexFv: /* 80405A9C 004018DC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/NANDErrorMenu.s b/asm/src/NANDErrorMenu.s index beaf2061..6f2aacad 100644 --- a/asm/src/NANDErrorMenu.s +++ b/asm/src/NANDErrorMenu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tNANDManager__Q23app27$$2unnamed$$2NANDErrorMenu_cpp$$2Fv tNANDManager__Q23app27$$2unnamed$$2NANDErrorMenu_cpp$$2Fv: /* 801798A8 001756E8 80 6D ED 10 */ lwz r3, object___Q33hel6common38ExplicitSingleton$$0Q23app11Application$$1-_SDA_BASE_(r13) @@ -939,7 +939,7 @@ decide__Q33app17NANDErrorMenuImpl6ButtonFv: /* 8017A580 001763C0 38 21 00 10 */ addi r1, r1, 0x10 /* 8017A584 001763C4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251882 $$251882: .incbin "baserom.dol", 0x44EFE0, 0x10 @@ -995,7 +995,7 @@ $$253374: $$253377: .incbin "baserom.dol", 0x44F0E4, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_LYT_RES__Q23app27$$2unnamed$$2NANDErrorMenu_cpp$$2 T_LYT_RES__Q23app27$$2unnamed$$2NANDErrorMenu_cpp$$2: .incbin "baserom.dol", 0x493010, 0x4 diff --git a/asm/src/NW4RAssert.s b/asm/src/NW4RAssert.s index c4f2d7db..42d02d8c 100644 --- a/asm/src/NW4RAssert.s +++ b/asm/src/NW4RAssert.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global VPanic__Q24nw4r2dbFPCciPCcP16__va_list_structb VPanic__Q24nw4r2dbFPCciPCcP16__va_list_structb: /* 8018B504 00187344 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -34,12 +34,12 @@ VPanic__Q24nw4r2dbFPCciPCcP16__va_list_structb: /* 8018B574 001873B4 38 21 00 20 */ addi r1, r1, 0x20 /* 8018B578 001873B8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248782 $$248782: .incbin "baserom.dol", 0x450138, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248783 $$248783: .incbin "baserom.dol", 0x493158, 0x8 diff --git a/asm/src/N_Mint_Cast.s b/asm/src/N_Mint_Cast.s index 59d2ad4b..62f46bb0 100644 --- a/asm/src/N_Mint_Cast.s +++ b/asm/src/N_Mint_Cast.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global N_Mint_Cast_i2f__6mintvmFRQ26mintvm13MintFuncProxy N_Mint_Cast_i2f__6mintvmFRQ26mintvm13MintFuncProxy: /* 801C6134 001C1F74 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -115,7 +115,7 @@ lbl_801C62A4: /* 801C62C4 001C2104 38 21 00 20 */ addi r1, r1, 0x20 /* 801C62C8 001C2108 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2setRet_s32__Q26mintvm13MintFuncProxyFi$$20 $$2STRING$$2setRet_s32__Q26mintvm13MintFuncProxyFi$$20: .incbin "baserom.dol", 0x457DC8, 0x14 @@ -129,7 +129,7 @@ $$2STRING$$2setRet_f32__Q26mintvm13MintFuncProxyFf$$20: $$2STRING$$2setRet_f32__Q26mintvm13MintFuncProxyFf: .incbin "baserom.dol", 0x457E04, 0x14 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249893 $$249893: .incbin "baserom.dol", 0x49A718, 0x8 diff --git a/asm/src/N_Mint_Debug.s b/asm/src/N_Mint_Debug.s index 22b49b41..ad0ca8e2 100644 --- a/asm/src/N_Mint_Debug.s +++ b/asm/src/N_Mint_Debug.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_AssertFail__Q26mintvm26$$2unnamed$$2N_Mint_Debug_cpp$$2Fv t_AssertFail__Q26mintvm26$$2unnamed$$2N_Mint_Debug_cpp$$2Fv: /* 801C62CC 001C210C 38 60 00 00 */ li r3, 0 @@ -431,7 +431,7 @@ N_Mint_Debug_StackDump__6mintvmFRQ26mintvm13MintFuncProxy: /* 801C6890 001C26D0 80 63 00 00 */ lwz r3, 0(r3) /* 801C6894 001C26D4 48 00 1C 68 */ b dump__Q26mintvm6RegsetCFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250074 $$250074: .incbin "baserom.dol", 0x457E18, 0xC @@ -469,7 +469,7 @@ $$250134: $$250137: .incbin "baserom.dol", 0x457F80, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250075 $$250075: .incbin "baserom.dol", 0x493928, 0x4 @@ -480,7 +480,7 @@ $$250140: $$250145: .incbin "baserom.dol", 0x493930, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250114 $$250114: .incbin "baserom.dol", 0x49A720, 0x8 diff --git a/asm/src/NandManager.s b/asm/src/NandManager.s index b57de926..cd965318 100644 --- a/asm/src/NandManager.s +++ b/asm/src/NandManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24nand11NandManagerFv __ct__Q24nand11NandManagerFv: /* 801D17CC 001CD60C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/NandThread.s b/asm/src/NandThread.s index c734fe3c..5c11c612 100644 --- a/asm/src/NandThread.s +++ b/asm/src/NandThread.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_StorageManager__Q24nand24$$2unnamed$$2NandThread_cpp$$2Fv t_StorageManager__Q24nand24$$2unnamed$$2NandThread_cpp$$2Fv: /* 801D1950 001CD790 80 6D ED 10 */ lwz r3, object___Q33hel6common38ExplicitSingleton$$0Q23app11Application$$1-_SDA_BASE_(r13) @@ -1644,12 +1644,12 @@ lbl_801D3020: /* 801D3020 001CEE60 38 60 00 00 */ li r3, 0 /* 801D3024 001CEE64 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global SaveFiles__4nand SaveFiles__4nand: .incbin "baserom.dol", 0x410ED0, 0xB8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249991 $$249991: .incbin "baserom.dol", 0x4593B8, 0xC @@ -1705,7 +1705,7 @@ $$251581: $$251582: .incbin "baserom.dol", 0x4594B4, 0x14 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249989 $$249989: .incbin "baserom.dol", 0x493A18, 0x8 diff --git a/asm/src/News.s b/asm/src/News.s index 379099d2..99e64870 100644 --- a/asm/src/News.s +++ b/asm/src/News.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history4NewsFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessor __ct__Q33scn7history4NewsFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessor: /* 8020CA58 00208898 94 21 FE A0 */ stwu r1, -0x160(r1) @@ -589,7 +589,7 @@ lbl_8020D2BC: /* 8020D2BC 002090FC 38 60 00 00 */ li r3, 0 /* 8020D2C0 00209100 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global IS_LARGE__Q33scn7history18$$2unnamed$$2News_cpp$$2 IS_LARGE__Q33scn7history18$$2unnamed$$2News_cpp$$2: .incbin "baserom.dol", 0x411C88, 0x18 @@ -597,7 +597,7 @@ IS_LARGE__Q33scn7history18$$2unnamed$$2News_cpp$$2: SHOW_DECORATION__Q33scn7history18$$2unnamed$$2News_cpp$$2: .incbin "baserom.dol", 0x411CA0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253381 $$253381: .incbin "baserom.dol", 0x45D460, 0x10 @@ -626,7 +626,7 @@ $$253514: $$253516: .incbin "baserom.dol", 0x45D4DC, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253382 $$253382: .incbin "baserom.dol", 0x494990, 0x8 @@ -652,7 +652,7 @@ $$253528: $$253532: .incbin "baserom.dol", 0x4949C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253533 $$253533: .incbin "baserom.dol", 0x49AC18, 0x8 diff --git a/asm/src/NextArrowPanel.s b/asm/src/NextArrowPanel.s index a6640c37..8d19d5d3 100644 --- a/asm/src/NextArrowPanel.s +++ b/asm/src/NextArrowPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetBasePaneName__Q43scn4step4info28$$2unnamed$$2NextArrowPanel_cpp$$2FQ43scn4step4info16NextArrowDirKind GetBasePaneName__Q43scn4step4info28$$2unnamed$$2NextArrowPanel_cpp$$2FQ43scn4step4info16NextArrowDirKind: /* 803AF648 003AB488 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -321,7 +321,7 @@ lbl_803AFACC: /* 803AFAD8 003AB918 38 21 00 10 */ addi r1, r1, 0x10 /* 803AFADC 003AB91C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$253080 $$253080: .incbin "baserom.dol", 0x41BED8, 0x10 @@ -329,7 +329,7 @@ $$253080: $$253090: .incbin "baserom.dol", 0x41BEE8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253551 $$253551: .incbin "baserom.dol", 0x48C098, 0x10 @@ -340,7 +340,7 @@ $$253552: $$253553: .incbin "baserom.dol", 0x48C0B8, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253076 $$253076: .incbin "baserom.dol", 0x497A60, 0x8 diff --git a/asm/src/NodeAccessor.s b/asm/src/NodeAccessor.s index 3ac688d9..a9211475 100644 --- a/asm/src/NodeAccessor.s +++ b/asm/src/NodeAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d12NodeAccessorFv __ct__Q23g3d12NodeAccessorFv: /* 80192CE4 0018EB24 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/NodeAttach.s b/asm/src/NodeAttach.s index a0f82d67..ba150957 100644 --- a/asm/src/NodeAttach.s +++ b/asm/src/NodeAttach.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero10NodeAttachFRQ24gobj5Model __ct__Q43scn4step4hero10NodeAttachFRQ24gobj5Model: /* 8034EAD8 0034A918 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -346,7 +346,7 @@ setScale__Q43scn4step4hero10NodeAttachFf: /* 8034EFB0 0034ADF0 D0 23 00 5C */ stfs f1, 0x5c(r3) /* 8034EFB4 0034ADF4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256190 $$256190: .incbin "baserom.dol", 0x49D888, 0x4 diff --git a/asm/src/NodeDesc.s b/asm/src/NodeDesc.s index 24463b3e..7a09c196 100644 --- a/asm/src/NodeDesc.s +++ b/asm/src/NodeDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll8NodeDescFv __ct__Q25ocoll8NodeDescFv: /* 801D805C 001D3E9C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -72,7 +72,7 @@ lbl_801D80F8: /* 801D8158 001D3F98 38 21 00 40 */ addi r1, r1, 0x40 /* 801D815C 001D3F9C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251991 $$251991: .incbin "baserom.dol", 0x49A7D0, 0x8 diff --git a/asm/src/NodeLocalMtx.s b/asm/src/NodeLocalMtx.s index 48a7418d..c71ee681 100644 --- a/asm/src/NodeLocalMtx.s +++ b/asm/src/NodeLocalMtx.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d12NodeLocalMtxFv __ct__Q23g3d12NodeLocalMtxFv: /* 801930BC 0018EEFC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -105,7 +105,7 @@ setCalcOp__Q23g3d12NodeLocalMtxFQ23g3d18NodeLocalMtxCalcOp: /* 80193200 0018F040 90 83 00 40 */ stw r4, 0x40(r3) /* 80193204 0018F044 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251380 $$251380: .incbin "baserom.dol", 0x49A1D8, 0x8 diff --git a/asm/src/NodeLocalMtxAccessor.s b/asm/src/NodeLocalMtxAccessor.s index 35af839e..ab7c2543 100644 --- a/asm/src/NodeLocalMtxAccessor.s +++ b/asm/src/NodeLocalMtxAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global reset__Q23g3d20NodeLocalMtxAccessorCFv reset__Q23g3d20NodeLocalMtxAccessorCFv: /* 80193208 0018F048 80 63 00 00 */ lwz r3, 0(r3) diff --git a/asm/src/NodeRepos.s b/asm/src/NodeRepos.s index 7475f1b0..7647c3cf 100644 --- a/asm/src/NodeRepos.s +++ b/asm/src/NodeRepos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj9NodeReposFRCQ24gobj13NodeReposDescRQ23mem10IAllocatorRCQ23g3d13ModelAccessor __ct__Q24gobj9NodeReposFRCQ24gobj13NodeReposDescRQ23mem10IAllocatorRCQ23g3d13ModelAccessor: /* 8019BA20 00197860 94 21 FF C0 */ stwu r1, -0x40(r1) diff --git a/asm/src/Nururi.s b/asm/src/Nururi.s index ee3e3eb6..8c6ffe24 100644 --- a/asm/src/Nururi.s +++ b/asm/src/Nururi.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26nururi6NururiFRQ26nururi7ManagerQ26nururi8Category __ct__Q26nururi6NururiFRQ26nururi7ManagerQ26nururi8Category: /* 801D347C 001CF2BC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -414,7 +414,7 @@ centerPos__Q26nururi6NururiCFv: /* 801D3A08 001CF848 EC 43 00 BA */ fmadds f2, f3, f2, f0 /* 801D3A0C 001CF84C 4B FC B9 9C */ b set__Q33hel4math7Vector2Fff -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy6NururiFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy6NururiFRQ43scn4step5enemy5Enemy: /* 8028AEB4 00286CF4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -610,7 +610,7 @@ changeSetting__Q43scn4step5enemy6NururiFRCQ33hel4math7Vector2ffQ26nururi4Mode: /* 8028B154 00286F94 90 A3 00 4C */ stw r5, 0x4c(r3) /* 8028B158 00286F98 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero6NururiFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero6NururiFRQ43scn4step4hero4Hero: /* 8034EFB8 0034ADF8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -958,12 +958,12 @@ mode__Q43scn4step4hero6NururiFv: /* 8034F464 0034B2A4 38 21 00 10 */ addi r1, r1, 0x10 /* 8034F468 0034B2A8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q26nururi6Nururi __vt__Q26nururi6Nururi: .incbin "baserom.dol", 0x4594C8, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249890 $$249890: .incbin "baserom.dol", 0x49A798, 0x4 @@ -980,7 +980,7 @@ $$249953: $$249988: .incbin "baserom.dol", 0x49A7A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250754 $$250754: .incbin "baserom.dol", 0x49BA08, 0x4 @@ -994,7 +994,7 @@ $$250789: $$250790: .incbin "baserom.dol", 0x49BA14, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251445 $$251445: .incbin "baserom.dol", 0x49D890, 0x4 diff --git a/asm/src/ObjColl.s b/asm/src/ObjColl.s index 452a90f2..e4377f5c 100644 --- a/asm/src/ObjColl.s +++ b/asm/src/ObjColl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara7ObjCollFRQ33scn4step9ComponentRQ24gobj5ModelQ43scn4step5ocoll6TeamNoUlRQ23mem10IAllocator __ct__Q43scn4step5chara7ObjCollFRQ33scn4step9ComponentRQ24gobj5ModelQ43scn4step5ocoll6TeamNoUlRQ23mem10IAllocator: /* 80271D34 0026DB74 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -515,7 +515,7 @@ searchAttack__Q43scn4step5chara7ObjCollFv: /* 80272358 0026E198 38 63 08 10 */ addi r3, r3, 0x810 /* 8027235C 0026E19C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7ObjCollFRQ43scn4step4hero4HeroRQ23mem10IAllocator __ct__Q43scn4step4hero7ObjCollFRQ43scn4step4hero4HeroRQ23mem10IAllocator: /* 8034F46C 0034B2AC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -904,7 +904,7 @@ onObjStopFinished__Q43scn4step4hero7ObjCollFv: /* 8034F9B4 0034B7F4 38 21 00 10 */ addi r1, r1, 0x10 /* 8034F9B8 0034B7F8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257554 $$257554: .incbin "baserom.dol", 0x49D8B8, 0x4 diff --git a/asm/src/ObjCollLite.s b/asm/src/ObjCollLite.s index df44775d..4a7668e0 100644 --- a/asm/src/ObjCollLite.s +++ b/asm/src/ObjCollLite.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara11ObjCollLiteFRQ33scn4step9ComponentRQ43scn4step5chara5ModelRQ25ocoll5OwnerRQ23mem10IAllocatorb __ct__Q43scn4step5chara11ObjCollLiteFRQ33scn4step9ComponentRQ43scn4step5chara5ModelRQ25ocoll5OwnerRQ23mem10IAllocatorb: /* 80272360 0026E1A0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/ObjCollReact.s b/asm/src/ObjCollReact.s index 98c56948..3cca1456 100644 --- a/asm/src/ObjCollReact.s +++ b/asm/src/ObjCollReact.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss12ObjCollReactFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss12ObjCollReactFRQ43scn4step4boss4Boss: /* 80232B6C 0022E9AC 90 83 00 00 */ stw r4, 0(r3) @@ -727,7 +727,7 @@ lbl_80233590: /* 802335B8 0022F3F8 38 21 01 10 */ addi r1, r1, 0x110 /* 802335BC 0022F3FC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy12ObjCollReactFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy12ObjCollReactFRQ43scn4step5enemy5Enemy: /* 8028B15C 00286F9C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1793,7 +1793,7 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage14Sta __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv: /* 8028C028 00287E68 4B FA 26 78 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global procObjCollReact__Q43scn4step4hero12ObjCollReactFv procObjCollReact__Q43scn4step4hero12ObjCollReactFv: /* 8034F9BC 0034B7FC 94 21 FF 20 */ stwu r1, -0xe0(r1) @@ -2868,7 +2868,7 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage10Stat __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1Fv: /* 80350838 0034C678 4B ED DE 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global procObjCollReact__Q43scn4step6weapon12ObjCollReactFv procObjCollReact__Q43scn4step6weapon12ObjCollReactFv: /* 803D7B98 003D39D8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2918,7 +2918,7 @@ lbl_803D7C2C: /* 803D7C40 003D3A80 38 21 00 20 */ addi r1, r1, 0x20 /* 803D7C44 003D3A84 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_HITEFFECT_TABLE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITEFFECT_TABLE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: .incbin "baserom.dol", 0x4124F0, 0x64 @@ -2926,7 +2926,7 @@ T_HITEFFECT_TABLE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: T_HITSE_TABLE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: .incbin "baserom.dol", 0x412554, 0x3C -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_HITEFFECT_TABLE__Q43scn4step5enemy26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITEFFECT_TABLE__Q43scn4step5enemy26$$2unnamed$$2ObjCollReact_cpp$$2: .incbin "baserom.dol", 0x414480, 0x64 @@ -2934,7 +2934,7 @@ T_HITEFFECT_TABLE__Q43scn4step5enemy26$$2unnamed$$2ObjCollReact_cpp$$2: T_HITSE_TABLE__Q43scn4step5enemy26$$2unnamed$$2ObjCollReact_cpp$$2: .incbin "baserom.dol", 0x4144E4, 0x3C -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_HITEFFECT_TABLE__Q43scn4step4hero26$$2unnamed$$2ObjCollReact_cpp$$2 T_HITEFFECT_TABLE__Q43scn4step4hero26$$2unnamed$$2ObjCollReact_cpp$$2: .incbin "baserom.dol", 0x416288, 0x64 @@ -2942,12 +2942,12 @@ T_HITEFFECT_TABLE__Q43scn4step4hero26$$2unnamed$$2ObjCollReact_cpp$$2: T_HITSE_TABLE__Q43scn4step4hero26$$2unnamed$$2ObjCollReact_cpp$$2: .incbin "baserom.dol", 0x4162EC, 0x3C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_DAMAGERATE_BY_PLAYERCOUNT__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2 T_DAMAGERATE_BY_PLAYERCOUNT__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: .incbin "baserom.dol", 0x460770, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1 __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage16StateDeadExtreme$$4PQ43scn4step5enemy5Enemy$$4Ul$$1: .incbin "baserom.dol", 0x46E768, 0x10 @@ -2964,7 +2964,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage17St __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageExtreme$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46E7A8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage20StateSuperTeamAttack$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x481258, 0x10 @@ -2999,17 +2999,17 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage12Stat __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage13StateSparkLv3$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4812F8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_DAMAGERATE_BY_PILE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2 T_DAMAGERATE_BY_PILE__Q43scn4step4boss26$$2unnamed$$2ObjCollReact_cpp$$2: .incbin "baserom.dol", 0x4952C0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256339 $$256339: .incbin "baserom.dol", 0x495A10, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257720 $$257720: .incbin "baserom.dol", 0x49AEB0, 0x8 @@ -3023,7 +3023,7 @@ $$257779: $$257780: .incbin "baserom.dol", 0x49AEC0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258198 $$258198: .incbin "baserom.dol", 0x49BA18, 0x8 @@ -3037,7 +3037,7 @@ $$258416: $$258417: .incbin "baserom.dol", 0x49BA2C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260300 $$260300: .incbin "baserom.dol", 0x49D8D8, 0x4 diff --git a/asm/src/ObjInfoImpl.s b/asm/src/ObjInfoImpl.s index 816c5505..e291f441 100644 --- a/asm/src/ObjInfoImpl.s +++ b/asm/src/ObjInfoImpl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss11ObjInfoImplFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss11ObjInfoImplFRQ43scn4step4boss4Boss: /* 802335C0 0022F400 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -141,7 +141,7 @@ state__Q43scn4step4boss11ObjInfoImplCFv: /* 80233768 0022F5A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8023376C 0022F5AC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11ObjInfoImplFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero11ObjInfoImplFRQ43scn4step4hero4Hero: /* 8035083C 0034C67C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -342,12 +342,12 @@ state__Q43scn4step4hero11ObjInfoImplCFv: /* 80350AB4 0034C8F4 38 21 00 10 */ addi r1, r1, 0x10 /* 80350AB8 0034C8F8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss11ObjInfoImpl __vt__Q43scn4step4boss11ObjInfoImpl: .incbin "baserom.dol", 0x460788, 0x30 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255463 $$255463: .incbin "baserom.dol", 0x481308, 0x14 @@ -370,12 +370,12 @@ $$255469: __vt__Q43scn4step4hero11ObjInfoImpl: .incbin "baserom.dol", 0x481364, 0x2C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254747 $$254747: .incbin "baserom.dol", 0x4952C8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255468 $$255468: .incbin "baserom.dol", 0x496DF8, 0x8 diff --git a/asm/src/ObjInfoRepos.s b/asm/src/ObjInfoRepos.s index 381d245a..564b6153 100644 --- a/asm/src/ObjInfoRepos.s +++ b/asm/src/ObjInfoRepos.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q43scn4step5debug12ObjInfoReposFv __dt__Q43scn4step5debug12ObjInfoReposFv: /* 8027A9AC 002767EC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/ObjPlacement.s b/asm/src/ObjPlacement.s index aff2238f..c1a261c6 100644 --- a/asm/src/ObjPlacement.s +++ b/asm/src/ObjPlacement.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5debug12ObjPlacementFRQ33scn4step9Component __ct__Q43scn4step5debug12ObjPlacementFRQ33scn4step9Component: /* 8027AB34 00276974 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/ObjStop.s b/asm/src/ObjStop.s index e4075408..98bdfe6b 100644 --- a/asm/src/ObjStop.s +++ b/asm/src/ObjStop.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss7ObjStopFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss7ObjStopFRQ43scn4step4boss4Boss: /* 80233770 0022F5B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -184,7 +184,7 @@ onStopPowerfulFinished__Q43scn4step4boss7ObjStopFRCQ25ostop5Actor: /* 802339D4 0022F814 38 21 00 10 */ addi r1, r1, 0x10 /* 802339D8 0022F818 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy7ObjStopFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy7ObjStopFRQ43scn4step5enemy5Enemy: /* 8028C02C 00287E6C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -339,7 +339,7 @@ onStopPowerfulFinished__Q43scn4step5enemy7ObjStopFRCQ25ostop5Actor: /* 8028C240 00288080 38 21 00 10 */ addi r1, r1, 0x10 /* 8028C244 00288084 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7ObjStopFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero7ObjStopFRQ43scn4step4hero4Hero: /* 80350ABC 0034C8FC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -559,7 +559,7 @@ onStopPowerfulFinished__Q43scn4step4hero7ObjStopFRCQ25ostop5Actor: /* 80350D9C 0034CBDC 38 21 00 10 */ addi r1, r1, 0x10 /* 80350DA0 0034CBE0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item7ObjStopFRQ43scn4step4item4Item __ct__Q43scn4step4item7ObjStopFRQ43scn4step4item4Item: /* 803C4E2C 003C0C6C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -720,7 +720,7 @@ onStopPowerfulFinished__Q43scn4step4item7ObjStopFRCQ25ostop5Actor: /* 803C5058 003C0E98 38 21 00 10 */ addi r1, r1, 0x10 /* 803C505C 003C0E9C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon7ObjStopFRQ43scn4step6weapon6WeaponQ43scn4step5ostop4Flag __ct__Q43scn4step6weapon7ObjStopFRQ43scn4step6weapon6WeaponQ43scn4step5ostop4Flag: /* 803D7C48 003D3A88 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -892,27 +892,27 @@ onStopPowerfulFinished__Q43scn4step6weapon7ObjStopFRCQ25ostop5Actor: /* 803D7E88 003D3CC8 38 21 00 10 */ addi r1, r1, 0x10 /* 803D7E8C 003D3CCC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss7ObjStop __vt__Q43scn4step4boss7ObjStop: .incbin "baserom.dol", 0x4607B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy7ObjStop __vt__Q43scn4step5enemy7ObjStop: .incbin "baserom.dol", 0x46E7B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero7ObjStop __vt__Q43scn4step4hero7ObjStop: .incbin "baserom.dol", 0x481390, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item7ObjStop __vt__Q43scn4step4item7ObjStop: .incbin "baserom.dol", 0x48DFE8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon7ObjStop __vt__Q43scn4step6weapon7ObjStop: .incbin "baserom.dol", 0x48F8E8, 0x20 diff --git a/asm/src/OperatorNewDelete.s b/asm/src/OperatorNewDelete.s index 6531e508..dd71129c 100644 --- a/asm/src/OperatorNewDelete.s +++ b/asm/src/OperatorNewDelete.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_allocatorRef__31$$2unnamed$$2OperatorNewDelete_cpp$$2Fv t_allocatorRef__31$$2unnamed$$2OperatorNewDelete_cpp$$2Fv: /* 801BF618 001BB458 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -120,7 +120,7 @@ __sinit_$$3OperatorNewDelete_cpp: /* 801BF758 001BB598 38 21 00 10 */ addi r1, r1, 0x10 /* 801BF75C 001BB59C 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402438, 0x4 .section .bss, "wa" # 0x80496700 - 0x805643FC diff --git a/asm/src/OrderUtil.s b/asm/src/OrderUtil.s index afcece85..8a1f2f8e 100644 --- a/asm/src/OrderUtil.s +++ b/asm/src/OrderUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global toSeLabel__Q53scn4step7gimmick13movegroupctrl9OrderUtilFUc toSeLabel__Q53scn4step7gimmick13movegroupctrl9OrderUtilFUc: /* 80319210 00315050 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -39,7 +39,7 @@ toMoveRate__Q53scn4step7gimmick13movegroupctrl9OrderUtilFUc: /* 80319270 003150B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80319274 003150B4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global t_SEList__Q53scn4step7gimmick13movegroupctrl23$$2unnamed$$2OrderUtil_cpp$$2 t_SEList__Q53scn4step7gimmick13movegroupctrl23$$2unnamed$$2OrderUtil_cpp$$2: .incbin "baserom.dol", 0x47DB80, 0x28 @@ -47,7 +47,7 @@ t_SEList__Q53scn4step7gimmick13movegroupctrl23$$2unnamed$$2OrderUtil_cpp$$2: t_QuakeList__Q53scn4step7gimmick13movegroupctrl23$$2unnamed$$2OrderUtil_cpp$$2: .incbin "baserom.dol", 0x47DBA8, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248798 $$248798: .incbin "baserom.dol", 0x49D4E0, 0x8 diff --git a/asm/src/Otachidai.s b/asm/src/Otachidai.s index bb5a0f2f..e9e10add 100644 --- a/asm/src/Otachidai.s +++ b/asm/src/Otachidai.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick9otachidai9OtachidaiFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick9otachidai9OtachidaiFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8031A410 00316250 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -192,17 +192,17 @@ mfCreateMoveLand__Q53scn4step7gimmick9otachidai9OtachidaiFv: /* 8031A6B0 003164F0 38 21 00 20 */ addi r1, r1, 0x20 /* 8031A6B4 003164F4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253405 $$253405: .incbin "baserom.dol", 0x47DC90, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253406 $$253406: .incbin "baserom.dol", 0x496C38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253404 $$253404: .incbin "baserom.dol", 0x49D510, 0x4 diff --git a/asm/src/Owner.s b/asm/src/Owner.s index 35abe2d4..75c7a774 100644 --- a/asm/src/Owner.s +++ b/asm/src/Owner.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll5OwnerFRQ25ocoll7ManagerUlRQ23mem10IAllocator __ct__Q25ocoll5OwnerFRQ25ocoll7ManagerUlRQ23mem10IAllocator: /* 801D8160 001D3FA0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Package.s b/asm/src/Package.s index d6c76055..69fc6b1b 100644 --- a/asm/src/Package.s +++ b/asm/src/Package.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history7PackageFQ33scn7history11ProductKindiRQ33scn7history9ComponentPCcPCcUl __ct__Q33scn7history7PackageFQ33scn7history11ProductKindiRQ33scn7history9ComponentPCcPCcUl: /* 8020D2C4 00209104 94 21 FA F0 */ stwu r1, -0x510(r1) @@ -884,10 +884,10 @@ detachParent__Q33scn7history7PackageFv: .global packageScales__Q33scn7history7PackageCFv packageScales__Q33scn7history7PackageCFv: /* 8020DF78 00209DB8 38 63 05 24 */ addi r3, r3, 0x524 -/* 8020DF7C 00209DBC 48 00 00 04 */ b dataHeadAddress__Q25xdata5XDataCFv +/* 8020DF7C 00209DBC 48 00 00 04 */ b dataHeadAddress__Q25.dataXDataCFv -.global dataHeadAddress__Q25xdata5XDataCFv -dataHeadAddress__Q25xdata5XDataCFv: +.global dataHeadAddress__Q25.dataXDataCFv +dataHeadAddress__Q25.dataXDataCFv: /* 8020DF80 00209DC0 38 80 00 00 */ li r4, 0 /* 8020DF84 00209DC4 38 A0 00 00 */ li r5, 0 /* 8020DF88 00209DC8 38 C0 00 00 */ li r6, 0 @@ -925,7 +925,7 @@ lbl_8020DFEC: .global shadowScales__Q33scn7history7PackageCFv shadowScales__Q33scn7history7PackageCFv: /* 8020DFF4 00209E34 38 63 05 2C */ addi r3, r3, 0x52c -/* 8020DFF8 00209E38 4B FF FF 88 */ b dataHeadAddress__Q25xdata5XDataCFv +/* 8020DFF8 00209E38 4B FF FF 88 */ b dataHeadAddress__Q25.dataXDataCFv .global __sinit_$$3Package_cpp __sinit_$$3Package_cpp: @@ -936,10 +936,10 @@ __sinit_$$3Package_cpp: /* 8020E00C 00209E4C C0 62 A1 78 */ lfs f3, $$253467-_SDA2_BASE_(r2) /* 8020E010 00209E50 4B EB 00 B0 */ b __ct__Q34nw4r4math4VEC3Ffff -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40245C, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253252 $$253252: .incbin "baserom.dol", 0x45D520, 0x10 @@ -956,7 +956,7 @@ $$253256: __vt__Q33scn7history7Package: .incbin "baserom.dol", 0x45D570, 0x70 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253254 $$253254: .incbin "baserom.dol", 0x4949D0, 0x8 @@ -982,7 +982,7 @@ $$253383: $$253427: .incbin "baserom.dol", 0x494A08, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253265 $$253265: .incbin "baserom.dol", 0x49AC20, 0x8 diff --git a/asm/src/PackageButtonContent.s b/asm/src/PackageButtonContent.s index c0ecc965..d591ff8e 100644 --- a/asm/src/PackageButtonContent.s +++ b/asm/src/PackageButtonContent.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail20PackageButtonContentFRQ23mem10IAllocator __ct__Q43scn7history6detail20PackageButtonContentFRQ23mem10IAllocator: /* 80217FB4 00213DF4 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -104,7 +104,7 @@ lbl_80218118: /* 80218118 00213F58 38 8D A6 50 */ addi r4, r13, $$252005-_SDA_BASE_ /* 8021811C 00213F5C 4B F9 4E 78 */ b play__Q23lyt6LayoutFPCc -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251550 $$251550: .incbin "baserom.dol", 0x45EB78, 0xC @@ -136,7 +136,7 @@ $$252003: $$252004: .incbin "baserom.dol", 0x45EC9C, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251545 $$251545: .incbin "baserom.dol", 0x494DD0, 0x8 diff --git a/asm/src/PackageHelp.s b/asm/src/PackageHelp.s index c5649b9e..181b7a58 100644 --- a/asm/src/PackageHelp.s +++ b/asm/src/PackageHelp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history11PackageHelpFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn7history11PackageHelpFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 8020E014 00209E54 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -225,7 +225,7 @@ lbl_8020E328: /* 8020E33C 0020A17C 38 21 00 30 */ addi r1, r1, 0x30 /* 8020E340 0020A180 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252155 $$252155: .incbin "baserom.dol", 0x45D5E0, 0x10 @@ -233,7 +233,7 @@ $$252155: $$252156: .incbin "baserom.dol", 0x45D5F0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252157 $$252157: .incbin "baserom.dol", 0x494A10, 0x8 diff --git a/asm/src/PackageHelps.s b/asm/src/PackageHelps.s index fbd29169..ebd10774 100644 --- a/asm/src/PackageHelps.s +++ b/asm/src/PackageHelps.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history12PackageHelpsFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn7history12PackageHelpsFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 8020E344 0020A184 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -232,12 +232,12 @@ lbl_8020E65C: /* 8020E65C 0020A49C 38 60 00 00 */ li r3, 0 /* 8020E660 0020A4A0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252124 $$252124: .incbin "baserom.dol", 0x45D600, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252169 $$252169: .incbin "baserom.dol", 0x494A40, 0x8 diff --git a/asm/src/PackageWindow.s b/asm/src/PackageWindow.s index c1bbe6c6..0f56f199 100644 --- a/asm/src/PackageWindow.s +++ b/asm/src/PackageWindow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail13PackageWindowFRQ33scn7history9ComponentRQ23mem10IAllocator __ct__Q43scn7history6detail13PackageWindowFRQ33scn7history9ComponentRQ23mem10IAllocator: /* 80218120 00213F60 94 21 FC 60 */ stwu r1, -0x3a0(r1) @@ -2042,10 +2042,10 @@ __sinit_$$3PackageWindow_cpp: /* 80219EA4 00215CE4 38 21 00 20 */ addi r1, r1, 0x20 /* 80219EA8 00215CE8 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402468, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255641 $$255641: .incbin "baserom.dol", 0x45ECE0, 0x20 @@ -2095,7 +2095,7 @@ $$256102: __vt__Q43scn7history6detail13PackageWindow: .incbin "baserom.dol", 0x45EE28, 0xA0 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255648 $$255648: .incbin "baserom.dol", 0x494E60, 0x8 @@ -2142,7 +2142,7 @@ $$253200: $$256045: .incbin "baserom.dol", 0x494EC4, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255615 $$255615: .incbin "baserom.dol", 0x49ACE8, 0x4 diff --git a/asm/src/PageAbility.s b/asm/src/PageAbility.s index 86fa1720..3496d5d2 100644 --- a/asm/src/PageAbility.s +++ b/asm/src/PageAbility.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause11PageAbilityFRQ25pause9ComponentRQ24file8FileTreeQ25pause10ManualKind __ct__Q25pause11PageAbilityFRQ25pause9ComponentRQ24file8FileTreeQ25pause10ManualKind: /* 801DC458 001D8298 94 21 FD 70 */ stwu r1, -0x290(r1) @@ -208,7 +208,7 @@ lbl_801DC718: /* 801DC72C 001D856C 38 21 00 10 */ addi r1, r1, 0x10 /* 801DC730 001D8570 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252590 $$252590: .incbin "baserom.dol", 0x459868, 0x10 @@ -222,7 +222,7 @@ $$252592: __vt__Q25pause11PageAbility: .incbin "baserom.dol", 0x4598A0, 0x50 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252593 $$252593: .incbin "baserom.dol", 0x493C78, 0x8 diff --git a/asm/src/PageCommand.s b/asm/src/PageCommand.s index ba0151f6..3e97a42a 100644 --- a/asm/src/PageCommand.s +++ b/asm/src/PageCommand.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause11PageCommandFRQ25pause9ComponentQ25pause10ManualKindUl __ct__Q25pause11PageCommandFRQ25pause9ComponentQ25pause10ManualKindUl: /* 801DC734 001D8574 94 21 FC 60 */ stwu r1, -0x3a0(r1) @@ -506,7 +506,7 @@ lbl_801DCE4C: /* 801DCE60 001D8CA0 38 21 00 10 */ addi r1, r1, 0x10 /* 801DCE64 001D8CA4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252946 $$252946: .incbin "baserom.dol", 0x4598F0, 0x10 @@ -544,7 +544,7 @@ $$252960: __vt__Q25pause11PageCommand: .incbin "baserom.dol", 0x459998, 0x50 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252951 $$252951: .incbin "baserom.dol", 0x493C98, 0x4 diff --git a/asm/src/PageCounter.s b/asm/src/PageCounter.s index 7f7c0e86..5a544833 100644 --- a/asm/src/PageCounter.s +++ b/asm/src/PageCounter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Count__Q33scn5comic11PageCounterFPCc Count__Q33scn5comic11PageCounterFPCc: /* 80200180 001FBFC0 94 21 FD D0 */ stwu r1, -0x230(r1) @@ -115,7 +115,7 @@ lbl_8020030C: /* 8020031C 001FC15C 38 21 02 30 */ addi r1, r1, 0x230 /* 80200320 001FC160 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249044 $$249044: .incbin "baserom.dol", 0x45C428, 0x10 @@ -126,7 +126,7 @@ $$249046: $$249047: .incbin "baserom.dol", 0x45C448, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249045 $$249045: .incbin "baserom.dol", 0x4946F0, 0x8 diff --git a/asm/src/PageDropout.s b/asm/src/PageDropout.s index a477dca1..26983768 100644 --- a/asm/src/PageDropout.s +++ b/asm/src/PageDropout.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tGetContext__Q25pause25$$2unnamed$$2PageDropout_cpp$$2FQ25pause8ModeKind tGetContext__Q25pause25$$2unnamed$$2PageDropout_cpp$$2FQ25pause8ModeKind: /* 801DCE68 001D8CA8 54 64 18 38 */ slwi r4, r3, 3 @@ -819,7 +819,7 @@ lbl_801DD99C: /* 801DD9B0 001D97F0 38 21 00 10 */ addi r1, r1, 0x10 /* 801DD9B4 001D97F4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ENTRIES_CHALLENGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_ENTRIES_CHALLENGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: .incbin "baserom.dol", 0x411538, 0x10 @@ -830,7 +830,7 @@ T_ENTRY_CONTEXTS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: T_LABELS__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: .incbin "baserom.dol", 0x411568, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252145 $$252145: .incbin "baserom.dol", 0x4599E8, 0xC @@ -898,7 +898,7 @@ $$253492: __vt__Q25pause11PageDropout: .incbin "baserom.dol", 0x459B28, 0x50 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252149 $$252149: .incbin "baserom.dol", 0x493CB8, 0x8 @@ -921,7 +921,7 @@ $$253493: $$253494: .incbin "baserom.dol", 0x493CE0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_ENTRIES_STAGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2 T_ENTRIES_STAGE__Q25pause25$$2unnamed$$2PageDropout_cpp$$2: .incbin "baserom.dol", 0x49A800, 0x8 diff --git a/asm/src/PageManager.s b/asm/src/PageManager.s index 968444b4..c83bc508 100644 --- a/asm/src/PageManager.s +++ b/asm/src/PageManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tBtnCheck__Q25pause25$$2unnamed$$2PageManager_cpp$$2FRCQ23hid6ButtonbUl tBtnCheck__Q25pause25$$2unnamed$$2PageManager_cpp$$2FRCQ23hid6ButtonbUl: /* 801DD9B8 001D97F8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1088,12 +1088,12 @@ Create__Q35pause11PageManager10PageRecipeFQ35pause11PageManager8PageKindUl: /* 801DE90C 001DA74C 38 21 00 10 */ addi r1, r1, 0x10 /* 801DE910 001DA750 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252644 $$252644: .incbin "baserom.dol", 0x411590, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252168 $$252168: .incbin "baserom.dol", 0x459B78, 0xC @@ -1137,7 +1137,7 @@ $$254051: $$254052: .incbin "baserom.dol", 0x459C24, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252167 $$252167: .incbin "baserom.dol", 0x493CE8, 0x8 @@ -1148,7 +1148,7 @@ $$253830: $$254028: .incbin "baserom.dol", 0x493CF8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_MOVE_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2 T_MOVE_NODE_NAME__Q25pause25$$2unnamed$$2PageManager_cpp$$2: .incbin "baserom.dol", 0x49A818, 0x4 diff --git a/asm/src/PaneAccessor.s b/asm/src/PaneAccessor.s index ab79a708..2208a616 100644 --- a/asm/src/PaneAccessor.s +++ b/asm/src/PaneAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23lyt12PaneAccessorFv __ct__Q23lyt12PaneAccessorFv: /* 801ADFC8 001A9E08 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -446,7 +446,7 @@ lbl_801AE53C: /* 801AE548 001AA388 38 21 00 20 */ addi r1, r1, 0x20 /* 801AE54C 001AA38C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253421 $$253421: .incbin "baserom.dol", 0x49A4D0, 0x8 diff --git a/asm/src/Param.s b/asm/src/Param.s index 567a64ee..721a9fe6 100644 --- a/asm/src/Param.s +++ b/asm/src/Param.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss5ParamFv __ct__Q43scn4step4boss5ParamFv: /* 802339DC 0022F81C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -74,7 +74,7 @@ bonkers__Q43scn4step4boss5ParamCFv: /* 80233AE0 0022F920 4B FA 68 BD */ bl loadCheck__Q25param8JITParamCFv /* 80233AE4 0022F924 80 7F 00 08 */ lwz r3, 8(r31) /* 80233AE8 0022F928 38 63 00 04 */ addi r3, r3, 4 -/* 80233AEC 0022F92C 4B FD A4 95 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233AEC 0022F92C 4B FD A4 95 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233AF0 0022F930 7C 7F 1B 78 */ mr r31, r3 /* 80233AF4 0022F934 80 63 00 EC */ lwz r3, 0xec(r3) /* 80233AF8 0022F938 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -100,7 +100,7 @@ challengemaster__Q43scn4step4boss5ParamCFv: /* 80233B38 0022F978 4B FA 68 65 */ bl loadCheck__Q25param8JITParamCFv /* 80233B3C 0022F97C 80 7F 00 18 */ lwz r3, 0x18(r31) /* 80233B40 0022F980 38 63 00 04 */ addi r3, r3, 4 -/* 80233B44 0022F984 4B FD A4 3D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233B44 0022F984 4B FD A4 3D */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233B48 0022F988 7C 7F 1B 78 */ mr r31, r3 /* 80233B4C 0022F98C 80 63 01 9C */ lwz r3, 0x19c(r3) /* 80233B50 0022F990 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -126,7 +126,7 @@ common__Q43scn4step4boss5ParamCFv: /* 80233B90 0022F9D0 4B FA 68 0D */ bl loadCheck__Q25param8JITParamCFv /* 80233B94 0022F9D4 80 7F 00 28 */ lwz r3, 0x28(r31) /* 80233B98 0022F9D8 38 63 00 04 */ addi r3, r3, 4 -/* 80233B9C 0022F9DC 4B FD A3 E5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233B9C 0022F9DC 4B FD A3 E5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233BA0 0022F9E0 7C 7F 1B 78 */ mr r31, r3 /* 80233BA4 0022F9E4 80 63 00 AC */ lwz r3, 0xac(r3) /* 80233BA8 0022F9E8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -152,7 +152,7 @@ creditdedede__Q43scn4step4boss5ParamCFv: /* 80233BE8 0022FA28 4B FA 67 B5 */ bl loadCheck__Q25param8JITParamCFv /* 80233BEC 0022FA2C 80 7F 00 38 */ lwz r3, 0x38(r31) /* 80233BF0 0022FA30 38 63 00 04 */ addi r3, r3, 4 -/* 80233BF4 0022FA34 4B FD A3 8D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233BF4 0022FA34 4B FD A3 8D */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233BF8 0022FA38 7C 7F 1B 78 */ mr r31, r3 /* 80233BFC 0022FA3C 80 63 00 3C */ lwz r3, 0x3c(r3) /* 80233C00 0022FA40 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -178,7 +178,7 @@ creditdee__Q43scn4step4boss5ParamCFv: /* 80233C40 0022FA80 4B FA 67 5D */ bl loadCheck__Q25param8JITParamCFv /* 80233C44 0022FA84 80 7F 00 48 */ lwz r3, 0x48(r31) /* 80233C48 0022FA88 38 63 00 04 */ addi r3, r3, 4 -/* 80233C4C 0022FA8C 4B FD A3 35 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233C4C 0022FA8C 4B FD A3 35 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233C50 0022FA90 7C 7F 1B 78 */ mr r31, r3 /* 80233C54 0022FA94 80 63 00 60 */ lwz r3, 0x60(r3) /* 80233C58 0022FA98 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -204,7 +204,7 @@ creditmeta__Q43scn4step4boss5ParamCFv: /* 80233C98 0022FAD8 4B FA 67 05 */ bl loadCheck__Q25param8JITParamCFv /* 80233C9C 0022FADC 80 7F 00 58 */ lwz r3, 0x58(r31) /* 80233CA0 0022FAE0 38 63 00 04 */ addi r3, r3, 4 -/* 80233CA4 0022FAE4 4B FD A2 DD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233CA4 0022FAE4 4B FD A2 DD */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233CA8 0022FAE8 7C 7F 1B 78 */ mr r31, r3 /* 80233CAC 0022FAEC 80 63 00 84 */ lwz r3, 0x84(r3) /* 80233CB0 0022FAF0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -230,7 +230,7 @@ creditroah__Q43scn4step4boss5ParamCFv: /* 80233CF0 0022FB30 4B FA 66 AD */ bl loadCheck__Q25param8JITParamCFv /* 80233CF4 0022FB34 80 7F 00 68 */ lwz r3, 0x68(r31) /* 80233CF8 0022FB38 38 63 00 04 */ addi r3, r3, 4 -/* 80233CFC 0022FB3C 4B FD A2 85 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233CFC 0022FB3C 4B FD A2 85 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233D00 0022FB40 7C 7F 1B 78 */ mr r31, r3 /* 80233D04 0022FB44 80 63 00 5C */ lwz r3, 0x5c(r3) /* 80233D08 0022FB48 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -256,7 +256,7 @@ dubior__Q43scn4step4boss5ParamCFv: /* 80233D48 0022FB88 4B FA 66 55 */ bl loadCheck__Q25param8JITParamCFv /* 80233D4C 0022FB8C 80 7F 00 78 */ lwz r3, 0x78(r31) /* 80233D50 0022FB90 38 63 00 04 */ addi r3, r3, 4 -/* 80233D54 0022FB94 4B FD A2 2D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233D54 0022FB94 4B FD A2 2D */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233D58 0022FB98 7C 7F 1B 78 */ mr r31, r3 /* 80233D5C 0022FB9C 80 63 01 04 */ lwz r3, 0x104(r3) /* 80233D60 0022FBA0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -282,7 +282,7 @@ gigantedge__Q43scn4step4boss5ParamCFv: /* 80233DA0 0022FBE0 4B FA 65 FD */ bl loadCheck__Q25param8JITParamCFv /* 80233DA4 0022FBE4 80 7F 00 88 */ lwz r3, 0x88(r31) /* 80233DA8 0022FBE8 38 63 00 04 */ addi r3, r3, 4 -/* 80233DAC 0022FBEC 4B FD A1 D5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233DAC 0022FBEC 4B FD A1 D5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233DB0 0022FBF0 7C 7F 1B 78 */ mr r31, r3 /* 80233DB4 0022FBF4 80 63 00 DC */ lwz r3, 0xdc(r3) /* 80233DB8 0022FBF8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -308,7 +308,7 @@ kingsdoo__Q43scn4step4boss5ParamCFv: /* 80233DF8 0022FC38 4B FA 65 A5 */ bl loadCheck__Q25param8JITParamCFv /* 80233DFC 0022FC3C 80 7F 00 98 */ lwz r3, 0x98(r31) /* 80233E00 0022FC40 38 63 00 04 */ addi r3, r3, 4 -/* 80233E04 0022FC44 4B FD A1 7D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233E04 0022FC44 4B FD A1 7D */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233E08 0022FC48 7C 7F 1B 78 */ mr r31, r3 /* 80233E0C 0022FC4C 80 63 00 C0 */ lwz r3, 0xc0(r3) /* 80233E10 0022FC50 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -334,7 +334,7 @@ moundeath__Q43scn4step4boss5ParamCFv: /* 80233E50 0022FC90 4B FA 65 4D */ bl loadCheck__Q25param8JITParamCFv /* 80233E54 0022FC94 80 7F 00 A8 */ lwz r3, 0xa8(r31) /* 80233E58 0022FC98 38 63 00 04 */ addi r3, r3, 4 -/* 80233E5C 0022FC9C 4B FD A1 25 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233E5C 0022FC9C 4B FD A1 25 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233E60 0022FCA0 7C 7F 1B 78 */ mr r31, r3 /* 80233E64 0022FCA4 80 63 01 70 */ lwz r3, 0x170(r3) /* 80233E68 0022FCA8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -360,7 +360,7 @@ watergalboros__Q43scn4step4boss5ParamCFv: /* 80233EA8 0022FCE8 4B FA 64 F5 */ bl loadCheck__Q25param8JITParamCFv /* 80233EAC 0022FCEC 80 7F 00 B8 */ lwz r3, 0xb8(r31) /* 80233EB0 0022FCF0 38 63 00 04 */ addi r3, r3, 4 -/* 80233EB4 0022FCF4 4B FD A0 CD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233EB4 0022FCF4 4B FD A0 CD */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233EB8 0022FCF8 7C 7F 1B 78 */ mr r31, r3 /* 80233EBC 0022FCFC 80 63 00 EC */ lwz r3, 0xec(r3) /* 80233EC0 0022FD00 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -386,7 +386,7 @@ whispy__Q43scn4step4boss5ParamCFv: /* 80233F00 0022FD40 4B FA 64 9D */ bl loadCheck__Q25param8JITParamCFv /* 80233F04 0022FD44 80 7F 00 C8 */ lwz r3, 0xc8(r31) /* 80233F08 0022FD48 38 63 00 04 */ addi r3, r3, 4 -/* 80233F0C 0022FD4C 4B FD A0 75 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233F0C 0022FD4C 4B FD A0 75 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233F10 0022FD50 7C 7F 1B 78 */ mr r31, r3 /* 80233F14 0022FD54 80 63 01 B4 */ lwz r3, 0x1b4(r3) /* 80233F18 0022FD58 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -412,7 +412,7 @@ zankibble__Q43scn4step4boss5ParamCFv: /* 80233F58 0022FD98 4B FA 64 45 */ bl loadCheck__Q25param8JITParamCFv /* 80233F5C 0022FD9C 80 7F 00 D8 */ lwz r3, 0xd8(r31) /* 80233F60 0022FDA0 38 63 00 04 */ addi r3, r3, 4 -/* 80233F64 0022FDA4 4B FD A0 1D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80233F64 0022FDA4 4B FD A0 1D */ bl dataHeadAddress__Q25.dataXDataCFv /* 80233F68 0022FDA8 7C 7F 1B 78 */ mr r31, r3 /* 80233F6C 0022FDAC 80 63 00 C8 */ lwz r3, 0xc8(r3) /* 80233F70 0022FDB0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -427,7 +427,7 @@ lbl_80233F80: /* 80233F90 0022FDD0 38 21 00 10 */ addi r1, r1, 0x10 /* 80233F94 0022FDD4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy5ParamFv __ct__Q43scn4step5enemy5ParamFv: /* 8028C248 00288088 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -644,7 +644,7 @@ common__Q43scn4step5enemy5ParamCFv: /* 8028C588 002883C8 4B F4 DE 15 */ bl loadCheck__Q25param8JITParamCFv /* 8028C58C 002883CC 80 7F 00 04 */ lwz r3, 4(r31) /* 8028C590 002883D0 38 63 00 04 */ addi r3, r3, 4 -/* 8028C594 002883D4 4B F8 19 ED */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C594 002883D4 4B F8 19 ED */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C598 002883D8 7C 7F 1B 78 */ mr r31, r3 /* 8028C59C 002883DC 80 63 00 98 */ lwz r3, 0x98(r3) /* 8028C5A0 002883E0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -670,7 +670,7 @@ sirkibble__Q43scn4step5enemy5ParamCFv: /* 8028C5E0 00288420 4B F4 DD BD */ bl loadCheck__Q25param8JITParamCFv /* 8028C5E4 00288424 80 7F 00 14 */ lwz r3, 0x14(r31) /* 8028C5E8 00288428 38 63 00 04 */ addi r3, r3, 4 -/* 8028C5EC 0028842C 4B F8 19 95 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C5EC 0028842C 4B F8 19 95 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C5F0 00288430 7C 7F 1B 78 */ mr r31, r3 /* 8028C5F4 00288434 80 63 00 24 */ lwz r3, 0x24(r3) /* 8028C5F8 00288438 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -696,7 +696,7 @@ brontoburt__Q43scn4step5enemy5ParamCFv: /* 8028C638 00288478 4B F4 DD 65 */ bl loadCheck__Q25param8JITParamCFv /* 8028C63C 0028847C 80 7F 00 24 */ lwz r3, 0x24(r31) /* 8028C640 00288480 38 63 00 04 */ addi r3, r3, 4 -/* 8028C644 00288484 4B F8 19 3D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C644 00288484 4B F8 19 3D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C648 00288488 7C 7F 1B 78 */ mr r31, r3 /* 8028C64C 0028848C 80 63 00 60 */ lwz r3, 0x60(r3) /* 8028C650 00288490 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -722,7 +722,7 @@ waddledee__Q43scn4step5enemy5ParamCFv: /* 8028C690 002884D0 4B F4 DD 0D */ bl loadCheck__Q25param8JITParamCFv /* 8028C694 002884D4 80 7F 00 34 */ lwz r3, 0x34(r31) /* 8028C698 002884D8 38 63 00 04 */ addi r3, r3, 4 -/* 8028C69C 002884DC 4B F8 18 E5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C69C 002884DC 4B F8 18 E5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C6A0 002884E0 7C 7F 1B 78 */ mr r31, r3 /* 8028C6A4 002884E4 80 63 00 84 */ lwz r3, 0x84(r3) /* 8028C6A8 002884E8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -748,7 +748,7 @@ bladeknight__Q43scn4step5enemy5ParamCFv: /* 8028C6E8 00288528 4B F4 DC B5 */ bl loadCheck__Q25param8JITParamCFv /* 8028C6EC 0028852C 80 7F 00 44 */ lwz r3, 0x44(r31) /* 8028C6F0 00288530 38 63 00 04 */ addi r3, r3, 4 -/* 8028C6F4 00288534 4B F8 18 8D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C6F4 00288534 4B F8 18 8D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C6F8 00288538 7C 7F 1B 78 */ mr r31, r3 /* 8028C6FC 0028853C 80 63 00 50 */ lwz r3, 0x50(r3) /* 8028C700 00288540 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -774,7 +774,7 @@ cappy__Q43scn4step5enemy5ParamCFv: /* 8028C740 00288580 4B F4 DC 5D */ bl loadCheck__Q25param8JITParamCFv /* 8028C744 00288584 80 7F 00 54 */ lwz r3, 0x54(r31) /* 8028C748 00288588 38 63 00 04 */ addi r3, r3, 4 -/* 8028C74C 0028858C 4B F8 18 35 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C74C 0028858C 4B F8 18 35 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C750 00288590 7C 7F 1B 78 */ mr r31, r3 /* 8028C754 00288594 80 63 00 38 */ lwz r3, 0x38(r3) /* 8028C758 00288598 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -800,7 +800,7 @@ hothead__Q43scn4step5enemy5ParamCFv: /* 8028C798 002885D8 4B F4 DC 05 */ bl loadCheck__Q25param8JITParamCFv /* 8028C79C 002885DC 80 7F 00 64 */ lwz r3, 0x64(r31) /* 8028C7A0 002885E0 38 63 00 04 */ addi r3, r3, 4 -/* 8028C7A4 002885E4 4B F8 17 DD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C7A4 002885E4 4B F8 17 DD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C7A8 002885E8 7C 7F 1B 78 */ mr r31, r3 /* 8028C7AC 002885EC 80 63 00 24 */ lwz r3, 0x24(r3) /* 8028C7B0 002885F0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -826,7 +826,7 @@ knucklejoe__Q43scn4step5enemy5ParamCFv: /* 8028C7F0 00288630 4B F4 DB AD */ bl loadCheck__Q25param8JITParamCFv /* 8028C7F4 00288634 80 7F 00 74 */ lwz r3, 0x74(r31) /* 8028C7F8 00288638 38 63 00 04 */ addi r3, r3, 4 -/* 8028C7FC 0028863C 4B F8 17 85 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C7FC 0028863C 4B F8 17 85 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C800 00288640 7C 7F 1B 78 */ mr r31, r3 /* 8028C804 00288644 80 63 00 68 */ lwz r3, 0x68(r3) /* 8028C808 00288648 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -852,7 +852,7 @@ como__Q43scn4step5enemy5ParamCFv: /* 8028C848 00288688 4B F4 DB 55 */ bl loadCheck__Q25param8JITParamCFv /* 8028C84C 0028868C 80 7F 00 A4 */ lwz r3, 0xa4(r31) /* 8028C850 00288690 38 63 00 04 */ addi r3, r3, 4 -/* 8028C854 00288694 4B F8 17 2D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C854 00288694 4B F8 17 2D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C858 00288698 7C 7F 1B 78 */ mr r31, r3 /* 8028C85C 0028869C 80 63 00 4C */ lwz r3, 0x4c(r3) /* 8028C860 002886A0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -878,7 +878,7 @@ gordo__Q43scn4step5enemy5ParamCFv: /* 8028C8A0 002886E0 4B F4 DA FD */ bl loadCheck__Q25param8JITParamCFv /* 8028C8A4 002886E4 80 7F 00 B4 */ lwz r3, 0xb4(r31) /* 8028C8A8 002886E8 38 63 00 04 */ addi r3, r3, 4 -/* 8028C8AC 002886EC 4B F8 16 D5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C8AC 002886EC 4B F8 16 D5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C8B0 002886F0 7C 7F 1B 78 */ mr r31, r3 /* 8028C8B4 002886F4 80 63 00 24 */ lwz r3, 0x24(r3) /* 8028C8B8 002886F8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -904,7 +904,7 @@ whippy__Q43scn4step5enemy5ParamCFv: /* 8028C8F8 00288738 4B F4 DA A5 */ bl loadCheck__Q25param8JITParamCFv /* 8028C8FC 0028873C 80 7F 00 C4 */ lwz r3, 0xc4(r31) /* 8028C900 00288740 38 63 00 04 */ addi r3, r3, 4 -/* 8028C904 00288744 4B F8 16 7D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C904 00288744 4B F8 16 7D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C908 00288748 7C 7F 1B 78 */ mr r31, r3 /* 8028C90C 0028874C 80 63 00 10 */ lwz r3, 0x10(r3) /* 8028C910 00288750 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -930,7 +930,7 @@ shotzo__Q43scn4step5enemy5ParamCFv: /* 8028C950 00288790 4B F4 DA 4D */ bl loadCheck__Q25param8JITParamCFv /* 8028C954 00288794 80 7F 00 D4 */ lwz r3, 0xd4(r31) /* 8028C958 00288798 38 63 00 04 */ addi r3, r3, 4 -/* 8028C95C 0028879C 4B F8 16 25 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C95C 0028879C 4B F8 16 25 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C960 002887A0 7C 7F 1B 78 */ mr r31, r3 /* 8028C964 002887A4 80 63 00 10 */ lwz r3, 0x10(r3) /* 8028C968 002887A8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -956,7 +956,7 @@ leafan__Q43scn4step5enemy5ParamCFv: /* 8028C9A8 002887E8 4B F4 D9 F5 */ bl loadCheck__Q25param8JITParamCFv /* 8028C9AC 002887EC 80 7F 00 E4 */ lwz r3, 0xe4(r31) /* 8028C9B0 002887F0 38 63 00 04 */ addi r3, r3, 4 -/* 8028C9B4 002887F4 4B F8 15 CD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028C9B4 002887F4 4B F8 15 CD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028C9B8 002887F8 7C 7F 1B 78 */ mr r31, r3 /* 8028C9BC 002887FC 80 63 00 34 */ lwz r3, 0x34(r3) /* 8028C9C0 00288800 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -982,7 +982,7 @@ waddledoo__Q43scn4step5enemy5ParamCFv: /* 8028CA00 00288840 4B F4 D9 9D */ bl loadCheck__Q25param8JITParamCFv /* 8028CA04 00288844 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 8028CA08 00288848 38 63 00 04 */ addi r3, r3, 4 -/* 8028CA0C 0028884C 4B F8 15 75 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CA0C 0028884C 4B F8 15 75 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CA10 00288850 7C 7F 1B 78 */ mr r31, r3 /* 8028CA14 00288854 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8028CA18 00288858 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1008,7 +1008,7 @@ bouncy__Q43scn4step5enemy5ParamCFv: /* 8028CA58 00288898 4B F4 D9 45 */ bl loadCheck__Q25param8JITParamCFv /* 8028CA5C 0028889C 80 7F 01 04 */ lwz r3, 0x104(r31) /* 8028CA60 002888A0 38 63 00 04 */ addi r3, r3, 4 -/* 8028CA64 002888A4 4B F8 15 1D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CA64 002888A4 4B F8 15 1D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CA68 002888A8 7C 7F 1B 78 */ mr r31, r3 /* 8028CA6C 002888AC 80 63 00 38 */ lwz r3, 0x38(r3) /* 8028CA70 002888B0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1034,7 +1034,7 @@ sparky__Q43scn4step5enemy5ParamCFv: /* 8028CAB0 002888F0 4B F4 D8 ED */ bl loadCheck__Q25param8JITParamCFv /* 8028CAB4 002888F4 80 7F 01 14 */ lwz r3, 0x114(r31) /* 8028CAB8 002888F8 38 63 00 04 */ addi r3, r3, 4 -/* 8028CABC 002888FC 4B F8 14 C5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CABC 002888FC 4B F8 14 C5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CAC0 00288900 7C 7F 1B 78 */ mr r31, r3 /* 8028CAC4 00288904 80 63 00 24 */ lwz r3, 0x24(r3) /* 8028CAC8 00288908 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1060,7 +1060,7 @@ needlous__Q43scn4step5enemy5ParamCFv: /* 8028CB08 00288948 4B F4 D8 95 */ bl loadCheck__Q25param8JITParamCFv /* 8028CB0C 0028894C 80 7F 01 24 */ lwz r3, 0x124(r31) /* 8028CB10 00288950 38 63 00 04 */ addi r3, r3, 4 -/* 8028CB14 00288954 4B F8 14 6D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CB14 00288954 4B F8 14 6D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CB18 00288958 7C 7F 1B 78 */ mr r31, r3 /* 8028CB1C 0028895C 80 63 00 48 */ lwz r3, 0x48(r3) /* 8028CB20 00288960 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1086,7 +1086,7 @@ broomhatter__Q43scn4step5enemy5ParamCFv: /* 8028CB60 002889A0 4B F4 D8 3D */ bl loadCheck__Q25param8JITParamCFv /* 8028CB64 002889A4 80 7F 01 34 */ lwz r3, 0x134(r31) /* 8028CB68 002889A8 38 63 00 04 */ addi r3, r3, 4 -/* 8028CB6C 002889AC 4B F8 14 15 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CB6C 002889AC 4B F8 14 15 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CB70 002889B0 7C 7F 1B 78 */ mr r31, r3 /* 8028CB74 002889B4 80 63 00 48 */ lwz r3, 0x48(r3) /* 8028CB78 002889B8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1112,7 +1112,7 @@ scarfy__Q43scn4step5enemy5ParamCFv: /* 8028CBB8 002889F8 4B F4 D7 E5 */ bl loadCheck__Q25param8JITParamCFv /* 8028CBBC 002889FC 80 7F 01 44 */ lwz r3, 0x144(r31) /* 8028CBC0 00288A00 38 63 00 04 */ addi r3, r3, 4 -/* 8028CBC4 00288A04 4B F8 13 BD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CBC4 00288A04 4B F8 13 BD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CBC8 00288A08 7C 7F 1B 78 */ mr r31, r3 /* 8028CBCC 00288A0C 80 63 00 C8 */ lwz r3, 0xc8(r3) /* 8028CBD0 00288A10 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1138,7 +1138,7 @@ nruff__Q43scn4step5enemy5ParamCFv: /* 8028CC10 00288A50 4B F4 D7 8D */ bl loadCheck__Q25param8JITParamCFv /* 8028CC14 00288A54 80 7F 01 54 */ lwz r3, 0x154(r31) /* 8028CC18 00288A58 38 63 00 04 */ addi r3, r3, 4 -/* 8028CC1C 00288A5C 4B F8 13 65 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CC1C 00288A5C 4B F8 13 65 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CC20 00288A60 7C 7F 1B 78 */ mr r31, r3 /* 8028CC24 00288A64 80 63 00 9C */ lwz r3, 0x9c(r3) /* 8028CC28 00288A68 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1164,7 +1164,7 @@ flamer__Q43scn4step5enemy5ParamCFv: /* 8028CC68 00288AA8 4B F4 D7 35 */ bl loadCheck__Q25param8JITParamCFv /* 8028CC6C 00288AAC 80 7F 01 64 */ lwz r3, 0x164(r31) /* 8028CC70 00288AB0 38 63 00 04 */ addi r3, r3, 4 -/* 8028CC74 00288AB4 4B F8 13 0D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CC74 00288AB4 4B F8 13 0D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CC78 00288AB8 7C 7F 1B 78 */ mr r31, r3 /* 8028CC7C 00288ABC 80 63 00 88 */ lwz r3, 0x88(r3) /* 8028CC80 00288AC0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1190,7 +1190,7 @@ watergalbo__Q43scn4step5enemy5ParamCFv: /* 8028CCC0 00288B00 4B F4 D6 DD */ bl loadCheck__Q25param8JITParamCFv /* 8028CCC4 00288B04 80 7F 01 74 */ lwz r3, 0x174(r31) /* 8028CCC8 00288B08 38 63 00 04 */ addi r3, r3, 4 -/* 8028CCCC 00288B0C 4B F8 12 B5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CCCC 00288B0C 4B F8 12 B5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CCD0 00288B10 7C 7F 1B 78 */ mr r31, r3 /* 8028CCD4 00288B14 80 63 00 18 */ lwz r3, 0x18(r3) /* 8028CCD8 00288B18 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1216,7 +1216,7 @@ rocky__Q43scn4step5enemy5ParamCFv: /* 8028CD18 00288B58 4B F4 D6 85 */ bl loadCheck__Q25param8JITParamCFv /* 8028CD1C 00288B5C 80 7F 01 84 */ lwz r3, 0x184(r31) /* 8028CD20 00288B60 38 63 00 04 */ addi r3, r3, 4 -/* 8028CD24 00288B64 4B F8 12 5D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CD24 00288B64 4B F8 12 5D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CD28 00288B68 7C 7F 1B 78 */ mr r31, r3 /* 8028CD2C 00288B6C 80 63 00 C4 */ lwz r3, 0xc4(r3) /* 8028CD30 00288B70 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1242,7 +1242,7 @@ poppybrojr__Q43scn4step5enemy5ParamCFv: /* 8028CD70 00288BB0 4B F4 D6 2D */ bl loadCheck__Q25param8JITParamCFv /* 8028CD74 00288BB4 80 7F 01 94 */ lwz r3, 0x194(r31) /* 8028CD78 00288BB8 38 63 00 04 */ addi r3, r3, 4 -/* 8028CD7C 00288BBC 4B F8 12 05 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CD7C 00288BBC 4B F8 12 05 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CD80 00288BC0 7C 7F 1B 78 */ mr r31, r3 /* 8028CD84 00288BC4 80 63 00 28 */ lwz r3, 0x28(r3) /* 8028CD88 00288BC8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1268,7 +1268,7 @@ noddy__Q43scn4step5enemy5ParamCFv: /* 8028CDC8 00288C08 4B F4 D5 D5 */ bl loadCheck__Q25param8JITParamCFv /* 8028CDCC 00288C0C 80 7F 01 A4 */ lwz r3, 0x1a4(r31) /* 8028CDD0 00288C10 38 63 00 04 */ addi r3, r3, 4 -/* 8028CDD4 00288C14 4B F8 11 AD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CDD4 00288C14 4B F8 11 AD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CDD8 00288C18 7C 7F 1B 78 */ mr r31, r3 /* 8028CDDC 00288C1C 80 63 00 0C */ lwz r3, 0xc(r3) /* 8028CDE0 00288C20 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1294,7 +1294,7 @@ cerulean__Q43scn4step5enemy5ParamCFv: /* 8028CE20 00288C60 4B F4 D5 7D */ bl loadCheck__Q25param8JITParamCFv /* 8028CE24 00288C64 80 7F 01 B4 */ lwz r3, 0x1b4(r31) /* 8028CE28 00288C68 38 63 00 04 */ addi r3, r3, 4 -/* 8028CE2C 00288C6C 4B F8 11 55 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CE2C 00288C6C 4B F8 11 55 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CE30 00288C70 7C 7F 1B 78 */ mr r31, r3 /* 8028CE34 00288C74 80 63 00 48 */ lwz r3, 0x48(r3) /* 8028CE38 00288C78 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1320,7 +1320,7 @@ blipper__Q43scn4step5enemy5ParamCFv: /* 8028CE78 00288CB8 4B F4 D5 25 */ bl loadCheck__Q25param8JITParamCFv /* 8028CE7C 00288CBC 80 7F 01 C4 */ lwz r3, 0x1c4(r31) /* 8028CE80 00288CC0 38 63 00 04 */ addi r3, r3, 4 -/* 8028CE84 00288CC4 4B F8 10 FD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CE84 00288CC4 4B F8 10 FD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CE88 00288CC8 7C 7F 1B 78 */ mr r31, r3 /* 8028CE8C 00288CCC 80 63 00 64 */ lwz r3, 0x64(r3) /* 8028CE90 00288CD0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1346,7 +1346,7 @@ gigatzo__Q43scn4step5enemy5ParamCFv: /* 8028CED0 00288D10 4B F4 D4 CD */ bl loadCheck__Q25param8JITParamCFv /* 8028CED4 00288D14 80 7F 01 D4 */ lwz r3, 0x1d4(r31) /* 8028CED8 00288D18 38 63 00 04 */ addi r3, r3, 4 -/* 8028CEDC 00288D1C 4B F8 10 A5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CEDC 00288D1C 4B F8 10 A5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CEE0 00288D20 7C 7F 1B 78 */ mr r31, r3 /* 8028CEE4 00288D24 80 63 00 84 */ lwz r3, 0x84(r3) /* 8028CEE8 00288D28 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1372,7 +1372,7 @@ sisterbound__Q43scn4step5enemy5ParamCFv: /* 8028CF28 00288D68 4B F4 D4 75 */ bl loadCheck__Q25param8JITParamCFv /* 8028CF2C 00288D6C 80 7F 01 E4 */ lwz r3, 0x1e4(r31) /* 8028CF30 00288D70 38 63 00 04 */ addi r3, r3, 4 -/* 8028CF34 00288D74 4B F8 10 4D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CF34 00288D74 4B F8 10 4D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CF38 00288D78 7C 7F 1B 78 */ mr r31, r3 /* 8028CF3C 00288D7C 80 63 00 48 */ lwz r3, 0x48(r3) /* 8028CF40 00288D80 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1398,7 +1398,7 @@ rollball__Q43scn4step5enemy5ParamCFv: /* 8028CF80 00288DC0 4B F4 D4 1D */ bl loadCheck__Q25param8JITParamCFv /* 8028CF84 00288DC4 80 7F 01 F4 */ lwz r3, 0x1f4(r31) /* 8028CF88 00288DC8 38 63 00 04 */ addi r3, r3, 4 -/* 8028CF8C 00288DCC 4B F8 0F F5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CF8C 00288DCC 4B F8 0F F5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CF90 00288DD0 7C 7F 1B 78 */ mr r31, r3 /* 8028CF94 00288DD4 80 63 00 70 */ lwz r3, 0x70(r3) /* 8028CF98 00288DD8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1424,7 +1424,7 @@ mumbies__Q43scn4step5enemy5ParamCFv: /* 8028CFD8 00288E18 4B F4 D3 C5 */ bl loadCheck__Q25param8JITParamCFv /* 8028CFDC 00288E1C 80 7F 02 04 */ lwz r3, 0x204(r31) /* 8028CFE0 00288E20 38 63 00 04 */ addi r3, r3, 4 -/* 8028CFE4 00288E24 4B F8 0F 9D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028CFE4 00288E24 4B F8 0F 9D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028CFE8 00288E28 7C 7F 1B 78 */ mr r31, r3 /* 8028CFEC 00288E2C 80 63 00 20 */ lwz r3, 0x20(r3) /* 8028CFF0 00288E30 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1450,7 +1450,7 @@ parasoldee__Q43scn4step5enemy5ParamCFv: /* 8028D030 00288E70 4B F4 D3 6D */ bl loadCheck__Q25param8JITParamCFv /* 8028D034 00288E74 80 7F 02 14 */ lwz r3, 0x214(r31) /* 8028D038 00288E78 38 63 00 04 */ addi r3, r3, 4 -/* 8028D03C 00288E7C 4B F8 0F 45 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D03C 00288E7C 4B F8 0F 45 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D040 00288E80 7C 7F 1B 78 */ mr r31, r3 /* 8028D044 00288E84 80 63 00 7C */ lwz r3, 0x7c(r3) /* 8028D048 00288E88 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1476,7 +1476,7 @@ kabu__Q43scn4step5enemy5ParamCFv: /* 8028D088 00288EC8 4B F4 D3 15 */ bl loadCheck__Q25param8JITParamCFv /* 8028D08C 00288ECC 80 7F 02 24 */ lwz r3, 0x224(r31) /* 8028D090 00288ED0 38 63 00 04 */ addi r3, r3, 4 -/* 8028D094 00288ED4 4B F8 0E ED */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D094 00288ED4 4B F8 0E ED */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D098 00288ED8 7C 7F 1B 78 */ mr r31, r3 /* 8028D09C 00288EDC 80 63 00 B8 */ lwz r3, 0xb8(r3) /* 8028D0A0 00288EE0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1502,7 +1502,7 @@ parasoldoo__Q43scn4step5enemy5ParamCFv: /* 8028D0E0 00288F20 4B F4 D2 BD */ bl loadCheck__Q25param8JITParamCFv /* 8028D0E4 00288F24 80 7F 02 34 */ lwz r3, 0x234(r31) /* 8028D0E8 00288F28 38 63 00 04 */ addi r3, r3, 4 -/* 8028D0EC 00288F2C 4B F8 0E 95 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D0EC 00288F2C 4B F8 0E 95 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D0F0 00288F30 7C 7F 1B 78 */ mr r31, r3 /* 8028D0F4 00288F34 80 63 00 6C */ lwz r3, 0x6c(r3) /* 8028D0F8 00288F38 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1528,7 +1528,7 @@ foley__Q43scn4step5enemy5ParamCFv: /* 8028D138 00288F78 4B F4 D2 65 */ bl loadCheck__Q25param8JITParamCFv /* 8028D13C 00288F7C 80 7F 02 44 */ lwz r3, 0x244(r31) /* 8028D140 00288F80 38 63 00 04 */ addi r3, r3, 4 -/* 8028D144 00288F84 4B F8 0E 3D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D144 00288F84 4B F8 0E 3D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D148 00288F88 7C 7F 1B 78 */ mr r31, r3 /* 8028D14C 00288F8C 80 63 00 5C */ lwz r3, 0x5c(r3) /* 8028D150 00288F90 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1554,7 +1554,7 @@ juckle__Q43scn4step5enemy5ParamCFv: /* 8028D190 00288FD0 4B F4 D2 0D */ bl loadCheck__Q25param8JITParamCFv /* 8028D194 00288FD4 80 7F 02 54 */ lwz r3, 0x254(r31) /* 8028D198 00288FD8 38 63 00 04 */ addi r3, r3, 4 -/* 8028D19C 00288FDC 4B F8 0D E5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D19C 00288FDC 4B F8 0D E5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D1A0 00288FE0 7C 7F 1B 78 */ mr r31, r3 /* 8028D1A4 00288FE4 80 63 00 54 */ lwz r3, 0x54(r3) /* 8028D1A8 00288FE8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1580,7 +1580,7 @@ bowby__Q43scn4step5enemy5ParamCFv: /* 8028D1E8 00289028 4B F4 D1 B5 */ bl loadCheck__Q25param8JITParamCFv /* 8028D1EC 0028902C 80 7F 02 64 */ lwz r3, 0x264(r31) /* 8028D1F0 00289030 38 63 00 04 */ addi r3, r3, 4 -/* 8028D1F4 00289034 4B F8 0D 8D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D1F4 00289034 4B F8 0D 8D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D1F8 00289038 7C 7F 1B 78 */ mr r31, r3 /* 8028D1FC 0028903C 80 63 00 18 */ lwz r3, 0x18(r3) /* 8028D200 00289040 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1606,7 +1606,7 @@ owgulf__Q43scn4step5enemy5ParamCFv: /* 8028D240 00289080 4B F4 D1 5D */ bl loadCheck__Q25param8JITParamCFv /* 8028D244 00289084 80 7F 02 74 */ lwz r3, 0x274(r31) /* 8028D248 00289088 38 63 00 04 */ addi r3, r3, 4 -/* 8028D24C 0028908C 4B F8 0D 35 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D24C 0028908C 4B F8 0D 35 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D250 00289090 7C 7F 1B 78 */ mr r31, r3 /* 8028D254 00289094 80 63 00 28 */ lwz r3, 0x28(r3) /* 8028D258 00289098 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1632,7 +1632,7 @@ degout__Q43scn4step5enemy5ParamCFv: /* 8028D298 002890D8 4B F4 D1 05 */ bl loadCheck__Q25param8JITParamCFv /* 8028D29C 002890DC 80 7F 02 84 */ lwz r3, 0x284(r31) /* 8028D2A0 002890E0 38 63 00 04 */ addi r3, r3, 4 -/* 8028D2A4 002890E4 4B F8 0C DD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D2A4 002890E4 4B F8 0C DD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D2A8 002890E8 7C 7F 1B 78 */ mr r31, r3 /* 8028D2AC 002890EC 80 63 00 5C */ lwz r3, 0x5c(r3) /* 8028D2B0 002890F0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1658,7 +1658,7 @@ sheld__Q43scn4step5enemy5ParamCFv: /* 8028D2F0 00289130 4B F4 D0 AD */ bl loadCheck__Q25param8JITParamCFv /* 8028D2F4 00289134 80 7F 02 94 */ lwz r3, 0x294(r31) /* 8028D2F8 00289138 38 63 00 04 */ addi r3, r3, 4 -/* 8028D2FC 0028913C 4B F8 0C 85 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D2FC 0028913C 4B F8 0C 85 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D300 00289140 7C 7F 1B 78 */ mr r31, r3 /* 8028D304 00289144 80 63 00 88 */ lwz r3, 0x88(r3) /* 8028D308 00289148 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1684,7 +1684,7 @@ lanzer__Q43scn4step5enemy5ParamCFv: /* 8028D348 00289188 4B F4 D0 55 */ bl loadCheck__Q25param8JITParamCFv /* 8028D34C 0028918C 80 7F 02 A4 */ lwz r3, 0x2a4(r31) /* 8028D350 00289190 38 63 00 04 */ addi r3, r3, 4 -/* 8028D354 00289194 4B F8 0C 2D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D354 00289194 4B F8 0C 2D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D358 00289198 7C 7F 1B 78 */ mr r31, r3 /* 8028D35C 0028919C 80 63 00 18 */ lwz r3, 0x18(r3) /* 8028D360 002891A0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1710,7 +1710,7 @@ chilly__Q43scn4step5enemy5ParamCFv: /* 8028D3A0 002891E0 4B F4 CF FD */ bl loadCheck__Q25param8JITParamCFv /* 8028D3A4 002891E4 80 7F 02 B4 */ lwz r3, 0x2b4(r31) /* 8028D3A8 002891E8 38 63 00 04 */ addi r3, r3, 4 -/* 8028D3AC 002891EC 4B F8 0B D5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D3AC 002891EC 4B F8 0B D5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D3B0 002891F0 7C 7F 1B 78 */ mr r31, r3 /* 8028D3B4 002891F4 80 63 00 2C */ lwz r3, 0x2c(r3) /* 8028D3B8 002891F8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1736,7 +1736,7 @@ tsukikage__Q43scn4step5enemy5ParamCFv: /* 8028D3F8 00289238 4B F4 CF A5 */ bl loadCheck__Q25param8JITParamCFv /* 8028D3FC 0028923C 80 7F 02 C4 */ lwz r3, 0x2c4(r31) /* 8028D400 00289240 38 63 00 04 */ addi r3, r3, 4 -/* 8028D404 00289244 4B F8 0B 7D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D404 00289244 4B F8 0B 7D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D408 00289248 7C 7F 1B 78 */ mr r31, r3 /* 8028D40C 0028924C 80 63 00 90 */ lwz r3, 0x90(r3) /* 8028D410 00289250 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1762,7 +1762,7 @@ gemra__Q43scn4step5enemy5ParamCFv: /* 8028D450 00289290 4B F4 CF 4D */ bl loadCheck__Q25param8JITParamCFv /* 8028D454 00289294 80 7F 02 D4 */ lwz r3, 0x2d4(r31) /* 8028D458 00289298 38 63 00 04 */ addi r3, r3, 4 -/* 8028D45C 0028929C 4B F8 0B 25 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D45C 0028929C 4B F8 0B 25 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D460 002892A0 7C 7F 1B 78 */ mr r31, r3 /* 8028D464 002892A4 80 63 00 30 */ lwz r3, 0x30(r3) /* 8028D468 002892A8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1788,7 +1788,7 @@ sodory__Q43scn4step5enemy5ParamCFv: /* 8028D4A8 002892E8 4B F4 CE F5 */ bl loadCheck__Q25param8JITParamCFv /* 8028D4AC 002892EC 80 7F 02 E4 */ lwz r3, 0x2e4(r31) /* 8028D4B0 002892F0 38 63 00 04 */ addi r3, r3, 4 -/* 8028D4B4 002892F4 4B F8 0A CD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D4B4 002892F4 4B F8 0A CD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D4B8 002892F8 7C 7F 1B 78 */ mr r31, r3 /* 8028D4BC 002892FC 80 63 00 48 */ lwz r3, 0x48(r3) /* 8028D4C0 00289300 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1814,7 +1814,7 @@ searches__Q43scn4step5enemy5ParamCFv: /* 8028D500 00289340 4B F4 CE 9D */ bl loadCheck__Q25param8JITParamCFv /* 8028D504 00289344 80 7F 02 F4 */ lwz r3, 0x2f4(r31) /* 8028D508 00289348 38 63 00 04 */ addi r3, r3, 4 -/* 8028D50C 0028934C 4B F8 0A 75 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D50C 0028934C 4B F8 0A 75 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D510 00289350 7C 7F 1B 78 */ mr r31, r3 /* 8028D514 00289354 80 63 00 18 */ lwz r3, 0x18(r3) /* 8028D518 00289358 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1840,7 +1840,7 @@ pierce__Q43scn4step5enemy5ParamCFv: /* 8028D558 00289398 4B F4 CE 45 */ bl loadCheck__Q25param8JITParamCFv /* 8028D55C 0028939C 80 7F 03 04 */ lwz r3, 0x304(r31) /* 8028D560 002893A0 38 63 00 04 */ addi r3, r3, 4 -/* 8028D564 002893A4 4B F8 0A 1D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D564 002893A4 4B F8 0A 1D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D568 002893A8 7C 7F 1B 78 */ mr r31, r3 /* 8028D56C 002893AC 80 63 00 4C */ lwz r3, 0x4c(r3) /* 8028D570 002893B0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1866,7 +1866,7 @@ elec__Q43scn4step5enemy5ParamCFv: /* 8028D5B0 002893F0 4B F4 CD ED */ bl loadCheck__Q25param8JITParamCFv /* 8028D5B4 002893F4 80 7F 03 14 */ lwz r3, 0x314(r31) /* 8028D5B8 002893F8 38 63 00 04 */ addi r3, r3, 4 -/* 8028D5BC 002893FC 4B F8 09 C5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D5BC 002893FC 4B F8 09 C5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D5C0 00289400 7C 7F 1B 78 */ mr r31, r3 /* 8028D5C4 00289404 80 63 00 64 */ lwz r3, 0x64(r3) /* 8028D5C8 00289408 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1892,7 +1892,7 @@ snowl__Q43scn4step5enemy5ParamCFv: /* 8028D608 00289448 4B F4 CD 95 */ bl loadCheck__Q25param8JITParamCFv /* 8028D60C 0028944C 80 7F 03 24 */ lwz r3, 0x324(r31) /* 8028D610 00289450 38 63 00 04 */ addi r3, r3, 4 -/* 8028D614 00289454 4B F8 09 6D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D614 00289454 4B F8 09 6D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D618 00289458 7C 7F 1B 78 */ mr r31, r3 /* 8028D61C 0028945C 80 63 00 24 */ lwz r3, 0x24(r3) /* 8028D620 00289460 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1918,7 +1918,7 @@ sun__Q43scn4step5enemy5ParamCFv: /* 8028D660 002894A0 4B F4 CD 3D */ bl loadCheck__Q25param8JITParamCFv /* 8028D664 002894A4 80 7F 03 34 */ lwz r3, 0x334(r31) /* 8028D668 002894A8 38 63 00 04 */ addi r3, r3, 4 -/* 8028D66C 002894AC 4B F8 09 15 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D66C 002894AC 4B F8 09 15 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D670 002894B0 7C 7F 1B 78 */ mr r31, r3 /* 8028D674 002894B4 80 63 00 50 */ lwz r3, 0x50(r3) /* 8028D678 002894B8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1944,7 +1944,7 @@ sandbag__Q43scn4step5enemy5ParamCFv: /* 8028D6B8 002894F8 4B F4 CC E5 */ bl loadCheck__Q25param8JITParamCFv /* 8028D6BC 002894FC 80 7F 03 44 */ lwz r3, 0x344(r31) /* 8028D6C0 00289500 38 63 00 04 */ addi r3, r3, 4 -/* 8028D6C4 00289504 4B F8 08 BD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D6C4 00289504 4B F8 08 BD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D6C8 00289508 7C 7F 1B 78 */ mr r31, r3 /* 8028D6CC 0028950C 80 63 00 0C */ lwz r3, 0xc(r3) /* 8028D6D0 00289510 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1970,7 +1970,7 @@ stareffect__Q43scn4step5enemy5ParamCFv: /* 8028D710 00289550 4B F4 CC 8D */ bl loadCheck__Q25param8JITParamCFv /* 8028D714 00289554 80 7F 03 54 */ lwz r3, 0x354(r31) /* 8028D718 00289558 38 63 00 04 */ addi r3, r3, 4 -/* 8028D71C 0028955C 4B F8 08 65 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D71C 0028955C 4B F8 08 65 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D720 00289560 7C 7F 1B 78 */ mr r31, r3 /* 8028D724 00289564 80 63 00 40 */ lwz r3, 0x40(r3) /* 8028D728 00289568 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -1996,7 +1996,7 @@ whispyapple__Q43scn4step5enemy5ParamCFv: /* 8028D768 002895A8 4B F4 CC 35 */ bl loadCheck__Q25param8JITParamCFv /* 8028D76C 002895AC 80 7F 03 74 */ lwz r3, 0x374(r31) /* 8028D770 002895B0 38 63 00 04 */ addi r3, r3, 4 -/* 8028D774 002895B4 4B F8 08 0D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D774 002895B4 4B F8 08 0D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D778 002895B8 7C 7F 1B 78 */ mr r31, r3 /* 8028D77C 002895BC 80 63 00 88 */ lwz r3, 0x88(r3) /* 8028D780 002895C0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -2022,7 +2022,7 @@ parasol__Q43scn4step5enemy5ParamCFv: /* 8028D7C0 00289600 4B F4 CB DD */ bl loadCheck__Q25param8JITParamCFv /* 8028D7C4 00289604 80 7F 03 84 */ lwz r3, 0x384(r31) /* 8028D7C8 00289608 38 63 00 04 */ addi r3, r3, 4 -/* 8028D7CC 0028960C 4B F8 07 B5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D7CC 0028960C 4B F8 07 B5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D7D0 00289610 7C 7F 1B 78 */ mr r31, r3 /* 8028D7D4 00289614 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8028D7D8 00289618 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -2048,7 +2048,7 @@ dubiorjr__Q43scn4step5enemy5ParamCFv: /* 8028D818 00289658 4B F4 CB 85 */ bl loadCheck__Q25param8JITParamCFv /* 8028D81C 0028965C 80 7F 03 94 */ lwz r3, 0x394(r31) /* 8028D820 00289660 38 63 00 04 */ addi r3, r3, 4 -/* 8028D824 00289664 4B F8 07 5D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D824 00289664 4B F8 07 5D */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D828 00289668 7C 7F 1B 78 */ mr r31, r3 /* 8028D82C 0028966C 80 63 00 1C */ lwz r3, 0x1c(r3) /* 8028D830 00289670 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -2074,7 +2074,7 @@ poppybrojrbomb__Q43scn4step5enemy5ParamCFv: /* 8028D870 002896B0 4B F4 CB 2D */ bl loadCheck__Q25param8JITParamCFv /* 8028D874 002896B4 80 7F 03 A4 */ lwz r3, 0x3a4(r31) /* 8028D878 002896B8 38 63 00 04 */ addi r3, r3, 4 -/* 8028D87C 002896BC 4B F8 07 05 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D87C 002896BC 4B F8 07 05 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D880 002896C0 7C 7F 1B 78 */ mr r31, r3 /* 8028D884 002896C4 80 63 00 10 */ lwz r3, 0x10(r3) /* 8028D888 002896C8 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -2100,7 +2100,7 @@ zankibblecutter__Q43scn4step5enemy5ParamCFv: /* 8028D8C8 00289708 4B F4 CA D5 */ bl loadCheck__Q25param8JITParamCFv /* 8028D8CC 0028970C 80 7F 03 B4 */ lwz r3, 0x3b4(r31) /* 8028D8D0 00289710 38 63 00 04 */ addi r3, r3, 4 -/* 8028D8D4 00289714 4B F8 06 AD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D8D4 00289714 4B F8 06 AD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D8D8 00289718 7C 7F 1B 78 */ mr r31, r3 /* 8028D8DC 0028971C 80 63 00 74 */ lwz r3, 0x74(r3) /* 8028D8E0 00289720 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -2126,7 +2126,7 @@ bonkersbomb__Q43scn4step5enemy5ParamCFv: /* 8028D920 00289760 4B F4 CA 7D */ bl loadCheck__Q25param8JITParamCFv /* 8028D924 00289764 80 7F 03 C4 */ lwz r3, 0x3c4(r31) /* 8028D928 00289768 38 63 00 04 */ addi r3, r3, 4 -/* 8028D92C 0028976C 4B F8 06 55 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D92C 0028976C 4B F8 06 55 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D930 00289770 7C 7F 1B 78 */ mr r31, r3 /* 8028D934 00289774 80 63 00 60 */ lwz r3, 0x60(r3) /* 8028D938 00289778 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -2152,7 +2152,7 @@ dubiorspark__Q43scn4step5enemy5ParamCFv: /* 8028D978 002897B8 4B F4 CA 25 */ bl loadCheck__Q25param8JITParamCFv /* 8028D97C 002897BC 80 7F 03 D4 */ lwz r3, 0x3d4(r31) /* 8028D980 002897C0 38 63 00 04 */ addi r3, r3, 4 -/* 8028D984 002897C4 4B F8 05 FD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D984 002897C4 4B F8 05 FD */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D988 002897C8 7C 7F 1B 78 */ mr r31, r3 /* 8028D98C 002897CC 80 63 00 04 */ lwz r3, 4(r3) /* 8028D990 002897D0 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -2178,7 +2178,7 @@ mbossdead__Q43scn4step5enemy5ParamCFv: /* 8028D9D0 00289810 4B F4 C9 CD */ bl loadCheck__Q25param8JITParamCFv /* 8028D9D4 00289814 80 7F 03 E4 */ lwz r3, 0x3e4(r31) /* 8028D9D8 00289818 38 63 00 04 */ addi r3, r3, 4 -/* 8028D9DC 0028981C 4B F8 05 A5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8028D9DC 0028981C 4B F8 05 A5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 8028D9E0 00289820 7C 7F 1B 78 */ mr r31, r3 /* 8028D9E4 00289824 80 63 00 34 */ lwz r3, 0x34(r3) /* 8028D9E8 00289828 3C 03 FF 44 */ addis r0, r3, 0xff44 @@ -2193,7 +2193,7 @@ lbl_8028D9F8: /* 8028DA08 00289848 38 21 00 10 */ addi r1, r1, 0x10 /* 8028DA0C 0028984C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero5ParamFv __ct__Q43scn4step4hero5ParamFv: /* 80350DA4 0034CBE4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2319,7 +2319,7 @@ get$$0Q53scn4step4hero6common5Param$$1__Q43scn4step4hero5ParamCFRCQ25param8JITPa /* 80350F74 0034CDB4 4B E8 94 29 */ bl loadCheck__Q25param8JITParamCFv /* 80350F78 0034CDB8 80 7F 00 04 */ lwz r3, 4(r31) /* 80350F7C 0034CDBC 38 63 00 04 */ addi r3, r3, 4 -/* 80350F80 0034CDC0 4B EB D0 01 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80350F80 0034CDC0 4B EB D0 01 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80350F84 0034CDC4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80350F88 0034CDC8 80 01 00 14 */ lwz r0, 0x14(r1) /* 80350F8C 0034CDCC 7C 08 03 A6 */ mtlr r0 @@ -2420,7 +2420,7 @@ interference__Q43scn4step4hero5ParamCFv: /* 803510A0 0034CEE0 4B E8 92 FD */ bl loadCheck__Q25param8JITParamCFv /* 803510A4 0034CEE4 80 7F 00 54 */ lwz r3, 0x54(r31) /* 803510A8 0034CEE8 38 63 00 04 */ addi r3, r3, 4 -/* 803510AC 0034CEEC 4B EB CE D5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803510AC 0034CEEC 4B EB CE D5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803510B0 0034CEF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803510B4 0034CEF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803510B8 0034CEF8 7C 08 03 A6 */ mtlr r0 @@ -2438,7 +2438,7 @@ sword__Q43scn4step4hero5ParamCFv: /* 803510DC 0034CF1C 4B E8 92 C1 */ bl loadCheck__Q25param8JITParamCFv /* 803510E0 0034CF20 80 7F 00 64 */ lwz r3, 0x64(r31) /* 803510E4 0034CF24 38 63 00 04 */ addi r3, r3, 4 -/* 803510E8 0034CF28 4B EB CE 99 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803510E8 0034CF28 4B EB CE 99 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803510EC 0034CF2C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803510F0 0034CF30 80 01 00 14 */ lwz r0, 0x14(r1) /* 803510F4 0034CF34 7C 08 03 A6 */ mtlr r0 @@ -2456,7 +2456,7 @@ cutter__Q43scn4step4hero5ParamCFv: /* 80351118 0034CF58 4B E8 92 85 */ bl loadCheck__Q25param8JITParamCFv /* 8035111C 0034CF5C 80 7F 00 74 */ lwz r3, 0x74(r31) /* 80351120 0034CF60 38 63 00 04 */ addi r3, r3, 4 -/* 80351124 0034CF64 4B EB CE 5D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80351124 0034CF64 4B EB CE 5D */ bl dataHeadAddress__Q25.dataXDataCFv /* 80351128 0034CF68 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8035112C 0034CF6C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80351130 0034CF70 7C 08 03 A6 */ mtlr r0 @@ -2474,7 +2474,7 @@ whip__Q43scn4step4hero5ParamCFv: /* 80351154 0034CF94 4B E8 92 49 */ bl loadCheck__Q25param8JITParamCFv /* 80351158 0034CF98 80 7F 00 84 */ lwz r3, 0x84(r31) /* 8035115C 0034CF9C 38 63 00 04 */ addi r3, r3, 4 -/* 80351160 0034CFA0 4B EB CE 21 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80351160 0034CFA0 4B EB CE 21 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80351164 0034CFA4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80351168 0034CFA8 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035116C 0034CFAC 7C 08 03 A6 */ mtlr r0 @@ -2492,7 +2492,7 @@ spark__Q43scn4step4hero5ParamCFv: /* 80351190 0034CFD0 4B E8 92 0D */ bl loadCheck__Q25param8JITParamCFv /* 80351194 0034CFD4 80 7F 00 A4 */ lwz r3, 0xa4(r31) /* 80351198 0034CFD8 38 63 00 04 */ addi r3, r3, 4 -/* 8035119C 0034CFDC 4B EB CD E5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8035119C 0034CFDC 4B EB CD E5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803511A0 0034CFE0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803511A4 0034CFE4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803511A8 0034CFE8 7C 08 03 A6 */ mtlr r0 @@ -2510,7 +2510,7 @@ stone__Q43scn4step4hero5ParamCFv: /* 803511CC 0034D00C 4B E8 91 D1 */ bl loadCheck__Q25param8JITParamCFv /* 803511D0 0034D010 80 7F 00 B4 */ lwz r3, 0xb4(r31) /* 803511D4 0034D014 38 63 00 04 */ addi r3, r3, 4 -/* 803511D8 0034D018 4B EB CD A9 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803511D8 0034D018 4B EB CD A9 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803511DC 0034D01C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803511E0 0034D020 80 01 00 14 */ lwz r0, 0x14(r1) /* 803511E4 0034D024 7C 08 03 A6 */ mtlr r0 @@ -2528,7 +2528,7 @@ parasol__Q43scn4step4hero5ParamCFv: /* 80351208 0034D048 4B E8 91 95 */ bl loadCheck__Q25param8JITParamCFv /* 8035120C 0034D04C 80 7F 00 C4 */ lwz r3, 0xc4(r31) /* 80351210 0034D050 38 63 00 04 */ addi r3, r3, 4 -/* 80351214 0034D054 4B EB CD 6D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80351214 0034D054 4B EB CD 6D */ bl dataHeadAddress__Q25.dataXDataCFv /* 80351218 0034D058 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8035121C 0034D05C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80351220 0034D060 7C 08 03 A6 */ mtlr r0 @@ -2546,7 +2546,7 @@ hammer__Q43scn4step4hero5ParamCFv: /* 80351244 0034D084 4B E8 91 59 */ bl loadCheck__Q25param8JITParamCFv /* 80351248 0034D088 80 7F 00 D4 */ lwz r3, 0xd4(r31) /* 8035124C 0034D08C 38 63 00 04 */ addi r3, r3, 4 -/* 80351250 0034D090 4B EB CD 31 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80351250 0034D090 4B EB CD 31 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80351254 0034D094 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80351258 0034D098 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035125C 0034D09C 7C 08 03 A6 */ mtlr r0 @@ -2564,7 +2564,7 @@ wing__Q43scn4step4hero5ParamCFv: /* 80351280 0034D0C0 4B E8 91 1D */ bl loadCheck__Q25param8JITParamCFv /* 80351284 0034D0C4 80 7F 00 E4 */ lwz r3, 0xe4(r31) /* 80351288 0034D0C8 38 63 00 04 */ addi r3, r3, 4 -/* 8035128C 0034D0CC 4B EB CC F5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8035128C 0034D0CC 4B EB CC F5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80351290 0034D0D0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80351294 0034D0D4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80351298 0034D0D8 7C 08 03 A6 */ mtlr r0 @@ -2582,7 +2582,7 @@ fighter__Q43scn4step4hero5ParamCFv: /* 803512BC 0034D0FC 4B E8 90 E1 */ bl loadCheck__Q25param8JITParamCFv /* 803512C0 0034D100 80 7F 00 F4 */ lwz r3, 0xf4(r31) /* 803512C4 0034D104 38 63 00 04 */ addi r3, r3, 4 -/* 803512C8 0034D108 4B EB CC B9 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803512C8 0034D108 4B EB CC B9 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803512CC 0034D10C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803512D0 0034D110 80 01 00 14 */ lwz r0, 0x14(r1) /* 803512D4 0034D114 7C 08 03 A6 */ mtlr r0 @@ -2600,7 +2600,7 @@ smash__Q43scn4step4hero5ParamCFv: /* 803512F8 0034D138 4B E8 90 A5 */ bl loadCheck__Q25param8JITParamCFv /* 803512FC 0034D13C 80 7F 01 04 */ lwz r3, 0x104(r31) /* 80351300 0034D140 38 63 00 04 */ addi r3, r3, 4 -/* 80351304 0034D144 4B EB CC 7D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80351304 0034D144 4B EB CC 7D */ bl dataHeadAddress__Q25.dataXDataCFv /* 80351308 0034D148 83 E1 00 0C */ lwz r31, 0xc(r1) /* 8035130C 0034D14C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80351310 0034D150 7C 08 03 A6 */ mtlr r0 @@ -2618,7 +2618,7 @@ bossdemo__Q43scn4step4hero5ParamCFv: /* 80351334 0034D174 4B E8 90 69 */ bl loadCheck__Q25param8JITParamCFv /* 80351338 0034D178 80 7F 01 44 */ lwz r3, 0x144(r31) /* 8035133C 0034D17C 38 63 00 04 */ addi r3, r3, 4 -/* 80351340 0034D180 4B EB CC 41 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 80351340 0034D180 4B EB CC 41 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80351344 0034D184 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80351348 0034D188 80 01 00 14 */ lwz r0, 0x14(r1) /* 8035134C 0034D18C 7C 08 03 A6 */ mtlr r0 @@ -2636,7 +2636,7 @@ staffcredit__Q43scn4step4hero5ParamCFv: /* 80351370 0034D1B0 4B E8 90 2D */ bl loadCheck__Q25param8JITParamCFv /* 80351374 0034D1B4 80 7F 01 54 */ lwz r3, 0x154(r31) /* 80351378 0034D1B8 38 63 00 04 */ addi r3, r3, 4 -/* 8035137C 0034D1BC 4B EB CC 05 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 8035137C 0034D1BC 4B EB CC 05 */ bl dataHeadAddress__Q25.dataXDataCFv /* 80351380 0034D1C0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 80351384 0034D1C4 80 01 00 14 */ lwz r0, 0x14(r1) /* 80351388 0034D1C8 7C 08 03 A6 */ mtlr r0 @@ -2654,7 +2654,7 @@ capturedWhispy__Q43scn4step4hero5ParamCFv: /* 803513AC 0034D1EC 4B E8 8F F1 */ bl loadCheck__Q25param8JITParamCFv /* 803513B0 0034D1F0 80 7F 01 64 */ lwz r3, 0x164(r31) /* 803513B4 0034D1F4 38 63 00 04 */ addi r3, r3, 4 -/* 803513B8 0034D1F8 4B EB CB C9 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803513B8 0034D1F8 4B EB CB C9 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803513BC 0034D1FC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803513C0 0034D200 80 01 00 14 */ lwz r0, 0x14(r1) /* 803513C4 0034D204 7C 08 03 A6 */ mtlr r0 @@ -2672,7 +2672,7 @@ capturedWaterGalboros__Q43scn4step4hero5ParamCFv: /* 803513E8 0034D228 4B E8 8F B5 */ bl loadCheck__Q25param8JITParamCFv /* 803513EC 0034D22C 80 7F 01 74 */ lwz r3, 0x174(r31) /* 803513F0 0034D230 38 63 00 04 */ addi r3, r3, 4 -/* 803513F4 0034D234 4B EB CB 8D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803513F4 0034D234 4B EB CB 8D */ bl dataHeadAddress__Q25.dataXDataCFv /* 803513F8 0034D238 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803513FC 0034D23C 80 01 00 14 */ lwz r0, 0x14(r1) /* 80351400 0034D240 7C 08 03 A6 */ mtlr r0 @@ -3382,7 +3382,7 @@ createCommonReplIce__Q43scn4step4hero5ParamFv: /* 80351E24 0034DC64 38 21 00 10 */ addi r1, r1, 0x10 /* 80351E28 0034DC68 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon5ParamFv __ct__Q43scn4step6weapon5ParamFv: /* 803D7E90 003D3CD0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3557,7 +3557,7 @@ starShotLv1__Q43scn4step6weapon5ParamCFv: /* 803D8128 003D3F68 4B E0 22 75 */ bl loadCheck__Q25param8JITParamCFv /* 803D812C 003D3F6C 80 7F 00 04 */ lwz r3, 4(r31) /* 803D8130 003D3F70 38 63 00 04 */ addi r3, r3, 4 -/* 803D8134 003D3F74 4B E3 5E 4D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8134 003D3F74 4B E3 5E 4D */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8138 003D3F78 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D813C 003D3F7C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8140 003D3F80 7C 08 03 A6 */ mtlr r0 @@ -3575,7 +3575,7 @@ starShotLv2__Q43scn4step6weapon5ParamCFv: /* 803D8164 003D3FA4 4B E0 22 39 */ bl loadCheck__Q25param8JITParamCFv /* 803D8168 003D3FA8 80 7F 00 14 */ lwz r3, 0x14(r31) /* 803D816C 003D3FAC 38 63 00 04 */ addi r3, r3, 4 -/* 803D8170 003D3FB0 4B E3 5E 11 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8170 003D3FB0 4B E3 5E 11 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8174 003D3FB4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8178 003D3FB8 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D817C 003D3FBC 7C 08 03 A6 */ mtlr r0 @@ -3593,7 +3593,7 @@ starShotLv3__Q43scn4step6weapon5ParamCFv: /* 803D81A0 003D3FE0 4B E0 21 FD */ bl loadCheck__Q25param8JITParamCFv /* 803D81A4 003D3FE4 80 7F 00 24 */ lwz r3, 0x24(r31) /* 803D81A8 003D3FE8 38 63 00 04 */ addi r3, r3, 4 -/* 803D81AC 003D3FEC 4B E3 5D D5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D81AC 003D3FEC 4B E3 5D D5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D81B0 003D3FF0 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D81B4 003D3FF4 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D81B8 003D3FF8 7C 08 03 A6 */ mtlr r0 @@ -3611,7 +3611,7 @@ airBall__Q43scn4step6weapon5ParamCFv: /* 803D81DC 003D401C 4B E0 21 C1 */ bl loadCheck__Q25param8JITParamCFv /* 803D81E0 003D4020 80 7F 00 34 */ lwz r3, 0x34(r31) /* 803D81E4 003D4024 38 63 00 04 */ addi r3, r3, 4 -/* 803D81E8 003D4028 4B E3 5D 99 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D81E8 003D4028 4B E3 5D 99 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D81EC 003D402C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D81F0 003D4030 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D81F4 003D4034 7C 08 03 A6 */ mtlr r0 @@ -3629,7 +3629,7 @@ waterPistol__Q43scn4step6weapon5ParamCFv: /* 803D8218 003D4058 4B E0 21 85 */ bl loadCheck__Q25param8JITParamCFv /* 803D821C 003D405C 80 7F 00 44 */ lwz r3, 0x44(r31) /* 803D8220 003D4060 38 63 00 04 */ addi r3, r3, 4 -/* 803D8224 003D4064 4B E3 5D 5D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8224 003D4064 4B E3 5D 5D */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8228 003D4068 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D822C 003D406C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8230 003D4070 7C 08 03 A6 */ mtlr r0 @@ -3662,7 +3662,7 @@ waterGalborosWater__Q43scn4step6weapon5ParamCFv: /* 803D826C 003D40AC 4B E0 21 31 */ bl loadCheck__Q25param8JITParamCFv /* 803D8270 003D40B0 80 7F 01 14 */ lwz r3, 0x114(r31) /* 803D8274 003D40B4 38 63 00 04 */ addi r3, r3, 4 -/* 803D8278 003D40B8 4B E3 5D 09 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8278 003D40B8 4B E3 5D 09 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D827C 003D40BC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8280 003D40C0 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8284 003D40C4 7C 08 03 A6 */ mtlr r0 @@ -3680,7 +3680,7 @@ spearSpear__Q43scn4step6weapon5ParamCFv: /* 803D82A8 003D40E8 4B E0 20 F5 */ bl loadCheck__Q25param8JITParamCFv /* 803D82AC 003D40EC 80 7F 01 24 */ lwz r3, 0x124(r31) /* 803D82B0 003D40F0 38 63 00 04 */ addi r3, r3, 4 -/* 803D82B4 003D40F4 4B E3 5C CD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D82B4 003D40F4 4B E3 5C CD */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D82B8 003D40F8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D82BC 003D40FC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D82C0 003D4100 7C 08 03 A6 */ mtlr r0 @@ -3698,7 +3698,7 @@ hammerHammer__Q43scn4step6weapon5ParamCFv: /* 803D82E4 003D4124 4B E0 20 B9 */ bl loadCheck__Q25param8JITParamCFv /* 803D82E8 003D4128 80 7F 01 34 */ lwz r3, 0x134(r31) /* 803D82EC 003D412C 38 63 00 04 */ addi r3, r3, 4 -/* 803D82F0 003D4130 4B E3 5C 91 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D82F0 003D4130 4B E3 5C 91 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D82F4 003D4134 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D82F8 003D4138 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D82FC 003D413C 7C 08 03 A6 */ mtlr r0 @@ -3716,7 +3716,7 @@ fighterHadouShot__Q43scn4step6weapon5ParamCFv: /* 803D8320 003D4160 4B E0 20 7D */ bl loadCheck__Q25param8JITParamCFv /* 803D8324 003D4164 80 7F 01 84 */ lwz r3, 0x184(r31) /* 803D8328 003D4168 38 63 00 04 */ addi r3, r3, 4 -/* 803D832C 003D416C 4B E3 5C 55 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D832C 003D416C 4B E3 5C 55 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8330 003D4170 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8334 003D4174 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8338 003D4178 7C 08 03 A6 */ mtlr r0 @@ -3734,7 +3734,7 @@ gigantEdgeShot__Q43scn4step6weapon5ParamCFv: /* 803D835C 003D419C 4B E0 20 41 */ bl loadCheck__Q25param8JITParamCFv /* 803D8360 003D41A0 80 7F 01 94 */ lwz r3, 0x194(r31) /* 803D8364 003D41A4 38 63 00 04 */ addi r3, r3, 4 -/* 803D8368 003D41A8 4B E3 5C 19 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8368 003D41A8 4B E3 5C 19 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D836C 003D41AC 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8370 003D41B0 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8374 003D41B4 7C 08 03 A6 */ mtlr r0 @@ -3752,7 +3752,7 @@ enemyWaterBullet__Q43scn4step6weapon5ParamCFv: /* 803D8398 003D41D8 4B E0 20 05 */ bl loadCheck__Q25param8JITParamCFv /* 803D839C 003D41DC 80 7F 01 A4 */ lwz r3, 0x1a4(r31) /* 803D83A0 003D41E0 38 63 00 04 */ addi r3, r3, 4 -/* 803D83A4 003D41E4 4B E3 5B DD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D83A4 003D41E4 4B E3 5B DD */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D83A8 003D41E8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D83AC 003D41EC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D83B0 003D41F0 7C 08 03 A6 */ mtlr r0 @@ -3770,7 +3770,7 @@ rollExp__Q43scn4step6weapon5ParamCFv: /* 803D83D4 003D4214 4B E0 1F C9 */ bl loadCheck__Q25param8JITParamCFv /* 803D83D8 003D4218 80 7F 01 B4 */ lwz r3, 0x1b4(r31) /* 803D83DC 003D421C 38 63 00 04 */ addi r3, r3, 4 -/* 803D83E0 003D4220 4B E3 5B A1 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D83E0 003D4220 4B E3 5B A1 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D83E4 003D4224 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D83E8 003D4228 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D83EC 003D422C 7C 08 03 A6 */ mtlr r0 @@ -3788,7 +3788,7 @@ gigatzoBullet__Q43scn4step6weapon5ParamCFv: /* 803D8410 003D4250 4B E0 1F 8D */ bl loadCheck__Q25param8JITParamCFv /* 803D8414 003D4254 80 7F 01 C4 */ lwz r3, 0x1c4(r31) /* 803D8418 003D4258 38 63 00 04 */ addi r3, r3, 4 -/* 803D841C 003D425C 4B E3 5B 65 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D841C 003D425C 4B E3 5B 65 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8420 003D4260 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8424 003D4264 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8428 003D4268 7C 08 03 A6 */ mtlr r0 @@ -3806,7 +3806,7 @@ kingsDooWaveShot__Q43scn4step6weapon5ParamCFv: /* 803D844C 003D428C 4B E0 1F 51 */ bl loadCheck__Q25param8JITParamCFv /* 803D8450 003D4290 80 7F 01 D4 */ lwz r3, 0x1d4(r31) /* 803D8454 003D4294 38 63 00 04 */ addi r3, r3, 4 -/* 803D8458 003D4298 4B E3 5B 29 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8458 003D4298 4B E3 5B 29 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D845C 003D429C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8460 003D42A0 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8464 003D42A4 7C 08 03 A6 */ mtlr r0 @@ -3824,7 +3824,7 @@ foleyLeaf__Q43scn4step6weapon5ParamCFv: /* 803D8488 003D42C8 4B E0 1F 15 */ bl loadCheck__Q25param8JITParamCFv /* 803D848C 003D42CC 80 7F 01 E4 */ lwz r3, 0x1e4(r31) /* 803D8490 003D42D0 38 63 00 04 */ addi r3, r3, 4 -/* 803D8494 003D42D4 4B E3 5A ED */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8494 003D42D4 4B E3 5A ED */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8498 003D42D8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D849C 003D42DC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D84A0 003D42E0 7C 08 03 A6 */ mtlr r0 @@ -3842,7 +3842,7 @@ bowbyArrow__Q43scn4step6weapon5ParamCFv: /* 803D84C4 003D4304 4B E0 1E D9 */ bl loadCheck__Q25param8JITParamCFv /* 803D84C8 003D4308 80 7F 01 F4 */ lwz r3, 0x1f4(r31) /* 803D84CC 003D430C 38 63 00 04 */ addi r3, r3, 4 -/* 803D84D0 003D4310 4B E3 5A B1 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D84D0 003D4310 4B E3 5A B1 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D84D4 003D4314 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D84D8 003D4318 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D84DC 003D431C 7C 08 03 A6 */ mtlr r0 @@ -3860,7 +3860,7 @@ juckleCutter__Q43scn4step6weapon5ParamCFv: /* 803D8500 003D4340 4B E0 1E 9D */ bl loadCheck__Q25param8JITParamCFv /* 803D8504 003D4344 80 7F 02 04 */ lwz r3, 0x204(r31) /* 803D8508 003D4348 38 63 00 04 */ addi r3, r3, 4 -/* 803D850C 003D434C 4B E3 5A 75 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D850C 003D434C 4B E3 5A 75 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8510 003D4350 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8514 003D4354 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8518 003D4358 7C 08 03 A6 */ mtlr r0 @@ -3878,7 +3878,7 @@ tsukikageshuriken__Q43scn4step6weapon5ParamCFv: /* 803D853C 003D437C 4B E0 1E 61 */ bl loadCheck__Q25param8JITParamCFv /* 803D8540 003D4380 80 7F 02 14 */ lwz r3, 0x214(r31) /* 803D8544 003D4384 38 63 00 04 */ addi r3, r3, 4 -/* 803D8548 003D4388 4B E3 5A 39 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8548 003D4388 4B E3 5A 39 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D854C 003D438C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8550 003D4390 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8554 003D4394 7C 08 03 A6 */ mtlr r0 @@ -3896,7 +3896,7 @@ knucklejoeHadou__Q43scn4step6weapon5ParamCFv: /* 803D8578 003D43B8 4B E0 1E 25 */ bl loadCheck__Q25param8JITParamCFv /* 803D857C 003D43BC 80 7F 02 24 */ lwz r3, 0x224(r31) /* 803D8580 003D43C0 38 63 00 04 */ addi r3, r3, 4 -/* 803D8584 003D43C4 4B E3 59 FD */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8584 003D43C4 4B E3 59 FD */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8588 003D43C8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D858C 003D43CC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8590 003D43D0 7C 08 03 A6 */ mtlr r0 @@ -3914,7 +3914,7 @@ whispyTornado__Q43scn4step6weapon5ParamCFv: /* 803D85B4 003D43F4 4B E0 1D E9 */ bl loadCheck__Q25param8JITParamCFv /* 803D85B8 003D43F8 80 7F 02 44 */ lwz r3, 0x244(r31) /* 803D85BC 003D43FC 38 63 00 04 */ addi r3, r3, 4 -/* 803D85C0 003D4400 4B E3 59 C1 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D85C0 003D4400 4B E3 59 C1 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D85C4 003D4404 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D85C8 003D4408 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D85CC 003D440C 7C 08 03 A6 */ mtlr r0 @@ -3932,7 +3932,7 @@ combinationAirBall__Q43scn4step6weapon5ParamCFv: /* 803D85F0 003D4430 4B E0 1D AD */ bl loadCheck__Q25param8JITParamCFv /* 803D85F4 003D4434 80 7F 02 64 */ lwz r3, 0x264(r31) /* 803D85F8 003D4438 38 63 00 04 */ addi r3, r3, 4 -/* 803D85FC 003D443C 4B E3 59 85 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D85FC 003D443C 4B E3 59 85 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8600 003D4440 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8604 003D4444 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8608 003D4448 7C 08 03 A6 */ mtlr r0 @@ -3950,7 +3950,7 @@ combinationMetaBeam__Q43scn4step6weapon5ParamCFv: /* 803D862C 003D446C 4B E0 1D 71 */ bl loadCheck__Q25param8JITParamCFv /* 803D8630 003D4470 80 7F 02 74 */ lwz r3, 0x274(r31) /* 803D8634 003D4474 38 63 00 04 */ addi r3, r3, 4 -/* 803D8638 003D4478 4B E3 59 49 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8638 003D4478 4B E3 59 49 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D863C 003D447C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8640 003D4480 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8644 003D4484 7C 08 03 A6 */ mtlr r0 @@ -3968,7 +3968,7 @@ combinationDededeBomber__Q43scn4step6weapon5ParamCFv: /* 803D8668 003D44A8 4B E0 1D 35 */ bl loadCheck__Q25param8JITParamCFv /* 803D866C 003D44AC 80 7F 02 84 */ lwz r3, 0x284(r31) /* 803D8670 003D44B0 38 63 00 04 */ addi r3, r3, 4 -/* 803D8674 003D44B4 4B E3 59 0D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8674 003D44B4 4B E3 59 0D */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8678 003D44B8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D867C 003D44BC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8680 003D44C0 7C 08 03 A6 */ mtlr r0 @@ -3986,7 +3986,7 @@ combinationDeeShot__Q43scn4step6weapon5ParamCFv: /* 803D86A4 003D44E4 4B E0 1C F9 */ bl loadCheck__Q25param8JITParamCFv /* 803D86A8 003D44E8 80 7F 02 94 */ lwz r3, 0x294(r31) /* 803D86AC 003D44EC 38 63 00 04 */ addi r3, r3, 4 -/* 803D86B0 003D44F0 4B E3 58 D1 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D86B0 003D44F0 4B E3 58 D1 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D86B4 003D44F4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D86B8 003D44F8 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D86BC 003D44FC 7C 08 03 A6 */ mtlr r0 @@ -4004,7 +4004,7 @@ metaBeam__Q43scn4step6weapon5ParamCFv: /* 803D86E0 003D4520 4B E0 1C BD */ bl loadCheck__Q25param8JITParamCFv /* 803D86E4 003D4524 80 7F 02 A4 */ lwz r3, 0x2a4(r31) /* 803D86E8 003D4528 38 63 00 04 */ addi r3, r3, 4 -/* 803D86EC 003D452C 4B E3 58 95 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D86EC 003D452C 4B E3 58 95 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D86F0 003D4530 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D86F4 003D4534 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D86F8 003D4538 7C 08 03 A6 */ mtlr r0 @@ -4022,7 +4022,7 @@ metaShockWave__Q43scn4step6weapon5ParamCFv: /* 803D871C 003D455C 4B E0 1C 81 */ bl loadCheck__Q25param8JITParamCFv /* 803D8720 003D4560 80 7F 02 B4 */ lwz r3, 0x2b4(r31) /* 803D8724 003D4564 38 63 00 04 */ addi r3, r3, 4 -/* 803D8728 003D4568 4B E3 58 59 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8728 003D4568 4B E3 58 59 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D872C 003D456C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8730 003D4570 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8734 003D4574 7C 08 03 A6 */ mtlr r0 @@ -4040,7 +4040,7 @@ dededeHammer__Q43scn4step6weapon5ParamCFv: /* 803D8758 003D4598 4B E0 1C 45 */ bl loadCheck__Q25param8JITParamCFv /* 803D875C 003D459C 80 7F 02 C4 */ lwz r3, 0x2c4(r31) /* 803D8760 003D45A0 38 63 00 04 */ addi r3, r3, 4 -/* 803D8764 003D45A4 4B E3 58 1D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8764 003D45A4 4B E3 58 1D */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8768 003D45A8 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D876C 003D45AC 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8770 003D45B0 7C 08 03 A6 */ mtlr r0 @@ -4058,7 +4058,7 @@ deeSpear__Q43scn4step6weapon5ParamCFv: /* 803D8794 003D45D4 4B E0 1C 09 */ bl loadCheck__Q25param8JITParamCFv /* 803D8798 003D45D8 80 7F 02 D4 */ lwz r3, 0x2d4(r31) /* 803D879C 003D45DC 38 63 00 04 */ addi r3, r3, 4 -/* 803D87A0 003D45E0 4B E3 57 E1 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D87A0 003D45E0 4B E3 57 E1 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D87A4 003D45E4 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D87A8 003D45E8 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D87AC 003D45EC 7C 08 03 A6 */ mtlr r0 @@ -4076,7 +4076,7 @@ vacuumedBlock__Q43scn4step6weapon5ParamCFv: /* 803D87D0 003D4610 4B E0 1B CD */ bl loadCheck__Q25param8JITParamCFv /* 803D87D4 003D4614 80 7F 02 E4 */ lwz r3, 0x2e4(r31) /* 803D87D8 003D4618 38 63 00 04 */ addi r3, r3, 4 -/* 803D87DC 003D461C 4B E3 57 A5 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D87DC 003D461C 4B E3 57 A5 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D87E0 003D4620 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D87E4 003D4624 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D87E8 003D4628 7C 08 03 A6 */ mtlr r0 @@ -4094,7 +4094,7 @@ challengeMasterSummonLight__Q43scn4step6weapon5ParamCFv: /* 803D880C 003D464C 4B E0 1B 91 */ bl loadCheck__Q25param8JITParamCFv /* 803D8810 003D4650 80 7F 02 F4 */ lwz r3, 0x2f4(r31) /* 803D8814 003D4654 38 63 00 04 */ addi r3, r3, 4 -/* 803D8818 003D4658 4B E3 57 69 */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8818 003D4658 4B E3 57 69 */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D881C 003D465C 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D8820 003D4660 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8824 003D4664 7C 08 03 A6 */ mtlr r0 @@ -4112,14 +4112,14 @@ challengeMasterShot__Q43scn4step6weapon5ParamCFv: /* 803D8848 003D4688 4B E0 1B 55 */ bl loadCheck__Q25param8JITParamCFv /* 803D884C 003D468C 80 7F 03 04 */ lwz r3, 0x304(r31) /* 803D8850 003D4690 38 63 00 04 */ addi r3, r3, 4 -/* 803D8854 003D4694 4B E3 57 2D */ bl dataHeadAddress__Q25xdata5XDataCFv +/* 803D8854 003D4694 4B E3 57 2D */ bl dataHeadAddress__Q25.dataXDataCFv /* 803D8858 003D4698 83 E1 00 0C */ lwz r31, 0xc(r1) /* 803D885C 003D469C 80 01 00 14 */ lwz r0, 0x14(r1) /* 803D8860 003D46A0 7C 08 03 A6 */ mtlr r0 /* 803D8864 003D46A4 38 21 00 10 */ addi r1, r1, 0x10 /* 803D8868 003D46A8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249988 $$249988: .incbin "baserom.dol", 0x4607D8, 0x14 @@ -4163,7 +4163,7 @@ $$250000: $$250001: .incbin "baserom.dol", 0x4608FC, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254665 $$254665: .incbin "baserom.dol", 0x46E7D8, 0x14 @@ -4354,7 +4354,7 @@ $$254726: $$254727: .incbin "baserom.dol", 0x46ECFC, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250654 $$250654: .incbin "baserom.dol", 0x4813B0, 0x14 @@ -4428,7 +4428,7 @@ $$250676: $$250677: .incbin "baserom.dol", 0x481580, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253509 $$253509: .incbin "baserom.dol", 0x48F908, 0x18 diff --git a/asm/src/ParamAccessor.s b/asm/src/ParamAccessor.s index 26ed61ab..4dc9c588 100644 --- a/asm/src/ParamAccessor.s +++ b/asm/src/ParamAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25param13ParamAccessorFPCc __ct__Q25param13ParamAccessorFPCc: /* 801DA3FC 001D623C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -29,7 +29,7 @@ lbl_801DA448: /* 801DA454 001D6294 90 61 00 10 */ stw r3, 0x10(r1) /* 801DA458 001D6298 90 81 00 08 */ stw r4, 8(r1) /* 801DA45C 001D629C 38 61 00 08 */ addi r3, r1, 8 -/* 801DA460 001D62A0 4B FA CD 0D */ bl isValidData__Q25xdata5XDataCFv +/* 801DA460 001D62A0 4B FA CD 0D */ bl isValidData__Q25.dataXDataCFv /* 801DA464 001D62A4 2C 03 00 00 */ cmpwi r3, 0 /* 801DA468 001D62A8 40 82 00 0C */ bne lbl_801DA474 /* 801DA46C 001D62AC 7F E3 FB 78 */ mr r3, r31 @@ -54,7 +54,7 @@ lbl_801DA498: /* 801DA4B0 001D62F0 4B FC 35 09 */ bl Strlen__Q33hel6common9Traits$$0c$$1FPCc /* 801DA4B4 001D62F4 7C 7C 1B 78 */ mr r28, r3 /* 801DA4B8 001D62F8 38 61 00 08 */ addi r3, r1, 8 -/* 801DA4BC 001D62FC 4B FA CC B1 */ bl isValidData__Q25xdata5XDataCFv +/* 801DA4BC 001D62FC 4B FA CC B1 */ bl isValidData__Q25.dataXDataCFv /* 801DA4C0 001D6300 2C 03 00 00 */ cmpwi r3, 0 /* 801DA4C4 001D6304 41 82 00 10 */ beq lbl_801DA4D4 /* 801DA4C8 001D6308 80 61 00 08 */ lwz r3, 8(r1) @@ -70,7 +70,7 @@ lbl_801DA4E4: /* 801DA4E4 001D6324 7F BB F2 14 */ add r29, r27, r30 /* 801DA4E8 001D6328 38 61 00 08 */ addi r3, r1, 8 /* 801DA4EC 001D632C 80 9D 00 04 */ lwz r4, 4(r29) -/* 801DA4F0 001D6330 4B FA CE 65 */ bl labelAddressWithReference__Q25xdata5XDataCFUi +/* 801DA4F0 001D6330 4B FA CE 65 */ bl labelAddressWithReference__Q25.dataXDataCFUi /* 801DA4F4 001D6334 7C 64 1B 78 */ mr r4, r3 /* 801DA4F8 001D6338 80 03 00 00 */ lwz r0, 0(r3) /* 801DA4FC 001D633C 7C 00 E0 40 */ cmplw r0, r28 @@ -84,10 +84,10 @@ lbl_801DA4E4: /* 801DA51C 001D635C 41 82 00 20 */ beq lbl_801DA53C /* 801DA520 001D6360 38 61 00 08 */ addi r3, r1, 8 /* 801DA524 001D6364 80 9D 00 08 */ lwz r4, 8(r29) -/* 801DA528 001D6368 4B FA CE 2D */ bl labelAddressWithReference__Q25xdata5XDataCFUi +/* 801DA528 001D6368 4B FA CE 2D */ bl labelAddressWithReference__Q25.dataXDataCFUi /* 801DA52C 001D636C 90 7F 00 04 */ stw r3, 4(r31) /* 801DA530 001D6370 38 7F 00 04 */ addi r3, r31, 4 -/* 801DA534 001D6374 4B FA CC 39 */ bl isValidData__Q25xdata5XDataCFv +/* 801DA534 001D6374 4B FA CC 39 */ bl isValidData__Q25.dataXDataCFv /* 801DA538 001D6378 48 00 00 18 */ b lbl_801DA550 lbl_801DA53C: /* 801DA53C 001D637C 3B 5A 00 01 */ addi r26, r26, 1 @@ -109,14 +109,14 @@ lbl_801DA554: .global str__Q25param13ParamAccessorCFUi str__Q25param13ParamAccessorCFUi: /* 801DA56C 001D63AC 38 63 00 04 */ addi r3, r3, 4 -/* 801DA570 001D63B0 4B FA CD E4 */ b labelAddressWithReference__Q25xdata5XDataCFUi +/* 801DA570 001D63B0 4B FA CD E4 */ b labelAddressWithReference__Q25.dataXDataCFUi -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249124 $$249124: .incbin "baserom.dol", 0x459508, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249125 $$249125: .incbin "baserom.dol", 0x493A38, 0x8 diff --git a/asm/src/ParamBase.s b/asm/src/ParamBase.s index 7211264e..c81ce6e9 100644 --- a/asm/src/ParamBase.s +++ b/asm/src/ParamBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step5enemy6common9ParamBaseFv Create__Q53scn4step5enemy6common9ParamBaseFv: /* 8029174C 0028D58C 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -67,7 +67,7 @@ lbl_80291824: /* 80291838 0028D678 38 21 00 60 */ addi r1, r1, 0x60 /* 8029183C 0028D67C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248731 $$248731: .incbin "baserom.dol", 0x49BAD8, 0x4 diff --git a/asm/src/Parasol.s b/asm/src/Parasol.s index 36d7b936..848e8513 100644 --- a/asm/src/Parasol.s +++ b/asm/src/Parasol.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ParasolPath__Q53scn4step4hero9modeldesc7ParasolFv ParasolPath__Q53scn4step4hero9modeldesc7ParasolFv: /* 8035C8AC 003586EC 3C 60 80 49 */ lis r3, $$248808@ha @@ -57,7 +57,7 @@ ParasolAnim__Q53scn4step4hero9modeldesc7ParasolFv: /* 8035C95C 0035879C 90 03 00 08 */ stw r0, 8(r3) /* 8035C960 003587A0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7parasol7ParasolFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q53scn4step4hero7parasol7ParasolFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 80392558 0038E398 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -322,12 +322,12 @@ lbl_803928E0: /* 803928F4 0038E734 38 21 00 10 */ addi r1, r1, 0x10 /* 803928F8 0038E738 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2ParasolAnim__Q53scn4step4hero9modeldesc7ParasolFv$$2entries$$21 $$2LOCAL$$2ParasolAnim__Q53scn4step4hero9modeldesc7ParasolFv$$2entries$$21: .incbin "baserom.dol", 0x41BA40, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248808 $$248808: .incbin "baserom.dol", 0x487468, 0x28 @@ -359,7 +359,7 @@ $$248753: $$248754: .incbin "baserom.dol", 0x487500, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257636 $$257636: .incbin "baserom.dol", 0x489C58, 0x20 @@ -370,7 +370,7 @@ $$257637: __vt__Q53scn4step4hero7parasol7Parasol: .incbin "baserom.dol", 0x489CA0, 0x60 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248732 $$248732: .incbin "baserom.dol", 0x497608, 0x8 diff --git a/asm/src/PassageTime.s b/asm/src/PassageTime.s index 4ec4ff2f..3a5850ef 100644 --- a/asm/src/PassageTime.s +++ b/asm/src/PassageTime.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge11PassageTimeFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge11PassageTimeFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B4AA0 003B08E0 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -261,7 +261,7 @@ lbl_803B4E3C: /* 803B4E54 003B0C94 38 21 04 E0 */ addi r1, r1, 0x4e0 /* 803B4E58 003B0C98 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253861 $$253861: .incbin "baserom.dol", 0x48C7B0, 0x14 @@ -272,7 +272,7 @@ $$253862: $$253867: .incbin "baserom.dol", 0x48C7D0, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253863 $$253863: .incbin "baserom.dol", 0x497C28, 0x8 diff --git a/asm/src/Pause.s b/asm/src/Pause.s index 3ebad550..5ebec978 100644 --- a/asm/src/Pause.s +++ b/asm/src/Pause.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause5PauseFRCQ25pause11ContextInitPQ25pause9ICallback __ct__Q25pause5PauseFRCQ25pause11ContextInitPQ25pause9ICallback: /* 801DE914 001DA754 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -663,12 +663,12 @@ lbl_801DF1F0: /* 801DF1FC 001DB03C 38 21 00 10 */ addi r1, r1, 0x10 /* 801DF200 001DB040 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253172 $$253172: .incbin "baserom.dol", 0x459C60, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253126 $$253126: .incbin "baserom.dol", 0x493D00, 0x8 diff --git a/asm/src/PauseManager.s b/asm/src/PauseManager.s index 8250205f..8a36712f 100644 --- a/asm/src/PauseManager.s +++ b/asm/src/PauseManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core12PauseManagerFRQ33scn4step9Component __ct__Q43scn4step4core12PauseManagerFRQ33scn4step9Component: /* 802777B0 002735F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -141,7 +141,7 @@ lbl_80277988: /* 80277998 002737D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8027799C 002737DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4core12PauseManager __vt__Q43scn4step4core12PauseManager: .incbin "baserom.dol", 0x468948, 0x10 diff --git a/asm/src/PauseTrigger.s b/asm/src/PauseTrigger.s index 9f9ccd67..2b81efea 100644 --- a/asm/src/PauseTrigger.s +++ b/asm/src/PauseTrigger.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core12PauseTriggerFRQ33scn4step9Component __ct__Q43scn4step4core12PauseTriggerFRQ33scn4step9Component: /* 802779A0 002737E0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/PerformanceController.s b/asm/src/PerformanceController.s index c9de0653..5fcffa65 100644 --- a/asm/src/PerformanceController.s +++ b/asm/src/PerformanceController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23app21PerformanceControllerFv __ct__Q23app21PerformanceControllerFv: /* 8017A588 001763C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -340,10 +340,10 @@ __sinit_$$3PerformanceController_cpp: /* 8017A9D4 00176814 38 6D ED 28 */ addi r3, r13, t_instance__35$$2unnamed$$2PerformanceController_cpp$$2-_SDA_BASE_ /* 8017A9D8 00176818 4B F6 2A 08 */ b __ct__Q34nw4r3g3d8LightObjFv -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4023DC, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DRAW_FRAME_INTERVAL_TABLE__35$$2unnamed$$2PerformanceController_cpp$$2 T_DRAW_FRAME_INTERVAL_TABLE__35$$2unnamed$$2PerformanceController_cpp$$2: .incbin "baserom.dol", 0x410600, 0x18 diff --git a/asm/src/PermEffect.s b/asm/src/PermEffect.s index 9423da6d..6d27908d 100644 --- a/asm/src/PermEffect.s +++ b/asm/src/PermEffect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core16PermEffectDetailFRQ33scn4step9Component __ct__Q43scn4step4core16PermEffectDetailFRQ33scn4step9Component: /* 80277EC4 00273D04 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -343,7 +343,7 @@ onStopPowerfulFinished__Q43scn4step4core10PermEffectFRCQ25ostop5Actor: /* 80278308 00274148 38 21 00 10 */ addi r1, r1, 0x10 /* 8027830C 0027414C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4core10PermEffect __vt__Q43scn4step4core10PermEffect: .incbin "baserom.dol", 0x468958, 0x20 diff --git a/asm/src/PermSoundSE.s b/asm/src/PermSoundSE.s index 787ffbdd..05d52d27 100644 --- a/asm/src/PermSoundSE.s +++ b/asm/src/PermSoundSE.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core11PermSoundSEFRQ33scn4step9Component __ct__Q43scn4step4core11PermSoundSEFRQ33scn4step9Component: /* 80278310 00274150 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Piggyback.s b/asm/src/Piggyback.s index 1fd6fef4..844fcb2d 100644 --- a/asm/src/Piggyback.s +++ b/asm/src/Piggyback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero9PiggybackFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero9PiggybackFRQ43scn4step4hero4Hero: /* 80351E2C 0034DC6C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1858,12 +1858,12 @@ lbl_80353788: /* 80353798 0034F5D8 38 21 00 30 */ addi r1, r1, 0x30 /* 8035379C 0034F5DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$261676 $$261676: .incbin "baserom.dol", 0x4815A0, 0x50 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258605 $$258605: .incbin "baserom.dol", 0x496E08, 0x4 @@ -1871,7 +1871,7 @@ $$258605: $$258606: .incbin "baserom.dol", 0x496E0C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$261280 $$261280: .incbin "baserom.dol", 0x49D910, 0x4 diff --git a/asm/src/Pinch.s b/asm/src/Pinch.s index e0dea818..6e23093f 100644 --- a/asm/src/Pinch.s +++ b/asm/src/Pinch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero5PinchFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero5PinchFRQ43scn4step4hero4Hero: /* 803537A0 0034F5E0 90 83 00 00 */ stw r4, 0(r3) @@ -200,7 +200,7 @@ lbl_80353A20: /* 80353A50 0034F890 38 21 00 20 */ addi r1, r1, 0x20 /* 80353A54 0034F894 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ALPHA_TABLE_1__19$$2unnamed$$2Pinch_cpp$$2 T_ALPHA_TABLE_1__19$$2unnamed$$2Pinch_cpp$$2: .incbin "baserom.dol", 0x416328, 0x80 @@ -208,7 +208,7 @@ T_ALPHA_TABLE_1__19$$2unnamed$$2Pinch_cpp$$2: T_ALPHA_TABLE_2__19$$2unnamed$$2Pinch_cpp$$2: .incbin "baserom.dol", 0x4163A8, 0x80 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252532 $$252532: .incbin "baserom.dol", 0x49D950, 0x4 diff --git a/asm/src/Player.s b/asm/src/Player.s index f1d3d3e3..cb01ecf3 100644 --- a/asm/src/Player.s +++ b/asm/src/Player.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn5anime6PlayerFQ23mov9MovieKind __ct__Q33scn5anime6PlayerFQ23mov9MovieKind: /* 801E1F44 001DDD84 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -737,7 +737,7 @@ getTotalTime__Q33scn5anime6PlayerCFv: /* 801E294C 001DE78C 38 21 00 10 */ addi r1, r1, 0x10 /* 801E2950 001DE790 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251631 $$251631: .incbin "baserom.dol", 0x4115A0, 0xC @@ -748,12 +748,12 @@ $$251633: $$251635: .incbin "baserom.dol", 0x4115B8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253021 $$253021: .incbin "baserom.dol", 0x493DF0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251642 $$251642: .incbin "baserom.dol", 0x49A838, 0x8 diff --git a/asm/src/PlayerEntryInfo.s b/asm/src/PlayerEntryInfo.s index 3e25f676..ec673904 100644 --- a/asm/src/PlayerEntryInfo.s +++ b/asm/src/PlayerEntryInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause15PlayerEntryInfoFv __ct__Q25pause15PlayerEntryInfoFv: /* 801DF204 001DB044 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/PlayerIcon.s b/asm/src/PlayerIcon.s index 1abd465f..d7467cde 100644 --- a/asm/src/PlayerIcon.s +++ b/asm/src/PlayerIcon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap10PlayerIconFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info5lvmap10PlayerIconFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803BE5FC 003BA43C 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -285,7 +285,7 @@ hide__Q53scn4step4info5lvmap10PlayerIconFv: /* 803BEA38 003BA878 38 21 00 E0 */ addi r1, r1, 0xe0 /* 803BEA3C 003BA87C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252394 $$252394: .incbin "baserom.dol", 0x48D920, 0xC @@ -305,7 +305,7 @@ $$252451: $$252453: .incbin "baserom.dol", 0x48D95C, 0xC4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252442 $$252442: .incbin "baserom.dol", 0x498010, 0x8 diff --git a/asm/src/PlayerWindow.s b/asm/src/PlayerWindow.s index 64df59c8..ef313e17 100644 --- a/asm/src/PlayerWindow.s +++ b/asm/src/PlayerWindow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn9grandmenu4menu12PlayerWindowFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q43scn9grandmenu4menu12PlayerWindowFRQ33scn9grandmenu9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803F7BA0 003F39E0 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -296,7 +296,7 @@ lbl_803F7FC0: /* 803F7FC0 003F3E00 38 60 00 00 */ li r3, 0 /* 803F7FC4 003F3E04 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251655 $$251655: .incbin "baserom.dol", 0x491C90, 0xC @@ -322,7 +322,7 @@ $$252111: $$252112: .incbin "baserom.dol", 0x491CF8, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252113 $$252113: .incbin "baserom.dol", 0x4989D8, 0x8 diff --git a/asm/src/Point2.s b/asm/src/Point2.s index fb551351..0790203d 100644 --- a/asm/src/Point2.s +++ b/asm/src/Point2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __sinit_$$3Point2_cpp __sinit_$$3Point2_cpp: /* 8019EC6C 0019AAAC 38 6D EE 20 */ addi r3, r13, ORIGIN__Q33hel4math6Point2-_SDA_BASE_ @@ -8,10 +8,10 @@ __sinit_$$3Point2_cpp: /* 8019EC74 0019AAB4 FC 40 08 90 */ fmr f2, f1 /* 8019EC78 0019AAB8 48 00 07 30 */ b set__Q33hel4math7Vector2Fff -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40241C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249826 $$249826: .incbin "baserom.dol", 0x49A388, 0x8 diff --git a/asm/src/PolyEffect.s b/asm/src/PolyEffect.s index 370f8967..cafc0013 100644 --- a/asm/src/PolyEffect.s +++ b/asm/src/PolyEffect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_hasAnimE__Q36effect6detail24$$2unnamed$$2PolyEffect_cpp$$2FQ36effect6detail13AnimComboType t_hasAnimE__Q36effect6detail24$$2unnamed$$2PolyEffect_cpp$$2FQ36effect6detail13AnimComboType: /* 80181C08 0017DA48 2C 03 00 01 */ cmpwi r3, 1 @@ -1383,7 +1383,7 @@ lbl_80182ED8: /* 80182EE4 0017ED24 38 21 00 C0 */ addi r1, r1, 0xc0 /* 80182EE8 0017ED28 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254764 $$254764: .incbin "baserom.dol", 0x4930C0, 0x4 @@ -1406,7 +1406,7 @@ $$255035: $$255036: .incbin "baserom.dol", 0x4930E4, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254875 $$254875: .incbin "baserom.dol", 0x49A180, 0x4 diff --git a/asm/src/PolyEffectAllocator.s b/asm/src/PolyEffectAllocator.s index a1e434dc..b4f064c3 100644 --- a/asm/src/PolyEffectAllocator.s +++ b/asm/src/PolyEffectAllocator.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail19PolyEffectAllocatorFv __ct__Q36effect6detail19PolyEffectAllocatorFv: /* 80182EEC 0017ED2C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/PolyEffectManager.s b/asm/src/PolyEffectManager.s index 58dc5258..474fcf68 100644 --- a/asm/src/PolyEffectManager.s +++ b/asm/src/PolyEffectManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail17PolyEffectManagerFRQ23mem10IAllocatorUlUl __ct__Q36effect6detail17PolyEffectManagerFRQ23mem10IAllocatorUlUl: /* 80182F6C 0017EDAC 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/PolyEffectMemManager.s b/asm/src/PolyEffectMemManager.s index c6fe96c3..5b452c74 100644 --- a/asm/src/PolyEffectMemManager.s +++ b/asm/src/PolyEffectMemManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail20PolyEffectMemManagerFRQ23mem10IAllocatorUl __ct__Q36effect6detail20PolyEffectMemManagerFRQ23mem10IAllocatorUl: /* 801834E0 0017F320 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -393,7 +393,7 @@ free__Q46effect6detail20PolyEffectMemManager8OneBlockFv: /* 80183A08 0017F848 98 03 00 58 */ stb r0, 0x58(r3) /* 80183A0C 0017F84C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249795 $$249795: .incbin "baserom.dol", 0x44F508, 0x18 diff --git a/asm/src/PolyEffectRes.s b/asm/src/PolyEffectRes.s index e55613ab..d69512e1 100644 --- a/asm/src/PolyEffectRes.s +++ b/asm/src/PolyEffectRes.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail13PolyEffectResFv __ct__Q36effect6detail13PolyEffectResFv: /* 80183A10 0017F850 38 A3 FF FC */ addi r5, r3, -4 diff --git a/asm/src/PosNotifier.s b/asm/src/PosNotifier.s index 32fc4584..ac0c320d 100644 --- a/asm/src/PosNotifier.s +++ b/asm/src/PosNotifier.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11PosNotifierFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero11PosNotifierFRQ43scn4step4hero4Hero: /* 80353A58 0034F898 90 83 00 00 */ stw r4, 0(r3) @@ -135,12 +135,12 @@ lbl_80353C0C: /* 80353C3C 0034FA7C 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80353C40 0034FA80 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255814 $$255814: .incbin "baserom.dol", 0x496E10, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256314 $$256314: .incbin "baserom.dol", 0x49D958, 0x4 diff --git a/asm/src/PowerCharge.s b/asm/src/PowerCharge.s index c730fda2..a1e86883 100644 --- a/asm/src/PowerCharge.s +++ b/asm/src/PowerCharge.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11PowerChargeFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero11PowerChargeFRQ43scn4step4hero4Hero: /* 80353C44 0034FA84 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -324,7 +324,7 @@ lbl_8035401C: /* 80354080 0034FEC0 38 21 00 30 */ addi r1, r1, 0x30 /* 80354084 0034FEC4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254650 $$254650: .incbin "baserom.dol", 0x49D968, 0x4 diff --git a/asm/src/PreLoadManager.s b/asm/src/PreLoadManager.s index 342f874d..67b30e83 100644 --- a/asm/src/PreLoadManager.s +++ b/asm/src/PreLoadManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tHeap__Q27preload28$$2unnamed$$2PreLoadManager_cpp$$2Fv tHeap__Q27preload28$$2unnamed$$2PreLoadManager_cpp$$2Fv: /* 801DF3E0 001DB220 80 6D ED 00 */ lwz r3, object___Q33hel6common32ExplicitSingleton$$0Q23mem6Memory$$1-_SDA_BASE_(r13) diff --git a/asm/src/PreLoadReq.s b/asm/src/PreLoadReq.s index 30effca6..66e5bad1 100644 --- a/asm/src/PreLoadReq.s +++ b/asm/src/PreLoadReq.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_dnOption__Q43scn4step4core24$$2unnamed$$2PreLoadReq_cpp$$2FRQ33scn4step9Component t_dnOption__Q43scn4step4core24$$2unnamed$$2PreLoadReq_cpp$$2FRQ33scn4step9Component: /* 802783C4 00274204 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -98,7 +98,7 @@ lbl_802784FC: /* 8027850C 0027434C 38 21 00 10 */ addi r1, r1, 0x10 /* 80278510 00274350 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250582 $$250582: .incbin "baserom.dol", 0x468978, 0x18 diff --git a/asm/src/Print.s b/asm/src/Print.s index d98cd33b..67f5a932 100644 --- a/asm/src/Print.s +++ b/asm/src/Print.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HelSPrintfImpl__Q33hel5debug5PrintFPCce HelSPrintfImpl__Q33hel5debug5PrintFPCce: /* 8019DE98 00199CD8 94 21 FE 00 */ stwu r1, -0x200(r1) diff --git a/asm/src/ProcessSeparator.s b/asm/src/ProcessSeparator.s index c906de7d..b91bb31d 100644 --- a/asm/src/ProcessSeparator.s +++ b/asm/src/ProcessSeparator.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q43scn4step4hero16ProcessSeparatorFv update__Q43scn4step4hero16ProcessSeparatorFv: /* 80354088 0034FEC8 80 83 00 00 */ lwz r4, 0(r3) diff --git a/asm/src/Product.s b/asm/src/Product.s index 1eed9f83..aaa85cdb 100644 --- a/asm/src/Product.s +++ b/asm/src/Product.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GamePlayable__Q43scn7history6detail21$$2unnamed$$2Product_cpp$$2Fv GamePlayable__Q43scn7history6detail21$$2unnamed$$2Product_cpp$$2Fv: /* 80219EAC 00215CEC 3C 80 80 41 */ lis r4, $$249032@ha @@ -380,10 +380,10 @@ __sinit_$$3Product_cpp: /* 8021A3EC 0021622C 38 21 01 70 */ addi r1, r1, 0x170 /* 8021A3F0 00216230 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40246C, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$249032 $$249032: .incbin "baserom.dol", 0x412158, 0xC diff --git a/asm/src/ProgressCtrl.s b/asm/src/ProgressCtrl.s index dc214ec8..680be5ff 100644 --- a/asm/src/ProgressCtrl.s +++ b/asm/src/ProgressCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster12ProgressCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster12ProgressCtrlFRQ43scn4step4boss4Boss: /* 8023F44C 0023B28C 90 83 00 00 */ stw r4, 0(r3) @@ -324,7 +324,7 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1Fv: /* 8023F8A0 0023B6E0 4B FE EE 00 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateLoseFly$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461E38, 0x10 @@ -332,7 +332,7 @@ __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster11StateWinFly$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461E48, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254746 $$254746: .incbin "baserom.dol", 0x49B058, 0x8 diff --git a/asm/src/Project.s b/asm/src/Project.s index 938443a5..689dcf74 100644 --- a/asm/src/Project.s +++ b/asm/src/Project.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23msg7ProjectFRQ23mem10IAllocatorPCc __ct__Q23msg7ProjectFRQ23mem10IAllocatorPCc: /* 801D168C 001CD4CC 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -97,7 +97,7 @@ listItemName__Q23msg7ProjectCFUsUsUsUs: /* 801D17C4 001CD604 54 E7 04 3E */ clrlwi r7, r7, 0x10 /* 801D17C8 001CD608 4B FA 30 F8 */ b LMS_GetTagListItemName -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249096 $$249096: .incbin "baserom.dol", 0x4593A8, 0x10 diff --git a/asm/src/PtclEffect.s b/asm/src/PtclEffect.s index 9a3bd205..917caa29 100644 --- a/asm/src/PtclEffect.s +++ b/asm/src/PtclEffect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail10PtclEffectFv __ct__Q36effect6detail10PtclEffectFv: /* 80183CCC 0017FB0C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/PtclEffectManager.s b/asm/src/PtclEffectManager.s index 0e2efb22..d8df8bbb 100644 --- a/asm/src/PtclEffectManager.s +++ b/asm/src/PtclEffectManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail17PtclEffectManagerFRQ23mem10IAllocatorUlUlUlUlUlUl __ct__Q36effect6detail17PtclEffectManagerFRQ23mem10IAllocatorUlUlUlUlUlUl: /* 801848BC 001806FC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1036,7 +1036,7 @@ lbl_8018567C: /* 8018568C 001814CC 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80185690 001814D0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv$$22 $$2STRING$$2GarbageCollection__Q34nw4r2ef13MemoryManagerFv$$22: .incbin "baserom.dol", 0x44F520, 0x128 diff --git a/asm/src/PtclEffectMemManager.s b/asm/src/PtclEffectMemManager.s index ac4de115..37223a97 100644 --- a/asm/src/PtclEffectMemManager.s +++ b/asm/src/PtclEffectMemManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail20PtclEffectMemManagerFRQ23mem10IAllocatorUlUlUlUlUl __ct__Q36effect6detail20PtclEffectMemManagerFRQ23mem10IAllocatorUlUlUlUlUl: /* 80185694 001814D4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1160,7 +1160,7 @@ lbl_80186600: AssignObjectID__Q34nw4r2ef35MemoryManagerTmp$$0Q34nw4r2ef6Effect$$1FPv: /* 80186618 00182458 4B FF FC 40 */ b AssignObjectID__Q34nw4r2ef37MemoryManagerTmp$$0Q34nw4r2ef8Particle$$1FPv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q34nw4r2ef13MemoryManager __vt__Q34nw4r2ef13MemoryManager: .incbin "baserom.dol", 0x44F6E8, 0x68 diff --git a/asm/src/PtclEffectRes.s b/asm/src/PtclEffectRes.s index be9de3ae..bd70a2f5 100644 --- a/asm/src/PtclEffectRes.s +++ b/asm/src/PtclEffectRes.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail13PtclEffectResFv __ct__Q36effect6detail13PtclEffectResFv: /* 8018661C 0018245C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -420,7 +420,7 @@ lbl_80186B60: /* 80186BC8 00182A08 38 21 00 90 */ addi r1, r1, 0x90 /* 80186BCC 00182A0C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250371 $$250371: .incbin "baserom.dol", 0x44F8B8, 0x14 diff --git a/asm/src/Quake.s b/asm/src/Quake.s index c3826bff..96225e93 100644 --- a/asm/src/Quake.s +++ b/asm/src/Quake.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera5QuakeFv __ct__Q43scn4step6camera5QuakeFv: /* 802662C4 00262104 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -130,7 +130,7 @@ lbl_80266418: /* 80266474 002622B4 38 21 00 20 */ addi r1, r1, 0x20 /* 80266478 002622B8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249899 $$249899: .incbin "baserom.dol", 0x49B690, 0x8 diff --git a/asm/src/QuakeData.s b/asm/src/QuakeData.s index cd0b5482..490ce896 100644 --- a/asm/src/QuakeData.s +++ b/asm/src/QuakeData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera9QuakeDataFv __ct__Q43scn4step6camera9QuakeDataFv: /* 8026647C 002622BC 94 21 FD 60 */ stwu r1, -0x2a0(r1) @@ -851,7 +851,7 @@ offset__Q43scn4step6camera9QuakeDataCFQ43scn4step6camera9QuakeKindUl: /* 8026716C 00262FAC 38 21 00 20 */ addi r1, r1, 0x20 /* 80267170 00262FB0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250464 $$250464: .incbin "baserom.dol", 0x49B698, 0x4 diff --git a/asm/src/QuakePiece.s b/asm/src/QuakePiece.s index 3eabc4ed..5b3b8063 100644 --- a/asm/src/QuakePiece.s +++ b/asm/src/QuakePiece.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q43scn4step6camera10QuakePieceFv update__Q43scn4step6camera10QuakePieceFv: /* 80267174 00262FB4 80 03 00 00 */ lwz r0, 0(r3) diff --git a/asm/src/Radar.s b/asm/src/Radar.s index 5f8f0a70..543b5e6b 100644 --- a/asm/src/Radar.s +++ b/asm/src/Radar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge5RadarFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge5RadarFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B4E5C 003B0C9C 94 21 FE B0 */ stwu r1, -0x150(r1) @@ -372,7 +372,7 @@ lbl_803B537C: /* 803B5388 003B11C8 FC 20 00 90 */ fmr f1, f0 /* 803B538C 003B11CC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252323 $$252323: .incbin "baserom.dol", 0x48C810, 0x14 @@ -392,7 +392,7 @@ $$252329: $$252331: .incbin "baserom.dol", 0x48C858, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252328 $$252328: .incbin "baserom.dol", 0x497C60, 0x8 @@ -406,7 +406,7 @@ $$252332: $$252333: .incbin "baserom.dol", 0x497C78, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252327 $$252327: .incbin "baserom.dol", 0x49E490, 0x4 diff --git a/asm/src/RadarIcon.s b/asm/src/RadarIcon.s index 76013416..59e53617 100644 --- a/asm/src/RadarIcon.s +++ b/asm/src/RadarIcon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge9RadarIconFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ63scn4step4info9challenge9RadarIcon6IconId __ct__Q53scn4step4info9challenge9RadarIconFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ63scn4step4info9challenge9RadarIcon6IconId: /* 803B5390 003B11D0 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -57,7 +57,7 @@ appear__Q53scn4step4info9challenge9RadarIconFv: /* 803B544C 003B128C 38 21 00 20 */ addi r1, r1, 0x20 /* 803B5450 003B1290 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251919 $$251919: .incbin "baserom.dol", 0x48C898, 0x14 diff --git a/asm/src/Random.s b/asm/src/Random.s index 3b1c99f4..3e7b5da4 100644 --- a/asm/src/Random.s +++ b/asm/src/Random.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RandBool__Q23app6RandomFf RandBool__Q23app6RandomFf: /* 8017A9DC 0017681C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -182,7 +182,7 @@ Obj__Q23app6RandomFv: /* 8017AC24 00176A64 80 6D ED 10 */ lwz r3, object___Q33hel6common38ExplicitSingleton$$0Q23app11Application$$1-_SDA_BASE_(r13) /* 8017AC28 00176A68 4B FF BA 2C */ b random__Q23app11ApplicationFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Default__Q43hel4math6Random4SeedFv Default__Q43hel4math6Random4SeedFv: /* 8019EC7C 0019AABC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -413,7 +413,7 @@ randCoreF32__Q33hel4math6RandomFv: /* 8019EF50 0019AD90 38 21 00 10 */ addi r1, r1, 0x10 /* 8019EF54 0019AD94 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249032 $$249032: .incbin "baserom.dol", 0x49A390, 0x4 diff --git a/asm/src/RankItem.s b/asm/src/RankItem.s index b979d9f6..d5ba3a32 100644 --- a/asm/src/RankItem.s +++ b/asm/src/RankItem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step9challenge8RankItemFv __ct__Q43scn4step9challenge8RankItemFv: /* 80269658 00265498 38 00 00 00 */ li r0, 0 diff --git a/asm/src/Ranking.s b/asm/src/Ranking.s index 45242c9e..ea869744 100644 --- a/asm/src/Ranking.s +++ b/asm/src/Ranking.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap7RankingFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator __ct__Q53scn4step4info5lvmap7RankingFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator: /* 803BEA40 003BA880 94 21 FE E0 */ stwu r1, -0x120(r1) @@ -691,7 +691,7 @@ lbl_803BF41C: /* 803BF42C 003BB26C 38 21 00 30 */ addi r1, r1, 0x30 /* 803BF430 003BB270 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253816 $$253816: .incbin "baserom.dol", 0x48DA20, 0x14 @@ -723,7 +723,7 @@ $$254062: $$254064: .incbin "baserom.dol", 0x48DACC, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253815 $$253815: .incbin "baserom.dol", 0x498048, 0x8 diff --git a/asm/src/RankingPanel.s b/asm/src/RankingPanel.s index 6903282c..aa699547 100644 --- a/asm/src/RankingPanel.s +++ b/asm/src/RankingPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap12RankingPanelFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator __ct__Q53scn4step4info5lvmap12RankingPanelFRQ33scn4step9ComponentRCQ23lyt12PaneAccessorRQ23mem10IAllocator: /* 803BF434 003BB274 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -294,7 +294,7 @@ updateFrame__Q53scn4step4info5lvmap12RankingPanelFv: /* 803BF870 003BB6B0 38 21 00 10 */ addi r1, r1, 0x10 /* 803BF874 003BB6B4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252661 $$252661: .incbin "baserom.dol", 0x48DB10, 0x18 @@ -320,7 +320,7 @@ $$252746: $$252748: .incbin "baserom.dol", 0x48DB78, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252660 $$252660: .incbin "baserom.dol", 0x498098, 0x8 diff --git a/asm/src/RayChecker.s b/asm/src/RayChecker.s index ce108274..5e989eac 100644 --- a/asm/src/RayChecker.s +++ b/asm/src/RayChecker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Check__Q35mcoll6detail10RayCheckerFRCQ35mcoll6detail7LandSetRCQ33hel4math7Vector2RCQ33hel4math7Vector2RCQ35mcoll6detail17ActorDetectOption Check__Q35mcoll6detail10RayCheckerFRCQ35mcoll6detail7LandSetRCQ33hel4math7Vector2RCQ33hel4math7Vector2RCQ35mcoll6detail17ActorDetectOption: /* 801BC514 001B8354 94 21 F9 90 */ stwu r1, -0x670(r1) @@ -541,7 +541,7 @@ lbl_801BCCCC: /* 801BCCDC 001B8B1C 42 00 FF F0 */ bdnz lbl_801BCCCC /* 801BCCE0 001B8B20 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251870 $$251870: .incbin "baserom.dol", 0x49A6E0, 0x4 diff --git a/asm/src/ReceiverBase.s b/asm/src/ReceiverBase.s index 9ea4683b..762b1c8e 100644 --- a/asm/src/ReceiverBase.s +++ b/asm/src/ReceiverBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6vacuum12ReceiverBaseFv __ct__Q43scn4step6vacuum12ReceiverBaseFv: /* 803D30BC 003CEEFC 3C 80 80 49 */ lis r4, __vt__Q43scn4step6vacuum12ReceiverBase@ha @@ -256,7 +256,7 @@ handle__Q34util42ObjRefHandle$$0Q43scn4step6vacuum9IReceiver$$15OwnerFv: /* 803D3424 003CF264 38 21 00 20 */ addi r1, r1, 0x20 /* 803D3428 003CF268 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6vacuum12ReceiverBase __vt__Q43scn4step6vacuum12ReceiverBase: .incbin "baserom.dol", 0x48EF40, 0x48 diff --git a/asm/src/Rect.s b/asm/src/Rect.s index c73a40ec..d81795c1 100644 --- a/asm/src/Rect.s +++ b/asm/src/Rect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33hel3geo4RectFv __ct__Q33hel3geo4RectFv: /* 8019FD54 0019BB94 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -356,7 +356,7 @@ lbl_801A01E4: /* 801A01F4 0019C034 D0 23 00 00 */ stfs f1, 0(r3) /* 801A01F8 0019C038 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249898 $$249898: .incbin "baserom.dol", 0x49A3E8, 0x4 diff --git a/asm/src/Regset.s b/asm/src/Regset.s index a101944c..5895f30f 100644 --- a/asm/src/Regset.s +++ b/asm/src/Regset.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm6RegsetFUlPQ26mintvm10IAllocator __ct__Q26mintvm6RegsetFUlPQ26mintvm10IAllocator: /* 801C6898 001C26D8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2238,7 +2238,7 @@ lbl_801C86FC: /* 801C8724 001C4564 38 21 00 20 */ addi r1, r1, 0x20 /* 801C8728 001C4568 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251070 $$251070: .incbin "baserom.dol", 0x457F98, 0xC @@ -2309,7 +2309,7 @@ $$2STRING$$2spDec__Q26mintvm6RegsetFUi$$20: $$2STRING$$2spDec__Q26mintvm6RegsetFUi: .incbin "baserom.dol", 0x458260, 0x38 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251259 $$251259: .incbin "baserom.dol", 0x493938, 0x8 @@ -2323,7 +2323,7 @@ $$251261: $$251262: .incbin "baserom.dol", 0x493950, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251099 $$251099: .incbin "baserom.dol", 0x49A728, 0x8 diff --git a/asm/src/RenderSetting.s b/asm/src/RenderSetting.s index fa579633..438129c2 100644 --- a/asm/src/RenderSetting.s +++ b/asm/src/RenderSetting.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_setCopyClear__27$$2unnamed$$2RenderSetting_cpp$$2Fv t_setCopyClear__27$$2unnamed$$2RenderSetting_cpp$$2Fv: /* 801962A8 001920E8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -816,7 +816,7 @@ endAABottomHalf__Q23gfx13RenderSettingFPv: /* 80196E24 00192C64 38 21 00 20 */ addi r1, r1, 0x20 /* 80196E28 00192C68 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248878 $$248878: .incbin "baserom.dol", 0x49A260, 0x4 diff --git a/asm/src/ReqHandle.s b/asm/src/ReqHandle.s index 51a29db6..da527b5a 100644 --- a/asm/src/ReqHandle.s +++ b/asm/src/ReqHandle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ostop9ReqHandleFv __ct__Q25ostop9ReqHandleFv: /* 801DA2DC 001D611C 38 00 00 00 */ li r0, 0 diff --git a/asm/src/RequestArg.s b/asm/src/RequestArg.s index f99dcfed..03e0a386 100644 --- a/asm/src/RequestArg.s +++ b/asm/src/RequestArg.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q36effect6detail10RequestArgFv __ct__Q36effect6detail10RequestArgFv: /* 80186BD0 00182A10 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/RequestArgOption.s b/asm/src/RequestArgOption.s index da68a02f..08ac2997 100644 --- a/asm/src/RequestArgOption.s +++ b/asm/src/RequestArgOption.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateP__Q36effect6detail16RequestArgOptionFRCQ33hel4math7Vector3 CreateP__Q36effect6detail16RequestArgOptionFRCQ33hel4math7Vector3: /* 80186DC8 00182C08 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -238,7 +238,7 @@ node__Q36effect6detail16RequestArgOptionCFv: /* 801870E4 00182F24 38 21 00 20 */ addi r1, r1, 0x20 /* 801870E8 00182F28 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global DEFAULT_SCALE__Q36effect6detail16RequestArgOption DEFAULT_SCALE__Q36effect6detail16RequestArgOption: .incbin "baserom.dol", 0x49A188, 0x4 diff --git a/asm/src/Requestor.s b/asm/src/Requestor.s index 7ecf35db..070ffc8c 100644 --- a/asm/src/Requestor.s +++ b/asm/src/Requestor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26effect9RequestorFRQ26effect7Manager __ct__Q26effect9RequestorFRQ26effect7Manager: /* 8017E670 0017A4B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -615,7 +615,7 @@ lbl_8017EE98: /* 8017EEA4 0017ACE4 38 21 00 10 */ addi r1, r1, 0x10 /* 8017EEA8 0017ACE8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6effect9RequestorFRQ43scn4step6effect7ManagerQ43scn4step6effect12DrawPriority __ct__Q43scn4step6effect9RequestorFRQ43scn4step6effect7ManagerQ43scn4step6effect12DrawPriority: /* 8027AFEC 00276E2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -758,7 +758,7 @@ native__Q43scn4step6effect9RequestorFv: /* 8027B120 00276F60 38 63 00 04 */ addi r3, r3, 4 /* 8027B124 00276F64 4B DA 93 7C */ b DefaultSwitchThreadCallback -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5ostop9RequestorFRQ33scn4step9Component __ct__Q43scn4step5ostop9RequestorFRQ33scn4step9Component: /* 803CAD40 003C6B80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -911,7 +911,7 @@ isActive__Q43scn4step5ostop9RequestorCFv: /* 803CAF30 003C6D70 38 63 00 04 */ addi r3, r3, 4 /* 803CAF34 003C6D74 4B DB 67 A0 */ b dataType__Q36effect6detail10GenContextCFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetPointerFromNode__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20 $$2STRING$$2GetPointerFromNode__Q34nw4r2ut77LinkList$$0Q24util56ObjListNode$$0Q36effect6detail6Effect$$4Q26effect9Requestor$$1$$40$$1FPQ34nw4r2ut12LinkListNode$$20: .incbin "baserom.dol", 0x44F360, 0x24 diff --git a/asm/src/ResFile.s b/asm/src/ResFile.s index c42a7f74..48f28d0f 100644 --- a/asm/src/ResFile.s +++ b/asm/src/ResFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d7ResFileFPCcb __ct__Q23g3d7ResFileFPCcb: /* 80193230 0018F070 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -145,7 +145,7 @@ lbl_8019341C: /* 80193430 0018F270 38 21 00 20 */ addi r1, r1, 0x20 /* 80193434 0018F274 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249003 $$249003: .incbin "baserom.dol", 0x450918, 0x14 diff --git a/asm/src/ResFileAccessor.s b/asm/src/ResFileAccessor.s index ffe280ca..b36d93c4 100644 --- a/asm/src/ResFileAccessor.s +++ b/asm/src/ResFileAccessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global bind__Q23g3d15ResFileAccessorCFRCQ23g3d15ResFileAccessorb bind__Q23g3d15ResFileAccessorCFRCQ23g3d15ResFileAccessorb: /* 80193438 0018F278 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -263,7 +263,7 @@ lbl_80193744: /* 80193758 0018F598 38 21 00 40 */ addi r1, r1, 0x40 /* 8019375C 0018F59C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249610 $$249610: .incbin "baserom.dol", 0x450968, 0xC diff --git a/asm/src/ResFileRepository.s b/asm/src/ResFileRepository.s index 1f9d5d9a..6c6718f6 100644 --- a/asm/src/ResFileRepository.s +++ b/asm/src/ResFileRepository.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d17ResFileRepositoryFv __ct__Q23g3d17ResFileRepositoryFv: /* 80193760 0018F5A0 38 A0 00 00 */ li r5, 0 diff --git a/asm/src/ResModel.s b/asm/src/ResModel.s index 51881d9a..c1bdc03d 100644 --- a/asm/src/ResModel.s +++ b/asm/src/ResModel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34nw4r3g3d6ResMdlFPv __ct__Q34nw4r3g3d6ResMdlFPv: /* 80193B9C 0018F9DC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/ResModelContext.s b/asm/src/ResModelContext.s index 88cac0f0..d5f7d6a4 100644 --- a/asm/src/ResModelContext.s +++ b/asm/src/ResModelContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DefaultEntryName__Q23g3d15ResModelContextFv DefaultEntryName__Q23g3d15ResModelContextFv: /* 80193CC8 0018FB08 38 6D 89 C0 */ addi r3, r13, $$249029-_SDA_BASE_ @@ -36,7 +36,7 @@ lbl_80193D0C: /* 80193D30 0018FB70 38 21 00 40 */ addi r1, r1, 0x40 /* 80193D34 0018FB74 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249029 $$249029: .incbin "baserom.dol", 0x4931C0, 0x8 diff --git a/asm/src/ResNode.s b/asm/src/ResNode.s index 4217d33d..8d0f2246 100644 --- a/asm/src/ResNode.s +++ b/asm/src/ResNode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d7ResNodeFv __ct__Q23g3d7ResNodeFv: /* 80193D38 0018FB78 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -175,7 +175,7 @@ rotate__Q23g3d7ResNodeCFv: /* 80193F6C 0018FDAC 38 21 00 10 */ addi r1, r1, 0x10 /* 80193F70 0018FDB0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2ref__Q34nw4r3g3d7ResNodeCFv$$20 $$2STRING$$2ref__Q34nw4r3g3d7ResNodeCFv$$20: .incbin "baserom.dol", 0x4509B0, 0x1C @@ -195,7 +195,7 @@ $$2STRING$$2GetMtxID__Q34nw4r3g3d7ResNodeCFv$$20: $$2STRING$$2GetMtxID__Q34nw4r3g3d7ResNodeCFv: .incbin "baserom.dol", 0x450A38, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __FUNCTION__$30525 __FUNCTION__$30525: .incbin "baserom.dol", 0x4931D0, 0x8 diff --git a/asm/src/Reset.s b/asm/src/Reset.s index 1f31a1a2..e6f14cb9 100644 --- a/asm/src/Reset.s +++ b/asm/src/Reset.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ReadyToRestartOrShutdown__Q23app5ResetFv ReadyToRestartOrShutdown__Q23app5ResetFv: /* 8017AC2C 00176A6C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -466,7 +466,7 @@ dvdCheckDiskCallback__Q23app5ResetFlP15DVDCommandBlock: /* 8017B1F0 00177030 38 80 00 02 */ li r4, 2 /* 8017B1F4 00177034 4B FF FF 10 */ b onCallback__Q23app5ResetFQ33app5Reset12CallbackKindl -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250602 $$250602: .incbin "baserom.dol", 0x493098, 0x4 @@ -474,7 +474,7 @@ $$250602: $$250603: .incbin "baserom.dol", 0x49309C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251058 $$251058: .incbin "baserom.dol", 0x49A118, 0x8 diff --git a/asm/src/ResidentFile.s b/asm/src/ResidentFile.s index 53e33d73..46d354e8 100644 --- a/asm/src/ResidentFile.s +++ b/asm/src/ResidentFile.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23app12ResidentFileFv __ct__Q23app12ResidentFileFv: /* 8017B1F8 00177038 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -242,7 +242,7 @@ lbl_8017B500: /* 8017B540 00177380 38 21 00 C0 */ addi r1, r1, 0xc0 /* 8017B544 00177384 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251961 $$251961: .incbin "baserom.dol", 0x44F120, 0x1C @@ -253,7 +253,7 @@ $$252401: $$252478: .incbin "baserom.dol", 0x44F154, 0x14 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_FILE_TABLE__Q23app26$$2unnamed$$2ResidentFile_cpp$$2 T_FILE_TABLE__Q23app26$$2unnamed$$2ResidentFile_cpp$$2: .incbin "baserom.dol", 0x49A128, 0x8 diff --git a/asm/src/Resource.s b/asm/src/Resource.s index 481d0cd5..be99ad3b 100644 --- a/asm/src/Resource.s +++ b/asm/src/Resource.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hbm8ResourceFRQ23mem7HeapExpb __ct__Q23hbm8ResourceFRQ23mem7HeapExpb: /* 8019D5D8 00199418 38 00 00 00 */ li r0, 0 diff --git a/asm/src/ResourceFileName.s b/asm/src/ResourceFileName.s index aa26819e..fd5b21de 100644 --- a/asm/src/ResourceFileName.s +++ b/asm/src/ResourceFileName.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetLayoutFileName__Q23hbm16ResourceFileNameFUc GetLayoutFileName__Q23hbm16ResourceFileNameFUc: /* 8019D834 00199674 54 60 06 3E */ clrlwi r0, r3, 0x18 @@ -34,7 +34,7 @@ lbl_8019D884: /* 8019D884 001996C4 80 6D 8A 34 */ lwz r3, MESSAGE_NORMAL_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2-_SDA_BASE_(r13) /* 8019D888 001996C8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248726 $$248726: .incbin "baserom.dol", 0x452A30, 0x14 @@ -60,7 +60,7 @@ $$248735: $$248736: .incbin "baserom.dol", 0x452AB4, 0x1C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global LAYOUT_ENG_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2 LAYOUT_ENG_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: .incbin "baserom.dol", 0x493228, 0x4 @@ -77,7 +77,7 @@ MESSAGE_NORMAL_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: MESSAGE_WARNING_FILENAME__Q23hbm30$$2unnamed$$2ResourceFileName_cpp$$2: .incbin "baserom.dol", 0x493238, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global CONFIG_FILENAME__Q23hbm16ResourceFileName CONFIG_FILENAME__Q23hbm16ResourceFileName: .incbin "baserom.dol", 0x49A358, 0x4 diff --git a/asm/src/Result.s b/asm/src/Result.s index ca1e6859..b6ab8380 100644 --- a/asm/src/Result.s +++ b/asm/src/Result.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick13challengedoor6ResultFv __ct__Q53scn4step7gimmick13challengedoor6ResultFv: /* 8030B070 00306EB0 38 00 00 00 */ li r0, 0 @@ -14,7 +14,7 @@ __ct__Q53scn4step7gimmick13challengedoor6ResultFv: /* 8030B090 00306ED0 90 03 00 14 */ stw r0, 0x14(r3) /* 8030B094 00306ED4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick4door6ResultFv __ct__Q53scn4step7gimmick4door6ResultFv: /* 8030EA10 0030A850 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -38,7 +38,7 @@ __ct__Q53scn4step7gimmick4door6ResultFv: /* 8030EA58 0030A898 38 21 00 10 */ addi r1, r1, 0x10 /* 8030EA5C 0030A89C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q63scn4step4info9challenge12masterresult6ResultFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q63scn4step4info9challenge12masterresult6ResultFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B5C00 003B1A40 94 21 F0 B0 */ stwu r1, -0xf50(r1) @@ -2865,7 +2865,7 @@ hideIcons__Q63scn4step4info9challenge12masterresult6ResultFRQ23lyt6Layout: /* 803B84F0 003B4330 38 21 00 E0 */ addi r1, r1, 0xe0 /* 803B84F4 003B4334 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253563 $$253563: .incbin "baserom.dol", 0x48C9D0, 0x14 @@ -3050,7 +3050,7 @@ $$258060: $$258062: .incbin "baserom.dol", 0x48CE30, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257487 $$257487: .incbin "baserom.dol", 0x497CD8, 0x8 @@ -3148,17 +3148,17 @@ $$258066: $$258067: .incbin "baserom.dol", 0x497DC8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249649 $$249649: .incbin "baserom.dol", 0x49D340, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249653 $$249653: .incbin "baserom.dol", 0x49D3C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257776 $$257776: .incbin "baserom.dol", 0x49E4A0, 0x8 diff --git a/asm/src/ResultLyt.s b/asm/src/ResultLyt.s index 05428cc3..3818b896 100644 --- a/asm/src/ResultLyt.s +++ b/asm/src/ResultLyt.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn15challengeresult4info9ResultLytFRQ43scn15challengeresult4info7ManagerRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessor __ct__Q43scn15challengeresult4info9ResultLytFRQ43scn15challengeresult4info7ManagerRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRCQ23lyt12PaneAccessor: /* 801F1B2C 001ED96C 94 21 FC F0 */ stwu r1, -0x310(r1) @@ -2912,7 +2912,7 @@ preLoadStage__Q43scn15challengeresult4info9ResultLytFv: /* 801F458C 001F03CC 38 21 00 E0 */ addi r1, r1, 0xe0 /* 801F4590 001F03D0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253950 $$253950: .incbin "baserom.dol", 0x45B1F8, 0x14 @@ -3115,7 +3115,7 @@ $$258980: $$258981: .incbin "baserom.dol", 0x45B6A0, 0x50 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258208 $$258208: .incbin "baserom.dol", 0x4941E8, 0x8 @@ -3252,7 +3252,7 @@ $$259089: $$259090: .incbin "baserom.dol", 0x494338, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258808 $$258808: .incbin "baserom.dol", 0x49A9A8, 0x8 diff --git a/asm/src/ResultSetter.s b/asm/src/ResultSetter.s index 3a9d60d5..481bd3c6 100644 --- a/asm/src/ResultSetter.s +++ b/asm/src/ResultSetter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause12ResultSetterFv __ct__Q25pause12ResultSetterFv: /* 801DF2E4 001DB124 38 00 00 09 */ li r0, 9 diff --git a/asm/src/ReverseWorld.s b/asm/src/ReverseWorld.s index dc51288b..c33cd215 100644 --- a/asm/src/ReverseWorld.s +++ b/asm/src/ReverseWorld.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx12ReverseWorldFRQ33scn4step9ComponentRQ23sfx7Manager __ct__Q43scn4step3sfx12ReverseWorldFRQ33scn4step9ComponentRQ23sfx7Manager: /* 803CE608 003CA448 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -488,7 +488,7 @@ lbl_803CECF8: /* 803CED44 003CAB84 38 21 00 80 */ addi r1, r1, 0x80 /* 803CED48 003CAB88 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254477 $$254477: .incbin "baserom.dol", 0x49E758, 0x4 diff --git a/asm/src/RomFontWrapper.s b/asm/src/RomFontWrapper.s index 9b1941c4..441a6287 100644 --- a/asm/src/RomFontWrapper.s +++ b/asm/src/RomFontWrapper.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23app14RomFontWrapperFv __ct__Q23app14RomFontWrapperFv: /* 8017B548 00177388 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/RoofChecker.s b/asm/src/RoofChecker.s index c564a66c..ce180ec4 100644 --- a/asm/src/RoofChecker.s +++ b/asm/src/RoofChecker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11RoofCheckerFRQ33scn4step9ComponentRQ43scn4step5chara8Location __ct__Q43scn4step4hero11RoofCheckerFRQ33scn4step9ComponentRQ43scn4step5chara8Location: /* 803540E8 0034FF28 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -148,7 +148,7 @@ lbl_803542F0: /* 80354300 00350140 38 21 06 E0 */ addi r1, r1, 0x6e0 /* 80354304 00350144 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252525 $$252525: .incbin "baserom.dol", 0x49D990, 0x4 diff --git a/asm/src/RoomGuarder.s b/asm/src/RoomGuarder.s index f2014fd8..f98b24bd 100644 --- a/asm/src/RoomGuarder.s +++ b/asm/src/RoomGuarder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick11roomguarder11RoomGuarderFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick11roomguarder11RoomGuarderFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8031B40C 0031724C 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -1030,7 +1030,7 @@ lbl_8031C284: .global obj__Q43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11roomguarder5Param$$1CFv obj__Q43scn4step7gimmick53ParamAccessor$$0Q53scn4step7gimmick11roomguarder5Param$$1CFv: /* 8031C298 003180D8 38 63 00 04 */ addi r3, r3, 4 -/* 8031C29C 003180DC 4B EF 1C E4 */ b dataHeadAddress__Q25xdata5XDataCFv +/* 8031C29C 003180DC 4B EF 1C E4 */ b dataHeadAddress__Q25.dataXDataCFv .global procAnim__Q53scn4step7gimmick11roomguarder11RoomGuarderFv procAnim__Q53scn4step7gimmick11roomguarder11RoomGuarderFv: @@ -3166,7 +3166,7 @@ lbl_8031E070: /* 8031E084 00319EC4 38 21 00 20 */ addi r1, r1, 0x20 /* 8031E088 00319EC8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$263446 $$263446: .incbin "baserom.dol", 0x47DCA8, 0x20 @@ -3174,7 +3174,7 @@ $$263446: $$263447: .incbin "baserom.dol", 0x47DCC8, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$263448 $$263448: .incbin "baserom.dol", 0x49D538, 0x4 diff --git a/asm/src/RoomGuarderMarker.s b/asm/src/RoomGuarderMarker.s index ba7d253e..865fd7c2 100644 --- a/asm/src/RoomGuarderMarker.s +++ b/asm/src/RoomGuarderMarker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick17roomguardermarker17RoomGuarderMarkerFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick17roomguardermarker17RoomGuarderMarkerFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8031E360 0031A1A0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/Root.s b/asm/src/Root.s index 8af10dbd..c49ec4cb 100644 --- a/asm/src/Root.s +++ b/asm/src/Root.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d4RootFRCQ23g3d11RootContext __ct__Q23g3d4RootFRCQ23g3d11RootContext: /* 80193F74 0018FDB4 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -505,7 +505,7 @@ lbl_80194608: /* 80194614 00190454 38 21 00 10 */ addi r1, r1, 0x10 /* 80194618 00190458 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252516 $$252516: .incbin "baserom.dol", 0x49A1E0, 0x4 diff --git a/asm/src/RootContext.s b/asm/src/RootContext.s index ae2326bb..78c988ec 100644 --- a/asm/src/RootContext.s +++ b/asm/src/RootContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d11RootContextFRQ23mem10IAllocatorUlUlUlUl __ct__Q23g3d11RootContextFRQ23mem10IAllocatorUlUlUlUl: /* 8019461C 0019045C 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/RotAnim.s b/asm/src/RotAnim.s index 768eab99..4329e157 100644 --- a/asm/src/RotAnim.s +++ b/asm/src/RotAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item7RotAnimFRQ43scn4step4item4Item __ct__Q43scn4step4item7RotAnimFRQ43scn4step4item4Item: /* 803C5060 003C0EA0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -118,7 +118,7 @@ lbl_803C51E0: /* 803C51E0 003C1020 C0 22 DA BC */ lfs f1, $$254905-_SDA2_BASE_(r2) /* 803C51E4 003C1024 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254904 $$254904: .incbin "baserom.dol", 0x49E578, 0x4 diff --git a/asm/src/RotController.s b/asm/src/RotController.s index 6774b6a5..324c535e 100644 --- a/asm/src/RotController.s +++ b/asm/src/RotController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera13RotControllerFf __ct__Q43scn4step6camera13RotControllerFf: /* 802671A4 00262FE4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -546,7 +546,7 @@ lbl_8026787C: /* 80267890 002636D0 38 21 00 20 */ addi r1, r1, 0x20 /* 80267894 002636D4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250424 $$250424: .incbin "baserom.dol", 0x49B708, 0x4 diff --git a/asm/src/RotControllerData.s b/asm/src/RotControllerData.s index 5f462d5f..19c08838 100644 --- a/asm/src/RotControllerData.s +++ b/asm/src/RotControllerData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera17RotControllerDataFv __ct__Q43scn4step6camera17RotControllerDataFv: /* 80267898 002636D8 38 00 00 00 */ li r0, 0 @@ -19,7 +19,7 @@ __ct__Q43scn4step6camera17RotControllerDataFUlffb: /* 802678C0 00263700 98 A3 00 0C */ stb r5, 0xc(r3) /* 802678C4 00263704 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249657 $$249657: .incbin "baserom.dol", 0x49B710, 0x8 diff --git a/asm/src/RotCtrl.s b/asm/src/RotCtrl.s index c0689178..35bf85fd 100644 --- a/asm/src/RotCtrl.s +++ b/asm/src/RotCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7RotCtrlFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero7RotCtrlFRQ43scn4step4hero4Hero: /* 80354308 00350148 90 83 00 00 */ stw r4, 0(r3) @@ -111,12 +111,12 @@ lbl_80354468: /* 80354484 003502C4 38 21 00 90 */ addi r1, r1, 0x90 /* 80354488 003502C8 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256335 $$256335: .incbin "baserom.dol", 0x496E18, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256857 $$256857: .incbin "baserom.dol", 0x49D9A0, 0x8 diff --git a/asm/src/Rumble.s b/asm/src/Rumble.s index df437436..6ce6b38b 100644 --- a/asm/src/Rumble.s +++ b/asm/src/Rumble.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect6RumbleFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn19challengefileselect6RumbleFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 801E42FC 001E013C 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -93,7 +93,7 @@ cursorPane__Q33scn19challengefileselect6RumbleFv: __dt__Q33scn19challengefileselect6RumbleFv: /* 801E43F0 001E0230 4B FF EF 0C */ b __dt__Q33scn19challengefileselect6DeleteFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251963 $$251963: .incbin "baserom.dol", 0x45A378, 0x1C @@ -104,7 +104,7 @@ $$252003: __vt__Q33scn19challengefileselect6Rumble: .incbin "baserom.dol", 0x45A3A0, 0x30 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251964 $$251964: .incbin "baserom.dol", 0x493F38, 0x8 diff --git a/asm/src/RumbleManager.s b/asm/src/RumbleManager.s index eb56ddd0..923317be 100644 --- a/asm/src/RumbleManager.s +++ b/asm/src/RumbleManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hid13RumbleManagerFQ23hid18RumbleResourceKind __ct__Q23hid13RumbleManagerFQ23hid18RumbleResourceKind: /* 801A3A5C 0019F89C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/RumbleRequestor.s b/asm/src/RumbleRequestor.s index 93373a36..067cda70 100644 --- a/asm/src/RumbleRequestor.s +++ b/asm/src/RumbleRequestor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hid15RumbleRequestorFRQ23hid13RumbleManagerUl __ct__Q23hid15RumbleRequestorFRQ23hid13RumbleManagerUl: /* 801A3E44 0019FC84 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/RumbleResource.s b/asm/src/RumbleResource.s index bda8d6c5..4f9ac3a5 100644 --- a/asm/src/RumbleResource.s +++ b/asm/src/RumbleResource.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hid14RumbleResourceFQ23hid18RumbleResourceKind __ct__Q23hid14RumbleResourceFQ23hid18RumbleResourceKind: /* 801A4178 0019FFB8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -35,7 +35,7 @@ commandList__Q23hid14RumbleResourceCFUl: /* 801A41E0 001A0020 7C 7E 1B 78 */ mr r30, r3 /* 801A41E4 001A0024 7C 9F 23 78 */ mr r31, r4 /* 801A41E8 001A0028 38 63 00 04 */ addi r3, r3, 4 -/* 801A41EC 001A002C 4B FE 2F 81 */ bl isValidData__Q25xdata5XDataCFv +/* 801A41EC 001A002C 4B FE 2F 81 */ bl isValidData__Q25.dataXDataCFv /* 801A41F0 001A0030 2C 03 00 00 */ cmpwi r3, 0 /* 801A41F4 001A0034 41 82 00 10 */ beq lbl_801A4204 /* 801A41F8 001A0038 80 7E 00 04 */ lwz r3, 4(r30) @@ -48,7 +48,7 @@ lbl_801A4208: /* 801A420C 001A004C 7C 63 02 14 */ add r3, r3, r0 /* 801A4210 001A0050 83 E3 00 04 */ lwz r31, 4(r3) /* 801A4214 001A0054 38 7E 00 04 */ addi r3, r30, 4 -/* 801A4218 001A0058 4B FE 2F 55 */ bl isValidData__Q25xdata5XDataCFv +/* 801A4218 001A0058 4B FE 2F 55 */ bl isValidData__Q25.dataXDataCFv /* 801A421C 001A005C 2C 03 00 00 */ cmpwi r3, 0 /* 801A4220 001A0060 40 82 00 0C */ bne lbl_801A422C /* 801A4224 001A0064 38 60 00 00 */ li r3, 0 @@ -73,7 +73,7 @@ lbl_801A4250: /* 801A4260 001A00A0 38 21 00 10 */ addi r1, r1, 0x10 /* 801A4264 001A00A4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248751 $$248751: .incbin "baserom.dol", 0x453040, 0x1C @@ -81,7 +81,7 @@ $$248751: $$248752: .incbin "baserom.dol", 0x45305C, 0x24 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_DAT_PATH_TABLE__Q23hid28$$2unnamed$$2RumbleResource_cpp$$2 T_DAT_PATH_TABLE__Q23hid28$$2unnamed$$2RumbleResource_cpp$$2: .incbin "baserom.dol", 0x493280, 0x8 diff --git a/asm/src/RumbleSetting.s b/asm/src/RumbleSetting.s index bcb1c80c..b4803a22 100644 --- a/asm/src/RumbleSetting.s +++ b/asm/src/RumbleSetting.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect13RumbleSettingFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ23hid13RumbleManager __ct__Q33scn19challengefileselect13RumbleSettingFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ23hid13RumbleManager: /* 801E43F4 001E0234 94 21 FF 20 */ stwu r1, -0xe0(r1) @@ -405,7 +405,7 @@ lbl_801E4994: /* 801E49B4 001E07F4 38 21 00 10 */ addi r1, r1, 0x10 /* 801E49B8 001E07F8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252673 $$252673: .incbin "baserom.dol", 0x45A3D0, 0x1C @@ -431,7 +431,7 @@ $$252679: $$252680: .incbin "baserom.dol", 0x45A43C, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252745 $$252745: .incbin "baserom.dol", 0x493F60, 0x8 diff --git a/asm/src/RunChecker.s b/asm/src/RunChecker.s index 211e02c0..d6501e0f 100644 --- a/asm/src/RunChecker.s +++ b/asm/src/RunChecker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero10RunCheckerFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero10RunCheckerFRQ43scn4step4hero4Hero: /* 8035448C 003502CC 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/Runner.s b/asm/src/Runner.s index 6e928c71..7ab11eeb 100644 --- a/asm/src/Runner.s +++ b/asm/src/Runner.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24mint6RunnerFRCQ24mint6Engine __ct__Q24mint6RunnerFRCQ24mint6Engine: /* 801C0778 001BC5B8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -274,7 +274,7 @@ lbl_801C0AD0: /* 801C0AF8 001BC938 38 21 00 30 */ addi r1, r1, 0x30 /* 801C0AFC 001BC93C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm6RunnerFRCQ26mintvm6VMCoreUlPQ26mintvm10IAllocator __ct__Q26mintvm6RunnerFRCQ26mintvm6VMCoreUlPQ26mintvm10IAllocator: /* 801C872C 001C456C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1790,7 +1790,7 @@ lbl_801C9D44: /* 801C9D54 001C5B94 38 21 00 20 */ addi r1, r1, 0x20 /* 801C9D58 001C5B98 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2Instance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20 $$2STRING$$2Instance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv$$20: .incbin "baserom.dol", 0x455EE0, 0x14 @@ -1798,7 +1798,7 @@ $$2STRING$$2Instance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv $$2STRING$$2Instance__Q26mintvm41ExplicitSingleton$$0Q26mintvm11MintSetting$$1Fv: .incbin "baserom.dol", 0x455EF4, 0x1C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252995 $$252995: .incbin "baserom.dol", 0x458298, 0xC diff --git a/asm/src/SCWaftCtrl.s b/asm/src/SCWaftCtrl.s index 366af1e9..2dec5904 100644 --- a/asm/src/SCWaftCtrl.s +++ b/asm/src/SCWaftCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster10SCWaftCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster10SCWaftCtrlFRQ43scn4step4boss4Boss: /* 8023F8A4 0023B6E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -154,7 +154,7 @@ lbl_8023F99C: /* 8023FAD8 0023B918 38 21 00 80 */ addi r1, r1, 0x80 /* 8023FADC 0023B91C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250562 $$250562: .incbin "baserom.dol", 0x49B060, 0x4 diff --git a/asm/src/SDKAllocator.s b/asm/src/SDKAllocator.s index 3d49e45f..76971c20 100644 --- a/asm/src/SDKAllocator.s +++ b/asm/src/SDKAllocator.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem12SDKAllocatorFRQ23mem10IAllocatori __ct__Q23mem12SDKAllocatorFRQ23mem10IAllocatori: /* 801BF760 001BB5A0 90 83 00 00 */ stw r4, 0(r3) @@ -29,7 +29,7 @@ Free__Q23mem12SDKAllocatorFP12MEMAllocatorPv: /* 801BF7A4 001BB5E4 7D 89 03 A6 */ mtctr r12 /* 801BF7A8 001BB5E8 4E 80 04 20 */ bctr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global AllocatorFunc__Q23mem12SDKAllocator AllocatorFunc__Q23mem12SDKAllocator: .incbin "baserom.dol", 0x49A6F8, 0x8 diff --git a/asm/src/SERequestor.s b/asm/src/SERequestor.s index 18b42042..66151026 100644 --- a/asm/src/SERequestor.s +++ b/asm/src/SERequestor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23snd11SERequestorFv __ct__Q23snd11SERequestorFv: /* 80402A6C 003FE8AC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -348,7 +348,7 @@ updateOutput__Q23snd11SERequestorFv: /* 80402ED8 003FED18 4B D0 3A 28 */ b SetOutputLine__Q44nw4r3snd6detail10BasicSoundFi /* 80402EDC 003FED1C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut79LinkList$$0Q24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util58ObjListNode$$0Q23snd11SERequestor$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x4926D0, 0x24 diff --git a/asm/src/SIntAABBox.s b/asm/src/SIntAABBox.s index ee988c18..c9ed3178 100644 --- a/asm/src/SIntAABBox.s +++ b/asm/src/SIntAABBox.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24util10SIntAABBoxFv __ct__Q24util10SIntAABBoxFv: /* 80405B68 004019A8 3C 80 80 00 */ lis r4, 0x7FFFFFFF@ha diff --git a/asm/src/SaveInfo.s b/asm/src/SaveInfo.s index db0af429..da3652cb 100644 --- a/asm/src/SaveInfo.s +++ b/asm/src/SaveInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tAllocator__Q23app22$$2unnamed$$2SaveInfo_cpp$$2Fv tAllocator__Q23app22$$2unnamed$$2SaveInfo_cpp$$2Fv: /* 8017B63C 0017747C 80 6D ED 00 */ lwz r3, object___Q33hel6common32ExplicitSingleton$$0Q23mem6Memory$$1-_SDA_BASE_(r13) @@ -423,7 +423,7 @@ requestSave__Q23app8SaveInfoFv: /* 8017BBD4 00177A14 38 21 00 10 */ addi r1, r1, 0x10 /* 8017BBD8 00177A18 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252513 $$252513: .incbin "baserom.dol", 0x44F168, 0x10 @@ -446,7 +446,7 @@ $$252582: $$252583: .incbin "baserom.dol", 0x44F1C0, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252516 $$252516: .incbin "baserom.dol", 0x4930A0, 0x8 diff --git a/asm/src/SceneAnim.s b/asm/src/SceneAnim.s index 87029755..8d7f4543 100644 --- a/asm/src/SceneAnim.s +++ b/asm/src/SceneAnim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d9SceneAnimFRCQ23g3d16SceneAnimContext __ct__Q23g3d9SceneAnimFRCQ23g3d16SceneAnimContext: /* 80194634 00190474 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -286,7 +286,7 @@ lbl_801949D4: /* 801949E4 00190824 38 21 00 20 */ addi r1, r1, 0x20 /* 801949E8 00190828 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmScnFv $$2STRING$$2GetClassName__Q34nw4r3g3d9ResAnmScnFv: .incbin "baserom.dol", 0x450A50, 0xC @@ -297,12 +297,12 @@ $$2STRING$$2ref__Q34nw4r3g3d9ResAnmScnCFv$$20: $$2STRING$$2ref__Q34nw4r3g3d9ResAnmScnCFv: .incbin "baserom.dol", 0x450A78, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __FUNCTION__$36033 __FUNCTION__$36033: .incbin "baserom.dol", 0x4931D8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249337 $$249337: .incbin "baserom.dol", 0x49A1F8, 0x8 diff --git a/asm/src/SceneAnime.s b/asm/src/SceneAnime.s index 7169b971..1b028121 100644 --- a/asm/src/SceneAnime.s +++ b/asm/src/SceneAnime.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn5anime10SceneAnime$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn5anime10SceneAnime$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 801E2954 001DE794 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -453,7 +453,7 @@ GetRuntimeTypeInfo__Q33scn5anime10SceneAnimeCFv: GetRuntimeTypeInfo__Q23scn6ISceneCFv: /* 801E2F80 001DEDC0 4B F9 1D 6C */ b RuntimeTypeInfoImpl$$0Q23scn6IScene$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252934 $$252934: .incbin "baserom.dol", 0x459F60, 0x10 diff --git a/asm/src/SceneChallengeFileSelect.s b/asm/src/SceneChallengeFileSelect.s index d0452fd2..da743292 100644 --- a/asm/src/SceneChallengeFileSelect.s +++ b/asm/src/SceneChallengeFileSelect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn19challengefileselect24SceneChallengeFileSelect$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn19challengefileselect24SceneChallengeFileSelect$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 801E49BC 001E07FC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5072,12 +5072,12 @@ __dt__Q43std3tr16detail315function_imp$$0PFv_v$$4Q43std3tr16detail271bound_func$ __dt__Q43std3tr16detail348function_imp$$0PFv_b$$4Q43std3tr16detail304bound_func$$0b$$4Q43std3tr16detail49mem_fn_0_c$$0b$$4Q33scn19challengefileselect7IButton$$1$$4Q33std3tr1208tuple$$0Q33std3tr154reference_wrapper$$0Q33scn19challengefileselect7IButton$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv: /* 801E91F0 001E5030 4B FF FF 34 */ b __dt__Q43std3tr16detail362function_imp$$0PFv_b$$4Q43std3tr16detail318bound_func$$0b$$4Q43std3tr16detail56mem_fn_0_c$$0b$$4Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr1215tuple$$0Q33std3tr161reference_wrapper$$0Q33scn19challengefileselect13DeleteConfirm$$1$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$4Q33std3tr13nat$$1$$1$$40$$40$$1Fv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$258868 $$258868: .incbin "baserom.dol", 0x411608, 0xF0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$265146 $$265146: .incbin "baserom.dol", 0x45A480, 0x18 @@ -5223,7 +5223,7 @@ __vt__Q43std3tr16detail20function_base$$0PFv_v$$1: __vt__Q33scn19challengefileselect24SceneChallengeFileSelect: .incbin "baserom.dol", 0x45A7F0, 0xB8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$265314 $$265314: .incbin "baserom.dol", 0x493F70, 0x8 @@ -5288,7 +5288,7 @@ $$265927: $$265928: .incbin "baserom.dol", 0x49400C, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$265328 $$265328: .incbin "baserom.dol", 0x49A868, 0x4 diff --git a/asm/src/SceneChallengeResult.s b/asm/src/SceneChallengeResult.s index c4dc218d..a761429f 100644 --- a/asm/src/SceneChallengeResult.s +++ b/asm/src/SceneChallengeResult.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn15challengeresult20SceneChallengeResult$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn15challengeresult20SceneChallengeResult$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 801F0548 001EC388 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -820,7 +820,7 @@ lbl_801F10B4: GetRuntimeTypeInfo__Q33scn15challengeresult20SceneChallengeResultCFv: /* 801F10BC 001ECEFC 4B FF F4 8C */ b RuntimeTypeInfoImpl$$0Q33scn15challengeresult20SceneChallengeResult$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254440 $$254440: .incbin "baserom.dol", 0x45B0F0, 0x14 @@ -828,12 +828,12 @@ $$254440: __vt__Q33scn15challengeresult20SceneChallengeResult: .incbin "baserom.dol", 0x45B104, 0x24 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254439 $$254439: .incbin "baserom.dol", 0x4941C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253533 $$253533: .incbin "baserom.dol", 0x49A968, 0x4 diff --git a/asm/src/SceneChallengeTitle.s b/asm/src/SceneChallengeTitle.s index 90b4c65b..517a5158 100644 --- a/asm/src/SceneChallengeTitle.s +++ b/asm/src/SceneChallengeTitle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn14challengetitle19SceneChallengeTitle$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn14challengetitle19SceneChallengeTitle$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 801EF56C 001EB3AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -456,7 +456,7 @@ isAutoEnd__Q33scn14challengetitle19SceneChallengeTitleCFv: GetRuntimeTypeInfo__Q33scn14challengetitle19SceneChallengeTitleCFv: /* 801EFBBC 001EB9FC 4B FF F9 B0 */ b RuntimeTypeInfoImpl$$0Q33scn14challengetitle19SceneChallengeTitle$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252713 $$252713: .incbin "baserom.dol", 0x45AE78, 0x18 diff --git a/asm/src/SceneChallengeTutorial.s b/asm/src/SceneChallengeTutorial.s index 01463755..faf23f1b 100644 --- a/asm/src/SceneChallengeTutorial.s +++ b/asm/src/SceneChallengeTutorial.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn17challengetutorial22SceneChallengeTutorial$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn17challengetutorial22SceneChallengeTutorial$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 801F6780 001F25C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -633,7 +633,7 @@ isSceneEnd__Q33scn17challengetutorial22SceneChallengeTutorialCFv: GetRuntimeTypeInfo__Q33scn17challengetutorial22SceneChallengeTutorialCFv: /* 801F7044 001F2E84 4B FF F7 3C */ b RuntimeTypeInfoImpl$$0Q33scn17challengetutorial22SceneChallengeTutorial$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253516 $$253516: .incbin "baserom.dol", 0x45B988, 0x10 @@ -656,7 +656,7 @@ $$253523: __vt__Q33scn17challengetutorial22SceneChallengeTutorial: .incbin "baserom.dol", 0x45BA54, 0x5C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252749 $$252749: .incbin "baserom.dol", 0x49A9D8, 0x4 diff --git a/asm/src/SceneChanger.s b/asm/src/SceneChanger.s index 56f2a176..fed3590a 100644 --- a/asm/src/SceneChanger.s +++ b/asm/src/SceneChanger.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core12SceneChangerFRQ33scn4step9Component __ct__Q43scn4step4core12SceneChangerFRQ33scn4step9Component: /* 80278514 00274354 94 21 FB 30 */ stwu r1, -0x4d0(r1) diff --git a/asm/src/SceneComic.s b/asm/src/SceneComic.s index 4b99c778..c333c8e6 100644 --- a/asm/src/SceneComic.s +++ b/asm/src/SceneComic.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn5comic10SceneComic$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn5comic10SceneComic$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80200324 001FC164 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -274,7 +274,7 @@ isSceneEnd__Q33scn5comic10SceneComicCFv: GetRuntimeTypeInfo__Q33scn5comic10SceneComicCFv: /* 802006DC 001FC51C 4B FF FC 48 */ b RuntimeTypeInfoImpl$$0Q33scn5comic10SceneComic$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251709 $$251709: .incbin "baserom.dol", 0x45C458, 0x10 diff --git a/asm/src/SceneGrandMenu.s b/asm/src/SceneGrandMenu.s index 3c988fbe..c2757d85 100644 --- a/asm/src/SceneGrandMenu.s +++ b/asm/src/SceneGrandMenu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn9grandmenu14SceneGrandMenu$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn9grandmenu14SceneGrandMenu$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803F3F90 003EFDD0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -416,7 +416,7 @@ result__Q33scn9grandmenu14SceneGrandMenuCFv: GetRuntimeTypeInfo__Q33scn9grandmenu14SceneGrandMenuCFv: /* 803F4548 003F0388 4B FF FA 48 */ b RuntimeTypeInfoImpl$$0Q33scn9grandmenu14SceneGrandMenu$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249814 $$249814: .incbin "baserom.dol", 0x491718, 0x14 diff --git a/asm/src/SceneGrandTitle.s b/asm/src/SceneGrandTitle.s index 231e99f5..f12c7767 100644 --- a/asm/src/SceneGrandTitle.s +++ b/asm/src/SceneGrandTitle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn10grandtitle15SceneGrandTitle$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn10grandtitle15SceneGrandTitle$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80205D44 00201B84 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -420,7 +420,7 @@ result__Q33scn10grandtitle15SceneGrandTitleCFv: GetRuntimeTypeInfo__Q33scn10grandtitle15SceneGrandTitleCFv: /* 8020630C 0020214C 4B FF FA 38 */ b RuntimeTypeInfoImpl$$0Q33scn10grandtitle15SceneGrandTitle$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252619 $$252619: .incbin "baserom.dol", 0x45CAA0, 0x14 diff --git a/asm/src/SceneHistory.s b/asm/src/SceneHistory.s index cd68fd3b..77e43cd9 100644 --- a/asm/src/SceneHistory.s +++ b/asm/src/SceneHistory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn7history12SceneHistory$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn7history12SceneHistory$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 8020E664 0020A4A4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -309,7 +309,7 @@ result__Q33scn7history12SceneHistoryCFv: GetRuntimeTypeInfo__Q33scn7history12SceneHistoryCFv: /* 8020EA80 0020A8C0 4B FF FB E4 */ b RuntimeTypeInfoImpl$$0Q33scn7history12SceneHistory$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254220 $$254220: .incbin "baserom.dol", 0x45D618, 0x14 diff --git a/asm/src/SceneInit.s b/asm/src/SceneInit.s index e261065f..4c8cdc67 100644 --- a/asm/src/SceneInit.s +++ b/asm/src/SceneInit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn4init9SceneInit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn4init9SceneInit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 8021B7D4 00217614 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -590,7 +590,7 @@ isButtonReceived__Q33scn4init9SceneInitCFv: GetRuntimeTypeInfo__Q33scn4init9SceneInitCFv: /* 8021C058 00217E98 4B FF F7 7C */ b RuntimeTypeInfoImpl$$0Q33scn4init9SceneInit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253204 $$253204: .incbin "baserom.dol", 0x45F7C8, 0x10 @@ -625,7 +625,7 @@ $$253298: __vt__Q33scn4init9SceneInit: .incbin "baserom.dol", 0x45F874, 0x8C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253207 $$253207: .incbin "baserom.dol", 0x495128, 0x8 @@ -648,7 +648,7 @@ $$253293: $$253296: .incbin "baserom.dol", 0x495158, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252157 $$252157: .incbin "baserom.dol", 0x49AD38, 0x4 diff --git a/asm/src/ScenePackageList.s b/asm/src/ScenePackageList.s index 63d64dbf..cdab34a7 100644 --- a/asm/src/ScenePackageList.s +++ b/asm/src/ScenePackageList.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn11packagelist16ScenePackageList$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn11packagelist16ScenePackageList$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 8021C954 00218794 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -256,7 +256,7 @@ isSceneEnd__Q33scn11packagelist16ScenePackageListCFv: GetRuntimeTypeInfo__Q33scn11packagelist16ScenePackageListCFv: /* 8021CCC4 00218B04 4B FF FC 90 */ b RuntimeTypeInfoImpl$$0Q33scn11packagelist16ScenePackageList$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252048 $$252048: .incbin "baserom.dol", 0x45FA20, 0x18 diff --git a/asm/src/SceneStaffCredit.s b/asm/src/SceneStaffCredit.s index 7f3ad98f..7126b77f 100644 --- a/asm/src/SceneStaffCredit.s +++ b/asm/src/SceneStaffCredit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn11staffcredit16SceneStaffCredit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn11staffcredit16SceneStaffCredit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803F9B7C 003F59BC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -321,7 +321,7 @@ lbl_803F9F04: GetRuntimeTypeInfo__Q33scn11staffcredit16SceneStaffCreditCFv: /* 803F9FD4 003F5E14 4B FF FB A8 */ b RuntimeTypeInfoImpl$$0Q33scn11staffcredit16SceneStaffCredit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252494 $$252494: .incbin "baserom.dol", 0x4920A8, 0x10 diff --git a/asm/src/SceneStep.s b/asm/src/SceneStep.s index fef2383f..6e3c6f2b 100644 --- a/asm/src/SceneStep.s +++ b/asm/src/SceneStep.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn4step9SceneStep$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn4step9SceneStep$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 802217A4 0021D5E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -499,7 +499,7 @@ result__Q33scn4step9SceneStepCFv: GetRuntimeTypeInfo__Q33scn4step9SceneStepCFv: /* 80221E74 0021DCB4 4B FF F9 30 */ b RuntimeTypeInfoImpl$$0Q33scn4step9SceneStep$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252721 $$252721: .incbin "baserom.dol", 0x45FC10, 0x14 diff --git a/asm/src/SceneStrap.s b/asm/src/SceneStrap.s index 39142ecd..9ef59922 100644 --- a/asm/src/SceneStrap.s +++ b/asm/src/SceneStrap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn5strap10SceneStrap$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn5strap10SceneStrap$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803F20EC 003EDF2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -513,7 +513,7 @@ isSceneEnd__Q33scn5strap10SceneStrapCFv: GetRuntimeTypeInfo__Q33scn5strap10SceneStrapCFv: /* 803F2830 003EE670 4B FF F8 BC */ b RuntimeTypeInfoImpl$$0Q33scn5strap10SceneStrap$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252931 $$252931: .incbin "baserom.dol", 0x491510, 0x14 @@ -554,7 +554,7 @@ $$253027: __vt__Q33scn5strap10SceneStrap: .incbin "baserom.dol", 0x4915F0, 0x58 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252932 $$252932: .incbin "baserom.dol", 0x498860, 0x8 @@ -562,7 +562,7 @@ $$252932: $$253025: .incbin "baserom.dol", 0x498868, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252128 $$252128: .incbin "baserom.dol", 0x49ED20, 0x4 diff --git a/asm/src/SceneVC.s b/asm/src/SceneVC.s index 9af79afc..fe5db214 100644 --- a/asm/src/SceneVC.s +++ b/asm/src/SceneVC.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q33scn2vc7SceneVC$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q33scn2vc7SceneVC$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803F28F0 003EE730 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -170,7 +170,7 @@ lbl_803F2B00: /* 803F2B14 003EE954 38 21 00 10 */ addi r1, r1, 0x10 /* 803F2B18 003EE958 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q33scn2vc7SceneVC __vt__Q33scn2vc7SceneVC: .incbin "baserom.dol", 0x4916F0, 0x28 diff --git a/asm/src/Scn__ChallengeTitle__Chara.s b/asm/src/Scn__ChallengeTitle__Chara.s index 4407eeea..c418e56d 100644 --- a/asm/src/Scn__ChallengeTitle__Chara.s +++ b/asm/src/Scn__ChallengeTitle__Chara.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue26Scn__ChallengeTitle__CharaFRQ26mintvm6VMCore AddOn__Q28mintglue26Scn__ChallengeTitle__CharaFRQ26mintvm6VMCore: /* 801C3464 001BF2A4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -641,7 +641,7 @@ setRandomFrame__Q28mintglue26Scn__ChallengeTitle__CharaFv: /* 801C3D1C 001BFB5C 38 21 00 10 */ addi r1, r1, 0x10 /* 801C3D20 001BFB60 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256033 $$256033: .incbin "baserom.dol", 0x456B88, 0x1C @@ -715,12 +715,12 @@ $$256141: $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv: .incbin "baserom.dol", 0x456D34, 0x8C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv$$20 $$2STRING$$2ref__Q26mintvm37MintPtr$$0Q33scn14challengetitle5Chara$$1CFv$$20: .incbin "baserom.dol", 0x4936D8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256148 $$256148: .incbin "baserom.dol", 0x49A708, 0x8 diff --git a/asm/src/Scn__ChallengeTitle__Commander.s b/asm/src/Scn__ChallengeTitle__Commander.s index cd408ea2..02c2f6f5 100644 --- a/asm/src/Scn__ChallengeTitle__Commander.s +++ b/asm/src/Scn__ChallengeTitle__Commander.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue30Scn__ChallengeTitle__CommanderFRQ26mintvm6VMCore AddOn__Q28mintglue30Scn__ChallengeTitle__CommanderFRQ26mintvm6VMCore: /* 801C3D24 001BFB64 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -287,7 +287,7 @@ lbl_801C4084: /* 801C4090 001BFED0 38 21 00 10 */ addi r1, r1, 0x10 /* 801C4094 001BFED4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255876 $$255876: .incbin "baserom.dol", 0x456DC0, 0x20 diff --git a/asm/src/Scn__GrandTitle__Block.s b/asm/src/Scn__GrandTitle__Block.s index 120d571f..d7e4605e 100644 --- a/asm/src/Scn__GrandTitle__Block.s +++ b/asm/src/Scn__GrandTitle__Block.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue22Scn__GrandTitle__BlockFRQ26mintvm6VMCore AddOn__Q28mintglue22Scn__GrandTitle__BlockFRQ26mintvm6VMCore: /* 801C4098 001BFED8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -165,7 +165,7 @@ setVisibility__Q28mintglue22Scn__GrandTitle__BlockFb: /* 801C42D4 001C0114 38 21 00 10 */ addi r1, r1, 0x10 /* 801C42D8 001C0118 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254950 $$254950: .incbin "baserom.dol", 0x457018, 0x18 @@ -185,7 +185,7 @@ $$254989: $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv: .incbin "baserom.dol", 0x457080, 0x60 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv$$20 $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Block$$1CFv$$20: .incbin "baserom.dol", 0x4936E0, 0x8 diff --git a/asm/src/Scn__GrandTitle__Chara.s b/asm/src/Scn__GrandTitle__Chara.s index 27016ffe..8a834343 100644 --- a/asm/src/Scn__GrandTitle__Chara.s +++ b/asm/src/Scn__GrandTitle__Chara.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue22Scn__GrandTitle__CharaFRQ26mintvm6VMCore AddOn__Q28mintglue22Scn__GrandTitle__CharaFRQ26mintvm6VMCore: /* 801C42DC 001C011C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -888,7 +888,7 @@ isCelebrateAnimPlayed__Q28mintglue22Scn__GrandTitle__CharaFv: /* 801C4F04 001C0D44 38 21 00 10 */ addi r1, r1, 0x10 /* 801C4F08 001C0D48 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256054 $$256054: .incbin "baserom.dol", 0x4570E0, 0x18 @@ -980,12 +980,12 @@ $$256191: $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv: .incbin "baserom.dol", 0x457330, 0x88 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv$$20 $$2STRING$$2ref__Q26mintvm33MintPtr$$0Q33scn10grandtitle5Chara$$1CFv$$20: .incbin "baserom.dol", 0x4936E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256198 $$256198: .incbin "baserom.dol", 0x49A710, 0x8 diff --git a/asm/src/Scn__GrandTitle__Commander.s b/asm/src/Scn__GrandTitle__Commander.s index 09018d58..555cf674 100644 --- a/asm/src/Scn__GrandTitle__Commander.s +++ b/asm/src/Scn__GrandTitle__Commander.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global AddOn__Q28mintglue26Scn__GrandTitle__CommanderFRQ26mintvm6VMCore AddOn__Q28mintglue26Scn__GrandTitle__CommanderFRQ26mintvm6VMCore: /* 801C4F0C 001C0D4C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -470,7 +470,7 @@ lbl_801C54BC: /* 801C54C8 001C1308 38 21 00 10 */ addi r1, r1, 0x10 /* 801C54CC 001C130C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256032 $$256032: .incbin "baserom.dol", 0x4573B8, 0x1C diff --git a/asm/src/Score.s b/asm/src/Score.s index ec40bd8d..667047d8 100644 --- a/asm/src/Score.s +++ b/asm/src/Score.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step9challenge5ScoreFv __ct__Q43scn4step9challenge5ScoreFv: /* 8026999C 002657DC 38 00 00 00 */ li r0, 0 @@ -530,7 +530,7 @@ lbl_8026A034: /* 8026A040 00265E80 38 21 00 10 */ addi r1, r1, 0x10 /* 8026A044 00265E84 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge5ScoreFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge5ScoreFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B5454 003B1294 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -589,17 +589,17 @@ set__Q53scn4step4info9challenge5ScoreFi: /* 803B551C 003B135C 38 21 03 30 */ addi r1, r1, 0x330 /* 803B5520 003B1360 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252015 $$252015: .incbin "baserom.dol", 0x48C8F8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249451 $$249451: .incbin "baserom.dol", 0x495818, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252016 $$252016: .incbin "baserom.dol", 0x497C80, 0x8 diff --git a/asm/src/ScoreCoin.s b/asm/src/ScoreCoin.s index e5f35db3..1fa679d0 100644 --- a/asm/src/ScoreCoin.s +++ b/asm/src/ScoreCoin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn4step4item9modeldesc9ScoreCoinFUl Create__Q53scn4step4item9modeldesc9ScoreCoinFUl: /* 803C70C4 003C2F04 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -125,7 +125,7 @@ lbl_803C7218: /* 803C7284 003C30C4 38 21 00 50 */ addi r1, r1, 0x50 /* 803C7288 003C30C8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250366 $$250366: .incbin "baserom.dol", 0x48E5F8, 0xC @@ -142,7 +142,7 @@ $$250370: $$250371: .incbin "baserom.dol", 0x48E640, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250368 $$250368: .incbin "baserom.dol", 0x4982C8, 0x8 diff --git a/asm/src/ScoreInfo.s b/asm/src/ScoreInfo.s index 22fef33f..d811633a 100644 --- a/asm/src/ScoreInfo.s +++ b/asm/src/ScoreInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step9challenge9ScoreInfoFRQ33scn4step9ComponentRQ43scn4step9challenge7ManagerRQ23g3d15ResFileAccessorRQ33hel4math7Vector3 __ct__Q43scn4step9challenge9ScoreInfoFRQ33scn4step9ComponentRQ43scn4step9challenge7ManagerRQ23g3d15ResFileAccessorRQ33hel4math7Vector3: /* 8026A048 00265E88 94 21 FF 20 */ stwu r1, -0xe0(r1) @@ -76,7 +76,7 @@ isAlive__Q43scn4step9challenge9ScoreInfoCFv: /* 8026A13C 00265F7C 38 63 00 08 */ addi r3, r3, 8 /* 8026A140 00265F80 4B F2 AC CC */ b isAnimating__Q23g3d8StdModelCFv -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251676 $$251676: .incbin "baserom.dol", 0x495820, 0x8 diff --git a/asm/src/ScoreLine.s b/asm/src/ScoreLine.s index e8b93c84..68c8723f 100644 --- a/asm/src/ScoreLine.s +++ b/asm/src/ScoreLine.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q53scn15challengeresult4info9ScoreLine6RecipeFQ53scn15challengeresult4info9ScoreLine4KindUli Create__Q53scn15challengeresult4info9ScoreLine6RecipeFQ53scn15challengeresult4info9ScoreLine4KindUli: /* 801F4594 001F03D4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -668,7 +668,7 @@ lbl_801F4F70: /* 801F4FAC 001F0DEC 38 21 18 50 */ addi r1, r1, 0x1850 /* 801F4FB0 001F0DF0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253406 $$253406: .incbin "baserom.dol", 0x45B6F0, 0x14 @@ -715,7 +715,7 @@ $$253504: $$253505: .incbin "baserom.dol", 0x45B7C0, 0x50 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253409 $$253409: .incbin "baserom.dol", 0x494340, 0x8 diff --git a/asm/src/ScreenFade.s b/asm/src/ScreenFade.s index 6614a8a7..1329c37f 100644 --- a/asm/src/ScreenFade.s +++ b/asm/src/ScreenFade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isEnd__Q43scn4step3sfx10ScreenFadeCFv isEnd__Q43scn4step3sfx10ScreenFadeCFv: /* 803CED4C 003CAB8C 48 03 1C 20 */ b isEnd__Q23sfx4FadeCFv diff --git a/asm/src/ScreenRemap.s b/asm/src/ScreenRemap.s index f0f2ce95..2bb47377 100644 --- a/asm/src/ScreenRemap.s +++ b/asm/src/ScreenRemap.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global drawBegin__Q23sfx11ScreenRemapFb drawBegin__Q23sfx11ScreenRemapFb: /* 80401708 003FD548 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -225,7 +225,7 @@ setupDrawOriginal__Q23sfx11ScreenRemapFv: /* 80401A5C 003FD89C 38 21 00 40 */ addi r1, r1, 0x40 /* 80401A60 003FD8A0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251565 $$251565: .incbin "baserom.dol", 0x49EE48, 0x4 diff --git a/asm/src/Script.s b/asm/src/Script.s index 2528f592..db26a596 100644 --- a/asm/src/Script.s +++ b/asm/src/Script.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj6ScriptFRCQ24gobj10ScriptDescRQ23mem10IAllocatorRQ24mint6Engine __ct__Q24gobj6ScriptFRCQ24gobj10ScriptDescRQ23mem10IAllocatorRQ24mint6Engine: /* 8019BD40 00197B80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -257,12 +257,12 @@ prevScriptIndex__Q24gobj6ScriptCFv: /* 8019C08C 00197ECC 80 63 00 58 */ lwz r3, 0x58(r3) /* 8019C090 00197ED0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251537 $$251537: .incbin "baserom.dol", 0x451140, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251536 $$251536: .incbin "baserom.dol", 0x493208, 0x8 diff --git a/asm/src/ScriptArchive.s b/asm/src/ScriptArchive.s index b6316399..6bbd7d7e 100644 --- a/asm/src/ScriptArchive.s +++ b/asm/src/ScriptArchive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24mint13ScriptArchiveFv __ct__Q24mint13ScriptArchiveFv: /* 801C0B00 001BC940 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -26,7 +26,7 @@ lbl_801C0B40: /* 801C0B4C 001BC98C 90 61 00 08 */ stw r3, 8(r1) /* 801C0B50 001BC990 90 9F 00 04 */ stw r4, 4(r31) /* 801C0B54 001BC994 38 7F 00 04 */ addi r3, r31, 4 -/* 801C0B58 001BC998 4B FC 66 15 */ bl isValidData__Q25xdata5XDataCFv +/* 801C0B58 001BC998 4B FC 66 15 */ bl isValidData__Q25.dataXDataCFv /* 801C0B5C 001BC99C 7F E3 FB 78 */ mr r3, r31 lbl_801C0B60: /* 801C0B60 001BC9A0 83 E1 00 1C */ lwz r31, 0x1c(r1) @@ -63,14 +63,14 @@ at__Q24mint13ScriptArchiveCFUl: /* 801C0BC4 001BCA04 7C 83 FA 14 */ add r4, r3, r31 /* 801C0BC8 001BCA08 38 7E 00 04 */ addi r3, r30, 4 /* 801C0BCC 001BCA0C 80 84 00 04 */ lwz r4, 4(r4) -/* 801C0BD0 001BCA10 4B FC 67 85 */ bl labelAddressWithReference__Q25xdata5XDataCFUi +/* 801C0BD0 001BCA10 4B FC 67 85 */ bl labelAddressWithReference__Q25.dataXDataCFUi /* 801C0BD4 001BCA14 90 61 00 08 */ stw r3, 8(r1) /* 801C0BD8 001BCA18 7F C3 F3 78 */ mr r3, r30 /* 801C0BDC 001BCA1C 48 00 00 39 */ bl header__Q24mint13ScriptArchiveCFv /* 801C0BE0 001BCA20 7C 83 FA 14 */ add r4, r3, r31 /* 801C0BE4 001BCA24 38 7E 00 04 */ addi r3, r30, 4 /* 801C0BE8 001BCA28 80 84 00 08 */ lwz r4, 8(r4) -/* 801C0BEC 001BCA2C 4B FC 67 69 */ bl labelAddressWithReference__Q25xdata5XDataCFUi +/* 801C0BEC 001BCA2C 4B FC 67 69 */ bl labelAddressWithReference__Q25.dataXDataCFUi /* 801C0BF0 001BCA30 7C 64 1B 78 */ mr r4, r3 /* 801C0BF4 001BCA34 90 61 00 0C */ stw r3, 0xc(r1) /* 801C0BF8 001BCA38 80 61 00 08 */ lwz r3, 8(r1) @@ -89,7 +89,7 @@ header__Q24mint13ScriptArchiveCFv: /* 801C0C20 001BCA60 93 E1 00 0C */ stw r31, 0xc(r1) /* 801C0C24 001BCA64 7C 7F 1B 78 */ mr r31, r3 /* 801C0C28 001BCA68 38 63 00 04 */ addi r3, r3, 4 -/* 801C0C2C 001BCA6C 4B FC 65 41 */ bl isValidData__Q25xdata5XDataCFv +/* 801C0C2C 001BCA6C 4B FC 65 41 */ bl isValidData__Q25.dataXDataCFv /* 801C0C30 001BCA70 2C 03 00 00 */ cmpwi r3, 0 /* 801C0C34 001BCA74 41 82 00 10 */ beq lbl_801C0C44 /* 801C0C38 001BCA78 80 7F 00 04 */ lwz r3, 4(r31) @@ -104,12 +104,12 @@ lbl_801C0C48: /* 801C0C54 001BCA94 38 21 00 10 */ addi r1, r1, 0x10 /* 801C0C58 001BCA98 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248751 $$248751: .incbin "baserom.dol", 0x455F10, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_FILE_NAME__Q24mint27$$2unnamed$$2ScriptArchive_cpp$$2 T_FILE_NAME__Q24mint27$$2unnamed$$2ScriptArchive_cpp$$2: .incbin "baserom.dol", 0x4936B8, 0x8 diff --git a/asm/src/ScriptCallback.s b/asm/src/ScriptCallback.s index 7d6bcc4b..53147f05 100644 --- a/asm/src/ScriptCallback.s +++ b/asm/src/ScriptCallback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss14ScriptCallbackFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss14ScriptCallbackFRQ43scn4step4boss4Boss: /* 80233F98 0022FDD8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -91,7 +91,7 @@ onScriptExecPost__Q43scn4step4boss14ScriptCallbackFRCQ24gobj6Script: /* 802340B8 0022FEF8 80 63 00 04 */ lwz r3, 4(r3) /* 802340BC 0022FEFC 48 00 08 18 */ b MintUnregister__Q43scn4step4boss7UtilityFRQ43scn4step4boss4Boss -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy14ScriptCallbackFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy14ScriptCallbackFRQ43scn4step5enemy5Enemy: /* 8028DA10 00289850 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -175,7 +175,7 @@ onScriptExecPost__Q43scn4step5enemy14ScriptCallbackFRCQ24gobj6Script: /* 8028DB14 00289954 38 80 00 00 */ li r4, 0 /* 8028DB18 00289958 48 00 0B 48 */ b MintUnregister__Q43scn4step5enemy7UtilityFRQ43scn4step5enemy5Enemyb -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon14ScriptCallbackFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon14ScriptCallbackFRQ43scn4step6weapon6Weapon: /* 803D886C 003D46AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -245,17 +245,17 @@ onScriptExecPre__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script: onScriptExecPost__Q43scn4step6weapon14ScriptCallbackFRCQ24gobj6Script: /* 803D893C 003D477C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss14ScriptCallback __vt__Q43scn4step4boss14ScriptCallback: .incbin "baserom.dol", 0x460910, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy14ScriptCallback __vt__Q43scn4step5enemy14ScriptCallback: .incbin "baserom.dol", 0x46ED18, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon14ScriptCallback __vt__Q43scn4step6weapon14ScriptCallback: .incbin "baserom.dol", 0x48FE78, 0x18 diff --git a/asm/src/ScriptTrigger.s b/asm/src/ScriptTrigger.s index 4d5ba129..df02e766 100644 --- a/asm/src/ScriptTrigger.s +++ b/asm/src/ScriptTrigger.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global set__Q43scn4step5chara13ScriptTriggerFUl set__Q43scn4step5chara13ScriptTriggerFUl: /* 80272A84 0026E8C4 28 04 00 20 */ cmplwi r4, 0x20 diff --git a/asm/src/Scroll.s b/asm/src/Scroll.s index 9b2c5908..6659ce0c 100644 --- a/asm/src/Scroll.s +++ b/asm/src/Scroll.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history6ScrollFRQ33scn7history5Kirby __ct__Q33scn7history6ScrollFRQ33scn7history5Kirby: /* 8020EA84 0020A8C4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -620,10 +620,10 @@ __sinit_$$3Scroll_cpp: /* 8020F2E8 0020B128 D0 0D EF 94 */ stfs f0, MAX_MOVE_SPEED__Q33scn7history20$$2unnamed$$2Scroll_cpp$$2-_SDA_BASE_(r13) /* 8020F2EC 0020B12C 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402460, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253103 $$253103: .incbin "baserom.dol", 0x49AC40, 0x4 diff --git a/asm/src/SearchAttack.s b/asm/src/SearchAttack.s index 31b38ae9..4ae02d2b 100644 --- a/asm/src/SearchAttack.s +++ b/asm/src/SearchAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll12SearchAttackFRQ25ocoll7ManagerRQ25ocoll5Owner __ct__Q25ocoll12SearchAttackFRQ25ocoll7ManagerRQ25ocoll5Owner: /* 801D8318 001D4158 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -512,7 +512,7 @@ getCollidedAttackTargetGimmick__Q25ocoll12SearchAttackCFUl: /* 801D89E8 001D4828 38 21 00 20 */ addi r1, r1, 0x20 /* 801D89EC 001D482C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q25ocoll12SearchAttack __vt__Q25ocoll12SearchAttack: .incbin "baserom.dol", 0x4594E8, 0x10 diff --git a/asm/src/SearchAttackNode.s b/asm/src/SearchAttackNode.s index 20463156..c462291d 100644 --- a/asm/src/SearchAttackNode.s +++ b/asm/src/SearchAttackNode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll16SearchAttackNodeFRQ25ocoll12SearchAttackRCQ25ocoll8NodeDesc __ct__Q25ocoll16SearchAttackNodeFRQ25ocoll12SearchAttackRCQ25ocoll8NodeDesc: /* 801D89F0 001D4830 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -187,7 +187,7 @@ lbl_801D8C90: /* 801D8C9C 001D4ADC 38 21 01 50 */ addi r1, r1, 0x150 /* 801D8CA0 001D4AE0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251954 $$251954: .incbin "baserom.dol", 0x49A7D8, 0x8 diff --git a/asm/src/SearchAttackResult.s b/asm/src/SearchAttackResult.s index 0683a856..7afebce3 100644 --- a/asm/src/SearchAttackResult.s +++ b/asm/src/SearchAttackResult.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll18SearchAttackResultFv __ct__Q25ocoll18SearchAttackResultFv: /* 801D8CA4 001D4AE4 38 80 00 00 */ li r4, 0 @@ -89,7 +89,7 @@ getData__Q25ocoll18SearchAttackResultCFUl: /* 801D8DD0 001D4C10 38 21 00 10 */ addi r1, r1, 0x10 /* 801D8DD4 001D4C14 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250028 $$250028: .incbin "baserom.dol", 0x49A7E0, 0x8 diff --git a/asm/src/SearchHit.s b/asm/src/SearchHit.s index 467998f8..3edda982 100644 --- a/asm/src/SearchHit.s +++ b/asm/src/SearchHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll9SearchHitFRQ25ocoll7ManagerRQ25ocoll5Owner __ct__Q25ocoll9SearchHitFRQ25ocoll7ManagerRQ25ocoll5Owner: /* 801D8DD8 001D4C18 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -461,7 +461,7 @@ getCollidedHitOwnerUid__Q25ocoll9SearchHitCFUl: /* 801D93D8 001D5218 38 21 00 10 */ addi r1, r1, 0x10 /* 801D93DC 001D521C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q25ocoll9SearchHit __vt__Q25ocoll9SearchHit: .incbin "baserom.dol", 0x4594F8, 0x10 diff --git a/asm/src/SearchHitNode.s b/asm/src/SearchHitNode.s index 1b56eb7f..be8ce788 100644 --- a/asm/src/SearchHitNode.s +++ b/asm/src/SearchHitNode.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll13SearchHitNodeFRQ25ocoll9SearchHitRCQ25ocoll8NodeDesc __ct__Q25ocoll13SearchHitNodeFRQ25ocoll9SearchHitRCQ25ocoll8NodeDesc: /* 801D93E0 001D5220 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -92,7 +92,7 @@ lbl_801D9494: update__Q25ocoll13SearchHitNodeFv: /* 801D9524 001D5364 4B FF D5 40 */ b updateShape__Q25ocoll7HitNodeFv -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251952 $$251952: .incbin "baserom.dol", 0x49A7E8, 0x8 diff --git a/asm/src/SearchHitResult.s b/asm/src/SearchHitResult.s index 862de18b..5d96e17d 100644 --- a/asm/src/SearchHitResult.s +++ b/asm/src/SearchHitResult.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll15SearchHitResultFv __ct__Q25ocoll15SearchHitResultFv: /* 801D9528 001D5368 38 80 00 00 */ li r4, 0 diff --git a/asm/src/SelectButtonContent.s b/asm/src/SelectButtonContent.s index fd15c90e..28699ade 100644 --- a/asm/src/SelectButtonContent.s +++ b/asm/src/SelectButtonContent.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail19SelectButtonContentFRQ23mem10IAllocator __ct__Q43scn7history6detail19SelectButtonContentFRQ23mem10IAllocator: /* 8021A3F4 00216234 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -269,7 +269,7 @@ lbl_8021A7D0: /* 8021A7D0 00216610 38 8D A7 90 */ addi r4, r13, $$252351-_SDA_BASE_ /* 8021A7D4 00216614 4B F9 27 C0 */ b play__Q23lyt6LayoutFPCc -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251551 $$251551: .incbin "baserom.dol", 0x45EEC8, 0xC @@ -313,7 +313,7 @@ $$252349: $$252402: .incbin "baserom.dol", 0x45F0AC, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251546 $$251546: .incbin "baserom.dol", 0x494ED0, 0x8 diff --git a/asm/src/Sequence.s b/asm/src/Sequence.s index 01702626..11f3c3a9 100644 --- a/asm/src/Sequence.s +++ b/asm/src/Sequence.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info8sequence8SequenceFRQ23mem10IAllocator __ct__Q34info8sequence8SequenceFRQ23mem10IAllocator: /* 801A5B58 001A1998 90 83 00 00 */ stw r4, 0(r3) @@ -1578,7 +1578,7 @@ lbl_801A6FFC: __dt__Q34info8sequence11CommandWaitFv: /* 801A7018 001A2E58 4B FF FB 94 */ b __dt__Q34info8sequence11CommandAnimFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255949 $$255949: .incbin "baserom.dol", 0x4532E8, 0xC diff --git a/asm/src/SequenceChallengeRoot.s b/asm/src/SequenceChallengeRoot.s index 031dacdd..0724ec90 100644 --- a/asm/src/SequenceChallengeRoot.s +++ b/asm/src/SequenceChallengeRoot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q23seq21SequenceChallengeRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q23seq21SequenceChallengeRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803FCC4C 003F8A8C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -975,7 +975,7 @@ lbl_803FD96C: GetRuntimeTypeInfo__Q23seq21SequenceChallengeRootCFv: /* 803FD984 003F97C4 4B FF F2 C8 */ b RuntimeTypeInfoImpl$$0Q23seq21SequenceChallengeRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq21SequenceChallengeRoot __vt__Q23seq21SequenceChallengeRoot: .incbin "baserom.dol", 0x4924B0, 0x28 diff --git a/asm/src/SequenceChallengeTitleRoot.s b/asm/src/SequenceChallengeTitleRoot.s index 302df807..dccfd0f6 100644 --- a/asm/src/SequenceChallengeTitleRoot.s +++ b/asm/src/SequenceChallengeTitleRoot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q23seq26SequenceChallengeTitleRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q23seq26SequenceChallengeTitleRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803FD988 003F97C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -503,7 +503,7 @@ GetRuntimeTypeInfo__Q23seq26SequenceChallengeTitleRootCFv: __dt__Q23seq26SequenceChallengeTitleRootFv: /* 803FE024 003F9E64 4B FF EE A8 */ b __dt__Q23seq21SequenceChallengeRootFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq26SequenceChallengeTitleRoot __vt__Q23seq26SequenceChallengeTitleRoot: .incbin "baserom.dol", 0x4924D8, 0x28 diff --git a/asm/src/SequenceFirstDemo.s b/asm/src/SequenceFirstDemo.s index 8760c8ad..545d296a 100644 --- a/asm/src/SequenceFirstDemo.s +++ b/asm/src/SequenceFirstDemo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23seq17SequenceFirstDemoFRCQ33seq17SequenceFirstDemo6Recipe __ct__Q23seq17SequenceFirstDemoFRCQ33seq17SequenceFirstDemo6Recipe: /* 803FE028 003F9E68 94 21 FC 30 */ stwu r1, -0x3d0(r1) @@ -203,7 +203,7 @@ onSceneEnd__Q23seq17SequenceFirstDemoFRQ23scn6IScene: GetRuntimeTypeInfo__Q23seq17SequenceFirstDemoCFv: /* 803FE2C0 003FA100 4B FF F7 18 */ b RuntimeTypeInfoImpl$$0Q23seq17SequenceFirstDemo$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq17SequenceFirstDemo __vt__Q23seq17SequenceFirstDemo: .incbin "baserom.dol", 0x492500, 0x28 diff --git a/asm/src/SequenceGrandMenu.s b/asm/src/SequenceGrandMenu.s index f08d59ea..d4874741 100644 --- a/asm/src/SequenceGrandMenu.s +++ b/asm/src/SequenceGrandMenu.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q23seq17SequenceGrandMenu$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q23seq17SequenceGrandMenu$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803FE2C4 003FA104 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -353,7 +353,7 @@ lbl_803FE734: GetRuntimeTypeInfo__Q23seq17SequenceGrandMenuCFv: /* 803FE74C 003FA58C 4B FF FB 78 */ b RuntimeTypeInfoImpl$$0Q23seq17SequenceGrandMenu$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq17SequenceGrandMenu __vt__Q23seq17SequenceGrandMenu: .incbin "baserom.dol", 0x492528, 0x28 diff --git a/asm/src/SequenceHistory.s b/asm/src/SequenceHistory.s index a17dd0bd..61c43e6f 100644 --- a/asm/src/SequenceHistory.s +++ b/asm/src/SequenceHistory.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23seq15SequenceHistoryFv __ct__Q23seq15SequenceHistoryFv: /* 803FE750 003FA590 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -363,7 +363,7 @@ GetRuntimeTypeInfo__Q23seq15SequenceHistoryCFv: __dt__Q23seq15SequenceHistoryFv: /* 803FEC1C 003FAA5C 4B FF E2 B0 */ b __dt__Q23seq21SequenceChallengeRootFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq15SequenceHistory __vt__Q23seq15SequenceHistory: .incbin "baserom.dol", 0x492550, 0x28 diff --git a/asm/src/SequenceLvMapRoot.s b/asm/src/SequenceLvMapRoot.s index 90760eff..1783fc5a 100644 --- a/asm/src/SequenceLvMapRoot.s +++ b/asm/src/SequenceLvMapRoot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q33seq17SequenceLvMapRoot6RecipeFQ33scn4step9LevelKindRCQ23seq12ContextStory Create__Q33seq17SequenceLvMapRoot6RecipeFQ33scn4step9LevelKindRCQ23seq12ContextStory: /* 803FEC20 003FAA60 94 21 FC 00 */ stwu r1, -0x400(r1) @@ -600,7 +600,7 @@ onChildSequenceEndForChallenge__Q23seq17SequenceLvMapRootFRQ23seq9ISequence: GetRuntimeTypeInfo__Q23seq17SequenceLvMapRootCFv: /* 803FF420 003FB260 4B FF E6 08 */ b RuntimeTypeInfoImpl$$0Q23seq17SequenceLvMapRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq17SequenceLvMapRoot __vt__Q23seq17SequenceLvMapRoot: .incbin "baserom.dol", 0x492578, 0x28 diff --git a/asm/src/SequenceProductRoot.s b/asm/src/SequenceProductRoot.s index 414ccdf6..7eb20447 100644 --- a/asm/src/SequenceProductRoot.s +++ b/asm/src/SequenceProductRoot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q23seq19SequenceProductRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q23seq19SequenceProductRoot$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 803FF424 003FB264 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -399,7 +399,7 @@ GetRuntimeTypeInfo__Q23seq19SequenceProductRootCFv: __dt__Q23seq19SequenceProductRootFv: /* 803FF968 003FB7A8 4B FF D5 64 */ b __dt__Q23seq21SequenceChallengeRootFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq19SequenceProductRoot __vt__Q23seq19SequenceProductRoot: .incbin "baserom.dol", 0x4925A0, 0x28 diff --git a/asm/src/SequenceRoot.s b/asm/src/SequenceRoot.s index e6ae2481..b5506719 100644 --- a/asm/src/SequenceRoot.s +++ b/asm/src/SequenceRoot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23seq12SequenceRootFbb __ct__Q23seq12SequenceRootFbb: /* 803FF96C 003FB7AC 3C C0 80 49 */ lis r6, __vt__Q23seq12SequenceRoot@ha @@ -87,7 +87,7 @@ lbl_803FFA40: /* 803FFA54 003FB894 38 21 00 10 */ addi r1, r1, 0x10 /* 803FFA58 003FB898 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq12SequenceRoot __vt__Q23seq12SequenceRoot: .incbin "baserom.dol", 0x4925C8, 0x28 diff --git a/asm/src/SequenceStack.s b/asm/src/SequenceStack.s index c5394f9f..ff8875d7 100644 --- a/asm/src/SequenceStack.s +++ b/asm/src/SequenceStack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q23seq13SequenceStackFv __dt__Q23seq13SequenceStackFv: /* 803FFA5C 003FB89C 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/SequenceStaffCredit.s b/asm/src/SequenceStaffCredit.s index 4fc79494..63b31221 100644 --- a/asm/src/SequenceStaffCredit.s +++ b/asm/src/SequenceStaffCredit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23seq19SequenceStaffCreditFv __ct__Q23seq19SequenceStaffCreditFv: /* 803FFC30 003FBA70 94 21 FC 30 */ stwu r1, -0x3d0(r1) @@ -128,7 +128,7 @@ onSceneEnd__Q23seq19SequenceStaffCreditFRQ23scn6IScene: GetRuntimeTypeInfo__Q23seq19SequenceStaffCreditCFv: /* 803FFDA8 003FBBE8 4B FF DC D0 */ b RuntimeTypeInfoImpl$$0Q23seq19SequenceStaffCredit$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq19SequenceStaffCredit __vt__Q23seq19SequenceStaffCredit: .incbin "baserom.dol", 0x4925F0, 0x28 diff --git a/asm/src/SequenceStep.s b/asm/src/SequenceStep.s index 5bb84e58..bf0291ad 100644 --- a/asm/src/SequenceStep.s +++ b/asm/src/SequenceStep.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q33seq12SequenceStep6RecipeFRCQ33scn4step7Context Create__Q33seq12SequenceStep6RecipeFRCQ33scn4step7Context: /* 803FFDAC 003FBBEC 38 C3 FF FC */ addi r6, r3, -4 @@ -483,12 +483,12 @@ GetRuntimeTypeInfo__Q23seq12SequenceStepCFv: __dt__Q23seq12SequenceStepFv: /* 8040043C 003FC27C 4B FF CA 90 */ b __dt__Q23seq21SequenceChallengeRootFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq12SequenceStep __vt__Q23seq12SequenceStep: .incbin "baserom.dol", 0x492618, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251094 $$251094: .incbin "baserom.dol", 0x49EDE0, 0x8 diff --git a/asm/src/SequenceVC.s b/asm/src/SequenceVC.s index 6f97b939..9a6396c4 100644 --- a/asm/src/SequenceVC.s +++ b/asm/src/SequenceVC.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23seq10SequenceVCFRCQ33seq10SequenceVC6Recipe __ct__Q23seq10SequenceVCFRCQ33seq10SequenceVC6Recipe: /* 80400440 003FC280 3C A0 80 49 */ lis r5, __vt__Q23seq10SequenceVC@ha @@ -78,7 +78,7 @@ GetRuntimeTypeInfo__Q23seq10SequenceVCCFv: __dt__Q23seq10SequenceVCFv: /* 8040050C 003FC34C 4B FF F4 F4 */ b __dt__Q23seq12SequenceRootFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23seq10SequenceVC __vt__Q23seq10SequenceVC: .incbin "baserom.dol", 0x492640, 0x28 diff --git a/asm/src/Shadow.s b/asm/src/Shadow.s index a92b503f..bf12b681 100644 --- a/asm/src/Shadow.s +++ b/asm/src/Shadow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle6ShadowFRQ33scn14challengetitle9ComponentRQ23g3d10CharaModel __ct__Q33scn14challengetitle6ShadowFRQ33scn14challengetitle9ComponentRQ23g3d10CharaModel: /* 801EFBC0 001EBA00 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -152,7 +152,7 @@ setVisibility__Q33scn14challengetitle6ShadowFb: /* 801EFDE0 001EBC20 38 21 00 20 */ addi r1, r1, 0x20 /* 801EFDE4 001EBC24 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle6ShadowFRQ33scn10grandtitle9ComponentRQ23g3d10CharaModelQ33scn10grandtitle9CharaKindff __ct__Q33scn10grandtitle6ShadowFRQ33scn10grandtitle9ComponentRQ23g3d10CharaModelQ33scn10grandtitle9CharaKindff: /* 80206310 00202150 94 21 FF 30 */ stwu r1, -0xd0(r1) @@ -386,7 +386,7 @@ flash__Q33scn10grandtitle6ShadowFv: /* 80206650 00202490 80 63 01 B8 */ lwz r3, 0x1b8(r3) /* 80206654 00202494 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history6ShadowFRQ33scn7history9Component __ct__Q33scn7history6ShadowFRQ33scn7history9Component: /* 8020F2F0 0020B130 94 21 FF 20 */ stwu r1, -0xe0(r1) @@ -646,7 +646,7 @@ update__Q33scn7history6ShadowFRCQ33hel4math7Vector3: /* 8020F684 0020B4C4 38 21 00 40 */ addi r1, r1, 0x40 /* 8020F688 0020B4C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara6ShadowFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ24gobj8LocationRCQ43scn4step5chara13GroundCheckerf __ct__Q43scn4step5chara6ShadowFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ24gobj8LocationRCQ43scn4step5chara13GroundCheckerf: /* 80272AD0 0026E910 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -853,7 +853,7 @@ setHeightOffset__Q43scn4step5chara6ShadowFf: /* 80272D74 0026EBB4 D0 23 01 D4 */ stfs f1, 0x1d4(r3) /* 80272D78 0026EBB8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy6ShadowFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ24gobj8LocationRCQ43scn4step5chara13GroundCheckerf __ct__Q43scn4step5enemy6ShadowFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ24gobj8LocationRCQ43scn4step5chara13GroundCheckerf: /* 8028DB1C 0028995C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1053,17 +1053,17 @@ lbl_8028DDAC: /* 8028DDBC 00289BFC 38 21 00 20 */ addi r1, r1, 0x20 /* 8028DDC0 00289C00 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251778 $$251778: .incbin "baserom.dol", 0x45AF68, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252146 $$252146: .incbin "baserom.dol", 0x45CB78, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252296 $$252296: .incbin "baserom.dol", 0x45D668, 0x10 @@ -1074,7 +1074,7 @@ $$252348: $$252351: .incbin "baserom.dol", 0x45D684, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn14challengetitle20$$2unnamed$$2Shadow_cpp$$2 G3D_RES_FILE_PATH__Q33scn14challengetitle20$$2unnamed$$2Shadow_cpp$$2: .incbin "baserom.dol", 0x494170, 0x4 @@ -1085,7 +1085,7 @@ $$252224: $$252232: .incbin "baserom.dol", 0x49417C, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global G3D_RES_FILE_PATH__Q33scn10grandtitle20$$2unnamed$$2Shadow_cpp$$2 G3D_RES_FILE_PATH__Q33scn10grandtitle20$$2unnamed$$2Shadow_cpp$$2: .incbin "baserom.dol", 0x494810, 0x4 @@ -1096,12 +1096,12 @@ $$252859: $$252900: .incbin "baserom.dol", 0x49481C, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252297 $$252297: .incbin "baserom.dol", 0x494A58, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252901 $$252901: .incbin "baserom.dol", 0x49AB20, 0x4 @@ -1115,7 +1115,7 @@ $$252903: $$252904: .incbin "baserom.dol", 0x49AB2C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251517 $$251517: .incbin "baserom.dol", 0x49B868, 0x4 @@ -1135,7 +1135,7 @@ $$251770: $$251773: .incbin "baserom.dol", 0x49B880, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252264 $$252264: .incbin "baserom.dol", 0x49BA30, 0x8 diff --git a/asm/src/ShadowRoot.s b/asm/src/ShadowRoot.s index f9510f06..ed34b7c7 100644 --- a/asm/src/ShadowRoot.s +++ b/asm/src/ShadowRoot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx10ShadowRootFv __ct__Q43scn4step3sfx10ShadowRootFv: /* 803CED50 003CAB90 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/ShadowSphere.s b/asm/src/ShadowSphere.s index 6fa59cd2..c60bd008 100644 --- a/asm/src/ShadowSphere.s +++ b/asm/src/ShadowSphere.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx12ShadowSphereFRQ33scn4step9ComponentRQ23mem10IAllocator __ct__Q43scn4step3sfx12ShadowSphereFRQ33scn4step9ComponentRQ23mem10IAllocator: /* 803CEDC0 003CAC00 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -140,12 +140,12 @@ updateMaterial__Q43scn4step3sfx12ShadowSphereFv: /* 803CEF9C 003CADDC 38 21 00 A0 */ addi r1, r1, 0xa0 /* 803CEFA0 003CADE0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252021 $$252021: .incbin "baserom.dol", 0x48EDA0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252022 $$252022: .incbin "baserom.dol", 0x4983F0, 0x8 @@ -156,7 +156,7 @@ $$252072: $$252073: .incbin "baserom.dol", 0x498400, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251593 $$251593: .incbin "baserom.dol", 0x49E7A0, 0x8 diff --git a/asm/src/Shake.s b/asm/src/Shake.s index 59e76818..a3e84546 100644 --- a/asm/src/Shake.s +++ b/asm/src/Shake.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara5ShakeFv __ct__Q43scn4step5chara5ShakeFv: /* 80272D7C 0026EBBC 38 00 00 06 */ li r0, 6 @@ -71,7 +71,7 @@ lbl_80272E54: /* 80272E5C 0026EC9C 38 21 00 10 */ addi r1, r1, 0x10 /* 80272E60 0026ECA0 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SHAKE_OFFS_TABLE_S__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_SHAKE_OFFS_TABLE_S__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: .incbin "baserom.dol", 0x413A88, 0x10 @@ -88,7 +88,7 @@ T_SHAKE_OFFS_TABLE_LL__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: T_TABLE__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: .incbin "baserom.dol", 0x413AF0, 0x30 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_SHAKE_OFFS_TABLE_SSS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2 T_SHAKE_OFFS_TABLE_SSS__Q43scn4step5chara19$$2unnamed$$2Shake_cpp$$2: .incbin "baserom.dol", 0x49B888, 0x8 diff --git a/asm/src/ShakeCharge.s b/asm/src/ShakeCharge.s index 8b060ec6..e770e5b1 100644 --- a/asm/src/ShakeCharge.s +++ b/asm/src/ShakeCharge.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero11ShakeChargeFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero11ShakeChargeFRQ43scn4step4hero4Hero: /* 80354794 003505D4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -281,7 +281,7 @@ lbl_80354B40: /* 80354B4C 0035098C 38 21 00 10 */ addi r1, r1, 0x10 /* 80354B50 00350990 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253367 $$253367: .incbin "baserom.dol", 0x49D9A8, 0x4 diff --git a/asm/src/Shape.s b/asm/src/Shape.s index abe5b74c..d89793dd 100644 --- a/asm/src/Shape.s +++ b/asm/src/Shape.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25ocoll5ShapeFv __ct__Q25ocoll5ShapeFv: /* 801D9634 001D5474 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -183,7 +183,7 @@ setDebugColor__Q25ocoll5ShapeFRC8_GXColor: /* 801D989C 001D56DC 38 63 00 1C */ addi r3, r3, 0x1c /* 801D98A0 001D56E0 4B F7 20 74 */ b __as__8_GXColorFRC8_GXColor -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252228 $$252228: .incbin "baserom.dol", 0x49A7F0, 0x4 diff --git a/asm/src/ShapeDiamondContext.s b/asm/src/ShapeDiamondContext.s index 768d5ac8..819e916b 100644 --- a/asm/src/ShapeDiamondContext.s +++ b/asm/src/ShapeDiamondContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CreateBaseBottom__Q35mcoll6detail19ShapeDiamondContextFfff CreateBaseBottom__Q35mcoll6detail19ShapeDiamondContextFfff: /* 801BCCE4 001B8B24 FC 80 08 90 */ fmr f4, f1 @@ -164,7 +164,7 @@ getToBottomDist__Q35mcoll6detail19ShapeDiamondContextCFv: /* 801BCEFC 001B8D3C C0 23 00 14 */ lfs f1, 0x14(r3) /* 801BCF00 001B8D40 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249753 $$249753: .incbin "baserom.dol", 0x49A6F0, 0x8 diff --git a/asm/src/ShareData.s b/asm/src/ShareData.s index f0db6fd1..429ef899 100644 --- a/asm/src/ShareData.s +++ b/asm/src/ShareData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero9ShareDataFRQ33scn4step9ComponentRCQ33scn4step11ContextHero __ct__Q43scn4step4hero9ShareDataFRQ33scn4step9ComponentRCQ33scn4step11ContextHero: /* 80354B54 00350994 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Ship.s b/asm/src/Ship.s index 83c1967a..61aa56ad 100644 --- a/asm/src/Ship.s +++ b/asm/src/Ship.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info4ship4ShipFRQ33scn4step9ComponentRQ23mem10IAllocator __ct__Q53scn4step4info4ship4ShipFRQ33scn4step9ComponentRQ23mem10IAllocator: /* 803C0418 003BC258 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -87,12 +87,12 @@ procAnim__Q53scn4step4info4ship4ShipFv: /* 803C0540 003BC380 38 21 00 10 */ addi r1, r1, 0x10 /* 803C0544 003BC384 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252067 $$252067: .incbin "baserom.dol", 0x48DD88, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252068 $$252068: .incbin "baserom.dol", 0x498118, 0x8 diff --git a/asm/src/ShipEvent.s b/asm/src/ShipEvent.s index 94e80d04..6e5b9bb4 100644 --- a/asm/src/ShipEvent.s +++ b/asm/src/ShipEvent.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick9shipevent9ShipEventFRQ33scn4step9Component __ct__Q53scn4step7gimmick9shipevent9ShipEventFRQ33scn4step9Component: /* 8031F7C4 0031B604 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -3840,7 +3840,7 @@ lbl_80322CB8: /* 80322CCC 0031EB0C 38 21 00 10 */ addi r1, r1, 0x10 /* 80322CD0 0031EB10 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$260977 $$260977: .incbin "baserom.dol", 0x415BB0, 0x20 @@ -3848,7 +3848,7 @@ $$260977: $$261005: .incbin "baserom.dol", 0x415BD0, 0x80 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$264598 $$264598: .incbin "baserom.dol", 0x47E228, 0x18 @@ -3928,7 +3928,7 @@ $$265268: $$2STRING$$2allocate__Q23std12allocator$$0c$$1FUlPCv: .incbin "baserom.dol", 0x47E4F0, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$260970 $$260970: .incbin "baserom.dol", 0x496C40, 0x8 @@ -3984,7 +3984,7 @@ $$261003: $$261004: .incbin "baserom.dol", 0x496CC8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$264823 $$264823: .incbin "baserom.dol", 0x49D560, 0x4 diff --git a/asm/src/Shooting.s b/asm/src/Shooting.s index 4532f371..658a2958 100644 --- a/asm/src/Shooting.s +++ b/asm/src/Shooting.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8shooting8ShootingFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick8shooting8ShootingFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80322FC0 0031EE00 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -39,7 +39,7 @@ __ct__Q53scn4step7gimmick8shooting8ShootingFRCQ43scn4step3map18BinGmkGeneralEntr __dt__Q53scn4step7gimmick8shooting8ShootingFv: /* 8032303C 0031EE7C 4B E5 2B 2C */ b __dt__Q23scn6ISceneFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick8shooting8Shooting __vt__Q53scn4step7gimmick8shooting8Shooting: .incbin "baserom.dol", 0x47E510, 0x10 diff --git a/asm/src/ShuffleManager.s b/asm/src/ShuffleManager.s index 8b6742ec..81cae349 100644 --- a/asm/src/ShuffleManager.s +++ b/asm/src/ShuffleManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero3mix14ShuffleManagerFRQ33scn4step9Component __ct__Q53scn4step4hero3mix14ShuffleManagerFRQ33scn4step9Component: /* 80385AA4 003818E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -605,12 +605,12 @@ lbl_80386268: /* 803862A4 003820E4 38 21 00 10 */ addi r1, r1, 0x10 /* 803862A8 003820E8 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ABILITY_SET__Q53scn4step4hero3mix28$$2unnamed$$2ShuffleManager_cpp$$2 T_ABILITY_SET__Q53scn4step4hero3mix28$$2unnamed$$2ShuffleManager_cpp$$2: .incbin "baserom.dol", 0x41BD18, 0x100 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252304 $$252304: .incbin "baserom.dol", 0x488F30, 0xC @@ -624,7 +624,7 @@ $$253467: $$253478: .incbin "baserom.dol", 0x488F78, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252280 $$252280: .incbin "baserom.dol", 0x497738, 0x8 diff --git a/asm/src/Shutter.s b/asm/src/Shutter.s index da0284fd..cd621848 100644 --- a/asm/src/Shutter.s +++ b/asm/src/Shutter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global getConnectString__21$$2unnamed$$2Shutter_cpp$$2FPCcPCc getConnectString__21$$2unnamed$$2Shutter_cpp$$2FPCcPCc: /* 803234D0 0031F310 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -2038,7 +2038,7 @@ mfReleaseWaitEffect__Q53scn4step7gimmick7shutter7ShutterFv: /* 80325144 00320F84 38 63 02 90 */ addi r3, r3, 0x290 /* 80325148 00320F88 4B FC ED DC */ b release__Q43scn4step7gimmick6EffectFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$254624 $$254624: .incbin "baserom.dol", 0x415C50, 0x14 @@ -2052,7 +2052,7 @@ $$254630: $$254633: .incbin "baserom.dol", 0x415C8C, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global SUB_KIND_POSTFIX__21$$2unnamed$$2Shutter_cpp$$2 SUB_KIND_POSTFIX__21$$2unnamed$$2Shutter_cpp$$2: .incbin "baserom.dol", 0x47E520, 0x10 @@ -2066,7 +2066,7 @@ $$256218: __vt__Q53scn4step7gimmick7shutter7Shutter: .incbin "baserom.dol", 0x47E568, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253500 $$253500: .incbin "baserom.dol", 0x496CD0, 0x4 @@ -2098,7 +2098,7 @@ $$256352: $$256570: .incbin "baserom.dol", 0x496D18, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256120 $$256120: .incbin "baserom.dol", 0x49D578, 0x4 diff --git a/asm/src/SimpleGCHID.s b/asm/src/SimpleGCHID.s index 8d521a43..73b09aca 100644 --- a/asm/src/SimpleGCHID.s +++ b/asm/src/SimpleGCHID.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hid11SimpleGCHIDFv __ct__Q23hid11SimpleGCHIDFv: /* 801A4268 001A00A8 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/SimpleWRHID.s b/asm/src/SimpleWRHID.s index eea82b02..b69f5c04 100644 --- a/asm/src/SimpleWRHID.s +++ b/asm/src/SimpleWRHID.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hid11SimpleWRHIDFv __ct__Q23hid11SimpleWRHIDFv: /* 801A4408 001A0248 94 21 FE B0 */ stwu r1, -0x150(r1) diff --git a/asm/src/Skip.s b/asm/src/Skip.s index d0f30195..d6c1c1d2 100644 --- a/asm/src/Skip.s +++ b/asm/src/Skip.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info4ship4SkipFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info4ship4SkipFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803C0548 003BC388 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -142,7 +142,7 @@ lbl_803C072C: /* 803C0738 003BC578 38 21 00 30 */ addi r1, r1, 0x30 /* 803C073C 003BC57C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252007 $$252007: .incbin "baserom.dol", 0x48DD98, 0x10 @@ -150,7 +150,7 @@ $$252007: $$252009: .incbin "baserom.dol", 0x48DDA8, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252008 $$252008: .incbin "baserom.dol", 0x498128, 0x8 diff --git a/asm/src/SkipHelp.s b/asm/src/SkipHelp.s index 70b75acb..8447477e 100644 --- a/asm/src/SkipHelp.s +++ b/asm/src/SkipHelp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tIsTriggerAnyBtn__Q34info6common22$$2unnamed$$2SkipHelp_cpp$$2Fv tIsTriggerAnyBtn__Q34info6common22$$2unnamed$$2SkipHelp_cpp$$2Fv: /* 801AA114 001A5F54 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -310,7 +310,7 @@ setTransTopRight__Q34info6common8SkipHelpFv: /* 801AA564 001A63A4 38 21 00 40 */ addi r1, r1, 0x40 /* 801AA568 001A63A8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252391 $$252391: .incbin "baserom.dol", 0x4536E8, 0x10 @@ -321,7 +321,7 @@ $$252393: $$252394: .incbin "baserom.dol", 0x453704, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252392 $$252392: .incbin "baserom.dol", 0x493490, 0x8 @@ -335,7 +335,7 @@ $$252439: $$252440: .incbin "baserom.dol", 0x4934A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252465 $$252465: .incbin "baserom.dol", 0x49A498, 0x4 diff --git a/asm/src/SlopeFit.s b/asm/src/SlopeFit.s index 3672150e..b000d94f 100644 --- a/asm/src/SlopeFit.s +++ b/asm/src/SlopeFit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero8SlopeFitFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero8SlopeFitFRQ43scn4step4hero4Hero: /* 80354C60 00350AA0 90 83 00 00 */ stw r4, 0(r3) @@ -63,7 +63,7 @@ reset__Q43scn4step4hero8SlopeFitFv: /* 80354D28 00350B68 D0 03 00 0C */ stfs f0, 0xc(r3) /* 80354D2C 00350B6C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250930 $$250930: .incbin "baserom.dol", 0x49D9B0, 0x4 diff --git a/asm/src/Smash.s b/asm/src/Smash.s index 7fd50973..38ed8f21 100644 --- a/asm/src/Smash.s +++ b/asm/src/Smash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5smash5SmashFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q53scn4step4hero5smash5SmashFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 803A0508 0039C348 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -555,7 +555,7 @@ lbl_803A0D04: /* 803A0D10 0039CB50 38 21 00 20 */ addi r1, r1, 0x20 /* 803A0D14 0039CB54 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global STONEBODY_TABLE_0__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2 STONEBODY_TABLE_0__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2: .incbin "baserom.dol", 0x41BE18, 0x40 @@ -566,7 +566,7 @@ STONEBODY_TABLE_1__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2: STONEBODY_TABLE_2__Q53scn4step4hero5smash19$$2unnamed$$2Smash_cpp$$2: .incbin "baserom.dol", 0x41BE98, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255926 $$255926: .incbin "baserom.dol", 0x48A7E0, 0x40 diff --git a/asm/src/SoundManager.s b/asm/src/SoundManager.s index f27f2cee..5c7b79f8 100644 --- a/asm/src/SoundManager.s +++ b/asm/src/SoundManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_dataHeap__26$$2unnamed$$2SoundManager_cpp$$2Fv t_dataHeap__26$$2unnamed$$2SoundManager_cpp$$2Fv: /* 80402EE0 003FED20 80 6D ED 00 */ lwz r3, object___Q33hel6common32ExplicitSingleton$$0Q23mem6Memory$$1-_SDA_BASE_(r13) @@ -548,12 +548,12 @@ final__Q23snd12SoundManagerFv: /* 80403630 003FF470 38 21 00 10 */ addi r1, r1, 0x10 /* 80403634 003FF474 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$249464 $$249464: .incbin "baserom.dol", 0x41D028, 0xA0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250548 $$250548: .incbin "baserom.dol", 0x492700, 0x18 diff --git a/asm/src/SoundSE.s b/asm/src/SoundSE.s index 3a42b764..29e2928c 100644 --- a/asm/src/SoundSE.s +++ b/asm/src/SoundSE.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss7SoundSEFv __ct__Q43scn4step4boss7SoundSEFv: /* 802340C0 0022FF00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -117,7 +117,7 @@ onObjStopFinished__Q43scn4step4boss7SoundSEFv: /* 80234230 00230070 38 21 00 10 */ addi r1, r1, 0x10 /* 80234234 00230074 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara7SoundSEFRQ33scn4step9ComponentRCQ24gobj8Location __ct__Q43scn4step5chara7SoundSEFRQ33scn4step9ComponentRCQ24gobj8Location: /* 80272E64 0026ECA4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -224,7 +224,7 @@ lbl_80272F94: /* 80272FBC 0026EDFC 38 21 00 50 */ addi r1, r1, 0x50 /* 80272FC0 0026EE00 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7SoundSEFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero7SoundSEFRQ43scn4step4hero4Hero: /* 80354D30 00350B70 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -369,7 +369,7 @@ onObjStopFinished__Q43scn4step4hero7SoundSEFv: /* 80354F34 00350D74 38 21 00 10 */ addi r1, r1, 0x10 /* 80354F38 00350D78 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251502 $$251502: .incbin "baserom.dol", 0x495840, 0x4 @@ -377,7 +377,7 @@ $$251502: $$251505: .incbin "baserom.dol", 0x495844, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251607 $$251607: .incbin "baserom.dol", 0x49B8A0, 0x4 diff --git a/asm/src/SoundSystem.s b/asm/src/SoundSystem.s index 4f3043fd..1adbfd4c 100644 --- a/asm/src/SoundSystem.s +++ b/asm/src/SoundSystem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_pauseCounterInc__25$$2unnamed$$2SoundSystem_cpp$$2FQ225$$2unnamed$$2SoundSystem_cpp$$219T_PauseCountReqKind t_pauseCounterInc__25$$2unnamed$$2SoundSystem_cpp$$2FQ225$$2unnamed$$2SoundSystem_cpp$$219T_PauseCountReqKind: /* 80403638 003FF478 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Spark.s b/asm/src/Spark.s index baa792f0..8aef5002 100644 --- a/asm/src/Spark.s +++ b/asm/src/Spark.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HatPath__Q53scn4step4hero9modeldesc5SparkFv HatPath__Q53scn4step4hero9modeldesc5SparkFv: /* 8035C964 003587A4 3C 60 80 49 */ lis r3, $$248824@ha @@ -78,7 +78,7 @@ HatAnim__Q53scn4step4hero9modeldesc5SparkFv: /* 8035CA60 003588A0 90 03 00 08 */ stw r0, 8(r3) /* 8035CA64 003588A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5spark5SparkFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q53scn4step4hero5spark5SparkFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 8038CDA0 00388BE0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1153,7 +1153,7 @@ lbl_8038DC18: /* 8038DC28 00389A68 38 21 00 10 */ addi r1, r1, 0x10 /* 8038DC2C 00389A6C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248824 $$248824: .incbin "baserom.dol", 0x487510, 0x20 @@ -1161,7 +1161,7 @@ $$248824: $$248733: .incbin "baserom.dol", 0x487530, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$259457 $$259457: .incbin "baserom.dol", 0x489860, 0x20 @@ -1172,7 +1172,7 @@ $$259458: __vt__Q53scn4step4hero5spark5Spark: .incbin "baserom.dol", 0x4898A4, 0x5C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248732 $$248732: .incbin "baserom.dol", 0x497658, 0x8 @@ -1186,7 +1186,7 @@ $$248831: $$248766: .incbin "baserom.dol", 0x497670, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc5SparkFv$$2entries$$22 $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc5SparkFv$$2entries$$22: .incbin "baserom.dol", 0x49DAF8, 0x8 diff --git a/asm/src/SphereComplete.s b/asm/src/SphereComplete.s index 53c73752..482c8024 100644 --- a/asm/src/SphereComplete.s +++ b/asm/src/SphereComplete.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap14SphereCompleteFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component __ct__Q53scn4step4info5lvmap14SphereCompleteFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component: /* 803BF878 003BB6B8 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -351,7 +351,7 @@ constraintPos__Q53scn4step4info5lvmap14SphereCompleteFv: /* 803BFD80 003BBBC0 38 21 00 60 */ addi r1, r1, 0x60 /* 803BFD84 003BBBC4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253706 $$253706: .incbin "baserom.dol", 0x48DBB8, 0x10 @@ -380,7 +380,7 @@ $$253761: $$253767: .incbin "baserom.dol", 0x48DC34, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253755 $$253755: .incbin "baserom.dol", 0x4980E8, 0x8 @@ -388,7 +388,7 @@ $$253755: $$253778: .incbin "baserom.dol", 0x4980F0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253708 $$253708: .incbin "baserom.dol", 0x49E4E0, 0x4 diff --git a/asm/src/SpiralScreen.s b/asm/src/SpiralScreen.s index 4e33d594..cdfb97ce 100644 --- a/asm/src/SpiralScreen.s +++ b/asm/src/SpiralScreen.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx12SpiralScreenFRQ33scn4step9ComponentRQ23sfx7Manager __ct__Q43scn4step3sfx12SpiralScreenFRQ33scn4step9ComponentRQ23sfx7Manager: /* 803CEFA4 003CADE4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -636,12 +636,12 @@ lbl_803CF8B8: /* 803CF8C4 003CB704 38 21 00 10 */ addi r1, r1, 0x10 /* 803CF8C8 003CB708 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251067 $$251067: .incbin "baserom.dol", 0x48EDB0, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251068 $$251068: .incbin "baserom.dol", 0x49E7A8, 0x4 diff --git a/asm/src/Spotlight.s b/asm/src/Spotlight.s index 1d83ab05..84b5bb2a 100644 --- a/asm/src/Spotlight.s +++ b/asm/src/Spotlight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history9SpotlightFRQ33scn7history9ComponentRQ23g3d4RootUl __ct__Q33scn7history9SpotlightFRQ33scn7history9ComponentRQ23g3d4RootUl: /* 8020F68C 0020B4CC 94 21 FF 20 */ stwu r1, -0xe0(r1) @@ -328,17 +328,17 @@ lbl_8020FB14: /* 8020FB48 0020B988 38 21 00 80 */ addi r1, r1, 0x80 /* 8020FB4C 0020B98C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global IS_LARGE__Q33scn7history23$$2unnamed$$2Spotlight_cpp$$2 IS_LARGE__Q33scn7history23$$2unnamed$$2Spotlight_cpp$$2: .incbin "baserom.dol", 0x411CB8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253289 $$253289: .incbin "baserom.dol", 0x45D690, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253290 $$253290: .incbin "baserom.dol", 0x494A60, 0x8 @@ -355,7 +355,7 @@ $$253351: $$253362: .incbin "baserom.dol", 0x494A7C, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253352 $$253352: .incbin "baserom.dol", 0x49AC70, 0x8 diff --git a/asm/src/Squash.s b/asm/src/Squash.s index 24468ab0..b26a46be 100644 --- a/asm/src/Squash.s +++ b/asm/src/Squash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero6SquashFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero6SquashFRQ43scn4step4hero4Hero: /* 80354F3C 00350D7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -194,7 +194,7 @@ getCurrentScale__Q43scn4step4hero6SquashCFv: /* 803551E4 00351024 90 03 00 08 */ stw r0, 8(r3) /* 803551E8 00351028 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255361 $$255361: .incbin "baserom.dol", 0x49D9C0, 0x4 diff --git a/asm/src/StaffCredit.s b/asm/src/StaffCredit.s index 410966db..93fa660e 100644 --- a/asm/src/StaffCredit.s +++ b/asm/src/StaffCredit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect11StaffCreditFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn19challengefileselect11StaffCreditFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 801E91F4 001E5034 94 21 FE E0 */ stwu r1, -0x120(r1) @@ -201,7 +201,7 @@ hideNew__Q33scn19challengefileselect11StaffCreditFv: /* 801E9470 001E52B0 38 21 00 20 */ addi r1, r1, 0x20 /* 801E9474 001E52B4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252079 $$252079: .incbin "baserom.dol", 0x45A8A8, 0x1C @@ -218,7 +218,7 @@ $$252124: __vt__Q33scn19challengefileselect11StaffCredit: .incbin "baserom.dol", 0x45A8EC, 0x8C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252080 $$252080: .incbin "baserom.dol", 0x494018, 0x8 diff --git a/asm/src/StaffCreditCtrl.s b/asm/src/StaffCreditCtrl.s index e504930a..d2b5df1c 100644 --- a/asm/src/StaffCreditCtrl.s +++ b/asm/src/StaffCreditCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global update__Q43scn4step4boss15StaffCreditCtrlFv update__Q43scn4step4boss15StaffCreditCtrlFv: /* 80234238 00230078 80 83 00 04 */ lwz r4, 4(r3) @@ -23,7 +23,7 @@ setSignal__Q43scn4step4boss15StaffCreditCtrlFQ43scn4step4boss21StaffCreditSignal /* 8023426C 002300AC 90 03 00 04 */ stw r0, 4(r3) /* 80234270 002300B0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero15StaffCreditCtrlFv __ct__Q43scn4step4hero15StaffCreditCtrlFv: /* 803551EC 0035102C 38 00 00 00 */ li r0, 0 diff --git a/asm/src/StaffRoll.s b/asm/src/StaffRoll.s index 6fc8cd99..db65c2d6 100644 --- a/asm/src/StaffRoll.s +++ b/asm/src/StaffRoll.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn11staffcredit9StaffRollFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q33scn11staffcredit9StaffRollFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803F9FD8 003F5E18 94 21 EE 10 */ stwu r1, -0x11f0(r1) @@ -2242,12 +2242,12 @@ logoScrollOutTime__Q33scn11staffcredit9StaffRollCFv: /* 803FC06C 003F7EAC 38 21 00 30 */ addi r1, r1, 0x30 /* 803FC070 003F7EB0 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2 POSITIONS__Q33scn11staffcredit23$$2unnamed$$2StaffRoll_cpp$$2: .incbin "baserom.dol", 0x41CE08, 0x220 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251814 $$251814: .incbin "baserom.dol", 0x492148, 0xC @@ -2393,7 +2393,7 @@ $$255301: $$255302: .incbin "baserom.dol", 0x492434, 0x44 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251820 $$251820: .incbin "baserom.dol", 0x498A08, 0x8 @@ -2431,7 +2431,7 @@ $$255297: $$255298: .incbin "baserom.dol", 0x498A60, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255272 $$255272: .incbin "baserom.dol", 0x49EDB8, 0x4 diff --git a/asm/src/Stage.s b/asm/src/Stage.s index 41d067e9..6754d4a3 100644 --- a/asm/src/Stage.s +++ b/asm/src/Stage.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history5StageFRQ33scn7history9ComponentRQ23g3d4Root __ct__Q33scn7history5StageFRQ33scn7history9ComponentRQ23g3d4Root: /* 8020FB50 0020B990 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -1104,15 +1104,15 @@ __sinit_$$3Stage_cpp: /* 80210A6C 0020C8AC C0 62 A1 C8 */ lfs f3, $$254735-_SDA2_BASE_(r2) /* 80210A70 0020C8B0 4B EA D6 50 */ b __ct__Q34nw4r4math4VEC3Ffff -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402464, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$254734 $$254734: .incbin "baserom.dol", 0x45D6A0, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254735 $$254735: .incbin "baserom.dol", 0x49AC88, 0x4 diff --git a/asm/src/StageParts.s b/asm/src/StageParts.s index d1ce806a..bff930a0 100644 --- a/asm/src/StageParts.s +++ b/asm/src/StageParts.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn7history10StagePartsFRQ33scn7history9ComponentRQ23g3d4Rooti __ct__Q33scn7history10StagePartsFRQ33scn7history9ComponentRQ23g3d4Rooti: /* 80210A74 0020C8B4 94 21 FE B0 */ stwu r1, -0x150(r1) @@ -550,7 +550,7 @@ decideEffect__Q33scn7history10StagePartsFv: /* 80211244 0020D084 38 21 00 40 */ addi r1, r1, 0x40 /* 80211248 0020D088 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253814 $$253814: .incbin "baserom.dol", 0x45D6B8, 0x10 @@ -576,7 +576,7 @@ $$253966: $$253969: .incbin "baserom.dol", 0x45D760, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253815 $$253815: .incbin "baserom.dol", 0x494A88, 0x8 @@ -596,7 +596,7 @@ $$253948: $$253959: .incbin "baserom.dol", 0x494AB0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global WIDTH__Q33scn7history10StageParts WIDTH__Q33scn7history10StageParts: .incbin "baserom.dol", 0x49AC98, 0x8 diff --git a/asm/src/StagingCtrl.s b/asm/src/StagingCtrl.s index 529c4e63..e204f579 100644 --- a/asm/src/StagingCtrl.s +++ b/asm/src/StagingCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q43scn4step4boss11StagingCtrlFv __dt__Q43scn4step4boss11StagingCtrlFv: /* 80234274 002300B4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -179,7 +179,7 @@ lbl_802344C8: /* 802344D8 00230318 38 21 00 20 */ addi r1, r1, 0x20 /* 802344DC 0023031C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q43scn4step4hero11StagingCtrlFv __dt__Q43scn4step4hero11StagingCtrlFv: /* 80355210 00351050 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -388,12 +388,12 @@ lbl_803554D8: /* 803554E8 00351328 38 21 00 10 */ addi r1, r1, 0x10 /* 803554EC 0035132C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253301 $$253301: .incbin "baserom.dol", 0x49AEC8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253387 $$253387: .incbin "baserom.dol", 0x49D9C8, 0x4 diff --git a/asm/src/Stake.s b/asm/src/Stake.s index 11421766..7c162e6f 100644 --- a/asm/src/Stake.s +++ b/asm/src/Stake.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick5stake5StakeFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick5stake5StakeFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80325534 00321374 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -443,7 +443,7 @@ mfStartStrike__Q53scn4step7gimmick5stake5StakeFv: /* 80325B8C 003219CC 38 21 00 20 */ addi r1, r1, 0x20 /* 80325B90 003219D0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258060 $$258060: .incbin "baserom.dol", 0x47E588, 0x14 @@ -454,12 +454,12 @@ $$258062: $$258184: .incbin "baserom.dol", 0x47E5AC, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258061 $$258061: .incbin "baserom.dol", 0x496D20, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258063 $$258063: .incbin "baserom.dol", 0x49D5B8, 0x4 diff --git a/asm/src/Start.s b/asm/src/Start.s index 6b1bd5c1..712ee010 100644 --- a/asm/src/Start.s +++ b/asm/src/Start.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge5StartFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge5StartFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B5524 003B1364 94 21 FD 70 */ stwu r1, -0x290(r1) @@ -251,7 +251,7 @@ lbl_803B5874: /* 803B5880 003B16C0 38 21 00 10 */ addi r1, r1, 0x10 /* 803B5884 003B16C4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253747 $$253747: .incbin "baserom.dol", 0x48C910, 0x18 @@ -265,7 +265,7 @@ $$253749: $$253751: .incbin "baserom.dol", 0x48C94C, 0x4C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253750 $$253750: .incbin "baserom.dol", 0x497C88, 0x8 diff --git a/asm/src/StateAbilityCrash.s b/asm/src/StateAbilityCrash.s index ef5b57ba..475acd0f 100644 --- a/asm/src/StateAbilityCrash.s +++ b/asm/src/StateAbilityCrash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6damage17StateAbilityCrashFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6damage17StateAbilityCrashFPQ43scn4step4hero4Hero: /* 80375580 003713C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -219,7 +219,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17St __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1Fv: /* 80375874 003716B4 4B EB 8E 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17StateAbilityCrash$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4886D0, 0x10 @@ -227,7 +227,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6damage17Stat __vt__Q53scn4step4hero6damage17StateAbilityCrash: .incbin "baserom.dol", 0x4886E0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256035 $$256035: .incbin "baserom.dol", 0x49DDE0, 0x4 diff --git a/asm/src/StateAgony.s b/asm/src/StateAgony.s index 8c6f87d5..3589186d 100644 --- a/asm/src/StateAgony.s +++ b/asm/src/StateAgony.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6flamer10StateAgonyFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6flamer10StateAgonyFPQ43scn4step5enemy5Enemy: /* 802B23C0 002AE200 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -325,12 +325,12 @@ lbl_802B2850: __dt__Q53scn4step5enemy6flamer10StateAgonyFv: /* 802B2878 002AE6B8 4B FD F1 40 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer10StateAgony __vt__Q53scn4step5enemy6flamer10StateAgony: .incbin "baserom.dol", 0x472D50, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257328 $$257328: .incbin "baserom.dol", 0x49C3D0, 0x4 diff --git a/asm/src/StateAim.s b/asm/src/StateAim.s index e55742fc..97dfe281 100644 --- a/asm/src/StateAim.s +++ b/asm/src/StateAim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7gigatzo8StateAimFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7gigatzo8StateAimFPQ43scn4step5enemy5Enemy: /* 802B78FC 002B373C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -322,7 +322,7 @@ roundAngle__Q53scn4step5enemy7gigatzo8StateAimFf: /* 802B7D7C 002B3BBC 38 21 00 10 */ addi r1, r1, 0x10 /* 802B7D80 002B3BC0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6shotzo8StateAimFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6shotzo8StateAimFPQ43scn4step5enemy5Enemy: /* 802E0824 002DC664 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -510,17 +510,17 @@ roundAngle__Q53scn4step5enemy6shotzo8StateAimFf: __dt__Q53scn4step5enemy6shotzo8StateAimFv: /* 802E0AAC 002DC8EC 4B FB 0F 0C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo8StateAim __vt__Q53scn4step5enemy7gigatzo8StateAim: .incbin "baserom.dol", 0x473588, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo8StateAim __vt__Q53scn4step5enemy6shotzo8StateAim: .incbin "baserom.dol", 0x478270, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256000 $$256000: .incbin "baserom.dol", 0x49C540, 0x4 @@ -537,7 +537,7 @@ $$256036: $$256050: .incbin "baserom.dol", 0x49C558, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255889 $$255889: .incbin "baserom.dol", 0x49CDD0, 0x4 diff --git a/asm/src/StateAirJump.s b/asm/src/StateAirJump.s index 64c0d768..b601ebea 100644 --- a/asm/src/StateAirJump.s +++ b/asm/src/StateAirJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common12StateAirJumpFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common12StateAirJumpFPQ43scn4step4hero4Hero: /* 8035E394 0035A1D4 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -351,7 +351,7 @@ create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12St __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1Fv: /* 8035E880 0035A6C0 4B EC FE 20 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12StateAirJump$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487A78, 0x10 @@ -359,7 +359,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12Stat __vt__Q53scn4step4hero6common12StateAirJump: .incbin "baserom.dol", 0x487A88, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256930 $$256930: .incbin "baserom.dol", 0x49DB08, 0x8 diff --git a/asm/src/StateAirSpin.s b/asm/src/StateAirSpin.s index e585d703..d8cf8beb 100644 --- a/asm/src/StateAirSpin.s +++ b/asm/src/StateAirSpin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5smash12StateAirSpinFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5smash12StateAirSpinFPQ43scn4step4hero4Hero: /* 803A0D18 0039CB58 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -193,7 +193,7 @@ create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12Sta __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A0F9C 0039CDDC 4B E8 D7 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12StateAirSpin$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48AE08, 0x10 @@ -201,7 +201,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash12State __vt__Q53scn4step4hero5smash12StateAirSpin: .incbin "baserom.dol", 0x48AE18, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258329 $$258329: .incbin "baserom.dol", 0x49E350, 0x8 diff --git a/asm/src/StateAllStageClear.s b/asm/src/StateAllStageClear.s index 67c3a16f..573148fd 100644 --- a/asm/src/StateAllStageClear.s +++ b/asm/src/StateAllStageClear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick18StateAllStageClearFPQ43scn4step4hero4Heroi __ct__Q53scn4step4hero7gimmick18StateAllStageClearFPQ43scn4step4hero4Heroi: /* 803789A4 003747E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -225,7 +225,7 @@ create__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16 __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1Fv: /* 80378CAC 00374AEC 4B EB 59 F4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick16StateChangeGrade$$4PQ43scn4step4hero4Hero$$4i$$1: .incbin "baserom.dol", 0x4888F8, 0x10 diff --git a/asm/src/StateAngerChase.s b/asm/src/StateAngerChase.s index 116f8c4b..b48497f9 100644 --- a/asm/src/StateAngerChase.s +++ b/asm/src/StateAngerChase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy15StateAngerChaseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy15StateAngerChaseFPQ43scn4step5enemy5Enemy: /* 802D9E74 002D5CB4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -573,12 +573,12 @@ lbl_802DA688: /* 802DA698 002D64D8 38 21 00 10 */ addi r1, r1, 0x10 /* 802DA69C 002D64DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy15StateAngerChase __vt__Q53scn4step5enemy6scarfy15StateAngerChase: .incbin "baserom.dol", 0x4776F8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257207 $$257207: .incbin "baserom.dol", 0x49CC20, 0x4 diff --git a/asm/src/StateAnyWhereIn.s b/asm/src/StateAnyWhereIn.s index f0891b4e..d3d99185 100644 --- a/asm/src/StateAnyWhereIn.s +++ b/asm/src/StateAnyWhereIn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common15StateAnyWhereInFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common15StateAnyWhereInFPQ43scn4step4hero4Hero: /* 8035E884 0035A6C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -694,12 +694,12 @@ lbl_8035F2AC: /* 8035F2C8 0035B108 38 21 00 40 */ addi r1, r1, 0x40 /* 8035F2CC 0035B10C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common15StateAnyWhereIn __vt__Q53scn4step4hero6common15StateAnyWhereIn: .incbin "baserom.dol", 0x487AB0, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258805 $$258805: .incbin "baserom.dol", 0x497710, 0x4 @@ -707,7 +707,7 @@ $$258805: $$258808: .incbin "baserom.dol", 0x497714, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259623 $$259623: .incbin "baserom.dol", 0x49DB10, 0x4 diff --git a/asm/src/StateAppear.s b/asm/src/StateAppear.s index 5b778a5e..de3948c5 100644 --- a/asm/src/StateAppear.s +++ b/asm/src/StateAppear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common11StateAppearFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6common11StateAppearFPQ43scn4step4boss4Boss: /* 80244578 002403B8 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -424,7 +424,7 @@ lbl_80244B78: /* 80244B84 002409C4 38 21 00 10 */ addi r1, r1, 0x10 /* 80244B88 002409C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss10creditroah11StateAppearFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss10creditroah11StateAppearFPQ43scn4step4boss4Boss: /* 8024B7F8 00247638 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -610,7 +610,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroa __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv: /* 8024BA6C 002478AC 4B FE 2C 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy11StateAppearFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy11StateAppearFPQ43scn4step4boss4Boss: /* 8025C8F8 00258738 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -773,7 +773,7 @@ create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9Sta __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025CAF8 00258938 4B FD 1B A8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como11StateAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como11StateAppearFPQ43scn4step5enemy5Enemy: /* 802A7550 002A3390 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -953,7 +953,7 @@ procFixPos__Q53scn4step5enemy4como11StateAppearFv: __dt__Q53scn4step5enemy4como11StateAppearFv: /* 802A77B8 002A35F8 4B FE A2 00 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11whispyapple11StateAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11whispyapple11StateAppearFPQ43scn4step5enemy5Enemy: /* 802F1190 002ECFD0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1078,7 +1078,7 @@ procMove__Q53scn4step5enemy11whispyapple11StateAppearFv: procFixPos__Q53scn4step5enemy11whispyapple11StateAppearFv: /* 802F1334 002ED174 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257483 $$257483: .incbin "baserom.dol", 0x4621A8, 0x1D8 @@ -1086,7 +1086,7 @@ $$257483: __vt__Q53scn4step4boss6common11StateAppear: .incbin "baserom.dol", 0x462380, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah11StateAppear$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x463288, 0x10 @@ -1094,7 +1094,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah1 __vt__Q53scn4step4boss10creditroah11StateAppear: .incbin "baserom.dol", 0x463298, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateWait$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x466608, 0x10 @@ -1102,17 +1102,17 @@ __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9State __vt__Q53scn4step4boss6whispy11StateAppear: .incbin "baserom.dol", 0x466618, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como11StateAppear __vt__Q53scn4step5enemy4como11StateAppear: .incbin "baserom.dol", 0x471C60, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11whispyapple11StateAppear __vt__Q53scn4step5enemy11whispyapple11StateAppear: .incbin "baserom.dol", 0x47AE38, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257435 $$257435: .incbin "baserom.dol", 0x49B110, 0x8 @@ -1126,7 +1126,7 @@ $$257480: $$257481: .incbin "baserom.dol", 0x49B124, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255225 $$255225: .incbin "baserom.dol", 0x49C0C0, 0x4 diff --git a/asm/src/StateApproach.s b/asm/src/StateApproach.s index 2205e8b5..82f63c5e 100644 --- a/asm/src/StateApproach.s +++ b/asm/src/StateApproach.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state13StateApproachFPQ43scn4step4item4Item __ct__Q53scn4step4item5state13StateApproachFPQ43scn4step4item4Item: /* 803C728C 003C30CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -133,12 +133,12 @@ lbl_803C7448: /* 803C745C 003C329C 38 21 00 10 */ addi r1, r1, 0x10 /* 803C7460 003C32A0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state13StateApproach __vt__Q53scn4step4item5state13StateApproach: .incbin "baserom.dol", 0x48E660, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255066 $$255066: .incbin "baserom.dol", 0x49E5B0, 0x4 diff --git a/asm/src/StateAreaMapDemoFirstPlay.s b/asm/src/StateAreaMapDemoFirstPlay.s index fc04d924..150d8834 100644 --- a/asm/src/StateAreaMapDemoFirstPlay.s +++ b/asm/src/StateAreaMapDemoFirstPlay.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFPQ43scn4step4hero4Heroi __ct__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFPQ43scn4step4hero4Heroi: /* 80378CB0 00374AF0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -157,7 +157,7 @@ procMove__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv: procFixPos__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlayFv: /* 80378ED4 00374D14 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay __vt__Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay: .incbin "baserom.dol", 0x488930, 0x28 diff --git a/asm/src/StateAttack.s b/asm/src/StateAttack.s index 164556fd..e640bbad 100644 --- a/asm/src/StateAttack.s +++ b/asm/src/StateAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common11StateAttackFPQ43scn4step4boss4BossRQ53scn4step4boss6common15StateAttackDescUl __ct__Q53scn4step4boss6common11StateAttackFPQ43scn4step4boss4BossRQ53scn4step4boss6common15StateAttackDescUl: /* 80244B8C 002409CC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -224,7 +224,7 @@ procMove__Q53scn4step4boss6common11StateAttackFv: procFixPos__Q53scn4step4boss6common11StateAttackFv: /* 80244EB4 00240CF4 4B FF 31 0C */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss13watergalboros11StateAttackFPQ43scn4step4boss4BossUl __ct__Q53scn4step4boss13watergalboros11StateAttackFPQ43scn4step4boss4BossUl: /* 80259EB4 00255CF4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -377,7 +377,7 @@ procMove__Q53scn4step4boss13watergalboros11StateAttackFv: procFixPos__Q53scn4step4boss13watergalboros11StateAttackFv: /* 8025A0B0 00255EF0 4B FD DF 10 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9zankibble11StateAttackFPQ43scn4step4boss4BossQ63scn4step4boss9zankibble11StateAttack6Config __ct__Q53scn4step4boss9zankibble11StateAttackFPQ43scn4step4boss4BossQ63scn4step4boss9zankibble11StateAttack6Config: /* 80260E38 0025CC78 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -948,7 +948,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble1 __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1Fv: /* 8026164C 0025D48C 4B FC D0 54 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight11StateAttackFPQ43scn4step5enemy5Enemy: /* 802975E4 00293424 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1168,7 +1168,7 @@ lbl_802978CC: /* 802978DC 0029371C 38 21 00 50 */ addi r1, r1, 0x50 /* 802978E0 00293720 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5bowby11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5bowby11StateAttackFPQ43scn4step5enemy5Enemy: /* 8029E914 0029A754 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1380,7 +1380,7 @@ lbl_8029EBF4: /* 8029EC10 0029AA50 38 21 00 D0 */ addi r1, r1, 0xd0 /* 8029EC14 0029AA54 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5cappy11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5cappy11StateAttackFPQ43scn4step5enemy5Enemy: /* 802A2E90 0029ECD0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1699,7 +1699,7 @@ __dt__Q53scn4step5enemy5cappy11StateAttackFv: __dt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv: /* 802A3310 0029F150 4B F8 B3 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6chilly11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6chilly11StateAttackFPQ43scn4step5enemy5Enemy: /* 802A63D8 002A2218 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1859,7 +1859,7 @@ lbl_802A65F4: procFixPos__Q53scn4step5enemy6chilly11StateAttackFv: /* 802A660C 002A244C 4B FF B5 20 */ b procFixPos__Q53scn4step5enemy11broomhatter9StateWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4elec11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4elec11StateAttackFPQ43scn4step5enemy5Enemy: /* 802AFD28 002ABB68 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1981,7 +1981,7 @@ lbl_802AFEC4: /* 802AFED4 002ABD14 38 21 00 20 */ addi r1, r1, 0x20 /* 802AFED8 002ABD18 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6flamer11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6flamer11StateAttackFPQ43scn4step5enemy5Enemy: /* 802B287C 002AE6BC 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -2468,7 +2468,7 @@ lbl_802B2F60: /* 802B2F70 002AEDB0 38 21 00 60 */ addi r1, r1, 0x60 /* 802B2F74 002AEDB4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5foley11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5foley11StateAttackFPQ43scn4step5enemy5Enemy: /* 802B4AA0 002B08E0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -2841,7 +2841,7 @@ lbl_802B4FE4: /* 802B4FF0 002B0E30 38 21 00 40 */ addi r1, r1, 0x40 /* 802B4FF4 002B0E34 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gemra11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gemra11StateAttackFPQ43scn4step5enemy5Enemy: /* 802B628C 002B20CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2961,7 +2961,7 @@ lbl_802B6428: /* 802B6434 002B2274 38 21 00 10 */ addi r1, r1, 0x10 /* 802B6438 002B2278 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7gigatzo11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7gigatzo11StateAttackFPQ43scn4step5enemy5Enemy: /* 802B7D84 002B3BC4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3716,7 +3716,7 @@ lbl_802B8838: /* 802B8850 002B4690 38 21 00 60 */ addi r1, r1, 0x60 /* 802B8854 002B4694 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6juckle11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6juckle11StateAttackFPQ43scn4step5enemy5Enemy: /* 802BB874 002B76B4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -4001,7 +4001,7 @@ lbl_802BBC58: __dt__Q53scn4step5enemy6juckle11StateAttackFv: /* 802BBC74 002B7AB4 4B FD 5D 44 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe11StateAttackFPQ43scn4step5enemy5Enemy: /* 802BFC58 002BBA98 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -4391,7 +4391,7 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejo __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C0178 002BBFB8 4B F6 E5 28 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6lanzer11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6lanzer11StateAttackFPQ43scn4step5enemy5Enemy: /* 802C2268 002BE0A8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -4689,7 +4689,7 @@ lbl_802C2684: /* 802C2694 002BE4D4 38 21 00 40 */ addi r1, r1, 0x40 /* 802C2698 002BE4D8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6leafan11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6leafan11StateAttackFPQ43scn4step5enemy5Enemy: /* 802C3648 002BF488 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -4929,7 +4929,7 @@ __dt__Q53scn4step5enemy6leafan11StateAttackFv: __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C39A4 002BF7E4 4B F6 AC FC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8needlous11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8needlous11StateAttackFPQ43scn4step5enemy5Enemy: /* 802C62E0 002C2120 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5246,7 +5246,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous1 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C6748 002C2588 4B F6 7F 58 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky11StateAttackFPQ43scn4step5enemy5Enemy: /* 802D3B84 002CF9C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5422,7 +5422,7 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9Sta __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D3DE0 002CFC20 4B F5 A8 C0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8searches11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8searches11StateAttackFPQ43scn4step5enemy5Enemy: /* 802DBEC0 002D7D00 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5584,7 +5584,7 @@ lbl_802DC0FC: __dt__Q53scn4step5enemy8searches11StateAttackFv: /* 802DC110 002D7F50 4B FB 58 A8 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9sirkibble11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9sirkibble11StateAttackFPQ43scn4step5enemy5Enemy: /* 802E17D8 002DD618 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -5702,7 +5702,7 @@ procMove__Q53scn4step5enemy9sirkibble11StateAttackFv: procFixPos__Q53scn4step5enemy9sirkibble11StateAttackFv: /* 802E195C 002DD79C 4B FB 12 40 */ b procFixPos__Q53scn4step5enemy6common12StateLandingFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory11StateAttackFPQ43scn4step5enemy5Enemy: /* 802E54B0 002E12F0 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -6515,7 +6515,7 @@ getTargetAngle__Q53scn4step5enemy6sodory11StateAttackFv: /* 802E6078 002E1EB8 38 21 00 40 */ addi r1, r1, 0x40 /* 802E607C 002E1EBC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sparky11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sparky11StateAttackFPQ43scn4step5enemy5Enemy: /* 802E6F6C 002E2DAC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -6634,7 +6634,7 @@ lbl_802E70E8: procFixPos__Q53scn4step5enemy6sparky11StateAttackFv: /* 802E7100 002E2F40 4B FD 37 C0 */ b procFixPos__Q53scn4step5enemy7hothead17StateAttackBreathFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage11StateAttackFPQ43scn4step5enemy5Enemy: /* 802EB0FC 002E6F3C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -6816,7 +6816,7 @@ lbl_802EB354: __dt__Q53scn4step5enemy9tsukikage11StateAttackFv: /* 802EB36C 002E71AC 4B FA 66 4C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledoo11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledoo11StateAttackFPQ43scn4step5enemy5Enemy: /* 802EFC4C 002EBA8C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -6856,7 +6856,7 @@ procFixPos__Q53scn4step5enemy9waddledoo11StateAttackFv: __dt__Q53scn4step5enemy9waddledoo11StateAttackFv: /* 802EFCB4 002EBAF4 4B FA 1D 04 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10watergalbo11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10watergalbo11StateAttackFPQ43scn4step5enemy5Enemy: /* 802F02AC 002EC0EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7124,7 +7124,7 @@ lbl_802F0664: procFixPos__Q53scn4step5enemy10watergalbo11StateAttackFv: /* 802F067C 002EC4BC 4B FB 2C 48 */ b procFixPos__Q53scn4step5enemy5cappy11StateAttackFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6whippy11StateAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6whippy11StateAttackFPQ43scn4step5enemy5Enemy: /* 802F08E4 002EC724 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7385,7 +7385,7 @@ lbl_802F0BF0: /* 802F0C8C 002ECACC 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802F0C90 002ECAD0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5spark11StateAttackFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5spark11StateAttackFPQ43scn4step4hero4Hero: /* 8038DC30 00389A70 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -7704,17 +7704,17 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11State __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038E074 00389EB4 4B EA 06 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common11StateAttack __vt__Q53scn4step4boss6common11StateAttack: .incbin "baserom.dol", 0x4623A0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros11StateAttack __vt__Q53scn4step4boss13watergalboros11StateAttack: .incbin "baserom.dol", 0x465B20, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10StateCatch$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x467090, 0x10 @@ -7722,17 +7722,17 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9zankibble10S __vt__Q53scn4step4boss9zankibble11StateAttack: .incbin "baserom.dol", 0x4670A0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight11StateAttack __vt__Q53scn4step5enemy11bladeknight11StateAttack: .incbin "baserom.dol", 0x46FAD8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5bowby11StateAttack __vt__Q53scn4step5enemy5bowby11StateAttack: .incbin "baserom.dol", 0x470840, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1 __vt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10StateThrow$$4PQ43scn4step5enemy5Enemy$$4Ux$$1: .incbin "baserom.dol", 0x471328, 0x10 @@ -7740,42 +7740,42 @@ __vt__Q24util99StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy8cappyhat10S __vt__Q53scn4step5enemy5cappy11StateAttack: .incbin "baserom.dol", 0x471338, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly11StateAttack __vt__Q53scn4step5enemy6chilly11StateAttack: .incbin "baserom.dol", 0x4719F0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec11StateAttack __vt__Q53scn4step5enemy4elec11StateAttack: .incbin "baserom.dol", 0x472838, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer11StateAttack __vt__Q53scn4step5enemy6flamer11StateAttack: .incbin "baserom.dol", 0x472D70, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley11StateAttack __vt__Q53scn4step5enemy5foley11StateAttack: .incbin "baserom.dol", 0x472F80, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra11StateAttack __vt__Q53scn4step5enemy5gemra11StateAttack: .incbin "baserom.dol", 0x4731F8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo11StateAttack __vt__Q53scn4step5enemy7gigatzo11StateAttack: .incbin "baserom.dol", 0x4735A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle11StateAttack __vt__Q53scn4step5enemy6juckle11StateAttack: .incbin "baserom.dol", 0x473DE0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe10StateHadou$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4749F0, 0x10 @@ -7792,12 +7792,12 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10knucklejoe __vt__Q53scn4step5enemy10knucklejoe11StateAttack: .incbin "baserom.dol", 0x474A30, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer11StateAttack __vt__Q53scn4step5enemy6lanzer11StateAttack: .incbin "baserom.dol", 0x474E30, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9StateWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475028, 0x10 @@ -7805,7 +7805,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan9Stat __vt__Q53scn4step5enemy6leafan11StateAttack: .incbin "baserom.dol", 0x475038, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateIdling$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475570, 0x10 @@ -7813,7 +7813,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11S __vt__Q53scn4step5enemy8needlous11StateAttack: .incbin "baserom.dol", 0x475580, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476EB8, 0x10 @@ -7821,47 +7821,47 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9State __vt__Q53scn4step5enemy5rocky11StateAttack: .incbin "baserom.dol", 0x476EC8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches11StateAttack __vt__Q53scn4step5enemy8searches11StateAttack: .incbin "baserom.dol", 0x477960, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble11StateAttack __vt__Q53scn4step5enemy9sirkibble11StateAttack: .incbin "baserom.dol", 0x478670, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory11StateAttack __vt__Q53scn4step5enemy6sodory11StateAttack: .incbin "baserom.dol", 0x478FD8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky11StateAttack __vt__Q53scn4step5enemy6sparky11StateAttack: .incbin "baserom.dol", 0x479308, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage11StateAttack __vt__Q53scn4step5enemy9tsukikage11StateAttack: .incbin "baserom.dol", 0x479A50, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo11StateAttack __vt__Q53scn4step5enemy9waddledoo11StateAttack: .incbin "baserom.dol", 0x47A8D0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10watergalbo11StateAttack __vt__Q53scn4step5enemy10watergalbo11StateAttack: .incbin "baserom.dol", 0x47AAA8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6whippy11StateAttack __vt__Q53scn4step5enemy6whippy11StateAttack: .incbin "baserom.dol", 0x47AC58, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark14StateAttackEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489900, 0x10 @@ -7872,7 +7872,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark11State __vt__Q53scn4step4hero5spark11StateAttack: .incbin "baserom.dol", 0x489920, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255924 $$255924: .incbin "baserom.dol", 0x49B5A8, 0x8 @@ -7883,12 +7883,12 @@ $$255990: $$256009: .incbin "baserom.dol", 0x49B5B8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256898 $$256898: .incbin "baserom.dol", 0x49BEC0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257318 $$257318: .incbin "baserom.dol", 0x49BFB8, 0x4 @@ -7896,7 +7896,7 @@ $$257318: $$257319: .incbin "baserom.dol", 0x49BFBC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256033 $$256033: .incbin "baserom.dol", 0x49C358, 0x4 @@ -7907,7 +7907,7 @@ $$256047: $$256050: .incbin "baserom.dol", 0x49C360, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256901 $$256901: .incbin "baserom.dol", 0x49C408, 0x4 @@ -7939,7 +7939,7 @@ $$256965: $$256990: .incbin "baserom.dol", 0x49C434, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257636 $$257636: .incbin "baserom.dol", 0x49C4B0, 0x8 @@ -7947,12 +7947,12 @@ $$257636: $$257706: .incbin "baserom.dol", 0x49C4B8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255969 $$255969: .incbin "baserom.dol", 0x49C4F0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258295 $$258295: .incbin "baserom.dol", 0x49C560, 0x4 @@ -7984,7 +7984,7 @@ $$258414: $$258415: .incbin "baserom.dol", 0x49C584, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257366 $$257366: .incbin "baserom.dol", 0x49C608, 0x4 @@ -8004,7 +8004,7 @@ $$257370: $$257371: .incbin "baserom.dol", 0x49C61C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255588 $$255588: .incbin "baserom.dol", 0x49C710, 0x4 @@ -8012,7 +8012,7 @@ $$255588: $$255589: .incbin "baserom.dol", 0x49C714, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256150 $$256150: .incbin "baserom.dol", 0x49C7A0, 0x4 @@ -8023,7 +8023,7 @@ $$256151: $$256160: .incbin "baserom.dol", 0x49C7A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257076 $$257076: .incbin "baserom.dol", 0x49C7D8, 0x4 @@ -8031,7 +8031,7 @@ $$257076: $$257086: .incbin "baserom.dol", 0x49C7DC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256204 $$256204: .incbin "baserom.dol", 0x49C880, 0x4 @@ -8039,12 +8039,12 @@ $$256204: $$256205: .incbin "baserom.dol", 0x49C884, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255849 $$255849: .incbin "baserom.dol", 0x49CB28, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256451 $$256451: .incbin "baserom.dol", 0x49CCC8, 0x4 @@ -8052,7 +8052,7 @@ $$256451: $$256452: .incbin "baserom.dol", 0x49CCCC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257960 $$257960: .incbin "baserom.dol", 0x49CE88, 0x4 @@ -8102,7 +8102,7 @@ $$258148: $$258153: .incbin "baserom.dol", 0x49CEC4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256622 $$256622: .incbin "baserom.dol", 0x49D070, 0x4 @@ -8110,7 +8110,7 @@ $$256622: $$256623: .incbin "baserom.dol", 0x49D074, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256306 $$256306: .incbin "baserom.dol", 0x49D080, 0x4 diff --git a/asm/src/StateAttack1Way.s b/asm/src/StateAttack1Way.s index 8d971c08..069ae3a5 100644 --- a/asm/src/StateAttack1Way.s +++ b/asm/src/StateAttack1Way.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6owgulf15StateAttack1WayFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6owgulf15StateAttack1WayFPQ43scn4step5enemy5Enemy: /* 802CA004 002C5E44 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -237,12 +237,12 @@ lbl_802CA338: __dt__Q53scn4step5enemy6owgulf15StateAttack1WayFv: /* 802CA368 002C61A8 4B FC 76 50 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf15StateAttack1Way __vt__Q53scn4step5enemy6owgulf15StateAttack1Way: .incbin "baserom.dol", 0x475E18, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255607 $$255607: .incbin "baserom.dol", 0x49C920, 0x4 diff --git a/asm/src/StateAttack3Way.s b/asm/src/StateAttack3Way.s index 9693d342..d54640ff 100644 --- a/asm/src/StateAttack3Way.s +++ b/asm/src/StateAttack3Way.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6owgulf15StateAttack3WayFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6owgulf15StateAttack3WayFPQ43scn4step5enemy5Enemy: /* 802CA36C 002C61AC 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -262,12 +262,12 @@ lbl_802CA5D8: __dt__Q53scn4step5enemy6owgulf15StateAttack3WayFv: /* 802CA728 002C6568 4B FC 72 90 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf15StateAttack3Way __vt__Q53scn4step5enemy6owgulf15StateAttack3Way: .incbin "baserom.dol", 0x475E38, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255579 $$255579: .incbin "baserom.dol", 0x49C938, 0x4 diff --git a/asm/src/StateAttackBreath.s b/asm/src/StateAttackBreath.s index f5feebf9..08dec059 100644 --- a/asm/src/StateAttackBreath.s +++ b/asm/src/StateAttackBreath.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7hothead17StateAttackBreathFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7hothead17StateAttackBreathFPQ43scn4step5enemy5Enemy: /* 802BA750 002B6590 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -154,7 +154,7 @@ lbl_802BA944: /* 802BA954 002B6794 38 21 00 50 */ addi r1, r1, 0x50 /* 802BA958 002B6798 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7hothead17StateAttackBreath __vt__Q53scn4step5enemy7hothead17StateAttackBreath: .incbin "baserom.dol", 0x473B18, 0x20 diff --git a/asm/src/StateAttackDesc.s b/asm/src/StateAttackDesc.s index 6f3701db..ca86acaf 100644 --- a/asm/src/StateAttackDesc.s +++ b/asm/src/StateAttackDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common15StateAttackDescFQ24gobj14MoveParamDecelQ33hel4math4Vec2Q33hel4math4Vec2ff __ct__Q53scn4step4boss6common15StateAttackDescFQ24gobj14MoveParamDecelQ33hel4math4Vec2Q33hel4math4Vec2ff: /* 80244EB8 00240CF8 80 04 00 00 */ lwz r0, 0(r4) diff --git a/asm/src/StateAttackEnd.s b/asm/src/StateAttackEnd.s index 75578682..4a760fd0 100644 --- a/asm/src/StateAttackEnd.s +++ b/asm/src/StateAttackEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5spark14StateAttackEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5spark14StateAttackEndFPQ43scn4step4hero4Hero: /* 8038E078 00389EB8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -135,7 +135,7 @@ procFixPos__Q53scn4step4hero5spark14StateAttackEndFv: /* 8038E240 0038A080 38 21 00 10 */ addi r1, r1, 0x10 /* 8038E244 0038A084 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5spark14StateAttackEnd __vt__Q53scn4step4hero5spark14StateAttackEnd: .incbin "baserom.dol", 0x489948, 0x28 diff --git a/asm/src/StateAttackJoint.s b/asm/src/StateAttackJoint.s index fe6e4362..b6705b11 100644 --- a/asm/src/StateAttackJoint.s +++ b/asm/src/StateAttackJoint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss13watergalboros16StateAttackJointFPQ43scn4step4boss4BossUl __ct__Q53scn4step4boss13watergalboros16StateAttackJointFPQ43scn4step4boss4BossUl: /* 8025A0B4 00255EF4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -47,7 +47,7 @@ procMove__Q53scn4step4boss13watergalboros16StateAttackJointFv: procFixPos__Q53scn4step4boss13watergalboros16StateAttackJointFv: /* 8025A12C 00255F6C 4B FD DE 94 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros16StateAttackJoint __vt__Q53scn4step4boss13watergalboros16StateAttackJoint: .incbin "baserom.dol", 0x465B40, 0x20 diff --git a/asm/src/StateAttackOver.s b/asm/src/StateAttackOver.s index 25d28212..0f6df443 100644 --- a/asm/src/StateAttackOver.s +++ b/asm/src/StateAttackOver.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5spark15StateAttackOverFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5spark15StateAttackOverFPQ43scn4step4hero4Hero: /* 8038E248 0038A088 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -383,7 +383,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15State __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038E778 0038A5B8 4B E9 FF 28 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark18StateAttackOverEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489970, 0x10 @@ -394,7 +394,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark15State __vt__Q53scn4step4hero5spark15StateAttackOver: .incbin "baserom.dol", 0x489990, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257144 $$257144: .incbin "baserom.dol", 0x49E0D8, 0x8 diff --git a/asm/src/StateAttackOverEnd.s b/asm/src/StateAttackOverEnd.s index 86ff7d72..a08c2cf3 100644 --- a/asm/src/StateAttackOverEnd.s +++ b/asm/src/StateAttackOverEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5spark18StateAttackOverEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5spark18StateAttackOverEndFPQ43scn4step4hero4Hero: /* 8038E77C 0038A5BC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -79,7 +79,7 @@ procMove__Q53scn4step4hero5spark18StateAttackOverEndFv: procFixPos__Q53scn4step4hero5spark18StateAttackOverEndFv: /* 8038E870 0038A6B0 4B FD 20 10 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5spark18StateAttackOverEnd __vt__Q53scn4step4hero5spark18StateAttackOverEnd: .incbin "baserom.dol", 0x4899B8, 0x28 diff --git a/asm/src/StateAttackShot.s b/asm/src/StateAttackShot.s index f5c6c0cd..0eb259c7 100644 --- a/asm/src/StateAttackShot.s +++ b/asm/src/StateAttackShot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7hothead15StateAttackShotFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7hothead15StateAttackShotFPQ43scn4step5enemy5Enemy: /* 802BA95C 002B679C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -349,12 +349,12 @@ reqWeapon__Q53scn4step5enemy7hothead15StateAttackShotFv: /* 802BAE40 002B6C80 38 21 00 80 */ addi r1, r1, 0x80 /* 802BAE44 002B6C84 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7hothead15StateAttackShot __vt__Q53scn4step5enemy7hothead15StateAttackShot: .incbin "baserom.dol", 0x473B38, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257616 $$257616: .incbin "baserom.dol", 0x49C5D8, 0x4 diff --git a/asm/src/StateAttackUnder.s b/asm/src/StateAttackUnder.s index 11d94255..fa049a11 100644 --- a/asm/src/StateAttackUnder.s +++ b/asm/src/StateAttackUnder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5spark16StateAttackUnderFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5spark16StateAttackUnderFPQ43scn4step4hero4Hero: /* 8038E874 0038A6B4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -393,7 +393,7 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16State __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038EDCC 0038AC0C 4B E9 F8 D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark19StateAttackUnderEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4899E0, 0x10 @@ -404,7 +404,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5spark16State __vt__Q53scn4step4hero5spark16StateAttackUnder: .incbin "baserom.dol", 0x489A00, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257172 $$257172: .incbin "baserom.dol", 0x49E0E0, 0x8 diff --git a/asm/src/StateAttackUnderEnd.s b/asm/src/StateAttackUnderEnd.s index 5751ee35..595d2800 100644 --- a/asm/src/StateAttackUnderEnd.s +++ b/asm/src/StateAttackUnderEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5spark19StateAttackUnderEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5spark19StateAttackUnderEndFPQ43scn4step4hero4Hero: /* 8038EDD0 0038AC10 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -79,7 +79,7 @@ procMove__Q53scn4step4hero5spark19StateAttackUnderEndFv: procFixPos__Q53scn4step4hero5spark19StateAttackUnderEndFv: /* 8038EEC4 0038AD04 4B FD 19 BC */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5spark19StateAttackUnderEnd __vt__Q53scn4step4hero5spark19StateAttackUnderEnd: .incbin "baserom.dol", 0x489A28, 0x28 diff --git a/asm/src/StateBack.s b/asm/src/StateBack.s index 5349ddc3..fa550ff7 100644 --- a/asm/src/StateBack.s +++ b/asm/src/StateBack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como9StateBackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como9StateBackFPQ43scn4step5enemy5Enemy: /* 802A77BC 002A35FC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -194,7 +194,7 @@ lbl_802A7A40: __dt__Q53scn4step5enemy4como9StateBackFv: /* 802A7A58 002A3898 4B FE 9F 60 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8dubiorjr9StateBackFPQ43scn4step5enemy5Enemyf __ct__Q53scn4step5enemy8dubiorjr9StateBackFPQ43scn4step5enemy5Enemyf: /* 802AE32C 002AA16C 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -389,17 +389,17 @@ procMove__Q53scn4step5enemy8dubiorjr9StateBackFv: procFixPos__Q53scn4step5enemy8dubiorjr9StateBackFv: /* 802AE5E0 002AA420 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como9StateBack __vt__Q53scn4step5enemy4como9StateBack: .incbin "baserom.dol", 0x471C80, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9StateBack __vt__Q53scn4step5enemy8dubiorjr9StateBack: .incbin "baserom.dol", 0x472408, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255315 $$255315: .incbin "baserom.dol", 0x49C0D8, 0x4 @@ -416,7 +416,7 @@ $$255318: $$255322: .incbin "baserom.dol", 0x49C0E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255062 $$255062: .incbin "baserom.dol", 0x49C2F8, 0x8 diff --git a/asm/src/StateBackCircle.s b/asm/src/StateBackCircle.s index 9540edc9..1914dd5c 100644 --- a/asm/src/StateBackCircle.s +++ b/asm/src/StateBackCircle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy15zankibblecutter15StateBackCircleFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy15zankibblecutter15StateBackCircleFPQ43scn4step5enemy5Enemy: /* 802F2620 002EE460 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -362,12 +362,12 @@ lbl_802F2B28: /* 802F2B44 002EE984 38 21 00 E0 */ addi r1, r1, 0xe0 /* 802F2B48 002EE988 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter15StateBackCircle __vt__Q53scn4step5enemy15zankibblecutter15StateBackCircle: .incbin "baserom.dol", 0x47AFD8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256131 $$256131: .incbin "baserom.dol", 0x49D0D8, 0x4 diff --git a/asm/src/StateBase.s b/asm/src/StateBase.s index 9a7c375b..8a930320 100644 --- a/asm/src/StateBase.s +++ b/asm/src/StateBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss9StateBaseFPQ43scn4step4boss4Boss __ct__Q43scn4step4boss9StateBaseFPQ43scn4step4boss4Boss: /* 802344E0 00230320 3C A0 80 46 */ lis r5, __vt__Q43scn4step4boss9StateBase@ha @@ -56,7 +56,7 @@ lbl_80234548: /* 8023455C 0023039C 38 21 00 10 */ addi r1, r1, 0x10 /* 80234560 002303A0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy9StateBaseFPQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy9StateBaseFPQ43scn4step5enemy5Enemy: /* 8028DDC4 00289C04 3C A0 80 47 */ lis r5, __vt__Q43scn4step5enemy9StateBase@ha @@ -112,7 +112,7 @@ lbl_8028DE2C: /* 8028DE40 00289C80 38 21 00 10 */ addi r1, r1, 0x10 /* 8028DE44 00289C84 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero9StateBaseFPQ43scn4step4hero4Hero __ct__Q43scn4step4hero9StateBaseFPQ43scn4step4hero4Hero: /* 803554F0 00351330 3C A0 80 48 */ lis r5, __vt__Q43scn4step4hero9StateBase@ha @@ -172,7 +172,7 @@ lbl_8035555C: /* 80355570 003513B0 38 21 00 10 */ addi r1, r1, 0x10 /* 80355574 003513B4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item9StateBaseFPQ43scn4step4item4Item __ct__Q43scn4step4item9StateBaseFPQ43scn4step4item4Item: /* 803C51E8 003C1028 3C A0 80 49 */ lis r5, __vt__Q43scn4step4item9StateBase@ha @@ -220,7 +220,7 @@ lbl_803C5248: /* 803C525C 003C109C 38 21 00 10 */ addi r1, r1, 0x10 /* 803C5260 003C10A0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon9StateBaseFPQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon9StateBaseFPQ43scn4step6weapon6Weapon: /* 803D8940 003D4780 3C A0 80 49 */ lis r5, __vt__Q43scn4step6weapon9StateBase@ha @@ -276,27 +276,27 @@ lbl_803D89A8: /* 803D89BC 003D47FC 38 21 00 10 */ addi r1, r1, 0x10 /* 803D89C0 003D4800 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss9StateBase __vt__Q43scn4step4boss9StateBase: .incbin "baserom.dol", 0x460928, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy9StateBase __vt__Q43scn4step5enemy9StateBase: .incbin "baserom.dol", 0x46ED30, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero9StateBase __vt__Q43scn4step4hero9StateBase: .incbin "baserom.dol", 0x4815F0, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item9StateBase __vt__Q43scn4step4item9StateBase: .incbin "baserom.dol", 0x48E008, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon9StateBase __vt__Q43scn4step6weapon9StateBase: .incbin "baserom.dol", 0x48FE90, 0x20 diff --git a/asm/src/StateBodyHit.s b/asm/src/StateBodyHit.s index 1aa883c0..88c67fa6 100644 --- a/asm/src/StateBodyHit.s +++ b/asm/src/StateBodyHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage12StateBodyHitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage12StateBodyHitFPQ43scn4step4hero4Hero: /* 80375878 003716B8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -174,12 +174,12 @@ lbl_80375AC0: /* 80375AD0 00371910 38 21 00 80 */ addi r1, r1, 0x80 /* 80375AD4 00371914 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage12StateBodyHit __vt__Q53scn4step4hero6damage12StateBodyHit: .incbin "baserom.dol", 0x488708, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256792 $$256792: .incbin "baserom.dol", 0x49DDF0, 0x8 diff --git a/asm/src/StateBomb.s b/asm/src/StateBomb.s index 6db78dbe..dfe4f696 100644 --- a/asm/src/StateBomb.s +++ b/asm/src/StateBomb.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers9StateBombFPQ43scn4step4boss4BossQ63scn4step4boss7bonkers9StateBomb6Config __ct__Q53scn4step4boss7bonkers9StateBombFPQ43scn4step4boss4BossQ63scn4step4boss7bonkers9StateBomb6Config: /* 80237DA8 00233BE8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -265,7 +265,7 @@ lbl_80238104: /* 80238144 00233F84 38 21 00 50 */ addi r1, r1, 0x50 /* 80238148 00233F88 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss7bonkers9StateBomb __vt__Q53scn4step4boss7bonkers9StateBomb: .incbin "baserom.dol", 0x461280, 0x20 diff --git a/asm/src/StateBombStart.s b/asm/src/StateBombStart.s index 3e3be2cf..8f186e6c 100644 --- a/asm/src/StateBombStart.s +++ b/asm/src/StateBombStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers14StateBombStartFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss7bonkers14StateBombStartFPQ43scn4step4boss4Boss: /* 8023814C 00233F8C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -63,7 +63,7 @@ procMove__Q53scn4step4boss7bonkers14StateBombStartFv: procFixPos__Q53scn4step4boss7bonkers14StateBombStartFv: /* 80238200 00234040 4B FF FD C0 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss7bonkers14StateBombStart __vt__Q53scn4step4boss7bonkers14StateBombStart: .incbin "baserom.dol", 0x4612A0, 0x20 diff --git a/asm/src/StateBossDemoGrandLowper.s b/asm/src/StateBossDemoGrandLowper.s index d48f50f9..b1c2bf49 100644 --- a/asm/src/StateBossDemoGrandLowper.s +++ b/asm/src/StateBossDemoGrandLowper.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setBossDemoReady__Q43scn4step4hero12StateCheckerFb setBossDemoReady__Q43scn4step4hero12StateCheckerFb: /* 803A2BFC 0039EA3C 98 83 00 21 */ stb r4, 0x21(r3) diff --git a/asm/src/StateBossDemoStart.s b/asm/src/StateBossDemoStart.s index f692c57b..820245b7 100644 --- a/asm/src/StateBossDemoStart.s +++ b/asm/src/StateBossDemoStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A2C04 0039EA44 7C 64 1B 78 */ mr r4, r3 @@ -15,7 +15,7 @@ create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo1 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A2C20 0039EA60 4B E8 BA 80 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8bossdemo17StateBossDemoWait$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48B070, 0x10 diff --git a/asm/src/StateBossDemoWait.s b/asm/src/StateBossDemoWait.s index 527f55f0..54bdd87f 100644 --- a/asm/src/StateBossDemoWait.s +++ b/asm/src/StateBossDemoWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero8bossdemo17StateBossDemoWaitFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero8bossdemo17StateBossDemoWaitFPQ43scn4step4hero4Hero: /* 803A2C24 0039EA64 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1117,7 +1117,7 @@ lbl_803A3C44: /* 803A3C6C 0039FAAC 38 21 00 50 */ addi r1, r1, 0x50 /* 803A3C70 0039FAB0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$260245 $$260245: .incbin "baserom.dol", 0x48B080, 0x40 @@ -1125,7 +1125,7 @@ $$260245: __vt__Q53scn4step4hero8bossdemo17StateBossDemoWait: .incbin "baserom.dol", 0x48B0C0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260133 $$260133: .incbin "baserom.dol", 0x49E370, 0x4 diff --git a/asm/src/StateBound.s b/asm/src/StateBound.s index 51abd19d..d2fbb9a7 100644 --- a/asm/src/StateBound.s +++ b/asm/src/StateBound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10stareffect10StateBoundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10stareffect10StateBoundFPQ43scn4step5enemy5Enemy: /* 802E7F34 002E3D74 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -388,7 +388,7 @@ detect__Q53scn4step5enemy10stareffect10StateBoundFRCQ33hel4math7Vector2RCQ33hel4 /* 802E84B4 002E42F4 38 21 00 30 */ addi r1, r1, 0x30 /* 802E84B8 002E42F8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state10StateBoundFPQ43scn4step4item4Item __ct__Q53scn4step4item5state10StateBoundFPQ43scn4step4item4Item: /* 803C7464 003C32A4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -682,17 +682,17 @@ lbl_803C7884: /* 803C7894 003C36D4 38 21 00 40 */ addi r1, r1, 0x40 /* 803C7898 003C36D8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10stareffect10StateBound __vt__Q53scn4step5enemy10stareffect10StateBound: .incbin "baserom.dol", 0x479438, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state10StateBound __vt__Q53scn4step4item5state10StateBound: .incbin "baserom.dol", 0x48E678, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257606 $$257606: .incbin "baserom.dol", 0x49CF10, 0x4 @@ -703,7 +703,7 @@ $$257664: $$257665: .incbin "baserom.dol", 0x49CF18, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256096 $$256096: .incbin "baserom.dol", 0x49E5B8, 0x4 diff --git a/asm/src/StateBound1.s b/asm/src/StateBound1.s index 0f56ac7e..2c356fca 100644 --- a/asm/src/StateBound1.s +++ b/asm/src/StateBound1.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11whispyapple11StateBound1FPQ43scn4step5enemy5EnemyUlb __ct__Q53scn4step5enemy11whispyapple11StateBound1FPQ43scn4step5enemy5EnemyUlb: /* 802F1338 002ED178 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -336,7 +336,7 @@ __dt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapp __dt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1Fv: /* 802F17C8 002ED608 4B F3 CE D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1 __vt__Q24util106StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple14StateBoundNear$$4PQ43scn4step5enemy5Enemy$$4b$$1: .incbin "baserom.dol", 0x47AE58, 0x10 @@ -347,7 +347,7 @@ __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapp __vt__Q53scn4step5enemy11whispyapple11StateBound1: .incbin "baserom.dol", 0x47AE78, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256704 $$256704: .incbin "baserom.dol", 0x49D0B0, 0x4 diff --git a/asm/src/StateBound2.s b/asm/src/StateBound2.s index c67bf7bc..560ba85b 100644 --- a/asm/src/StateBound2.s +++ b/asm/src/StateBound2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11whispyapple11StateBound2FPQ43scn4step5enemy5EnemyUlb __ct__Q53scn4step5enemy11whispyapple11StateBound2FPQ43scn4step5enemy5EnemyUlb: /* 802F17CC 002ED60C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -219,12 +219,12 @@ lbl_802F1AC4: /* 802F1AD4 002ED914 38 21 00 40 */ addi r1, r1, 0x40 /* 802F1AD8 002ED918 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11whispyapple11StateBound2 __vt__Q53scn4step5enemy11whispyapple11StateBound2: .incbin "baserom.dol", 0x47AE98, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256621 $$256621: .incbin "baserom.dol", 0x49D0B8, 0x4 diff --git a/asm/src/StateBoundNear.s b/asm/src/StateBoundNear.s index 999f15d0..fd5553bf 100644 --- a/asm/src/StateBoundNear.s +++ b/asm/src/StateBoundNear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11whispyapple14StateBoundNearFPQ43scn4step5enemy5Enemyb __ct__Q53scn4step5enemy11whispyapple14StateBoundNearFPQ43scn4step5enemy5Enemyb: /* 802F1ADC 002ED91C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -286,12 +286,12 @@ lbl_802F1EC8: /* 802F1EE4 002EDD24 38 21 00 40 */ addi r1, r1, 0x40 /* 802F1EE8 002EDD28 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11whispyapple14StateBoundNear __vt__Q53scn4step5enemy11whispyapple14StateBoundNear: .incbin "baserom.dol", 0x47AEB8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256802 $$256802: .incbin "baserom.dol", 0x49D0C0, 0x4 diff --git a/asm/src/StateCall.s b/asm/src/StateCall.s index 359365c8..f687324d 100644 --- a/asm/src/StateCall.s +++ b/asm/src/StateCall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior9StateCallFPQ43scn4step4boss4BossUl __ct__Q53scn4step4boss6dubior9StateCallFPQ43scn4step4boss4BossUl: /* 8024D82C 0024966C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -531,12 +531,12 @@ lbl_8024DFD4: /* 8024DFE4 00249E24 38 21 01 D0 */ addi r1, r1, 0x1d0 /* 8024DFE8 00249E28 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateCall __vt__Q53scn4step4boss6dubior9StateCall: .incbin "baserom.dol", 0x463860, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256053 $$256053: .incbin "baserom.dol", 0x49B290, 0x8 diff --git a/asm/src/StateCallback.s b/asm/src/StateCallback.s index a3e13f59..48cd33d0 100644 --- a/asm/src/StateCallback.s +++ b/asm/src/StateCallback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss13StateCallbackFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss13StateCallbackFRQ43scn4step4boss4Boss: /* 80234564 002303A4 3C A0 80 46 */ lis r5, __vt__Q43scn4step4boss13StateCallback@ha @@ -65,7 +65,7 @@ lbl_802345AC: /* 80234640 00230480 38 21 00 10 */ addi r1, r1, 0x10 /* 80234644 00230484 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy13StateCallbackFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy13StateCallbackFRQ43scn4step5enemy5Enemy: /* 8028DE48 00289C88 3C A0 80 47 */ lis r5, __vt__Q43scn4step5enemy13StateCallback@ha @@ -111,7 +111,7 @@ onStateChanged__Q43scn4step5enemy13StateCallbackFRCQ24util13IStateChanger: /* 8028DEDC 00289D1C 38 21 00 10 */ addi r1, r1, 0x10 /* 8028DEE0 00289D20 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero13StateCallbackFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero13StateCallbackFRQ43scn4step4hero4Hero: /* 80355578 003513B8 3C A0 80 48 */ lis r5, __vt__Q43scn4step4hero13StateCallback@ha @@ -323,7 +323,7 @@ lbl_8035587C: /* 80355898 003516D8 38 21 00 10 */ addi r1, r1, 0x10 /* 8035589C 003516DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item13StateCallbackFRQ43scn4step4item4Item __ct__Q43scn4step4item13StateCallbackFRQ43scn4step4item4Item: /* 803C5264 003C10A4 3C A0 80 49 */ lis r5, __vt__Q43scn4step4item13StateCallback@ha @@ -345,7 +345,7 @@ onStateChanged__Q43scn4step4item13StateCallbackFRCQ24util13IStateChanger: /* 803C5298 003C10D8 38 21 00 10 */ addi r1, r1, 0x10 /* 803C529C 003C10DC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon13StateCallbackFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon13StateCallbackFRQ43scn4step6weapon6Weapon: /* 803D89C4 003D4804 3C A0 80 49 */ lis r5, __vt__Q43scn4step6weapon13StateCallback@ha @@ -371,27 +371,27 @@ onStateChanged__Q43scn4step6weapon13StateCallbackFRCQ24util13IStateChanger: __dt__Q43scn4step6weapon13StateCallbackFv: /* 803D8A00 003D4840 4B E5 35 84 */ b __dt__Q43scn4step4boss13StateCallbackFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss13StateCallback __vt__Q43scn4step4boss13StateCallback: .incbin "baserom.dol", 0x460948, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy13StateCallback __vt__Q43scn4step5enemy13StateCallback: .incbin "baserom.dol", 0x46ED50, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero13StateCallback __vt__Q43scn4step4hero13StateCallback: .incbin "baserom.dol", 0x481618, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item13StateCallback __vt__Q43scn4step4item13StateCallback: .incbin "baserom.dol", 0x48E020, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon13StateCallback __vt__Q43scn4step6weapon13StateCallback: .incbin "baserom.dol", 0x48FEB0, 0x10 diff --git a/asm/src/StateCapture.s b/asm/src/StateCapture.s index 05d30472..553bb08a 100644 --- a/asm/src/StateCapture.s +++ b/asm/src/StateCapture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss13watergalboros12StateCaptureFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss13watergalboros12StateCaptureFPQ43scn4step4boss4Boss: /* 8025A130 00255F70 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -236,7 +236,7 @@ create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergal __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv: /* 8025A434 00256274 4B FD 42 6C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy12StateCaptureFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy12StateCaptureFPQ43scn4step4boss4Boss: /* 8025CAFC 0025893C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -329,7 +329,7 @@ create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12St __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025CC0C 00258A4C 4B FD 1A 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1 __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalboros10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1: .incbin "baserom.dol", 0x465B60, 0x10 @@ -337,7 +337,7 @@ __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss13watergalbo __vt__Q53scn4step4boss13watergalboros12StateCapture: .incbin "baserom.dol", 0x465B70, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateChewing$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x466638, 0x10 diff --git a/asm/src/StateCaptureAttack.s b/asm/src/StateCaptureAttack.s index 442229d8..e7dcff12 100644 --- a/asm/src/StateCaptureAttack.s +++ b/asm/src/StateCaptureAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss13watergalboros18StateCaptureAttackFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss13watergalboros18StateCaptureAttackFPQ43scn4step4boss4Boss: /* 8025A438 00256278 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -285,7 +285,7 @@ create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergal __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025A810 00256650 4B FD 3E 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss13watergalboros12StateCapture$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x465B90, 0x10 diff --git a/asm/src/StateCapturedFighter.s b/asm/src/StateCapturedFighter.s index a6e96e15..2b28cb5d 100644 --- a/asm/src/StateCapturedFighter.s +++ b/asm/src/StateCapturedFighter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8captured20StateCapturedFighterFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8captured20StateCapturedFighterFPQ43scn4step5enemy5Enemy: /* 802A4220 002A0060 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -298,7 +298,7 @@ __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23St __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1Fv: /* 802A4634 002A0474 4B F8 A0 6C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateThrownFighter$$4PQ43scn4step5enemy5Enemy$$4Ux$$1: .incbin "baserom.dol", 0x4714D8, 0x10 @@ -309,12 +309,12 @@ __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6damage23St __vt__Q53scn4step5enemy8captured20StateCapturedFighter: .incbin "baserom.dol", 0x4714F8, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255917 $$255917: .incbin "baserom.dol", 0x495C50, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256237 $$256237: .incbin "baserom.dol", 0x49C010, 0x8 diff --git a/asm/src/StateCapturedParasol.s b/asm/src/StateCapturedParasol.s index b7441f15..677fac5c 100644 --- a/asm/src/StateCapturedParasol.s +++ b/asm/src/StateCapturedParasol.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8captured20StateCapturedParasolFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8captured20StateCapturedParasolFPQ43scn4step5enemy5Enemy: /* 802A4638 002A0478 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -383,7 +383,7 @@ create__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19 __dt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1Fv: /* 802A4BB0 002A09F0 4B F8 9A F0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1 __vt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19StateParasolRelease$$4PQ43scn4step5enemy5Enemy$$4Ux$$4Ul$$1: .incbin "baserom.dol", 0x471518, 0x10 @@ -391,7 +391,7 @@ __vt__Q24util109StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6damage19St __vt__Q53scn4step5enemy8captured20StateCapturedParasol: .incbin "baserom.dol", 0x471528, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256967 $$256967: .incbin "baserom.dol", 0x49C020, 0x4 diff --git a/asm/src/StateCapturedWaterGalborosEat.s b/asm/src/StateCapturedWaterGalborosEat.s index 64cf9f02..ee3f09f3 100644 --- a/asm/src/StateCapturedWaterGalborosEat.s +++ b/asm/src/StateCapturedWaterGalborosEat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFPQ43scn4step4hero4Hero: /* 80383E24 0037FC64 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -210,12 +210,12 @@ procMove__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv: procFixPos__Q53scn4step4hero8captured29StateCapturedWaterGalborosEatFv: /* 80384124 0037FF64 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEat __vt__Q53scn4step4hero8captured29StateCapturedWaterGalborosEat: .incbin "baserom.dol", 0x488DD0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257761 $$257761: .incbin "baserom.dol", 0x49E038, 0x4 diff --git a/asm/src/StateCapturedWaterGalborosVomit.s b/asm/src/StateCapturedWaterGalborosVomit.s index cae28a3e..42b2038a 100644 --- a/asm/src/StateCapturedWaterGalborosVomit.s +++ b/asm/src/StateCapturedWaterGalborosVomit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomitFPQ43scn4step4hero4Hero: /* 80384128 0037FF68 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -312,12 +312,12 @@ lbl_803845A0: /* 803845B0 003803F0 38 21 00 50 */ addi r1, r1, 0x50 /* 803845B4 003803F4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit __vt__Q53scn4step4hero8captured31StateCapturedWaterGalborosVomit: .incbin "baserom.dol", 0x488DF8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257995 $$257995: .incbin "baserom.dol", 0x49E040, 0x4 diff --git a/asm/src/StateCapturedWhip.s b/asm/src/StateCapturedWhip.s index 0c2272ba..f8b54cda 100644 --- a/asm/src/StateCapturedWhip.s +++ b/asm/src/StateCapturedWhip.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8captured17StateCapturedWhipFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8captured17StateCapturedWhipFPQ43scn4step5enemy5Enemy: /* 802A4BB4 002A09F4 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -334,7 +334,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A5064 002A0EA4 4B F8 96 3C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18StateDamageCapture$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471548, 0x10 @@ -342,7 +342,7 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6damage18St __vt__Q53scn4step5enemy8captured17StateCapturedWhip: .incbin "baserom.dol", 0x471558, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256311 $$256311: .incbin "baserom.dol", 0x49C040, 0x4 diff --git a/asm/src/StateCapturedWhispyChewing.s b/asm/src/StateCapturedWhispyChewing.s index 4183d52b..812c4419 100644 --- a/asm/src/StateCapturedWhispyChewing.s +++ b/asm/src/StateCapturedWhispyChewing.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8captured26StateCapturedWhispyChewingFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero8captured26StateCapturedWhispyChewingFPQ43scn4step4hero4Hero: /* 803845B8 003803F8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -111,7 +111,7 @@ procMove__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv: procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyChewingFv: /* 8038472C 0038056C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured26StateCapturedWhispyChewing __vt__Q53scn4step4hero8captured26StateCapturedWhispyChewing: .incbin "baserom.dol", 0x488E20, 0x28 diff --git a/asm/src/StateCapturedWhispyRelease.s b/asm/src/StateCapturedWhispyRelease.s index 502671d2..7d3f0b09 100644 --- a/asm/src/StateCapturedWhispyRelease.s +++ b/asm/src/StateCapturedWhispyRelease.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFPQ43scn4step4hero4Hero: /* 80384730 00380570 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -176,7 +176,7 @@ procMove__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv: procFixPos__Q53scn4step4hero8captured26StateCapturedWhispyReleaseFv: /* 803849A0 003807E0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured26StateCapturedWhispyRelease __vt__Q53scn4step4hero8captured26StateCapturedWhispyRelease: .incbin "baserom.dol", 0x488E48, 0x28 diff --git a/asm/src/StateCapturedWhispyVacuum.s b/asm/src/StateCapturedWhispyVacuum.s index 177d3bbd..cccb2383 100644 --- a/asm/src/StateCapturedWhispyVacuum.s +++ b/asm/src/StateCapturedWhispyVacuum.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero8captured25StateCapturedWhispyVacuumFPQ43scn4step4hero4Hero: /* 803849A4 003807E4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -262,7 +262,7 @@ create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured2 __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1Fv: /* 80384D50 00380B90 4B EA 99 50 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26StateCapturedWhispyChewing$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488E70, 0x10 @@ -270,7 +270,7 @@ __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured26S __vt__Q53scn4step4hero8captured25StateCapturedWhispyVacuum: .incbin "baserom.dol", 0x488E80, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257457 $$257457: .incbin "baserom.dol", 0x49E048, 0x4 diff --git a/asm/src/StateCapturedWhispyVomit.s b/asm/src/StateCapturedWhispyVomit.s index 93a91b8e..73194d18 100644 --- a/asm/src/StateCapturedWhispyVomit.s +++ b/asm/src/StateCapturedWhispyVomit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8captured24StateCapturedWhispyVomitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero8captured24StateCapturedWhispyVomitFPQ43scn4step4hero4Hero: /* 80384D54 00380B94 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -246,7 +246,7 @@ create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured2 __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1Fv: /* 803850C0 00380F00 4B EA 95 E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero8captured29StateCapturedWhispyVomitBound$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488EA8, 0x10 diff --git a/asm/src/StateCapturedWhispyVomitBound.s b/asm/src/StateCapturedWhispyVomitBound.s index 7c18538a..c90ed8a1 100644 --- a/asm/src/StateCapturedWhispyVomitBound.s +++ b/asm/src/StateCapturedWhispyVomitBound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero8captured29StateCapturedWhispyVomitBoundFPQ43scn4step4hero4Hero: /* 803850C4 00380F04 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -374,12 +374,12 @@ lbl_80385614: /* 80385630 00381470 38 21 00 60 */ addi r1, r1, 0x60 /* 80385634 00381474 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBound __vt__Q53scn4step4hero8captured29StateCapturedWhispyVomitBound: .incbin "baserom.dol", 0x488EE0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258072 $$258072: .incbin "baserom.dol", 0x49E058, 0x4 diff --git a/asm/src/StateCapturedWhispyVomitSoft.s b/asm/src/StateCapturedWhispyVomitSoft.s index e4c6b98a..5c4cf431 100644 --- a/asm/src/StateCapturedWhispyVomitSoft.s +++ b/asm/src/StateCapturedWhispyVomitSoft.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoftFPQ43scn4step4hero4Hero: /* 80385638 00381478 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -304,12 +304,12 @@ lbl_80385A8C: /* 80385A9C 003818DC 38 21 00 50 */ addi r1, r1, 0x50 /* 80385AA0 003818E0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft __vt__Q53scn4step4hero8captured28StateCapturedWhispyVomitSoft: .incbin "baserom.dol", 0x488F08, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257620 $$257620: .incbin "baserom.dol", 0x49E070, 0x4 diff --git a/asm/src/StateCatch.s b/asm/src/StateCatch.s index 738172c6..91166bab 100644 --- a/asm/src/StateCatch.s +++ b/asm/src/StateCatch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9zankibble10StateCatchFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9zankibble10StateCatchFPQ43scn4step4boss4Boss: /* 80261650 0025D490 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -153,7 +153,7 @@ procMove__Q53scn4step4boss9zankibble10StateCatchFv: procFixPos__Q53scn4step4boss9zankibble10StateCatchFv: /* 80261858 0025D698 4B FD 67 68 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9sirkibble10StateCatchFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9sirkibble10StateCatchFPQ43scn4step5enemy5Enemy: /* 802E1960 002DD7A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -232,7 +232,7 @@ procMove__Q53scn4step5enemy9sirkibble10StateCatchFv: procFixPos__Q53scn4step5enemy9sirkibble10StateCatchFv: /* 802E1A50 002DD890 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7fighter10StateCatchFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7fighter10StateCatchFPQ43scn4step4hero4Hero: /* 8039B774 003975B4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -780,17 +780,17 @@ __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20 __dt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1Fv: /* 8039BF04 00397D44 4B E9 27 9C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9zankibble10StateCatch __vt__Q53scn4step4boss9zankibble10StateCatch: .incbin "baserom.dol", 0x4670C0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble10StateCatch __vt__Q53scn4step5enemy9sirkibble10StateCatch: .incbin "baserom.dol", 0x478690, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1 __vt__Q24util96StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateThrow$$4PQ43scn4step4hero4Hero$$4b$$4b$$1: .incbin "baserom.dol", 0x48A3A8, 0x10 @@ -804,7 +804,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10Sta __vt__Q53scn4step4hero7fighter10StateCatch: .incbin "baserom.dol", 0x48A3D8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258320 $$258320: .incbin "baserom.dol", 0x49E2C0, 0x4 diff --git a/asm/src/StateChallengeBattleLose.s b/asm/src/StateChallengeBattleLose.s index e88ec48a..b6e89884 100644 --- a/asm/src/StateChallengeBattleLose.s +++ b/asm/src/StateChallengeBattleLose.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7gimmick24StateChallengeBattleLoseFPQ43scn4step4hero4Hero: /* 80378ED8 00374D18 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1070,12 +1070,12 @@ lbl_80379E84: /* 80379EB0 00375CF0 38 21 06 90 */ addi r1, r1, 0x690 /* 80379EB4 00375CF4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick24StateChallengeBattleLose __vt__Q53scn4step4hero7gimmick24StateChallengeBattleLose: .incbin "baserom.dol", 0x488958, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$262138 $$262138: .incbin "baserom.dol", 0x49DEE8, 0x4 diff --git a/asm/src/StateChallengeBattleWin.s b/asm/src/StateChallengeBattleWin.s index 07184030..7ca35e23 100644 --- a/asm/src/StateChallengeBattleWin.s +++ b/asm/src/StateChallengeBattleWin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick23StateChallengeBattleWinFPQ43scn4step4hero4Herob __ct__Q53scn4step4hero7gimmick23StateChallengeBattleWinFPQ43scn4step4hero4Herob: /* 80379EB8 00375CF8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -614,12 +614,12 @@ sceneChange__Q53scn4step4hero7gimmick23StateChallengeBattleWinFv: /* 8037A780 003765C0 38 21 00 10 */ addi r1, r1, 0x10 /* 8037A784 003765C4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick23StateChallengeBattleWin __vt__Q53scn4step4hero7gimmick23StateChallengeBattleWin: .incbin "baserom.dol", 0x488980, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$259503 $$259503: .incbin "baserom.dol", 0x497718, 0x8 diff --git a/asm/src/StateChallengeBattleWinPre.s b/asm/src/StateChallengeBattleWinPre.s index 1cc06e0b..418ad8eb 100644 --- a/asm/src/StateChallengeBattleWinPre.s +++ b/asm/src/StateChallengeBattleWinPre.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7gimmick26StateChallengeBattleWinPreFPQ43scn4step4hero4Hero: /* 8037A788 003765C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -932,7 +932,7 @@ __dt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26St __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1Fv: /* 8037B4C4 00377304 4B EB 31 DC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick23StateChallengeBattleWin$$4PQ43scn4step4hero4Hero$$4b$$1: .incbin "baserom.dol", 0x4889A8, 0x10 @@ -943,7 +943,7 @@ __vt__Q24util167StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26St __vt__Q53scn4step4hero7gimmick26StateChallengeBattleWinPre: .incbin "baserom.dol", 0x4889C8, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248855 $$248855: .incbin "baserom.dol", 0x497720, 0x4 @@ -951,7 +951,7 @@ $$248855: $$248856: .incbin "baserom.dol", 0x497724, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260505 $$260505: .incbin "baserom.dol", 0x49DF10, 0x4 diff --git a/asm/src/StateChallengeConfirm.s b/asm/src/StateChallengeConfirm.s index a5474602..3a5b459a 100644 --- a/asm/src/StateChallengeConfirm.s +++ b/asm/src/StateChallengeConfirm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7gimmick21StateChallengeConfirmFPQ43scn4step4hero4HeroQ33scn4step13ChallengeKindPQ53scn4step7gimmick13challengedoor13ChallengeDoor TryToChangeState__Q53scn4step4hero7gimmick21StateChallengeConfirmFPQ43scn4step4hero4HeroQ33scn4step13ChallengeKindPQ53scn4step7gimmick13challengedoor13ChallengeDoor: /* 8037B4C8 00377308 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -322,7 +322,7 @@ create__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21 __dt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1Fv: /* 8037B938 00377778 4B EB 2D 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1 __vt__Q24util181StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero7gimmick21StateChallengeConfirm$$4PQ43scn4step4hero4Hero$$4Q33scn4step13ChallengeKind$$4PQ53scn4step7gimmick13challengedoor13ChallengeDoor$$1: .incbin "baserom.dol", 0x4889F0, 0x10 diff --git a/asm/src/StateChallengeIn.s b/asm/src/StateChallengeIn.s index fec494c9..176b0bf7 100644 --- a/asm/src/StateChallengeIn.s +++ b/asm/src/StateChallengeIn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick16StateChallengeInFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7gimmick16StateChallengeInFPQ43scn4step4hero4Hero: /* 8037B93C 0037777C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -592,12 +592,12 @@ lbl_8037C1C0: /* 8037C1CC 0037800C 38 21 00 10 */ addi r1, r1, 0x10 /* 8037C1D0 00378010 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick16StateChallengeIn __vt__Q53scn4step4hero7gimmick16StateChallengeIn: .incbin "baserom.dol", 0x488A28, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260558 $$260558: .incbin "baserom.dol", 0x49DF30, 0x4 diff --git a/asm/src/StateChange.s b/asm/src/StateChange.s index a4a1000f..c9c4d8d2 100644 --- a/asm/src/StateChange.s +++ b/asm/src/StateChange.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ChangeStateNoScrew__Q53scn4step4hero5stone11StateChangeFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context ChangeStateNoScrew__Q53scn4step4hero5stone11StateChangeFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context: /* 8038FA98 0038B8D8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -460,7 +460,7 @@ __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9State __dt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv: /* 803900D0 0038BF10 4B E9 E5 D0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util161StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone19StateFallScrewStart$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .incbin "baserom.dol", 0x489A88, 0x10 @@ -477,7 +477,7 @@ __vt__Q24util153StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone11Stat __vt__Q53scn4step4hero5stone11StateChange: .incbin "baserom.dol", 0x489AC8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258219 $$258219: .incbin "baserom.dol", 0x49E108, 0x8 diff --git a/asm/src/StateChangeGrade.s b/asm/src/StateChangeGrade.s index 6a707515..a4050f41 100644 --- a/asm/src/StateChangeGrade.s +++ b/asm/src/StateChangeGrade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick16StateChangeGradeFPQ43scn4step4hero4Heroi __ct__Q53scn4step4hero7gimmick16StateChangeGradeFPQ43scn4step4hero4Heroi: /* 8037C1D4 00378014 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -122,7 +122,7 @@ procMove__Q53scn4step4hero7gimmick16StateChangeGradeFv: procFixPos__Q53scn4step4hero7gimmick16StateChangeGradeFv: /* 8037C36C 003781AC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick16StateChangeGrade __vt__Q53scn4step4hero7gimmick16StateChangeGrade: .incbin "baserom.dol", 0x488A50, 0x28 diff --git a/asm/src/StateChanger.s b/asm/src/StateChanger.s index 4568b0d9..58d0819e 100644 --- a/asm/src/StateChanger.s +++ b/asm/src/StateChanger.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24util16StateChangerBaseFRQ24util14IStateCallback __ct__Q24util16StateChangerBaseFRQ24util14IStateCallback: /* 80405CD0 00401B10 3C A0 80 49 */ lis r5, __vt__Q24util16StateChangerBase@ha @@ -176,7 +176,7 @@ onSetNextStateFactory__Q24util16StateChangerBaseFv: /* 80405F0C 00401D4C 4B FF FF AC */ b releaseNextStateFactory__Q24util16StateChangerBaseFv /* 80405F10 00401D50 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util16StateChangerBase __vt__Q24util16StateChangerBase: .incbin "baserom.dol", 0x4927F0, 0x10 diff --git a/asm/src/StateCharge.s b/asm/src/StateCharge.s index 78acfcf1..b8f22410 100644 --- a/asm/src/StateCharge.s +++ b/asm/src/StateCharge.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7fighter11StateChargeFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7fighter11StateChargeFPQ43scn4step4hero4Hero: /* 8039BF08 00397D48 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -555,7 +555,7 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11Sta __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1Fv: /* 8039C660 003984A0 4B E9 20 40 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter10StateStamp$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A400, 0x10 @@ -578,7 +578,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11Sta __vt__Q53scn4step4hero7fighter11StateCharge: .incbin "baserom.dol", 0x48A460, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258418 $$258418: .incbin "baserom.dol", 0x49E2D8, 0x8 diff --git a/asm/src/StateChargeAttack.s b/asm/src/StateChargeAttack.s index 91a715ec..bad9c8ed 100644 --- a/asm/src/StateChargeAttack.s +++ b/asm/src/StateChargeAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss8kingsdoo17StateChargeAttackFPQ43scn4step4boss4BossQ63scn4step4boss8kingsdoo17StateChargeAttack6Config __ct__Q53scn4step4boss8kingsdoo17StateChargeAttackFPQ43scn4step4boss4BossQ63scn4step4boss8kingsdoo17StateChargeAttack6Config: /* 80253958 0024F798 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -329,12 +329,12 @@ lbl_80253D54: /* 80253E08 0024FC48 38 21 00 F0 */ addi r1, r1, 0xf0 /* 80253E0C 0024FC4C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss8kingsdoo17StateChargeAttack __vt__Q53scn4step4boss8kingsdoo17StateChargeAttack: .incbin "baserom.dol", 0x464838, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256691 $$256691: .incbin "baserom.dol", 0x49B3B0, 0x4 diff --git a/asm/src/StateChargeAttackStart.s b/asm/src/StateChargeAttackStart.s index 99e4d621..e4a47497 100644 --- a/asm/src/StateChargeAttackStart.s +++ b/asm/src/StateChargeAttackStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFPQ43scn4step4boss4Boss: /* 80253E10 0024FC50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -51,7 +51,7 @@ procMove__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv: procFixPos__Q53scn4step4boss8kingsdoo22StateChargeAttackStartFv: /* 80253E98 0024FCD8 4B FE 41 28 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss8kingsdoo22StateChargeAttackStart __vt__Q53scn4step4boss8kingsdoo22StateChargeAttackStart: .incbin "baserom.dol", 0x464858, 0x20 diff --git a/asm/src/StateChase.s b/asm/src/StateChase.s index d9a068bd..354a4dec 100644 --- a/asm/src/StateChase.s +++ b/asm/src/StateChase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper10StateChaseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper10StateChaseFPQ43scn4step5enemy5Enemy: /* 8029948C 002952CC 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -878,7 +878,7 @@ lbl_8029A0F4: __dt__Q53scn4step5enemy7blipper10StateChaseFv: /* 8029A11C 00295F5C 4B FF 78 9C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6degout10StateChaseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6degout10StateChaseFPQ43scn4step5enemy5Enemy: /* 802AD428 002A9268 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -1316,7 +1316,7 @@ lbl_802ADA3C: __dt__Q53scn4step5enemy6degout10StateChaseFv: /* 802ADA54 002A9894 4B FE 3F 64 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4elec10StateChaseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4elec10StateChaseFPQ43scn4step5enemy5Enemy: /* 802AFEDC 002ABD1C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1582,7 +1582,7 @@ __dt__Q53scn4step5enemy4elec10StateChaseFv: __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B0290 002AC0D0 4B F7 E4 10 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6flamer10StateChaseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6flamer10StateChaseFPQ43scn4step5enemy5Enemy: /* 802B2F78 002AEDB8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1931,7 +1931,7 @@ offset__Q53scn4step5enemy6flamer10StateChaseCFv: __dt__Q53scn4step5enemy6flamer10StateChaseFv: /* 802B3478 002AF2B8 4B FD E5 40 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7mumbies10StateChaseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7mumbies10StateChaseFPQ43scn4step5enemy5Enemy: /* 802C50EC 002C0F2C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2457,7 +2457,7 @@ lbl_802C5868: /* 802C5878 002C16B8 38 21 00 40 */ addi r1, r1, 0x40 /* 802C587C 002C16BC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy10StateChaseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy10StateChaseFPQ43scn4step5enemy5Enemy: /* 802DA6A0 002D64E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2849,7 +2849,7 @@ lbl_802DABEC: /* 802DABFC 002D6A3C 38 21 00 10 */ addi r1, r1, 0x10 /* 802DAC00 002D6A40 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld10StateChaseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld10StateChaseFPQ43scn4step5enemy5Enemy: /* 802DD9E4 002D9824 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -3209,17 +3209,17 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9State __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DDED4 002D9D14 4B F5 07 CC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper10StateChase __vt__Q53scn4step5enemy7blipper10StateChase: .incbin "baserom.dol", 0x46FF40, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout10StateChase __vt__Q53scn4step5enemy6degout10StateChase: .incbin "baserom.dol", 0x472160, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x472858, 0x10 @@ -3227,22 +3227,22 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4elec11State __vt__Q53scn4step5enemy4elec10StateChase: .incbin "baserom.dol", 0x472868, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer10StateChase __vt__Q53scn4step5enemy6flamer10StateChase: .incbin "baserom.dol", 0x472D90, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7mumbies10StateChase __vt__Q53scn4step5enemy7mumbies10StateChase: .incbin "baserom.dol", 0x475380, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy10StateChase __vt__Q53scn4step5enemy6scarfy10StateChase: .incbin "baserom.dol", 0x477718, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld14StateJumpStart$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477DF0, 0x10 @@ -3253,7 +3253,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9State __vt__Q53scn4step5enemy5sheld10StateChase: .incbin "baserom.dol", 0x477E10, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257807 $$257807: .incbin "baserom.dol", 0x49BD80, 0x4 @@ -3315,7 +3315,7 @@ $$257987: $$257988: .incbin "baserom.dol", 0x49BDCC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256387 $$256387: .incbin "baserom.dol", 0x49C2D8, 0x4 @@ -3326,7 +3326,7 @@ $$256388: $$256464: .incbin "baserom.dol", 0x49C2E0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255103 $$255103: .incbin "baserom.dol", 0x49C368, 0x4 @@ -3337,7 +3337,7 @@ $$255153: $$255154: .incbin "baserom.dol", 0x49C370, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255211 $$255211: .incbin "baserom.dol", 0x49C438, 0x4 @@ -3372,7 +3372,7 @@ $$255301: $$255305: .incbin "baserom.dol", 0x49C460, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256235 $$256235: .incbin "baserom.dol", 0x49C828, 0x4 @@ -3389,7 +3389,7 @@ $$256328: $$256331: .incbin "baserom.dol", 0x49C838, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255168 $$255168: .incbin "baserom.dol", 0x49CC60, 0x4 @@ -3406,7 +3406,7 @@ $$255232: $$255233: .incbin "baserom.dol", 0x49CC70, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256351 $$256351: .incbin "baserom.dol", 0x49CCF0, 0x4 diff --git a/asm/src/StateChecker.s b/asm/src/StateChecker.s index 9e5bc4db..058d1da9 100644 --- a/asm/src/StateChecker.s +++ b/asm/src/StateChecker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setForbidDeadForMBoss__Q43scn4step5enemy12StateCheckerFb setForbidDeadForMBoss__Q43scn4step5enemy12StateCheckerFb: /* 8028DEE4 00289D24 7C 85 23 78 */ mr r5, r4 @@ -51,7 +51,7 @@ lbl_8028DF44: /* 8028DF4C 00289D8C 90 03 00 00 */ stw r0, 0(r3) /* 8028DF50 00289D90 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero12StateCheckerFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero12StateCheckerFRQ43scn4step4hero4Hero: /* 803558A0 003516E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -165,7 +165,7 @@ setForbidWarpStar__Q43scn4step4hero12StateCheckerFv: /* 80355A20 00351860 90 03 00 48 */ stw r0, 0x48(r3) /* 80355A24 00351864 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251026 $$251026: .incbin "baserom.dol", 0x49D9D8, 0x8 diff --git a/asm/src/StateChewing.s b/asm/src/StateChewing.s index aebb072b..5c9f494d 100644 --- a/asm/src/StateChewing.s +++ b/asm/src/StateChewing.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy12StateChewingFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy12StateChewingFPQ43scn4step4boss4Boss: /* 8025CC10 00258A50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -188,7 +188,7 @@ create__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10St __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1Fv: /* 8025CE6C 00258CAC 4B FD 18 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1 __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6whispy10StateVomit$$4PQ43scn4step4boss4Boss$$4b$$1: .incbin "baserom.dol", 0x466668, 0x10 diff --git a/asm/src/StateCircle.s b/asm/src/StateCircle.s index 19a1ac06..4b6928da 100644 --- a/asm/src/StateCircle.s +++ b/asm/src/StateCircle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy15zankibblecutter11StateCircleFPQ43scn4step5enemy5Enemyb __ct__Q53scn4step5enemy15zankibblecutter11StateCircleFPQ43scn4step5enemy5Enemyb: /* 802F2B4C 002EE98C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -381,12 +381,12 @@ lbl_802F309C: /* 802F30B8 002EEEF8 38 21 00 E0 */ addi r1, r1, 0xe0 /* 802F30BC 002EEEFC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter11StateCircle __vt__Q53scn4step5enemy15zankibblecutter11StateCircle: .incbin "baserom.dol", 0x47AFF8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257063 $$257063: .incbin "baserom.dol", 0x49D0E8, 0x4 diff --git a/asm/src/StateClearDance.s b/asm/src/StateClearDance.s index 0df615d4..6767f123 100644 --- a/asm/src/StateClearDance.s +++ b/asm/src/StateClearDance.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common15StateClearDanceFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common15StateClearDanceFPQ43scn4step4hero4Hero: /* 8035F2D0 0035B110 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -202,12 +202,12 @@ procMove__Q53scn4step4hero6common15StateClearDanceFv: procFixPos__Q53scn4step4hero6common15StateClearDanceFv: /* 8035F5A0 0035B3E0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common15StateClearDance __vt__Q53scn4step4hero6common15StateClearDance: .incbin "baserom.dol", 0x487AD8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259892 $$259892: .incbin "baserom.dol", 0x49DB30, 0x8 diff --git a/asm/src/StateClearDanceFall.s b/asm/src/StateClearDanceFall.s index 5c74c127..cc000122 100644 --- a/asm/src/StateClearDanceFall.s +++ b/asm/src/StateClearDanceFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common19StateClearDanceFallFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common19StateClearDanceFallFPQ43scn4step4hero4Hero: /* 8035F5A4 0035B3E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -251,7 +251,7 @@ create__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19S __dt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv: /* 8035F924 0035B764 4B EC ED 7C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util103StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common19StateClearDanceWalk$$4PQ43scn4step4hero4Hero$$4Ul$$1: .incbin "baserom.dol", 0x487B00, 0x10 diff --git a/asm/src/StateClearDancePre.s b/asm/src/StateClearDancePre.s index 6ea3b2bc..cc4f292c 100644 --- a/asm/src/StateClearDancePre.s +++ b/asm/src/StateClearDancePre.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common18StateClearDancePreFPQ43scn4step4hero4HeroUl __ct__Q53scn4step4hero6common18StateClearDancePreFPQ43scn4step4hero4HeroUl: /* 8035F928 0035B768 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -188,7 +188,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15St __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1Fv: /* 8035FBA8 0035B9E8 4B EC EA F8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateClearDance$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487B38, 0x10 diff --git a/asm/src/StateClearDanceWalk.s b/asm/src/StateClearDanceWalk.s index 63480351..c21167e5 100644 --- a/asm/src/StateClearDanceWalk.s +++ b/asm/src/StateClearDanceWalk.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common19StateClearDanceWalkFPQ43scn4step4hero4HeroUl __ct__Q53scn4step4hero6common19StateClearDanceWalkFPQ43scn4step4hero4HeroUl: /* 8035FBAC 0035B9EC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -282,7 +282,7 @@ create__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18S __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv: /* 8035FFAC 0035BDEC 4B EC E6 F4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18StateClearDancePre$$4PQ43scn4step4hero4Hero$$4Ul$$1: .incbin "baserom.dol", 0x487B70, 0x10 @@ -290,7 +290,7 @@ __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common18Sta __vt__Q53scn4step4hero6common19StateClearDanceWalk: .incbin "baserom.dol", 0x487B80, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258516 $$258516: .incbin "baserom.dol", 0x49DB38, 0x4 diff --git a/asm/src/StateCliffAttack.s b/asm/src/StateCliffAttack.s index b90320bf..67bfe9a5 100644 --- a/asm/src/StateCliffAttack.s +++ b/asm/src/StateCliffAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky16StateCliffAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky16StateCliffAttackFPQ43scn4step5enemy5Enemy: /* 802D3DE4 002CFC24 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -114,7 +114,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14St __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D3F54 002CFD94 4B F5 A7 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14StateCliffJump$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476EE8, 0x10 @@ -122,7 +122,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky14Stat __vt__Q53scn4step5enemy5rocky16StateCliffAttack: .incbin "baserom.dol", 0x476EF8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255825 $$255825: .incbin "baserom.dol", 0x49CB30, 0x8 diff --git a/asm/src/StateCliffJump.s b/asm/src/StateCliffJump.s index 7333ef46..635083c0 100644 --- a/asm/src/StateCliffJump.s +++ b/asm/src/StateCliffJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky14StateCliffJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky14StateCliffJumpFPQ43scn4step5enemy5Enemy: /* 802D3F58 002CFD98 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -217,7 +217,7 @@ lbl_802D4238: procFixPos__Q53scn4step5enemy5rocky14StateCliffJumpFv: /* 802D4250 002D0090 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky14StateCliffJump __vt__Q53scn4step5enemy5rocky14StateCliffJump: .incbin "baserom.dol", 0x476F18, 0x20 diff --git a/asm/src/StateCombinationAttack.s b/asm/src/StateCombinationAttack.s index 52252dff..ce24d30b 100644 --- a/asm/src/StateCombinationAttack.s +++ b/asm/src/StateCombinationAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero12interference22StateCombinationAttackFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero12interference22StateCombinationAttackFPQ43scn4step4hero4Hero: /* 8036FF9C 0036BDDC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1040,7 +1040,7 @@ create__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interfer __dt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv: /* 80370E38 0036CC78 4B EB D8 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference22StateCombinationAttack$$4PQ43scn4step4hero4Hero$$4Ul$$1: .incbin "baserom.dol", 0x488538, 0x10 @@ -1048,7 +1048,7 @@ __vt__Q24util113StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interferen __vt__Q53scn4step4hero12interference22StateCombinationAttack: .incbin "baserom.dol", 0x488548, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258437 $$258437: .incbin "baserom.dol", 0x49DCF0, 0x4 diff --git a/asm/src/StateCopy.s b/asm/src/StateCopy.s index c61bb5b8..0fefa8c6 100644 --- a/asm/src/StateCopy.s +++ b/asm/src/StateCopy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common9StateCopyFPQ43scn4step4hero4HeroRCQ25ostop9ReqHandle __ct__Q53scn4step4hero6common9StateCopyFPQ43scn4step4hero4HeroRCQ25ostop9ReqHandle: /* 8035FFB0 0035BDF0 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -607,12 +607,12 @@ procFixPos__Q53scn4step4hero6common9StateCopyFv: /* 8036089C 0035C6DC 38 21 00 10 */ addi r1, r1, 0x10 /* 803608A0 0035C6E0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateCopy __vt__Q53scn4step4hero6common9StateCopy: .incbin "baserom.dol", 0x487BA8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259744 $$259744: .incbin "baserom.dol", 0x49DB48, 0x8 diff --git a/asm/src/StateCopyPre.s b/asm/src/StateCopyPre.s index 1090a6a9..b3cf71f4 100644 --- a/asm/src/StateCopyPre.s +++ b/asm/src/StateCopyPre.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common12StateCopyPreFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common12StateCopyPreFPQ43scn4step4hero4Hero: /* 803608A4 0035C6E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -284,7 +284,7 @@ create__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9St __dt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv: /* 80360C9C 0035CADC 4B EC DA 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1 __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateCopy$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1: .incbin "baserom.dol", 0x487BD0, 0x10 diff --git a/asm/src/StateCreditMove.s b/asm/src/StateCreditMove.s index 81342ab0..a7d9e078 100644 --- a/asm/src/StateCreditMove.s +++ b/asm/src/StateCreditMove.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6chilly15StateCreditMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6chilly15StateCreditMoveFPQ43scn4step5enemy5Enemy: /* 802A6610 002A2450 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -176,12 +176,12 @@ procFixPos__Q53scn4step5enemy6chilly15StateCreditMoveFv: __dt__Q53scn4step5enemy6chilly15StateCreditMoveFv: /* 802A6880 002A26C0 4B FE B1 38 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly15StateCreditMove __vt__Q53scn4step5enemy6chilly15StateCreditMove: .incbin "baserom.dol", 0x471A10, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256565 $$256565: .incbin "baserom.dol", 0x49C070, 0x8 diff --git a/asm/src/StateCreditWalk.s b/asm/src/StateCreditWalk.s index c2475376..10302a37 100644 --- a/asm/src/StateCreditWalk.s +++ b/asm/src/StateCreditWalk.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common15StateCreditWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common15StateCreditWalkFPQ43scn4step5enemy5Enemy: /* 80291840 0028D680 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -163,7 +163,7 @@ procMove__Q53scn4step5enemy6common15StateCreditWalkFv: procFixPos__Q53scn4step5enemy6common15StateCreditWalkFv: /* 80291A70 0028D8B0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter15StateCreditWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter15StateCreditWalkFPQ43scn4step5enemy5Enemy: /* 802A0FC8 0029CE08 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -397,17 +397,17 @@ procFixPos__Q53scn4step5enemy11broomhatter15StateCreditWalkFv: __dt__Q53scn4step5enemy11broomhatter15StateCreditWalkFv: /* 802A131C 0029D15C 4B FF 06 9C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common15StateCreditWalk __vt__Q53scn4step5enemy6common15StateCreditWalk: .incbin "baserom.dol", 0x46F0E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter15StateCreditWalk __vt__Q53scn4step5enemy11broomhatter15StateCreditWalk: .incbin "baserom.dol", 0x470F98, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256619 $$256619: .incbin "baserom.dol", 0x49BAF0, 0x4 @@ -433,7 +433,7 @@ $$256625: $$256626: .incbin "baserom.dol", 0x49BB0C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256990 $$256990: .incbin "baserom.dol", 0x49BF50, 0x4 diff --git a/asm/src/StateCutFall.s b/asm/src/StateCutFall.s index 7c12f490..3482600e 100644 --- a/asm/src/StateCutFall.s +++ b/asm/src/StateCutFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como12StateCutFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como12StateCutFallFPQ43scn4step5enemy5Enemy: /* 802A7A5C 002A389C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -182,7 +182,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15Sta __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A7CCC 002A3B0C 4B F8 69 D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15StateCutLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471CA0, 0x10 @@ -190,7 +190,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como15State __vt__Q53scn4step5enemy4como12StateCutFall: .incbin "baserom.dol", 0x471CB0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256668 $$256668: .incbin "baserom.dol", 0x49C0F0, 0x8 diff --git a/asm/src/StateCutLanding.s b/asm/src/StateCutLanding.s index 82587947..52f54cd5 100644 --- a/asm/src/StateCutLanding.s +++ b/asm/src/StateCutLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como15StateCutLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como15StateCutLandingFPQ43scn4step5enemy5Enemy: /* 802A7CD0 002A3B10 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -120,12 +120,12 @@ procMove__Q53scn4step5enemy4como15StateCutLandingFv: procFixPos__Q53scn4step5enemy4como15StateCutLandingFv: /* 802A7E68 002A3CA8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como15StateCutLanding __vt__Q53scn4step5enemy4como15StateCutLanding: .incbin "baserom.dol", 0x471CD0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256544 $$256544: .incbin "baserom.dol", 0x49C0F8, 0x8 diff --git a/asm/src/StateDamage.s b/asm/src/StateDamage.s index 161f1699..bbf446e0 100644 --- a/asm/src/StateDamage.s +++ b/asm/src/StateDamage.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8rollball11StateDamageFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8rollball11StateDamageFPQ43scn4step5enemy5Enemy: /* 802D67B4 002D25F4 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -163,7 +163,7 @@ lbl_802D69D4: __dt__Q53scn4step5enemy8rollball11StateDamageFv: /* 802D69E8 002D2828 4B FB AF D0 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8rollball11StateDamage __vt__Q53scn4step5enemy8rollball11StateDamage: .incbin "baserom.dol", 0x477200, 0x20 diff --git a/asm/src/StateDamageCapture.s b/asm/src/StateDamageCapture.s index 8ba34365..f20b3bb3 100644 --- a/asm/src/StateDamageCapture.s +++ b/asm/src/StateDamageCapture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage18StateDamageCaptureFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6damage18StateDamageCaptureFPQ43scn4step5enemy5Enemy: /* 802A8E48 002A4C88 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -459,12 +459,12 @@ lbl_802A94A8: /* 802A94C0 002A5300 38 21 00 80 */ addi r1, r1, 0x80 /* 802A94C4 002A5304 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage18StateDamageCapture __vt__Q53scn4step5enemy6damage18StateDamageCapture: .incbin "baserom.dol", 0x471D60, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257027 $$257027: .incbin "baserom.dol", 0x49C150, 0x4 diff --git a/asm/src/StateDamageExtreme.s b/asm/src/StateDamageExtreme.s index 95226936..87ab21d8 100644 --- a/asm/src/StateDamageExtreme.s +++ b/asm/src/StateDamageExtreme.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage18StateDamageExtremeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6damage18StateDamageExtremeFPQ43scn4step5enemy5Enemy: /* 802A94C8 002A5308 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -360,12 +360,12 @@ lbl_802A99C4: /* 802A99D0 002A5810 38 21 00 50 */ addi r1, r1, 0x50 /* 802A99D4 002A5814 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage18StateDamageExtreme __vt__Q53scn4step5enemy6damage18StateDamageExtreme: .incbin "baserom.dol", 0x471D80, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256978 $$256978: .incbin "baserom.dol", 0x49C180, 0x4 diff --git a/asm/src/StateDamageL.s b/asm/src/StateDamageL.s index 548c4fe4..f9c23ae3 100644 --- a/asm/src/StateDamageL.s +++ b/asm/src/StateDamageL.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy12StateDamageLFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy12StateDamageLFPQ43scn4step4boss4Boss: /* 8025CE70 00258CB0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -111,7 +111,7 @@ create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9Sta __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025CFC8 00258E08 4B FD 16 D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy9StateGrow$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x466698, 0x10 diff --git a/asm/src/StateDamageNormal.s b/asm/src/StateDamageNormal.s index dfe99349..4ada57a3 100644 --- a/asm/src/StateDamageNormal.s +++ b/asm/src/StateDamageNormal.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage17StateDamageNormalFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6damage17StateDamageNormalFPQ43scn4step5enemy5Enemy: /* 802A99D8 002A5818 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -284,12 +284,12 @@ procFixPos__Q53scn4step5enemy6damage17StateDamageNormalFv: /* 802A9DCC 002A5C0C 38 21 00 10 */ addi r1, r1, 0x10 /* 802A9DD0 002A5C10 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage17StateDamageNormal __vt__Q53scn4step5enemy6damage17StateDamageNormal: .incbin "baserom.dol", 0x471DA0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256803 $$256803: .incbin "baserom.dol", 0x49C198, 0x4 diff --git a/asm/src/StateDamageWingToss.s b/asm/src/StateDamageWingToss.s index 7c1a2d5a..d5d9a6e6 100644 --- a/asm/src/StateDamageWingToss.s +++ b/asm/src/StateDamageWingToss.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage19StateDamageWingTossFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6damage19StateDamageWingTossFPQ43scn4step5enemy5Enemy: /* 802A9DD4 002A5C14 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -312,12 +312,12 @@ lbl_802AA21C: /* 802AA228 002A6068 38 21 00 10 */ addi r1, r1, 0x10 /* 802AA22C 002A606C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage19StateDamageWingToss __vt__Q53scn4step5enemy6damage19StateDamageWingToss: .incbin "baserom.dol", 0x471DC0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256724 $$256724: .incbin "baserom.dol", 0x49C1A0, 0x4 diff --git a/asm/src/StateDash.s b/asm/src/StateDash.s index e68dda46..69140a01 100644 --- a/asm/src/StateDash.s +++ b/asm/src/StateDash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster9StateDashFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster9StateDashFPQ43scn4step4boss4Boss: /* 8023FAE0 0023B920 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -288,7 +288,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengema __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1Fv: /* 8023FE9C 0023BCDC 4B FE E8 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common9StateDashFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateDashDescUlUlUl __ct__Q53scn4step4boss6common9StateDashFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateDashDescUlUlUl: /* 80244EEC 00240D2C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -766,7 +766,7 @@ __dt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12Sta __dt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1Fv: /* 8024559C 002413DC 4B FE 91 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior9StateDashFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior9StateDashFPQ43scn4step4boss4Boss: /* 8024DFEC 00249E2C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1058,7 +1058,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16St __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1Fv: /* 8024E3E0 0024A220 4B FE 02 C0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld9StateDashFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld9StateDashFPQ43scn4step5enemy5Enemy: /* 802DDED8 002D9D18 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1315,7 +1315,7 @@ lbl_802DE244: /* 802DE254 002DA094 38 21 00 70 */ addi r1, r1, 0x70 /* 802DE258 002DA098 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461E58, 0x10 @@ -1326,7 +1326,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengema __vt__Q53scn4step4boss15challengemaster9StateDash: .incbin "baserom.dol", 0x461E78, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1 __vt__Q24util139StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common16StateDashWallHit$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateDashDesc$$4Ul$$1: .incbin "baserom.dol", 0x4623C0, 0x10 @@ -1337,7 +1337,7 @@ __vt__Q24util135StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common12Sta __vt__Q53scn4step4boss6common9StateDash: .incbin "baserom.dol", 0x4623E0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateDashWallHit$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x463880, 0x10 @@ -1345,17 +1345,17 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16Stat __vt__Q53scn4step4boss6dubior9StateDash: .incbin "baserom.dol", 0x463890, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9StateDash __vt__Q53scn4step5enemy5sheld9StateDash: .incbin "baserom.dol", 0x477E30, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256936 $$256936: .incbin "baserom.dol", 0x49B128, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256210 $$256210: .incbin "baserom.dol", 0x49CD00, 0x4 diff --git a/asm/src/StateDashAttack.s b/asm/src/StateDashAttack.s index 276d084c..69d6bf96 100644 --- a/asm/src/StateDashAttack.s +++ b/asm/src/StateDashAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4wing15StateDashAttackFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4wing15StateDashAttackFPQ43scn4step4hero4Hero: /* 80397250 00393090 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -827,7 +827,7 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateD __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1Fv: /* 80397DBC 00393BFC 4B E9 68 E4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing22StateDashAttackWallHit$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A020, 0x10 @@ -844,7 +844,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing15StateD __vt__Q53scn4step4hero4wing15StateDashAttack: .incbin "baserom.dol", 0x48A060, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259300 $$259300: .incbin "baserom.dol", 0x49E218, 0x4 diff --git a/asm/src/StateDashAttackWallHit.s b/asm/src/StateDashAttackWallHit.s index 84a183e0..74932973 100644 --- a/asm/src/StateDashAttackWallHit.s +++ b/asm/src/StateDashAttackWallHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4wing22StateDashAttackWallHitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero4wing22StateDashAttackWallHitFPQ43scn4step4hero4Hero: /* 80397DC0 00393C00 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -191,12 +191,12 @@ lbl_8039800C: procFixPos__Q53scn4step4hero4wing22StateDashAttackWallHitFv: /* 80398068 00393EA8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4wing22StateDashAttackWallHit __vt__Q53scn4step4hero4wing22StateDashAttackWallHit: .incbin "baserom.dol", 0x48A088, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256276 $$256276: .incbin "baserom.dol", 0x49E228, 0x4 diff --git a/asm/src/StateDashDesc.s b/asm/src/StateDashDesc.s index 1b8ee83d..89ea6993 100644 --- a/asm/src/StateDashDesc.s +++ b/asm/src/StateDashDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common13StateDashDescFUlQ24gobj14MoveParamAccelQ24gobj14MoveParamDecelQ24gobj14MoveParamDecelQ24gobj13MoveParamFallQ33hel4math4Vec2Q33hel4math4Vec2Q33hel4math4Vec2bQ33hel4math4Vec2Q33hel4math4Vec2Q43scn4step4boss9GuardTypebQ43scn4step5ocoll10AttackType __ct__Q53scn4step4boss6common13StateDashDescFUlQ24gobj14MoveParamAccelQ24gobj14MoveParamDecelQ24gobj14MoveParamDecelQ24gobj13MoveParamFallQ33hel4math4Vec2Q33hel4math4Vec2Q33hel4math4Vec2bQ33hel4math4Vec2Q33hel4math4Vec2Q43scn4step4boss9GuardTypebQ43scn4step5ocoll10AttackType: /* 802455A0 002413E0 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/StateDashEnd.s b/asm/src/StateDashEnd.s index d8bc8210..6d7d3378 100644 --- a/asm/src/StateDashEnd.s +++ b/asm/src/StateDashEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common12StateDashEndFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateDashDescUl __ct__Q53scn4step4boss6common12StateDashEndFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateDashDescUl: /* 8024568C 002414CC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -63,7 +63,7 @@ procMove__Q53scn4step4boss6common12StateDashEndFv: procFixPos__Q53scn4step4boss6common12StateDashEndFv: /* 80245744 00241584 4B FF 28 7C */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common12StateDashEnd __vt__Q53scn4step4boss6common12StateDashEnd: .incbin "baserom.dol", 0x462400, 0x20 diff --git a/asm/src/StateDashWallHit.s b/asm/src/StateDashWallHit.s index 586cdedf..2fd69479 100644 --- a/asm/src/StateDashWallHit.s +++ b/asm/src/StateDashWallHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common16StateDashWallHitFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateDashDescUl __ct__Q53scn4step4boss6common16StateDashWallHitFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateDashDescUl: /* 80245748 00241588 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -263,7 +263,7 @@ lbl_80245AFC: /* 80245B0C 0024194C 38 21 00 80 */ addi r1, r1, 0x80 /* 80245B10 00241950 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior16StateDashWallHitFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior16StateDashWallHitFPQ43scn4step4boss4Boss: /* 8024E3E4 0024A224 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -403,17 +403,17 @@ procMove__Q53scn4step4boss6dubior16StateDashWallHitFv: procFixPos__Q53scn4step4boss6dubior16StateDashWallHitFv: /* 8024E5CC 0024A40C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common16StateDashWallHit __vt__Q53scn4step4boss6common16StateDashWallHit: .incbin "baserom.dol", 0x462420, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior16StateDashWallHit __vt__Q53scn4step4boss6dubior16StateDashWallHit: .incbin "baserom.dol", 0x4638B0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255953 $$255953: .incbin "baserom.dol", 0x49B130, 0x4 diff --git a/asm/src/StateDead.s b/asm/src/StateDead.s index 6b0b319c..063fa182 100644 --- a/asm/src/StateDead.s +++ b/asm/src/StateDead.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common9StateDeadFPQ43scn4step4boss4Bossi __ct__Q53scn4step4boss6common9StateDeadFPQ43scn4step4boss4Bossi: /* 80245B14 00241954 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -678,7 +678,7 @@ dead__Q53scn4step4boss6common9StateDeadFv: /* 802464E8 00242328 38 21 00 10 */ addi r1, r1, 0x10 /* 802464EC 0024232C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy9StateDeadFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy9StateDeadFPQ43scn4step4boss4Boss: /* 8025CFCC 00258E0C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1016,7 +1016,7 @@ lbl_8025D484: /* 8025D494 002592D4 38 21 00 20 */ addi r1, r1, 0x20 /* 8025D498 002592D8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common9StateDeadFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common9StateDeadFPQ43scn4step4hero4Hero: /* 80360CA0 0035CAE0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2217,17 +2217,17 @@ create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11St __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1Fv: /* 80361E28 0035DC68 4B EC C8 78 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common9StateDead __vt__Q53scn4step4boss6common9StateDead: .incbin "baserom.dol", 0x462440, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateDead __vt__Q53scn4step4boss6whispy9StateDead: .incbin "baserom.dol", 0x4666C8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateLogout$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487C08, 0x10 @@ -2235,12 +2235,12 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11Stat __vt__Q53scn4step4hero6common9StateDead: .incbin "baserom.dol", 0x487C18, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257422 $$257422: .incbin "baserom.dol", 0x4957B0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257797 $$257797: .incbin "baserom.dol", 0x49B138, 0x4 @@ -2257,7 +2257,7 @@ $$259229: $$259230: .incbin "baserom.dol", 0x49B148, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258046 $$258046: .incbin "baserom.dol", 0x49B520, 0x4 @@ -2277,7 +2277,7 @@ $$258050: $$258053: .incbin "baserom.dol", 0x49B538, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$262125 $$262125: .incbin "baserom.dol", 0x49DB50, 0x4 diff --git a/asm/src/StateDeadCaptureRelease.s b/asm/src/StateDeadCaptureRelease.s index ee8c05f0..f15f9754 100644 --- a/asm/src/StateDeadCaptureRelease.s +++ b/asm/src/StateDeadCaptureRelease.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFPQ43scn4step5enemy5Enemyb __ct__Q53scn4step5enemy6damage23StateDeadCaptureReleaseFPQ43scn4step5enemy5Enemyb: /* 802AA230 002A6070 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -207,12 +207,12 @@ lbl_802AA50C: /* 802AA518 002A6358 38 21 00 40 */ addi r1, r1, 0x40 /* 802AA51C 002A635C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage23StateDeadCaptureRelease __vt__Q53scn4step5enemy6damage23StateDeadCaptureRelease: .incbin "baserom.dol", 0x471DE0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256713 $$256713: .incbin "baserom.dol", 0x49C1A8, 0x4 diff --git a/asm/src/StateDeadExtreme.s b/asm/src/StateDeadExtreme.s index 25e152e3..710efa7b 100644 --- a/asm/src/StateDeadExtreme.s +++ b/asm/src/StateDeadExtreme.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage16StateDeadExtremeFPQ43scn4step5enemy5EnemyUl __ct__Q53scn4step5enemy6damage16StateDeadExtremeFPQ43scn4step5enemy5EnemyUl: /* 802AA520 002A6360 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -328,12 +328,12 @@ lbl_802AA9A0: /* 802AA9AC 002A67EC 38 21 00 10 */ addi r1, r1, 0x10 /* 802AA9B0 002A67F0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage16StateDeadExtreme __vt__Q53scn4step5enemy6damage16StateDeadExtreme: .incbin "baserom.dol", 0x471E00, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257029 $$257029: .incbin "baserom.dol", 0x49C1C0, 0x4 diff --git a/asm/src/StateDeadInWater.s b/asm/src/StateDeadInWater.s index 4ea06151..3c19fdd0 100644 --- a/asm/src/StateDeadInWater.s +++ b/asm/src/StateDeadInWater.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage16StateDeadInWaterFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6damage16StateDeadInWaterFPQ43scn4step5enemy5Enemy: /* 802AA9B4 002A67F4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -401,17 +401,17 @@ lbl_802AAE7C: /* 802AAF6C 002A6DAC 38 21 00 60 */ addi r1, r1, 0x60 /* 802AAF70 002A6DB0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage16StateDeadInWater __vt__Q53scn4step5enemy6damage16StateDeadInWater: .incbin "baserom.dol", 0x471E20, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256983 $$256983: .incbin "baserom.dol", 0x495D08, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257302 $$257302: .incbin "baserom.dol", 0x49C1D8, 0x4 diff --git a/asm/src/StateDeadSuper.s b/asm/src/StateDeadSuper.s index 4dfa81a4..e82160b3 100644 --- a/asm/src/StateDeadSuper.s +++ b/asm/src/StateDeadSuper.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage14StateDeadSuperFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6damage14StateDeadSuperFPQ43scn4step5enemy5Enemy: /* 802AAF74 002A6DB4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -470,12 +470,12 @@ lbl_802AB5FC: /* 802AB614 002A7454 38 21 00 70 */ addi r1, r1, 0x70 /* 802AB618 002A7458 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage14StateDeadSuper __vt__Q53scn4step5enemy6damage14StateDeadSuper: .incbin "baserom.dol", 0x471E40, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257110 $$257110: .incbin "baserom.dol", 0x49C230, 0x4 diff --git a/asm/src/StateDemo.s b/asm/src/StateDemo.s index 959614b6..84852a96 100644 --- a/asm/src/StateDemo.s +++ b/asm/src/StateDemo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common9StateDemoFPQ43scn4step4hero4HeroQ43scn4step4hero10ScriptKindb __ct__Q53scn4step4hero6common9StateDemoFPQ43scn4step4hero4HeroQ43scn4step4hero10ScriptKindb: /* 80361E2C 0035DC6C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -221,7 +221,7 @@ lbl_80362130: /* 80362140 0035DF80 38 21 00 40 */ addi r1, r1, 0x40 /* 80362144 0035DF84 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateDemo __vt__Q53scn4step4hero6common9StateDemo: .incbin "baserom.dol", 0x487C40, 0x28 diff --git a/asm/src/StateDive.s b/asm/src/StateDive.s index cf2dbd08..c1634098 100644 --- a/asm/src/StateDive.s +++ b/asm/src/StateDive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper9StateDiveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper9StateDiveFPQ43scn4step5enemy5Enemy: /* 8029A120 00295F60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -303,7 +303,7 @@ lbl_8029A528: __dt__Q53scn4step5enemy7blipper9StateDiveFv: /* 8029A56C 002963AC 4B FF 74 4C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como9StateDiveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como9StateDiveFPQ43scn4step5enemy5Enemy: /* 802A7E6C 002A3CAC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -502,12 +502,12 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13Sta __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A8104 002A3F44 4B F8 65 9C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateDive __vt__Q53scn4step5enemy7blipper9StateDive: .incbin "baserom.dol", 0x46FF60, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13StateDiveWait$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x471CF0, 0x10 @@ -515,7 +515,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4como13State __vt__Q53scn4step5enemy4como9StateDive: .incbin "baserom.dol", 0x471D00, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255836 $$255836: .incbin "baserom.dol", 0x49BDD0, 0x4 @@ -529,7 +529,7 @@ $$255838: $$255886: .incbin "baserom.dol", 0x49BDDC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256046 $$256046: .incbin "baserom.dol", 0x49C100, 0x4 diff --git a/asm/src/StateDiveAttack.s b/asm/src/StateDiveAttack.s index a0a20f0d..a6416437 100644 --- a/asm/src/StateDiveAttack.s +++ b/asm/src/StateDiveAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4wing15StateDiveAttackFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4wing15StateDiveAttackFPQ43scn4step4hero4Hero: /* 8039806C 00393EAC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -592,7 +592,7 @@ create__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23Sta __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1Fv: /* 803988D8 00394718 4B E9 5D C8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23StateUnderAttackLanding$$4PQ43scn4step4hero4Hero$$4b$$1: .incbin "baserom.dol", 0x48A0B0, 0x10 @@ -600,7 +600,7 @@ __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero4wing23State __vt__Q53scn4step4hero4wing15StateDiveAttack: .incbin "baserom.dol", 0x48A0C0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257542 $$257542: .incbin "baserom.dol", 0x49E240, 0x4 diff --git a/asm/src/StateDiveWait.s b/asm/src/StateDiveWait.s index 273e2cf4..925a24bd 100644 --- a/asm/src/StateDiveWait.s +++ b/asm/src/StateDiveWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como13StateDiveWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como13StateDiveWaitFPQ43scn4step5enemy5Enemy: /* 802A8108 002A3F48 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -150,7 +150,7 @@ lbl_802A82D0: __dt__Q53scn4step5enemy4como13StateDiveWaitFv: /* 802A82E8 002A4128 4B FE 96 D0 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como13StateDiveWait __vt__Q53scn4step5enemy4como13StateDiveWait: .incbin "baserom.dol", 0x471D20, 0x20 diff --git a/asm/src/StateDoubleAttack.s b/asm/src/StateDoubleAttack.s index 37e4dc54..b47cba27 100644 --- a/asm/src/StateDoubleAttack.s +++ b/asm/src/StateDoubleAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight17StateDoubleAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight17StateDoubleAttackFPQ43scn4step5enemy5Enemy: /* 802978E4 00293724 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -170,12 +170,12 @@ lbl_80297AE8: procFixPos__Q53scn4step5enemy11bladeknight17StateDoubleAttackFv: /* 80297B34 00293974 4B FF FC E4 */ b procFixPos__Q53scn4step5enemy11bladeknight11StateAttackFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight17StateDoubleAttack __vt__Q53scn4step5enemy11bladeknight17StateDoubleAttack: .incbin "baserom.dol", 0x46FAF8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255847 $$255847: .incbin "baserom.dol", 0x49BD40, 0x4 diff --git a/asm/src/StateDoubleKick.s b/asm/src/StateDoubleKick.s index 169a553e..3eff6640 100644 --- a/asm/src/StateDoubleKick.s +++ b/asm/src/StateDoubleKick.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter15StateDoubleKickFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter15StateDoubleKickFPQ43scn4step4hero4Hero: /* 8039C664 003984A4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -306,12 +306,12 @@ createWeapon__Q53scn4step4hero7fighter15StateDoubleKickFv: /* 8039CAB0 003988F0 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8039CAB4 003988F4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter15StateDoubleKick __vt__Q53scn4step4hero7fighter15StateDoubleKick: .incbin "baserom.dol", 0x48A488, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257941 $$257941: .incbin "baserom.dol", 0x49E2E0, 0x4 diff --git a/asm/src/StateDrink.s b/asm/src/StateDrink.s index 2d1df86e..50bc10e8 100644 --- a/asm/src/StateDrink.s +++ b/asm/src/StateDrink.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common10StateDrinkFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common10StateDrinkFPQ43scn4step4hero4Hero: /* 80362148 0035DF88 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -495,7 +495,7 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12Stat __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1Fv: /* 80362808 0035E648 4B EC BE 98 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11StateMixPre$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487C68, 0x10 @@ -509,7 +509,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __vt__Q53scn4step4hero6common10StateDrink: .incbin "baserom.dol", 0x487C98, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258822 $$258822: .incbin "baserom.dol", 0x49DB78, 0x8 diff --git a/asm/src/StateEat.s b/asm/src/StateEat.s index ac5bab59..45d38bbd 100644 --- a/asm/src/StateEat.s +++ b/asm/src/StateEat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common8StateEatFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common8StateEatFPQ43scn4step4hero4Hero: /* 8036280C 0035E64C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -118,7 +118,7 @@ procMove__Q53scn4step4hero6common8StateEatFv: procFixPos__Q53scn4step4hero6common8StateEatFv: /* 80362990 0035E7D0 4B FF DE F0 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common8StateEat __vt__Q53scn4step4hero6common8StateEat: .incbin "baserom.dol", 0x487CC0, 0x28 diff --git a/asm/src/StateEaten.s b/asm/src/StateEaten.s index baa24cd1..d9dba48b 100644 --- a/asm/src/StateEaten.s +++ b/asm/src/StateEaten.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global param__Q53scn4step4hero12interference24$$2unnamed$$2StateEaten_cpp$$2FRQ43scn4step4hero4Hero param__Q53scn4step4hero12interference24$$2unnamed$$2StateEaten_cpp$$2FRQ43scn4step4hero4Hero: /* 80370E3C 0036CC7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -560,12 +560,12 @@ endState__Q53scn4step4hero12interference10StateEatenFv: /* 80371670 0036D4B0 38 21 00 70 */ addi r1, r1, 0x70 /* 80371674 0036D4B4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference10StateEaten __vt__Q53scn4step4hero12interference10StateEaten: .incbin "baserom.dol", 0x488570, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259191 $$259191: .incbin "baserom.dol", 0x49DD10, 0x8 diff --git a/asm/src/StateEnd.s b/asm/src/StateEnd.s index 07410ae0..4d002840 100644 --- a/asm/src/StateEnd.s +++ b/asm/src/StateEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone8StateEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5stone8StateEndFPQ43scn4step4hero4Hero: /* 803900D4 0038BF14 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -142,12 +142,12 @@ procMove__Q53scn4step4hero5stone8StateEndFv: procFixPos__Q53scn4step4hero5stone8StateEndFv: /* 803902B0 0038C0F0 4B FD 05 D0 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone8StateEnd __vt__Q53scn4step4hero5stone8StateEnd: .incbin "baserom.dol", 0x489AF0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256284 $$256284: .incbin "baserom.dol", 0x49E110, 0x4 diff --git a/asm/src/StateEndure.s b/asm/src/StateEndure.s index b36b0dd7..c31362fb 100644 --- a/asm/src/StateEndure.s +++ b/asm/src/StateEndure.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7mumbies11StateEndureFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7mumbies11StateEndureFPQ43scn4step5enemy5Enemy: /* 802C5880 002C16C0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -131,7 +131,7 @@ lbl_802C5A24: /* 802C5A34 002C1874 38 21 00 30 */ addi r1, r1, 0x30 /* 802C5A38 002C1878 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7mumbies11StateEndure __vt__Q53scn4step5enemy7mumbies11StateEndure: .incbin "baserom.dol", 0x4753A0, 0x20 diff --git a/asm/src/StateEnterChallengeDoor.s b/asm/src/StateEnterChallengeDoor.s index 30b73a35..198d9156 100644 --- a/asm/src/StateEnterChallengeDoor.s +++ b/asm/src/StateEnterChallengeDoor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFPQ43scn4step4hero4HeroRCQ33hel4math7Vector2Q33scn4step13ChallengeKindb __ct__Q53scn4step4hero7gimmick23StateEnterChallengeDoorFPQ43scn4step4hero4HeroRCQ33hel4math7Vector2Q33scn4step13ChallengeKindb: /* 8037C370 003781B0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -274,12 +274,12 @@ lbl_8037C730: /* 8037C740 00378580 38 21 00 80 */ addi r1, r1, 0x80 /* 8037C744 00378584 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick23StateEnterChallengeDoor __vt__Q53scn4step4hero7gimmick23StateEnterChallengeDoor: .incbin "baserom.dol", 0x488A78, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260691 $$260691: .incbin "baserom.dol", 0x49DF38, 0x4 diff --git a/asm/src/StateEnterChallengeDoorPre.s b/asm/src/StateEnterChallengeDoorPre.s index 39ba5704..5d48169d 100644 --- a/asm/src/StateEnterChallengeDoorPre.s +++ b/asm/src/StateEnterChallengeDoorPre.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPreFPQ43scn4step4hero4Hero: /* 8037C748 00378588 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -589,7 +589,7 @@ create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26 __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1Fv: /* 8037CF78 00378DB8 4B EB 17 28 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick13challengedoor6Result$$1: .incbin "baserom.dol", 0x488AA0, 0x10 @@ -597,7 +597,7 @@ __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick26St __vt__Q53scn4step4hero7gimmick26StateEnterChallengeDoorPre: .incbin "baserom.dol", 0x488AB0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$261107 $$261107: .incbin "baserom.dol", 0x49DF40, 0x8 diff --git a/asm/src/StateEnterDoor.s b/asm/src/StateEnterDoor.s index 5528b695..e4287366 100644 --- a/asm/src/StateEnterDoor.s +++ b/asm/src/StateEnterDoor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global checkChangeState__Q53scn4step4hero7gimmick28$$2unnamed$$2StateEnterDoor_cpp$$2FPQ43scn4step4hero4HerobRb checkChangeState__Q53scn4step4hero7gimmick28$$2unnamed$$2StateEnterDoor_cpp$$2FPQ43scn4step4hero4HerobRb: /* 8037CF7C 00378DBC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -817,7 +817,7 @@ create__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14 __dt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1Fv: /* 8037DB10 00379950 4B EB 0B 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1 __vt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14StateEnterDoor$$4PQ43scn4step4hero4Hero$$4Q53scn4step7gimmick4door6Result$$4b$$4b$$1: .incbin "baserom.dol", 0x488AD8, 0x10 @@ -825,7 +825,7 @@ __vt__Q24util132StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero7gimmick14St __vt__Q53scn4step4hero7gimmick14StateEnterDoor: .incbin "baserom.dol", 0x488AE8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260742 $$260742: .incbin "baserom.dol", 0x49DF48, 0x4 diff --git a/asm/src/StateEnterMahoroa.s b/asm/src/StateEnterMahoroa.s index ba615426..99789d5b 100644 --- a/asm/src/StateEnterMahoroa.s +++ b/asm/src/StateEnterMahoroa.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Turn__Q53scn4step4hero7gimmick31$$2unnamed$$2StateEnterMahoroa_cpp$$2FPQ43scn4step4hero4Herof Turn__Q53scn4step4hero7gimmick31$$2unnamed$$2StateEnterMahoroa_cpp$$2FPQ43scn4step4hero4Herof: /* 8037DB14 00379954 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1827,7 +1827,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17S __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17StateLeaveMahoroa$$4PQ43scn4step4hero4Hero$$1Fv: /* 8037F554 0037B394 4B EA F1 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DEPTH_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2 T_DEPTH_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: .incbin "baserom.dol", 0x41BCF8, 0x10 @@ -1835,7 +1835,7 @@ T_DEPTH_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: T_DEPTH_LIST3__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: .incbin "baserom.dol", 0x41BD08, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_OFS_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2 T_OFS_LIST24__31$$2unnamed$$2StateEnterMahoroa_cpp$$2: .incbin "baserom.dol", 0x488B10, 0x20 @@ -1849,7 +1849,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7gimmick17Sta __vt__Q53scn4step4hero7gimmick17StateEnterMahoroa: .incbin "baserom.dol", 0x488B60, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$262848 $$262848: .incbin "baserom.dol", 0x49DF58, 0x4 diff --git a/asm/src/StateEscape.s b/asm/src/StateEscape.s index 1790e45f..9dc4df68 100644 --- a/asm/src/StateEscape.s +++ b/asm/src/StateEscape.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy11StateEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy11StateEscapeFPQ43scn4step5enemy5Enemy: /* 802DAC04 002D6A44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -140,7 +140,7 @@ lbl_802DADB8: __dt__Q53scn4step5enemy6scarfy11StateEscapeFv: /* 802DAE04 002D6C44 4B FB 6B B4 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld11StateEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld11StateEscapeFPQ43scn4step5enemy5Enemy: /* 802DE25C 002DA09C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -351,17 +351,17 @@ lbl_802DE524: /* 802DE534 002DA374 38 21 00 70 */ addi r1, r1, 0x70 /* 802DE538 002DA378 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy11StateEscape __vt__Q53scn4step5enemy6scarfy11StateEscape: .incbin "baserom.dol", 0x477738, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld11StateEscape __vt__Q53scn4step5enemy5sheld11StateEscape: .incbin "baserom.dol", 0x477E50, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257269 $$257269: .incbin "baserom.dol", 0x49CD10, 0x4 diff --git a/asm/src/StateExplosion.s b/asm/src/StateExplosion.s index 90bc5dcc..fa45ed35 100644 --- a/asm/src/StateExplosion.s +++ b/asm/src/StateExplosion.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon12hammerhammer14StateExplosionFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon12hammerhammer14StateExplosionFPQ43scn4step6weapon6Weapon: /* 803E544C 003E128C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -229,7 +229,7 @@ procObjCollReact__Q53scn4step6weapon12hammerhammer14StateExplosionFv: __dt__Q53scn4step6weapon12hammerhammer14StateExplosionFv: /* 803E5784 003E15C4 4B FF 32 BC */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon16fightersmashshot14StateExplosionFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon16fightersmashshot14StateExplosionFPQ43scn4step6weapon6Weapon: /* 803E6284 003E20C4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -328,7 +328,7 @@ procFixPos__Q53scn4step6weapon16fightersmashshot14StateExplosionFv: procObjCollReact__Q53scn4step6weapon16fightersmashshot14StateExplosionFv: /* 803E63BC 003E21FC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon15fighterkickshot14StateExplosionFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon15fighterkickshot14StateExplosionFPQ43scn4step6weapon6Weapon: /* 803E669C 003E24DC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -427,7 +427,7 @@ procFixPos__Q53scn4step6weapon15fighterkickshot14StateExplosionFv: procObjCollReact__Q53scn4step6weapon15fighterkickshot14StateExplosionFv: /* 803E67D4 003E2614 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon16fighterhadoushot14StateExplosionFPQ43scn4step6weapon6WeaponQ53scn4step6weapon16fighterhadoushot9Variation __ct__Q53scn4step6weapon16fighterhadoushot14StateExplosionFPQ43scn4step6weapon6WeaponQ53scn4step6weapon16fighterhadoushot9Variation: /* 803E6C50 003E2A90 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -605,7 +605,7 @@ lbl_803E6E8C: /* 803E6E98 003E2CD8 38 21 00 10 */ addi r1, r1, 0x10 /* 803E6E9C 003E2CDC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon23combinationdededebomber14StateExplosionFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon23combinationdededebomber14StateExplosionFPQ43scn4step6weapon6Weapon: /* 803EB86C 003E76AC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -776,7 +776,7 @@ lbl_803EBA84: /* 803EBA84 003E78C4 38 6D DE F4 */ addi r3, r13, $$256505-_SDA_BASE_ /* 803EBA88 003E78C8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon12dededehammer14StateExplosionFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon12dededehammer14StateExplosionFPQ43scn4step6weapon6Weapon: /* 803EC898 003E86D8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1005,37 +1005,37 @@ procObjCollReact__Q53scn4step6weapon12dededehammer14StateExplosionFv: __dt__Q53scn4step6weapon12dededehammer14StateExplosionFv: /* 803ECBD0 003E8A10 4B FE BE 70 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12hammerhammer14StateExplosion __vt__Q53scn4step6weapon12hammerhammer14StateExplosion: .incbin "baserom.dol", 0x4908B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16fightersmashshot14StateExplosion __vt__Q53scn4step6weapon16fightersmashshot14StateExplosion: .incbin "baserom.dol", 0x490968, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon15fighterkickshot14StateExplosion __vt__Q53scn4step6weapon15fighterkickshot14StateExplosion: .incbin "baserom.dol", 0x4909B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16fighterhadoushot14StateExplosion __vt__Q53scn4step6weapon16fighterhadoushot14StateExplosion: .incbin "baserom.dol", 0x490A38, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon23combinationdededebomber14StateExplosion __vt__Q53scn4step6weapon23combinationdededebomber14StateExplosion: .incbin "baserom.dol", 0x490E58, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12dededehammer14StateExplosion __vt__Q53scn4step6weapon12dededehammer14StateExplosion: .incbin "baserom.dol", 0x490F88, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256495 $$256495: .incbin "baserom.dol", 0x4986E8, 0x4 @@ -1049,7 +1049,7 @@ $$256499: $$256505: .incbin "baserom.dol", 0x4986F4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256953 $$256953: .incbin "baserom.dol", 0x49EA90, 0x4 @@ -1066,7 +1066,7 @@ $$256956: $$256960: .incbin "baserom.dol", 0x49EAA0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256641 $$256641: .incbin "baserom.dol", 0x49EAF0, 0x4 @@ -1083,7 +1083,7 @@ $$256644: $$256647: .incbin "baserom.dol", 0x49EB00, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256953 $$256953: .incbin "baserom.dol", 0x49EC10, 0x4 diff --git a/asm/src/StateExtreme.s b/asm/src/StateExtreme.s index 9f0a5f7f..9f39992b 100644 --- a/asm/src/StateExtreme.s +++ b/asm/src/StateExtreme.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage12StateExtremeFPQ43scn4step4hero4HeroQ63scn4step4hero6damage12StateExtreme11DamageLevel __ct__Q53scn4step4hero6damage12StateExtremeFPQ43scn4step4hero4HeroQ63scn4step4hero6damage12StateExtreme11DamageLevel: /* 80375AD8 00371918 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -375,7 +375,7 @@ create__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10St __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv: /* 8037601C 00371E5C 4B EB 86 84 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10StateFaint$$4PQ43scn4step4hero4Hero$$4Ul$$1: .incbin "baserom.dol", 0x488730, 0x10 @@ -383,7 +383,7 @@ __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __vt__Q53scn4step4hero6damage12StateExtreme: .incbin "baserom.dol", 0x488740, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256907 $$256907: .incbin "baserom.dol", 0x49DDF8, 0x4 diff --git a/asm/src/StateFaceChange.s b/asm/src/StateFaceChange.s index 66a6f5e6..97a4d598 100644 --- a/asm/src/StateFaceChange.s +++ b/asm/src/StateFaceChange.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy15StateFaceChangeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy15StateFaceChangeFPQ43scn4step5enemy5Enemy: /* 802DAE08 002D6C48 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -243,7 +243,7 @@ lbl_802DB160: /* 802DB170 002D6FB0 38 21 00 20 */ addi r1, r1, 0x20 /* 802DB174 002D6FB4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy15StateFaceChange __vt__Q53scn4step5enemy6scarfy15StateFaceChange: .incbin "baserom.dol", 0x477758, 0x20 diff --git a/asm/src/StateFaint.s b/asm/src/StateFaint.s index 5e4b53a3..9239c84e 100644 --- a/asm/src/StateFaint.s +++ b/asm/src/StateFaint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common10StateFaintFPQ43scn4step4hero4HeroUlb __ct__Q53scn4step4hero6common10StateFaintFPQ43scn4step4hero4HeroUlb: /* 80362994 0035E7D4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -206,7 +206,7 @@ create__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11St __dt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1Fv: /* 80362C50 0035EA90 4B EC BA 50 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util94StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateWakeUp$$4PQ43scn4step4hero4Hero$$4b$$1: .incbin "baserom.dol", 0x487CE8, 0x10 diff --git a/asm/src/StateFall.s b/asm/src/StateFall.s index c65d9079..c57daa6b 100644 --- a/asm/src/StateFall.s +++ b/asm/src/StateFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss6common9StateFallFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss6common9StateFallFPQ43scn4step4boss4Boss: /* 802464F0 00242330 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -156,7 +156,7 @@ lbl_802466E8: /* 802466F8 00242538 38 21 00 50 */ addi r1, r1, 0x50 /* 802466FC 0024253C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common9StateFallFPQ43scn4step5enemy5Enemy: /* 80291A74 0028D8B4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -311,7 +311,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12S __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80291C74 0028DAB4 4B F9 CA 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper9StateFallFPQ43scn4step5enemy5Enemy: /* 8029A570 002963B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -446,7 +446,7 @@ lbl_8029A724: __dt__Q53scn4step5enemy7blipper9StateFallFv: /* 8029A73C 0029657C 4B FF 72 7C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu9StateFallFPQ43scn4step5enemy5Enemy: /* 802BCEBC 002B8CFC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -598,7 +598,7 @@ lbl_802BD0B8: /* 802BD0C8 002B8F08 38 21 00 70 */ addi r1, r1, 0x70 /* 802BD0CC 002B8F0C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6leafan9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6leafan9StateFallFPQ43scn4step5enemy5Enemy: /* 802C39A8 002BF7E8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -720,7 +720,7 @@ __dt__Q53scn4step5enemy6leafan9StateFallFv: __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C3B38 002BF978 4B F6 AB 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff9StateFallFPQ43scn4step5enemy5Enemy: /* 802C7EE4 002C3D24 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1066,7 +1066,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12St __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C83A8 002C41E8 4B F6 62 F8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee9StateFallFPQ43scn4step5enemy5Enemy: /* 802CC554 002C8394 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1315,7 +1315,7 @@ __dt__Q53scn4step5enemy10parasoldee9StateFallFv: __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CC89C 002C86DC 4B F6 1E 04 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo9StateFallFPQ43scn4step5enemy5Enemy: /* 802CE47C 002CA2BC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1480,7 +1480,7 @@ __dt__Q53scn4step5enemy10parasoldoo9StateFallFv: __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CE6A8 002CA4E8 4B F5 FF F8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky9StateFallFPQ43scn4step5enemy5Enemy: /* 802D4254 002D0094 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1746,7 +1746,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12St __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D45F4 002D0434 4B F5 A0 AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld9StateFallFPQ43scn4step5enemy5Enemy: /* 802DE53C 002DA37C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1903,7 +1903,7 @@ lbl_802DE744: /* 802DE754 002DA594 38 21 00 70 */ addi r1, r1, 0x70 /* 802DE758 002DA598 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11sisterbound9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11sisterbound9StateFallFPQ43scn4step5enemy5Enemy: /* 802E2BD4 002DEA14 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2087,7 +2087,7 @@ lbl_802E2E50: /* 802E2E5C 002DEC9C 38 21 00 70 */ addi r1, r1, 0x70 /* 802E2E60 002DECA0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage9StateFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage9StateFallFPQ43scn4step5enemy5Enemy: /* 802EB370 002E71B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2213,7 +2213,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EB510 002E7350 4B F4 31 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11whispyapple9StateFallFPQ43scn4step5enemy5EnemyUlb __ct__Q53scn4step5enemy11whispyapple9StateFallFPQ43scn4step5enemy5EnemyUlb: /* 802F1EEC 002EDD2C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2445,7 +2445,7 @@ create__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispya __dt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1Fv: /* 802F2210 002EE050 4B F3 C4 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common9StateFallFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common9StateFallFPQ43scn4step4hero4Hero: /* 80362C54 0035EA94 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2845,7 +2845,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13St __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1Fv: /* 803631EC 0035F02C 4B EC B4 B4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone9StateFallFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context __ct__Q53scn4step4hero5stone9StateFallFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context: /* 803902B4 0038C0F4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3214,7 +3214,7 @@ __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateE __dt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv: /* 803907AC 0038C5EC 4B E9 DE F4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state9StateFallFPQ43scn4step4item4Item __ct__Q53scn4step4item5state9StateFallFPQ43scn4step4item4Item: /* 803C789C 003C36DC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -3417,12 +3417,12 @@ lbl_803C7B58: /* 803C7B68 003C39A8 38 21 00 20 */ addi r1, r1, 0x20 /* 803C7B6C 003C39AC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common9StateFall __vt__Q53scn4step4boss6common9StateFall: .incbin "baserom.dol", 0x462460, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46F108, 0x10 @@ -3430,17 +3430,17 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common12Sta __vt__Q53scn4step5enemy6common9StateFall: .incbin "baserom.dol", 0x46F118, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateFall __vt__Q53scn4step5enemy7blipper9StateFall: .incbin "baserom.dol", 0x46FF80, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateFall __vt__Q53scn4step5enemy4kabu9StateFall: .incbin "baserom.dol", 0x474248, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475058, 0x10 @@ -3448,7 +3448,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6leafan12Sta __vt__Q53scn4step5enemy6leafan9StateFall: .incbin "baserom.dol", 0x475068, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12StateStopAir$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475A48, 0x10 @@ -3456,7 +3456,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff12Stat __vt__Q53scn4step5enemy5nruff9StateFall: .incbin "baserom.dol", 0x475A58, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476188, 0x10 @@ -3464,7 +3464,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasolde __vt__Q53scn4step5enemy10parasoldee9StateFall: .incbin "baserom.dol", 0x476198, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476338, 0x10 @@ -3472,7 +3472,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldo __vt__Q53scn4step5enemy10parasoldoo9StateFall: .incbin "baserom.dol", 0x476348, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476F38, 0x10 @@ -3480,17 +3480,17 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12Stat __vt__Q53scn4step5enemy5rocky9StateFall: .incbin "baserom.dol", 0x476F48, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld9StateFall __vt__Q53scn4step5enemy5sheld9StateFall: .incbin "baserom.dol", 0x477E70, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9StateFall __vt__Q53scn4step5enemy11sisterbound9StateFall: .incbin "baserom.dol", 0x478A40, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x479A70, 0x10 @@ -3498,7 +3498,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9tsukikage12 __vt__Q53scn4step5enemy9tsukikage9StateFall: .incbin "baserom.dol", 0x479A80, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1 __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple11StateBound1$$4PQ43scn4step5enemy5Enemy$$4Ul$$4b$$1: .incbin "baserom.dol", 0x47AED8, 0x10 @@ -3506,7 +3506,7 @@ __vt__Q24util106StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy11whispyapp __vt__Q53scn4step5enemy11whispyapple9StateFall: .incbin "baserom.dol", 0x47AEE8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13StatePlancher$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487D20, 0x10 @@ -3514,7 +3514,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common13Stat __vt__Q53scn4step4hero6common9StateFall: .incbin "baserom.dol", 0x487D30, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util154StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone12StateLanding$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .incbin "baserom.dol", 0x489B18, 0x10 @@ -3525,12 +3525,12 @@ __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5stone8StateE __vt__Q53scn4step4hero5stone9StateFall: .incbin "baserom.dol", 0x489B38, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state9StateFall __vt__Q53scn4step4item5state9StateFall: .incbin "baserom.dol", 0x48E690, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255720 $$255720: .incbin "baserom.dol", 0x49B150, 0x4 @@ -3544,7 +3544,7 @@ $$255722: $$255723: .incbin "baserom.dol", 0x49B15C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255749 $$255749: .incbin "baserom.dol", 0x49BDE0, 0x4 @@ -3558,12 +3558,12 @@ $$255751: $$255752: .incbin "baserom.dol", 0x49BDEC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255807 $$255807: .incbin "baserom.dol", 0x49C658, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256323 $$256323: .incbin "baserom.dol", 0x49C8C8, 0x4 @@ -3574,7 +3574,7 @@ $$256331: $$256361: .incbin "baserom.dol", 0x49C8D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256052 $$256052: .incbin "baserom.dol", 0x49C9B0, 0x4 @@ -3585,7 +3585,7 @@ $$256053: $$256054: .incbin "baserom.dol", 0x49C9B8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255891 $$255891: .incbin "baserom.dol", 0x49CA00, 0x4 @@ -3596,7 +3596,7 @@ $$255892: $$255893: .incbin "baserom.dol", 0x49CA08, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256789 $$256789: .incbin "baserom.dol", 0x49CB38, 0x4 @@ -3604,7 +3604,7 @@ $$256789: $$256790: .incbin "baserom.dol", 0x49CB3C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255784 $$255784: .incbin "baserom.dol", 0x49CD20, 0x4 @@ -3612,7 +3612,7 @@ $$255784: $$255785: .incbin "baserom.dol", 0x49CD24, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255783 $$255783: .incbin "baserom.dol", 0x49CE20, 0x4 @@ -3620,17 +3620,17 @@ $$255783: $$255796: .incbin "baserom.dol", 0x49CE24, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256780 $$256780: .incbin "baserom.dol", 0x49D0C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257716 $$257716: .incbin "baserom.dol", 0x49DB80, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255828 $$255828: .incbin "baserom.dol", 0x49E5D0, 0x4 diff --git a/asm/src/StateFallEnemy.s b/asm/src/StateFallEnemy.s index 7ae68854..e2cabcb8 100644 --- a/asm/src/StateFallEnemy.s +++ b/asm/src/StateFallEnemy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy14StateFallEnemyFPQ43scn4step4boss4BossQ53scn4step4boss6whispy10ScriptKindUl __ct__Q53scn4step4boss6whispy14StateFallEnemyFPQ43scn4step4boss4BossQ53scn4step4boss6whispy10ScriptKindUl: /* 8025D49C 002592DC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -238,7 +238,7 @@ lbl_8025D7B0: /* 8025D7BC 002595FC 38 21 00 30 */ addi r1, r1, 0x30 /* 8025D7C0 00259600 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy14StateFallEnemy __vt__Q53scn4step4boss6whispy14StateFallEnemy: .incbin "baserom.dol", 0x4666E8, 0x20 diff --git a/asm/src/StateFallFeathery.s b/asm/src/StateFallFeathery.s index a203fb2e..5273bbaf 100644 --- a/asm/src/StateFallFeathery.s +++ b/asm/src/StateFallFeathery.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state17StateFallFeatheryFPQ43scn4step4item4Item __ct__Q53scn4step4item5state17StateFallFeatheryFPQ43scn4step4item4Item: /* 803C7B70 003C39B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -137,7 +137,7 @@ lbl_803C7D34: /* 803C7D40 003C3B80 38 21 00 10 */ addi r1, r1, 0x10 /* 803C7D44 003C3B84 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state17StateFallFeathery __vt__Q53scn4step4item5state17StateFallFeathery: .incbin "baserom.dol", 0x48E6A8, 0x18 diff --git a/asm/src/StateFallNoDecel.s b/asm/src/StateFallNoDecel.s index b88d2f54..d6ed098f 100644 --- a/asm/src/StateFallNoDecel.s +++ b/asm/src/StateFallNoDecel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common16StateFallNoDecelFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common16StateFallNoDecelFPQ43scn4step5enemy5Enemy: /* 80291C78 0028DAB8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -66,12 +66,12 @@ procMove__Q53scn4step5enemy6common16StateFallNoDecelFv: procFixPos__Q53scn4step5enemy6common16StateFallNoDecelFv: /* 80291D3C 0028DB7C 4B FF FE 68 */ b procFixPos__Q53scn4step5enemy6common9StateFallFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common16StateFallNoDecel __vt__Q53scn4step5enemy6common16StateFallNoDecel: .incbin "baserom.dol", 0x46F138, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255747 $$255747: .incbin "baserom.dol", 0x49BB10, 0x4 diff --git a/asm/src/StateFallScrewStart.s b/asm/src/StateFallScrewStart.s index fc637709..280b8275 100644 --- a/asm/src/StateFallScrewStart.s +++ b/asm/src/StateFallScrewStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone19StateFallScrewStartFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context __ct__Q53scn4step4hero5stone19StateFallScrewStartFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context: /* 803907B0 0038C5F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -194,7 +194,7 @@ procMove__Q53scn4step4hero5stone19StateFallScrewStartFv: procFixPos__Q53scn4step4hero5stone19StateFallScrewStartFv: /* 80390A58 0038C898 4B FC FE 28 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone19StateFallScrewStart __vt__Q53scn4step4hero5stone19StateFallScrewStart: .incbin "baserom.dol", 0x489B60, 0x28 diff --git a/asm/src/StateFattyBufferAppearFall.s b/asm/src/StateFattyBufferAppearFall.s index 7156f9f7..3af2ef53 100644 --- a/asm/src/StateFattyBufferAppearFall.s +++ b/asm/src/StateFattyBufferAppearFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFPQ43scn4step5enemy5Enemy: /* 8029A740 00296580 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -183,12 +183,12 @@ procMove__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv: procFixPos__Q53scn4step5enemy7blipper26StateFattyBufferAppearFallFv: /* 8029A9D4 00296814 4B FF 71 D0 */ b procFixPos__Q53scn4step5enemy6common9StateFallFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFall __vt__Q53scn4step5enemy7blipper26StateFattyBufferAppearFall: .incbin "baserom.dol", 0x46FFA0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256135 $$256135: .incbin "baserom.dol", 0x49BDF0, 0x8 diff --git a/asm/src/StateFattyBufferEscapeNear.s b/asm/src/StateFattyBufferEscapeNear.s index 3ea8b986..da682c99 100644 --- a/asm/src/StateFattyBufferEscapeNear.s +++ b/asm/src/StateFattyBufferEscapeNear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFPQ43scn4step5enemy5Enemy: /* 8029A9D8 00296818 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -116,12 +116,12 @@ lbl_8029AB48: __dt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNearFv: /* 8029AB60 002969A0 4B FF 6E 58 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear __vt__Q53scn4step5enemy7blipper26StateFattyBufferEscapeNear: .incbin "baserom.dol", 0x46FFC0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256586 $$256586: .incbin "baserom.dol", 0x49BDF8, 0x8 diff --git a/asm/src/StateFinalCutterDrop.s b/asm/src/StateFinalCutterDrop.s index ea446a58..a3454490 100644 --- a/asm/src/StateFinalCutterDrop.s +++ b/asm/src/StateFinalCutterDrop.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5smash20StateFinalCutterDropFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5smash20StateFinalCutterDropFPQ43scn4step4hero4Hero: /* 803A0FA0 0039CDE0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -268,7 +268,7 @@ create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23St __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A1364 0039D1A4 4B E8 D3 3C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash23StateFinalCutterLanding$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48AE40, 0x10 diff --git a/asm/src/StateFinalCutterLanding.s b/asm/src/StateFinalCutterLanding.s index 3031f3d4..4918c94b 100644 --- a/asm/src/StateFinalCutterLanding.s +++ b/asm/src/StateFinalCutterLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5smash23StateFinalCutterLandingFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5smash23StateFinalCutterLandingFPQ43scn4step4hero4Hero: /* 803A1368 0039D1A8 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -222,12 +222,12 @@ procMove__Q53scn4step4hero5smash23StateFinalCutterLandingFv: procFixPos__Q53scn4step4hero5smash23StateFinalCutterLandingFv: /* 803A1690 0039D4D0 4B FE 57 BC */ b procFixPos__Q53scn4step4hero5sword22StateSwordAttackFinishFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5smash23StateFinalCutterLanding __vt__Q53scn4step4hero5smash23StateFinalCutterLanding: .incbin "baserom.dol", 0x48AE78, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259013 $$259013: .incbin "baserom.dol", 0x49E358, 0x4 diff --git a/asm/src/StateFinalCutterPre.s b/asm/src/StateFinalCutterPre.s index 8f0abd13..8bded607 100644 --- a/asm/src/StateFinalCutterPre.s +++ b/asm/src/StateFinalCutterPre.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5smash19StateFinalCutterPreFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5smash19StateFinalCutterPreFPQ43scn4step4hero4Hero: /* 803A1694 0039D4D4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -197,7 +197,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash19State __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A1914 0039D754 4B E8 CD 8C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterRise$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48AEA0, 0x10 diff --git a/asm/src/StateFinalCutterRise.s b/asm/src/StateFinalCutterRise.s index dd1f6e05..12b5eb4a 100644 --- a/asm/src/StateFinalCutterRise.s +++ b/asm/src/StateFinalCutterRise.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5smash20StateFinalCutterRiseFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5smash20StateFinalCutterRiseFPQ43scn4step4hero4Hero: /* 803A1918 0039D758 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -259,7 +259,7 @@ create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20St __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A1CB0 0039DAF0 4B E8 C9 F0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20StateFinalCutterDrop$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48AEE8, 0x10 @@ -267,7 +267,7 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20Stat __vt__Q53scn4step4hero5smash20StateFinalCutterRise: .incbin "baserom.dol", 0x48AEF8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257541 $$257541: .incbin "baserom.dol", 0x49E368, 0x8 diff --git a/asm/src/StateFireBlock.s b/asm/src/StateFireBlock.s index ccaa6015..c73d3df4 100644 --- a/asm/src/StateFireBlock.s +++ b/asm/src/StateFireBlock.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage14StateFireBlockFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage14StateFireBlockFPQ43scn4step4hero4Hero: /* 80376020 00371E60 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -421,12 +421,12 @@ lbl_8037662C: /* 8037663C 0037247C 38 21 00 70 */ addi r1, r1, 0x70 /* 80376640 00372480 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage14StateFireBlock __vt__Q53scn4step4hero6damage14StateFireBlock: .incbin "baserom.dol", 0x488768, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257204 $$257204: .incbin "baserom.dol", 0x49DE10, 0x4 diff --git a/asm/src/StateFireLv2.s b/asm/src/StateFireLv2.s index 78df458e..32ed0bf6 100644 --- a/asm/src/StateFireLv2.s +++ b/asm/src/StateFireLv2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage12StateFireLv2FPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage12StateFireLv2FPQ43scn4step4hero4Hero: /* 80376644 00372484 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -331,12 +331,12 @@ lbl_80376AEC: /* 80376AFC 0037293C 38 21 00 40 */ addi r1, r1, 0x40 /* 80376B00 00372940 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage12StateFireLv2 __vt__Q53scn4step4hero6damage12StateFireLv2: .incbin "baserom.dol", 0x488790, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256845 $$256845: .incbin "baserom.dol", 0x49DE40, 0x4 diff --git a/asm/src/StateFireLv3.s b/asm/src/StateFireLv3.s index b5dd2141..16219250 100644 --- a/asm/src/StateFireLv3.s +++ b/asm/src/StateFireLv3.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage12StateFireLv3FPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage12StateFireLv3FPQ43scn4step4hero4Hero: /* 80376B04 00372944 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -336,12 +336,12 @@ lbl_80376FBC: /* 80376FCC 00372E0C 38 21 00 70 */ addi r1, r1, 0x70 /* 80376FD0 00372E10 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage12StateFireLv3 __vt__Q53scn4step4hero6damage12StateFireLv3: .incbin "baserom.dol", 0x4887B8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257010 $$257010: .incbin "baserom.dol", 0x49DE58, 0x4 diff --git a/asm/src/StateFirst.s b/asm/src/StateFirst.s index 279f5fe5..ef92df05 100644 --- a/asm/src/StateFirst.s +++ b/asm/src/StateFirst.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy10StateFirstFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy10StateFirstFPQ43scn4step4boss4Boss: /* 8025D7C4 00259604 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -124,7 +124,7 @@ create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11St __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025D954 00259794 4B FD 0D 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateAppear$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x466708, 0x10 diff --git a/asm/src/StateFirstDemo.s b/asm/src/StateFirstDemo.s index 82b39fce..37aaca0a 100644 --- a/asm/src/StateFirstDemo.s +++ b/asm/src/StateFirstDemo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick14StateFirstDemoFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7gimmick14StateFirstDemoFPQ43scn4step4hero4Hero: /* 8037F558 0037B398 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -351,12 +351,12 @@ lbl_8037FA2C: /* 8037FA4C 0037B88C 38 21 00 10 */ addi r1, r1, 0x10 /* 8037FA50 0037B890 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick14StateFirstDemo __vt__Q53scn4step4hero7gimmick14StateFirstDemo: .incbin "baserom.dol", 0x488B88, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260642 $$260642: .incbin "baserom.dol", 0x49DF80, 0x8 diff --git a/asm/src/StateFirstMotion.s b/asm/src/StateFirstMotion.s index 5cc7dac7..bc1f6c42 100644 --- a/asm/src/StateFirstMotion.s +++ b/asm/src/StateFirstMotion.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7fighter16StateFirstMotionFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7fighter16StateFirstMotionFPQ43scn4step4hero4Hero: /* 8039CAB8 003988F8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -486,7 +486,7 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter11Sta __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1Fv: /* 8039D150 00398F90 4B E9 15 50 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateMoonSault$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A4B0, 0x10 diff --git a/asm/src/StateFirstMotionDash.s b/asm/src/StateFirstMotionDash.s index cbbd986e..7758b6e5 100644 --- a/asm/src/StateFirstMotionDash.s +++ b/asm/src/StateFirstMotionDash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7fighter20StateFirstMotionDashFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7fighter20StateFirstMotionDashFPQ43scn4step4hero4Hero: /* 8039D154 00398F94 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -276,7 +276,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13Sta __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1Fv: /* 8039D4D4 00399314 4B E9 11 CC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateFootSweep$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A508, 0x10 diff --git a/asm/src/StateFixed.s b/asm/src/StateFixed.s index a9a75163..bbadbaec 100644 --- a/asm/src/StateFixed.s +++ b/asm/src/StateFixed.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state10StateFixedFPQ43scn4step4item4Item __ct__Q53scn4step4item5state10StateFixedFPQ43scn4step4item4Item: /* 803C7D48 003C3B88 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -60,7 +60,7 @@ lbl_803C7DF4: __dt__Q53scn4step4item5state10StateFixedFv: /* 803C7E08 003C3C48 4B FF F6 00 */ b __dt__Q53scn4step4item5state13StateApproachFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state10StateFixed __vt__Q53scn4step4item5state10StateFixed: .incbin "baserom.dol", 0x48E6C0, 0x18 diff --git a/asm/src/StateFlight.s b/asm/src/StateFlight.s index e0309a5a..3772ea2d 100644 --- a/asm/src/StateFlight.s +++ b/asm/src/StateFlight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4wing11StateFlightFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4wing11StateFlightFPQ43scn4step4hero4Hero: /* 803988DC 0039471C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -415,7 +415,7 @@ create__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11Stat __dt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1Fv: /* 80398EB8 00394CF8 4B E9 57 E8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util90StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing11StateFlight$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A0E8, 0x10 diff --git a/asm/src/StateFlightFar.s b/asm/src/StateFlightFar.s index 97df4629..d5c54fc9 100644 --- a/asm/src/StateFlightFar.s +++ b/asm/src/StateFlightFar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss9creditdee14StateFlightFarFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss9creditdee14StateFlightFarFPQ43scn4step4boss4Boss: /* 8024891C 0024475C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -409,7 +409,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee1 __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1Fv: /* 80248EE4 00244D24 4B FE 57 BC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14StateFlightFar$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462C10, 0x10 @@ -417,7 +417,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14S __vt__Q53scn4step4boss9creditdee14StateFlightFar: .incbin "baserom.dol", 0x462C20, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255678 $$255678: .incbin "baserom.dol", 0x49B1B8, 0x4 diff --git a/asm/src/StateFlush.s b/asm/src/StateFlush.s index 084cf5ca..a530432c 100644 --- a/asm/src/StateFlush.s +++ b/asm/src/StateFlush.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common10StateFlushFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common10StateFlushFPQ43scn4step5enemy5Enemy: /* 80291D40 0028DB80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -130,12 +130,12 @@ lbl_80291EF8: __dt__Q53scn4step5enemy6common10StateFlushFv: /* 80291F10 0028DD50 4B FF FA A8 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common10StateFlush __vt__Q53scn4step5enemy6common10StateFlush: .incbin "baserom.dol", 0x46F158, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254965 $$254965: .incbin "baserom.dol", 0x49BB20, 0x8 diff --git a/asm/src/StateFlushWait.s b/asm/src/StateFlushWait.s index 284501dc..388328ad 100644 --- a/asm/src/StateFlushWait.s +++ b/asm/src/StateFlushWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common14StateFlushWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common14StateFlushWaitFPQ43scn4step5enemy5Enemy: /* 80291F14 0028DD54 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ __dt__Q53scn4step5enemy6common14StateFlushWaitFv: __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80292074 0028DEB4 4B F9 C6 2C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10StateFlush$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46F178, 0x10 @@ -116,7 +116,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common10Sta __vt__Q53scn4step5enemy6common14StateFlushWait: .incbin "baserom.dol", 0x46F188, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255730 $$255730: .incbin "baserom.dol", 0x49BB30, 0x4 diff --git a/asm/src/StateFly.s b/asm/src/StateFly.s index f97c27a9..28a7a500 100644 --- a/asm/src/StateFly.s +++ b/asm/src/StateFly.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster8StateFlyFPQ43scn4step4boss4BossQ63scn4step4boss15challengemaster8StateFly12TurnWaitType __ct__Q53scn4step4boss15challengemaster8StateFlyFPQ43scn4step4boss4BossQ63scn4step4boss15challengemaster8StateFly12TurnWaitType: /* 8023FEA0 0023BCE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -247,7 +247,7 @@ lbl_802401D4: /* 802401E4 0023C024 38 21 00 20 */ addi r1, r1, 0x20 /* 802401E8 0023C028 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common8StateFlyFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common8StateFlyFPQ43scn4step5enemy5Enemy: /* 80292078 0028DEB8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -364,7 +364,7 @@ lbl_802921E8: procFixPos__Q53scn4step5enemy6common8StateFlyFv: /* 80292200 0028E040 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt8StateFlyFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt8StateFlyFPQ43scn4step5enemy5Enemy: /* 8029F4F0 0029B330 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -611,7 +611,7 @@ lbl_8029F838: __dt__Q53scn4step5enemy10brontoburt8StateFlyFv: /* 8029F86C 0029B6AC 4B FF 21 4C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8cerulean8StateFlyFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8cerulean8StateFlyFPQ43scn4step5enemy5Enemy: /* 802A5668 002A14A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1044,7 +1044,7 @@ lbl_802A5C44: /* 802A5C74 002A1AB4 38 21 00 40 */ addi r1, r1, 0x40 /* 802A5C78 002A1AB8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6degout8StateFlyFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6degout8StateFlyFPQ43scn4step5enemy5Enemy: /* 802ADA58 002A9898 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1111,7 +1111,7 @@ lbl_802ADB20: __dt__Q53scn4step5enemy6degout8StateFlyFv: /* 802ADB34 002A9974 4B FE 3E 84 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8dubiorjr8StateFlyFPQ43scn4step5enemy5Enemyf __ct__Q53scn4step5enemy8dubiorjr8StateFlyFPQ43scn4step5enemy5Enemyf: /* 802AE5E4 002AA424 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1196,7 +1196,7 @@ procMove__Q53scn4step5enemy8dubiorjr8StateFlyFv: procFixPos__Q53scn4step5enemy8dubiorjr8StateFlyFv: /* 802AE6F4 002AA534 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gemra8StateFlyFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gemra8StateFlyFPQ43scn4step5enemy5Enemy: /* 802B643C 002B227C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1345,7 +1345,7 @@ procFixPos__Q53scn4step5enemy5gemra8StateFlyFv: /* 802B661C 002B245C 38 21 00 10 */ addi r1, r1, 0x10 /* 802B6620 002B2460 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8searches8StateFlyFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8searches8StateFlyFPQ43scn4step5enemy5Enemy: /* 802DC114 002D7F54 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1464,7 +1464,7 @@ __dt__Q53scn4step5enemy8searches8StateFlyFv: __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DC28C 002D80CC 4B F5 24 14 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory8StateFlyFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory8StateFlyFPQ43scn4step5enemy5Enemy: /* 802E6080 002E1EC0 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1622,42 +1622,42 @@ procFixPos__Q53scn4step5enemy6sodory8StateFlyFv: /* 802E62A8 002E20E8 38 21 00 10 */ addi r1, r1, 0x10 /* 802E62AC 002E20EC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster8StateFly __vt__Q53scn4step4boss15challengemaster8StateFly: .incbin "baserom.dol", 0x461E98, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common8StateFly __vt__Q53scn4step5enemy6common8StateFly: .incbin "baserom.dol", 0x46F1A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt8StateFly __vt__Q53scn4step5enemy10brontoburt8StateFly: .incbin "baserom.dol", 0x470B88, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8cerulean8StateFly __vt__Q53scn4step5enemy8cerulean8StateFly: .incbin "baserom.dol", 0x4716B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6degout8StateFly __vt__Q53scn4step5enemy6degout8StateFly: .incbin "baserom.dol", 0x472180, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr8StateFly __vt__Q53scn4step5enemy8dubiorjr8StateFly: .incbin "baserom.dol", 0x472428, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gemra8StateFly __vt__Q53scn4step5enemy5gemra8StateFly: .incbin "baserom.dol", 0x473218, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477980, 0x10 @@ -1665,17 +1665,17 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8searches11S __vt__Q53scn4step5enemy8searches8StateFly: .incbin "baserom.dol", 0x477990, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory8StateFly __vt__Q53scn4step5enemy6sodory8StateFly: .incbin "baserom.dol", 0x478FF8, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255233 $$255233: .incbin "baserom.dol", 0x4953E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255684 $$255684: .incbin "baserom.dol", 0x49BB40, 0x4 @@ -1683,7 +1683,7 @@ $$255684: $$255685: .incbin "baserom.dol", 0x49BB44, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255869 $$255869: .incbin "baserom.dol", 0x49BED8, 0x4 @@ -1694,12 +1694,12 @@ $$255884: $$255885: .incbin "baserom.dol", 0x49BEE0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256042 $$256042: .incbin "baserom.dol", 0x49C068, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255787 $$255787: .incbin "baserom.dol", 0x49CEC8, 0x4 diff --git a/asm/src/StateFlyAround.s b/asm/src/StateFlyAround.s index 33fc5f72..3c45ecb9 100644 --- a/asm/src/StateFlyAround.s +++ b/asm/src/StateFlyAround.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6pierce14StateFlyAroundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6pierce14StateFlyAroundFPQ43scn4step5enemy5Enemy: /* 802CFC24 002CBA64 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -571,7 +571,7 @@ lbl_802D03E0: /* 802D03FC 002CC23C 38 21 00 20 */ addi r1, r1, 0x20 /* 802D0400 002CC240 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5snowl14StateFlyAroundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5snowl14StateFlyAroundFPQ43scn4step5enemy5Enemy: /* 802E3928 002DF768 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -954,17 +954,17 @@ lbl_802E3E80: /* 802E3E90 002DFCD0 38 21 00 50 */ addi r1, r1, 0x50 /* 802E3E94 002DFCD4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce14StateFlyAround __vt__Q53scn4step5enemy6pierce14StateFlyAround: .incbin "baserom.dol", 0x476630, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl14StateFlyAround __vt__Q53scn4step5enemy5snowl14StateFlyAround: .incbin "baserom.dol", 0x478C20, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256372 $$256372: .incbin "baserom.dol", 0x49CA48, 0x4 @@ -984,7 +984,7 @@ $$256460: $$256461: .incbin "baserom.dol", 0x49CA5C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256260 $$256260: .incbin "baserom.dol", 0x49CE40, 0x4 diff --git a/asm/src/StateFlyAway.s b/asm/src/StateFlyAway.s index de570e47..2a3bc315 100644 --- a/asm/src/StateFlyAway.s +++ b/asm/src/StateFlyAway.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss10creditroah12StateFlyAwayFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss10creditroah12StateFlyAwayFPQ43scn4step4boss4Boss: /* 8024BA70 002478B0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -348,7 +348,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroa __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1Fv: /* 8024BF58 00247D98 4B FE 27 48 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateFlyAway$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4632B8, 0x10 @@ -356,7 +356,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah1 __vt__Q53scn4step4boss10creditroah12StateFlyAway: .incbin "baserom.dol", 0x4632C8, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255018 $$255018: .incbin "baserom.dol", 0x495550, 0x4 @@ -370,7 +370,7 @@ $$255020: $$255071: .incbin "baserom.dol", 0x49555C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255489 $$255489: .incbin "baserom.dol", 0x49B250, 0x4 diff --git a/asm/src/StateFlyFarSinCurve.s b/asm/src/StateFlyFarSinCurve.s index c8aac811..db4943b1 100644 --- a/asm/src/StateFlyFarSinCurve.s +++ b/asm/src/StateFlyFarSinCurve.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFPQ43scn4step5enemy5Enemy: /* 8029F870 0029B6B0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -148,12 +148,12 @@ lbl_8029FA08: procFixPos__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurveFv: /* 8029FA78 0029B8B8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve __vt__Q53scn4step5enemy10brontoburt19StateFlyFarSinCurve: .incbin "baserom.dol", 0x470BA8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256604 $$256604: .incbin "baserom.dol", 0x49BEE8, 0x4 diff --git a/asm/src/StateFlyPursuit.s b/asm/src/StateFlyPursuit.s index 02f53b94..755671c6 100644 --- a/asm/src/StateFlyPursuit.s +++ b/asm/src/StateFlyPursuit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6pierce15StateFlyPursuitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6pierce15StateFlyPursuitFPQ43scn4step5enemy5Enemy: /* 802D0404 002CC244 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -488,12 +488,12 @@ lbl_802D0AEC: /* 802D0AFC 002CC93C 38 21 00 10 */ addi r1, r1, 0x10 /* 802D0B00 002CC940 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce15StateFlyPursuit __vt__Q53scn4step5enemy6pierce15StateFlyPursuit: .incbin "baserom.dol", 0x476650, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256306 $$256306: .incbin "baserom.dol", 0x49CA60, 0x4 diff --git a/asm/src/StateFlySinCurve.s b/asm/src/StateFlySinCurve.s index 782b1fbc..94f84eb3 100644 --- a/asm/src/StateFlySinCurve.s +++ b/asm/src/StateFlySinCurve.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common16StateFlySinCurveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common16StateFlySinCurveFPQ43scn4step5enemy5Enemy: /* 80292204 0028E044 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -272,7 +272,7 @@ lbl_802925C4: /* 802925D0 0028E410 38 21 00 C0 */ addi r1, r1, 0xc0 /* 802925D4 0028E414 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6pierce16StateFlySinCurveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6pierce16StateFlySinCurveFPQ43scn4step5enemy5Enemy: /* 802D0B04 002CC944 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -609,17 +609,17 @@ lbl_802D0F9C: /* 802D0FA8 002CCDE8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 802D0FAC 002CCDEC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common16StateFlySinCurve __vt__Q53scn4step5enemy6common16StateFlySinCurve: .incbin "baserom.dol", 0x46F1C8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce16StateFlySinCurve __vt__Q53scn4step5enemy6pierce16StateFlySinCurve: .incbin "baserom.dol", 0x476670, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255895 $$255895: .incbin "baserom.dol", 0x49BB48, 0x4 @@ -660,7 +660,7 @@ $$255941: $$255942: .incbin "baserom.dol", 0x49BB78, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256166 $$256166: .incbin "baserom.dol", 0x49CA70, 0x4 diff --git a/asm/src/StateFlyStraight.s b/asm/src/StateFlyStraight.s index 57e9c419..6a9db767 100644 --- a/asm/src/StateFlyStraight.s +++ b/asm/src/StateFlyStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6owgulf16StateFlyStraightFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6owgulf16StateFlyStraightFPQ43scn4step5enemy5Enemy: /* 802CA72C 002C656C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -149,7 +149,7 @@ lbl_802CA924: __dt__Q53scn4step5enemy6owgulf16StateFlyStraightFv: /* 802CA93C 002C677C 4B FC 70 7C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5snowl16StateFlyStraightFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5snowl16StateFlyStraightFPQ43scn4step5enemy5Enemy: /* 802E3E98 002DFCD8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -456,17 +456,17 @@ lbl_802E42D4: /* 802E42E4 002E0124 38 21 00 50 */ addi r1, r1, 0x50 /* 802E42E8 002E0128 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf16StateFlyStraight __vt__Q53scn4step5enemy6owgulf16StateFlyStraight: .incbin "baserom.dol", 0x475E58, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5snowl16StateFlyStraight __vt__Q53scn4step5enemy5snowl16StateFlyStraight: .incbin "baserom.dol", 0x478C40, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255722 $$255722: .incbin "baserom.dol", 0x49C948, 0x4 @@ -477,7 +477,7 @@ $$255723: $$255739: .incbin "baserom.dol", 0x49C950, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256178 $$256178: .incbin "baserom.dol", 0x49CE50, 0x4 diff --git a/asm/src/StateFlyUpDown.s b/asm/src/StateFlyUpDown.s index 03e5f0b4..6d474334 100644 --- a/asm/src/StateFlyUpDown.s +++ b/asm/src/StateFlyUpDown.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common14StateFlyUpDownFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common14StateFlyUpDownFPQ43scn4step5enemy5Enemy: /* 802925D8 0028E418 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -160,7 +160,7 @@ lbl_802927EC: /* 80292804 0028E644 38 21 00 90 */ addi r1, r1, 0x90 /* 80292808 0028E648 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy14StateFlyUpDownFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy14StateFlyUpDownFPQ43scn4step5enemy5Enemy: /* 802DB178 002D6FB8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -337,17 +337,17 @@ lbl_802DB3CC: /* 802DB3E8 002D7228 38 21 00 90 */ addi r1, r1, 0x90 /* 802DB3EC 002D722C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common14StateFlyUpDown __vt__Q53scn4step5enemy6common14StateFlyUpDown: .incbin "baserom.dol", 0x46F1E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy14StateFlyUpDown __vt__Q53scn4step5enemy6scarfy14StateFlyUpDown: .incbin "baserom.dol", 0x477778, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255699 $$255699: .incbin "baserom.dol", 0x49BB80, 0x4 @@ -367,7 +367,7 @@ $$255727: $$255728: .incbin "baserom.dol", 0x49BB94, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255730 $$255730: .incbin "baserom.dol", 0x49CC78, 0x4 diff --git a/asm/src/StateFlyWait.s b/asm/src/StateFlyWait.s index e1ee2afc..d7ebbbd8 100644 --- a/asm/src/StateFlyWait.s +++ b/asm/src/StateFlyWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6pierce12StateFlyWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6pierce12StateFlyWaitFPQ43scn4step5enemy5Enemy: /* 802D0FB0 002CCDF0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -164,7 +164,7 @@ procMove__Q53scn4step5enemy6pierce12StateFlyWaitFv: /* 802D11EC 002CD02C 38 21 00 20 */ addi r1, r1, 0x20 /* 802D11F0 002CD030 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6pierce12StateFlyWait __vt__Q53scn4step5enemy6pierce12StateFlyWait: .incbin "baserom.dol", 0x476690, 0x20 diff --git a/asm/src/StateFlyWaitFix.s b/asm/src/StateFlyWaitFix.s index 60052d41..7f2457f5 100644 --- a/asm/src/StateFlyWaitFix.s +++ b/asm/src/StateFlyWaitFix.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6owgulf15StateFlyWaitFixFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6owgulf15StateFlyWaitFixFPQ43scn4step5enemy5Enemy: /* 802CA940 002C6780 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -63,12 +63,12 @@ procMove__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv: __dt__Q53scn4step5enemy6owgulf15StateFlyWaitFixFv: /* 802CAA10 002C6850 4B FC 6F A8 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6owgulf15StateFlyWaitFix __vt__Q53scn4step5enemy6owgulf15StateFlyWaitFix: .incbin "baserom.dol", 0x475E78, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254812 $$254812: .incbin "baserom.dol", 0x49C958, 0x4 diff --git a/asm/src/StateFlyWall.s b/asm/src/StateFlyWall.s index f5ef9e31..72211a89 100644 --- a/asm/src/StateFlyWall.s +++ b/asm/src/StateFlyWall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster12StateFlyWallFPQ43scn4step4boss4BossQ53scn4step4boss15challengemaster9AvoidType __ct__Q53scn4step4boss15challengemaster12StateFlyWallFPQ43scn4step4boss4BossQ53scn4step4boss15challengemaster9AvoidType: /* 802401EC 0023C02C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -530,12 +530,12 @@ lbl_8024096C: /* 8024097C 0023C7BC 38 21 00 10 */ addi r1, r1, 0x10 /* 80240980 0023C7C0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster12StateFlyWall __vt__Q53scn4step4boss15challengemaster12StateFlyWall: .incbin "baserom.dol", 0x461EB8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255893 $$255893: .incbin "baserom.dol", 0x49B068, 0x4 diff --git a/asm/src/StateFlyWallStart.s b/asm/src/StateFlyWallStart.s index 1176ff8c..b31faa33 100644 --- a/asm/src/StateFlyWallStart.s +++ b/asm/src/StateFlyWallStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster17StateFlyWallStartFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster17StateFlyWallStartFPQ43scn4step4boss4Boss: /* 80240984 0023C7C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -255,7 +255,7 @@ __dt__Q24util152StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem __dt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1Fv: /* 80240CD4 0023CB14 4B FE D9 CC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1 __vt__Q24util147StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster12StateFlyWall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss15challengemaster9AvoidType$$1: .incbin "baserom.dol", 0x461ED8, 0x10 diff --git a/asm/src/StateFlyingOut.s b/asm/src/StateFlyingOut.s index 33d225a9..f89ec48b 100644 --- a/asm/src/StateFlyingOut.s +++ b/asm/src/StateFlyingOut.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper14StateFlyingOutFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper14StateFlyingOutFPQ43scn4step5enemy5Enemy: /* 8029AB64 002969A4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -202,12 +202,12 @@ lbl_8029AE18: __dt__Q53scn4step5enemy7blipper14StateFlyingOutFv: /* 8029AE30 00296C70 4B FF 6B 88 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper14StateFlyingOut __vt__Q53scn4step5enemy7blipper14StateFlyingOut: .incbin "baserom.dol", 0x46FFE0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255853 $$255853: .incbin "baserom.dol", 0x49BE00, 0x4 diff --git a/asm/src/StateFollow.s b/asm/src/StateFollow.s index 0c9edf2a..38fa9581 100644 --- a/asm/src/StateFollow.s +++ b/asm/src/StateFollow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6juckle11StateFollowFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6juckle11StateFollowFPQ43scn4step5enemy5Enemy: /* 802BBC78 002B7AB8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -356,12 +356,12 @@ roundAnger__Q53scn4step5enemy6juckle11StateFollowFf: __dt__Q53scn4step5enemy6juckle11StateFollowFv: /* 802BC18C 002B7FCC 4B FD 58 2C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6juckle11StateFollow __vt__Q53scn4step5enemy6juckle11StateFollow: .incbin "baserom.dol", 0x473E00, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255367 $$255367: .incbin "baserom.dol", 0x49C620, 0x4 diff --git a/asm/src/StateFootSweep.s b/asm/src/StateFootSweep.s index 3bb1512c..a4a4336f 100644 --- a/asm/src/StateFootSweep.s +++ b/asm/src/StateFootSweep.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter14StateFootSweepFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter14StateFootSweepFPQ43scn4step4hero4Hero: /* 8039D4D8 00399318 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -362,7 +362,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17S __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 8039D9F0 00399830 4B E9 0C B0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17StateFootSweepEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A560, 0x10 @@ -370,7 +370,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter17Sta __vt__Q53scn4step4hero7fighter14StateFootSweep: .incbin "baserom.dol", 0x48A570, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257336 $$257336: .incbin "baserom.dol", 0x49E2E8, 0x4 diff --git a/asm/src/StateFootSweepEnd.s b/asm/src/StateFootSweepEnd.s index bd6494ef..39ce0da2 100644 --- a/asm/src/StateFootSweepEnd.s +++ b/asm/src/StateFootSweepEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter17StateFootSweepEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter17StateFootSweepEndFPQ43scn4step4hero4Hero: /* 8039D9F4 00399834 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -81,7 +81,7 @@ procMove__Q53scn4step4hero7fighter17StateFootSweepEndFv: procFixPos__Q53scn4step4hero7fighter17StateFootSweepEndFv: /* 8039DAF0 00399930 4B FC 2D 90 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter17StateFootSweepEnd __vt__Q53scn4step4hero7fighter17StateFootSweepEnd: .incbin "baserom.dol", 0x48A598, 0x28 diff --git a/asm/src/StateGather.s b/asm/src/StateGather.s index 44ef59bc..b224b86b 100644 --- a/asm/src/StateGather.s +++ b/asm/src/StateGather.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state11StateGatherFPQ43scn4step4item4ItemRQ43scn4step4item7Catcher __ct__Q53scn4step4item5state11StateGatherFPQ43scn4step4item4ItemRQ43scn4step4item7Catcher: /* 803C7E0C 003C3C4C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -193,12 +193,12 @@ procMove__Q53scn4step4item5state11StateGatherFv: __dt__Q53scn4step4item5state11StateGatherFv: /* 803C80D4 003C3F14 4B FF F3 34 */ b __dt__Q53scn4step4item5state13StateApproachFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state11StateGather __vt__Q53scn4step4item5state11StateGather: .incbin "baserom.dol", 0x48E6D8, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255059 $$255059: .incbin "baserom.dol", 0x49E5D8, 0x4 diff --git a/asm/src/StateGetShipParts.s b/asm/src/StateGetShipParts.s index 1d147be9..3fe34f0e 100644 --- a/asm/src/StateGetShipParts.s +++ b/asm/src/StateGetShipParts.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick17StateGetShipPartsFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7gimmick17StateGetShipPartsFPQ43scn4step4hero4Hero: /* 8037FA54 0037B894 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -329,12 +329,12 @@ lbl_8037FF00: /* 8037FF08 0037BD48 38 21 00 10 */ addi r1, r1, 0x10 /* 8037FF0C 0037BD4C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick17StateGetShipParts __vt__Q53scn4step4hero7gimmick17StateGetShipParts: .incbin "baserom.dol", 0x488BB0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259720 $$259720: .incbin "baserom.dol", 0x49DF88, 0x4 diff --git a/asm/src/StateGlide.s b/asm/src/StateGlide.s index dea07571..3d15bcf4 100644 --- a/asm/src/StateGlide.s +++ b/asm/src/StateGlide.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss10creditmeta10StateGlideFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss10creditmeta10StateGlideFPQ43scn4step4boss4Boss: /* 80249E24 00245C64 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -446,7 +446,7 @@ create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmet __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1Fv: /* 8024A454 00246294 4B FE 42 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior10StateGlideFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior10StateGlideFPQ43scn4step4boss4Boss: /* 8024E5D0 0024A410 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -1067,7 +1067,7 @@ lbl_8024EEE4: /* 8024EF0C 0024AD4C 38 21 00 70 */ addi r1, r1, 0x70 /* 8024EF10 0024AD50 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1 __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta10StateGlide$$4PQ43scn4step4boss4Boss$$4b$$1: .incbin "baserom.dol", 0x462FD0, 0x10 @@ -1075,17 +1075,17 @@ __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss10creditmeta1 __vt__Q53scn4step4boss10creditmeta10StateGlide: .incbin "baserom.dol", 0x462FE0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior10StateGlide __vt__Q53scn4step4boss6dubior10StateGlide: .incbin "baserom.dol", 0x4638D0, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255202 $$255202: .incbin "baserom.dol", 0x495508, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255695 $$255695: .incbin "baserom.dol", 0x49B1D8, 0x4 @@ -1096,7 +1096,7 @@ $$255723: $$255738: .incbin "baserom.dol", 0x49B1E0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256745 $$256745: .incbin "baserom.dol", 0x49B298, 0x4 diff --git a/asm/src/StateGlideAway.s b/asm/src/StateGlideAway.s index 3425a788..ba73c415 100644 --- a/asm/src/StateGlideAway.s +++ b/asm/src/StateGlideAway.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss10creditmeta14StateGlideAwayFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss10creditmeta14StateGlideAwayFPQ43scn4step4boss4Boss: /* 8024A458 00246298 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -491,12 +491,12 @@ lbl_8024AB84: /* 8024ABA0 002469E0 38 21 00 C0 */ addi r1, r1, 0xc0 /* 8024ABA4 002469E4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditmeta14StateGlideAway __vt__Q53scn4step4boss10creditmeta14StateGlideAway: .incbin "baserom.dol", 0x463000, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256059 $$256059: .incbin "baserom.dol", 0x49B1E8, 0x4 diff --git a/asm/src/StateGoodbye.s b/asm/src/StateGoodbye.s index 015bf3bb..4b94b4d8 100644 --- a/asm/src/StateGoodbye.s +++ b/asm/src/StateGoodbye.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common12StateGoodbyeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common12StateGoodbyeFPQ43scn4step5enemy5Enemy: /* 8029280C 0028E64C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -147,7 +147,7 @@ procMove__Q53scn4step5enemy6common12StateGoodbyeFv: procFixPos__Q53scn4step5enemy6common12StateGoodbyeFv: /* 80292A00 0028E840 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256612 $$256612: .incbin "baserom.dol", 0x46F208, 0xD0 diff --git a/asm/src/StateGrandLowperAppear.s b/asm/src/StateGrandLowperAppear.s index a1fad2b7..e7a3cc20 100644 --- a/asm/src/StateGrandLowperAppear.s +++ b/asm/src/StateGrandLowperAppear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8armordee22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8armordee22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 80296708 00292548 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -176,7 +176,7 @@ lbl_80296960: /* 80296970 002927B0 38 21 00 40 */ addi r1, r1, 0x40 /* 80296974 002927B4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 80297B38 00293978 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -309,7 +309,7 @@ procMove__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv: procFixPos__Q53scn4step5enemy11bladeknight22StateGrandLowperAppearFv: /* 80297D00 00293B40 4B FF EB D4 */ b procFixPos__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 8029D2B8 002990F8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -478,7 +478,7 @@ lbl_8029D4FC: /* 8029D508 00299348 38 21 00 40 */ addi r1, r1, 0x40 /* 8029D50C 0029934C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 802A1320 0029D160 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -611,7 +611,7 @@ procMove__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv: procFixPos__Q53scn4step5enemy11broomhatter22StateGrandLowperAppearFv: /* 802A14E8 0029D328 4B FF 53 EC */ b procFixPos__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 802BD0D0 002B8F10 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -790,7 +790,7 @@ procMove__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv: procFixPos__Q53scn4step5enemy4kabu22StateGrandLowperAppearFv: /* 802BD348 002B9188 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 802C83AC 002C41EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -934,7 +934,7 @@ procMove__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv: procFixPos__Q53scn4step5enemy5nruff22StateGrandLowperAppearFv: /* 802C85A0 002C43E0 4B FC E3 34 */ b procFixPos__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 802DB3F0 002D7230 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1093,7 +1093,7 @@ procMove__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv: procFixPos__Q53scn4step5enemy6scarfy22StateGrandLowperAppearFv: /* 802DB618 002D7458 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 802DE75C 002DA59C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1226,7 +1226,7 @@ procMove__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv: procFixPos__Q53scn4step5enemy5sheld22StateGrandLowperAppearFv: /* 802DE924 002DA764 4B FB 7F B0 */ b procFixPos__Q53scn4step5enemy8armordee22StateGrandLowperAppearFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee22StateGrandLowperAppearFPQ43scn4step5enemy5Enemy: /* 802ED994 002E97D4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1434,47 +1434,47 @@ create__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddlede __dt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EDC64 002E9AA4 4B F4 0A 3C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8armordee22StateGrandLowperAppear __vt__Q53scn4step5enemy8armordee22StateGrandLowperAppear: .incbin "baserom.dol", 0x46F690, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppear __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperAppear: .incbin "baserom.dol", 0x46FB18, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy22StateGrandLowperAppear __vt__Q53scn4step5enemy6bouncy22StateGrandLowperAppear: .incbin "baserom.dol", 0x4704B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppear __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperAppear: .incbin "baserom.dol", 0x470FB8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu22StateGrandLowperAppear __vt__Q53scn4step5enemy4kabu22StateGrandLowperAppear: .incbin "baserom.dol", 0x474268, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff22StateGrandLowperAppear __vt__Q53scn4step5enemy5nruff22StateGrandLowperAppear: .incbin "baserom.dol", 0x475A78, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy22StateGrandLowperAppear __vt__Q53scn4step5enemy6scarfy22StateGrandLowperAppear: .incbin "baserom.dol", 0x477798, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld22StateGrandLowperAppear __vt__Q53scn4step5enemy5sheld22StateGrandLowperAppear: .incbin "baserom.dol", 0x477E90, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee23StateGrandLowperLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47A2C8, 0x10 @@ -1482,7 +1482,7 @@ __vt__Q24util110StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee2 __vt__Q53scn4step5enemy9waddledee22StateGrandLowperAppear: .incbin "baserom.dol", 0x47A2D8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256597 $$256597: .incbin "baserom.dol", 0x49BCE0, 0x4 @@ -1502,7 +1502,7 @@ $$256601: $$256602: .incbin "baserom.dol", 0x49BCF4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256597 $$256597: .incbin "baserom.dol", 0x49BD48, 0x4 @@ -1522,7 +1522,7 @@ $$256601: $$256602: .incbin "baserom.dol", 0x49BD5C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256493 $$256493: .incbin "baserom.dol", 0x49BE70, 0x4 @@ -1536,7 +1536,7 @@ $$256495: $$256496: .incbin "baserom.dol", 0x49BE7C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256597 $$256597: .incbin "baserom.dol", 0x49BF60, 0x4 @@ -1556,7 +1556,7 @@ $$256601: $$256602: .incbin "baserom.dol", 0x49BF74, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256576 $$256576: .incbin "baserom.dol", 0x49C660, 0x4 @@ -1573,7 +1573,7 @@ $$256595: $$256596: .incbin "baserom.dol", 0x49C670, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256611 $$256611: .incbin "baserom.dol", 0x49C8D8, 0x4 @@ -1593,7 +1593,7 @@ $$256615: $$256616: .incbin "baserom.dol", 0x49C8EC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256585 $$256585: .incbin "baserom.dol", 0x49CC88, 0x4 @@ -1613,7 +1613,7 @@ $$256589: $$256590: .incbin "baserom.dol", 0x49CC9C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256599 $$256599: .incbin "baserom.dol", 0x49CD28, 0x4 @@ -1633,7 +1633,7 @@ $$256603: $$256604: .incbin "baserom.dol", 0x49CD3C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256588 $$256588: .incbin "baserom.dol", 0x49CFF8, 0x4 diff --git a/asm/src/StateGrandLowperEscape.s b/asm/src/StateGrandLowperEscape.s index 01f25920..245a3d18 100644 --- a/asm/src/StateGrandLowperEscape.s +++ b/asm/src/StateGrandLowperEscape.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy: /* 80297D04 00293B44 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -160,7 +160,7 @@ lbl_80297F24: /* 80297F34 00293D74 38 21 00 20 */ addi r1, r1, 0x20 /* 80297F38 00293D78 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy: /* 8029D510 00299350 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -325,7 +325,7 @@ lbl_8029D744: /* 8029D754 00299594 38 21 00 20 */ addi r1, r1, 0x20 /* 8029D758 00299598 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy: /* 802A14EC 0029D32C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -485,7 +485,7 @@ lbl_802A170C: /* 802A171C 0029D55C 38 21 00 20 */ addi r1, r1, 0x20 /* 802A1720 0029D560 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy: /* 802BD34C 002B918C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -645,7 +645,7 @@ lbl_802BD56C: /* 802BD57C 002B93BC 38 21 00 20 */ addi r1, r1, 0x20 /* 802BD580 002B93C0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy: /* 802C85A4 002C43E4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -805,7 +805,7 @@ lbl_802C87C4: /* 802C87D4 002C4614 38 21 00 20 */ addi r1, r1, 0x20 /* 802C87D8 002C4618 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy: /* 802DE928 002DA768 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -965,7 +965,7 @@ lbl_802DEB48: /* 802DEB58 002DA998 38 21 00 20 */ addi r1, r1, 0x20 /* 802DEB5C 002DA99C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee22StateGrandLowperEscapeFPQ43scn4step5enemy5Enemy: /* 802EDC68 002E9AA8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1125,37 +1125,37 @@ lbl_802EDE88: /* 802EDE98 002E9CD8 38 21 00 20 */ addi r1, r1, 0x20 /* 802EDE9C 002E9CDC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscape __vt__Q53scn4step5enemy11bladeknight22StateGrandLowperEscape: .incbin "baserom.dol", 0x46FB38, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy22StateGrandLowperEscape __vt__Q53scn4step5enemy6bouncy22StateGrandLowperEscape: .incbin "baserom.dol", 0x4704D8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscape __vt__Q53scn4step5enemy11broomhatter22StateGrandLowperEscape: .incbin "baserom.dol", 0x470FD8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu22StateGrandLowperEscape __vt__Q53scn4step5enemy4kabu22StateGrandLowperEscape: .incbin "baserom.dol", 0x474288, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff22StateGrandLowperEscape __vt__Q53scn4step5enemy5nruff22StateGrandLowperEscape: .incbin "baserom.dol", 0x475A98, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld22StateGrandLowperEscape __vt__Q53scn4step5enemy5sheld22StateGrandLowperEscape: .incbin "baserom.dol", 0x477EB0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee22StateGrandLowperEscape __vt__Q53scn4step5enemy9waddledee22StateGrandLowperEscape: .incbin "baserom.dol", 0x47A2F8, 0x20 diff --git a/asm/src/StateGrandLowperEscapeStart.s b/asm/src/StateGrandLowperEscapeStart.s index cc8390d4..172000c8 100644 --- a/asm/src/StateGrandLowperEscapeStart.s +++ b/asm/src/StateGrandLowperEscapeStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy: /* 80297F3C 00293D7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -101,7 +101,7 @@ create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladekn __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029806C 00293EAC 4B F9 66 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy: /* 8029D75C 0029959C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -202,7 +202,7 @@ create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22 __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029D88C 002996CC 4B F9 0E 14 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy: /* 802A1724 0029D564 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -303,7 +303,7 @@ create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomha __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A1854 0029D694 4B F8 CE 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy: /* 802BD584 002B93C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -404,7 +404,7 @@ create__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22St __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802BD6B4 002B94F4 4B F7 0F EC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy: /* 802C87DC 002C461C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -505,7 +505,7 @@ create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22S __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C890C 002C474C 4B F6 5D 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy: /* 802DEB60 002DA9A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -606,7 +606,7 @@ create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22S __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DEC90 002DAAD0 4B F4 FA 10 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee27StateGrandLowperEscapeStartFPQ43scn4step5enemy5Enemy: /* 802EDEA0 002E9CE0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -707,7 +707,7 @@ create__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddlede __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EDFD0 002E9E10 4B F4 06 D0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknight22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x46FB58, 0x10 @@ -715,7 +715,7 @@ __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bladeknig __vt__Q53scn4step5enemy11bladeknight27StateGrandLowperEscapeStart: .incbin "baserom.dol", 0x46FB68, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4704F8, 0x10 @@ -723,7 +723,7 @@ __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6bouncy22St __vt__Q53scn4step5enemy6bouncy27StateGrandLowperEscapeStart: .incbin "baserom.dol", 0x470508, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatter22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470FF8, 0x10 @@ -731,7 +731,7 @@ __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11broomhatt __vt__Q53scn4step5enemy11broomhatter27StateGrandLowperEscapeStart: .incbin "baserom.dol", 0x471008, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4742A8, 0x10 @@ -739,7 +739,7 @@ __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy4kabu22Stat __vt__Q53scn4step5enemy4kabu27StateGrandLowperEscapeStart: .incbin "baserom.dol", 0x4742B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475AB8, 0x10 @@ -747,7 +747,7 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff22Sta __vt__Q53scn4step5enemy5nruff27StateGrandLowperEscapeStart: .incbin "baserom.dol", 0x475AC8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477ED0, 0x10 @@ -755,7 +755,7 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld22Sta __vt__Q53scn4step5enemy5sheld27StateGrandLowperEscapeStart: .incbin "baserom.dol", 0x477EE0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee22StateGrandLowperEscape$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47A318, 0x10 diff --git a/asm/src/StateGrandLowperLanding.s b/asm/src/StateGrandLowperLanding.s index 9b1ff76f..3ad1dfd7 100644 --- a/asm/src/StateGrandLowperLanding.s +++ b/asm/src/StateGrandLowperLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFPQ43scn4step5enemy5Enemy: /* 802EDFD4 002E9E14 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -87,7 +87,7 @@ procMove__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv: procFixPos__Q53scn4step5enemy9waddledee23StateGrandLowperLandingFv: /* 802EE0E4 002E9F24 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee23StateGrandLowperLanding __vt__Q53scn4step5enemy9waddledee23StateGrandLowperLanding: .incbin "baserom.dol", 0x47A348, 0x20 diff --git a/asm/src/StateGroundAttack.s b/asm/src/StateGroundAttack.s index 9e41bc29..954fd8e5 100644 --- a/asm/src/StateGroundAttack.s +++ b/asm/src/StateGroundAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory17StateGroundAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory17StateGroundAttackFPQ43scn4step5enemy5Enemy: /* 802E62B0 002E20F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ procAnim__Q53scn4step5enemy6sodory17StateGroundAttackFv: procMove__Q53scn4step5enemy6sodory17StateGroundAttackFv: /* 802E6424 002E2264 4B FA C5 88 */ b procMove__Q53scn4step5enemy6common12StateGoodbyeFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory17StateGroundAttack __vt__Q53scn4step5enemy6sodory17StateGroundAttack: .incbin "baserom.dol", 0x479018, 0x20 diff --git a/asm/src/StateGrow.s b/asm/src/StateGrow.s index 2b90e90d..894feea4 100644 --- a/asm/src/StateGrow.s +++ b/asm/src/StateGrow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy9StateGrowFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy9StateGrowFPQ43scn4step4boss4Boss: /* 8025D958 00259798 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -258,17 +258,17 @@ procMove__Q53scn4step4boss6whispy9StateGrowFv: procFixPos__Q53scn4step4boss6whispy9StateGrowFv: /* 8025DCF4 00259B34 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateGrow __vt__Q53scn4step4boss6whispy9StateGrow: .incbin "baserom.dol", 0x466738, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256186 $$256186: .incbin "baserom.dol", 0x4957B8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256769 $$256769: .incbin "baserom.dol", 0x49B540, 0x8 diff --git a/asm/src/StateGuard.s b/asm/src/StateGuard.s index 855b18b0..4263bcfb 100644 --- a/asm/src/StateGuard.s +++ b/asm/src/StateGuard.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss10gigantedge10StateGuardFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss10gigantedge10StateGuardFPQ43scn4step4boss4Boss: /* 80252388 0024E1C8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -207,7 +207,7 @@ lbl_80252644: /* 80252650 0024E490 38 21 00 20 */ addi r1, r1, 0x20 /* 80252654 0024E494 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global canChangeState__Q53scn4step4hero6common24$$2unnamed$$2StateGuard_cpp$$2FPQ43scn4step4hero4Hero canChangeState__Q53scn4step4hero6common24$$2unnamed$$2StateGuard_cpp$$2FPQ43scn4step4hero4Hero: /* 803631F0 0035F030 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -676,7 +676,7 @@ __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __dt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv: /* 80363840 0035F680 4B EC AE 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage10StateGuardFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage10StateGuardFPQ43scn4step4hero4Hero: /* 80376FD4 00372E14 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -850,12 +850,12 @@ procMove__Q53scn4step4hero6damage10StateGuardFv: procFixPos__Q53scn4step4hero6damage10StateGuardFv: /* 80377240 00373080 4B FE 96 40 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10gigantedge10StateGuard __vt__Q53scn4step4boss10gigantedge10StateGuard: .incbin "baserom.dol", 0x464110, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util118StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: .incbin "baserom.dol", 0x487D58, 0x10 @@ -866,12 +866,12 @@ __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __vt__Q53scn4step4hero6common10StateGuard: .incbin "baserom.dol", 0x487D78, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage10StateGuard __vt__Q53scn4step4hero6damage10StateGuard: .incbin "baserom.dol", 0x4887E0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256790 $$256790: .incbin "baserom.dol", 0x49DE70, 0x8 diff --git a/asm/src/StateHadou.s b/asm/src/StateHadou.s index 790d22e2..3688e479 100644 --- a/asm/src/StateHadou.s +++ b/asm/src/StateHadou.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe10StateHadouFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe10StateHadouFPQ43scn4step5enemy5Enemy: /* 802C017C 002BBFBC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -146,12 +146,12 @@ lbl_802C036C: procFixPos__Q53scn4step5enemy10knucklejoe10StateHadouFv: /* 802C0380 002BC1C0 4B FE 17 AC */ b procFixPos__Q53scn4step5enemy11broomhatter9StateWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe10StateHadou __vt__Q53scn4step5enemy10knucklejoe10StateHadou: .incbin "baserom.dol", 0x474A50, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255822 $$255822: .incbin "baserom.dol", 0x49C718, 0x4 diff --git a/asm/src/StateHammerAirSpin.s b/asm/src/StateHammerAirSpin.s index 755086ac..ea69ddc1 100644 --- a/asm/src/StateHammerAirSpin.s +++ b/asm/src/StateHammerAirSpin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5smash18StateHammerAirSpinFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5smash18StateHammerAirSpinFPQ43scn4step4hero4Hero: /* 803A1CB4 0039DAF4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -262,7 +262,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18Sta __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A2048 0039DE88 4B E8 C6 58 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash18StateHammerAirSpin$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48AF20, 0x10 diff --git a/asm/src/StateHammerStrongSwing.s b/asm/src/StateHammerStrongSwing.s index 276ce698..fc610605 100644 --- a/asm/src/StateHammerStrongSwing.s +++ b/asm/src/StateHammerStrongSwing.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5smash22StateHammerStrongSwingFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5smash22StateHammerStrongSwingFPQ43scn4step4hero4Hero: /* 803A204C 0039DE8C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -189,7 +189,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22St __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A22C8 0039E108 4B E8 C3 D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash22StateHammerStrongSwing$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48AF58, 0x10 diff --git a/asm/src/StateHang.s b/asm/src/StateHang.s index f0403e75..4a9c15c3 100644 --- a/asm/src/StateHang.s +++ b/asm/src/StateHang.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4como9StateHangFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4como9StateHangFPQ43scn4step5enemy5Enemy: /* 802A82EC 002A412C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -213,7 +213,7 @@ lbl_802A85DC: __dt__Q53scn4step5enemy4como9StateHangFv: /* 802A85F4 002A4434 4B FE 93 C4 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero12interference9StateHangFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero12interference9StateHangFPQ43scn4step4hero4Hero: /* 80371678 0036D4B8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -871,12 +871,12 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interfere __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1Fv: /* 80371FF4 0036DE34 4B EB C6 AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4como9StateHang __vt__Q53scn4step5enemy4como9StateHang: .incbin "baserom.dol", 0x471D40, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interference9StateHang$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488598, 0x10 @@ -884,7 +884,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interferenc __vt__Q53scn4step4hero12interference9StateHang: .incbin "baserom.dol", 0x4885A8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256895 $$256895: .incbin "baserom.dol", 0x49C108, 0x4 @@ -898,7 +898,7 @@ $$256897: $$256898: .incbin "baserom.dol", 0x49C114, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258465 $$258465: .incbin "baserom.dol", 0x49DD18, 0x4 diff --git a/asm/src/StateHeightAdjust.s b/asm/src/StateHeightAdjust.s index 6e6a7b33..ad9d62c6 100644 --- a/asm/src/StateHeightAdjust.s +++ b/asm/src/StateHeightAdjust.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior17StateHeightAdjustFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior17StateHeightAdjustFPQ43scn4step4boss4Boss: /* 8024EF14 0024AD54 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -259,12 +259,12 @@ procMove__Q53scn4step4boss6dubior17StateHeightAdjustFv: procFixPos__Q53scn4step4boss6dubior17StateHeightAdjustFv: /* 8024F2B8 0024B0F8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior17StateHeightAdjust __vt__Q53scn4step4boss6dubior17StateHeightAdjust: .incbin "baserom.dol", 0x4638F0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255294 $$255294: .incbin "baserom.dol", 0x49B2D8, 0x4 diff --git a/asm/src/StateHide.s b/asm/src/StateHide.s index 55c638d0..0515fcc4 100644 --- a/asm/src/StateHide.s +++ b/asm/src/StateHide.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss12creditdedede9StateHideFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss12creditdedede9StateHideFPQ43scn4step4boss4Boss: /* 80247D3C 00243B7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ procMove__Q53scn4step4boss12creditdedede9StateHideFv: procFixPos__Q53scn4step4boss12creditdedede9StateHideFv: /* 80247EA0 00243CE0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss9creditdee9StateHideFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss9creditdee9StateHideFPQ43scn4step4boss4Boss: /* 80248EE8 00244D28 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -340,7 +340,7 @@ requestDee__Q53scn4step4boss9creditdee9StateHideFv: /* 80249210 00245050 38 21 00 90 */ addi r1, r1, 0x90 /* 80249214 00245054 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss10creditmeta9StateHideFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss10creditmeta9StateHideFPQ43scn4step4boss4Boss: /* 8024ABA8 002469E8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -448,7 +448,7 @@ procMove__Q53scn4step4boss10creditmeta9StateHideFv: procFixPos__Q53scn4step4boss10creditmeta9StateHideFv: /* 8024AD0C 00246B4C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss10creditroah9StateHideFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss10creditroah9StateHideFPQ43scn4step4boss4Boss: /* 8024BF5C 00247D9C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -552,22 +552,22 @@ procMove__Q53scn4step4boss10creditroah9StateHideFv: procFixPos__Q53scn4step4boss10creditroah9StateHideFv: /* 8024C0B4 00247EF4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss12creditdedede9StateHide __vt__Q53scn4step4boss12creditdedede9StateHide: .incbin "baserom.dol", 0x462840, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9creditdee9StateHide __vt__Q53scn4step4boss9creditdee9StateHide: .incbin "baserom.dol", 0x462C40, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditmeta9StateHide __vt__Q53scn4step4boss10creditmeta9StateHide: .incbin "baserom.dol", 0x463020, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10creditroah9StateHide __vt__Q53scn4step4boss10creditroah9StateHide: .incbin "baserom.dol", 0x4632E8, 0x20 diff --git a/asm/src/StateHover.s b/asm/src/StateHover.s index 16aac2d0..47605afe 100644 --- a/asm/src/StateHover.s +++ b/asm/src/StateHover.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common10StateHoverFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common10StateHoverFPQ43scn4step4hero4Hero: /* 80363844 0035F684 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -769,7 +769,7 @@ __dt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1Fv: /* 80364338 00360178 4B EC A3 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage10StateHoverFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage10StateHoverFPQ43scn4step4hero4Hero: /* 80377244 00373084 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -962,7 +962,7 @@ procMove__Q53scn4step4hero6damage10StateHoverFv: procFixPos__Q53scn4step4hero6damage10StateHoverFv: /* 803774F4 00373334 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StateShotAirBall$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487DA0, 0x10 @@ -973,12 +973,12 @@ __vt__Q24util93StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __vt__Q53scn4step4hero6common10StateHover: .incbin "baserom.dol", 0x487DC0, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage10StateHover __vt__Q53scn4step4hero6damage10StateHover: .incbin "baserom.dol", 0x488808, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258766 $$258766: .incbin "baserom.dol", 0x49DB88, 0x4 @@ -986,7 +986,7 @@ $$258766: $$258788: .incbin "baserom.dol", 0x49DB8C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257465 $$257465: .incbin "baserom.dol", 0x49DE78, 0x8 diff --git a/asm/src/StateHoverFar.s b/asm/src/StateHoverFar.s index c4343f30..d64c199d 100644 --- a/asm/src/StateHoverFar.s +++ b/asm/src/StateHoverFar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss12creditdedede13StateHoverFarFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss12creditdedede13StateHoverFarFPQ43scn4step4boss4Boss: /* 80247EA4 00243CE4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -277,7 +277,7 @@ create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditde __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1Fv: /* 80248264 002440A4 4B FE 64 3C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede13StateHoverFar$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462860, 0x10 @@ -285,7 +285,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdede __vt__Q53scn4step4boss12creditdedede13StateHoverFar: .incbin "baserom.dol", 0x462870, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255585 $$255585: .incbin "baserom.dol", 0x49B198, 0x4 diff --git a/asm/src/StateHoverLanding.s b/asm/src/StateHoverLanding.s index c8988c8d..bd67a942 100644 --- a/asm/src/StateHoverLanding.s +++ b/asm/src/StateHoverLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common17StateHoverLandingFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common17StateHoverLandingFPQ43scn4step4hero4Hero: /* 8036433C 0036017C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -161,7 +161,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17St __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1Fv: /* 80364540 00360380 4B EC A1 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common17StateHoverLanding$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487DE8, 0x10 diff --git a/asm/src/StateIdling.s b/asm/src/StateIdling.s index 86f8b0b1..68b2bf9a 100644 --- a/asm/src/StateIdling.s +++ b/asm/src/StateIdling.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8needlous11StateIdlingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8needlous11StateIdlingFPQ43scn4step5enemy5Enemy: /* 802C674C 002C258C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -368,7 +368,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous1 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C6C84 002C2AC4 4B F6 7A 1C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4755A0, 0x10 @@ -376,7 +376,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8needlous11S __vt__Q53scn4step5enemy8needlous11StateIdling: .incbin "baserom.dol", 0x4755B0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256990 $$256990: .incbin "baserom.dol", 0x49C888, 0x4 diff --git a/asm/src/StateInit.s b/asm/src/StateInit.s index 863504dd..7c78a752 100644 --- a/asm/src/StateInit.s +++ b/asm/src/StateInit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8inactive9StateInitFPQ43scn4step4hero12InactiveHero __ct__Q53scn4step4hero8inactive9StateInitFPQ43scn4step4hero12InactiveHero: /* 8035D268 003590A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -231,7 +231,7 @@ lbl_8035D578: /* 8035D588 003593C8 38 21 00 10 */ addi r1, r1, 0x10 /* 8035D58C 003593CC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero11staffcredit9StateInitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero11staffcredit9StateInitFPQ43scn4step4hero4Hero: /* 803A3C74 0039FAB4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -380,17 +380,17 @@ procMove__Q53scn4step4hero11staffcredit9StateInitFv: procFixPos__Q53scn4step4hero11staffcredit9StateInitFv: /* 803A3E7C 0039FCBC 4B FB CA 04 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8inactive9StateInit __vt__Q53scn4step4hero8inactive9StateInit: .incbin "baserom.dol", 0x487A58, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero11staffcredit9StateInit __vt__Q53scn4step4hero11staffcredit9StateInit: .incbin "baserom.dol", 0x48B0E8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259466 $$259466: .incbin "baserom.dol", 0x49E3A0, 0x8 diff --git a/asm/src/StateItemGet.s b/asm/src/StateItemGet.s index e5e893ca..1e4d8206 100644 --- a/asm/src/StateItemGet.s +++ b/asm/src/StateItemGet.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick12StateItemGetFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7gimmick12StateItemGetFPQ43scn4step4hero4Hero: /* 8037FF10 0037BD50 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -235,7 +235,7 @@ procMove__Q53scn4step4hero7gimmick12StateItemGetFv: procFixPos__Q53scn4step4hero7gimmick12StateItemGetFv: /* 80380254 0037C094 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick12StateItemGet __vt__Q53scn4step4hero7gimmick12StateItemGet: .incbin "baserom.dol", 0x488BD8, 0x28 diff --git a/asm/src/StateJump.s b/asm/src/StateJump.s index e1c9b65a..9e5c26b9 100644 --- a/asm/src/StateJump.s +++ b/asm/src/StateJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common9StateJumpFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateJumpDescUl __ct__Q53scn4step4boss6common9StateJumpFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateJumpDescUl: /* 80246700 00242540 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -331,7 +331,7 @@ lbl_80246BA0: /* 80246BB4 002429F4 38 21 00 20 */ addi r1, r1, 0x20 /* 80246BB8 002429F8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath9StateJumpFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9moundeath9StateJumpFPQ43scn4step4boss4Boss: /* 80255B98 002519D8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -498,7 +498,7 @@ lbl_80255DD4: /* 80255DE4 00251C24 38 21 00 50 */ addi r1, r1, 0x50 /* 80255DE8 00251C28 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper9StateJumpFPQ43scn4step5enemy5Enemy: /* 8029AE34 00296C74 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -672,7 +672,7 @@ lbl_8029B06C: __dt__Q53scn4step5enemy7blipper9StateJumpFv: /* 8029B084 00296EC4 4B FF 69 34 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy9StateJumpFPQ43scn4step5enemy5Enemy: /* 8029D890 002996D0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -909,7 +909,7 @@ lbl_8029DBC8: __dt__Q53scn4step5enemy6bouncy9StateJumpFv: /* 8029DBE0 00299A20 4B FF 3D D8 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu9StateJumpFPQ43scn4step5enemy5Enemy: /* 802BD6B8 002B94F8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1279,7 +1279,7 @@ lbl_802BDB98: /* 802BDBE8 002B9A28 38 21 00 40 */ addi r1, r1, 0x40 /* 802BDBEC 002B9A2C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6leafan9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6leafan9StateJumpFPQ43scn4step5enemy5Enemy: /* 802C3B3C 002BF97C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1466,7 +1466,7 @@ lbl_802C3DBC: __dt__Q53scn4step5enemy6leafan9StateJumpFv: /* 802C3DD4 002BFC14 4B FC DB E4 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky9StateJumpFPQ43scn4step5enemy5Enemy: /* 802D45F8 002D0438 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1683,7 +1683,7 @@ lbl_802D48D8: procFixPos__Q53scn4step5enemy5rocky9StateJumpFv: /* 802D48F0 002D0730 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld9StateJumpFPQ43scn4step5enemy5Enemy: /* 802DEC94 002DAAD4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1942,7 +1942,7 @@ create__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16 __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DF00C 002DAE4C 4B F4 F6 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9sirkibble9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9sirkibble9StateJumpFPQ43scn4step5enemy5Enemy: /* 802E1A54 002DD894 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2217,7 +2217,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibbl __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E1E08 002DDC48 4B F4 C8 98 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11sisterbound9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11sisterbound9StateJumpFPQ43scn4step5enemy5Enemy: /* 802E2E64 002DECA4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2396,7 +2396,7 @@ lbl_802E30CC: /* 802E30D8 002DEF18 38 21 00 40 */ addi r1, r1, 0x40 /* 802E30DC 002DEF1C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sparky9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sparky9StateJumpFPQ43scn4step5enemy5Enemy: /* 802E7104 002E2F44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2655,7 +2655,7 @@ lbl_802E7494: /* 802E74A4 002E32E4 38 21 00 70 */ addi r1, r1, 0x70 /* 802E74A8 002E32E8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage9StateJumpFPQ43scn4step5enemy5Enemy: /* 802EB514 002E7354 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3025,7 +3025,7 @@ lbl_802EB9EC: /* 802EBA38 002E7878 38 21 00 60 */ addi r1, r1, 0x60 /* 802EBA3C 002E787C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledoo9StateJumpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledoo9StateJumpFPQ43scn4step5enemy5Enemy: /* 802EFCB8 002EBAF8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3237,7 +3237,7 @@ lbl_802EFF8C: __dt__Q53scn4step5enemy9waddledoo9StateJumpFv: /* 802EFFA4 002EBDE4 4B FA 1A 14 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common9StateJumpFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common9StateJumpFPQ43scn4step4hero4Hero: /* 80364544 00360384 38 80 00 01 */ li r4, 1 @@ -3756,7 +3756,7 @@ __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State __dt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1Fv: /* 80364C58 00360A98 4B EC 9A 48 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero11staffcredit9StateJumpFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero11staffcredit9StateJumpFPQ43scn4step4hero4Hero: /* 803A3E80 0039FCC0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -4308,42 +4308,42 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv: /* 803A4630 003A0470 4B E8 A0 70 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common9StateJump __vt__Q53scn4step4boss6common9StateJump: .incbin "baserom.dol", 0x462480, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath9StateJump __vt__Q53scn4step4boss9moundeath9StateJump: .incbin "baserom.dol", 0x465180, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateJump __vt__Q53scn4step5enemy7blipper9StateJump: .incbin "baserom.dol", 0x470000, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy9StateJump __vt__Q53scn4step5enemy6bouncy9StateJump: .incbin "baserom.dol", 0x470528, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateJump __vt__Q53scn4step5enemy4kabu9StateJump: .incbin "baserom.dol", 0x4742D8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan9StateJump __vt__Q53scn4step5enemy6leafan9StateJump: .incbin "baserom.dol", 0x475088, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky9StateJump __vt__Q53scn4step5enemy5rocky9StateJump: .incbin "baserom.dol", 0x476F68, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16StateFallNoDecel$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477F00, 0x10 @@ -4351,7 +4351,7 @@ __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy6common16St __vt__Q53scn4step5enemy5sheld9StateJump: .incbin "baserom.dol", 0x477F10, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble15StateJumpAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4786B0, 0x10 @@ -4359,27 +4359,27 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble1 __vt__Q53scn4step5enemy9sirkibble9StateJump: .incbin "baserom.dol", 0x4786C0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound9StateJump __vt__Q53scn4step5enemy11sisterbound9StateJump: .incbin "baserom.dol", 0x478A60, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky9StateJump __vt__Q53scn4step5enemy6sparky9StateJump: .incbin "baserom.dol", 0x479328, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateJump __vt__Q53scn4step5enemy9tsukikage9StateJump: .incbin "baserom.dol", 0x479AA0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledoo9StateJump __vt__Q53scn4step5enemy9waddledoo9StateJump: .incbin "baserom.dol", 0x47A8F0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util96StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common13StateJumpHold$$4PQ43scn4step4hero4Hero$$4b$$1: .incbin "baserom.dol", 0x487E20, 0x10 @@ -4390,7 +4390,7 @@ __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q53scn4step4hero6common9StateJump: .incbin "baserom.dol", 0x487E40, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: .incbin "baserom.dol", 0x48B110, 0x10 @@ -4401,7 +4401,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit __vt__Q53scn4step4hero11staffcredit9StateJump: .incbin "baserom.dol", 0x48B130, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257111 $$257111: .incbin "baserom.dol", 0x49B160, 0x4 @@ -4409,12 +4409,12 @@ $$257111: $$257112: .incbin "baserom.dol", 0x49B164, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256117 $$256117: .incbin "baserom.dol", 0x49B400, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255844 $$255844: .incbin "baserom.dol", 0x49BE18, 0x4 @@ -4437,7 +4437,7 @@ $$255869: $$255870: .incbin "baserom.dol", 0x49BE30, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255819 $$255819: .incbin "baserom.dol", 0x49BE80, 0x4 @@ -4445,12 +4445,12 @@ $$255819: $$255830: .incbin "baserom.dol", 0x49BE84, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256154 $$256154: .incbin "baserom.dol", 0x49C678, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255874 $$255874: .incbin "baserom.dol", 0x49C7E0, 0x8 @@ -4458,7 +4458,7 @@ $$255874: $$255889: .incbin "baserom.dol", 0x49C7E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256167 $$256167: .incbin "baserom.dol", 0x49CD40, 0x4 @@ -4466,12 +4466,12 @@ $$256167: $$256168: .incbin "baserom.dol", 0x49CD44, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256248 $$256248: .incbin "baserom.dol", 0x49CE08, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255871 $$255871: .incbin "baserom.dol", 0x49CE28, 0x4 @@ -4479,7 +4479,7 @@ $$255871: $$255890: .incbin "baserom.dol", 0x49CE2C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256307 $$256307: .incbin "baserom.dol", 0x49CFA8, 0x4 @@ -4490,12 +4490,12 @@ $$256356: $$256357: .incbin "baserom.dol", 0x49CFB0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257601 $$257601: .incbin "baserom.dol", 0x49DB90, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257888 $$257888: .incbin "baserom.dol", 0x49E3A8, 0x4 diff --git a/asm/src/StateJumpAttack.s b/asm/src/StateJumpAttack.s index 525b3937..d3127b64 100644 --- a/asm/src/StateJumpAttack.s +++ b/asm/src/StateJumpAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common15StateJumpAttackFPQ43scn4step4boss4BossRQ53scn4step4boss6common19StateJumpAttackDescUl __ct__Q53scn4step4boss6common15StateJumpAttackFPQ43scn4step4boss4BossRQ53scn4step4boss6common19StateJumpAttackDescUl: /* 80246BBC 002429FC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -217,7 +217,7 @@ create__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12St __dt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1Fv: /* 80246E98 00242CD8 4B FE 78 08 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9zankibble15StateJumpAttackFPQ43scn4step4boss4BossQ63scn4step4boss9zankibble15StateJumpAttack6Config __ct__Q53scn4step4boss9zankibble15StateJumpAttackFPQ43scn4step4boss4BossQ63scn4step4boss9zankibble15StateJumpAttack6Config: /* 8026185C 0025D69C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -622,7 +622,7 @@ create__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12S __dt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1Fv: /* 80261E0C 0025DC4C 4B FC C8 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9sirkibble15StateJumpAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9sirkibble15StateJumpAttackFPQ43scn4step5enemy5Enemy: /* 802E1E0C 002DDC4C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -788,7 +788,7 @@ lbl_802E2020: procFixPos__Q53scn4step5enemy9sirkibble15StateJumpAttackFv: /* 802E2038 002DDE78 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage15StateJumpAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage15StateJumpAttackFPQ43scn4step5enemy5Enemy: /* 802EBA40 002E7880 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1164,7 +1164,7 @@ lbl_802EBF64: __dt__Q53scn4step5enemy9tsukikage15StateJumpAttackFv: /* 802EBF7C 002E7DBC 4B FA 5A 3C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1 __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4i$$1: .incbin "baserom.dol", 0x4624A0, 0x10 @@ -1172,7 +1172,7 @@ __vt__Q24util95StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12Stat __vt__Q53scn4step4boss6common15StateJumpAttack: .incbin "baserom.dol", 0x4624B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1 __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9zankibble10ScriptKind$$1: .incbin "baserom.dol", 0x4670E0, 0x10 @@ -1180,17 +1180,17 @@ __vt__Q24util132StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss6common12Sta __vt__Q53scn4step4boss9zankibble15StateJumpAttack: .incbin "baserom.dol", 0x4670F0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9sirkibble15StateJumpAttack __vt__Q53scn4step5enemy9sirkibble15StateJumpAttack: .incbin "baserom.dol", 0x4786E0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage15StateJumpAttack __vt__Q53scn4step5enemy9tsukikage15StateJumpAttack: .incbin "baserom.dol", 0x479AC0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256369 $$256369: .incbin "baserom.dol", 0x49B5C0, 0x4 @@ -1204,7 +1204,7 @@ $$256415: $$256418: .incbin "baserom.dol", 0x49B5D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256445 $$256445: .incbin "baserom.dol", 0x49CFB8, 0x8 diff --git a/asm/src/StateJumpAttackDesc.s b/asm/src/StateJumpAttackDesc.s index feaaba12..e850789d 100644 --- a/asm/src/StateJumpAttackDesc.s +++ b/asm/src/StateJumpAttackDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common19StateJumpAttackDescFQ33hel4math7Vector2Q24gobj14MoveParamDecelQ24gobj13MoveParamFalli __ct__Q53scn4step4boss6common19StateJumpAttackDescFQ33hel4math7Vector2Q24gobj14MoveParamDecelQ24gobj13MoveParamFalli: /* 80246E9C 00242CDC C0 04 00 00 */ lfs f0, 0(r4) diff --git a/asm/src/StateJumpAttackStart.s b/asm/src/StateJumpAttackStart.s index 137da210..c35695cb 100644 --- a/asm/src/StateJumpAttackStart.s +++ b/asm/src/StateJumpAttackStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common20StateJumpAttackStartFPQ43scn4step4boss4BossRQ53scn4step4boss6common19StateJumpAttackDescUlUl __ct__Q53scn4step4boss6common20StateJumpAttackStartFPQ43scn4step4boss4BossRQ53scn4step4boss6common19StateJumpAttackDescUlUl: /* 80246ED4 00242D14 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -155,7 +155,7 @@ create__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15S __dt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1Fv: /* 802470D0 00242F10 4B FE 75 D0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9zankibble20StateJumpAttackStartFPQ43scn4step4boss4BossQ63scn4step4boss9zankibble15StateJumpAttack6Config __ct__Q53scn4step4boss9zankibble20StateJumpAttackStartFPQ43scn4step4boss4BossQ63scn4step4boss9zankibble15StateJumpAttack6Config: /* 80261E10 0025DC50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -275,7 +275,7 @@ lbl_80261F74: __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1Fv: /* 80261F88 0025DDC8 4B FC C7 18 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1 __vt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common19StateJumpAttackDesc$$4Ul$$1: .incbin "baserom.dol", 0x4624D0, 0x10 @@ -283,7 +283,7 @@ __vt__Q24util144StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common15Sta __vt__Q53scn4step4boss6common20StateJumpAttackStart: .incbin "baserom.dol", 0x4624E0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15StateJumpAttack$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss9zankibble15StateJumpAttack6Config$$1: .incbin "baserom.dol", 0x467110, 0x10 @@ -291,7 +291,7 @@ __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9zankibble15 __vt__Q53scn4step4boss9zankibble20StateJumpAttackStart: .incbin "baserom.dol", 0x467120, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254946 $$254946: .incbin "baserom.dol", 0x49B168, 0x8 diff --git a/asm/src/StateJumpBig.s b/asm/src/StateJumpBig.s index 70b00916..a0068e84 100644 --- a/asm/src/StateJumpBig.s +++ b/asm/src/StateJumpBig.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers12StateJumpBigFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss7bonkers12StateJumpBigFPQ43scn4step4boss4Boss: /* 80238204 00234044 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -335,7 +335,7 @@ create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12St __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1Fv: /* 802386C4 00234504 4B FF 5F DC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12StateLanding$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4612C0, 0x10 @@ -343,7 +343,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common12Stat __vt__Q53scn4step4boss7bonkers12StateJumpBig: .incbin "baserom.dol", 0x4612D0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256288 $$256288: .incbin "baserom.dol", 0x49AF40, 0x8 diff --git a/asm/src/StateJumpBigStart.s b/asm/src/StateJumpBigStart.s index cc1536a0..3f4a60a6 100644 --- a/asm/src/StateJumpBigStart.s +++ b/asm/src/StateJumpBigStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers17StateJumpBigStartFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss7bonkers17StateJumpBigStartFPQ43scn4step4boss4Boss: /* 802386C8 00234508 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -97,7 +97,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12S __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1Fv: /* 802387E8 00234628 4B FF 5E B8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers12StateJumpBig$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4612F0, 0x10 diff --git a/asm/src/StateJumpCenterAttack.s b/asm/src/StateJumpCenterAttack.s index 90c5ccd7..19150b98 100644 --- a/asm/src/StateJumpCenterAttack.s +++ b/asm/src/StateJumpCenterAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss8kingsdoo21StateJumpCenterAttackFPQ43scn4step4boss4Boss: /* 80253E9C 0024FCDC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -289,12 +289,12 @@ lbl_802542AC: /* 802542BC 002500FC 38 21 00 40 */ addi r1, r1, 0x40 /* 802542C0 00250100 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttack __vt__Q53scn4step4boss8kingsdoo21StateJumpCenterAttack: .incbin "baserom.dol", 0x464878, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256165 $$256165: .incbin "baserom.dol", 0x49B3B8, 0x4 diff --git a/asm/src/StateJumpDesc.s b/asm/src/StateJumpDesc.s index 51af7ca7..66c26214 100644 --- a/asm/src/StateJumpDesc.s +++ b/asm/src/StateJumpDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common13StateJumpDescFQ33hel4math7Vector2Q24gobj14MoveParamDecelQ24gobj14MoveParamDecelQ24gobj13MoveParamFallQ33hel4math7Vector2Q33hel4math7Vector2bQ63scn4step4boss6common13StateJumpDesc15LandingAnimTypebQ43scn4step5ocoll10AttackType __ct__Q53scn4step4boss6common13StateJumpDescFQ33hel4math7Vector2Q24gobj14MoveParamDecelQ24gobj14MoveParamDecelQ24gobj13MoveParamFallQ33hel4math7Vector2Q33hel4math7Vector2bQ63scn4step4boss6common13StateJumpDesc15LandingAnimTypebQ43scn4step5ocoll10AttackType: /* 802470D4 00242F14 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/StateJumpHold.s b/asm/src/StateJumpHold.s index 0d60cd89..a2d23059 100644 --- a/asm/src/StateJumpHold.s +++ b/asm/src/StateJumpHold.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common13StateJumpHoldFPQ43scn4step4hero4Herob __ct__Q53scn4step4hero6common13StateJumpHoldFPQ43scn4step4hero4Herob: /* 80364C5C 00360A9C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -335,7 +335,7 @@ create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9Sta __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1Fv: /* 80365110 00360F50 4B EC 95 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateFall$$4PQ43scn4step4hero4Hero$$4b$$1: .incbin "baserom.dol", 0x487E68, 0x10 @@ -343,7 +343,7 @@ __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q53scn4step4hero6common13StateJumpHold: .incbin "baserom.dol", 0x487E78, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256581 $$256581: .incbin "baserom.dol", 0x49DB98, 0x4 diff --git a/asm/src/StateJumpMachinegun.s b/asm/src/StateJumpMachinegun.s index b0eee8c9..9c1140d7 100644 --- a/asm/src/StateJumpMachinegun.s +++ b/asm/src/StateJumpMachinegun.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFPQ43scn4step4boss4Boss: /* 802542C4 00250104 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -402,12 +402,12 @@ reqMachinegun__Q53scn4step4boss8kingsdoo19StateJumpMachinegunFv: /* 80254890 002506D0 38 21 00 A0 */ addi r1, r1, 0xa0 /* 80254894 002506D4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss8kingsdoo19StateJumpMachinegun __vt__Q53scn4step4boss8kingsdoo19StateJumpMachinegun: .incbin "baserom.dol", 0x464898, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256540 $$256540: .incbin "baserom.dol", 0x49B3D0, 0x4 diff --git a/asm/src/StateJumpMachinegunStart.s b/asm/src/StateJumpMachinegunStart.s index 934b07b5..0d7806d7 100644 --- a/asm/src/StateJumpMachinegunStart.s +++ b/asm/src/StateJumpMachinegunStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss8kingsdoo24StateJumpMachinegunStartFPQ43scn4step4boss4Boss: /* 80254898 002506D8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -100,7 +100,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo1 __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1Fv: /* 802549C4 00250804 4B FD 9C DC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss8kingsdoo19StateJumpMachinegun$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4648B8, 0x10 diff --git a/asm/src/StateJumpStart.s b/asm/src/StateJumpStart.s index c0bbacf0..a55d36bc 100644 --- a/asm/src/StateJumpStart.s +++ b/asm/src/StateJumpStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common14StateJumpStartFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateJumpDescUlUl __ct__Q53scn4step4boss6common14StateJumpStartFPQ43scn4step4boss4BossRQ53scn4step4boss6common13StateJumpDescUlUl: /* 8024715C 00242F9C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -123,7 +123,7 @@ create__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9St __dt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1Fv: /* 802472E4 00243124 4B FE 73 BC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld14StateJumpStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld14StateJumpStartFPQ43scn4step5enemy5Enemy: /* 802DF010 002DAE50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -328,7 +328,7 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9Sta __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DF2D4 002DB114 4B F4 F3 CC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11sisterbound14StateJumpStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11sisterbound14StateJumpStartFPQ43scn4step5enemy5Enemy: /* 802E30E0 002DEF20 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -543,7 +543,7 @@ lbl_802E33C8: /* 802E33D8 002DF218 38 21 00 50 */ addi r1, r1, 0x50 /* 802E33DC 002DF21C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common14StateJumpStartFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common14StateJumpStartFPQ43scn4step4hero4Hero: /* 80365114 00360F54 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -912,7 +912,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14Stat __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1Fv: /* 80365620 00361460 4B EC 90 80 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1 __vt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9StateJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss6common13StateJumpDesc$$4Ul$$1: .incbin "baserom.dol", 0x462500, 0x10 @@ -920,7 +920,7 @@ __vt__Q24util131StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4boss6common9Stat __vt__Q53scn4step4boss6common14StateJumpStart: .incbin "baserom.dol", 0x462510, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9StateJump$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477F30, 0x10 @@ -928,12 +928,12 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld9State __vt__Q53scn4step5enemy5sheld14StateJumpStart: .incbin "baserom.dol", 0x477F40, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound14StateJumpStart __vt__Q53scn4step5enemy11sisterbound14StateJumpStart: .incbin "baserom.dol", 0x478A80, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487EA0, 0x10 @@ -944,7 +944,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14Stat __vt__Q53scn4step4hero6common14StateJumpStart: .incbin "baserom.dol", 0x487EC0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256099 $$256099: .incbin "baserom.dol", 0x49CD48, 0x4 @@ -952,7 +952,7 @@ $$256099: $$256100: .incbin "baserom.dol", 0x49CD4C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255920 $$255920: .incbin "baserom.dol", 0x49CE30, 0x4 @@ -963,7 +963,7 @@ $$255942: $$255945: .incbin "baserom.dol", 0x49CE38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258419 $$258419: .incbin "baserom.dol", 0x49DBA0, 0x8 diff --git a/asm/src/StateKiss.s b/asm/src/StateKiss.s index f08d5439..f89fef5f 100644 --- a/asm/src/StateKiss.s +++ b/asm/src/StateKiss.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero12interference9StateKissFPQ43scn4step4hero4HeroQ33hel4math7Vector3Q33hel4math7Vector3Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1Q43scn4step4hero11KissContext __ct__Q53scn4step4hero12interference9StateKissFPQ43scn4step4hero4HeroQ33hel4math7Vector3Q33hel4math7Vector3Q24util35ObjRefHandle$$0Q43scn4step4hero4Hero$$1Q43scn4step4hero11KissContext: /* 80371FF8 0036DE38 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -677,7 +677,7 @@ lbl_803729B4: __dt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1Fv: /* 803729C8 0036E808 4B EB BC D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1 __vt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interference16StateKissReceive$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector3$$4Q33hel4math7Vector3$$4Q43scn4step4hero11KissContext$$1: .incbin "baserom.dol", 0x4885D0, 0x10 @@ -685,7 +685,7 @@ __vt__Q24util174StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero12interferen __vt__Q53scn4step4hero12interference9StateKiss: .incbin "baserom.dol", 0x4885E0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259088 $$259088: .incbin "baserom.dol", 0x49DD40, 0x4 diff --git a/asm/src/StateKissReceive.s b/asm/src/StateKissReceive.s index e8baada6..5803814e 100644 --- a/asm/src/StateKissReceive.s +++ b/asm/src/StateKissReceive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero12interference16StateKissReceiveFPQ43scn4step4hero4HeroQ33hel4math7Vector3Q33hel4math7Vector3Q43scn4step4hero11KissContext __ct__Q53scn4step4hero12interference16StateKissReceiveFPQ43scn4step4hero4HeroQ33hel4math7Vector3Q33hel4math7Vector3Q43scn4step4hero11KissContext: /* 803729CC 0036E80C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -441,12 +441,12 @@ procMove__Q53scn4step4hero12interference16StateKissReceiveFv: procFixPos__Q53scn4step4hero12interference16StateKissReceiveFv: /* 80373038 0036EE78 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference16StateKissReceive __vt__Q53scn4step4hero12interference16StateKissReceive: .incbin "baserom.dol", 0x488608, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258092 $$258092: .incbin "baserom.dol", 0x49DD60, 0x4 diff --git a/asm/src/StateLadder.s b/asm/src/StateLadder.s index 4c697bf8..61b08231 100644 --- a/asm/src/StateLadder.s +++ b/asm/src/StateLadder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common11StateLadderFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common11StateLadderFPQ43scn4step4hero4Hero: /* 80365624 00361464 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -1102,7 +1102,7 @@ create__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11S __dt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1Fv: /* 803665D0 00362410 4B EC 80 D0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1 __vt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11StateLadder$$4PQ43scn4step4hero4Hero$$4Q35mcoll6detail10LadderInfo$$1: .incbin "baserom.dol", 0x487EE8, 0x10 @@ -1110,7 +1110,7 @@ __vt__Q24util120StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common11Sta __vt__Q53scn4step4hero6common11StateLadder: .incbin "baserom.dol", 0x487EF8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259367 $$259367: .incbin "baserom.dol", 0x49DBA8, 0x4 diff --git a/asm/src/StateLanding.s b/asm/src/StateLanding.s index 9dbfff19..71ed60bf 100644 --- a/asm/src/StateLanding.s +++ b/asm/src/StateLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common12StateLandingFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6common12StateLandingFPQ43scn4step4boss4Boss: /* 802472E8 00243128 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -107,7 +107,7 @@ procMove__Q53scn4step4boss6common12StateLandingFv: procFixPos__Q53scn4step4boss6common12StateLandingFv: /* 80247438 00243278 4B FF 0B 88 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common12StateLandingFPQ43scn4step5enemy5Enemy: /* 80292A04 0028E844 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -278,7 +278,7 @@ lbl_80292C34: /* 80292C44 0028EA84 38 21 00 50 */ addi r1, r1, 0x50 /* 80292C48 0028EA88 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper12StateLandingFPQ43scn4step5enemy5Enemy: /* 8029B088 00296EC8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -430,7 +430,7 @@ lbl_8029B280: __dt__Q53scn4step5enemy7blipper12StateLandingFv: /* 8029B298 002970D8 4B FF 67 20 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bonkersbomb12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bonkersbomb12StateLandingFPQ43scn4step5enemy5Enemy: /* 8029C190 00297FD0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -710,7 +710,7 @@ lbl_8029C538: procFixPos__Q53scn4step5enemy11bonkersbomb12StateLandingFv: /* 8029C564 002983A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6bouncy12StateLandingFPQ43scn4step5enemy5Enemy: /* 8029DBE4 00299A24 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -746,7 +746,7 @@ procAnim__Q53scn4step5enemy6bouncy12StateLandingFv: __dt__Q53scn4step5enemy6bouncy12StateLandingFv: /* 8029DC48 00299A88 4B FF 3D 70 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6leafan12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6leafan12StateLandingFPQ43scn4step5enemy5Enemy: /* 802C3DD8 002BFC18 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -917,7 +917,7 @@ lbl_802C4008: /* 802C4018 002BFE58 38 21 00 50 */ addi r1, r1, 0x50 /* 802C401C 002BFE5C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee12StateLandingFPQ43scn4step5enemy5Enemy: /* 802CC8A0 002C86E0 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -1225,7 +1225,7 @@ create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasol __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CCCF0 002C8B30 4B F6 19 B0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo12StateLandingFPQ43scn4step5enemy5Enemy: /* 802CE6AC 002CA4EC 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -1556,7 +1556,7 @@ create__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasol __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CEB3C 002CA97C 4B F5 FB 64 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky12StateLandingFPQ43scn4step5enemy5Enemy: /* 802D48F4 002D0734 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1927,7 +1927,7 @@ create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10St __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D4E3C 002D0C7C 4B F5 98 64 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11sisterbound12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11sisterbound12StateLandingFPQ43scn4step5enemy5Enemy: /* 802E33E0 002DF220 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2031,7 +2031,7 @@ lbl_802E3528: /* 802E3538 002DF378 38 21 00 40 */ addi r1, r1, 0x40 /* 802E353C 002DF37C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage12StateLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage12StateLandingFPQ43scn4step5enemy5Enemy: /* 802EBF80 002E7DC0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2196,7 +2196,7 @@ lbl_802EC1A4: /* 802EC1B4 002E7FF4 38 21 00 50 */ addi r1, r1, 0x50 /* 802EC1B8 002E7FF8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone12StateLandingFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context __ct__Q53scn4step4hero5stone12StateLandingFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context: /* 80390A5C 0038C89C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2490,37 +2490,37 @@ create__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9Sta __dt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv: /* 80390E68 0038CCA8 4B E9 D8 38 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common12StateLanding __vt__Q53scn4step4boss6common12StateLanding: .incbin "baserom.dol", 0x462530, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common12StateLanding __vt__Q53scn4step5enemy6common12StateLanding: .incbin "baserom.dol", 0x46F2F8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper12StateLanding __vt__Q53scn4step5enemy7blipper12StateLanding: .incbin "baserom.dol", 0x470020, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bonkersbomb12StateLanding __vt__Q53scn4step5enemy11bonkersbomb12StateLanding: .incbin "baserom.dol", 0x470108, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy12StateLanding __vt__Q53scn4step5enemy6bouncy12StateLanding: .incbin "baserom.dol", 0x470548, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan12StateLanding __vt__Q53scn4step5enemy6leafan12StateLanding: .incbin "baserom.dol", 0x4750A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldee17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4761B8, 0x10 @@ -2528,7 +2528,7 @@ __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasolde __vt__Q53scn4step5enemy10parasoldee12StateLanding: .incbin "baserom.dol", 0x4761C8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldoo17StateWalkStraight$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476368, 0x10 @@ -2536,7 +2536,7 @@ __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10parasoldo __vt__Q53scn4step5enemy10parasoldoo12StateLanding: .incbin "baserom.dol", 0x476378, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10StateSlope$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476F88, 0x10 @@ -2544,17 +2544,17 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky10Stat __vt__Q53scn4step5enemy5rocky12StateLanding: .incbin "baserom.dol", 0x476F98, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11sisterbound12StateLanding __vt__Q53scn4step5enemy11sisterbound12StateLanding: .incbin "baserom.dol", 0x478AA0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage12StateLanding __vt__Q53scn4step5enemy9tsukikage12StateLanding: .incbin "baserom.dol", 0x479AE0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9StateWait$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .incbin "baserom.dol", 0x489B88, 0x10 @@ -2562,17 +2562,17 @@ __vt__Q24util150StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone9State __vt__Q53scn4step4hero5stone12StateLanding: .incbin "baserom.dol", 0x489B98, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$254872 $$254872: .incbin "baserom.dol", 0x495B10, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254882 $$254882: .incbin "baserom.dol", 0x49B170, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255350 $$255350: .incbin "baserom.dol", 0x49BE58, 0x4 @@ -2580,17 +2580,17 @@ $$255350: $$255351: .incbin "baserom.dol", 0x49BE5C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257248 $$257248: .incbin "baserom.dol", 0x49C9C0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257206 $$257206: .incbin "baserom.dol", 0x49CA10, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256334 $$256334: .incbin "baserom.dol", 0x49CB40, 0x4 diff --git a/asm/src/StateLaugh.s b/asm/src/StateLaugh.s index ddfb453c..beee4689 100644 --- a/asm/src/StateLaugh.s +++ b/asm/src/StateLaugh.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster10StateLaughFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster10StateLaughFPQ43scn4step4boss4Boss: /* 80240CD8 0023CB18 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -189,7 +189,7 @@ create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challeng __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1Fv: /* 80240F48 0023CD88 4B FE D7 58 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StateLaugh$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461F18, 0x10 diff --git a/asm/src/StateLeaveChallengeDoor.s b/asm/src/StateLeaveChallengeDoor.s index f07324ea..b0c46efd 100644 --- a/asm/src/StateLeaveChallengeDoor.s +++ b/asm/src/StateLeaveChallengeDoor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFPQ43scn4step4hero4HeroRCQ33hel4math7Vector3 __ct__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFPQ43scn4step4hero4HeroRCQ33hel4math7Vector3: /* 80380258 0037C098 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -412,12 +412,12 @@ lbl_8038081C: procFixPos__Q53scn4step4hero7gimmick23StateLeaveChallengeDoorFv: /* 80380830 0037C670 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoor __vt__Q53scn4step4hero7gimmick23StateLeaveChallengeDoor: .incbin "baserom.dol", 0x488C00, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260395 $$260395: .incbin "baserom.dol", 0x49DFA0, 0x8 diff --git a/asm/src/StateLeaveLvMapDoor.s b/asm/src/StateLeaveLvMapDoor.s index 9b33f3b9..e67075a3 100644 --- a/asm/src/StateLeaveLvMapDoor.s +++ b/asm/src/StateLeaveLvMapDoor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFPQ43scn4step4hero4HeroQ33hel4math7Vector3 __ct__Q53scn4step4hero7gimmick19StateLeaveLvMapDoorFPQ43scn4step4hero4HeroQ33hel4math7Vector3: /* 80380834 0037C674 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -436,7 +436,7 @@ __dt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18St __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1Fv: /* 80380E54 0037CC94 4B EA D8 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick20StateUnlockLvMapDoor$$4PQ43scn4step4hero4Hero$$4i$$1: .incbin "baserom.dol", 0x488C28, 0x10 @@ -447,7 +447,7 @@ __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick18St __vt__Q53scn4step4hero7gimmick19StateLeaveLvMapDoor: .incbin "baserom.dol", 0x488C48, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259504 $$259504: .incbin "baserom.dol", 0x49DFA8, 0x8 diff --git a/asm/src/StateLeaveMahoroa.s b/asm/src/StateLeaveMahoroa.s index 266e8437..38721d23 100644 --- a/asm/src/StateLeaveMahoroa.s +++ b/asm/src/StateLeaveMahoroa.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick17StateLeaveMahoroaFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7gimmick17StateLeaveMahoroaFPQ43scn4step4hero4Hero: /* 80380E58 0037CC98 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -351,12 +351,12 @@ distance__Q53scn4step4hero7gimmick17StateLeaveMahoroaFv: /* 80381354 0037D194 38 21 00 10 */ addi r1, r1, 0x10 /* 80381358 0037D198 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick17StateLeaveMahoroa __vt__Q53scn4step4hero7gimmick17StateLeaveMahoroa: .incbin "baserom.dol", 0x488C70, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258967 $$258967: .incbin "baserom.dol", 0x49DFB0, 0x4 diff --git a/asm/src/StateLeaveSubgameDoor.s b/asm/src/StateLeaveSubgameDoor.s index 1233b97c..f5aec778 100644 --- a/asm/src/StateLeaveSubgameDoor.s +++ b/asm/src/StateLeaveSubgameDoor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFPQ43scn4step4hero4HeroQ33hel4math7Vector3 __ct__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFPQ43scn4step4hero4HeroQ33hel4math7Vector3: /* 8038135C 0037D19C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -269,12 +269,12 @@ mfCinemaScopeDisable__Q53scn4step4hero7gimmick21StateLeaveSubgameDoorFv: /* 8038171C 0037D55C 38 21 00 10 */ addi r1, r1, 0x10 /* 80381720 0037D560 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoor __vt__Q53scn4step4hero7gimmick21StateLeaveSubgameDoor: .incbin "baserom.dol", 0x488C98, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260106 $$260106: .incbin "baserom.dol", 0x49DFB8, 0x8 diff --git a/asm/src/StateLink.s b/asm/src/StateLink.s index 6e45070f..7f729984 100644 --- a/asm/src/StateLink.s +++ b/asm/src/StateLink.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7parasol9StateLinkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7parasol9StateLinkFPQ43scn4step5enemy5Enemy: /* 802CB1F4 002C7034 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -143,7 +143,7 @@ __dt__Q53scn4step5enemy7parasol9StateLinkFv: __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802CB3CC 002C720C 4B F6 32 D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9StateRise$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476048, 0x10 @@ -151,7 +151,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy7parasol9Sta __vt__Q53scn4step5enemy7parasol9StateLink: .incbin "baserom.dol", 0x476058, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256687 $$256687: .incbin "baserom.dol", 0x49C978, 0x8 diff --git a/asm/src/StateLogout.s b/asm/src/StateLogout.s index d0dc2161..e987fbb5 100644 --- a/asm/src/StateLogout.s +++ b/asm/src/StateLogout.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common11StateLogoutFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common11StateLogoutFPQ43scn4step4hero4Hero: /* 803665D4 00362414 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -215,7 +215,7 @@ procMove__Q53scn4step4hero6common11StateLogoutFv: procFixPos__Q53scn4step4hero6common11StateLogoutFv: /* 803668C8 00362708 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common11StateLogout __vt__Q53scn4step4hero6common11StateLogout: .incbin "baserom.dol", 0x487F20, 0x28 diff --git a/asm/src/StateLookAround.s b/asm/src/StateLookAround.s index 218efb31..3b180978 100644 --- a/asm/src/StateLookAround.s +++ b/asm/src/StateLookAround.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6chilly15StateLookAroundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6chilly15StateLookAroundFPQ43scn4step5enemy5Enemy: /* 802A6884 002A26C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -40,7 +40,7 @@ procFixPos__Q53scn4step5enemy6chilly15StateLookAroundFv: __dt__Q53scn4step5enemy6chilly15StateLookAroundFv: /* 802A68EC 002A272C 4B FE B0 CC */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly15StateLookAround __vt__Q53scn4step5enemy6chilly15StateLookAround: .incbin "baserom.dol", 0x471A30, 0x20 diff --git a/asm/src/StateLookBoss.s b/asm/src/StateLookBoss.s index 909758a9..2dc67432 100644 --- a/asm/src/StateLookBoss.s +++ b/asm/src/StateLookBoss.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero11staffcredit13StateLookBossFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero11staffcredit13StateLookBossFPQ43scn4step4hero4Hero: /* 803A4634 003A0474 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -539,7 +539,7 @@ __dt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredi __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A4D94 003A0BD4 4B E8 99 0C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWait$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48B158, 0x10 @@ -550,7 +550,7 @@ __vt__Q24util129StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredi __vt__Q53scn4step4hero11staffcredit13StateLookBoss: .incbin "baserom.dol", 0x48B178, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257405 $$257405: .incbin "baserom.dol", 0x49E3B0, 0x4 diff --git a/asm/src/StateLose.s b/asm/src/StateLose.s index a0c84c23..8fb1a486 100644 --- a/asm/src/StateLose.s +++ b/asm/src/StateLose.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster9StateLoseFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster9StateLoseFPQ43scn4step4boss4Boss: /* 80240F4C 0023CD8C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -83,7 +83,7 @@ procMove__Q53scn4step4boss15challengemaster9StateLoseFv: procFixPos__Q53scn4step4boss15challengemaster9StateLoseFv: /* 8024103C 0023CE7C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster9StateLose __vt__Q53scn4step4boss15challengemaster9StateLose: .incbin "baserom.dol", 0x461F48, 0x20 diff --git a/asm/src/StateLoseFly.s b/asm/src/StateLoseFly.s index 6a0bf181..893d7b1a 100644 --- a/asm/src/StateLoseFly.s +++ b/asm/src/StateLoseFly.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster12StateLoseFlyFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster12StateLoseFlyFPQ43scn4step4boss4Boss: /* 80241040 0023CE80 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -474,10 +474,10 @@ __sinit_$$3StateLoseFly_cpp: /* 802416DC 0023D51C 38 21 00 10 */ addi r1, r1, 0x10 /* 802416E0 0023D520 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x40247C, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateLose$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461F68, 0x10 @@ -485,12 +485,12 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengema __vt__Q53scn4step4boss15challengemaster12StateLoseFly: .incbin "baserom.dol", 0x461F78, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256401 $$256401: .incbin "baserom.dol", 0x4953F0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257754 $$257754: .incbin "baserom.dol", 0x49B090, 0x8 diff --git a/asm/src/StateLostHat.s b/asm/src/StateLostHat.s index 4bef804d..f95cfd09 100644 --- a/asm/src/StateLostHat.s +++ b/asm/src/StateLostHat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5cappy12StateLostHatFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5cappy12StateLostHatFPQ43scn4step5enemy5Enemy: /* 802A3314 0029F154 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -118,7 +118,7 @@ procMove__Q53scn4step5enemy5cappy12StateLostHatFv: procFixPos__Q53scn4step5enemy5cappy12StateLostHatFv: /* 802A349C 0029F2DC 4B FF 23 90 */ b procFixPos__Q53scn4step5enemy6common9StateWaitFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5cappy12StateLostHat __vt__Q53scn4step5enemy5cappy12StateLostHat: .incbin "baserom.dol", 0x471358, 0x20 diff --git a/asm/src/StateMain.s b/asm/src/StateMain.s index b33ca306..be8bf185 100644 --- a/asm/src/StateMain.s +++ b/asm/src/StateMain.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9mbossdead9StateMainFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9mbossdead9StateMainFPQ43scn4step5enemy5Enemy: /* 802C47A0 002C05E0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -326,7 +326,7 @@ lbl_802C4C20: /* 802C4C2C 002C0A6C 38 21 00 10 */ addi r1, r1, 0x10 /* 802C4C30 002C0A70 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon7airball9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon7airball9StateMainFPQ43scn4step6weapon6Weapon: /* 803DB2D0 003D7110 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -980,7 +980,7 @@ lbl_803DBBF4: /* 803DBC00 003D7A40 38 21 00 10 */ addi r1, r1, 0x10 /* 803DBC04 003D7A44 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon11starshotlv19StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon11starshotlv19StateMainFPQ43scn4step6weapon6Weapon: /* 803DC2D4 003D8114 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1527,7 +1527,7 @@ deadWithEffect__Q53scn4step6weapon11starshotlv19StateMainFv: /* 803DCAA0 003D88E0 38 21 00 40 */ addi r1, r1, 0x40 /* 803DCAA4 003D88E4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon11starshotlv29StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon11starshotlv29StateMainFPQ43scn4step6weapon6Weapon: /* 803DCBC4 003D8A04 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -1936,7 +1936,7 @@ lbl_803DD16C: /* 803DD17C 003D8FBC 38 21 00 20 */ addi r1, r1, 0x20 /* 803DD180 003D8FC0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon11starshotlv39StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon11starshotlv39StateMainFPQ43scn4step6weapon6Weapon: /* 803DD2A0 003D90E0 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -3170,7 +3170,7 @@ lbl_803DE3E8: __dt__Q53scn4step6weapon9swordbeam9StateMainFv: /* 803DE3FC 003DA23C 4B FF A6 44 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon13whispyairball9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon13whispyairball9StateMainFPQ43scn4step6weapon6Weapon: /* 803DE5D0 003DA410 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -3493,7 +3493,7 @@ lbl_803DEA28: __dt__Q53scn4step6weapon13whispyairball9StateMainFv: /* 803DEA3C 003DA87C 4B FF A0 04 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon7rollexp9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon7rollexp9StateMainFPQ43scn4step6weapon6Weapon: /* 803DEB40 003DA980 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -3886,7 +3886,7 @@ lbl_803DF058: __dt__Q53scn4step6weapon7rollexp9StateMainFv: /* 803DF074 003DAEB4 4B FF 99 CC */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon12leafanpollen9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon12leafanpollen9StateMainFPQ43scn4step6weapon6Weapon: /* 803DF174 003DAFB4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -4994,7 +4994,7 @@ lbl_803E0158: __dt__Q53scn4step6weapon14gigantedgeshot9StateMainFv: /* 803E0170 003DBFB0 4B FF 88 D0 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon13gigatzobullet9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon13gigatzobullet9StateMainFPQ43scn4step6weapon6Weapon: /* 803E04F8 003DC338 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -6834,7 +6834,7 @@ lbl_803E1F30: __dt__Q53scn4step6weapon13gigatzobullet9StateMainFv: /* 803E1F48 003DDD88 4B FF 6A F8 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10comothread9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon10comothread9StateMainFPQ43scn4step6weapon6Weapon: /* 803E2374 003DE1B4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -7311,7 +7311,7 @@ lbl_803E29F8: /* 803E2A04 003DE844 38 21 00 20 */ addi r1, r1, 0x20 /* 803E2A08 003DE848 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon16enemywaterbullet9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon16enemywaterbullet9StateMainFPQ43scn4step6weapon6Weapon: /* 803E2B28 003DE968 94 21 FF 30 */ stwu r1, -0xd0(r1) @@ -8094,7 +8094,7 @@ lbl_803E34E0: /* 803E3660 003DF4A0 38 21 00 E0 */ addi r1, r1, 0xe0 /* 803E3664 003DF4A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon20enemywaterbulletwarp9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon20enemywaterbulletwarp9StateMainFPQ43scn4step6weapon6Weapon: /* 803E3784 003DF5C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -8690,7 +8690,7 @@ procObjCollReact__Q53scn4step6weapon12sparkshotlv39StateMainFv: __dt__Q53scn4step6weapon12sparkshotlv39StateMainFv: /* 803E3F60 003DFDA0 4B FF 4A E0 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10spearspear9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon10spearspear9StateMainFPQ43scn4step6weapon6Weapon: /* 803E4090 003DFED0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -9110,7 +9110,7 @@ __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspe __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803E463C 003E047C 4B E4 A0 64 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon12hammerhammer9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon12hammerhammer9StateMainFPQ43scn4step6weapon6Weapon: /* 803E5788 003E15C8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -9363,7 +9363,7 @@ create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammer __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803E5AF0 003E1930 4B E4 8B B0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon8wingshot9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon8wingshot9StateMainFPQ43scn4step6weapon6Weapon: /* 803E5C10 003E1A50 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -9824,7 +9824,7 @@ lbl_803E6270: /* 803E627C 003E20BC 38 21 00 20 */ addi r1, r1, 0x20 /* 803E6280 003E20C0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon16fightersmashshot9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon16fightersmashshot9StateMainFPQ43scn4step6weapon6Weapon: /* 803E63C0 003E2200 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -10036,7 +10036,7 @@ create__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fighte __dt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803E6698 003E24D8 4B E4 80 08 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon15fighterkickshot9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon15fighterkickshot9StateMainFPQ43scn4step6weapon6Weapon: /* 803E67D8 003E2618 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -10248,7 +10248,7 @@ create__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighte __dt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803E6AB0 003E28F0 4B E4 7B F0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon16fighterhadoushot9StateMainFPQ43scn4step6weapon6WeaponQ53scn4step6weapon16fighterhadoushot9Variation __ct__Q53scn4step6weapon16fighterhadoushot9StateMainFPQ43scn4step6weapon6WeaponQ53scn4step6weapon16fighterhadoushot9Variation: /* 803E6EA0 003E2CE0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -10546,7 +10546,7 @@ create__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighte __dt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1Fv: /* 803E728C 003E30CC 4B E4 74 14 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon12shotzobullet9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon12shotzobullet9StateMainFPQ43scn4step6weapon6Weapon: /* 803E738C 003E31CC 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -10847,7 +10847,7 @@ lbl_803E77D8: __dt__Q53scn4step6weapon12shotzobullet9StateMainFv: /* 803E77F0 003E3630 4B FF 12 50 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon15sirkibblecutter9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon15sirkibblecutter9StateMainFPQ43scn4step6weapon6Weapon: /* 803E7910 003E3750 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -11335,7 +11335,7 @@ lbl_803E8028: /* 803E8038 003E3E78 38 21 00 40 */ addi r1, r1, 0x40 /* 803E803C 003E3E7C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon13owgulffeather9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon13owgulffeather9StateMainFPQ43scn4step6weapon6Weapon: /* 803E813C 003E3F7C 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -11583,7 +11583,7 @@ addObjColl__Q53scn4step6weapon13owgulffeather9StateMainFv: /* 803E849C 003E42DC 38 21 00 10 */ addi r1, r1, 0x10 /* 803E84A0 003E42E0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon9foleyleaf9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon9foleyleaf9StateMainFPQ43scn4step6weapon6Weapon: /* 803E85CC 003E440C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -11735,7 +11735,7 @@ lbl_803E87DC: __dt__Q53scn4step6weapon9foleyleaf9StateMainFv: /* 803E87F0 003E4630 4B FF 02 50 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10bowbyarrow9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon10bowbyarrow9StateMainFPQ43scn4step6weapon6Weapon: /* 803E8974 003E47B4 94 21 FE B0 */ stwu r1, -0x150(r1) @@ -12510,7 +12510,7 @@ lbl_803E9478: __dt__Q53scn4step6weapon10bowbyarrow9StateMainFv: /* 803E9490 003E52D0 4B FE F5 B0 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon12jucklecutter9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon12jucklecutter9StateMainFPQ43scn4step6weapon6Weapon: /* 803E9590 003E53D0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -12734,7 +12734,7 @@ lbl_803E98B0: __dt__Q53scn4step6weapon12jucklecutter9StateMainFv: /* 803E98C4 003E5704 4B FE F1 7C */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon17tsukikageshuriken9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon17tsukikageshuriken9StateMainFPQ43scn4step6weapon6Weapon: /* 803E99E4 003E5824 94 21 FD F0 */ stwu r1, -0x210(r1) @@ -13700,7 +13700,7 @@ procFixPos__Q53scn4step6weapon13whispytornado9StateMainFv: __dt__Q53scn4step6weapon13whispytornado9StateMainFv: /* 803EA764 003E65A4 4B FE E2 DC */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10whispyroot9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon10whispyroot9StateMainFPQ43scn4step6weapon6Weapon: /* 803EA864 003E66A4 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -13995,7 +13995,7 @@ procFixPos__Q53scn4step6weapon10whispyroot9StateMainFv: __dt__Q53scn4step6weapon10whispyroot9StateMainFv: /* 803EACA8 003E6AE8 4B FE DD 98 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon18combinationairball9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon18combinationairball9StateMainFPQ43scn4step6weapon6Weapon: /* 803EADC8 003E6C08 94 21 FF 30 */ stwu r1, -0xd0(r1) @@ -14742,7 +14742,7 @@ lbl_803EB854: __dt__Q53scn4step6weapon19combinationmetabeam9StateMainFv: /* 803EB868 003E76A8 4B FE D1 D8 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon23combinationdededebomber9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon23combinationdededebomber9StateMainFPQ43scn4step6weapon6Weapon: /* 803EBA8C 003E78CC 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -15016,7 +15016,7 @@ create__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combin __dt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803EBE2C 003E7C6C 4B E4 28 74 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon18combinationdeeshot9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon18combinationdeeshot9StateMainFPQ43scn4step6weapon6Weapon: /* 803EBF2C 003E7D6C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -15640,7 +15640,7 @@ lbl_803EC788: /* 803EC794 003E85D4 38 21 00 20 */ addi r1, r1, 0x20 /* 803EC798 003E85D8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon12dededehammer9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon12dededehammer9StateMainFPQ43scn4step6weapon6Weapon: /* 803ECBD4 003E8A14 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -15913,7 +15913,7 @@ create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dedede __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803ECF84 003E8DC4 4B E4 17 1C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon8deespear9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon8deespear9StateMainFPQ43scn4step6weapon6Weapon: /* 803ED0B4 003E8EF4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -16329,7 +16329,7 @@ __dt__Q24util104StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear1 __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803ED650 003E9490 4B E4 10 50 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon13vacuumedblock9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon13vacuumedblock9StateMainFPQ43scn4step6weapon6Weapon: /* 803EEE68 003EACA8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -16364,7 +16364,7 @@ procMove__Q53scn4step6weapon13vacuumedblock9StateMainFv: procFixPos__Q53scn4step6weapon13vacuumedblock9StateMainFv: /* 803EEEB0 003EACF0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon11hotheadfire9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon11hotheadfire9StateMainFPQ43scn4step6weapon6Weapon: /* 803EF708 003EB548 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -16546,7 +16546,7 @@ lbl_803EF970: __dt__Q53scn4step6weapon11hotheadfire9StateMainFv: /* 803EF988 003EB7C8 4B FE 90 B8 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon26challengemastersummonlight9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon26challengemastersummonlight9StateMainFPQ43scn4step6weapon6Weapon: /* 803EFA7C 003EB8BC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -17072,7 +17072,7 @@ lbl_803F01F0: __dt__Q53scn4step6weapon26challengemastersummonlight9StateMainFv: /* 803F0210 003EC050 4B FE 88 30 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon19challengemastershot9StateMainFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon19challengemastershot9StateMainFPQ43scn4step6weapon6Weapon: /* 803F04DC 003EC31C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -17272,7 +17272,7 @@ procFixPos__Q53scn4step6weapon19challengemastershot9StateMainFv: __dt__Q53scn4step6weapon19challengemastershot9StateMainFv: /* 803F0784 003EC5C4 4B FE 82 BC */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2 ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2: .incbin "baserom.dol", 0x41CB30, 0x10 @@ -17286,7 +17286,7 @@ ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2: ATTACK_TYPE_TABLE__23$$2unnamed$$2StateMain_cpp$$2: .incbin "baserom.dol", 0x41CB60, 0x58 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_WN_NODE_INTERVAL__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2StateMain_cpp$$2 T_WN_NODE_INTERVAL__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2StateMain_cpp$$2: .incbin "baserom.dol", 0x41CBC8, 0xC @@ -17294,7 +17294,7 @@ T_WN_NODE_INTERVAL__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2StateMain T_WN_GRAVITY__Q53scn4step6weapon16enemywaterbullet23$$2unnamed$$2StateMain_cpp$$2: .incbin "baserom.dol", 0x41CBD4, 0xC -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_ROT_TABLE__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2 T_ROT_TABLE__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2: .incbin "baserom.dol", 0x41CC08, 0x10 @@ -17302,12 +17302,12 @@ T_ROT_TABLE__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2: T_HOLD_FRAME__Q53scn4step6weapon10whispyroot23$$2unnamed$$2StateMain_cpp$$2: .incbin "baserom.dol", 0x41CC18, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9mbossdead9StateMain __vt__Q53scn4step5enemy9mbossdead9StateMain: .incbin "baserom.dol", 0x475170, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon7airball9StateMain __vt__Q53scn4step6weapon7airball9StateMain: .incbin "baserom.dol", 0x48FFC8, 0x20 @@ -17315,17 +17315,17 @@ __vt__Q53scn4step6weapon7airball9StateMain: __vt__Q53scn4step6weapon17fireburningbullet9StateMain: .incbin "baserom.dol", 0x48FFE8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv19StateMain __vt__Q53scn4step6weapon11starshotlv19StateMain: .incbin "baserom.dol", 0x490098, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv29StateMain __vt__Q53scn4step6weapon11starshotlv29StateMain: .incbin "baserom.dol", 0x490110, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11starshotlv39StateMain __vt__Q53scn4step6weapon11starshotlv39StateMain: .incbin "baserom.dol", 0x4901A0, 0x20 @@ -17336,17 +17336,17 @@ __vt__Q53scn4step6weapon11waterpistol9StateMain: __vt__Q53scn4step6weapon9swordbeam9StateMain: .incbin "baserom.dol", 0x4901E0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13whispyairball9StateMain __vt__Q53scn4step6weapon13whispyairball9StateMain: .incbin "baserom.dol", 0x4902A0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon7rollexp9StateMain __vt__Q53scn4step6weapon7rollexp9StateMain: .incbin "baserom.dol", 0x4902F0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12leafanpollen9StateMain __vt__Q53scn4step6weapon12leafanpollen9StateMain: .incbin "baserom.dol", 0x490348, 0x20 @@ -17357,12 +17357,12 @@ __vt__Q53scn4step6weapon16kingsdoowaveshot9StateMain: __vt__Q53scn4step6weapon14gigantedgeshot9StateMain: .incbin "baserom.dol", 0x490388, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13gigatzobullet9StateMain __vt__Q53scn4step6weapon13gigatzobullet9StateMain: .incbin "baserom.dol", 0x490480, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10comothread9StateMain __vt__Q53scn4step6weapon10comothread9StateMain: .incbin "baserom.dol", 0x490518, 0x20 @@ -17370,12 +17370,12 @@ __vt__Q53scn4step6weapon10comothread9StateMain: __vt__Q53scn4step6weapon18watergalboroswater9StateMain: .incbin "baserom.dol", 0x490538, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon16enemywaterbullet9StateMain __vt__Q53scn4step6weapon16enemywaterbullet9StateMain: .incbin "baserom.dol", 0x4905D0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon20enemywaterbulletwarp9StateMain __vt__Q53scn4step6weapon20enemywaterbulletwarp9StateMain: .incbin "baserom.dol", 0x490670, 0x20 @@ -17392,7 +17392,7 @@ __vt__Q53scn4step6weapon12sparkshotlv29StateMain: __vt__Q53scn4step6weapon12sparkshotlv39StateMain: .incbin "baserom.dol", 0x4906F0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon10spearspear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x490780, 0x10 @@ -17409,7 +17409,7 @@ __vt__Q24util108StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon10spearspe __vt__Q53scn4step6weapon10spearspear9StateMain: .incbin "baserom.dol", 0x4907C0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerhammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x4908D0, 0x10 @@ -17417,7 +17417,7 @@ __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12hammerha __vt__Q53scn4step6weapon12hammerhammer9StateMain: .incbin "baserom.dol", 0x4908E0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8wingshot9StateMain __vt__Q53scn4step6weapon8wingshot9StateMain: .incbin "baserom.dol", 0x490928, 0x20 @@ -17425,7 +17425,7 @@ __vt__Q53scn4step6weapon8wingshot9StateMain: __vt__Q53scn4step6weapon13wingshockwave9StateMain: .incbin "baserom.dol", 0x490948, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fightersmashshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x490988, 0x10 @@ -17433,7 +17433,7 @@ __vt__Q24util112StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon16fighters __vt__Q53scn4step6weapon16fightersmashshot9StateMain: .incbin "baserom.dol", 0x490998, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterkickshot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x4909D8, 0x10 @@ -17441,7 +17441,7 @@ __vt__Q24util111StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon15fighterk __vt__Q53scn4step6weapon15fighterkickshot9StateMain: .incbin "baserom.dol", 0x4909E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1 __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterhadoushot14StateExplosion$$4PQ43scn4step6weapon6Weapon$$4Q53scn4step6weapon16fighterhadoushot9Variation$$1: .incbin "baserom.dol", 0x490A58, 0x10 @@ -17449,37 +17449,37 @@ __vt__Q24util159StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon16fighterh __vt__Q53scn4step6weapon16fighterhadoushot9StateMain: .incbin "baserom.dol", 0x490A68, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12shotzobullet9StateMain __vt__Q53scn4step6weapon12shotzobullet9StateMain: .incbin "baserom.dol", 0x490AC0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon15sirkibblecutter9StateMain __vt__Q53scn4step6weapon15sirkibblecutter9StateMain: .incbin "baserom.dol", 0x490B10, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13owgulffeather9StateMain __vt__Q53scn4step6weapon13owgulffeather9StateMain: .incbin "baserom.dol", 0x490B60, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon9foleyleaf9StateMain __vt__Q53scn4step6weapon9foleyleaf9StateMain: .incbin "baserom.dol", 0x490BD0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10bowbyarrow9StateMain __vt__Q53scn4step6weapon10bowbyarrow9StateMain: .incbin "baserom.dol", 0x490C48, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon12jucklecutter9StateMain __vt__Q53scn4step6weapon12jucklecutter9StateMain: .incbin "baserom.dol", 0x490CA0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon17tsukikageshuriken9StateMain __vt__Q53scn4step6weapon17tsukikageshuriken9StateMain: .incbin "baserom.dol", 0x490CF0, 0x20 @@ -17496,12 +17496,12 @@ __vt__Q53scn4step6weapon10floweffect9StateMain: __vt__Q53scn4step6weapon13whispytornado9StateMain: .incbin "baserom.dol", 0x490D70, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10whispyroot9StateMain __vt__Q53scn4step6weapon10whispyroot9StateMain: .incbin "baserom.dol", 0x490DB8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon18combinationairball9StateMain __vt__Q53scn4step6weapon18combinationairball9StateMain: .incbin "baserom.dol", 0x490E18, 0x20 @@ -17509,7 +17509,7 @@ __vt__Q53scn4step6weapon18combinationairball9StateMain: __vt__Q53scn4step6weapon19combinationmetabeam9StateMain: .incbin "baserom.dol", 0x490E38, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinationdededebomber14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x490E78, 0x10 @@ -17517,7 +17517,7 @@ __vt__Q24util119StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon23combinat __vt__Q53scn4step6weapon23combinationdededebomber9StateMain: .incbin "baserom.dol", 0x490E88, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon18combinationdeeshot9StateMain __vt__Q53scn4step6weapon18combinationdeeshot9StateMain: .incbin "baserom.dol", 0x490EF0, 0x20 @@ -17528,7 +17528,7 @@ __vt__Q53scn4step6weapon8metabeam9StateMain: __vt__Q53scn4step6weapon13metashockwave9StateMain: .incbin "baserom.dol", 0x490F30, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededehammer14StateExplosion$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x490FA8, 0x10 @@ -17536,7 +17536,7 @@ __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon12dededeha __vt__Q53scn4step6weapon12dededehammer9StateMain: .incbin "baserom.dol", 0x490FB8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon8deespear12StateReflect$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x491048, 0x10 @@ -17553,42 +17553,42 @@ __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon8deespear1 __vt__Q53scn4step6weapon8deespear9StateMain: .incbin "baserom.dol", 0x491088, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13vacuumedblock9StateMain __vt__Q53scn4step6weapon13vacuumedblock9StateMain: .incbin "baserom.dol", 0x491308, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon11hotheadfire9StateMain __vt__Q53scn4step6weapon11hotheadfire9StateMain: .incbin "baserom.dol", 0x4913D0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon26challengemastersummonlight9StateMain __vt__Q53scn4step6weapon26challengemastersummonlight9StateMain: .incbin "baserom.dol", 0x491420, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon19challengemastershot9StateMain __vt__Q53scn4step6weapon19challengemastershot9StateMain: .incbin "baserom.dol", 0x491480, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256519 $$256519: .incbin "baserom.dol", 0x498468, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256548 $$256548: .incbin "baserom.dol", 0x498490, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256804 $$256804: .incbin "baserom.dol", 0x4984B8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256562 $$256562: .incbin "baserom.dol", 0x4986F8, 0x4 @@ -17602,7 +17602,7 @@ $$256566: $$256572: .incbin "baserom.dol", 0x498704, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256164 $$256164: .incbin "baserom.dol", 0x498728, 0x4 @@ -17616,7 +17616,7 @@ $$256168: $$256174: .incbin "baserom.dol", 0x498734, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256978 $$256978: .incbin "baserom.dol", 0x49C818, 0x4 @@ -17627,7 +17627,7 @@ $$256979: $$256980: .incbin "baserom.dol", 0x49C820, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257154 $$257154: .incbin "baserom.dol", 0x49E898, 0x4 @@ -17671,7 +17671,7 @@ $$257667: $$257720: .incbin "baserom.dol", 0x49E8E0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257577 $$257577: .incbin "baserom.dol", 0x49E8F0, 0x4 @@ -17691,7 +17691,7 @@ $$257620: $$257623: .incbin "baserom.dol", 0x49E908, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257870 $$257870: .incbin "baserom.dol", 0x49E918, 0x4 @@ -17756,7 +17756,7 @@ $$256513: $$256527: .incbin "baserom.dol", 0x49E978, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257213 $$257213: .incbin "baserom.dol", 0x49E988, 0x8 @@ -17845,7 +17845,7 @@ $$257108: $$257109: .incbin "baserom.dol", 0x49EA10, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258554 $$258554: .incbin "baserom.dol", 0x49EA20, 0x4 @@ -17865,7 +17865,7 @@ lbl_80563EF4: $$258712: .incbin "baserom.dol", 0x49EA38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256720 $$256720: .incbin "baserom.dol", 0x49EA48, 0x4 @@ -17879,7 +17879,7 @@ $$257163: $$257164: .incbin "baserom.dol", 0x49EA54, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256753 $$256753: .incbin "baserom.dol", 0x49EAA8, 0x4 @@ -17893,7 +17893,7 @@ $$256765: $$256766: .incbin "baserom.dol", 0x49EAB4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256698 $$256698: .incbin "baserom.dol", 0x49EAC0, 0x4 @@ -17928,7 +17928,7 @@ $$256744: $$256765: .incbin "baserom.dol", 0x49EAE8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256838 $$256838: .incbin "baserom.dol", 0x49EB08, 0x8 @@ -17942,7 +17942,7 @@ $$257037: $$257087: .incbin "baserom.dol", 0x49EB18, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257342 $$257342: .incbin "baserom.dol", 0x49EB28, 0x4 @@ -18004,7 +18004,7 @@ $$256964: $$257016: .incbin "baserom.dol", 0x49EB84, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257755 $$257755: .incbin "baserom.dol", 0x49EB90, 0x4 @@ -18057,7 +18057,7 @@ $$256976: $$256979: .incbin "baserom.dol", 0x49EBD8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256687 $$256687: .incbin "baserom.dol", 0x49EBE8, 0x8 @@ -18083,7 +18083,7 @@ $$256666: $$256693: .incbin "baserom.dol", 0x49EC0C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256767 $$256767: .incbin "baserom.dol", 0x49EC28, 0x4 @@ -18103,7 +18103,7 @@ $$257159: $$257160: .incbin "baserom.dol", 0x49EC3C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256440 $$256440: .incbin "baserom.dol", 0x49EC80, 0x4 diff --git a/asm/src/StateMasterSummon.s b/asm/src/StateMasterSummon.s index 4f5b7b88..406e5d80 100644 --- a/asm/src/StateMasterSummon.s +++ b/asm/src/StateMasterSummon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common17StateMasterSummonFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common17StateMasterSummonFPQ43scn4step5enemy5Enemy: /* 80292C4C 0028EA8C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -559,12 +559,12 @@ lbl_8029343C: /* 8029344C 0028F28C 38 21 00 90 */ addi r1, r1, 0x90 /* 80293450 0028F290 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common17StateMasterSummon __vt__Q53scn4step5enemy6common17StateMasterSummon: .incbin "baserom.dol", 0x46F318, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257050 $$257050: .incbin "baserom.dol", 0x49BB98, 0x4 diff --git a/asm/src/StateMasterSummonWait.s b/asm/src/StateMasterSummonWait.s index 7dc794fd..f2800f43 100644 --- a/asm/src/StateMasterSummonWait.s +++ b/asm/src/StateMasterSummonWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common21StateMasterSummonWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common21StateMasterSummonWaitFPQ43scn4step5enemy5Enemy: /* 80293454 0028F294 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -318,7 +318,7 @@ lbl_8029389C: /* 802938AC 0028F6EC 38 21 00 80 */ addi r1, r1, 0x80 /* 802938B0 0028F6F0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common21StateMasterSummonWait __vt__Q53scn4step5enemy6common21StateMasterSummonWait: .incbin "baserom.dol", 0x46F338, 0x20 diff --git a/asm/src/StateMix.s b/asm/src/StateMix.s index 24794483..056f3516 100644 --- a/asm/src/StateMix.s +++ b/asm/src/StateMix.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global shuffleManager__Q53scn4step4hero6common22$$2unnamed$$2StateMix_cpp$$2FRQ43scn4step4hero4Hero shuffleManager__Q53scn4step4hero6common22$$2unnamed$$2StateMix_cpp$$2FRQ43scn4step4hero4Hero: /* 803668CC 0036270C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -567,7 +567,7 @@ lbl_803670E0: /* 803670F0 00362F30 38 21 00 10 */ addi r1, r1, 0x10 /* 803670F4 00362F34 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common8StateMix __vt__Q53scn4step4hero6common8StateMix: .incbin "baserom.dol", 0x487F48, 0x28 diff --git a/asm/src/StateMixPre.s b/asm/src/StateMixPre.s index cd06a0f5..c9c15cca 100644 --- a/asm/src/StateMixPre.s +++ b/asm/src/StateMixPre.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common11StateMixPreFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common11StateMixPreFPQ43scn4step4hero4Hero: /* 803670F8 00362F38 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -169,7 +169,7 @@ create__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8St __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1Fv: /* 80367348 00363188 4B EC 73 58 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common8StateMix$$4PQ43scn4step4hero4Hero$$4Q25ostop9ReqHandle$$1: .incbin "baserom.dol", 0x487F70, 0x10 diff --git a/asm/src/StateMoonSault.s b/asm/src/StateMoonSault.s index 64a78dd5..fe667c61 100644 --- a/asm/src/StateMoonSault.s +++ b/asm/src/StateMoonSault.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter14StateMoonSaultFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter14StateMoonSaultFPQ43scn4step4hero4Hero: /* 8039DAF4 00399934 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -199,7 +199,7 @@ lbl_8039DD9C: procFixPos__Q53scn4step4hero7fighter14StateMoonSaultFv: /* 8039DDB4 00399BF4 4B FC 2A CC */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter14StateMoonSault __vt__Q53scn4step4hero7fighter14StateMoonSault: .incbin "baserom.dol", 0x48A5C0, 0x28 diff --git a/asm/src/StateMove.s b/asm/src/StateMove.s index 4dd07d2b..dd3700d8 100644 --- a/asm/src/StateMove.s +++ b/asm/src/StateMove.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7blipper9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7blipper9StateMoveFPQ43scn4step5enemy5Enemy: /* 8029B29C 002970DC 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -619,7 +619,7 @@ lbl_8029BB2C: __dt__Q53scn4step5enemy7blipper9StateMoveFv: /* 8029BB7C 002979BC 4B FF 5E 3C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6chilly9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6chilly9StateMoveFPQ43scn4step5enemy5Enemy: /* 802A68F0 002A2730 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -829,7 +829,7 @@ procFixPos__Q53scn4step5enemy6chilly9StateMoveFv: __dt__Q53scn4step5enemy6chilly9StateMoveFv: /* 802A6BCC 002A2A0C 4B FE AD EC */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8dubiorjr9StateMoveFPQ43scn4step5enemy5Enemyff __ct__Q53scn4step5enemy8dubiorjr9StateMoveFPQ43scn4step5enemy5Enemyff: /* 802AE6F8 002AA538 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -1179,7 +1179,7 @@ lbl_802AEBF4: /* 802AEC00 002AAA40 38 21 00 40 */ addi r1, r1, 0x40 /* 802AEC04 002AAA44 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4elec9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4elec9StateMoveFPQ43scn4step5enemy5Enemy: /* 802B0294 002AC0D4 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -2263,7 +2263,7 @@ lbl_802B120C: /* 802B1254 002AD094 38 21 00 30 */ addi r1, r1, 0x30 /* 802B1258 002AD098 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6flamer9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6flamer9StateMoveFPQ43scn4step5enemy5Enemy: /* 802B347C 002AF2BC 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -3245,7 +3245,7 @@ lbl_802B4284: /* 802B42CC 002B010C 38 21 00 30 */ addi r1, r1, 0x30 /* 802B42D0 002B0110 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5foley9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5foley9StateMoveFPQ43scn4step5enemy5Enemy: /* 802B4FF8 002B0E38 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3460,7 +3460,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11St __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B52D8 002B1118 4B F7 93 C8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu9StateMoveFPQ43scn4step5enemy5Enemy: /* 802BDBF0 002B9A30 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -3772,7 +3772,7 @@ lbl_802BE030: /* 802BE040 002B9E80 38 21 00 50 */ addi r1, r1, 0x50 /* 802BE044 002B9E84 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10poppybrojr9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10poppybrojr9StateMoveFPQ43scn4step5enemy5Enemy: /* 802D1FF8 002CDE38 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -4174,7 +4174,7 @@ procFixPos__Q53scn4step5enemy10poppybrojr9StateMoveFv: __dt__Q53scn4step5enemy10poppybrojr9StateMoveFv: /* 802D259C 002CE3DC 4B FB F4 1C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8rollball9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8rollball9StateMoveFPQ43scn4step5enemy5Enemy: /* 802D69EC 002D282C 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -6258,7 +6258,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball1 __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D87F4 002D4634 4B F5 5E AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8searches9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8searches9StateMoveFPQ43scn4step5enemy5Enemy: /* 802DC290 002D80D0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -6458,7 +6458,7 @@ lbl_802DC53C: __dt__Q53scn4step5enemy8searches9StateMoveFv: /* 802DC554 002D8394 4B FB 54 64 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy3sun9StateMoveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy3sun9StateMoveFPQ43scn4step5enemy5Enemy: /* 802E8D28 002E4B68 94 21 FE A0 */ stwu r1, -0x160(r1) @@ -7535,32 +7535,32 @@ lbl_802E9CA4: /* 802E9CCC 002E5B0C 38 21 00 60 */ addi r1, r1, 0x60 /* 802E9CD0 002E5B10 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7blipper9StateMove __vt__Q53scn4step5enemy7blipper9StateMove: .incbin "baserom.dol", 0x470040, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6chilly9StateMove __vt__Q53scn4step5enemy6chilly9StateMove: .incbin "baserom.dol", 0x471A50, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8dubiorjr9StateMove __vt__Q53scn4step5enemy8dubiorjr9StateMove: .incbin "baserom.dol", 0x472448, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4elec9StateMove __vt__Q53scn4step5enemy4elec9StateMove: .incbin "baserom.dol", 0x472888, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6flamer9StateMove __vt__Q53scn4step5enemy6flamer9StateMove: .incbin "baserom.dol", 0x472DB0, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x472FA0, 0x10 @@ -7568,17 +7568,17 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5foley11Stat __vt__Q53scn4step5enemy5foley9StateMove: .incbin "baserom.dol", 0x472FB0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu9StateMove __vt__Q53scn4step5enemy4kabu9StateMove: .incbin "baserom.dol", 0x4742F8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr9StateMove __vt__Q53scn4step5enemy10poppybrojr9StateMove: .incbin "baserom.dol", 0x476980, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11StateDamage$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477220, 0x10 @@ -7586,22 +7586,22 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8rollball11S __vt__Q53scn4step5enemy8rollball9StateMove: .incbin "baserom.dol", 0x477230, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8searches9StateMove __vt__Q53scn4step5enemy8searches9StateMove: .incbin "baserom.dol", 0x4779B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy3sun9StateMove __vt__Q53scn4step5enemy3sun9StateMove: .incbin "baserom.dol", 0x4795C8, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255763 $$255763: .incbin "baserom.dol", 0x495D80, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255521 $$255521: .incbin "baserom.dol", 0x496308, 0x4 @@ -7675,7 +7675,7 @@ $$255552: $$255553: .incbin "baserom.dol", 0x496364, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256356 $$256356: .incbin "baserom.dol", 0x49BE38, 0x4 @@ -7695,7 +7695,7 @@ $$256466: $$256467: .incbin "baserom.dol", 0x49BE4C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255848 $$255848: .incbin "baserom.dol", 0x49C088, 0x8 @@ -7706,7 +7706,7 @@ $$255851: $$255853: .incbin "baserom.dol", 0x49C098, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256340 $$256340: .incbin "baserom.dol", 0x49C300, 0x4 @@ -7726,7 +7726,7 @@ $$256407: $$256410: .incbin "baserom.dol", 0x49C318, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257616 $$257616: .incbin "baserom.dol", 0x49C378, 0x4 @@ -7770,7 +7770,7 @@ $$257793: $$257800: .incbin "baserom.dol", 0x49C3B4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257548 $$257548: .incbin "baserom.dol", 0x49C468, 0x4 @@ -7814,7 +7814,7 @@ $$257721: $$257728: .incbin "baserom.dol", 0x49C4A4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255918 $$255918: .incbin "baserom.dol", 0x49C4C0, 0x4 @@ -7822,12 +7822,12 @@ $$255918: $$255919: .incbin "baserom.dol", 0x49C4C4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256136 $$256136: .incbin "baserom.dol", 0x49C680, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256352 $$256352: .incbin "baserom.dol", 0x49CAD0, 0x4 @@ -7844,7 +7844,7 @@ $$256411: $$256412: .incbin "baserom.dol", 0x49CAE0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259518 $$259518: .incbin "baserom.dol", 0x49CBA0, 0x4 @@ -7909,12 +7909,12 @@ $$259768: $$259769: .incbin "baserom.dol", 0x49CBF8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256202 $$256202: .incbin "baserom.dol", 0x49CCD0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258458 $$258458: .incbin "baserom.dol", 0x49CF58, 0x4 diff --git a/asm/src/StateMoveAround.s b/asm/src/StateMoveAround.s index 27b36d2b..7fb37668 100644 --- a/asm/src/StateMoveAround.s +++ b/asm/src/StateMoveAround.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu15StateMoveAroundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu15StateMoveAroundFPQ43scn4step5enemy5Enemy: /* 802BE048 002B9E88 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -296,12 +296,12 @@ turn__Q53scn4step5enemy4kabu15StateMoveAroundFv: /* 802BE45C 002BA29C 38 21 00 10 */ addi r1, r1, 0x10 /* 802BE460 002BA2A0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu15StateMoveAround __vt__Q53scn4step5enemy4kabu15StateMoveAround: .incbin "baserom.dol", 0x474318, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256041 $$256041: .incbin "baserom.dol", 0x49C688, 0x8 diff --git a/asm/src/StateMoveBack.s b/asm/src/StateMoveBack.s index 3b04915d..4eb8c950 100644 --- a/asm/src/StateMoveBack.s +++ b/asm/src/StateMoveBack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common13StateMoveBackFPQ43scn4step4boss4BossQ53scn4step4boss6common13StateMoveDescUl __ct__Q53scn4step4boss6common13StateMoveBackFPQ43scn4step4boss4BossQ53scn4step4boss6common13StateMoveDescUl: /* 8024743C 0024327C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -80,7 +80,7 @@ procMove__Q53scn4step4boss6common13StateMoveBackFv: procFixPos__Q53scn4step4boss6common13StateMoveBackFv: /* 80247538 00243378 4B FF 0A 88 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common13StateMoveBack __vt__Q53scn4step4boss6common13StateMoveBack: .incbin "baserom.dol", 0x462550, 0x20 diff --git a/asm/src/StateMoveCircle.s b/asm/src/StateMoveCircle.s index 22812e2e..6c15054b 100644 --- a/asm/src/StateMoveCircle.s +++ b/asm/src/StateMoveCircle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gordo15StateMoveCircleFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gordo15StateMoveCircleFPQ43scn4step5enemy5Enemy: /* 802B9138 002B4F78 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -236,12 +236,12 @@ lbl_802B93E0: __dt__Q53scn4step5enemy5gordo15StateMoveCircleFv: /* 802B9490 002B52D0 4B FD 85 28 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gordo15StateMoveCircle __vt__Q53scn4step5enemy5gordo15StateMoveCircle: .incbin "baserom.dol", 0x473758, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255034 $$255034: .incbin "baserom.dol", 0x49C598, 0x4 diff --git a/asm/src/StateMoveForward.s b/asm/src/StateMoveForward.s index 9b01b96b..f9c1556e 100644 --- a/asm/src/StateMoveForward.s +++ b/asm/src/StateMoveForward.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common16StateMoveForwardFPQ43scn4step4boss4BossQ53scn4step4boss6common13StateMoveDescUl __ct__Q53scn4step4boss6common16StateMoveForwardFPQ43scn4step4boss4BossQ53scn4step4boss6common13StateMoveDescUl: /* 8024753C 0024337C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -79,7 +79,7 @@ procMove__Q53scn4step4boss6common16StateMoveForwardFv: procFixPos__Q53scn4step4boss6common16StateMoveForwardFv: /* 80247634 00243474 4B FF 09 8C */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath16StateMoveForwardFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9moundeath16StateMoveForwardFPQ43scn4step4boss4Boss: /* 80255DEC 00251C2C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -236,17 +236,17 @@ procMove__Q53scn4step4boss9moundeath16StateMoveForwardFv: procFixPos__Q53scn4step4boss9moundeath16StateMoveForwardFv: /* 80256018 00251E58 4B FE 1F A8 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common16StateMoveForward __vt__Q53scn4step4boss6common16StateMoveForward: .incbin "baserom.dol", 0x462570, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath16StateMoveForward __vt__Q53scn4step4boss9moundeath16StateMoveForward: .incbin "baserom.dol", 0x4651A0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254872 $$254872: .incbin "baserom.dol", 0x49B408, 0x4 diff --git a/asm/src/StateMoveJoint.s b/asm/src/StateMoveJoint.s index fb475119..7db0db87 100644 --- a/asm/src/StateMoveJoint.s +++ b/asm/src/StateMoveJoint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common14StateMoveJointFPQ43scn4step4boss4BossQ53scn4step4boss6common18StateMoveJointDescUl __ct__Q53scn4step4boss6common14StateMoveJointFPQ43scn4step4boss4BossQ53scn4step4boss6common18StateMoveJointDescUl: /* 80247638 00243478 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -87,7 +87,7 @@ procMove__Q53scn4step4boss6common14StateMoveJointFv: procFixPos__Q53scn4step4boss6common14StateMoveJointFv: /* 8024774C 0024358C 4B FF 08 74 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common14StateMoveJoint __vt__Q53scn4step4boss6common14StateMoveJoint: .incbin "baserom.dol", 0x462590, 0x20 diff --git a/asm/src/StateMoveSinCurve.s b/asm/src/StateMoveSinCurve.s index 9508865a..a20abdd7 100644 --- a/asm/src/StateMoveSinCurve.s +++ b/asm/src/StateMoveSinCurve.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gordo17StateMoveSinCurveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gordo17StateMoveSinCurveFPQ43scn4step5enemy5Enemy: /* 802B9494 002B52D4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -308,12 +308,12 @@ lbl_802B98D4: __dt__Q53scn4step5enemy5gordo17StateMoveSinCurveFv: /* 802B98F8 002B5738 4B FD 80 C0 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gordo17StateMoveSinCurve __vt__Q53scn4step5enemy5gordo17StateMoveSinCurve: .incbin "baserom.dol", 0x473778, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255872 $$255872: .incbin "baserom.dol", 0x49C5A0, 0x4 diff --git a/asm/src/StateMoveStraight.s b/asm/src/StateMoveStraight.s index 19340c2d..2af1c572 100644 --- a/asm/src/StateMoveStraight.s +++ b/asm/src/StateMoveStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gordo17StateMoveStraightFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gordo17StateMoveStraightFPQ43scn4step5enemy5Enemy: /* 802B98FC 002B573C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -166,12 +166,12 @@ lbl_802B9B30: __dt__Q53scn4step5enemy5gordo17StateMoveStraightFv: /* 802B9B44 002B5984 4B FD 7E 74 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5gordo17StateMoveStraight __vt__Q53scn4step5enemy5gordo17StateMoveStraight: .incbin "baserom.dol", 0x473798, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255765 $$255765: .incbin "baserom.dol", 0x49C5B0, 0x8 diff --git a/asm/src/StateMoveThunder.s b/asm/src/StateMoveThunder.s index 68c60c9e..5bdb3402 100644 --- a/asm/src/StateMoveThunder.s +++ b/asm/src/StateMoveThunder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior16StateMoveThunderFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior16StateMoveThunderFPQ43scn4step4boss4Boss: /* 8024F2BC 0024B0FC 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -471,12 +471,12 @@ lbl_8024F910: procFixPos__Q53scn4step4boss6dubior16StateMoveThunderFv: /* 8024F978 0024B7B8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior16StateMoveThunder __vt__Q53scn4step4boss6dubior16StateMoveThunder: .incbin "baserom.dol", 0x463910, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257085 $$257085: .incbin "baserom.dol", 0x49B2F0, 0x4 diff --git a/asm/src/StateMoveThunderStart.s b/asm/src/StateMoveThunderStart.s index 8eaaf718..d118786d 100644 --- a/asm/src/StateMoveThunderStart.s +++ b/asm/src/StateMoveThunderStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior21StateMoveThunderStartFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior21StateMoveThunderStartFPQ43scn4step4boss4Boss: /* 8024F97C 0024B7BC 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -267,7 +267,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16St __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1Fv: /* 8024FD38 0024BB78 4B FD E9 68 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16StateMoveThunder$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x463930, 0x10 @@ -275,7 +275,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior16Stat __vt__Q53scn4step4boss6dubior21StateMoveThunderStart: .incbin "baserom.dol", 0x463940, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256036 $$256036: .incbin "baserom.dol", 0x49B320, 0x4 diff --git a/asm/src/StateMoveToOtherSide.s b/asm/src/StateMoveToOtherSide.s index 01653f7c..38108542 100644 --- a/asm/src/StateMoveToOtherSide.s +++ b/asm/src/StateMoveToOtherSide.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior20StateMoveToOtherSideFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior20StateMoveToOtherSideFPQ43scn4step4boss4Boss: /* 8024FD3C 0024BB7C 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -413,17 +413,17 @@ procMove__Q53scn4step4boss6dubior20StateMoveToOtherSideFv: procFixPos__Q53scn4step4boss6dubior20StateMoveToOtherSideFv: /* 80250330 0024C170 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global WaitFrameTable__Q53scn4step4boss6dubior34$$2unnamed$$2StateMoveToOtherSide_cpp$$2 WaitFrameTable__Q53scn4step4boss6dubior34$$2unnamed$$2StateMoveToOtherSide_cpp$$2: .incbin "baserom.dol", 0x412CC8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior20StateMoveToOtherSide __vt__Q53scn4step4boss6dubior20StateMoveToOtherSide: .incbin "baserom.dol", 0x463960, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256237 $$256237: .incbin "baserom.dol", 0x49B338, 0x4 diff --git a/asm/src/StateNormal.s b/asm/src/StateNormal.s index fc31f1ba..b941052e 100644 --- a/asm/src/StateNormal.s +++ b/asm/src/StateNormal.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon11StateNormalFPQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon11StateNormalFPQ43scn4step6weapon6Weapon: /* 803D8A04 003D4844 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -99,12 +99,12 @@ lbl_803D8B34: /* 803D8B40 003D4980 38 21 00 10 */ addi r1, r1, 0x10 /* 803D8B44 003D4984 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon11StateNormal __vt__Q43scn4step6weapon11StateNormal: .incbin "baserom.dol", 0x48FEC0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256141 $$256141: .incbin "baserom.dol", 0x49E860, 0x8 diff --git a/asm/src/StateNoseDive.s b/asm/src/StateNoseDive.s index 4f334eff..566e954f 100644 --- a/asm/src/StateNoseDive.s +++ b/asm/src/StateNoseDive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee13StateNoseDiveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee13StateNoseDiveFPQ43scn4step5enemy5Enemy: /* 802CCCF4 002C8B34 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -283,7 +283,7 @@ lbl_802CD0E8: __dt__Q53scn4step5enemy10parasoldee13StateNoseDiveFv: /* 802CD100 002C8F40 4B FC 48 B8 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo13StateNoseDiveFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo13StateNoseDiveFPQ43scn4step5enemy5Enemy: /* 802CEB40 002CA980 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -562,17 +562,17 @@ lbl_802CEF24: __dt__Q53scn4step5enemy10parasoldoo13StateNoseDiveFv: /* 802CEF3C 002CAD7C 4B FC 2A 7C */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee13StateNoseDive __vt__Q53scn4step5enemy10parasoldee13StateNoseDive: .incbin "baserom.dol", 0x4761E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo13StateNoseDive __vt__Q53scn4step5enemy10parasoldoo13StateNoseDive: .incbin "baserom.dol", 0x476398, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257074 $$257074: .incbin "baserom.dol", 0x49C9C8, 0x4 @@ -586,7 +586,7 @@ $$257076: $$257102: .incbin "baserom.dol", 0x49C9D4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256945 $$256945: .incbin "baserom.dol", 0x49CA18, 0x4 diff --git a/asm/src/StatePanic.s b/asm/src/StatePanic.s index 77b97b7e..cb95fcb3 100644 --- a/asm/src/StatePanic.s +++ b/asm/src/StatePanic.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster10StatePanicFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster10StatePanicFPQ43scn4step4boss4Boss: /* 802416E4 0023D524 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -250,7 +250,7 @@ create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challeng __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1Fv: /* 80241A34 0023D874 4B FE CC 6C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster10StatePanic$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461F98, 0x10 diff --git a/asm/src/StateParasolCapture.s b/asm/src/StateParasolCapture.s index cd5a834f..522b5049 100644 --- a/asm/src/StateParasolCapture.s +++ b/asm/src/StateParasolCapture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7parasol19StateParasolCaptureFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7parasol19StateParasolCaptureFPQ43scn4step4hero4Hero: /* 803928FC 0038E73C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -414,15 +414,15 @@ __sinit_$$3StateParasolCapture_cpp: /* 80392EF8 0038ED38 38 21 00 10 */ addi r1, r1, 0x10 /* 80392EFC 0038ED3C 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025D0, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol19StateParasolCapture __vt__Q53scn4step4hero7parasol19StateParasolCapture: .incbin "baserom.dol", 0x489D00, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258789 $$258789: .incbin "baserom.dol", 0x49E158, 0x4 diff --git a/asm/src/StateParasolDive.s b/asm/src/StateParasolDive.s index 787fb464..8102e044 100644 --- a/asm/src/StateParasolDive.s +++ b/asm/src/StateParasolDive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7parasol16StateParasolDiveFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7parasol16StateParasolDiveFPQ43scn4step4hero4Hero: /* 80392F00 0038ED40 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -412,7 +412,7 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16Sta __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1Fv: /* 803934C0 0038F300 4B E9 B1 E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolParachuteFall$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489D28, 0x10 @@ -423,7 +423,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol16Sta __vt__Q53scn4step4hero7parasol16StateParasolDive: .incbin "baserom.dol", 0x489D48, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258601 $$258601: .incbin "baserom.dol", 0x49E190, 0x8 diff --git a/asm/src/StateParasolDrill.s b/asm/src/StateParasolDrill.s index af2e2918..08b7a6aa 100644 --- a/asm/src/StateParasolDrill.s +++ b/asm/src/StateParasolDrill.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7parasol17StateParasolDrillFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7parasol17StateParasolDrillFPQ43scn4step4hero4Hero: /* 803934C4 0038F304 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -411,7 +411,7 @@ __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17Sta __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 80393A68 0038F8A8 4B E9 AC 38 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol20StateParasolDrillEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489D70, 0x10 @@ -422,7 +422,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17Sta __vt__Q53scn4step4hero7parasol17StateParasolDrill: .incbin "baserom.dol", 0x489D90, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258531 $$258531: .incbin "baserom.dol", 0x49E198, 0x4 diff --git a/asm/src/StateParasolDrillEnd.s b/asm/src/StateParasolDrillEnd.s index 246c8bd4..bbba6bfd 100644 --- a/asm/src/StateParasolDrillEnd.s +++ b/asm/src/StateParasolDrillEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7parasol20StateParasolDrillEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7parasol20StateParasolDrillEndFPQ43scn4step4hero4Hero: /* 80393A6C 0038F8AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -104,7 +104,7 @@ procMove__Q53scn4step4hero7parasol20StateParasolDrillEndFv: procFixPos__Q53scn4step4hero7parasol20StateParasolDrillEndFv: /* 80393BC0 0038FA00 4B FC CC C0 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol20StateParasolDrillEnd __vt__Q53scn4step4hero7parasol20StateParasolDrillEnd: .incbin "baserom.dol", 0x489DB8, 0x28 diff --git a/asm/src/StateParasolFall.s b/asm/src/StateParasolFall.s index 784c8380..7ae49e97 100644 --- a/asm/src/StateParasolFall.s +++ b/asm/src/StateParasolFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee16StateParasolFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee16StateParasolFallFPQ43scn4step5enemy5Enemy: /* 802CD104 002C8F44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -237,7 +237,7 @@ lbl_802CD43C: __dt__Q53scn4step5enemy10parasoldee16StateParasolFallFv: /* 802CD454 002C9294 4B FC 45 64 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo16StateParasolFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo16StateParasolFallFPQ43scn4step5enemy5Enemy: /* 802CEF40 002CAD80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -471,17 +471,17 @@ lbl_802CF26C: __dt__Q53scn4step5enemy10parasoldoo16StateParasolFallFv: /* 802CF284 002CB0C4 4B FC 27 34 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee16StateParasolFall __vt__Q53scn4step5enemy10parasoldee16StateParasolFall: .incbin "baserom.dol", 0x476208, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo16StateParasolFall __vt__Q53scn4step5enemy10parasoldoo16StateParasolFall: .incbin "baserom.dol", 0x4763B8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256866 $$256866: .incbin "baserom.dol", 0x49C9D8, 0x4 @@ -498,7 +498,7 @@ $$256869: $$256892: .incbin "baserom.dol", 0x49C9E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256865 $$256865: .incbin "baserom.dol", 0x49CA28, 0x4 diff --git a/asm/src/StateParasolParachute.s b/asm/src/StateParasolParachute.s index 37772247..5e8b3e77 100644 --- a/asm/src/StateParasolParachute.s +++ b/asm/src/StateParasolParachute.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7parasol21StateParasolParachuteFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7parasol21StateParasolParachuteFPQ43scn4step4hero4Hero: /* 80393BC4 0038FA04 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -488,7 +488,7 @@ create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1Fv: /* 803942A8 003900E8 4B E9 A3 F8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolParachute$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489DE0, 0x10 @@ -496,7 +496,7 @@ __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21St __vt__Q53scn4step4hero7parasol21StateParasolParachute: .incbin "baserom.dol", 0x489DF0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258821 $$258821: .incbin "baserom.dol", 0x49E1A8, 0x4 diff --git a/asm/src/StateParasolParachuteFall.s b/asm/src/StateParasolParachuteFall.s index dd004735..0c79c5c7 100644 --- a/asm/src/StateParasolParachuteFall.s +++ b/asm/src/StateParasolParachuteFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7parasol25StateParasolParachuteFallFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7parasol25StateParasolParachuteFallFPQ43scn4step4hero4Hero: /* 803942AC 003900EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -309,12 +309,12 @@ lbl_803946FC: /* 80394708 00390548 38 21 00 10 */ addi r1, r1, 0x10 /* 8039470C 0039054C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol25StateParasolParachuteFall __vt__Q53scn4step4hero7parasol25StateParasolParachuteFall: .incbin "baserom.dol", 0x489E18, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258542 $$258542: .incbin "baserom.dol", 0x49E1B8, 0x8 diff --git a/asm/src/StateParasolRelease.s b/asm/src/StateParasolRelease.s index 1bc868fa..48d11308 100644 --- a/asm/src/StateParasolRelease.s +++ b/asm/src/StateParasolRelease.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage19StateParasolReleaseFPQ43scn4step5enemy5EnemyUxUl __ct__Q53scn4step5enemy6damage19StateParasolReleaseFPQ43scn4step5enemy5EnemyUxUl: /* 802AB61C 002A745C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -360,12 +360,12 @@ lbl_802ABB20: procObjCollReact__Q53scn4step5enemy6damage19StateParasolReleaseFv: /* 802ABB34 002A7974 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage19StateParasolRelease __vt__Q53scn4step5enemy6damage19StateParasolRelease: .incbin "baserom.dol", 0x471E60, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257646 $$257646: .incbin "baserom.dol", 0x49C250, 0x4 diff --git a/asm/src/StateParasolShield.s b/asm/src/StateParasolShield.s index edbdac77..ad4958ea 100644 --- a/asm/src/StateParasolShield.s +++ b/asm/src/StateParasolShield.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7parasol18StateParasolShieldFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7parasol18StateParasolShieldFPQ43scn4step4hero4Hero: /* 80394710 00390550 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -125,7 +125,7 @@ procMove__Q53scn4step4hero7parasol18StateParasolShieldFv: procFixPos__Q53scn4step4hero7parasol18StateParasolShieldFv: /* 803948B4 003906F4 4B FC BF CC */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol18StateParasolShield __vt__Q53scn4step4hero7parasol18StateParasolShield: .incbin "baserom.dol", 0x489E40, 0x28 diff --git a/asm/src/StateParasolSwing.s b/asm/src/StateParasolSwing.s index 1a02b514..203b7dca 100644 --- a/asm/src/StateParasolSwing.s +++ b/asm/src/StateParasolSwing.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7parasol17StateParasolSwingFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7parasol17StateParasolSwingFPQ43scn4step4hero4Hero: /* 803948B8 003906F8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -705,7 +705,7 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol19St __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 80395288 003910C8 4B E9 94 18 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured20StateCapturedParasol$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x489E68, 0x10 @@ -722,7 +722,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17Sta __vt__Q53scn4step4hero7parasol17StateParasolSwing: .incbin "baserom.dol", 0x489EA8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259324 $$259324: .incbin "baserom.dol", 0x49E1C0, 0x4 diff --git a/asm/src/StateParasolUnder.s b/asm/src/StateParasolUnder.s index 92beb5c1..c90983b0 100644 --- a/asm/src/StateParasolUnder.s +++ b/asm/src/StateParasolUnder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7parasol17StateParasolUnderFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7parasol17StateParasolUnderFPQ43scn4step4hero4Hero: /* 8039528C 003910CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -300,7 +300,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17S __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1Fv: /* 803956AC 003914EC 4B E9 8F F4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol17StateParasolUnder$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489ED0, 0x10 diff --git a/asm/src/StateParasolWaterDive.s b/asm/src/StateParasolWaterDive.s index 56dc9464..7b777c5c 100644 --- a/asm/src/StateParasolWaterDive.s +++ b/asm/src/StateParasolWaterDive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7parasol21StateParasolWaterDiveFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7parasol21StateParasolWaterDiveFPQ43scn4step4hero4Hero: /* 803956B0 003914F0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -515,7 +515,7 @@ create__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21 __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1Fv: /* 80395E0C 00391C4C 4B E9 88 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21StateParasolWaterDive$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489F08, 0x10 @@ -523,7 +523,7 @@ __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol21St __vt__Q53scn4step4hero7parasol21StateParasolWaterDive: .incbin "baserom.dol", 0x489F18, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258175 $$258175: .incbin "baserom.dol", 0x49E1D8, 0x4 diff --git a/asm/src/StateParasolWaterDrill.s b/asm/src/StateParasolWaterDrill.s index af46452b..644ddae9 100644 --- a/asm/src/StateParasolWaterDrill.s +++ b/asm/src/StateParasolWaterDrill.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7parasol22StateParasolWaterDrillFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7parasol22StateParasolWaterDrillFPQ43scn4step4hero4Hero: /* 80395E10 00391C50 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -555,7 +555,7 @@ __dt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22St __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 803965F0 00392430 4B E9 80 B0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol25StateParasolWaterDrillEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489F40, 0x10 @@ -566,7 +566,7 @@ __vt__Q24util104StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7parasol22St __vt__Q53scn4step4hero7parasol22StateParasolWaterDrill: .incbin "baserom.dol", 0x489F60, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258172 $$258172: .incbin "baserom.dol", 0x49E1E8, 0x4 diff --git a/asm/src/StateParasolWaterDrillEnd.s b/asm/src/StateParasolWaterDrillEnd.s index c1435e7f..adfd78eb 100644 --- a/asm/src/StateParasolWaterDrillEnd.s +++ b/asm/src/StateParasolWaterDrillEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFPQ43scn4step4hero4Hero: /* 803965F4 00392434 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -193,7 +193,7 @@ lbl_80396880: procFixPos__Q53scn4step4hero7parasol25StateParasolWaterDrillEndFv: /* 80396894 003926D4 4B FC 9F EC */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7parasol25StateParasolWaterDrillEnd __vt__Q53scn4step4hero7parasol25StateParasolWaterDrillEnd: .incbin "baserom.dol", 0x489F88, 0x28 diff --git a/asm/src/StatePick.s b/asm/src/StatePick.s index 340927b6..5afa906c 100644 --- a/asm/src/StatePick.s +++ b/asm/src/StatePick.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9creditdee9StatePickFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9creditdee9StatePickFPQ43scn4step4boss4Boss: /* 80249218 00245058 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -193,7 +193,7 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8 __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1Fv: /* 802494A0 002452E0 4B FE 52 00 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8StateRun$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462C60, 0x10 @@ -201,7 +201,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee8St __vt__Q53scn4step4boss9creditdee9StatePick: .incbin "baserom.dol", 0x462C70, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255433 $$255433: .incbin "baserom.dol", 0x49B1C0, 0x4 diff --git a/asm/src/StatePiggyback.s b/asm/src/StatePiggyback.s index c175ba9f..5cade1cf 100644 --- a/asm/src/StatePiggyback.s +++ b/asm/src/StatePiggyback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero12interference14StatePiggybackFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero12interference14StatePiggybackFPQ43scn4step4hero4Hero: /* 8037303C 0036EE7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -371,12 +371,12 @@ procConstraint__Q53scn4step4hero12interference14StatePiggybackFv: procFixPos__Q53scn4step4hero12interference14StatePiggybackFv: /* 80373590 0036F3D0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference14StatePiggyback __vt__Q53scn4step4hero12interference14StatePiggyback: .incbin "baserom.dol", 0x488630, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257204 $$257204: .incbin "baserom.dol", 0x49DD80, 0x4 diff --git a/asm/src/StatePlancher.s b/asm/src/StatePlancher.s index f7901715..5eeb8ca9 100644 --- a/asm/src/StatePlancher.s +++ b/asm/src/StatePlancher.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CanPlancher__Q53scn4step4hero6common13StatePlancherFPQ43scn4step4hero4Hero CanPlancher__Q53scn4step4hero6common13StatePlancherFPQ43scn4step4hero4Hero: /* 8036734C 0036318C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -391,7 +391,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16St __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1Fv: /* 803678A0 003636E0 4B EC 6E 00 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16StatePlancherHit$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x487FA8, 0x10 @@ -399,7 +399,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common16Stat __vt__Q53scn4step4hero6common13StatePlancher: .incbin "baserom.dol", 0x487FB8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257709 $$257709: .incbin "baserom.dol", 0x49DBC0, 0x8 diff --git a/asm/src/StatePlancherBound.s b/asm/src/StatePlancherBound.s index b8785774..8299dba5 100644 --- a/asm/src/StatePlancherBound.s +++ b/asm/src/StatePlancherBound.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common18StatePlancherBoundFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common18StatePlancherBoundFPQ43scn4step4hero4Hero: /* 803678A4 003636E4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -290,12 +290,12 @@ lbl_80367CB0: /* 80367CBC 00363AFC 38 21 00 20 */ addi r1, r1, 0x20 /* 80367CC0 00363B00 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common18StatePlancherBound __vt__Q53scn4step4hero6common18StatePlancherBound: .incbin "baserom.dol", 0x487FE0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256367 $$256367: .incbin "baserom.dol", 0x49DBC8, 0x8 diff --git a/asm/src/StatePlancherHit.s b/asm/src/StatePlancherHit.s index 468bae53..a65df6aa 100644 --- a/asm/src/StatePlancherHit.s +++ b/asm/src/StatePlancherHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common16StatePlancherHitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common16StatePlancherHitFPQ43scn4step4hero4Hero: /* 80367CC4 00363B04 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -329,12 +329,12 @@ lbl_80368164: /* 80368170 00363FB0 38 21 00 10 */ addi r1, r1, 0x10 /* 80368174 00363FB4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common16StatePlancherHit __vt__Q53scn4step4hero6common16StatePlancherHit: .incbin "baserom.dol", 0x488008, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256509 $$256509: .incbin "baserom.dol", 0x49DBD0, 0x8 diff --git a/asm/src/StatePlancherLanding.s b/asm/src/StatePlancherLanding.s index f84ee063..d2604e96 100644 --- a/asm/src/StatePlancherLanding.s +++ b/asm/src/StatePlancherLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common20StatePlancherLandingFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common20StatePlancherLandingFPQ43scn4step4hero4Hero: /* 80368178 00363FB8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -318,7 +318,7 @@ __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20Sta __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1Fv: /* 803685CC 0036440C 4B EC 60 D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common18StatePlancherBound$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488030, 0x10 @@ -329,7 +329,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common20Sta __vt__Q53scn4step4hero6common20StatePlancherLanding: .incbin "baserom.dol", 0x488050, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257417 $$257417: .incbin "baserom.dol", 0x49DBD8, 0x8 diff --git a/asm/src/StatePraise.s b/asm/src/StatePraise.s index d3a4d6c7..24558da4 100644 --- a/asm/src/StatePraise.s +++ b/asm/src/StatePraise.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss12creditdedede11StatePraiseFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss12creditdedede11StatePraiseFPQ43scn4step4boss4Boss: /* 80248268 002440A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -221,7 +221,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditded __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv: /* 80248558 00244398 4B FE 61 48 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss9creditdee11StatePraiseFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss9creditdee11StatePraiseFPQ43scn4step4boss4Boss: /* 802494A4 002452E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -376,7 +376,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee1 __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv: /* 80249690 002454D0 4B FE 50 10 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss10creditmeta11StatePraiseFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss10creditmeta11StatePraiseFPQ43scn4step4boss4Boss: /* 8024AD10 00246B50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -536,7 +536,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmet __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1Fv: /* 8024AF10 00246D50 4B FE 37 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common11StatePraiseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common11StatePraiseFPQ43scn4step5enemy5Enemy: /* 802938B4 0028F6F4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -654,7 +654,7 @@ procMove__Q53scn4step5enemy6common11StatePraiseFv: procFixPos__Q53scn4step5enemy6common11StatePraiseFv: /* 80293A24 0028F864 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6bouncy11StatePraiseFPQ43scn4step5enemy5Enemyb __ct__Q53scn4step5enemy6bouncy11StatePraiseFPQ43scn4step5enemy5Enemyb: /* 8029DC4C 00299A8C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -906,7 +906,7 @@ lbl_8029DFC8: /* 8029DFD4 00299E14 38 21 00 20 */ addi r1, r1, 0x20 /* 8029DFD8 00299E18 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sparky11StatePraiseFPQ43scn4step5enemy5Enemyb __ct__Q53scn4step5enemy6sparky11StatePraiseFPQ43scn4step5enemy5Enemyb: /* 802E74AC 002E32EC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1135,7 +1135,7 @@ lbl_802E77C4: procFixPos__Q53scn4step5enemy6sparky11StatePraiseFv: /* 802E77DC 002E361C 4B FB 67 A8 */ b procFixPos__Q53scn4step5enemy6bouncy11StatePraiseFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdedede11StatePraise$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462890, 0x10 @@ -1143,7 +1143,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss12creditdeded __vt__Q53scn4step4boss12creditdedede11StatePraise: .incbin "baserom.dol", 0x4628A0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11StatePraise$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462C90, 0x10 @@ -1151,7 +1151,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee11S __vt__Q53scn4step4boss9creditdee11StatePraise: .incbin "baserom.dol", 0x462CA0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta11StatePraise$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x463040, 0x10 @@ -1159,27 +1159,27 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta1 __vt__Q53scn4step4boss10creditmeta11StatePraise: .incbin "baserom.dol", 0x463050, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common11StatePraise __vt__Q53scn4step5enemy6common11StatePraise: .incbin "baserom.dol", 0x46F358, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6bouncy11StatePraise __vt__Q53scn4step5enemy6bouncy11StatePraise: .incbin "baserom.dol", 0x470568, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sparky11StatePraise __vt__Q53scn4step5enemy6sparky11StatePraise: .incbin "baserom.dol", 0x479348, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255711 $$255711: .incbin "baserom.dol", 0x49B1A0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256661 $$256661: .incbin "baserom.dol", 0x49BE88, 0x8 diff --git a/asm/src/StatePreciousAppear.s b/asm/src/StatePreciousAppear.s index 7531cda0..8520d6ac 100644 --- a/asm/src/StatePreciousAppear.s +++ b/asm/src/StatePreciousAppear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state19StatePreciousAppearFPQ43scn4step4item4Item __ct__Q53scn4step4item5state19StatePreciousAppearFPQ43scn4step4item4Item: /* 803C80D8 003C3F18 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -395,7 +395,7 @@ create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9Stat __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1Fv: /* 803C8654 003C4494 4B E6 60 4C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateWaft$$4PQ43scn4step4item4Item$$1: .incbin "baserom.dol", 0x48E6F0, 0x10 @@ -403,7 +403,7 @@ __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4item5state9StateW __vt__Q53scn4step4item5state19StatePreciousAppear: .incbin "baserom.dol", 0x48E700, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255473 $$255473: .incbin "baserom.dol", 0x49E600, 0x4 diff --git a/asm/src/StatePressFall.s b/asm/src/StatePressFall.s index 323c163a..56d74774 100644 --- a/asm/src/StatePressFall.s +++ b/asm/src/StatePressFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath14StatePressFallFPQ43scn4step4boss4BossQ53scn4step4boss9moundeath8JumpKind __ct__Q53scn4step4boss9moundeath14StatePressFallFPQ43scn4step4boss4BossQ53scn4step4boss9moundeath8JumpKind: /* 8025601C 00251E5C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -338,12 +338,12 @@ lbl_802564D4: /* 802564E8 00252328 38 21 00 20 */ addi r1, r1, 0x20 /* 802564EC 0025232C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath14StatePressFall __vt__Q53scn4step4boss9moundeath14StatePressFall: .incbin "baserom.dol", 0x4651C0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256793 $$256793: .incbin "baserom.dol", 0x49B428, 0x4 diff --git a/asm/src/StatePressFallStart.s b/asm/src/StatePressFallStart.s index 5d4a4193..642dea08 100644 --- a/asm/src/StatePressFallStart.s +++ b/asm/src/StatePressFallStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath19StatePressFallStartFPQ43scn4step4boss4BossQ53scn4step4boss9moundeath8JumpKind __ct__Q53scn4step4boss9moundeath19StatePressFallStartFPQ43scn4step4boss4BossQ53scn4step4boss9moundeath8JumpKind: /* 802564F0 00252330 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -200,7 +200,7 @@ create__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv: /* 80256794 002525D4 4B FD 7F 0C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1 __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressFall$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: .incbin "baserom.dol", 0x4651E0, 0x10 @@ -208,7 +208,7 @@ __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14 __vt__Q53scn4step4boss9moundeath19StatePressFallStart: .incbin "baserom.dol", 0x4651F0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256005 $$256005: .incbin "baserom.dol", 0x49B430, 0x8 diff --git a/asm/src/StatePressJump.s b/asm/src/StatePressJump.s index fb28dff0..f35cf089 100644 --- a/asm/src/StatePressJump.s +++ b/asm/src/StatePressJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath14StatePressJumpFPQ43scn4step4boss4BossQ53scn4step4boss9moundeath8JumpKind __ct__Q53scn4step4boss9moundeath14StatePressJumpFPQ43scn4step4boss4BossQ53scn4step4boss9moundeath8JumpKind: /* 80256798 002525D8 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -394,7 +394,7 @@ create__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath __dt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv: /* 80256D30 00252B70 4B FD 79 70 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1 __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19StatePressFallStart$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: .incbin "baserom.dol", 0x465210, 0x10 @@ -402,7 +402,7 @@ __vt__Q24util139StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath19 __vt__Q53scn4step4boss9moundeath14StatePressJump: .incbin "baserom.dol", 0x465220, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255442 $$255442: .incbin "baserom.dol", 0x49B438, 0x4 diff --git a/asm/src/StatePressJumpStart.s b/asm/src/StatePressJumpStart.s index 419d1002..2cb78bcb 100644 --- a/asm/src/StatePressJumpStart.s +++ b/asm/src/StatePressJumpStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath19StatePressJumpStartFPQ43scn4step4boss4BossQ53scn4step4boss9moundeath8JumpKind __ct__Q53scn4step4boss9moundeath19StatePressJumpStartFPQ43scn4step4boss4BossQ53scn4step4boss9moundeath8JumpKind: /* 80256D34 00252B74 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -170,7 +170,7 @@ create__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath __dt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1Fv: /* 80256F60 00252DA0 4B FD 77 40 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1 __vt__Q24util134StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss9moundeath14StatePressJump$$4PQ43scn4step4boss4Boss$$4Q53scn4step4boss9moundeath8JumpKind$$1: .incbin "baserom.dol", 0x465240, 0x10 diff --git a/asm/src/StatePuff.s b/asm/src/StatePuff.s index 9035d736..cd49809a 100644 --- a/asm/src/StatePuff.s +++ b/asm/src/StatePuff.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10stareffect9StatePuffFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10stareffect9StatePuffFPQ43scn4step5enemy5Enemy: /* 802E84BC 002E42FC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -147,12 +147,12 @@ procMove__Q53scn4step5enemy10stareffect9StatePuffFv: /* 802E86C8 002E4508 38 21 00 10 */ addi r1, r1, 0x10 /* 802E86CC 002E450C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10stareffect9StatePuff __vt__Q53scn4step5enemy10stareffect9StatePuff: .incbin "baserom.dol", 0x479458, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256196 $$256196: .incbin "baserom.dol", 0x49CF20, 0x8 diff --git a/asm/src/StatePursuit.s b/asm/src/StatePursuit.s index c9f08837..95c2b0b7 100644 --- a/asm/src/StatePursuit.s +++ b/asm/src/StatePursuit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common12StatePursuitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common12StatePursuitFPQ43scn4step5enemy5Enemy: /* 80293A28 0028F868 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -404,7 +404,7 @@ lbl_80293FA0: __dt__Q53scn4step5enemy6common12StatePursuitFv: /* 80294004 0028FE44 4B FF D9 B4 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt12StatePursuitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt12StatePursuitFPQ43scn4step5enemy5Enemy: /* 8029FA7C 0029B8BC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -839,17 +839,17 @@ lbl_802A0064: __dt__Q53scn4step5enemy10brontoburt12StatePursuitFv: /* 802A00C8 0029BF08 4B FF 18 F0 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common12StatePursuit __vt__Q53scn4step5enemy6common12StatePursuit: .incbin "baserom.dol", 0x46F378, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt12StatePursuit __vt__Q53scn4step5enemy10brontoburt12StatePursuit: .incbin "baserom.dol", 0x470BC8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256157 $$256157: .incbin "baserom.dol", 0x49BBE0, 0x4 @@ -863,7 +863,7 @@ $$256211: $$256249: .incbin "baserom.dol", 0x49BBEC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256193 $$256193: .incbin "baserom.dol", 0x49BF00, 0x4 diff --git a/asm/src/StateQuivery.s b/asm/src/StateQuivery.s index 490ddb36..d1150505 100644 --- a/asm/src/StateQuivery.s +++ b/asm/src/StateQuivery.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss13watergalboros12StateQuiveryFPQ43scn4step4boss4BossQ63scn4step4boss13watergalboros12StateQuivery6Config __ct__Q53scn4step4boss13watergalboros12StateQuiveryFPQ43scn4step4boss4BossQ63scn4step4boss13watergalboros12StateQuivery6Config: /* 8025A814 00256654 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -220,12 +220,12 @@ reqQuivery__Q53scn4step4boss13watergalboros12StateQuiveryFv: /* 8025AB20 00256960 38 21 00 80 */ addi r1, r1, 0x80 /* 8025AB24 00256964 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros12StateQuivery __vt__Q53scn4step4boss13watergalboros12StateQuivery: .incbin "baserom.dol", 0x465BC0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256461 $$256461: .incbin "baserom.dol", 0x49B4E0, 0x4 diff --git a/asm/src/StateRainBomb.s b/asm/src/StateRainBomb.s index f058f485..990c2527 100644 --- a/asm/src/StateRainBomb.s +++ b/asm/src/StateRainBomb.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers13StateRainBombFPQ43scn4step4boss4BossQ63scn4step4boss7bonkers13StateRainBomb6Config __ct__Q53scn4step4boss7bonkers13StateRainBombFPQ43scn4step4boss4BossQ63scn4step4boss7bonkers13StateRainBomb6Config: /* 802387EC 0023462C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -323,7 +323,7 @@ create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9Sta __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1Fv: /* 80238C3C 00234A7C 4B FF 5A 64 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateFall$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461320, 0x10 @@ -331,7 +331,7 @@ __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9State __vt__Q53scn4step4boss7bonkers13StateRainBomb: .incbin "baserom.dol", 0x461330, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256362 $$256362: .incbin "baserom.dol", 0x49AF68, 0x4 diff --git a/asm/src/StateRainBombStart.s b/asm/src/StateRainBombStart.s index 7d75110e..0bd682a6 100644 --- a/asm/src/StateRainBombStart.s +++ b/asm/src/StateRainBombStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers18StateRainBombStartFPQ43scn4step4boss4BossQ63scn4step4boss7bonkers13StateRainBomb6Config __ct__Q53scn4step4boss7bonkers18StateRainBombStartFPQ43scn4step4boss4BossQ63scn4step4boss7bonkers13StateRainBomb6Config: /* 80238C40 00234A80 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -270,7 +270,7 @@ lbl_80238FE4: __dt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1Fv: /* 80238FF8 00234E38 4B FF 56 A8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1 __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateRainBomb$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss7bonkers13StateRainBomb6Config$$1: .incbin "baserom.dol", 0x461350, 0x10 @@ -278,7 +278,7 @@ __vt__Q24util142StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss7bonkers13St __vt__Q53scn4step4boss7bonkers18StateRainBombStart: .incbin "baserom.dol", 0x461360, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255597 $$255597: .incbin "baserom.dol", 0x49AF78, 0x4 diff --git a/asm/src/StateReady.s b/asm/src/StateReady.s index 213dae17..d2639b50 100644 --- a/asm/src/StateReady.s +++ b/asm/src/StateReady.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon19challengemastershot10StateReadyFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon19challengemastershot10StateReadyFPQ43scn4step6weapon6Weapon: /* 803F0788 003EC5C8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -614,7 +614,7 @@ __dt__Q53scn4step6weapon19challengemastershot10StateReadyFv: __dt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803F1070 003ECEB0 4B E3 D6 30 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challengemastershot9StateMain$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x4914A0, 0x10 @@ -622,7 +622,7 @@ __vt__Q24util109StateFactoryArg1$$0Q24util6IState$$4Q53scn4step6weapon19challeng __vt__Q53scn4step6weapon19challengemastershot10StateReady: .incbin "baserom.dol", 0x4914B0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257357 $$257357: .incbin "baserom.dol", 0x49ECC0, 0x4 diff --git a/asm/src/StateReflect.s b/asm/src/StateReflect.s index bcbd5f68..25a30fc1 100644 --- a/asm/src/StateReflect.s +++ b/asm/src/StateReflect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10spearspear12StateReflectFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon10spearspear12StateReflectFPQ43scn4step6weapon6Weapon: /* 803E4640 003E0480 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -332,7 +332,7 @@ lbl_803E4AD0: procObjCollReact__Q53scn4step6weapon10spearspear12StateReflectFv: /* 803E4AF4 003E0934 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon8deespear12StateReflectFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon8deespear12StateReflectFPQ43scn4step6weapon6Weapon: /* 803ED654 003E9494 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -664,17 +664,17 @@ lbl_803EDAE4: procObjCollReact__Q53scn4step6weapon8deespear12StateReflectFv: /* 803EDB08 003E9948 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10spearspear12StateReflect __vt__Q53scn4step6weapon10spearspear12StateReflect: .incbin "baserom.dol", 0x4907E0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear12StateReflect __vt__Q53scn4step6weapon8deespear12StateReflect: .incbin "baserom.dol", 0x4910A8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257330 $$257330: .incbin "baserom.dol", 0x49EA58, 0x8 @@ -688,7 +688,7 @@ $$257379: $$257391: .incbin "baserom.dol", 0x49EA6C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257330 $$257330: .incbin "baserom.dol", 0x49EC40, 0x8 diff --git a/asm/src/StateReturnWarpLowper.s b/asm/src/StateReturnWarpLowper.s index b3133ed1..d860bb24 100644 --- a/asm/src/StateReturnWarpLowper.s +++ b/asm/src/StateReturnWarpLowper.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick21StateReturnWarpLowperFPQ43scn4step4hero4HeroQ33hel4math7Vector2b __ct__Q53scn4step4hero7gimmick21StateReturnWarpLowperFPQ43scn4step4hero4HeroQ33hel4math7Vector2b: /* 80381724 0037D564 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -481,7 +481,7 @@ create__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9St __dt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1Fv: /* 80381E1C 0037DC5C 4B EA C8 84 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1 __vt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9StateDemo$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$4b$$1: .incbin "baserom.dol", 0x488CC0, 0x10 @@ -489,7 +489,7 @@ __vt__Q24util120StateFactoryArg3$$0Q24util6IState$$4Q53scn4step4hero6common9Stat __vt__Q53scn4step4hero7gimmick21StateReturnWarpLowper: .incbin "baserom.dol", 0x488CD0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259162 $$259162: .incbin "baserom.dol", 0x49DFC0, 0x4 diff --git a/asm/src/StateRise.s b/asm/src/StateRise.s index 57d4cab0..f281c892 100644 --- a/asm/src/StateRise.s +++ b/asm/src/StateRise.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7parasol9StateRiseFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7parasol9StateRiseFPQ43scn4step5enemy5Enemy: /* 802CB3D0 002C7210 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -217,12 +217,12 @@ lbl_802CB6C8: __dt__Q53scn4step5enemy7parasol9StateRiseFv: /* 802CB6DC 002C751C 4B FC 62 DC */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7parasol9StateRise __vt__Q53scn4step5enemy7parasol9StateRise: .incbin "baserom.dol", 0x476078, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255826 $$255826: .incbin "baserom.dol", 0x49C980, 0x4 diff --git a/asm/src/StateRising.s b/asm/src/StateRising.s index 2691011a..fad361a3 100644 --- a/asm/src/StateRising.s +++ b/asm/src/StateRising.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe11StateRisingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe11StateRisingFPQ43scn4step5enemy5Enemy: /* 802C0384 002BC1C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -272,7 +272,7 @@ lbl_802C0750: /* 802C0760 002BC5A0 38 21 00 70 */ addi r1, r1, 0x70 /* 802C0764 002BC5A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter11StateRisingFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter11StateRisingFPQ43scn4step4hero4Hero: /* 8039DDB8 00399BF8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -552,17 +552,17 @@ lbl_8039E18C: /* 8039E198 00399FD8 38 21 00 10 */ addi r1, r1, 0x10 /* 8039E19C 00399FDC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe11StateRising __vt__Q53scn4step5enemy10knucklejoe11StateRising: .incbin "baserom.dol", 0x474A70, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter11StateRising __vt__Q53scn4step4hero7fighter11StateRising: .incbin "baserom.dol", 0x48A5E8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255924 $$255924: .incbin "baserom.dol", 0x49C730, 0x4 @@ -579,7 +579,7 @@ $$255934: $$255942: .incbin "baserom.dol", 0x49C740, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256087 $$256087: .incbin "baserom.dol", 0x49E300, 0x8 diff --git a/asm/src/StateRoah.s b/asm/src/StateRoah.s index 07fbe0ef..89cc35b0 100644 --- a/asm/src/StateRoah.s +++ b/asm/src/StateRoah.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state9StateRoahFPQ43scn4step4item4Item __ct__Q53scn4step4item5state9StateRoahFPQ43scn4step4item4Item: /* 803C8658 003C4498 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -174,12 +174,12 @@ lbl_803C8818: procFixPos__Q53scn4step4item5state9StateRoahFv: /* 803C88C8 003C4708 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state9StateRoah __vt__Q53scn4step4item5state9StateRoah: .incbin "baserom.dol", 0x48E718, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255795 $$255795: .incbin "baserom.dol", 0x49E618, 0x4 diff --git a/asm/src/StateRollJump.s b/asm/src/StateRollJump.s index 1bc9c702..3448bee6 100644 --- a/asm/src/StateRollJump.s +++ b/asm/src/StateRollJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath13StateRollJumpFPQ43scn4step4boss4BossQ63scn4step4boss9moundeath13StateRollJump6Config __ct__Q53scn4step4boss9moundeath13StateRollJumpFPQ43scn4step4boss4BossQ63scn4step4boss9moundeath13StateRollJump6Config: /* 80257A60 002538A0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -359,12 +359,12 @@ procMove__Q53scn4step4boss9moundeath13StateRollJumpFv: procFixPos__Q53scn4step4boss9moundeath13StateRollJumpFv: /* 80257F8C 00253DCC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath13StateRollJump __vt__Q53scn4step4boss9moundeath13StateRollJump: .incbin "baserom.dol", 0x4652F0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256524 $$256524: .incbin "baserom.dol", 0x49B480, 0x4 diff --git a/asm/src/StateRolling.s b/asm/src/StateRolling.s index e7e69ffb..f5463c58 100644 --- a/asm/src/StateRolling.s +++ b/asm/src/StateRolling.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath12StateRollingFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9moundeath12StateRollingFPQ43scn4step4boss4Boss: /* 80256F64 00252DA4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -475,7 +475,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath1 __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1Fv: /* 80257620 00253460 4B FD 70 80 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15StateRollingEnd$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x465270, 0x10 @@ -483,7 +483,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath15S __vt__Q53scn4step4boss9moundeath12StateRolling: .incbin "baserom.dol", 0x465280, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257155 $$257155: .incbin "baserom.dol", 0x49B458, 0x4 diff --git a/asm/src/StateRollingEnd.s b/asm/src/StateRollingEnd.s index bafd513b..18088b66 100644 --- a/asm/src/StateRollingEnd.s +++ b/asm/src/StateRollingEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath15StateRollingEndFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9moundeath15StateRollingEndFPQ43scn4step4boss4Boss: /* 80257624 00253464 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -64,7 +64,7 @@ procMove__Q53scn4step4boss9moundeath15StateRollingEndFv: procFixPos__Q53scn4step4boss9moundeath15StateRollingEndFv: /* 802576E0 00253520 4B FE 08 E0 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath15StateRollingEnd __vt__Q53scn4step4boss9moundeath15StateRollingEnd: .incbin "baserom.dol", 0x4652A0, 0x20 diff --git a/asm/src/StateRollingStart.s b/asm/src/StateRollingStart.s index 8c0fc0e0..06f9a7f8 100644 --- a/asm/src/StateRollingStart.s +++ b/asm/src/StateRollingStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath17StateRollingStartFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9moundeath17StateRollingStartFPQ43scn4step4boss4Boss: /* 802576E4 00253524 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -248,7 +248,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath1 __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1Fv: /* 80257A5C 0025389C 4B FD 6C 44 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12StateRolling$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4652C0, 0x10 @@ -256,7 +256,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath12S __vt__Q53scn4step4boss9moundeath17StateRollingStart: .incbin "baserom.dol", 0x4652D0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256231 $$256231: .incbin "baserom.dol", 0x49B470, 0x4 diff --git a/asm/src/StateRoomGuarderAppear.s b/asm/src/StateRoomGuarderAppear.s index 1f402a01..ccb82d9d 100644 --- a/asm/src/StateRoomGuarderAppear.s +++ b/asm/src/StateRoomGuarderAppear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common22StateRoomGuarderAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common22StateRoomGuarderAppearFPQ43scn4step5enemy5Enemy: /* 80294008 0028FE48 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -221,12 +221,12 @@ lbl_80294310: procMove__Q53scn4step5enemy6common22StateRoomGuarderAppearFv: /* 80294334 00290174 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common22StateRoomGuarderAppear __vt__Q53scn4step5enemy6common22StateRoomGuarderAppear: .incbin "baserom.dol", 0x46F398, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256208 $$256208: .incbin "baserom.dol", 0x49BBF0, 0x4 diff --git a/asm/src/StateRootAttack.s b/asm/src/StateRootAttack.s index 76cd4f22..37fb0298 100644 --- a/asm/src/StateRootAttack.s +++ b/asm/src/StateRootAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy15StateRootAttackFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy15StateRootAttackFPQ43scn4step4boss4Boss: /* 8025DCF8 00259B38 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -144,12 +144,12 @@ procMove__Q53scn4step4boss6whispy15StateRootAttackFv: procFixPos__Q53scn4step4boss6whispy15StateRootAttackFv: /* 8025DEE4 00259D24 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy15StateRootAttack __vt__Q53scn4step4boss6whispy15StateRootAttack: .incbin "baserom.dol", 0x466758, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256375 $$256375: .incbin "baserom.dol", 0x49B550, 0x8 diff --git a/asm/src/StateRun.s b/asm/src/StateRun.s index 1ac488e3..f2e60cf2 100644 --- a/asm/src/StateRun.s +++ b/asm/src/StateRun.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9creditdee8StateRunFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9creditdee8StateRunFPQ43scn4step4boss4Boss: /* 80249694 002454D4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -141,7 +141,7 @@ lbl_80249858: /* 80249874 002456B4 38 21 00 30 */ addi r1, r1, 0x30 /* 80249878 002456B8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common8StateRunFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common8StateRunFPQ43scn4step4hero4Hero: /* 803685D0 00364410 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -560,12 +560,12 @@ create__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8Sta __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1Fv: /* 80368BB8 003649F8 4B EC 5A E8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9creditdee8StateRun __vt__Q53scn4step4boss9creditdee8StateRun: .incbin "baserom.dol", 0x462CC0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8StateRun$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488078, 0x10 @@ -573,7 +573,7 @@ __vt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8State __vt__Q53scn4step4hero6common8StateRun: .incbin "baserom.dol", 0x488088, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259126 $$259126: .incbin "baserom.dol", 0x49DBE0, 0x4 diff --git a/asm/src/StateRunAppear.s b/asm/src/StateRunAppear.s index 3c27ee8d..50280d3e 100644 --- a/asm/src/StateRunAppear.s +++ b/asm/src/StateRunAppear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss9creditdee14StateRunAppearFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss9creditdee14StateRunAppearFPQ43scn4step4boss4Boss: /* 8024987C 002456BC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -260,7 +260,7 @@ __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14S __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1Fv: /* 80249BF4 00245A34 4B FE 4A AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee9StatePick$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462CE0, 0x10 @@ -271,7 +271,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9creditdee14S __vt__Q53scn4step4boss9creditdee14StateRunAppear: .incbin "baserom.dol", 0x462D00, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255551 $$255551: .incbin "baserom.dol", 0x49B1C8, 0x8 diff --git a/asm/src/StateSCFlyAway.s b/asm/src/StateSCFlyAway.s index 4b766f1a..118c0557 100644 --- a/asm/src/StateSCFlyAway.s +++ b/asm/src/StateSCFlyAway.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster14StateSCFlyAwayFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster14StateSCFlyAwayFPQ43scn4step4boss4Boss: /* 80241A38 0023D878 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -597,7 +597,7 @@ create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challeng __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1Fv: /* 802422DC 0023E11C 4B FE C3 C4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCFlyAway$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461FC8, 0x10 @@ -605,12 +605,12 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q53scn4step4boss15challengemaster14StateSCFlyAway: .incbin "baserom.dol", 0x461FD8, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255744 $$255744: .incbin "baserom.dol", 0x4953F8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256779 $$256779: .incbin "baserom.dol", 0x49B098, 0x4 diff --git a/asm/src/StateSCHide.s b/asm/src/StateSCHide.s index 4a6e32b6..0118b8d6 100644 --- a/asm/src/StateSCHide.s +++ b/asm/src/StateSCHide.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster11StateSCHideFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster11StateSCHideFPQ43scn4step4boss4Boss: /* 802422E0 0023E120 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -104,7 +104,7 @@ procMove__Q53scn4step4boss15challengemaster11StateSCHideFv: procFixPos__Q53scn4step4boss15challengemaster11StateSCHideFv: /* 80242438 0023E278 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster11StateSCHide __vt__Q53scn4step4boss15challengemaster11StateSCHide: .incbin "baserom.dol", 0x461FF8, 0x20 diff --git a/asm/src/StateSCLookFar.s b/asm/src/StateSCLookFar.s index e76c9f5c..4a2f9c13 100644 --- a/asm/src/StateSCLookFar.s +++ b/asm/src/StateSCLookFar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster14StateSCLookFarFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster14StateSCLookFarFPQ43scn4step4boss4Boss: /* 8024243C 0023E27C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -163,7 +163,7 @@ create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challeng __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1Fv: /* 80242640 0023E480 4B FE C0 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCLookFar$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462018, 0x10 diff --git a/asm/src/StateSCLookKirby.s b/asm/src/StateSCLookKirby.s index 2ae3779a..70dd75d9 100644 --- a/asm/src/StateSCLookKirby.s +++ b/asm/src/StateSCLookKirby.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster16StateSCLookKirbyFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster16StateSCLookKirbyFPQ43scn4step4boss4Boss: /* 80242644 0023E484 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -313,7 +313,7 @@ __dt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1Fv: /* 80242A78 0023E8B8 4B FE BC 28 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1 __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster14StateSCPursuit$$4PQ43scn4step4boss4Boss$$4b$$1: .incbin "baserom.dol", 0x462048, 0x10 @@ -324,12 +324,12 @@ __vt__Q24util107StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q53scn4step4boss15challengemaster16StateSCLookKirby: .incbin "baserom.dol", 0x462068, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255360 $$255360: .incbin "baserom.dol", 0x495400, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255993 $$255993: .incbin "baserom.dol", 0x49B0C8, 0x4 diff --git a/asm/src/StateSCPursuit.s b/asm/src/StateSCPursuit.s index 25006e52..072f95fa 100644 --- a/asm/src/StateSCPursuit.s +++ b/asm/src/StateSCPursuit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster14StateSCPursuitFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster14StateSCPursuitFPQ43scn4step4boss4Boss: /* 80242A7C 0023E8BC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -304,12 +304,12 @@ lbl_80242E50: procFixPos__Q53scn4step4boss15challengemaster14StateSCPursuitFv: /* 80242ECC 0023ED0C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster14StateSCPursuit __vt__Q53scn4step4boss15challengemaster14StateSCPursuit: .incbin "baserom.dol", 0x462088, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256097 $$256097: .incbin "baserom.dol", 0x49B0D0, 0x8 diff --git a/asm/src/StateSelect.s b/asm/src/StateSelect.s index f93ec616..61fb4a8d 100644 --- a/asm/src/StateSelect.s +++ b/asm/src/StateSelect.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero8inactive11StateSelectFPQ43scn4step4hero12InactiveHerob __ct__Q53scn4step4hero8inactive11StateSelectFPQ43scn4step4hero12InactiveHerob: /* 8035D590 003593D0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -948,7 +948,7 @@ lbl_8035E29C: /* 8035E2AC 0035A0EC 38 21 00 10 */ addi r1, r1, 0x10 /* 8035E2B0 0035A0F0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero8inactive11StateSelect __vt__Q53scn4step4hero8inactive11StateSelect: .incbin "baserom.dol", 0x487A68, 0x10 diff --git a/asm/src/StateShipRepairDemo.s b/asm/src/StateShipRepairDemo.s index edd56c5c..d136c202 100644 --- a/asm/src/StateShipRepairDemo.s +++ b/asm/src/StateShipRepairDemo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common19StateShipRepairDemoFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common19StateShipRepairDemoFPQ43scn4step4hero4Hero: /* 80368BBC 003649FC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -390,12 +390,12 @@ procFixPos__Q53scn4step4hero6common19StateShipRepairDemoFv: /* 80369140 00364F80 38 21 00 10 */ addi r1, r1, 0x10 /* 80369144 00364F84 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common19StateShipRepairDemo __vt__Q53scn4step4hero6common19StateShipRepairDemo: .incbin "baserom.dol", 0x4880B0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259942 $$259942: .incbin "baserom.dol", 0x49DBE8, 0x4 diff --git a/asm/src/StateShipRepairDemoAfter.s b/asm/src/StateShipRepairDemoAfter.s index 256f22ec..ac9d74f2 100644 --- a/asm/src/StateShipRepairDemoAfter.s +++ b/asm/src/StateShipRepairDemoAfter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common24StateShipRepairDemoAfterFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common24StateShipRepairDemoAfterFPQ43scn4step4hero4Hero: /* 80369148 00364F88 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -256,12 +256,12 @@ lbl_803694DC: /* 803694E8 00365328 38 21 00 10 */ addi r1, r1, 0x10 /* 803694EC 0036532C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common24StateShipRepairDemoAfter __vt__Q53scn4step4hero6common24StateShipRepairDemoAfter: .incbin "baserom.dol", 0x4880D8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260120 $$260120: .incbin "baserom.dol", 0x49DBF0, 0x4 diff --git a/asm/src/StateShipRepairDemoAfterFollow.s b/asm/src/StateShipRepairDemoAfterFollow.s index 31ce815a..0d0e7b13 100644 --- a/asm/src/StateShipRepairDemoAfterFollow.s +++ b/asm/src/StateShipRepairDemoAfterFollow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFPQ43scn4step4hero4Hero: /* 803694F0 00365330 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -404,7 +404,7 @@ lbl_80369A9C: procFixPos__Q53scn4step4hero6common30StateShipRepairDemoAfterFollowFv: /* 80369AB0 003658F0 4B FF F9 F8 */ b procFixPos__Q53scn4step4hero6common24StateShipRepairDemoAfterFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_DEPTH_LIST24__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2 T_DEPTH_LIST24__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2: .incbin "baserom.dol", 0x41BCC8, 0x10 @@ -412,12 +412,12 @@ T_DEPTH_LIST24__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2: T_DEPTH_LIST3__44$$2unnamed$$2StateShipRepairDemoAfterFollow_cpp$$2: .incbin "baserom.dol", 0x41BCD8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common30StateShipRepairDemoAfterFollow __vt__Q53scn4step4hero6common30StateShipRepairDemoAfterFollow: .incbin "baserom.dol", 0x488100, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259551 $$259551: .incbin "baserom.dol", 0x49DC00, 0x4 diff --git a/asm/src/StateShipRepairDemoFollow.s b/asm/src/StateShipRepairDemoFollow.s index acf3a9a0..be1d5410 100644 --- a/asm/src/StateShipRepairDemoFollow.s +++ b/asm/src/StateShipRepairDemoFollow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common25StateShipRepairDemoFollowFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common25StateShipRepairDemoFollowFPQ43scn4step4hero4Hero: /* 80369AB4 003658F4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -426,17 +426,17 @@ lbl_8036A0B4: procFixPos__Q53scn4step4hero6common25StateShipRepairDemoFollowFv: /* 8036A0CC 00365F0C 4B FF F0 54 */ b procFixPos__Q53scn4step4hero6common19StateShipRepairDemoFv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global ROT_LIST__39$$2unnamed$$2StateShipRepairDemoFollow_cpp$$2 ROT_LIST__39$$2unnamed$$2StateShipRepairDemoFollow_cpp$$2: .incbin "baserom.dol", 0x41BCE8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common25StateShipRepairDemoFollow __vt__Q53scn4step4hero6common25StateShipRepairDemoFollow: .incbin "baserom.dol", 0x488128, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259892 $$259892: .incbin "baserom.dol", 0x49DC10, 0x4 diff --git a/asm/src/StateShot.s b/asm/src/StateShot.s index 478b3a13..85222353 100644 --- a/asm/src/StateShot.s +++ b/asm/src/StateShot.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster9StateShotFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster9StateShotFPQ43scn4step4boss4Boss: /* 80242ED0 0023ED10 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -296,7 +296,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challenge __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1Fv: /* 802432C4 0023F104 4B FE B3 DC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior9StateShotFPQ43scn4step4boss4Bossf __ct__Q53scn4step4boss6dubior9StateShotFPQ43scn4step4boss4Bossf: /* 80250334 0024C174 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -521,7 +521,7 @@ lbl_80250640: /* 80250650 0024C490 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80250654 0024C494 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss10gigantedge9StateShotFPQ43scn4step4boss4BossQ63scn4step4boss10gigantedge9StateShot6Config __ct__Q53scn4step4boss10gigantedge9StateShotFPQ43scn4step4boss4BossQ63scn4step4boss10gigantedge9StateShot6Config: /* 80252658 0024E498 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -652,7 +652,7 @@ procMove__Q53scn4step4boss10gigantedge9StateShotFv: procFixPos__Q53scn4step4boss10gigantedge9StateShotFv: /* 802527FC 0024E63C 4B FE 57 C4 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bonkersbomb9StateShotFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bonkersbomb9StateShotFPQ43scn4step5enemy5Enemy: /* 8029C568 002983A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -866,7 +866,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkers __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8029C844 00298684 4B F9 1E 5C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11dubiorspark9StateShotFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11dubiorspark9StateShotFPQ43scn4step5enemy5Enemy: /* 802AEFBC 002AADFC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -993,7 +993,7 @@ lbl_802AF154: /* 802AF160 002AAFA0 38 21 00 40 */ addi r1, r1, 0x40 /* 802AF164 002AAFA4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy14poppybrojrbomb9StateShotFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy14poppybrojrbomb9StateShotFPQ43scn4step5enemy5Enemy: /* 802D2CBC 002CEAFC 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1312,7 +1312,7 @@ lbl_802D3130: /* 802D3140 002CEF80 38 21 00 40 */ addi r1, r1, 0x40 /* 802D3144 002CEF84 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6shotzo9StateShotFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6shotzo9StateShotFPQ43scn4step5enemy5Enemy: /* 802E0AB0 002DC8F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1587,7 +1587,7 @@ lbl_802E0CBC: __dt__Q53scn4step5enemy6shotzo9StateShotFv: /* 802E0E84 002DCCC4 4B FB 0B 34 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5spark9StateShotFPQ43scn4step4hero4Heroi TryToChangeState__Q53scn4step4hero5spark9StateShotFPQ43scn4step4hero4Heroi: /* 8038EEC8 0038AD08 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2062,7 +2062,7 @@ create__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9Stat __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv: /* 8038F548 0038B388 4B E9 F1 58 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4wing9StateShotFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4wing9StateShotFPQ43scn4step4hero4Hero: /* 80398EBC 00394CFC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2764,7 +2764,7 @@ create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9State __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1Fv: /* 8039987C 003956BC 4B E9 4E 24 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter9StateShotFPQ43scn4step4hero4HeroQ53scn4step4hero7fighter11ChargeLevel __ct__Q53scn4step4hero7fighter9StateShotFPQ43scn4step4hero4HeroQ53scn4step4hero7fighter11ChargeLevel: /* 8039E1A0 00399FE0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -3102,7 +3102,7 @@ lbl_8039E640: /* 8039E648 0039A488 38 21 00 10 */ addi r1, r1, 0x10 /* 8039E64C 0039A48C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster9StateShot$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4620A8, 0x10 @@ -3110,17 +3110,17 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengema __vt__Q53scn4step4boss15challengemaster9StateShot: .incbin "baserom.dol", 0x4620B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateShot __vt__Q53scn4step4boss6dubior9StateShot: .incbin "baserom.dol", 0x463980, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss10gigantedge9StateShot __vt__Q53scn4step4boss10gigantedge9StateShot: .incbin "baserom.dol", 0x464130, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbomb12StateLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470128, 0x10 @@ -3128,22 +3128,22 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11bonkersbo __vt__Q53scn4step5enemy11bonkersbomb9StateShot: .incbin "baserom.dol", 0x470138, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11dubiorspark9StateShot __vt__Q53scn4step5enemy11dubiorspark9StateShot: .incbin "baserom.dol", 0x4724E8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb9StateShot __vt__Q53scn4step5enemy14poppybrojrbomb9StateShot: .incbin "baserom.dol", 0x476A68, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo9StateShot __vt__Q53scn4step5enemy6shotzo9StateShot: .incbin "baserom.dol", 0x478290, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateShot$$4PQ43scn4step4hero4Hero$$4Ul$$1: .incbin "baserom.dol", 0x489A50, 0x10 @@ -3151,7 +3151,7 @@ __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5spark9StateS __vt__Q53scn4step4hero5spark9StateShot: .incbin "baserom.dol", 0x489A60, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateShot$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A120, 0x10 @@ -3159,12 +3159,12 @@ __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateSh __vt__Q53scn4step4hero4wing9StateShot: .incbin "baserom.dol", 0x48A130, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter9StateShot __vt__Q53scn4step4hero7fighter9StateShot: .incbin "baserom.dol", 0x48A610, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255729 $$255729: .incbin "baserom.dol", 0x49B0D8, 0x4 @@ -3178,7 +3178,7 @@ $$255731: $$255732: .incbin "baserom.dol", 0x49B0E4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256239 $$256239: .incbin "baserom.dol", 0x49B358, 0x4 @@ -3186,12 +3186,12 @@ $$256239: $$256240: .incbin "baserom.dol", 0x49B35C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255827 $$255827: .incbin "baserom.dol", 0x49BE60, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256882 $$256882: .incbin "baserom.dol", 0x49CAF0, 0x4 @@ -3211,7 +3211,7 @@ $$256901: $$256904: .incbin "baserom.dol", 0x49CB08, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257656 $$257656: .incbin "baserom.dol", 0x49CDE8, 0x4 @@ -3222,12 +3222,12 @@ $$257657: $$257658: .incbin "baserom.dol", 0x49CDF0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257930 $$257930: .incbin "baserom.dol", 0x49E0E8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258093 $$258093: .incbin "baserom.dol", 0x49E260, 0x4 @@ -3250,7 +3250,7 @@ $$258116: $$258117: .incbin "baserom.dol", 0x49E278, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257331 $$257331: .incbin "baserom.dol", 0x49E308, 0x4 diff --git a/asm/src/StateShotAirBall.s b/asm/src/StateShotAirBall.s index 8684156e..b9febc2a 100644 --- a/asm/src/StateShotAirBall.s +++ b/asm/src/StateShotAirBall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy16StateShotAirBallFPQ43scn4step4boss4BossUlUlUl __ct__Q53scn4step4boss6whispy16StateShotAirBallFPQ43scn4step4boss4BossUlUlUl: /* 8025DEE8 00259D28 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -182,7 +182,7 @@ lbl_8025E16C: /* 8025E180 00259FC0 38 21 00 10 */ addi r1, r1, 0x10 /* 8025E184 00259FC4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common16StateShotAirBallFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common16StateShotAirBallFPQ43scn4step4hero4Hero: /* 8036A0D0 00365F10 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -353,17 +353,17 @@ procMove__Q53scn4step4hero6common16StateShotAirBallFv: procFixPos__Q53scn4step4hero6common16StateShotAirBallFv: /* 8036A32C 0036616C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy16StateShotAirBall __vt__Q53scn4step4boss6whispy16StateShotAirBall: .incbin "baserom.dol", 0x466778, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common16StateShotAirBall __vt__Q53scn4step4hero6common16StateShotAirBall: .incbin "baserom.dol", 0x488150, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253461 $$253461: .incbin "baserom.dol", 0x49B560, 0x8 diff --git a/asm/src/StateShotAirBallBase.s b/asm/src/StateShotAirBallBase.s index 026b179f..df5bd998 100644 --- a/asm/src/StateShotAirBallBase.s +++ b/asm/src/StateShotAirBallBase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy20StateShotAirBallBaseFPQ43scn4step4boss4BossUlUlUl __ct__Q53scn4step4boss6whispy20StateShotAirBallBaseFPQ43scn4step4boss4BossUlUlUl: /* 8025E188 00259FC8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -149,7 +149,7 @@ procMove__Q53scn4step4boss6whispy20StateShotAirBallBaseFv: procFixPos__Q53scn4step4boss6whispy20StateShotAirBallBaseFv: /* 8025E380 0025A1C0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy20StateShotAirBallBase __vt__Q53scn4step4boss6whispy20StateShotAirBallBase: .incbin "baserom.dol", 0x4667A0, 0x28 diff --git a/asm/src/StateShotAirBallBig.s b/asm/src/StateShotAirBallBig.s index 71e6621e..65c9942c 100644 --- a/asm/src/StateShotAirBallBig.s +++ b/asm/src/StateShotAirBallBig.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy19StateShotAirBallBigFPQ43scn4step4boss4BossUlUlUl __ct__Q53scn4step4boss6whispy19StateShotAirBallBigFPQ43scn4step4boss4BossUlUlUl: /* 8025E384 0025A1C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -213,7 +213,7 @@ reqAirBallIN__Q53scn4step4boss6whispy19StateShotAirBallBigFRCQ33hel4math7Vector2 __dt__Q53scn4step4boss6whispy19StateShotAirBallBigFv: /* 8025E6A0 0025A4E0 4B FF FA 8C */ b __dt__Q53scn4step4boss6whispy16StateShotAirBallFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy19StateShotAirBallBig __vt__Q53scn4step4boss6whispy19StateShotAirBallBig: .incbin "baserom.dol", 0x4667C8, 0x28 diff --git a/asm/src/StateShotAirBallTornado.s b/asm/src/StateShotAirBallTornado.s index 83699e1c..6be2b1b6 100644 --- a/asm/src/StateShotAirBallTornado.s +++ b/asm/src/StateShotAirBallTornado.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy23StateShotAirBallTornadoFPQ43scn4step4boss4BossUlUlUl __ct__Q53scn4step4boss6whispy23StateShotAirBallTornadoFPQ43scn4step4boss4BossUlUlUl: /* 8025E6A4 0025A4E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -151,12 +151,12 @@ reqAirBall__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv: __dt__Q53scn4step4boss6whispy23StateShotAirBallTornadoFv: /* 8025E8D4 0025A714 4B FF F8 58 */ b __dt__Q53scn4step4boss6whispy16StateShotAirBallFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy23StateShotAirBallTornado __vt__Q53scn4step4boss6whispy23StateShotAirBallTornado: .incbin "baserom.dol", 0x4667F0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253395 $$253395: .incbin "baserom.dol", 0x49B568, 0x8 diff --git a/asm/src/StateShuttleLoop.s b/asm/src/StateShuttleLoop.s index 1a622da7..515dbf10 100644 --- a/asm/src/StateShuttleLoop.s +++ b/asm/src/StateShuttleLoop.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss10creditmeta16StateShuttleLoopFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss10creditmeta16StateShuttleLoopFPQ43scn4step4boss4Boss: /* 8024AF14 00246D54 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -325,7 +325,7 @@ __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1Fv: /* 8024B390 002471D0 4B FE 33 10 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4wing16StateShuttleLoopFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4wing16StateShuttleLoopFPQ43scn4step4hero4Hero: /* 80399880 003956C0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -658,7 +658,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateS __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 80399D14 00395B54 4B E9 49 8C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta14StateGlideAway$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x463070, 0x10 @@ -669,7 +669,7 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditmeta __vt__Q53scn4step4boss10creditmeta16StateShuttleLoop: .incbin "baserom.dol", 0x463090, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing19StateShuttleLoopEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A158, 0x10 @@ -680,7 +680,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing16StateS __vt__Q53scn4step4hero4wing16StateShuttleLoop: .incbin "baserom.dol", 0x48A178, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255753 $$255753: .incbin "baserom.dol", 0x49B218, 0x4 @@ -700,7 +700,7 @@ $$255757: $$255760: .incbin "baserom.dol", 0x49B230, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257169 $$257169: .incbin "baserom.dol", 0x49E280, 0x4 diff --git a/asm/src/StateShuttleLoopEnd.s b/asm/src/StateShuttleLoopEnd.s index 10d43e6c..6060779e 100644 --- a/asm/src/StateShuttleLoopEnd.s +++ b/asm/src/StateShuttleLoopEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4wing19StateShuttleLoopEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero4wing19StateShuttleLoopEndFPQ43scn4step4hero4Hero: /* 80399D18 00395B58 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -186,7 +186,7 @@ lbl_80399F90: procFixPos__Q53scn4step4hero4wing19StateShuttleLoopEndFv: /* 80399FA8 00395DE8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4wing19StateShuttleLoopEnd __vt__Q53scn4step4hero4wing19StateShuttleLoopEnd: .incbin "baserom.dol", 0x48A1A0, 0x28 diff --git a/asm/src/StateSkinned.s b/asm/src/StateSkinned.s index 07f943b5..261348a4 100644 --- a/asm/src/StateSkinned.s +++ b/asm/src/StateSkinned.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5cappy12StateSkinnedFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5cappy12StateSkinnedFPQ43scn4step5enemy5Enemy: /* 802A34A0 0029F2E0 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -314,7 +314,7 @@ lbl_802A3900: /* 802A3910 0029F750 38 21 00 50 */ addi r1, r1, 0x50 /* 802A3914 0029F754 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5cappy12StateSkinned __vt__Q53scn4step5enemy5cappy12StateSkinned: .incbin "baserom.dol", 0x471378, 0x20 diff --git a/asm/src/StateSkyKick.s b/asm/src/StateSkyKick.s index 100c85b8..389c5ab4 100644 --- a/asm/src/StateSkyKick.s +++ b/asm/src/StateSkyKick.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero7fighter12StateSkyKickFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero7fighter12StateSkyKickFPQ43scn4step4hero4Hero: /* 8039E650 0039A490 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -309,7 +309,7 @@ __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter12Sta __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1Fv: /* 8039EA6C 0039A8AC 4B E8 FC 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter15StateSkyKickHit$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A638, 0x10 diff --git a/asm/src/StateSkyKickHit.s b/asm/src/StateSkyKickHit.s index 0d39a411..a2726c20 100644 --- a/asm/src/StateSkyKickHit.s +++ b/asm/src/StateSkyKickHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter15StateSkyKickHitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter15StateSkyKickHitFPQ43scn4step4hero4Hero: /* 8039EA70 0039A8B0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -267,12 +267,12 @@ lbl_8039EDDC: procFixPos__Q53scn4step4hero7fighter15StateSkyKickHitFv: /* 8039EE38 0039AC78 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter15StateSkyKickHit __vt__Q53scn4step4hero7fighter15StateSkyKickHit: .incbin "baserom.dol", 0x48A680, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258356 $$258356: .incbin "baserom.dol", 0x49E318, 0x4 diff --git a/asm/src/StateSlant.s b/asm/src/StateSlant.s index 1bfe892f..8005d540 100644 --- a/asm/src/StateSlant.s +++ b/asm/src/StateSlant.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy15zankibblecutter10StateSlantFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy15zankibblecutter10StateSlantFPQ43scn4step5enemy5Enemy: /* 802F30C0 002EEF00 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -268,12 +268,12 @@ lbl_802F3468: /* 802F3484 002EF2C4 38 21 00 D0 */ addi r1, r1, 0xd0 /* 802F3488 002EF2C8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter10StateSlant __vt__Q53scn4step5enemy15zankibblecutter10StateSlant: .incbin "baserom.dol", 0x47B018, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256064 $$256064: .incbin "baserom.dol", 0x49D0F8, 0x8 diff --git a/asm/src/StateSliding.s b/asm/src/StateSliding.s index 0ea987eb..3864bf4b 100644 --- a/asm/src/StateSliding.s +++ b/asm/src/StateSliding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common12StateSlidingFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common12StateSlidingFPQ43scn4step4hero4Hero: /* 8036A330 00366170 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -481,7 +481,7 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12Stat __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036A9C4 00366804 4B EC 3C DC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSlidingHit$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488178, 0x10 @@ -492,7 +492,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common12Stat __vt__Q53scn4step4hero6common12StateSliding: .incbin "baserom.dol", 0x488198, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258502 $$258502: .incbin "baserom.dol", 0x49DC20, 0x8 diff --git a/asm/src/StateSlidingHit.s b/asm/src/StateSlidingHit.s index 8508686f..b41f443a 100644 --- a/asm/src/StateSlidingHit.s +++ b/asm/src/StateSlidingHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common15StateSlidingHitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common15StateSlidingHitFPQ43scn4step4hero4Hero: /* 8036A9C8 00366808 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -149,12 +149,12 @@ procMove__Q53scn4step4hero6common15StateSlidingHitFv: procFixPos__Q53scn4step4hero6common15StateSlidingHitFv: /* 8036ABD0 00366A10 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common15StateSlidingHit __vt__Q53scn4step4hero6common15StateSlidingHit: .incbin "baserom.dol", 0x4881C0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255746 $$255746: .incbin "baserom.dol", 0x49DC30, 0x8 diff --git a/asm/src/StateSlip.s b/asm/src/StateSlip.s index ce04d4a3..14831003 100644 --- a/asm/src/StateSlip.s +++ b/asm/src/StateSlip.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone9StateSlipFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context __ct__Q53scn4step4hero5stone9StateSlipFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context: /* 80390E6C 0038CCAC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -474,12 +474,12 @@ lbl_80391514: /* 8039152C 0038D36C 38 21 00 30 */ addi r1, r1, 0x30 /* 80391530 0038D370 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone9StateSlip __vt__Q53scn4step4hero5stone9StateSlip: .incbin "baserom.dol", 0x489BC0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257140 $$257140: .incbin "baserom.dol", 0x49E120, 0x4 diff --git a/asm/src/StateSlope.s b/asm/src/StateSlope.s index ce8f3180..ab8a5fe8 100644 --- a/asm/src/StateSlope.s +++ b/asm/src/StateSlope.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky10StateSlopeFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky10StateSlopeFPQ43scn4step5enemy5Enemy: /* 802D4E40 002D0C80 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -288,12 +288,12 @@ lbl_802D5228: /* 802D5244 002D1084 38 21 00 60 */ addi r1, r1, 0x60 /* 802D5248 002D1088 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky10StateSlope __vt__Q53scn4step5enemy5rocky10StateSlope: .incbin "baserom.dol", 0x476FB8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256183 $$256183: .incbin "baserom.dol", 0x49CB50, 0x8 diff --git a/asm/src/StateSmash.s b/asm/src/StateSmash.s index ad839ff6..fa2a8eac 100644 --- a/asm/src/StateSmash.s +++ b/asm/src/StateSmash.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter10StateSmashFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter10StateSmashFPQ43scn4step4hero4Hero: /* 8039EE3C 0039AC7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -152,12 +152,12 @@ createWeapon__Q53scn4step4hero7fighter10StateSmashFv: /* 8039F040 0039AE80 38 21 00 90 */ addi r1, r1, 0x90 /* 8039F044 0039AE84 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter10StateSmash __vt__Q53scn4step4hero7fighter10StateSmash: .incbin "baserom.dol", 0x48A6A8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257075 $$257075: .incbin "baserom.dol", 0x49E328, 0x4 diff --git a/asm/src/StateSmashKick.s b/asm/src/StateSmashKick.s index de637b53..42d75dbe 100644 --- a/asm/src/StateSmashKick.s +++ b/asm/src/StateSmashKick.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5smash14StateSmashKickFPQ43scn4step4hero4HeroQ53scn4step4hero5smash11ChargeLevel __ct__Q53scn4step4hero5smash14StateSmashKickFPQ43scn4step4hero4HeroQ53scn4step4hero5smash11ChargeLevel: /* 803A22CC 0039E10C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -215,7 +215,7 @@ lbl_803A25A8: procFixPos__Q53scn4step4hero5smash14StateSmashKickFv: /* 803A25C0 0039E400 4B FB E2 C0 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5smash14StateSmashKick __vt__Q53scn4step4hero5smash14StateSmashKick: .incbin "baserom.dol", 0x48AF90, 0x28 diff --git a/asm/src/StateSmashKickCharge.s b/asm/src/StateSmashKickCharge.s index 097d7808..2b4a390c 100644 --- a/asm/src/StateSmashKickCharge.s +++ b/asm/src/StateSmashKickCharge.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5smash20StateSmashKickChargeFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5smash20StateSmashKickChargeFPQ43scn4step4hero4Hero: /* 803A25C4 0039E404 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -246,7 +246,7 @@ __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash20Stat __dt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1Fv: /* 803A28FC 0039E73C 4B E8 BD A4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1 __vt__Q24util130StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5smash14StateSmashKick$$4PQ43scn4step4hero4Hero$$4Q53scn4step4hero5smash11ChargeLevel$$1: .incbin "baserom.dol", 0x48AFB8, 0x10 diff --git a/asm/src/StateSmashed.s b/asm/src/StateSmashed.s index 6345c81b..c664dabc 100644 --- a/asm/src/StateSmashed.s +++ b/asm/src/StateSmashed.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld12StateSmashedFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld12StateSmashedFPQ43scn4step5enemy5Enemy: /* 802DF2D8 002DB118 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -370,7 +370,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15St __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802DF7FC 002DB63C 4B F4 EE A4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee12StateSmashedFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee12StateSmashedFPQ43scn4step5enemy5Enemy: /* 802EE0E8 002E9F28 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -789,7 +789,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddlede __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EE6C4 002EA504 4B F3 FF DC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477F60, 0x10 @@ -797,7 +797,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5sheld15Stat __vt__Q53scn4step5enemy5sheld12StateSmashed: .incbin "baserom.dol", 0x477F70, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateSmashedEnd$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47A368, 0x10 @@ -805,7 +805,7 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 __vt__Q53scn4step5enemy9waddledee12StateSmashed: .incbin "baserom.dol", 0x47A378, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256802 $$256802: .incbin "baserom.dol", 0x49CD50, 0x4 @@ -828,7 +828,7 @@ $$256870: $$256871: .incbin "baserom.dol", 0x49CD68, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256888 $$256888: .incbin "baserom.dol", 0x49D000, 0x4 diff --git a/asm/src/StateSmashedEnd.s b/asm/src/StateSmashedEnd.s index ab3ed6da..bf91e3a5 100644 --- a/asm/src/StateSmashedEnd.s +++ b/asm/src/StateSmashedEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5sheld15StateSmashedEndFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5sheld15StateSmashedEndFPQ43scn4step5enemy5Enemy: /* 802DF800 002DB640 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -199,7 +199,7 @@ lbl_802DFAC8: /* 802DFAD8 002DB918 38 21 00 10 */ addi r1, r1, 0x10 /* 802DFADC 002DB91C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee15StateSmashedEndFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee15StateSmashedEndFPQ43scn4step5enemy5Enemy: /* 802EE6C8 002EA508 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -427,17 +427,17 @@ lbl_802EE9EC: procFixPos__Q53scn4step5enemy9waddledee15StateSmashedEndFv: /* 802EEA04 002EA844 4B FA 41 98 */ b procFixPos__Q53scn4step5enemy6common12StateLandingFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5sheld15StateSmashedEnd __vt__Q53scn4step5enemy5sheld15StateSmashedEnd: .incbin "baserom.dol", 0x477F90, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee15StateSmashedEnd __vt__Q53scn4step5enemy9waddledee15StateSmashedEnd: .incbin "baserom.dol", 0x47A398, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256208 $$256208: .incbin "baserom.dol", 0x49CD70, 0x4 @@ -448,7 +448,7 @@ $$256209: $$256210: .incbin "baserom.dol", 0x49CD78, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256918 $$256918: .incbin "baserom.dol", 0x49D020, 0x4 diff --git a/asm/src/StateSpaceJump.s b/asm/src/StateSpaceJump.s index 69464255..c2cc0c2b 100644 --- a/asm/src/StateSpaceJump.s +++ b/asm/src/StateSpaceJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero12interference14StateSpaceJumpFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero12interference14StateSpaceJumpFPQ43scn4step4hero4Hero: /* 80373594 0036F3D4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1044,12 +1044,12 @@ init__Q53scn4step4hero12interference14StateSpaceJumpFv: /* 80374498 003702D8 38 21 00 20 */ addi r1, r1, 0x20 /* 8037449C 003702DC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference14StateSpaceJump __vt__Q53scn4step4hero12interference14StateSpaceJump: .incbin "baserom.dol", 0x488658, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260789 $$260789: .incbin "baserom.dol", 0x49DD90, 0x4 diff --git a/asm/src/StateSparkLv1.s b/asm/src/StateSparkLv1.s index 2c139842..bcb99674 100644 --- a/asm/src/StateSparkLv1.s +++ b/asm/src/StateSparkLv1.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage13StateSparkLv1FPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage13StateSparkLv1FPQ43scn4step4hero4Hero: /* 803774F8 00373338 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -139,12 +139,12 @@ procMove__Q53scn4step4hero6damage13StateSparkLv1Fv: procFixPos__Q53scn4step4hero6damage13StateSparkLv1Fv: /* 803776DC 0037351C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage13StateSparkLv1 __vt__Q53scn4step4hero6damage13StateSparkLv1: .incbin "baserom.dol", 0x488830, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256678 $$256678: .incbin "baserom.dol", 0x49DE80, 0x4 diff --git a/asm/src/StateSparkLv2.s b/asm/src/StateSparkLv2.s index 6f5d8931..801fa19a 100644 --- a/asm/src/StateSparkLv2.s +++ b/asm/src/StateSparkLv2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage13StateSparkLv2FPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage13StateSparkLv2FPQ43scn4step4hero4Hero: /* 803776E0 00373520 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -334,12 +334,12 @@ lbl_80377B94: /* 80377BA4 003739E4 38 21 00 40 */ addi r1, r1, 0x40 /* 80377BA8 003739E8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage13StateSparkLv2 __vt__Q53scn4step4hero6damage13StateSparkLv2: .incbin "baserom.dol", 0x488858, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256853 $$256853: .incbin "baserom.dol", 0x49DE88, 0x4 diff --git a/asm/src/StateSparkLv3.s b/asm/src/StateSparkLv3.s index d8b7844a..7f9f1d6f 100644 --- a/asm/src/StateSparkLv3.s +++ b/asm/src/StateSparkLv3.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage13StateSparkLv3FPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage13StateSparkLv3FPQ43scn4step4hero4Hero: /* 80377BAC 003739EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -254,12 +254,12 @@ procMove__Q53scn4step4hero6damage13StateSparkLv3Fv: procFixPos__Q53scn4step4hero6damage13StateSparkLv3Fv: /* 80377F40 00373D80 4B FF EF 58 */ b procFixPos__Q53scn4step4hero6damage12StateFireLv3Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage13StateSparkLv3 __vt__Q53scn4step4hero6damage13StateSparkLv3: .incbin "baserom.dol", 0x488880, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257010 $$257010: .incbin "baserom.dol", 0x49DEA0, 0x4 diff --git a/asm/src/StateSpin.s b/asm/src/StateSpin.s index 9de51b51..9dcf3b04 100644 --- a/asm/src/StateSpin.s +++ b/asm/src/StateSpin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe9StateSpinFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe9StateSpinFPQ43scn4step5enemy5Enemy: /* 802C0768 002BC5A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -228,7 +228,7 @@ lbl_802C0A88: procFixPos__Q53scn4step5enemy10knucklejoe9StateSpinFv: /* 802C0AA0 002BC8E0 4B FF FC 08 */ b procFixPos__Q53scn4step5enemy10knucklejoe11StateRisingFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setNextState$$0Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1FPQ43scn4step4hero4Herob_v setNextState$$0Q53scn4step4hero6hammer9StateSpin$$4PQ43scn4step4hero4Hero$$4b$$1__Q24util41StateChanger$$0Q43scn4step4hero6IState$$4256$$1FPQ43scn4step4hero4Herob_v: /* 80396898 003926D8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -710,12 +710,12 @@ __dt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9State __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1Fv: /* 80396F28 00392D68 4B E9 77 78 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe9StateSpin __vt__Q53scn4step5enemy10knucklejoe9StateSpin: .incbin "baserom.dol", 0x474A90, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6hammer10StateThrow$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489FB0, 0x10 @@ -726,7 +726,7 @@ __vt__Q24util91StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6hammer9State __vt__Q53scn4step4hero6hammer9StateSpin: .incbin "baserom.dol", 0x489FD0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255929 $$255929: .incbin "baserom.dol", 0x49C748, 0x4 @@ -743,7 +743,7 @@ $$255939: $$255947: .incbin "baserom.dol", 0x49C758, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258565 $$258565: .incbin "baserom.dol", 0x49E208, 0x8 diff --git a/asm/src/StateSpinKick.s b/asm/src/StateSpinKick.s index 0da90221..71ff927e 100644 --- a/asm/src/StateSpinKick.s +++ b/asm/src/StateSpinKick.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter13StateSpinKickFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter13StateSpinKickFPQ43scn4step4hero4Hero: /* 8039F048 0039AE88 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -312,7 +312,7 @@ lbl_8039F494: /* 8039F4A4 0039B2E4 38 21 00 10 */ addi r1, r1, 0x10 /* 8039F4A8 0039B2E8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter13StateSpinKick __vt__Q53scn4step4hero7fighter13StateSpinKick: .incbin "baserom.dol", 0x48A6D0, 0x28 diff --git a/asm/src/StateSpine.s b/asm/src/StateSpine.s index 26f48ee9..2ba3582f 100644 --- a/asm/src/StateSpine.s +++ b/asm/src/StateSpine.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage10StateSpineFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage10StateSpineFPQ43scn4step4hero4Hero: /* 80377F44 00373D84 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -220,12 +220,12 @@ procMove__Q53scn4step4hero6damage10StateSpineFv: procFixPos__Q53scn4step4hero6damage10StateSpineFv: /* 8037826C 003740AC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage10StateSpine __vt__Q53scn4step4hero6damage10StateSpine: .incbin "baserom.dol", 0x4888A8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256844 $$256844: .incbin "baserom.dol", 0x49DEB8, 0x4 diff --git a/asm/src/StateSquashRoof.s b/asm/src/StateSquashRoof.s index d494ca11..5112b9c8 100644 --- a/asm/src/StateSquashRoof.s +++ b/asm/src/StateSquashRoof.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common15StateSquashRoofFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common15StateSquashRoofFPQ43scn4step4hero4Hero: /* 8036ABD4 00366A14 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -283,7 +283,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15St __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036AFB4 00366DF4 4B EC 36 EC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashRoof$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4881E8, 0x10 @@ -291,7 +291,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat __vt__Q53scn4step4hero6common15StateSquashRoof: .incbin "baserom.dol", 0x4881F8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257232 $$257232: .incbin "baserom.dol", 0x49DC38, 0x8 diff --git a/asm/src/StateSquashWall.s b/asm/src/StateSquashWall.s index 0d4ac302..eb545d57 100644 --- a/asm/src/StateSquashWall.s +++ b/asm/src/StateSquashWall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common15StateSquashWallFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common15StateSquashWallFPQ43scn4step4hero4Hero: /* 8036AFB8 00366DF8 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -439,7 +439,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15St __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036B5DC 0036741C 4B EC 30 C4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateSquashWall$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488220, 0x10 @@ -447,7 +447,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat __vt__Q53scn4step4hero6common15StateSquashWall: .incbin "baserom.dol", 0x488230, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258293 $$258293: .incbin "baserom.dol", 0x49DC40, 0x4 diff --git a/asm/src/StateSquat.s b/asm/src/StateSquat.s index b02ee0c0..b4a90e46 100644 --- a/asm/src/StateSquat.s +++ b/asm/src/StateSquat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common10StateSquatFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common10StateSquatFPQ43scn4step4hero4Hero: /* 8036B5E0 00367420 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -356,7 +356,7 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10St __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036BAD0 00367910 4B EC 2B D0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateSquat$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488258, 0x10 @@ -364,7 +364,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10Stat __vt__Q53scn4step4hero6common10StateSquat: .incbin "baserom.dol", 0x488268, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258194 $$258194: .incbin "baserom.dol", 0x49DC48, 0x4 diff --git a/asm/src/StateStamp.s b/asm/src/StateStamp.s index e34dc9e0..38346daa 100644 --- a/asm/src/StateStamp.s +++ b/asm/src/StateStamp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter10StateStampFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter10StateStampFPQ43scn4step4hero4Hero: /* 8039F4AC 0039B2EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -166,7 +166,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13S __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1Fv: /* 8039F6C8 0039B508 4B E8 EF D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero7fighter13StateStampHit$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A6F8, 0x10 diff --git a/asm/src/StateStampHit.s b/asm/src/StateStampHit.s index a82ef082..0017158b 100644 --- a/asm/src/StateStampHit.s +++ b/asm/src/StateStampHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter13StateStampHitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter13StateStampHitFPQ43scn4step4hero4Hero: /* 8039F6CC 0039B50C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -197,12 +197,12 @@ lbl_8039F92C: procFixPos__Q53scn4step4hero7fighter13StateStampHitFv: /* 8039F988 0039B7C8 4B FC 0E F8 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter13StateStampHit __vt__Q53scn4step4hero7fighter13StateStampHit: .incbin "baserom.dol", 0x48A730, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255748 $$255748: .incbin "baserom.dol", 0x49E330, 0x4 diff --git a/asm/src/StateStartJump.s b/asm/src/StateStartJump.s index 534f2e9e..9b0b2d0b 100644 --- a/asm/src/StateStartJump.s +++ b/asm/src/StateStartJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone14StateStartJumpFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context __ct__Q53scn4step4hero5stone14StateStartJumpFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context: /* 80391534 0038D374 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -232,7 +232,7 @@ lbl_8039185C: /* 80391868 0038D6A8 38 21 00 10 */ addi r1, r1, 0x10 /* 8039186C 0038D6AC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone14StateStartJump __vt__Q53scn4step4hero5stone14StateStartJump: .incbin "baserom.dol", 0x489BE8, 0x28 diff --git a/asm/src/StateStartWait.s b/asm/src/StateStartWait.s index b55ded9e..19f721a0 100644 --- a/asm/src/StateStartWait.s +++ b/asm/src/StateStartWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster14StateStartWaitFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster14StateStartWaitFPQ43scn4step4boss4Boss: /* 802432C8 0023F108 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ procMove__Q53scn4step4boss15challengemaster14StateStartWaitFv: procFixPos__Q53scn4step4boss15challengemaster14StateStartWaitFv: /* 80243428 0023F268 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster14StateStartWait __vt__Q53scn4step4boss15challengemaster14StateStartWait: .incbin "baserom.dol", 0x4620D8, 0x20 diff --git a/asm/src/StateStay.s b/asm/src/StateStay.s index 028bfdc1..e907cb37 100644 --- a/asm/src/StateStay.s +++ b/asm/src/StateStay.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff9StateStayFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff9StateStayFPQ43scn4step5enemy5Enemy: /* 802C8910 002C4750 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -140,7 +140,7 @@ lbl_802C8AE0: /* 802C8AF0 002C4930 38 21 00 40 */ addi r1, r1, 0x40 /* 802C8AF4 002C4934 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky9StateStayFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky9StateStayFPQ43scn4step5enemy5Enemy: /* 802D524C 002D108C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -433,12 +433,12 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11St __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D5668 002D14A8 4B F5 90 38 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff9StateStay __vt__Q53scn4step5enemy5nruff9StateStay: .incbin "baserom.dol", 0x475AE8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11StateAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x476FD8, 0x10 @@ -446,7 +446,7 @@ __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky11Stat __vt__Q53scn4step5enemy5rocky9StateStay: .incbin "baserom.dol", 0x476FE8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256196 $$256196: .incbin "baserom.dol", 0x49CB58, 0x4 diff --git a/asm/src/StateStepBack.s b/asm/src/StateStepBack.s index a4e8a1ba..f0ffb4ee 100644 --- a/asm/src/StateStepBack.s +++ b/asm/src/StateStepBack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight13StateStepBackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight13StateStepBackFPQ43scn4step5enemy5Enemy: /* 80298070 00293EB0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -239,7 +239,7 @@ lbl_80298394: /* 802983A4 002941E4 38 21 00 50 */ addi r1, r1, 0x50 /* 802983A8 002941E8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight13StateStepBack __vt__Q53scn4step5enemy11bladeknight13StateStepBack: .incbin "baserom.dol", 0x46FB88, 0x20 diff --git a/asm/src/StateStickObj.s b/asm/src/StateStickObj.s index 7a8f8021..a059db6a 100644 --- a/asm/src/StateStickObj.s +++ b/asm/src/StateStickObj.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10spearspear13StateStickObjFPQ43scn4step6weapon6Weaponf __ct__Q53scn4step6weapon10spearspear13StateStickObjFPQ43scn4step6weapon6Weaponf: /* 803E4AF8 003E0938 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -135,7 +135,7 @@ procMove__Q53scn4step6weapon10spearspear13StateStickObjFv: /* 803E4CCC 003E0B0C 38 63 00 08 */ addi r3, r3, 8 /* 803E4CD0 003E0B10 4B FF 3F 98 */ b procMove__Q43scn4step6weapon17StickObjAlgorithmFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon8deespear13StateStickObjFPQ43scn4step6weapon6Weaponf __ct__Q53scn4step6weapon8deespear13StateStickObjFPQ43scn4step6weapon6Weaponf: /* 803EDB0C 003E994C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -242,12 +242,12 @@ lbl_803EDC64: procMove__Q53scn4step6weapon8deespear13StateStickObjFv: /* 803EDC78 003E9AB8 4B FF 70 54 */ b procMove__Q53scn4step6weapon10spearspear13StateStickObjFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10spearspear13StateStickObj __vt__Q53scn4step6weapon10spearspear13StateStickObj: .incbin "baserom.dol", 0x490800, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear13StateStickObj __vt__Q53scn4step6weapon8deespear13StateStickObj: .incbin "baserom.dol", 0x4910C8, 0x20 diff --git a/asm/src/StateStickWall.s b/asm/src/StateStickWall.s index 17102014..17bd5e99 100644 --- a/asm/src/StateStickWall.s +++ b/asm/src/StateStickWall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10spearspear14StateStickWallFPQ43scn4step6weapon6Weaponf __ct__Q53scn4step6weapon10spearspear14StateStickWallFPQ43scn4step6weapon6Weaponf: /* 803E4CD4 003E0B14 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -209,7 +209,7 @@ lbl_803E4F80: procObjCollReact__Q53scn4step6weapon10spearspear14StateStickWallFv: /* 803E4FA0 003E0DE0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon8deespear14StateStickWallFPQ43scn4step6weapon6Weaponf __ct__Q53scn4step6weapon8deespear14StateStickWallFPQ43scn4step6weapon6Weaponf: /* 803EDC7C 003E9ABC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -394,17 +394,17 @@ lbl_803EDECC: procObjCollReact__Q53scn4step6weapon8deespear14StateStickWallFv: /* 803EDEEC 003E9D2C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10spearspear14StateStickWall __vt__Q53scn4step6weapon10spearspear14StateStickWall: .incbin "baserom.dol", 0x490820, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear14StateStickWall __vt__Q53scn4step6weapon8deespear14StateStickWall: .incbin "baserom.dol", 0x4910E8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256411 $$256411: .incbin "baserom.dol", 0x49EA70, 0x4 @@ -418,7 +418,7 @@ $$256413: $$256414: .incbin "baserom.dol", 0x49EA7C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256414 $$256414: .incbin "baserom.dol", 0x49EC58, 0x4 diff --git a/asm/src/StateStop.s b/asm/src/StateStop.s index 04bffa2d..12a8adb8 100644 --- a/asm/src/StateStop.s +++ b/asm/src/StateStop.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff9StateStopFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff9StateStopFPQ43scn4step5enemy5Enemy: /* 802C8AF8 002C4938 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -226,12 +226,12 @@ lbl_802C8E1C: /* 802C8E2C 002C4C6C 38 21 00 50 */ addi r1, r1, 0x50 /* 802C8E30 002C4C70 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff9StateStop __vt__Q53scn4step5enemy5nruff9StateStop: .incbin "baserom.dol", 0x475B08, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256172 $$256172: .incbin "baserom.dol", 0x49C8F0, 0x8 diff --git a/asm/src/StateStopAir.s b/asm/src/StateStopAir.s index c297cb1f..f6829814 100644 --- a/asm/src/StateStopAir.s +++ b/asm/src/StateStopAir.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff12StateStopAirFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff12StateStopAirFPQ43scn4step5enemy5Enemy: /* 802C8E34 002C4C74 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -219,12 +219,12 @@ lbl_802C9134: /* 802C9150 002C4F90 38 21 00 20 */ addi r1, r1, 0x20 /* 802C9154 002C4F94 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5nruff12StateStopAir __vt__Q53scn4step5enemy5nruff12StateStopAir: .incbin "baserom.dol", 0x475B28, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255952 $$255952: .incbin "baserom.dol", 0x49C8F8, 0x8 diff --git a/asm/src/StateStraight.s b/asm/src/StateStraight.s index 569b19b5..f6c4f80e 100644 --- a/asm/src/StateStraight.s +++ b/asm/src/StateStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy15zankibblecutter13StateStraightFPQ43scn4step5enemy5EnemyRQ43scn4step4boss8Accessor __ct__Q53scn4step5enemy15zankibblecutter13StateStraightFPQ43scn4step5enemy5EnemyRQ43scn4step4boss8Accessor: /* 802F348C 002EF2CC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -341,12 +341,12 @@ lbl_802F3944: /* 802F3954 002EF794 38 21 00 80 */ addi r1, r1, 0x80 /* 802F3958 002EF798 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy15zankibblecutter13StateStraight __vt__Q53scn4step5enemy15zankibblecutter13StateStraight: .incbin "baserom.dol", 0x47B038, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256486 $$256486: .incbin "baserom.dol", 0x49D100, 0x4 diff --git a/asm/src/StateSummon.s b/asm/src/StateSummon.s index bff25df2..305cb3b3 100644 --- a/asm/src/StateSummon.s +++ b/asm/src/StateSummon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster11StateSummonFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster11StateSummonFPQ43scn4step4boss4Boss: /* 8024342C 0023F26C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -145,7 +145,7 @@ procMove__Q53scn4step4boss15challengemaster11StateSummonFv: procFixPos__Q53scn4step4boss15challengemaster11StateSummonFv: /* 80243610 0023F450 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster11StateSummon __vt__Q53scn4step4boss15challengemaster11StateSummon: .incbin "baserom.dol", 0x4620F8, 0x20 diff --git a/asm/src/StateSuperAppear.s b/asm/src/StateSuperAppear.s index 5d460fe1..ec942b82 100644 --- a/asm/src/StateSuperAppear.s +++ b/asm/src/StateSuperAppear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common16StateSuperAppearFPQ43scn4step5enemy5EnemyRCQ25ostop9ReqHandlei __ct__Q53scn4step5enemy6common16StateSuperAppearFPQ43scn4step5enemy5EnemyRCQ25ostop9ReqHandlei: /* 80294338 00290178 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -357,12 +357,12 @@ procMove__Q53scn4step5enemy6common16StateSuperAppearFv: procFixPos__Q53scn4step5enemy6common16StateSuperAppearFv: /* 80294874 002906B4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common16StateSuperAppear __vt__Q53scn4step5enemy6common16StateSuperAppear: .incbin "baserom.dol", 0x46F3B8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257491 $$257491: .incbin "baserom.dol", 0x49BC08, 0x4 diff --git a/asm/src/StateSuperAppearPre.s b/asm/src/StateSuperAppearPre.s index 53edddaa..07bc11c0 100644 --- a/asm/src/StateSuperAppearPre.s +++ b/asm/src/StateSuperAppearPre.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common19StateSuperAppearPreFPQ43scn4step5enemy5Enemyi __ct__Q53scn4step5enemy6common19StateSuperAppearPreFPQ43scn4step5enemy5Enemyi: /* 80294878 002906B8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -197,7 +197,7 @@ create__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16 __dt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1Fv: /* 80294B24 00290964 4B F9 9B 7C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1 __vt__Q24util121StateFactoryArg3$$0Q24util6IState$$4Q53scn4step5enemy6common16StateSuperAppear$$4PQ43scn4step5enemy5Enemy$$4Q25ostop9ReqHandle$$4i$$1: .incbin "baserom.dol", 0x46F3D8, 0x10 diff --git a/asm/src/StateSuperFirst.s b/asm/src/StateSuperFirst.s index b1bac465..64795054 100644 --- a/asm/src/StateSuperFirst.s +++ b/asm/src/StateSuperFirst.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step5enemy6common15StateSuperFirstFPQ43scn4step5enemy5Enemyi TryToChangeState__Q53scn4step5enemy6common15StateSuperFirstFPQ43scn4step5enemy5Enemyi: /* 80294B28 00290968 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -595,7 +595,7 @@ __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15St __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1Fv: /* 80295364 002911A4 4B F9 93 3C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common19StateSuperAppearPre$$4PQ43scn4step5enemy5Enemy$$4i$$1: .incbin "baserom.dol", 0x46F408, 0x10 @@ -606,7 +606,7 @@ __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common15St __vt__Q53scn4step5enemy6common15StateSuperFirst: .incbin "baserom.dol", 0x46F428, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258008 $$258008: .incbin "baserom.dol", 0x49BC10, 0x4 diff --git a/asm/src/StateSuperJump.s b/asm/src/StateSuperJump.s index bab2711d..95e4d4b7 100644 --- a/asm/src/StateSuperJump.s +++ b/asm/src/StateSuperJump.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common14StateSuperJumpFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common14StateSuperJumpFPQ43scn4step4hero4Hero: /* 8036BAD4 00367914 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -245,12 +245,12 @@ lbl_8036BE28: procFixPos__Q53scn4step4hero6common14StateSuperJumpFv: /* 8036BE40 00367C80 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common14StateSuperJump __vt__Q53scn4step4hero6common14StateSuperJump: .incbin "baserom.dol", 0x488290, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256442 $$256442: .incbin "baserom.dol", 0x49DC58, 0x8 diff --git a/asm/src/StateSuperTeamAttack.s b/asm/src/StateSuperTeamAttack.s index f76720a6..253456da 100644 --- a/asm/src/StateSuperTeamAttack.s +++ b/asm/src/StateSuperTeamAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6damage20StateSuperTeamAttackFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6damage20StateSuperTeamAttackFPQ43scn4step4hero4Hero: /* 80378270 003740B0 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -182,12 +182,12 @@ procMove__Q53scn4step4hero6damage20StateSuperTeamAttackFv: procFixPos__Q53scn4step4hero6damage20StateSuperTeamAttackFv: /* 803784F4 00374334 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6damage20StateSuperTeamAttack __vt__Q53scn4step4hero6damage20StateSuperTeamAttack: .incbin "baserom.dol", 0x4888D0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257021 $$257021: .incbin "baserom.dol", 0x49DED8, 0x8 diff --git a/asm/src/StateSwim.s b/asm/src/StateSwim.s index ff1c2eca..7741d860 100644 --- a/asm/src/StateSwim.s +++ b/asm/src/StateSwim.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common9StateSwimFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common9StateSwimFPQ43scn4step4hero4Hero: /* 8036BE44 00367C84 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -740,12 +740,12 @@ lbl_8036C8B8: /* 8036C8DC 0036871C 38 21 00 30 */ addi r1, r1, 0x30 /* 8036C8E0 00368720 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateSwim __vt__Q53scn4step4hero6common9StateSwim: .incbin "baserom.dol", 0x4882B8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257929 $$257929: .incbin "baserom.dol", 0x49DC60, 0x4 diff --git a/asm/src/StateSwing.s b/asm/src/StateSwing.s index 09a2b2c4..864d1c83 100644 --- a/asm/src/StateSwing.s +++ b/asm/src/StateSwing.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers10StateSwingFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss7bonkers10StateSwingFPQ43scn4step4boss4Boss: /* 80238FFC 00234E3C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -310,7 +310,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13S __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1Fv: /* 80239420 00235260 4B FF 52 80 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss7bonkers13StateSwingEnd$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x461380, 0x10 diff --git a/asm/src/StateSwingEnd.s b/asm/src/StateSwingEnd.s index 42e7dd36..83d36ef2 100644 --- a/asm/src/StateSwingEnd.s +++ b/asm/src/StateSwingEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers13StateSwingEndFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss7bonkers13StateSwingEndFPQ43scn4step4boss4Boss: /* 80239424 00235264 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -103,7 +103,7 @@ procMove__Q53scn4step4boss7bonkers13StateSwingEndFv: procFixPos__Q53scn4step4boss7bonkers13StateSwingEndFv: /* 80239574 002353B4 4B FF EA 4C */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss7bonkers13StateSwingEnd __vt__Q53scn4step4boss7bonkers13StateSwingEnd: .incbin "baserom.dol", 0x4613B0, 0x20 diff --git a/asm/src/StateSwingPursuit.s b/asm/src/StateSwingPursuit.s index b84c4e04..6bbd5ac2 100644 --- a/asm/src/StateSwingPursuit.s +++ b/asm/src/StateSwingPursuit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss7bonkers17StateSwingPursuitFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss7bonkers17StateSwingPursuitFPQ43scn4step4boss4Boss: /* 80239578 002353B8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -393,12 +393,12 @@ lbl_80239B08: /* 80239B18 00235958 38 21 00 90 */ addi r1, r1, 0x90 /* 80239B1C 0023595C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss7bonkers17StateSwingPursuit __vt__Q53scn4step4boss7bonkers17StateSwingPursuit: .incbin "baserom.dol", 0x4613D0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256457 $$256457: .incbin "baserom.dol", 0x49AF98, 0x4 diff --git a/asm/src/StateSwordAirSpin.s b/asm/src/StateSwordAirSpin.s index fc4a821f..91d5b0fd 100644 --- a/asm/src/StateSwordAirSpin.s +++ b/asm/src/StateSwordAirSpin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tryToChangeState__Q53scn4step4hero5sword17StateSwordAirSpinFPQ43scn4step4hero4Hero tryToChangeState__Q53scn4step4hero5sword17StateSwordAirSpinFPQ43scn4step4hero4Hero: /* 803862AC 003820EC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -286,7 +286,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17Sta __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1Fv: /* 80386698 003824D8 4B EA 80 08 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17StateSwordAirSpin$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488F90, 0x10 diff --git a/asm/src/StateSwordAttack.s b/asm/src/StateSwordAttack.s index e3ab2199..a5f3db68 100644 --- a/asm/src/StateSwordAttack.s +++ b/asm/src/StateSwordAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tryToChangeState__Q53scn4step4hero5sword16StateSwordAttackFPQ43scn4step4hero4Hero tryToChangeState__Q53scn4step4hero5sword16StateSwordAttackFPQ43scn4step4hero4Hero: /* 8038669C 003824DC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -396,7 +396,7 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16State __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1Fv: /* 80386C04 00382A44 4B EA 7A 9C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChargeStart$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488FC8, 0x10 @@ -407,7 +407,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16State __vt__Q53scn4step4hero5sword16StateSwordAttack: .incbin "baserom.dol", 0x488FE8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259298 $$259298: .incbin "baserom.dol", 0x49E080, 0x8 diff --git a/asm/src/StateSwordAttackFinish.s b/asm/src/StateSwordAttackFinish.s index dd3a4dd7..9804d399 100644 --- a/asm/src/StateSwordAttackFinish.s +++ b/asm/src/StateSwordAttackFinish.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword22StateSwordAttackFinishFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword22StateSwordAttackFinishFPQ43scn4step4hero4Hero: /* 80386C08 00382A48 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -266,7 +266,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22St __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1Fv: /* 80386FA4 00382DE4 4B EA 76 FC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword22StateSwordAttackFinish$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489010, 0x10 diff --git a/asm/src/StateSwordCharge.s b/asm/src/StateSwordCharge.s index 2fed9984..64b38a26 100644 --- a/asm/src/StateSwordCharge.s +++ b/asm/src/StateSwordCharge.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword16StateSwordChargeFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword16StateSwordChargeFPQ43scn4step4hero4Hero: /* 80386FA8 00382DE8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -111,7 +111,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14Sta __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1Fv: /* 80387100 00382F40 4B EA 75 A0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword14StateSwordSpin$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489048, 0x10 diff --git a/asm/src/StateSwordChargeStart.s b/asm/src/StateSwordChargeStart.s index 8651d2b7..0ec8dbdd 100644 --- a/asm/src/StateSwordChargeStart.s +++ b/asm/src/StateSwordChargeStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword21StateSwordChargeStartFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword21StateSwordChargeStartFPQ43scn4step4hero4Hero: /* 80387104 00382F44 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -176,7 +176,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16Sta __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1Fv: /* 80387340 00383180 4B EA 73 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16StateSwordCharge$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489080, 0x10 diff --git a/asm/src/StateSwordChopping.s b/asm/src/StateSwordChopping.s index 76b71cde..c9bb7e55 100644 --- a/asm/src/StateSwordChopping.s +++ b/asm/src/StateSwordChopping.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword18StateSwordChoppingFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword18StateSwordChoppingFPQ43scn4step4hero4Hero: /* 80387344 00383184 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -331,7 +331,7 @@ __dt__Q24util100StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5sword18Stat __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1Fv: /* 80387798 003835D8 4B EA 6F 08 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordChoppingHit$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4890B8, 0x10 diff --git a/asm/src/StateSwordChoppingHit.s b/asm/src/StateSwordChoppingHit.s index 18e3c957..271450a9 100644 --- a/asm/src/StateSwordChoppingHit.s +++ b/asm/src/StateSwordChoppingHit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword21StateSwordChoppingHitFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword21StateSwordChoppingHitFPQ43scn4step4hero4Hero: /* 8038779C 003835DC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -195,12 +195,12 @@ lbl_803879EC: procFixPos__Q53scn4step4hero5sword21StateSwordChoppingHitFv: /* 80387A48 00383888 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword21StateSwordChoppingHit __vt__Q53scn4step4hero5sword21StateSwordChoppingHit: .incbin "baserom.dol", 0x489100, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258007 $$258007: .incbin "baserom.dol", 0x49E088, 0x4 diff --git a/asm/src/StateSwordFloatSpin.s b/asm/src/StateSwordFloatSpin.s index 2bd59154..7a302081 100644 --- a/asm/src/StateSwordFloatSpin.s +++ b/asm/src/StateSwordFloatSpin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword19StateSwordFloatSpinFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword19StateSwordFloatSpinFPQ43scn4step4hero4Hero: /* 80387A4C 0038388C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -382,7 +382,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19Sta __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1Fv: /* 80387F90 00383DD0 4B EA 67 10 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordFloatSpin$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489128, 0x10 @@ -390,7 +390,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19State __vt__Q53scn4step4hero5sword19StateSwordFloatSpin: .incbin "baserom.dol", 0x489138, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258789 $$258789: .incbin "baserom.dol", 0x49E0A0, 0x8 diff --git a/asm/src/StateSwordMeteor.s b/asm/src/StateSwordMeteor.s index c8bdd7a0..209b6e17 100644 --- a/asm/src/StateSwordMeteor.s +++ b/asm/src/StateSwordMeteor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword16StateSwordMeteorFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword16StateSwordMeteorFPQ43scn4step4hero4Hero: /* 80387F94 00383DD4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -296,7 +296,7 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16State __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1Fv: /* 80388398 003841D8 4B EA 63 08 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword23StateSwordMeteorLanding$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489160, 0x10 diff --git a/asm/src/StateSwordMeteorLanding.s b/asm/src/StateSwordMeteorLanding.s index 1601984e..95738f88 100644 --- a/asm/src/StateSwordMeteorLanding.s +++ b/asm/src/StateSwordMeteorLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword23StateSwordMeteorLandingFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword23StateSwordMeteorLandingFPQ43scn4step4hero4Hero: /* 8038839C 003841DC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -112,7 +112,7 @@ procMove__Q53scn4step4hero5sword23StateSwordMeteorLandingFv: procFixPos__Q53scn4step4hero5sword23StateSwordMeteorLandingFv: /* 80388510 00384350 4B FD 83 70 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword23StateSwordMeteorLanding __vt__Q53scn4step4hero5sword23StateSwordMeteorLanding: .incbin "baserom.dol", 0x4891A8, 0x28 diff --git a/asm/src/StateSwordMince.s b/asm/src/StateSwordMince.s index 73b5b01d..5a6c5f9d 100644 --- a/asm/src/StateSwordMince.s +++ b/asm/src/StateSwordMince.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword15StateSwordMinceFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword15StateSwordMinceFPQ43scn4step4hero4Hero: /* 80388514 00384354 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -221,7 +221,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15Sta __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1Fv: /* 80388800 00384640 4B EA 5E A0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword15StateSwordMince$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4891D0, 0x10 diff --git a/asm/src/StateSwordRaising.s b/asm/src/StateSwordRaising.s index ac3798db..aa70b9c7 100644 --- a/asm/src/StateSwordRaising.s +++ b/asm/src/StateSwordRaising.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword17StateSwordRaisingFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword17StateSwordRaisingFPQ43scn4step4hero4Hero: /* 80388804 00384644 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -296,7 +296,7 @@ __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17State __dt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 80388BF8 00384A38 4B EA 5A A8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util100StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword20StateSwordRaisingEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489208, 0x10 @@ -307,7 +307,7 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword17State __vt__Q53scn4step4hero5sword17StateSwordRaising: .incbin "baserom.dol", 0x489228, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258972 $$258972: .incbin "baserom.dol", 0x49E0A8, 0x8 diff --git a/asm/src/StateSwordRaisingEnd.s b/asm/src/StateSwordRaisingEnd.s index 7f9c513f..513332af 100644 --- a/asm/src/StateSwordRaisingEnd.s +++ b/asm/src/StateSwordRaisingEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword20StateSwordRaisingEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword20StateSwordRaisingEndFPQ43scn4step4hero4Hero: /* 80388BFC 00384A3C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -82,7 +82,7 @@ procMove__Q53scn4step4hero5sword20StateSwordRaisingEndFv: procFixPos__Q53scn4step4hero5sword20StateSwordRaisingEndFv: /* 80388CF8 00384B38 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword20StateSwordRaisingEnd __vt__Q53scn4step4hero5sword20StateSwordRaisingEnd: .incbin "baserom.dol", 0x489250, 0x28 diff --git a/asm/src/StateSwordSpin.s b/asm/src/StateSwordSpin.s index 252e49eb..c9a4c6b7 100644 --- a/asm/src/StateSwordSpin.s +++ b/asm/src/StateSwordSpin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword14StateSwordSpinFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword14StateSwordSpinFPQ43scn4step4hero4Hero: /* 80388CFC 00384B3C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -145,7 +145,7 @@ lbl_80388ED4: procFixPos__Q53scn4step4hero5sword14StateSwordSpinFv: /* 80388EE4 00384D24 4B FD 79 9C */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword14StateSwordSpin __vt__Q53scn4step4hero5sword14StateSwordSpin: .incbin "baserom.dol", 0x489278, 0x28 diff --git a/asm/src/StateSwordThrust.s b/asm/src/StateSwordThrust.s index 429fcca9..f65f5d53 100644 --- a/asm/src/StateSwordThrust.s +++ b/asm/src/StateSwordThrust.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword16StateSwordThrustFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword16StateSwordThrustFPQ43scn4step4hero4Hero: /* 80388EE8 00384D28 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -362,7 +362,7 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16State __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 803893CC 0038520C 4B EA 52 D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordThrustEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4892A0, 0x10 @@ -373,7 +373,7 @@ __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword16State __vt__Q53scn4step4hero5sword16StateSwordThrust: .incbin "baserom.dol", 0x4892C0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259340 $$259340: .incbin "baserom.dol", 0x49E0B0, 0x8 diff --git a/asm/src/StateSwordThrustEnd.s b/asm/src/StateSwordThrustEnd.s index 0d259702..34ec9580 100644 --- a/asm/src/StateSwordThrustEnd.s +++ b/asm/src/StateSwordThrustEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword19StateSwordThrustEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword19StateSwordThrustEndFPQ43scn4step4hero4Hero: /* 803893D0 00385210 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -41,7 +41,7 @@ procMove__Q53scn4step4hero5sword19StateSwordThrustEndFv: procFixPos__Q53scn4step4hero5sword19StateSwordThrustEndFv: /* 80389430 00385270 4B FD 74 50 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword19StateSwordThrustEnd __vt__Q53scn4step4hero5sword19StateSwordThrustEnd: .incbin "baserom.dol", 0x4892E8, 0x28 diff --git a/asm/src/StateSwordUnderThrust.s b/asm/src/StateSwordUnderThrust.s index de56e0cd..991aa831 100644 --- a/asm/src/StateSwordUnderThrust.s +++ b/asm/src/StateSwordUnderThrust.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword21StateSwordUnderThrustFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword21StateSwordUnderThrustFPQ43scn4step4hero4Hero: /* 80389434 00385274 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -192,7 +192,7 @@ create__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28St __dt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1Fv: /* 803896CC 0038550C 4B EA 4F D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28StateSwordUnderThrustLanding$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489310, 0x10 @@ -200,7 +200,7 @@ __vt__Q24util108StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword28Stat __vt__Q53scn4step4hero5sword21StateSwordUnderThrust: .incbin "baserom.dol", 0x489320, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259034 $$259034: .incbin "baserom.dol", 0x49E0B8, 0x8 diff --git a/asm/src/StateSwordUnderThrustLanding.s b/asm/src/StateSwordUnderThrustLanding.s index 563e500c..dc4ab724 100644 --- a/asm/src/StateSwordUnderThrustLanding.s +++ b/asm/src/StateSwordUnderThrustLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFPQ43scn4step4hero4Hero: /* 803896D0 00385510 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -100,7 +100,7 @@ procMove__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv: procFixPos__Q53scn4step4hero5sword28StateSwordUnderThrustLandingFv: /* 80389814 00385654 4B FF D6 38 */ b procFixPos__Q53scn4step4hero5sword22StateSwordAttackFinishFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5sword28StateSwordUnderThrustLanding __vt__Q53scn4step4hero5sword28StateSwordUnderThrustLanding: .incbin "baserom.dol", 0x489348, 0x28 diff --git a/asm/src/StateSwordUnderThrustStart.s b/asm/src/StateSwordUnderThrustStart.s index f6db5a4a..40342b4d 100644 --- a/asm/src/StateSwordUnderThrustStart.s +++ b/asm/src/StateSwordUnderThrustStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword26StateSwordUnderThrustStartFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword26StateSwordUnderThrustStartFPQ43scn4step4hero4Hero: /* 80389818 00385658 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -203,7 +203,7 @@ __dt__Q24util106StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword26Stat __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1Fv: /* 80389AB0 003858F0 4B EA 4B F0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword21StateSwordUnderThrust$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489370, 0x10 diff --git a/asm/src/StateSwordWaterSpin.s b/asm/src/StateSwordWaterSpin.s index 8cbf984d..b67ab659 100644 --- a/asm/src/StateSwordWaterSpin.s +++ b/asm/src/StateSwordWaterSpin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5sword19StateSwordWaterSpinFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5sword19StateSwordWaterSpinFPQ43scn4step4hero4Hero: /* 80389AB4 003858F4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -161,7 +161,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19Sta __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1Fv: /* 80389CB8 00385AF8 4B EA 49 E8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5sword19StateSwordWaterSpin$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4893B8, 0x10 diff --git a/asm/src/StateTakeOff.s b/asm/src/StateTakeOff.s index b755687d..a2dd17c8 100644 --- a/asm/src/StateTakeOff.s +++ b/asm/src/StateTakeOff.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt12StateTakeOffFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt12StateTakeOffFPQ43scn4step5enemy5Enemy: /* 802A00CC 0029BF0C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -161,12 +161,12 @@ lbl_802A02F4: __dt__Q53scn4step5enemy10brontoburt12StateTakeOffFv: /* 802A030C 0029C14C 4B FF 16 AC */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt12StateTakeOff __vt__Q53scn4step5enemy10brontoburt12StateTakeOff: .incbin "baserom.dol", 0x470BE8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255068 $$255068: .incbin "baserom.dol", 0x49BF10, 0x8 diff --git a/asm/src/StateTeleport.s b/asm/src/StateTeleport.s index 0c98d372..819e0e5f 100644 --- a/asm/src/StateTeleport.s +++ b/asm/src/StateTeleport.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy4kabu13StateTeleportFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy4kabu13StateTeleportFPQ43scn4step5enemy5Enemy: /* 802BE464 002BA2A4 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -558,12 +558,12 @@ lbl_802BEC48: /* 802BEC54 002BAA94 38 21 00 20 */ addi r1, r1, 0x20 /* 802BEC58 002BAA98 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy4kabu13StateTeleport __vt__Q53scn4step5enemy4kabu13StateTeleport: .incbin "baserom.dol", 0x474338, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257445 $$257445: .incbin "baserom.dol", 0x49C690, 0x4 diff --git a/asm/src/StateThrow.s b/asm/src/StateThrow.s index bdfb0a9a..5d0556d1 100644 --- a/asm/src/StateThrow.s +++ b/asm/src/StateThrow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8cappyhat10StateThrowFPQ43scn4step5enemy5EnemyUx __ct__Q53scn4step5enemy8cappyhat10StateThrowFPQ43scn4step5enemy5EnemyUx: /* 802A3DF8 0029FC38 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -283,7 +283,7 @@ lbl_802A41F0: /* 802A4218 002A0058 38 21 00 F0 */ addi r1, r1, 0xf0 /* 802A421C 002A005C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10poppybrojr10StateThrowFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10poppybrojr10StateThrowFPQ43scn4step5enemy5Enemy: /* 802D25A0 002CE3E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -412,7 +412,7 @@ lbl_802D2730: procFixPos__Q53scn4step5enemy10poppybrojr10StateThrowFv: /* 802D2748 002CE588 4B FC F3 E4 */ b procFixPos__Q53scn4step5enemy11broomhatter9StateWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6hammer10StateThrowFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6hammer10StateThrowFPQ43scn4step4hero4Hero: /* 80396F2C 00392D6C 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -633,7 +633,7 @@ procMove__Q53scn4step4hero6hammer10StateThrowFv: procFixPos__Q53scn4step4hero6hammer10StateThrowFv: /* 8039724C 0039308C 4B FC 96 34 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter10StateThrowFPQ43scn4step4hero4Herobb __ct__Q53scn4step4hero7fighter10StateThrowFPQ43scn4step4hero4Herobb: /* 8039F98C 0039B7CC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1148,27 +1148,27 @@ lbl_803A00F0: /* 803A00F8 0039BF38 38 21 00 10 */ addi r1, r1, 0x10 /* 803A00FC 0039BF3C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8cappyhat10StateThrow __vt__Q53scn4step5enemy8cappyhat10StateThrow: .incbin "baserom.dol", 0x4714B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10poppybrojr10StateThrow __vt__Q53scn4step5enemy10poppybrojr10StateThrow: .incbin "baserom.dol", 0x4769A0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6hammer10StateThrow __vt__Q53scn4step4hero6hammer10StateThrow: .incbin "baserom.dol", 0x489FF8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter10StateThrow __vt__Q53scn4step4hero7fighter10StateThrow: .incbin "baserom.dol", 0x48A758, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257328 $$257328: .incbin "baserom.dol", 0x49BFF0, 0x4 @@ -1191,12 +1191,12 @@ $$257419: $$257420: .incbin "baserom.dol", 0x49C008, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258516 $$258516: .incbin "baserom.dol", 0x49E210, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258019 $$258019: .incbin "baserom.dol", 0x49E338, 0x4 diff --git a/asm/src/StateThrownFighter.s b/asm/src/StateThrownFighter.s index 3b088a06..193d2234 100644 --- a/asm/src/StateThrownFighter.s +++ b/asm/src/StateThrownFighter.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6damage18StateThrownFighterFPQ43scn4step5enemy5EnemyUx __ct__Q53scn4step5enemy6damage18StateThrownFighterFPQ43scn4step5enemy5EnemyUx: /* 802ABB38 002A7978 94 21 FF 90 */ stwu r1, -0x70(r1) @@ -497,12 +497,12 @@ lbl_802AC23C: /* 802AC248 002A8088 38 21 00 60 */ addi r1, r1, 0x60 /* 802AC24C 002A808C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6damage18StateThrownFighter __vt__Q53scn4step5enemy6damage18StateThrownFighter: .incbin "baserom.dol", 0x471E80, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257792 $$257792: .incbin "baserom.dol", 0x49C270, 0x4 diff --git a/asm/src/StateThunder.s b/asm/src/StateThunder.s index 1a68fcca..6f6c25b0 100644 --- a/asm/src/StateThunder.s +++ b/asm/src/StateThunder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior12StateThunderFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior12StateThunderFPQ43scn4step4boss4Boss: /* 80250658 0024C498 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -163,7 +163,7 @@ procMove__Q53scn4step4boss6dubior12StateThunderFv: procFixPos__Q53scn4step4boss6dubior12StateThunderFv: /* 80250878 0024C6B8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior12StateThunder __vt__Q53scn4step4boss6dubior12StateThunder: .incbin "baserom.dol", 0x4639A0, 0x20 diff --git a/asm/src/StateThunderStart.s b/asm/src/StateThunderStart.s index 803a1f45..cd300c74 100644 --- a/asm/src/StateThunderStart.s +++ b/asm/src/StateThunderStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior17StateThunderStartFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior17StateThunderStartFPQ43scn4step4boss4Boss: /* 8025087C 0024C6BC 94 21 FF 20 */ stwu r1, -0xe0(r1) @@ -390,7 +390,7 @@ create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12St __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1Fv: /* 80250E0C 0024CC4C 4B FD D8 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12StateThunder$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4639C0, 0x10 @@ -398,7 +398,7 @@ __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6dubior12Stat __vt__Q53scn4step4boss6dubior17StateThunderStart: .incbin "baserom.dol", 0x4639D0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global WaitFrameTable__Q53scn4step4boss6dubior31$$2unnamed$$2StateThunderStart_cpp$$2 WaitFrameTable__Q53scn4step4boss6dubior31$$2unnamed$$2StateThunderStart_cpp$$2: .incbin "baserom.dol", 0x49B360, 0x8 diff --git a/asm/src/StateTornadoChase.s b/asm/src/StateTornadoChase.s index a8b5bd37..0445148c 100644 --- a/asm/src/StateTornadoChase.s +++ b/asm/src/StateTornadoChase.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath17StateTornadoChaseFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9moundeath17StateTornadoChaseFPQ43scn4step4boss4Boss: /* 80257F90 00253DD0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -404,12 +404,12 @@ lbl_8025854C: /* 80258568 002543A8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 8025856C 002543AC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss9moundeath17StateTornadoChase __vt__Q53scn4step4boss9moundeath17StateTornadoChase: .incbin "baserom.dol", 0x465310, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257129 $$257129: .incbin "baserom.dol", 0x49B4A0, 0x4 diff --git a/asm/src/StateTornadoRise.s b/asm/src/StateTornadoRise.s index 7f2cd6df..b548542d 100644 --- a/asm/src/StateTornadoRise.s +++ b/asm/src/StateTornadoRise.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss9moundeath16StateTornadoRiseFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss9moundeath16StateTornadoRiseFPQ43scn4step4boss4Boss: /* 80258570 002543B0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -279,7 +279,7 @@ create__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1Fv: /* 80258960 002547A0 4B FD 5D 40 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17StateTornadoChase$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x465330, 0x10 @@ -287,7 +287,7 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss9moundeath17 __vt__Q53scn4step4boss9moundeath16StateTornadoRise: .incbin "baserom.dol", 0x465340, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256270 $$256270: .incbin "baserom.dol", 0x49B4B0, 0x4 diff --git a/asm/src/StateToss.s b/asm/src/StateToss.s index f0661b12..66f23948 100644 --- a/asm/src/StateToss.s +++ b/asm/src/StateToss.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4wing9StateTossFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4wing9StateTossFPQ43scn4step4hero4Hero: /* 80399FAC 00395DEC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -397,7 +397,7 @@ create__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9State __dt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1Fv: /* 8039A534 00396374 4B E9 41 6C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateToss$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48A1C8, 0x10 @@ -405,7 +405,7 @@ __vt__Q24util87StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4wing9StateTo __vt__Q53scn4step4hero4wing9StateToss: .incbin "baserom.dol", 0x48A1D8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258321 $$258321: .incbin "baserom.dol", 0x49E2A0, 0x4 diff --git a/asm/src/StateUnderAttack.s b/asm/src/StateUnderAttack.s index ff7827f7..7111a858 100644 --- a/asm/src/StateUnderAttack.s +++ b/asm/src/StateUnderAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4wing16StateUnderAttackFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4wing16StateUnderAttackFPQ43scn4step4hero4Hero: /* 8039A538 00396378 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -407,12 +407,12 @@ lbl_8039AB00: /* 8039AB10 00396950 38 21 00 50 */ addi r1, r1, 0x50 /* 8039AB14 00396954 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4wing16StateUnderAttack __vt__Q53scn4step4hero4wing16StateUnderAttack: .incbin "baserom.dol", 0x48A200, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257184 $$257184: .incbin "baserom.dol", 0x49E2A8, 0x4 diff --git a/asm/src/StateUnderAttackLanding.s b/asm/src/StateUnderAttackLanding.s index 70d7b1e4..251b32fd 100644 --- a/asm/src/StateUnderAttackLanding.s +++ b/asm/src/StateUnderAttackLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4wing23StateUnderAttackLandingFPQ43scn4step4hero4Herob __ct__Q53scn4step4hero4wing23StateUnderAttackLandingFPQ43scn4step4hero4Herob: /* 8039AB18 00396958 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -331,12 +331,12 @@ lbl_8039AF24: /* 8039AFCC 00396E0C 38 21 00 90 */ addi r1, r1, 0x90 /* 8039AFD0 00396E10 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4wing23StateUnderAttackLanding __vt__Q53scn4step4hero4wing23StateUnderAttackLanding: .incbin "baserom.dol", 0x48A228, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256962 $$256962: .incbin "baserom.dol", 0x497870, 0x4 @@ -344,7 +344,7 @@ $$256962: $$256963: .incbin "baserom.dol", 0x497874, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257777 $$257777: .incbin "baserom.dol", 0x49E2B8, 0x4 diff --git a/asm/src/StateUnlockLvMapDoor.s b/asm/src/StateUnlockLvMapDoor.s index 1dd9925e..d755c5cd 100644 --- a/asm/src/StateUnlockLvMapDoor.s +++ b/asm/src/StateUnlockLvMapDoor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFPQ43scn4step4hero4Heroi __ct__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFPQ43scn4step4hero4Heroi: /* 80381E20 0037DC60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -230,7 +230,7 @@ procMove__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv: procFixPos__Q53scn4step4hero7gimmick20StateUnlockLvMapDoorFv: /* 80382158 0037DF98 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoor __vt__Q53scn4step4hero7gimmick20StateUnlockLvMapDoor: .incbin "baserom.dol", 0x488CF8, 0x28 diff --git a/asm/src/StateVacuum.s b/asm/src/StateVacuum.s index 4953deba..c9214a7c 100644 --- a/asm/src/StateVacuum.s +++ b/asm/src/StateVacuum.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy11StateVacuumFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy11StateVacuumFPQ43scn4step4boss4Boss: /* 8025E8D8 0025A718 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -304,7 +304,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14Stat __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025ECF0 0025AB30 4B FC F9 B0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common11StateVacuumFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common11StateVacuumFPQ43scn4step4hero4Hero: /* 8036C8E4 00368724 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1129,7 +1129,7 @@ __dt__Q24util88StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common8State __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036D4A8 003692E8 4B EC 11 F8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy12StateCapture$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x466818, 0x10 @@ -1140,7 +1140,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy14Stat __vt__Q53scn4step4boss6whispy11StateVacuum: .incbin "baserom.dol", 0x466838, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateVacuumEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4882E0, 0x10 @@ -1154,7 +1154,7 @@ __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common11Stat __vt__Q53scn4step4hero6common11StateVacuum: .incbin "baserom.dol", 0x488310, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258572 $$258572: .incbin "baserom.dol", 0x49DC78, 0x4 diff --git a/asm/src/StateVacuumEnd.s b/asm/src/StateVacuumEnd.s index f80bd2cd..0f9dd8b0 100644 --- a/asm/src/StateVacuumEnd.s +++ b/asm/src/StateVacuumEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy14StateVacuumEndFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy14StateVacuumEndFPQ43scn4step4boss4Boss: /* 8025ECF4 0025AB34 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -94,7 +94,7 @@ procMove__Q53scn4step4boss6whispy14StateVacuumEndFv: procFixPos__Q53scn4step4boss6whispy14StateVacuumEndFv: /* 8025EE1C 0025AC5C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common14StateVacuumEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common14StateVacuumEndFPQ43scn4step4hero4Hero: /* 8036D4AC 003692EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -190,12 +190,12 @@ procMove__Q53scn4step4hero6common14StateVacuumEndFv: procFixPos__Q53scn4step4hero6common14StateVacuumEndFv: /* 8036D5DC 0036941C 4B FF 32 A4 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy14StateVacuumEnd __vt__Q53scn4step4boss6whispy14StateVacuumEnd: .incbin "baserom.dol", 0x466858, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common14StateVacuumEnd __vt__Q53scn4step4hero6common14StateVacuumEnd: .incbin "baserom.dol", 0x488338, 0x28 diff --git a/asm/src/StateVacuumReceive.s b/asm/src/StateVacuumReceive.s index d3ecdf79..1f51effb 100644 --- a/asm/src/StateVacuumReceive.s +++ b/asm/src/StateVacuumReceive.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common18StateVacuumReceiveFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6common18StateVacuumReceiveFPQ43scn4step4boss4Boss: /* 80247750 00243590 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -196,7 +196,7 @@ procFixPos__Q53scn4step4boss6common18StateVacuumReceiveFv: /* 80247A10 00243850 38 21 00 60 */ addi r1, r1, 0x60 /* 80247A14 00243854 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common18StateVacuumReceiveFPQ43scn4step5enemy5EnemyUl __ct__Q53scn4step5enemy6common18StateVacuumReceiveFPQ43scn4step5enemy5EnemyUl: /* 80295368 002911A8 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -488,7 +488,7 @@ procFixPos__Q53scn4step5enemy6common18StateVacuumReceiveFv: /* 802957A8 002915E8 38 21 00 90 */ addi r1, r1, 0x90 /* 802957AC 002915EC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero12interference18StateVacuumReceiveFPQ43scn4step4hero4HeroUl __ct__Q53scn4step4hero12interference18StateVacuumReceiveFPQ43scn4step4hero4HeroUl: /* 803744A0 003702E0 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -857,7 +857,7 @@ procMove__Q53scn4step4hero12interference18StateVacuumReceiveFv: procFixPos__Q53scn4step4hero12interference18StateVacuumReceiveFv: /* 80374A0C 0037084C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state18StateVacuumReceiveFPQ43scn4step4item4ItemUl __ct__Q53scn4step4item5state18StateVacuumReceiveFPQ43scn4step4item4ItemUl: /* 803C88CC 003C470C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1071,7 +1071,7 @@ procFixPos__Q53scn4step4item5state18StateVacuumReceiveFv: /* 803C8BE0 003C4A20 38 21 00 70 */ addi r1, r1, 0x70 /* 803C8BE4 003C4A24 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFPQ43scn4step6weapon6WeaponUl __ct__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFPQ43scn4step6weapon6WeaponUl: /* 803EEEB4 003EACF4 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -1315,32 +1315,32 @@ procFixPos__Q53scn4step6weapon13vacuumedblock18StateVacuumReceiveFv: /* 803EF210 003EB050 38 21 00 90 */ addi r1, r1, 0x90 /* 803EF214 003EB054 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common18StateVacuumReceive __vt__Q53scn4step4boss6common18StateVacuumReceive: .incbin "baserom.dol", 0x4625B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common18StateVacuumReceive __vt__Q53scn4step5enemy6common18StateVacuumReceive: .incbin "baserom.dol", 0x46F448, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference18StateVacuumReceive __vt__Q53scn4step4hero12interference18StateVacuumReceive: .incbin "baserom.dol", 0x488680, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4item5state18StateVacuumReceive __vt__Q53scn4step4item5state18StateVacuumReceive: .incbin "baserom.dol", 0x48E730, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceive __vt__Q53scn4step6weapon13vacuumedblock18StateVacuumReceive: .incbin "baserom.dol", 0x491328, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256631 $$256631: .incbin "baserom.dol", 0x49B178, 0x4 @@ -1351,12 +1351,12 @@ $$256632: $$256633: .incbin "baserom.dol", 0x49B180, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256844 $$256844: .incbin "baserom.dol", 0x49BC30, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258416 $$258416: .incbin "baserom.dol", 0x49DDA0, 0x4 @@ -1367,7 +1367,7 @@ $$258417: $$258418: .incbin "baserom.dol", 0x49DDA8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255920 $$255920: .incbin "baserom.dol", 0x49E638, 0x8 diff --git a/asm/src/StateVacuumStart.s b/asm/src/StateVacuumStart.s index d195d611..6f589ab1 100644 --- a/asm/src/StateVacuumStart.s +++ b/asm/src/StateVacuumStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy16StateVacuumStartFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy16StateVacuumStartFPQ43scn4step4boss4Boss: /* 8025EE20 0025AC60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11St __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1Fv: /* 8025EF68 0025ADA8 4B FC F7 38 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6whispy11StateVacuum$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x466878, 0x10 diff --git a/asm/src/StateVanish.s b/asm/src/StateVanish.s index 9dfda17d..5f96c16e 100644 --- a/asm/src/StateVanish.s +++ b/asm/src/StateVanish.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon10spearspear11StateVanishFPQ43scn4step6weapon6Weaponf __ct__Q53scn4step6weapon10spearspear11StateVanishFPQ43scn4step6weapon6Weaponf: /* 803E4FA4 003E0DE4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -193,7 +193,7 @@ procFixPos__Q53scn4step6weapon10spearspear11StateVanishFv: procObjCollReact__Q53scn4step6weapon10spearspear11StateVanishFv: /* 803E5240 003E1080 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon8deespear11StateVanishFPQ43scn4step6weapon6Weaponf __ct__Q53scn4step6weapon8deespear11StateVanishFPQ43scn4step6weapon6Weaponf: /* 803EDEF0 003E9D30 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -386,17 +386,17 @@ procFixPos__Q53scn4step6weapon8deespear11StateVanishFv: procObjCollReact__Q53scn4step6weapon8deespear11StateVanishFv: /* 803EE18C 003E9FCC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon10spearspear11StateVanish __vt__Q53scn4step6weapon10spearspear11StateVanish: .incbin "baserom.dol", 0x490840, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon8deespear11StateVanish __vt__Q53scn4step6weapon8deespear11StateVanish: .incbin "baserom.dol", 0x491108, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256857 $$256857: .incbin "baserom.dol", 0x49EA80, 0x4 @@ -404,7 +404,7 @@ $$256857: $$256904: .incbin "baserom.dol", 0x49EA84, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256857 $$256857: .incbin "baserom.dol", 0x49EC68, 0x4 diff --git a/asm/src/StateVomit.s b/asm/src/StateVomit.s index 5c3bb3e6..97b8b258 100644 --- a/asm/src/StateVomit.s +++ b/asm/src/StateVomit.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss13watergalboros10StateVomitFPQ43scn4step4boss4Bossb __ct__Q53scn4step4boss13watergalboros10StateVomitFPQ43scn4step4boss4Bossb: /* 8025AB28 00256968 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -134,7 +134,7 @@ procMove__Q53scn4step4boss13watergalboros10StateVomitFv: procFixPos__Q53scn4step4boss13watergalboros10StateVomitFv: /* 8025ACD4 00256B14 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy10StateVomitFPQ43scn4step4boss4Bossb __ct__Q53scn4step4boss6whispy10StateVomitFPQ43scn4step4boss4Bossb: /* 8025EF6C 0025ADAC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -248,7 +248,7 @@ procMove__Q53scn4step4boss6whispy10StateVomitFv: procFixPos__Q53scn4step4boss6whispy10StateVomitFv: /* 8025F0DC 0025AF1C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common10StateVomitFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common10StateVomitFPQ43scn4step4hero4Hero: /* 8036D5E0 00369420 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -501,17 +501,17 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10St __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036D944 00369784 4B EC 0D 5C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss13watergalboros10StateVomit __vt__Q53scn4step4boss13watergalboros10StateVomit: .incbin "baserom.dol", 0x465BE0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy10StateVomit __vt__Q53scn4step4boss6whispy10StateVomit: .incbin "baserom.dol", 0x4668A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common10StateVomit$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488360, 0x10 diff --git a/asm/src/StateVomited.s b/asm/src/StateVomited.s index 05539984..66976c9c 100644 --- a/asm/src/StateVomited.s +++ b/asm/src/StateVomited.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step6weapon11starshotlv16Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step6weapon11starshotlv16Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80374A10 00370850 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -805,12 +805,12 @@ lbl_8037555C: /* 80375578 003713B8 38 21 00 20 */ addi r1, r1, 0x20 /* 8037557C 003713BC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero12interference12StateVomited __vt__Q53scn4step4hero12interference12StateVomited: .incbin "baserom.dol", 0x4886A8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260568 $$260568: .incbin "baserom.dol", 0x49DDB0, 0x4 diff --git a/asm/src/StateVulcan.s b/asm/src/StateVulcan.s index 48fcdbcc..0e307b6a 100644 --- a/asm/src/StateVulcan.s +++ b/asm/src/StateVulcan.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe11StateVulcanFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe11StateVulcanFPQ43scn4step5enemy5Enemy: /* 802C0AA4 002BC8E4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -146,7 +146,7 @@ lbl_802C0C94: procFixPos__Q53scn4step5enemy10knucklejoe11StateVulcanFv: /* 802C0CA8 002BCAE8 4B FE 0E 84 */ b procFixPos__Q53scn4step5enemy11broomhatter9StateWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter11StateVulcanFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero7fighter11StateVulcanFPQ43scn4step4hero4Hero: /* 803A0100 0039BF40 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -369,7 +369,7 @@ create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14S __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1Fv: /* 803A03E0 0039C220 4B E8 E2 C0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero5smash11StateVulcanFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero5smash11StateVulcanFPQ43scn4step4hero4Hero: /* 803A2900 0039E740 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -576,12 +576,12 @@ __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11State __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1Fv: /* 803A2B94 0039E9D4 4B E8 BB 0C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe11StateVulcan __vt__Q53scn4step5enemy10knucklejoe11StateVulcan: .incbin "baserom.dol", 0x474AB0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1 __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$4b$$1: .incbin "baserom.dol", 0x48A780, 0x10 @@ -589,7 +589,7 @@ __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7fighter14Sta __vt__Q53scn4step4hero7fighter11StateVulcan: .incbin "baserom.dol", 0x48A790, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash14StateVulcanEnd$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x48B000, 0x10 @@ -600,7 +600,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero5smash11State __vt__Q53scn4step4hero5smash11StateVulcan: .incbin "baserom.dol", 0x48B020, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255822 $$255822: .incbin "baserom.dol", 0x49C760, 0x4 diff --git a/asm/src/StateVulcanEnd.s b/asm/src/StateVulcanEnd.s index 361038b7..53b636c3 100644 --- a/asm/src/StateVulcanEnd.s +++ b/asm/src/StateVulcanEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7fighter14StateVulcanEndFPQ43scn4step4hero4Herob __ct__Q53scn4step4hero7fighter14StateVulcanEndFPQ43scn4step4hero4Herob: /* 803A03E4 0039C224 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -92,7 +92,7 @@ procMove__Q53scn4step4hero7fighter14StateVulcanEndFv: procFixPos__Q53scn4step4hero7fighter14StateVulcanEndFv: /* 803A0504 0039C344 4B FC 03 7C */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5smash14StateVulcanEndFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero5smash14StateVulcanEndFPQ43scn4step4hero4Hero: /* 803A2B98 0039E9D8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -133,12 +133,12 @@ procMove__Q53scn4step4hero5smash14StateVulcanEndFv: procFixPos__Q53scn4step4hero5smash14StateVulcanEndFv: /* 803A2BF8 0039EA38 4B FB DC 88 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7fighter14StateVulcanEnd __vt__Q53scn4step4hero7fighter14StateVulcanEnd: .incbin "baserom.dol", 0x48A7B8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5smash14StateVulcanEnd __vt__Q53scn4step4hero5smash14StateVulcanEnd: .incbin "baserom.dol", 0x48B048, 0x28 diff --git a/asm/src/StateWaft.s b/asm/src/StateWaft.s index 678d2ebd..971b62a3 100644 --- a/asm/src/StateWaft.s +++ b/asm/src/StateWaft.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4item5state9StateWaftFPQ43scn4step4item4Item __ct__Q53scn4step4item5state9StateWaftFPQ43scn4step4item4Item: /* 803C8BE8 003C4A28 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -168,7 +168,7 @@ procMove__Q53scn4step4item5state9StateWaftFv: __dt__Q53scn4step4item5state9StateWaftFv: /* 803C8E44 003C4C84 4B FF E5 C4 */ b __dt__Q53scn4step4item5state13StateApproachFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255349 $$255349: .incbin "baserom.dol", 0x48E748, 0x10 @@ -176,7 +176,7 @@ $$255349: __vt__Q53scn4step4item5state9StateWaft: .incbin "baserom.dol", 0x48E758, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255346 $$255346: .incbin "baserom.dol", 0x49E640, 0x4 diff --git a/asm/src/StateWait.s b/asm/src/StateWait.s index 1f508f48..ad6984bc 100644 --- a/asm/src/StateWait.s +++ b/asm/src/StateWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6common9StateWaitFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6common9StateWaitFPQ43scn4step4boss4Boss: /* 80247A18 00243858 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -77,7 +77,7 @@ procMove__Q53scn4step4boss6common9StateWaitFv: procFixPos__Q53scn4step4boss6common9StateWaitFv: /* 80247B08 00243948 4B FF 04 B8 */ b procFixPos__Q53scn4step4boss7bonkers9StateBombFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6dubior9StateWaitFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6dubior9StateWaitFPQ43scn4step4boss4Boss: /* 80250E10 0024CC50 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -129,7 +129,7 @@ procMove__Q53scn4step4boss6dubior9StateWaitFv: procFixPos__Q53scn4step4boss6dubior9StateWaitFv: /* 80250E9C 0024CCDC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy9StateWaitFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy9StateWaitFPQ43scn4step4boss4Boss: /* 8025F0E0 0025AF20 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -188,7 +188,7 @@ procMove__Q53scn4step4boss6whispy9StateWaitFv: procFixPos__Q53scn4step4boss6whispy9StateWaitFv: /* 8025F184 0025AFC4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common9StateWaitFPQ43scn4step5enemy5Enemy: /* 802957B0 002915F0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -284,7 +284,7 @@ lbl_802958CC: /* 802958DC 0029171C 38 21 00 40 */ addi r1, r1, 0x40 /* 802958E0 00291720 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt9StateWaitFPQ43scn4step5enemy5Enemy: /* 802A0310 0029C150 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -398,7 +398,7 @@ __dt__Q53scn4step5enemy10brontoburt9StateWaitFv: __dt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802A0484 0029C2C4 4B F8 E2 1C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5foley9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5foley9StateWaitFPQ43scn4step5enemy5Enemy: /* 802B52DC 002B111C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -550,7 +550,7 @@ procMove__Q53scn4step5enemy5foley9StateWaitFv: /* 802B54F4 002B1334 38 21 00 20 */ addi r1, r1, 0x20 /* 802B54F8 002B1338 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy7gigatzo9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy7gigatzo9StateWaitFPQ43scn4step5enemy5Enemy: /* 802B8858 002B4698 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -691,7 +691,7 @@ lbl_802B8A28: /* 802B8A38 002B4878 38 21 00 40 */ addi r1, r1, 0x40 /* 802B8A3C 002B487C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6lanzer9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6lanzer9StateWaitFPQ43scn4step5enemy5Enemy: /* 802C269C 002BE4DC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -752,7 +752,7 @@ procMove__Q53scn4step5enemy6lanzer9StateWaitFv: procFixPos__Q53scn4step5enemy6lanzer9StateWaitFv: /* 802C274C 002BE58C 4B FD 30 E0 */ b procFixPos__Q53scn4step5enemy6common9StateWaitFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6leafan9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6leafan9StateWaitFPQ43scn4step5enemy5Enemy: /* 802C4020 002BFE60 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -848,7 +848,7 @@ lbl_802C413C: /* 802C414C 002BFF8C 38 21 00 40 */ addi r1, r1, 0x40 /* 802C4150 002BFF90 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy14poppybrojrbomb9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy14poppybrojrbomb9StateWaitFPQ43scn4step5enemy5Enemy: /* 802D3148 002CEF88 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -875,7 +875,7 @@ __ct__Q53scn4step5enemy14poppybrojrbomb9StateWaitFPQ43scn4step5enemy5Enemy: __dt__Q53scn4step5enemy14poppybrojrbomb9StateWaitFv: /* 802D3194 002CEFD4 4B FB E8 24 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6shotzo9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6shotzo9StateWaitFPQ43scn4step5enemy5Enemy: /* 802E0E88 002DCCC8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -914,7 +914,7 @@ procFixPos__Q53scn4step5enemy6shotzo9StateWaitFv: __dt__Q53scn4step5enemy6shotzo9StateWaitFv: /* 802E0EEC 002DCD2C 4B FB 0A CC */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9sirkibble9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9sirkibble9StateWaitFPQ43scn4step5enemy5Enemy: /* 802E203C 002DDE7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1109,7 +1109,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802E22C0 002DE100 4B F4 C3 E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory9StateWaitFPQ43scn4step5enemy5Enemy: /* 802E6428 002E2268 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1208,7 +1208,7 @@ lbl_802E653C: /* 802E6560 002E23A0 38 21 00 50 */ addi r1, r1, 0x50 /* 802E6564 002E23A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage9StateWaitFPQ43scn4step5enemy5Enemy: /* 802EC1BC 002E7FFC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1313,7 +1313,7 @@ lbl_802EC300: /* 802EC310 002E8150 38 21 00 40 */ addi r1, r1, 0x40 /* 802EC314 002E8154 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee9StateWaitFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee9StateWaitFPQ43scn4step5enemy5Enemy: /* 802EEA08 002EA848 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1526,7 +1526,7 @@ lbl_802EECC8: __dt__Q53scn4step5enemy9waddledee9StateWaitFv: /* 802EECDC 002EAB1C 4B FA 2C DC */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common9StateWaitFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common9StateWaitFPQ43scn4step4hero4Hero: /* 8036D948 00369788 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -2029,7 +2029,7 @@ construct__Q53scn4step4hero6common9StateWaitFv: /* 8036E040 00369E80 38 21 00 10 */ addi r1, r1, 0x10 /* 8036E044 00369E84 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5stone9StateWaitFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context __ct__Q53scn4step4hero5stone9StateWaitFPQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context: /* 80391870 0038D6B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2233,7 +2233,7 @@ lbl_80391B20: /* 80391B30 0038D970 38 21 00 20 */ addi r1, r1, 0x20 /* 80391B34 0038D974 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero11staffcredit9StateWaitFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero11staffcredit9StateWaitFPQ43scn4step4hero4Hero: /* 803A4D98 003A0BD8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2501,7 +2501,7 @@ create__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcre __dt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1Fv: /* 803A5114 003A0F54 4B E8 95 8C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon19challengemastershot9StateWaitFPQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon19challengemastershot9StateWaitFPQ43scn4step6weapon6Weapon: /* 803F1074 003ECEB4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -2615,27 +2615,27 @@ procFixPos__Q53scn4step6weapon19challengemastershot9StateWaitFv: __dt__Q53scn4step6weapon19challengemastershot9StateWaitFv: /* 803F11DC 003ED01C 4B FE 78 64 */ b __dt__Q43scn4step6weapon11StateNormalFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6common9StateWait __vt__Q53scn4step4boss6common9StateWait: .incbin "baserom.dol", 0x4625D0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6dubior9StateWait __vt__Q53scn4step4boss6dubior9StateWait: .incbin "baserom.dol", 0x4639F0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss6whispy9StateWait __vt__Q53scn4step4boss6whispy9StateWait: .incbin "baserom.dol", 0x4668C8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common9StateWait __vt__Q53scn4step5enemy6common9StateWait: .incbin "baserom.dol", 0x46F468, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontoburt12StateTakeOff$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x470C08, 0x10 @@ -2643,37 +2643,37 @@ __vt__Q24util101StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy10brontobur __vt__Q53scn4step5enemy10brontoburt9StateWait: .incbin "baserom.dol", 0x470C18, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5foley9StateWait __vt__Q53scn4step5enemy5foley9StateWait: .incbin "baserom.dol", 0x472FD0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy7gigatzo9StateWait __vt__Q53scn4step5enemy7gigatzo9StateWait: .incbin "baserom.dol", 0x4735C8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9StateWait __vt__Q53scn4step5enemy6lanzer9StateWait: .incbin "baserom.dol", 0x474E50, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6leafan9StateWait __vt__Q53scn4step5enemy6leafan9StateWait: .incbin "baserom.dol", 0x4750C8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy14poppybrojrbomb9StateWait __vt__Q53scn4step5enemy14poppybrojrbomb9StateWait: .incbin "baserom.dol", 0x476A88, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6shotzo9StateWait __vt__Q53scn4step5enemy6shotzo9StateWait: .incbin "baserom.dol", 0x4782B0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10StateCatch$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x478700, 0x10 @@ -2681,32 +2681,32 @@ __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9sirkibble10 __vt__Q53scn4step5enemy9sirkibble9StateWait: .incbin "baserom.dol", 0x478710, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory9StateWait __vt__Q53scn4step5enemy6sodory9StateWait: .incbin "baserom.dol", 0x479038, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateWait __vt__Q53scn4step5enemy9tsukikage9StateWait: .incbin "baserom.dol", 0x479B00, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee9StateWait __vt__Q53scn4step5enemy9waddledee9StateWait: .incbin "baserom.dol", 0x47A3B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common9StateWait __vt__Q53scn4step4hero6common9StateWait: .incbin "baserom.dol", 0x488398, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero5stone9StateWait __vt__Q53scn4step4hero5stone9StateWait: .incbin "baserom.dol", 0x489C10, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1 __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredit9StateWalk$$4PQ43scn4step4hero4Hero$$4Q43scn4step4hero10ScriptKind$$1: .incbin "baserom.dol", 0x48B1A0, 0x10 @@ -2714,17 +2714,17 @@ __vt__Q24util124StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero11staffcredi __vt__Q53scn4step4hero11staffcredit9StateWait: .incbin "baserom.dol", 0x48B1B0, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step6weapon19challengemastershot9StateWait __vt__Q53scn4step6weapon19challengemastershot9StateWait: .incbin "baserom.dol", 0x4914D0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254787 $$254787: .incbin "baserom.dol", 0x49B188, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255734 $$255734: .incbin "baserom.dol", 0x49BF20, 0x4 @@ -2738,7 +2738,7 @@ $$255736: $$255737: .incbin "baserom.dol", 0x49BF2C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255120 $$255120: .incbin "baserom.dol", 0x49C4C8, 0x4 @@ -2746,7 +2746,7 @@ $$255120: $$255121: .incbin "baserom.dol", 0x49C4CC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255732 $$255732: .incbin "baserom.dol", 0x49C7B0, 0x8 diff --git a/asm/src/StateWaitFar.s b/asm/src/StateWaitFar.s index 015c7d0c..084b7ce7 100644 --- a/asm/src/StateWaitFar.s +++ b/asm/src/StateWaitFar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss10creditroah12StateWaitFarFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss10creditroah12StateWaitFarFPQ43scn4step4boss4Boss: /* 8024C0B8 00247EF8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -220,7 +220,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroa __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1Fv: /* 8024C38C 002481CC 4B FE 23 14 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss10creditroah12StateWaitFar$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x463308, 0x10 diff --git a/asm/src/StateWakeUp.s b/asm/src/StateWakeUp.s index 30fe25bb..cd9d6fcb 100644 --- a/asm/src/StateWakeUp.s +++ b/asm/src/StateWakeUp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common11StateWakeUpFPQ43scn4step4hero4Herob __ct__Q53scn4step4hero6common11StateWakeUpFPQ43scn4step4hero4Herob: /* 8036E048 00369E88 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -121,7 +121,7 @@ procMove__Q53scn4step4hero6common11StateWakeUpFv: procFixPos__Q53scn4step4hero6common11StateWakeUpFv: /* 8036E1D8 0036A018 4B FF 26 A8 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero6common11StateWakeUp __vt__Q53scn4step4hero6common11StateWakeUp: .incbin "baserom.dol", 0x4883C0, 0x28 diff --git a/asm/src/StateWalk.s b/asm/src/StateWalk.s index e8c0b1d7..744c3f52 100644 --- a/asm/src/StateWalk.s +++ b/asm/src/StateWalk.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11bladeknight9StateWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11bladeknight9StateWalkFPQ43scn4step5enemy5Enemy: /* 802983AC 002941EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -75,7 +75,7 @@ procMove__Q53scn4step5enemy11bladeknight9StateWalkFv: procFixPos__Q53scn4step5enemy11bladeknight9StateWalkFv: /* 80298494 002942D4 4B FF D9 9C */ b procFixPos__Q53scn4step5enemy6common17StateWalkStraightFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter9StateWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter9StateWalkFPQ43scn4step5enemy5Enemy: /* 802A1858 0029D698 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -320,7 +320,7 @@ lbl_802A1BB8: __dt__Q53scn4step5enemy11broomhatter9StateWalkFv: /* 802A1BD0 0029DA10 4B FE FD E8 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe9StateWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe9StateWalkFPQ43scn4step5enemy5Enemy: /* 802C0CAC 002BCAEC 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -637,7 +637,7 @@ lbl_802C1114: /* 802C1130 002BCF70 38 21 00 90 */ addi r1, r1, 0x90 /* 802C1134 002BCF74 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6lanzer9StateWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6lanzer9StateWalkFPQ43scn4step5enemy5Enemy: /* 802C2750 002BE590 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -987,7 +987,7 @@ lbl_802C2C40: /* 802C2C50 002BEA90 38 21 00 70 */ addi r1, r1, 0x70 /* 802C2C54 002BEA94 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5noddy9StateWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5noddy9StateWalkFPQ43scn4step5enemy5Enemy: /* 802C740C 002C324C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1057,7 +1057,7 @@ procMove__Q53scn4step5enemy5noddy9StateWalkFv: procFixPos__Q53scn4step5enemy5noddy9StateWalkFv: /* 802C74EC 002C332C 4B FC E9 44 */ b procFixPos__Q53scn4step5enemy6common17StateWalkStraightFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5nruff9StateWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5nruff9StateWalkFPQ43scn4step5enemy5Enemy: /* 802C9158 002C4F98 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1520,7 +1520,7 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9Sta __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802C97EC 002C562C 4B F6 4E B4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky9StateWalkFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky9StateWalkFPQ43scn4step5enemy5Enemy: /* 802D566C 002D14AC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2075,7 +2075,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12Stat __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D5E44 002D1C84 4B F5 88 5C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common9StateWalkFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common9StateWalkFPQ43scn4step4hero4Hero: /* 8036E1DC 0036A01C 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -2426,7 +2426,7 @@ create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9Sta __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036E6C0 0036A500 4B EB FF E0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero11staffcredit9StateWalkFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero11staffcredit9StateWalkFPQ43scn4step4hero4Hero: /* 803A5118 003A0F58 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2746,32 +2746,32 @@ lbl_803A5568: procFixPos__Q53scn4step4hero11staffcredit9StateWalkFv: /* 803A5580 003A13C0 4B FB B3 00 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11bladeknight9StateWalk __vt__Q53scn4step5enemy11bladeknight9StateWalk: .incbin "baserom.dol", 0x46FBA8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter9StateWalk __vt__Q53scn4step5enemy11broomhatter9StateWalk: .incbin "baserom.dol", 0x471028, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe9StateWalk __vt__Q53scn4step5enemy10knucklejoe9StateWalk: .incbin "baserom.dol", 0x474AD0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer9StateWalk __vt__Q53scn4step5enemy6lanzer9StateWalk: .incbin "baserom.dol", 0x474E70, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5noddy9StateWalk __vt__Q53scn4step5enemy5noddy9StateWalk: .incbin "baserom.dol", 0x475720, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9StateStop$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x475B48, 0x10 @@ -2779,7 +2779,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5nruff9State __vt__Q53scn4step5enemy5nruff9StateWalk: .incbin "baserom.dol", 0x475B58, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky16StateCliffAttack$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477008, 0x10 @@ -2790,7 +2790,7 @@ __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky12Stat __vt__Q53scn4step5enemy5rocky9StateWalk: .incbin "baserom.dol", 0x477028, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateWalk$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4883E8, 0x10 @@ -2798,12 +2798,12 @@ __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q53scn4step4hero6common9StateWalk: .incbin "baserom.dol", 0x4883F8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero11staffcredit9StateWalk __vt__Q53scn4step4hero11staffcredit9StateWalk: .incbin "baserom.dol", 0x48B1D8, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255785 $$255785: .incbin "baserom.dol", 0x49BD60, 0x4 @@ -2811,7 +2811,7 @@ $$255785: $$255786: .incbin "baserom.dol", 0x49BD64, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256240 $$256240: .incbin "baserom.dol", 0x49BF78, 0x4 @@ -2822,7 +2822,7 @@ $$256241: $$256245: .incbin "baserom.dol", 0x49BF80, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256172 $$256172: .incbin "baserom.dol", 0x49C778, 0x4 @@ -2836,12 +2836,12 @@ $$256204: $$256205: .incbin "baserom.dol", 0x49C784, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256206 $$256206: .incbin "baserom.dol", 0x49C7B8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256452 $$256452: .incbin "baserom.dol", 0x49C900, 0x4 @@ -2855,7 +2855,7 @@ $$256473: $$256506: .incbin "baserom.dol", 0x49C910, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256748 $$256748: .incbin "baserom.dol", 0x49CB60, 0x4 @@ -2866,7 +2866,7 @@ $$256749: $$256753: .incbin "baserom.dol", 0x49CB68, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257723 $$257723: .incbin "baserom.dol", 0x49DCB0, 0x4 diff --git a/asm/src/StateWalkAround.s b/asm/src/StateWalkAround.s index 7431217b..06e572c8 100644 --- a/asm/src/StateWalkAround.s +++ b/asm/src/StateWalkAround.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common15StateWalkAroundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common15StateWalkAroundFPQ43scn4step5enemy5Enemy: /* 802958E4 00291724 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -251,7 +251,7 @@ lbl_80295C3C: /* 80295C58 00291A98 38 21 00 70 */ addi r1, r1, 0x70 /* 80295C5C 00291A9C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy11broomhatter15StateWalkAroundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy11broomhatter15StateWalkAroundFPQ43scn4step5enemy5Enemy: /* 802A1BD4 0029DA14 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -613,7 +613,7 @@ initBrush__Q53scn4step5enemy11broomhatter15StateWalkAroundFv: __dt__Q53scn4step5enemy11broomhatter15StateWalkAroundFv: /* 802A2100 0029DF40 4B FE F8 B8 */ b __dt__Q53scn4step5enemy6common15StateCreditWalkFv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6lanzer15StateWalkAroundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6lanzer15StateWalkAroundFPQ43scn4step5enemy5Enemy: /* 802C2C58 002BEA98 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1035,7 +1035,7 @@ lbl_802C324C: /* 802C3268 002BF0A8 38 21 00 A0 */ addi r1, r1, 0xa0 /* 802C326C 002BF0AC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6sodory15StateWalkAroundFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6sodory15StateWalkAroundFPQ43scn4step5enemy5Enemy: /* 802E6568 002E23A8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1384,27 +1384,27 @@ lbl_802E6A34: /* 802E6A58 002E2898 38 21 00 A0 */ addi r1, r1, 0xa0 /* 802E6A5C 002E289C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common15StateWalkAround __vt__Q53scn4step5enemy6common15StateWalkAround: .incbin "baserom.dol", 0x46F488, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy11broomhatter15StateWalkAround __vt__Q53scn4step5enemy11broomhatter15StateWalkAround: .incbin "baserom.dol", 0x471048, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6lanzer15StateWalkAround __vt__Q53scn4step5enemy6lanzer15StateWalkAround: .incbin "baserom.dol", 0x474E90, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6sodory15StateWalkAround __vt__Q53scn4step5enemy6sodory15StateWalkAround: .incbin "baserom.dol", 0x479058, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255928 $$255928: .incbin "baserom.dol", 0x49BC38, 0x4 @@ -1439,7 +1439,7 @@ $$255970: $$255971: .incbin "baserom.dol", 0x49BC60, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256398 $$256398: .incbin "baserom.dol", 0x49BF88, 0x4 @@ -1453,7 +1453,7 @@ $$256403: $$256429: .incbin "baserom.dol", 0x49BF98, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256373 $$256373: .incbin "baserom.dol", 0x49C7C0, 0x4 @@ -1470,7 +1470,7 @@ $$256409: $$256410: .incbin "baserom.dol", 0x49C7D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256319 $$256319: .incbin "baserom.dol", 0x49CED0, 0x4 diff --git a/asm/src/StateWalkEnd.s b/asm/src/StateWalkEnd.s index 90b57163..3dba0868 100644 --- a/asm/src/StateWalkEnd.s +++ b/asm/src/StateWalkEnd.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky12StateWalkEndFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky12StateWalkEndFPQ43scn4step5enemy5Enemy: /* 802D5E48 002D1C88 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -88,12 +88,12 @@ lbl_802D5F54: /* 802D5F64 002D1DA4 38 21 00 40 */ addi r1, r1, 0x40 /* 802D5F68 002D1DA8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy5rocky12StateWalkEnd __vt__Q53scn4step5enemy5rocky12StateWalkEnd: .incbin "baserom.dol", 0x477048, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255720 $$255720: .incbin "baserom.dol", 0x49CB70, 0x8 diff --git a/asm/src/StateWalkStart.s b/asm/src/StateWalkStart.s index 8b94ce13..89cc267a 100644 --- a/asm/src/StateWalkStart.s +++ b/asm/src/StateWalkStart.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5rocky14StateWalkStartFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5rocky14StateWalkStartFPQ43scn4step5enemy5Enemy: /* 802D5F6C 002D1DAC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -93,7 +93,7 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9Sta __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802D6088 002D1EC8 4B F5 86 18 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9StateWalk$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x477068, 0x10 @@ -101,7 +101,7 @@ __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy5rocky9State __vt__Q53scn4step5enemy5rocky14StateWalkStart: .incbin "baserom.dol", 0x477078, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255797 $$255797: .incbin "baserom.dol", 0x49CB78, 0x8 diff --git a/asm/src/StateWalkStepBack.s b/asm/src/StateWalkStepBack.s index 0c352ba4..2e3498e4 100644 --- a/asm/src/StateWalkStepBack.s +++ b/asm/src/StateWalkStepBack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10knucklejoe17StateWalkStepBackFPQ43scn4step5enemy5Enemy: /* 802C1138 002BCF78 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -421,12 +421,12 @@ lbl_802C1718: /* 802C1738 002BD578 38 21 00 50 */ addi r1, r1, 0x50 /* 802C173C 002BD57C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10knucklejoe17StateWalkStepBack __vt__Q53scn4step5enemy10knucklejoe17StateWalkStepBack: .incbin "baserom.dol", 0x474AF0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256282 $$256282: .incbin "baserom.dol", 0x49C788, 0x4 diff --git a/asm/src/StateWalkStraight.s b/asm/src/StateWalkStraight.s index de717089..665100e4 100644 --- a/asm/src/StateWalkStraight.s +++ b/asm/src/StateWalkStraight.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6common17StateWalkStraightFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6common17StateWalkStraightFPQ43scn4step5enemy5Enemy: /* 80295C60 00291AA0 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -206,7 +206,7 @@ lbl_80295F18: /* 80295F28 00291D68 38 21 00 40 */ addi r1, r1, 0x40 /* 80295F2C 00291D6C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy8needlous17StateWalkStraightFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy8needlous17StateWalkStraightFPQ43scn4step5enemy5Enemy: /* 802C6C88 002C2AC8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -518,7 +518,7 @@ lbl_802C70D4: /* 802C70E4 002C2F24 38 21 00 50 */ addi r1, r1, 0x50 /* 802C70E8 002C2F28 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldee17StateWalkStraightFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldee17StateWalkStraightFPQ43scn4step5enemy5Enemy: /* 802CD458 002C9298 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -785,7 +785,7 @@ lbl_802CD7E8: /* 802CD804 002C9644 38 21 00 60 */ addi r1, r1, 0x60 /* 802CD808 002C9648 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10parasoldoo17StateWalkStraightFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10parasoldoo17StateWalkStraightFPQ43scn4step5enemy5Enemy: /* 802CF288 002CB0C8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1052,27 +1052,27 @@ lbl_802CF618: /* 802CF634 002CB474 38 21 00 60 */ addi r1, r1, 0x60 /* 802CF638 002CB478 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6common17StateWalkStraight __vt__Q53scn4step5enemy6common17StateWalkStraight: .incbin "baserom.dol", 0x46F4A8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy8needlous17StateWalkStraight __vt__Q53scn4step5enemy8needlous17StateWalkStraight: .incbin "baserom.dol", 0x4755D0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldee17StateWalkStraight __vt__Q53scn4step5enemy10parasoldee17StateWalkStraight: .incbin "baserom.dol", 0x476228, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10parasoldoo17StateWalkStraight __vt__Q53scn4step5enemy10parasoldoo17StateWalkStraight: .incbin "baserom.dol", 0x4763D8, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255905 $$255905: .incbin "baserom.dol", 0x49BC68, 0x4 @@ -1104,7 +1104,7 @@ $$255913: $$255914: .incbin "baserom.dol", 0x49BC8C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256319 $$256319: .incbin "baserom.dol", 0x49C898, 0x4 @@ -1124,12 +1124,12 @@ $$256323: $$256373: .incbin "baserom.dol", 0x49C8AC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256414 $$256414: .incbin "baserom.dol", 0x49C9F0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256413 $$256413: .incbin "baserom.dol", 0x49CA40, 0x8 diff --git a/asm/src/StateWall.s b/asm/src/StateWall.s index ea839227..4c6a8b4a 100644 --- a/asm/src/StateWall.s +++ b/asm/src/StateWall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage9StateWallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage9StateWallFPQ43scn4step5enemy5Enemy: /* 802EC318 002E8158 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -138,12 +138,12 @@ lbl_802EC4E0: /* 802EC4F4 002E8334 38 21 00 10 */ addi r1, r1, 0x10 /* 802EC4F8 002E8338 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateWall __vt__Q53scn4step5enemy9tsukikage9StateWall: .incbin "baserom.dol", 0x479B20, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255060 $$255060: .incbin "baserom.dol", 0x49CFC0, 0x8 diff --git a/asm/src/StateWallAttack.s b/asm/src/StateWallAttack.s index 384207b8..004a90f0 100644 --- a/asm/src/StateWallAttack.s +++ b/asm/src/StateWallAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage15StateWallAttackFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage15StateWallAttackFPQ43scn4step5enemy5Enemy: /* 802EC4FC 002E833C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -171,12 +171,12 @@ lbl_802EC750: /* 802EC760 002E85A0 38 21 00 10 */ addi r1, r1, 0x10 /* 802EC764 002E85A4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage15StateWallAttack __vt__Q53scn4step5enemy9tsukikage15StateWallAttack: .incbin "baserom.dol", 0x479B40, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255084 $$255084: .incbin "baserom.dol", 0x49CFC8, 0x8 diff --git a/asm/src/StateWarp.s b/asm/src/StateWarp.s index 5dbddd7f..233fa43a 100644 --- a/asm/src/StateWarp.s +++ b/asm/src/StateWarp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9tsukikage9StateWarpFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9tsukikage9StateWarpFPQ43scn4step5enemy5Enemy: /* 802EC768 002E85A8 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -650,12 +650,12 @@ lbl_802ED08C: /* 802ED0DC 002E8F1C 38 21 00 40 */ addi r1, r1, 0x40 /* 802ED0E0 002E8F20 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9tsukikage9StateWarp __vt__Q53scn4step5enemy9tsukikage9StateWarp: .incbin "baserom.dol", 0x479B60, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257655 $$257655: .incbin "baserom.dol", 0x49CFD0, 0x4 diff --git a/asm/src/StateWarpStar.s b/asm/src/StateWarpStar.s index 949f9165..17e44733 100644 --- a/asm/src/StateWarpStar.s +++ b/asm/src/StateWarpStar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isArenaEntrance__Q53scn4step4hero7gimmick27$$2unnamed$$2StateWarpStar_cpp$$2FRQ43scn4step4hero4Hero isArenaEntrance__Q53scn4step4hero7gimmick27$$2unnamed$$2StateWarpStar_cpp$$2FRQ43scn4step4hero4Hero: /* 8038215C 0037DF9C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -764,7 +764,7 @@ lbl_80382BAC: /* 80382C38 0037EA78 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80382C3C 0037EA7C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero7gimmick13StateWarpStar __vt__Q53scn4step4hero7gimmick13StateWarpStar: .incbin "baserom.dol", 0x488D20, 0x28 diff --git a/asm/src/StateWarpStarFall.s b/asm/src/StateWarpStarFall.s index 063d4ab5..aee4ce0a 100644 --- a/asm/src/StateWarpStarFall.s +++ b/asm/src/StateWarpStarFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick17StateWarpStarFallFPQ43scn4step4hero4HeroUl __ct__Q53scn4step4hero7gimmick17StateWarpStarFallFPQ43scn4step4hero4HeroUl: /* 80382C40 0037EA80 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -476,10 +476,10 @@ __sinit_$$3StateWarpStarFall_cpp: /* 80383308 0037F148 FC 60 08 90 */ fmr f3, f1 /* 8038330C 0037F14C 4B D3 AD B4 */ b __ct__Q34nw4r4math4VEC3Ffff -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025C8, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25StateAreaMapDemoFirstPlay$$4PQ43scn4step4hero4Hero$$4i$$1: .incbin "baserom.dol", 0x488D48, 0x10 @@ -487,7 +487,7 @@ __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick25St __vt__Q53scn4step4hero7gimmick17StateWarpStarFall: .incbin "baserom.dol", 0x488D58, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260208 $$260208: .incbin "baserom.dol", 0x49DFE8, 0x4 diff --git a/asm/src/StateWarpStarIn.s b/asm/src/StateWarpStarIn.s index 86441fd7..66738c85 100644 --- a/asm/src/StateWarpStarIn.s +++ b/asm/src/StateWarpStarIn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero7gimmick15StateWarpStarInFPQ43scn4step4hero4HeroQ33hel4math7Vector2 __ct__Q53scn4step4hero7gimmick15StateWarpStarInFPQ43scn4step4hero4HeroQ33hel4math7Vector2: /* 80383310 0037F150 94 21 FE F0 */ stwu r1, -0x110(r1) @@ -669,10 +669,10 @@ __sinit_$$3StateWarpStarIn_cpp: /* 80383CD0 0037FB10 FC 60 08 90 */ fmr f3, f1 /* 80383CD4 0037FB14 4B D3 A3 EC */ b __ct__Q34nw4r4math4VEC3Ffff -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025CC, 0x4 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$260738 $$260738: .incbin "baserom.dol", 0x488D80, 0x18 @@ -683,7 +683,7 @@ __vt__Q24util102StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero7gimmick17St __vt__Q53scn4step4hero7gimmick15StateWarpStarIn: .incbin "baserom.dol", 0x488DA8, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$260737 $$260737: .incbin "baserom.dol", 0x497728, 0x8 @@ -691,7 +691,7 @@ $$260737: $$260739: .incbin "baserom.dol", 0x497730, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$260734 $$260734: .incbin "baserom.dol", 0x49DFF0, 0x4 diff --git a/asm/src/StateWaterFloat.s b/asm/src/StateWaterFloat.s index f0c9e11a..d8ad9e92 100644 --- a/asm/src/StateWaterFloat.s +++ b/asm/src/StateWaterFloat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero6common15StateWaterFloatFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero6common15StateWaterFloatFPQ43scn4step4hero4Hero: /* 8036E6C4 0036A504 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -444,7 +444,7 @@ create__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9Sta __dt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1Fv: /* 8036ED08 0036AB48 4B EB F9 98 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1 __vt__Q24util96StateFactoryArg4$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$4b$$4b$$1: .incbin "baserom.dol", 0x488420, 0x10 diff --git a/asm/src/StateWaterPistol.s b/asm/src/StateWaterPistol.s index 1ff1a527..9be65379 100644 --- a/asm/src/StateWaterPistol.s +++ b/asm/src/StateWaterPistol.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common16StateWaterPistolFPQ43scn4step4hero4HeroRCQ33hel4math7Vector2 TryToChangeState__Q53scn4step4hero6common16StateWaterPistolFPQ43scn4step4hero4HeroRCQ33hel4math7Vector2: /* 8036ED0C 0036AB4C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -353,7 +353,7 @@ create__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16S __dt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1Fv: /* 8036F1CC 0036B00C 4B EB F4 D4 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1 __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16StateWaterPistol$$4PQ43scn4step4hero4Hero$$4Q33hel4math7Vector2$$1: .incbin "baserom.dol", 0x488458, 0x10 @@ -361,7 +361,7 @@ __vt__Q24util117StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common16Sta __vt__Q53scn4step4hero6common16StateWaterPistol: .incbin "baserom.dol", 0x488468, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257717 $$257717: .incbin "baserom.dol", 0x49DCC0, 0x4 diff --git a/asm/src/StateWaterPistolFloat.s b/asm/src/StateWaterPistolFloat.s index a6499aba..e1f3047e 100644 --- a/asm/src/StateWaterPistolFloat.s +++ b/asm/src/StateWaterPistolFloat.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common21StateWaterPistolFloatFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common21StateWaterPistolFloatFPQ43scn4step4hero4Hero: /* 8036F1D0 0036B010 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -242,7 +242,7 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21S __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036F500 0036B340 4B EB F1 A0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21StateWaterPistolFloat$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488490, 0x10 @@ -250,7 +250,7 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common21Sta __vt__Q53scn4step4hero6common21StateWaterPistolFloat: .incbin "baserom.dol", 0x4884A0, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257643 $$257643: .incbin "baserom.dol", 0x49DCE0, 0x4 diff --git a/asm/src/StateWaterWait.s b/asm/src/StateWaterWait.s index 7caf3a47..d82b262e 100644 --- a/asm/src/StateWaterWait.s +++ b/asm/src/StateWaterWait.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common14StateWaterWaitFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common14StateWaterWaitFPQ43scn4step4hero4Hero: /* 8036F504 0036B344 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -430,7 +430,7 @@ create__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14St __dt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv: /* 8036FAE4 0036B924 4B EB EB BC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util98StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWait$$4PQ43scn4step4hero4Hero$$4Ul$$1: .incbin "baserom.dol", 0x4884C8, 0x10 diff --git a/asm/src/StateWaterWalk.s b/asm/src/StateWaterWalk.s index 49c6f5c1..6ac7c3f9 100644 --- a/asm/src/StateWaterWalk.s +++ b/asm/src/StateWaterWalk.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero6common14StateWaterWalkFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero6common14StateWaterWalkFPQ43scn4step4hero4Hero: /* 8036FAE8 0036B928 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -337,7 +337,7 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14St __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1Fv: /* 8036FF98 0036BDD8 4B EB E7 08 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateWaterWalk$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x488500, 0x10 diff --git a/asm/src/StateWhipAttack.s b/asm/src/StateWhipAttack.s index b318f2e9..93c9236f 100644 --- a/asm/src/StateWhipAttack.s +++ b/asm/src/StateWhipAttack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4whip15StateWhipAttackFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero4whip15StateWhipAttackFPQ43scn4step4hero4Hero: /* 8038A03C 00385E7C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -54,7 +54,7 @@ procMove__Q53scn4step4hero4whip15StateWhipAttackFv: procFixPos__Q53scn4step4hero4whip15StateWhipAttackFv: /* 8038A0D0 00385F10 4B FD 67 B0 */ b procFixPos__Q53scn4step4hero6common9StateCopyFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4whip15StateWhipAttack __vt__Q53scn4step4hero4whip15StateWhipAttack: .incbin "baserom.dol", 0x489490, 0x28 diff --git a/asm/src/StateWhipAttackAir.s b/asm/src/StateWhipAttackAir.s index 7d9d7631..84119b44 100644 --- a/asm/src/StateWhipAttackAir.s +++ b/asm/src/StateWhipAttackAir.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip18StateWhipAttackAirFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4whip18StateWhipAttackAirFPQ43scn4step4hero4Hero: /* 8038A0D4 00385F14 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -156,7 +156,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18Stat __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038A2C8 00386108 4B EA 43 D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipAttackAir$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4894B8, 0x10 diff --git a/asm/src/StateWhipAttackUp.s b/asm/src/StateWhipAttackUp.s index 22a50a4b..9e5c5ea0 100644 --- a/asm/src/StateWhipAttackUp.s +++ b/asm/src/StateWhipAttackUp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip17StateWhipAttackUpFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4whip17StateWhipAttackUpFPQ43scn4step4hero4Hero: /* 8038A2CC 0038610C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -109,7 +109,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17Stat __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038A40C 0038624C 4B EA 42 94 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipAttackUp$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4894F0, 0x10 diff --git a/asm/src/StateWhipCapture.s b/asm/src/StateWhipCapture.s index 43350fa5..2c154aa9 100644 --- a/asm/src/StateWhipCapture.s +++ b/asm/src/StateWhipCapture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4whip16StateWhipCaptureFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero4whip16StateWhipCaptureFPQ43scn4step4hero4Hero: /* 8038A410 00386250 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -258,7 +258,7 @@ __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateW __dt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 8038A76C 003865AC 4B EA 3F 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util103StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy8captured17StateCapturedWhip$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x489528, 0x10 diff --git a/asm/src/StateWhipCaptureUp.s b/asm/src/StateWhipCaptureUp.s index fc3a7772..1c79659a 100644 --- a/asm/src/StateWhipCaptureUp.s +++ b/asm/src/StateWhipCaptureUp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4whip18StateWhipCaptureUpFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero4whip18StateWhipCaptureUpFPQ43scn4step4hero4Hero: /* 8038A770 003865B0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -102,7 +102,7 @@ procFixPos__Q53scn4step4hero4whip18StateWhipCaptureUpFv: procObjCollReact__Q53scn4step4hero4whip18StateWhipCaptureUpFv: /* 8038A8A4 003866E4 4B FF FD C0 */ b procObjCollReact__Q53scn4step4hero4whip16StateWhipCaptureFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4whip18StateWhipCaptureUp __vt__Q53scn4step4hero4whip18StateWhipCaptureUp: .incbin "baserom.dol", 0x489570, 0x28 diff --git a/asm/src/StateWhipCatch.s b/asm/src/StateWhipCatch.s index cf88edc8..5643aced 100644 --- a/asm/src/StateWhipCatch.s +++ b/asm/src/StateWhipCatch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4whip14StateWhipCatchFPQ43scn4step4hero4Hero __ct__Q53scn4step4hero4whip14StateWhipCatchFPQ43scn4step4hero4Hero: /* 8038A8A8 003866E8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -235,12 +235,12 @@ procObjCollReact__Q53scn4step4hero4whip14StateWhipCatchFv: /* 8038ABDC 00386A1C 38 21 00 10 */ addi r1, r1, 0x10 /* 8038ABE0 00386A20 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4hero4whip14StateWhipCatch __vt__Q53scn4step4hero4whip14StateWhipCatch: .incbin "baserom.dol", 0x489598, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258486 $$258486: .incbin "baserom.dol", 0x49E0C0, 0x4 diff --git a/asm/src/StateWhipCharge.s b/asm/src/StateWhipCharge.s index 36da29f8..9f94a6d8 100644 --- a/asm/src/StateWhipCharge.s +++ b/asm/src/StateWhipCharge.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip15StateWhipChargeFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4whip15StateWhipChargeFPQ43scn4step4hero4Hero: /* 8038ABE4 00386A24 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -402,7 +402,7 @@ __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip16StateW __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038B130 00386F70 4B EA 35 70 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipCaptureUp$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4895C0, 0x10 diff --git a/asm/src/StateWhipDrill.s b/asm/src/StateWhipDrill.s index 97c29dfd..b8114254 100644 --- a/asm/src/StateWhipDrill.s +++ b/asm/src/StateWhipDrill.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip14StateWhipDrillFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4whip14StateWhipDrillFPQ43scn4step4hero4Hero: /* 8038B134 00386F74 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -285,7 +285,7 @@ create__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14Stat __dt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038B514 00387354 4B EA 31 8C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util93StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip14StateWhipDrill$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489628, 0x10 diff --git a/asm/src/StateWhipGazerSpiral.s b/asm/src/StateWhipGazerSpiral.s index 9488bcb9..2546cfd3 100644 --- a/asm/src/StateWhipGazerSpiral.s +++ b/asm/src/StateWhipGazerSpiral.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip20StateWhipGazerSpiralFPQ43scn4step4hero4HeroUl TryToChangeState__Q53scn4step4hero4whip20StateWhipGazerSpiralFPQ43scn4step4hero4HeroUl: /* 8038B518 00387358 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -315,7 +315,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20Stat __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038B978 003877B8 4B EA 2D 28 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateWhipGazerSpiral$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489660, 0x10 @@ -323,7 +323,7 @@ __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip20StateW __vt__Q53scn4step4hero4whip20StateWhipGazerSpiral: .incbin "baserom.dol", 0x489670, 0x28 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258346 $$258346: .incbin "baserom.dol", 0x49E0C8, 0x8 diff --git a/asm/src/StateWhipRush.s b/asm/src/StateWhipRush.s index 1569a3b3..cedabc47 100644 --- a/asm/src/StateWhipRush.s +++ b/asm/src/StateWhipRush.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip13StateWhipRushFPQ43scn4step4hero4HeroUl TryToChangeState__Q53scn4step4hero4whip13StateWhipRushFPQ43scn4step4hero4HeroUl: /* 8038B97C 003877BC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -236,7 +236,7 @@ create__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13Stat __dt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038BC90 00387AD0 4B EA 2A 10 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util92StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip13StateWhipRush$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489698, 0x10 diff --git a/asm/src/StateWhipSlamBack.s b/asm/src/StateWhipSlamBack.s index de0758ac..bac2f887 100644 --- a/asm/src/StateWhipSlamBack.s +++ b/asm/src/StateWhipSlamBack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip17StateWhipSlamBackFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4whip17StateWhipSlamBackFPQ43scn4step4hero4Hero: /* 8038BC94 00387AD4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -208,7 +208,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17Stat __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038BF40 00387D80 4B EA 27 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamBack$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x4896D0, 0x10 diff --git a/asm/src/StateWhipSlamDown.s b/asm/src/StateWhipSlamDown.s index 50e1e069..077f040d 100644 --- a/asm/src/StateWhipSlamDown.s +++ b/asm/src/StateWhipSlamDown.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip17StateWhipSlamDownFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4whip17StateWhipSlamDownFPQ43scn4step4hero4Hero: /* 8038BF44 00387D84 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -215,7 +215,7 @@ create__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17Stat __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038C210 00388050 4B EA 24 90 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip17StateWhipSlamDown$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489708, 0x10 diff --git a/asm/src/StateWhipSlamFront.s b/asm/src/StateWhipSlamFront.s index 7120f6f5..04c238e2 100644 --- a/asm/src/StateWhipSlamFront.s +++ b/asm/src/StateWhipSlamFront.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip18StateWhipSlamFrontFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4whip18StateWhipSlamFrontFPQ43scn4step4hero4Hero: /* 8038C214 00388054 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -238,7 +238,7 @@ create__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18Stat __dt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038C528 00388368 4B EA 21 78 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util97StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip18StateWhipSlamFront$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489740, 0x10 diff --git a/asm/src/StateWhipSlamUp.s b/asm/src/StateWhipSlamUp.s index 6a876217..c3295065 100644 --- a/asm/src/StateWhipSlamUp.s +++ b/asm/src/StateWhipSlamUp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4hero4whip15StateWhipSlamUpFPQ43scn4step4hero4Hero TryToChangeState__Q53scn4step4hero4whip15StateWhipSlamUpFPQ43scn4step4hero4Hero: /* 8038C52C 0038836C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -190,7 +190,7 @@ create__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15Stat __dt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1Fv: /* 8038C798 003885D8 4B EA 1F 08 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util94StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero4whip15StateWhipSlamUp$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x489778, 0x10 diff --git a/asm/src/StateWhispyAppear.s b/asm/src/StateWhispyAppear.s index 100c7da6..76076625 100644 --- a/asm/src/StateWhispyAppear.s +++ b/asm/src/StateWhispyAppear.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy10brontoburt17StateWhispyAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy10brontoburt17StateWhispyAppearFPQ43scn4step5enemy5Enemy: /* 802A0488 0029C2C8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -316,7 +316,7 @@ lbl_802A08F4: /* 802A0904 0029C744 38 21 00 40 */ addi r1, r1, 0x40 /* 802A0908 0029C748 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy5gordo17StateWhispyAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy5gordo17StateWhispyAppearFPQ43scn4step5enemy5Enemy: /* 802B9B48 002B5988 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -497,7 +497,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyap __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802B9DB0 002B5BF0 4B F7 48 F0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy6scarfy17StateWhispyAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy6scarfy17StateWhispyAppearFPQ43scn4step5enemy5Enemy: /* 802DB61C 002D745C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -778,7 +778,7 @@ lbl_802DB9F0: procFixPos__Q53scn4step5enemy6scarfy17StateWhispyAppearFv: /* 802DBA14 002D7854 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee17StateWhispyAppearFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee17StateWhispyAppearFPQ43scn4step5enemy5Enemy: /* 802EECE0 002EAB20 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -985,12 +985,12 @@ create__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddlede __dt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EEFB0 002EADF0 4B F3 F6 F0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy10brontoburt17StateWhispyAppear __vt__Q53scn4step5enemy10brontoburt17StateWhispyAppear: .incbin "baserom.dol", 0x470C38, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyapple9StateFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x4737B8, 0x10 @@ -998,12 +998,12 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy11whispyappl __vt__Q53scn4step5enemy5gordo17StateWhispyAppear: .incbin "baserom.dol", 0x4737C8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy6scarfy17StateWhispyAppear __vt__Q53scn4step5enemy6scarfy17StateWhispyAppear: .incbin "baserom.dol", 0x4777B8, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee15StateWhispyFall$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47A3D8, 0x10 @@ -1011,7 +1011,7 @@ __vt__Q24util102StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 __vt__Q53scn4step5enemy9waddledee17StateWhispyAppear: .incbin "baserom.dol", 0x47A3E8, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255825 $$255825: .incbin "baserom.dol", 0x495F50, 0x4 @@ -1019,7 +1019,7 @@ $$255825: $$255826: .incbin "baserom.dol", 0x495F54, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256674 $$256674: .incbin "baserom.dol", 0x49BF30, 0x4 @@ -1033,7 +1033,7 @@ $$256699: $$256703: .incbin "baserom.dol", 0x49BF40, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256059 $$256059: .incbin "baserom.dol", 0x49C5B8, 0x4 @@ -1047,7 +1047,7 @@ $$256088: $$256091: .incbin "baserom.dol", 0x49C5C8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256654 $$256654: .incbin "baserom.dol", 0x49CCA0, 0x4 @@ -1061,7 +1061,7 @@ $$256685: $$256689: .incbin "baserom.dol", 0x49CCB0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256065 $$256065: .incbin "baserom.dol", 0x49D030, 0x4 diff --git a/asm/src/StateWhispyFall.s b/asm/src/StateWhispyFall.s index d9edcf88..a9088deb 100644 --- a/asm/src/StateWhispyFall.s +++ b/asm/src/StateWhispyFall.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee15StateWhispyFallFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee15StateWhispyFallFPQ43scn4step5enemy5Enemy: /* 802EEFB4 002EADF4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -190,7 +190,7 @@ create__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddlede __dt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EF240 002EB080 4B F3 F4 60 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee18StateWhispyLanding$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47A408, 0x10 @@ -198,7 +198,7 @@ __vt__Q24util105StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee1 __vt__Q53scn4step5enemy9waddledee15StateWhispyFall: .incbin "baserom.dol", 0x47A418, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256580 $$256580: .incbin "baserom.dol", 0x49D048, 0x4 diff --git a/asm/src/StateWhispyLanding.s b/asm/src/StateWhispyLanding.s index 1ae57680..c2f923c2 100644 --- a/asm/src/StateWhispyLanding.s +++ b/asm/src/StateWhispyLanding.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step5enemy9waddledee18StateWhispyLandingFPQ43scn4step5enemy5Enemy __ct__Q53scn4step5enemy9waddledee18StateWhispyLandingFPQ43scn4step5enemy5Enemy: /* 802EF244 002EB084 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -48,7 +48,7 @@ procMove__Q53scn4step5enemy9waddledee18StateWhispyLandingFv: procFixPos__Q53scn4step5enemy9waddledee18StateWhispyLandingFv: /* 802EF2C0 002EB100 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step5enemy9waddledee18StateWhispyLanding __vt__Q53scn4step5enemy9waddledee18StateWhispyLanding: .incbin "baserom.dol", 0x47A438, 0x20 diff --git a/asm/src/StateWin.s b/asm/src/StateWin.s index 615338fb..7699a1e2 100644 --- a/asm/src/StateWin.s +++ b/asm/src/StateWin.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster8StateWinFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster8StateWinFPQ43scn4step4boss4Boss: /* 80243614 0023F454 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -110,7 +110,7 @@ procMove__Q53scn4step4boss15challengemaster8StateWinFv: procFixPos__Q53scn4step4boss15challengemaster8StateWinFv: /* 8024376C 0023F5AC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step4boss15challengemaster8StateWin __vt__Q53scn4step4boss15challengemaster8StateWin: .incbin "baserom.dol", 0x462118, 0x20 diff --git a/asm/src/StateWinFly.s b/asm/src/StateWinFly.s index 3643d0a3..7b04ade5 100644 --- a/asm/src/StateWinFly.s +++ b/asm/src/StateWinFly.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss15challengemaster11StateWinFlyFPQ43scn4step4boss4Boss __ct__Q53scn4step4boss15challengemaster11StateWinFlyFPQ43scn4step4boss4Boss: /* 80243770 0023F5B0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -283,7 +283,7 @@ create__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challenge __dt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1Fv: /* 80243B6C 0023F9AC 4B FE AB 34 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateWin$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x462138, 0x10 @@ -291,7 +291,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss15challengema __vt__Q53scn4step4boss15challengemaster11StateWinFly: .incbin "baserom.dol", 0x462148, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256210 $$256210: .incbin "baserom.dol", 0x49B0E8, 0x4 diff --git a/asm/src/StateWorrisome.s b/asm/src/StateWorrisome.s index fe2a3807..70399887 100644 --- a/asm/src/StateWorrisome.s +++ b/asm/src/StateWorrisome.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TryToChangeState__Q53scn4step4boss15challengemaster14StateWorrisomeFPQ43scn4step4boss4Boss TryToChangeState__Q53scn4step4boss15challengemaster14StateWorrisomeFPQ43scn4step4boss4Boss: /* 80243B70 0023F9B0 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -536,7 +536,7 @@ __dt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem __dt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1Fv: /* 802442F4 00240134 4B FE A3 AC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1 __vt__Q24util155StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengemaster8StateFly$$4PQ43scn4step4boss4Boss$$4Q63scn4step4boss15challengemaster8StateFly12TurnWaitType$$1: .incbin "baserom.dol", 0x462168, 0x10 @@ -547,7 +547,7 @@ __vt__Q24util107StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4boss15challengem __vt__Q53scn4step4boss15challengemaster14StateWorrisome: .incbin "baserom.dol", 0x462188, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256482 $$256482: .incbin "baserom.dol", 0x49B100, 0x4 diff --git a/asm/src/StdModel.s b/asm/src/StdModel.s index cf02333b..f3c8170a 100644 --- a/asm/src/StdModel.s +++ b/asm/src/StdModel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23g3d8StdModelFRCQ23g3d15StdModelContext __ct__Q23g3d8StdModelFRCQ23g3d15StdModelContext: /* 801949EC 0019082C 94 21 FF 60 */ stwu r1, -0xa0(r1) diff --git a/asm/src/StdRequestor.s b/asm/src/StdRequestor.s index d6363a92..bebb1ffb 100644 --- a/asm/src/StdRequestor.s +++ b/asm/src/StdRequestor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26effect12StdRequestorFRQ26effect7Manager __ct__Q26effect12StdRequestorFRQ26effect7Manager: /* 8017EEAC 0017ACEC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/StdResponder.s b/asm/src/StdResponder.s index bf593c25..55752bb3 100644 --- a/asm/src/StdResponder.s +++ b/asm/src/StdResponder.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail9DetectArg __ct__Q35mcoll6detail12StdResponderFRCQ35mcoll6detail9DetectArg: /* 801BCF04 001B8D44 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -218,7 +218,7 @@ lbl_801BD1F0: /* 801BD1FC 001B903C 38 21 00 30 */ addi r1, r1, 0x30 /* 801BD200 001B9040 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q35mcoll6detail12StdResponder __vt__Q35mcoll6detail12StdResponder: .incbin "baserom.dol", 0x455D98, 0x18 diff --git a/asm/src/StepMain.s b/asm/src/StepMain.s index 0a2cdd08..16f8dcf6 100644 --- a/asm/src/StepMain.s +++ b/asm/src/StepMain.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn11staffcredit8StepMainFRCQ33scn4step7Context __ct__Q33scn11staffcredit8StepMainFRCQ33scn4step7Context: /* 803FC074 003F7EB4 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -755,7 +755,7 @@ lbl_803FCB08: /* 803FCB18 003F8958 38 21 00 10 */ addi r1, r1, 0x10 /* 803FCB1C 003F895C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$257488 $$257488: .incbin "baserom.dol", 0x492478, 0x14 @@ -763,7 +763,7 @@ $$257488: $$257586: .incbin "baserom.dol", 0x49248C, 0x24 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$257489 $$257489: .incbin "baserom.dol", 0x498A68, 0x4 diff --git a/asm/src/StepMoveInfo.s b/asm/src/StepMoveInfo.s index 27397ce7..d67f9991 100644 --- a/asm/src/StepMoveInfo.s +++ b/asm/src/StepMoveInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global isEqualsMapAndScene__Q43scn4step7gimmick12StepMoveInfoCFRCQ43scn4step7gimmick12StepMoveInfo isEqualsMapAndScene__Q43scn4step7gimmick12StepMoveInfoCFRCQ43scn4step7gimmick12StepMoveInfo: /* 802F7294 002F30D4 38 C0 00 00 */ li r6, 0 diff --git a/asm/src/StepReleaseUtil.s b/asm/src/StepReleaseUtil.s index 7fa861dc..b7552081 100644 --- a/asm/src/StepReleaseUtil.s +++ b/asm/src/StepReleaseUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global StepRelease__Q33scn4step15StepReleaseUtilFRQ33scn4step9Component StepRelease__Q33scn4step15StepReleaseUtilFRQ33scn4step9Component: /* 80221E78 0021DCB8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/Stepping.s b/asm/src/Stepping.s index 3eefcdfa..f191e96c 100644 --- a/asm/src/Stepping.s +++ b/asm/src/Stepping.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global chkCollide__Q43scn4step4hero8SteppingFRQ43scn4step4hero8Stepping chkCollide__Q43scn4step4hero8SteppingFRQ43scn4step4hero8Stepping: /* 80355A28 00351868 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -166,12 +166,12 @@ create__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14St __dt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1Fv: /* 80355C7C 00351ABC 4B ED 8A 24 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1 __vt__Q24util95StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common14StateSuperJump$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x481628, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255899 $$255899: .incbin "baserom.dol", 0x49D9E0, 0x4 diff --git a/asm/src/Stick.s b/asm/src/Stick.s index 7157643b..a1ca86ea 100644 --- a/asm/src/Stick.s +++ b/asm/src/Stick.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23hid5StickFi __ct__Q23hid5StickFi: /* 801A4778 001A05B8 90 83 00 00 */ stw r4, 0(r3) @@ -48,7 +48,7 @@ normalized__Q23hid5StickCFv: /* 801A4808 001A0648 38 21 00 20 */ addi r1, r1, 0x20 /* 801A480C 001A064C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249704 $$249704: .incbin "baserom.dol", 0x49A470, 0x8 diff --git a/asm/src/StickObjAlgorithm.s b/asm/src/StickObjAlgorithm.s index 7f9054d6..b1becb59 100644 --- a/asm/src/StickObjAlgorithm.s +++ b/asm/src/StickObjAlgorithm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon17StickObjAlgorithmFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon17StickObjAlgorithmFRQ43scn4step6weapon6Weapon: /* 803D8B48 003D4988 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -97,7 +97,7 @@ procMove__Q43scn4step6weapon17StickObjAlgorithmFv: /* 803D8CA0 003D4AE0 38 21 00 20 */ addi r1, r1, 0x20 /* 803D8CA4 003D4AE4 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253717 $$253717: .incbin "baserom.dol", 0x49E868, 0x8 diff --git a/asm/src/StickWallAlgorithm.s b/asm/src/StickWallAlgorithm.s index db3c7bf8..6fbaa795 100644 --- a/asm/src/StickWallAlgorithm.s +++ b/asm/src/StickWallAlgorithm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon18StickWallAlgorithmFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon18StickWallAlgorithmFRQ43scn4step6weapon6Weapon: /* 803D8CA8 003D4AE8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -107,7 +107,7 @@ lbl_803D8DFC: /* 803D8E0C 003D4C4C 38 21 00 30 */ addi r1, r1, 0x30 /* 803D8E10 003D4C50 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253191 $$253191: .incbin "baserom.dol", 0x49E870, 0x8 diff --git a/asm/src/Stone.s b/asm/src/Stone.s index 754eaccf..d33db1b4 100644 --- a/asm/src/Stone.s +++ b/asm/src/Stone.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global BodyModel__Q53scn4step4hero9modeldesc5StoneFv BodyModel__Q53scn4step4hero9modeldesc5StoneFv: /* 8035CA68 003588A8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -25,7 +25,7 @@ lbl_8035CA98: /* 8035CAB0 003588F0 38 21 00 10 */ addi r1, r1, 0x10 /* 8035CAB4 003588F4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global create__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv create__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv: /* 80391B38 0038D978 7C 65 1B 78 */ mr r5, r3 @@ -41,7 +41,7 @@ create__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14St __dt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1Fv: /* 80391B58 0038D998 4B E9 CB 48 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1 __vt__Q24util156StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero5stone14StateStartJump$$4PQ43scn4step4hero4Hero$$4Q33std3tr149reference_wrapper$$0Q53scn4step4hero5stone7Context$$1$$1: .incbin "baserom.dol", 0x489C38, 0x10 diff --git a/asm/src/Stop.s b/asm/src/Stop.s index 8ad4ac08..e9878da6 100644 --- a/asm/src/Stop.s +++ b/asm/src/Stop.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick4StopFRQ33scn4step9Component __ct__Q43scn4step7gimmick4StopFRQ33scn4step9Component: /* 802F72C4 002F3104 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -536,7 +536,7 @@ lbl_802F79A8: /* 802F79C4 002F3804 38 21 00 10 */ addi r1, r1, 0x10 /* 802F79C8 002F3808 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx4StopFRQ33scn4step9Component __ct__Q43scn4step3sfx4StopFRQ33scn4step9Component: /* 803CF8CC 003CB70C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -852,12 +852,12 @@ lbl_803CFCE4: /* 803CFD00 003CBB40 38 21 00 10 */ addi r1, r1, 0x10 /* 803CFD04 003CBB44 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step7gimmick4Stop __vt__Q43scn4step7gimmick4Stop: .incbin "baserom.dol", 0x47B058, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step3sfx4Stop __vt__Q43scn4step3sfx4Stop: .incbin "baserom.dol", 0x48EDC8, 0x20 diff --git a/asm/src/StorageAccessor2.s b/asm/src/StorageAccessor2.s index 5677e08c..bc90783f 100644 --- a/asm/src/StorageAccessor2.s +++ b/asm/src/StorageAccessor2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_volatileData__Q33scn4step30$$2unnamed$$2StorageAccessor2_cpp$$2Fv t_volatileData__Q33scn4step30$$2unnamed$$2StorageAccessor2_cpp$$2Fv: /* 80221EB8 0021DCF8 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/StorageData.s b/asm/src/StorageData.s index e3a780f1..f4cd14b9 100644 --- a/asm/src/StorageData.s +++ b/asm/src/StorageData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global init__Q27storage11StorageDataFv init__Q27storage11StorageDataFv: /* 804048AC 004006EC 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/StorageManager.s b/asm/src/StorageManager.s index 72ad868d..d71376ea 100644 --- a/asm/src/StorageManager.s +++ b/asm/src/StorageManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q27storage14StorageManagerFv __ct__Q27storage14StorageManagerFv: /* 80404914 00400754 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -485,7 +485,7 @@ selectedBackupFileData2__Q27storage14StorageManagerFv: /* 80404F7C 00400DBC 38 21 00 10 */ addi r1, r1, 0x10 /* 80404F80 00400DC0 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250677 $$250677: .incbin "baserom.dol", 0x49EEA8, 0x8 diff --git a/asm/src/StorageUtil.s b/asm/src/StorageUtil.s index 140a707b..6e85afd6 100644 --- a/asm/src/StorageUtil.s +++ b/asm/src/StorageUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q27storage11StorageUtilFv __ct__Q27storage11StorageUtilFv: /* 80404F84 00400DC4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -158,7 +158,7 @@ hasAllPlatinumMedal__Q27storage11StorageUtilCFi: /* 8040518C 00400FCC 38 21 00 10 */ addi r1, r1, 0x10 /* 80405190 00400FD0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249178 $$249178: .incbin "baserom.dol", 0x4927D0, 0x10 diff --git a/asm/src/StoryModeUtil.s b/asm/src/StoryModeUtil.s index 10446829..9a295c31 100644 --- a/asm/src/StoryModeUtil.s +++ b/asm/src/StoryModeUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsExtraMode__Q43scn4step4hero13StoryModeUtilFRCQ33scn4step9Component IsExtraMode__Q43scn4step4hero13StoryModeUtilFRCQ33scn4step9Component: /* 80355C80 00351AC0 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/SubAnimControl.s b/asm/src/SubAnimControl.s index 803a0ee6..6111faa1 100644 --- a/asm/src/SubAnimControl.s +++ b/asm/src/SubAnimControl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero14SubAnimControlFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero14SubAnimControlFRQ43scn4step4hero4Hero: /* 80355CA8 00351AE8 90 83 00 00 */ stw r4, 0(r3) @@ -365,12 +365,12 @@ lbl_80356188: /* 803561A4 00351FE4 38 21 00 30 */ addi r1, r1, 0x30 /* 803561A8 00351FE8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256381 $$256381: .incbin "baserom.dol", 0x481638, 0xE8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256378 $$256378: .incbin "baserom.dol", 0x49D9F0, 0x4 diff --git a/asm/src/SuperBackPicture.s b/asm/src/SuperBackPicture.s index b1e0148d..cdf4ae03 100644 --- a/asm/src/SuperBackPicture.s +++ b/asm/src/SuperBackPicture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_request__Q43scn4step3sfx30$$2unnamed$$2SuperBackPicture_cpp$$2FRQ43scn4step6effect9RequestorQ43scn4step6effect4KindRCQ23g3d12NodeAccessor t_request__Q43scn4step3sfx30$$2unnamed$$2SuperBackPicture_cpp$$2FRQ43scn4step6effect9RequestorQ43scn4step6effect4KindRCQ23g3d12NodeAccessor: /* 803CFD08 003CBB48 94 21 FF 10 */ stwu r1, -0xf0(r1) @@ -792,7 +792,7 @@ onStopPowerfulFinished__Q43scn4step3sfx16SuperBackPictureFRCQ25ostop5Actor: /* 803D0808 003CC648 38 21 00 10 */ addi r1, r1, 0x10 /* 803D080C 003CC64C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253740 $$253740: .incbin "baserom.dol", 0x48EDE8, 0x14 @@ -803,7 +803,7 @@ $$253741: __vt__Q43scn4step3sfx16SuperBackPicture: .incbin "baserom.dol", 0x48EE20, 0x20 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253742 $$253742: .incbin "baserom.dol", 0x498408, 0x8 @@ -811,7 +811,7 @@ $$253742: $$253852: .incbin "baserom.dol", 0x498410, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253791 $$253791: .incbin "baserom.dol", 0x49E7E0, 0x4 diff --git a/asm/src/SuperFade.s b/asm/src/SuperFade.s index b640d98e..fabd7049 100644 --- a/asm/src/SuperFade.s +++ b/asm/src/SuperFade.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step3sfx9SuperFadeFv __ct__Q43scn4step3sfx9SuperFadeFv: /* 803D0810 003CC650 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -76,7 +76,7 @@ lbl_803D08C8: /* 803D0904 003CC744 D0 03 00 08 */ stfs f0, 8(r3) /* 803D0908 003CC748 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251381 $$251381: .incbin "baserom.dol", 0x49E7F0, 0x4 diff --git a/asm/src/SuperStop.s b/asm/src/SuperStop.s index a302f74f..daf8590d 100644 --- a/asm/src/SuperStop.s +++ b/asm/src/SuperStop.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss9SuperStopFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss9SuperStopFRQ43scn4step4boss4Boss: /* 80234648 00230488 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -142,7 +142,7 @@ lbl_80234804: /* 80234810 00230650 38 21 00 10 */ addi r1, r1, 0x10 /* 80234814 00230654 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy9SuperStopFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy9SuperStopFRQ43scn4step5enemy5Enemy: /* 8028DF54 00289D94 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -257,7 +257,7 @@ lbl_8028E0C0: /* 8028E0CC 00289F0C 38 21 00 10 */ addi r1, r1, 0x10 /* 8028E0D0 00289F10 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick9SuperStopFRQ33scn4step9ComponentRQ43scn4step5ostop5Actor __ct__Q43scn4step7gimmick9SuperStopFRQ33scn4step9ComponentRQ43scn4step5ostop5Actor: /* 802F79CC 002F380C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -408,7 +408,7 @@ lbl_802F7BA8: /* 802F7BB4 002F39F4 38 21 00 10 */ addi r1, r1, 0x10 /* 802F7BB8 002F39F8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item9SuperStopFRQ43scn4step4item4Item __ct__Q43scn4step4item9SuperStopFRQ43scn4step4item4Item: /* 803C52A0 003C10E0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -524,7 +524,7 @@ lbl_803C541C: /* 803C5428 003C1268 38 21 00 10 */ addi r1, r1, 0x10 /* 803C542C 003C126C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon9SuperStopFRQ43scn4step6weapon6Weapon __ct__Q43scn4step6weapon9SuperStopFRQ43scn4step6weapon6Weapon: /* 803D8E14 003D4C54 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -668,27 +668,27 @@ lbl_803D8FF0: /* 803D8FFC 003D4E3C 38 21 00 10 */ addi r1, r1, 0x10 /* 803D9000 003D4E40 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4boss9SuperStop __vt__Q43scn4step4boss9SuperStop: .incbin "baserom.dol", 0x460958, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy9SuperStop __vt__Q43scn4step5enemy9SuperStop: .incbin "baserom.dol", 0x46ED60, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step7gimmick9SuperStop __vt__Q43scn4step7gimmick9SuperStop: .incbin "baserom.dol", 0x47B078, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4item9SuperStop __vt__Q43scn4step4item9SuperStop: .incbin "baserom.dol", 0x48E030, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step6weapon9SuperStop __vt__Q43scn4step6weapon9SuperStop: .incbin "baserom.dol", 0x48FEE0, 0x18 diff --git a/asm/src/Switch.s b/asm/src/Switch.s index c01d0828..0759bc93 100644 --- a/asm/src/Switch.s +++ b/asm/src/Switch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global getConnectString__20$$2unnamed$$2Switch_cpp$$2FPCcPCc getConnectString__20$$2unnamed$$2Switch_cpp$$2FPCcPCc: /* 8032757C 003233BC 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -944,7 +944,7 @@ lbl_803281E0: /* 80328258 00324098 38 21 00 90 */ addi r1, r1, 0x90 /* 8032825C 0032409C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255943 $$255943: .incbin "baserom.dol", 0x47E5F0, 0x14 @@ -952,7 +952,7 @@ $$255943: __vt__Q53scn4step7gimmick8switch_n6Switch: .incbin "baserom.dol", 0x47E604, 0x24 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$255903 $$255903: .incbin "baserom.dol", 0x496D28, 0x8 @@ -972,7 +972,7 @@ $$256040: $$256041: .incbin "baserom.dol", 0x496D50, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256104 $$256104: .incbin "baserom.dol", 0x49D5E0, 0x8 diff --git a/asm/src/SwitchOnce.s b/asm/src/SwitchOnce.s index a6195169..ca2e9fa7 100644 --- a/asm/src/SwitchOnce.s +++ b/asm/src/SwitchOnce.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8switch_n10SwitchOnceFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick8switch_n10SwitchOnceFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80328260 003240A0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -63,12 +63,12 @@ onChangeOffToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv: onChangeToOn__Q53scn4step7gimmick8switch_n10SwitchOnceFv: /* 80328308 00324148 4B FF FB 7C */ b sendSwitchOn__Q53scn4step7gimmick8switch_n6SwitchFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick8switch_n10SwitchOnce __vt__Q53scn4step7gimmick8switch_n10SwitchOnce: .incbin "baserom.dol", 0x47E628, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252477 $$252477: .incbin "baserom.dol", 0x496D58, 0x8 diff --git a/asm/src/SwitchReceiver.s b/asm/src/SwitchReceiver.s index cda5b639..9dddd5ac 100644 --- a/asm/src/SwitchReceiver.s +++ b/asm/src/SwitchReceiver.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick14SwitchReceiverFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager __ct__Q43scn4step7gimmick14SwitchReceiverFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRQ43scn4step7gimmick21SwitchReceiverManager: /* 802F7BBC 002F39FC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -110,7 +110,7 @@ onSwitchOff__Q43scn4step7gimmick14SwitchReceiverFv: onSwitchOn__Q43scn4step7gimmick14SwitchReceiverFv: /* 802F7D00 002F3B40 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step7gimmick14SwitchReceiver __vt__Q43scn4step7gimmick14SwitchReceiver: .incbin "baserom.dol", 0x47B090, 0x20 diff --git a/asm/src/SwitchReceiverManager.s b/asm/src/SwitchReceiverManager.s index 61ebde72..4f5d1842 100644 --- a/asm/src/SwitchReceiverManager.s +++ b/asm/src/SwitchReceiverManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick21SwitchReceiverManagerFRQ33scn4step9Component __ct__Q43scn4step7gimmick21SwitchReceiverManagerFRQ33scn4step9Component: /* 802F7D04 002F3B44 90 83 00 00 */ stw r4, 0(r3) diff --git a/asm/src/SwitchReturn.s b/asm/src/SwitchReturn.s index fe98ebed..86fd7c4f 100644 --- a/asm/src/SwitchReturn.s +++ b/asm/src/SwitchReturn.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8switch_n12SwitchReturnFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick8switch_n12SwitchReturnFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8032830C 0032414C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -161,12 +161,12 @@ onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv: /* 80328500 00324340 38 21 00 10 */ addi r1, r1, 0x10 /* 80328504 00324344 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick8switch_n12SwitchReturn __vt__Q53scn4step7gimmick8switch_n12SwitchReturn: .incbin "baserom.dol", 0x47E650, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252608 $$252608: .incbin "baserom.dol", 0x496D60, 0x8 diff --git a/asm/src/SwitchToggle.s b/asm/src/SwitchToggle.s index 68d25250..82fbed37 100644 --- a/asm/src/SwitchToggle.s +++ b/asm/src/SwitchToggle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick8switch_n12SwitchToggleFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick8switch_n12SwitchToggleFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 80328508 00324348 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -112,12 +112,12 @@ onChangeToOn__Q53scn4step7gimmick8switch_n12SwitchToggleFv: onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchToggleFv: /* 80328648 00324488 4B FF FE 8C */ b onChangeToOff__Q53scn4step7gimmick8switch_n12SwitchReturnFv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick8switch_n12SwitchToggle __vt__Q53scn4step7gimmick8switch_n12SwitchToggle: .incbin "baserom.dol", 0x47E678, 0x28 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252602 $$252602: .incbin "baserom.dol", 0x496D68, 0x8 diff --git a/asm/src/Sword.s b/asm/src/Sword.s index 454a6a47..a89e2b1d 100644 --- a/asm/src/Sword.s +++ b/asm/src/Sword.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global T_PARAM__Q53scn4step4hero9modeldesc19$$2unnamed$$2Sword_cpp$$2Fv T_PARAM__Q53scn4step4hero9modeldesc19$$2unnamed$$2Sword_cpp$$2Fv: /* 8035CAB8 003588F8 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -272,7 +272,7 @@ SwordAnim__Q53scn4step4hero9modeldesc5SwordFv: /* 8035CE60 00358CA0 90 03 00 08 */ stw r0, 8(r3) /* 8035CE64 00358CA4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero5sword5SwordFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q53scn4step4hero5sword5SwordFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 80389CBC 00385AFC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -522,12 +522,12 @@ lbl_8038A028: /* 8038A034 00385E74 38 21 00 10 */ addi r1, r1, 0x10 /* 8038A038 00385E78 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2SwordAnim__Q53scn4step4hero9modeldesc5SwordFv$$2entries$$21 $$2LOCAL$$2SwordAnim__Q53scn4step4hero9modeldesc5SwordFv$$2entries$$21: .incbin "baserom.dol", 0x41BAC0, 0xB0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249844 $$249844: .incbin "baserom.dol", 0x487540, 0x20 @@ -595,7 +595,7 @@ $$249605: $$249606: .incbin "baserom.dol", 0x4876C4, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256365 $$256365: .incbin "baserom.dol", 0x4893F0, 0x20 @@ -606,7 +606,7 @@ $$256366: __vt__Q53scn4step4hero5sword5Sword: .incbin "baserom.dol", 0x489434, 0x5C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249578 $$249578: .incbin "baserom.dol", 0x497678, 0x8 @@ -629,7 +629,7 @@ $$249597: $$249607: .incbin "baserom.dol", 0x4976A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249876 $$249876: .incbin "baserom.dol", 0x49DB00, 0x8 diff --git a/asm/src/System.s b/asm/src/System.s index d94718a8..ec8c9649 100644 --- a/asm/src/System.s +++ b/asm/src/System.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23app6SystemFv __ct__Q23app6SystemFv: /* 8017BBDC 00177A1C 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/SystemSERequestor.s b/asm/src/SystemSERequestor.s index a1cc5ae0..fff739b4 100644 --- a/asm/src/SystemSERequestor.s +++ b/asm/src/SystemSERequestor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23snd17SystemSERequestorFv __ct__Q23snd17SystemSERequestorFv: /* 80403C74 003FFAB4 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/SystemTagProcessor.s b/asm/src/SystemTagProcessor.s index 7c7e5266..2ac7ad9f 100644 --- a/asm/src/SystemTagProcessor.s +++ b/asm/src/SystemTagProcessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Process__Q23lyt18SystemTagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 Process__Q23lyt18SystemTagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1: /* 801AE550 001AA390 94 21 FF 00 */ stwu r1, -0x100(r1) @@ -1644,7 +1644,7 @@ applyScale__Q23lyt18SystemTagProcessorCFPQ34nw4r2ut15PrintContext$$0w$$1Us: /* 801AFC68 001ABAA8 38 21 00 20 */ addi r1, r1, 0x20 /* 801AFC6C 001ABAAC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23lyt18SystemTagProcessor __vt__Q23lyt18SystemTagProcessor: .incbin "baserom.dol", 0x453B00, 0x14 @@ -1727,7 +1727,7 @@ $$2STRING$$2GetCursorY__Q34nw4r2ut10CharWriterCFv$$20: $$2STRING$$2GetCursorY__Q34nw4r2ut10CharWriterCFv: .incbin "baserom.dol", 0x453E8C, 0x14 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250358 $$250358: .incbin "baserom.dol", 0x49A4D8, 0x4 diff --git a/asm/src/TPL.s b/asm/src/TPL.s index dc60c8e7..40497b6f 100644 --- a/asm/src/TPL.s +++ b/asm/src/TPL.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HALTPLBind__FP10TPLPalette HALTPLBind__FP10TPLPalette: /* 80174AF8 00170938 80 83 00 08 */ lwz r4, 8(r3) diff --git a/asm/src/TPLTexture.s b/asm/src/TPLTexture.s index 6eaff95c..b940f7cc 100644 --- a/asm/src/TPLTexture.s +++ b/asm/src/TPLTexture.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global texObj__Q23gfx10TextureObjCFv texObj__Q23gfx10TextureObjCFv: /* 80196F38 00192D78 38 A3 FF FC */ addi r5, r3, -4 @@ -74,7 +74,7 @@ lbl_80196FFC: /* 8019701C 00192E5C 38 21 00 10 */ addi r1, r1, 0x10 /* 80197020 00192E60 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23gfx10TPLTexture __vt__Q23gfx10TPLTexture: .incbin "baserom.dol", 0x450A90, 0xC diff --git a/asm/src/TPLTexturePlate.s b/asm/src/TPLTexturePlate.s index 9dbe515d..bee7e1cb 100644 --- a/asm/src/TPLTexturePlate.s +++ b/asm/src/TPLTexturePlate.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23gfx15TPLTexturePlateFPv __ct__Q23gfx15TPLTexturePlateFPv: /* 80197024 00192E64 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -320,7 +320,7 @@ setPos__Q23gfx15TPLTexturePlateFRCQ33hel4math7Vector2: /* 801974B8 001932F8 C0 62 97 B8 */ lfs f3, $$250129-_SDA2_BASE_(r2) /* 801974BC 001932FC 4B E9 96 A4 */ b PSMTXTrans -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250129 $$250129: .incbin "baserom.dol", 0x49A278, 0x4 diff --git a/asm/src/TSCtrl.s b/asm/src/TSCtrl.s index 64ce831e..041c982d 100644 --- a/asm/src/TSCtrl.s +++ b/asm/src/TSCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setTrunkScale__Q53scn4step4boss6whispy6TSCtrlFf setTrunkScale__Q53scn4step4boss6whispy6TSCtrlFf: /* 8025F188 0025AFC8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -109,12 +109,12 @@ setBaseScale__Q53scn4step4boss6whispy6TSCtrlFRCQ33hel4math7Vector3: /* 8025F308 0025B148 38 21 00 30 */ addi r1, r1, 0x30 /* 8025F30C 0025B14C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_TRUNKNODE_TABLE__Q53scn4step4boss6whispy20$$2unnamed$$2TSCtrl_cpp$$2 T_TRUNKNODE_TABLE__Q53scn4step4boss6whispy20$$2unnamed$$2TSCtrl_cpp$$2: .incbin "baserom.dol", 0x4137C8, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254977 $$254977: .incbin "baserom.dol", 0x49B570, 0x8 diff --git a/asm/src/Table.s b/asm/src/Table.s index 51b976ce..95ec0968 100644 --- a/asm/src/Table.s +++ b/asm/src/Table.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GenContextAt__Q43scn19challengefileselect6effect5TableFQ43scn19challengefileselect6effect4Kind GenContextAt__Q43scn19challengefileselect6effect5TableFQ43scn19challengefileselect6effect4Kind: /* 801EA0D0 001E5F10 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -49,7 +49,7 @@ PtclResPath__Q43scn19challengefileselect6effect5TableFQ43scn19challengefileselec /* 801EA160 001E5FA0 80 63 00 04 */ lwz r3, 4(r3) /* 801EA164 001E5FA4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GenContextAt__Q43scn14challengetitle6effect5TableFQ43scn14challengetitle6effect4Kind GenContextAt__Q43scn14challengetitle6effect5TableFQ43scn14challengetitle6effect4Kind: /* 801F045C 001EC29C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -119,7 +119,7 @@ PtclResPath__Q43scn14challengetitle6effect5TableFQ43scn14challengetitle6effect11 /* 801F0540 001EC380 80 63 00 04 */ lwz r3, 4(r3) /* 801F0544 001EC384 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GenContextAt__Q43scn15challengeresult6effect5TableFQ43scn15challengeresult6effect4Kind GenContextAt__Q43scn15challengeresult6effect5TableFQ43scn15challengeresult6effect4Kind: /* 801F1484 001ED2C4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -194,7 +194,7 @@ PtclResPath__Q43scn15challengeresult6effect5TableFQ43scn15challengeresult6effect /* 801F157C 001ED3BC 80 63 00 04 */ lwz r3, 4(r3) /* 801F1580 001ED3C0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GenContextAt__Q43scn10grandtitle6effect5TableFQ43scn10grandtitle6effect4Kind GenContextAt__Q43scn10grandtitle6effect5TableFQ43scn10grandtitle6effect4Kind: /* 80206D50 00202B90 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -335,7 +335,7 @@ PolyResPath__Q43scn10grandtitle6effect5TableFQ43scn10grandtitle6effect11PolyResS /* 80206F44 00202D84 7C 63 00 2E */ lwzx r3, r3, r0 /* 80206F48 00202D88 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GenContextAt__Q43scn7history6effect5TableFQ43scn7history6effect4Kind GenContextAt__Q43scn7history6effect5TableFQ43scn7history6effect4Kind: /* 8021B648 00217488 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -448,7 +448,7 @@ PolyResPath__Q43scn7history6effect5TableFQ43scn7history6effect11PolyResSlot: /* 8021B7CC 0021760C 7C 63 00 2E */ lwzx r3, r3, r0 /* 8021B7D0 00217610 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_genContextHeader__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2Fv t_genContextHeader__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2Fv: /* 8027B128 00276F68 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3614,7 +3614,7 @@ PolyResPath__Q43scn4step6effect5TableFQ43scn4step6effect11PolyResSlot: /* 8027E254 0027A094 7C 63 00 2E */ lwzx r3, r3, r0 /* 8027E258 0027A098 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GenContextAt__Q43scn9grandmenu6effect5TableFQ43scn9grandmenu6effect4Kind GenContextAt__Q43scn9grandmenu6effect5TableFQ43scn9grandmenu6effect4Kind: /* 803F454C 003F038C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -3672,7 +3672,7 @@ PtclResPath__Q43scn9grandmenu6effect5TableFQ43scn9grandmenu6effect11PtclResSlot: /* 803F4600 003F0440 80 63 00 04 */ lwz r3, 4(r3) /* 803F4604 003F0444 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x4119C8, 0x18 @@ -3680,17 +3680,17 @@ T_PTCL_INFOS__Q43scn14challengetitle6effect19$$2unnamed$$2Table_cpp$$2: T_PTCL_INFOS__Q43scn15challengeresult6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x4119E0, 0x10 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x412270, 0x18 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PTCL_INFOS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x413C00, 0x1D8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 $$248738: .incbin "baserom.dol", 0x45AA68, 0xC @@ -3701,7 +3701,7 @@ $$248739: $$248839: .incbin "baserom.dol", 0x45AA8C, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 $$248738: .incbin "baserom.dol", 0x45B038, 0x10 @@ -3727,7 +3727,7 @@ $$248855: $$248856: .incbin "baserom.dol", 0x45B0DC, 0x14 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248739 $$248739: .incbin "baserom.dol", 0x45B128, 0x10 @@ -3750,7 +3750,7 @@ $$248851: $$248852: .incbin "baserom.dol", 0x45B1BC, 0x24 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 $$248738: .incbin "baserom.dol", 0x45CC38, 0x10 @@ -3806,7 +3806,7 @@ $$248888: $$248889: .incbin "baserom.dol", 0x45CDA8, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248739 $$248739: .incbin "baserom.dol", 0x45F6A0, 0x18 @@ -3850,7 +3850,7 @@ $$248874: $$248875: .incbin "baserom.dol", 0x45F7B0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250167 $$250167: .incbin "baserom.dol", 0x468990, 0x10 @@ -5793,7 +5793,7 @@ $$248907: T_POLY_RESPATHS__Q43scn4step6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x46C230, 0xD0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248738 $$248738: .incbin "baserom.dol", 0x4917F0, 0xC @@ -5807,7 +5807,7 @@ $$248845: $$248846: .incbin "baserom.dol", 0x491828, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248740 $$248740: .incbin "baserom.dol", 0x4941B8, 0x8 @@ -5815,12 +5815,12 @@ $$248740: $$248742: .incbin "baserom.dol", 0x4941C0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248738 $$248738: .incbin "baserom.dol", 0x4941D0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global T_POLY_RESPATHS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2 T_POLY_RESPATHS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x494858, 0x8 @@ -5828,7 +5828,7 @@ T_POLY_RESPATHS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2: $$248890: .incbin "baserom.dol", 0x494860, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248738 $$248738: .incbin "baserom.dol", 0x495108, 0x8 @@ -5842,7 +5842,7 @@ T_POLY_RESPATHS__Q43scn7history6effect19$$2unnamed$$2Table_cpp$$2: $$248876: .incbin "baserom.dol", 0x495120, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250606 $$250606: .incbin "baserom.dol", 0x495878, 0x4 @@ -6003,7 +6003,7 @@ $$248848: $$248854: .incbin "baserom.dol", 0x4959F8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn19challengefileselect6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x49A8D0, 0x8 @@ -6014,7 +6014,7 @@ $$248833: lbl_8055FD9C: .incbin "baserom.dol", 0x49A8DC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248847 $$248847: .incbin "baserom.dol", 0x49A960, 0x4 @@ -6022,7 +6022,7 @@ $$248847: lbl_8055FE24: .incbin "baserom.dol", 0x49A964, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248842 $$248842: .incbin "baserom.dol", 0x49A9A0, 0x4 @@ -6030,7 +6030,7 @@ $$248842: lbl_8055FE64: .incbin "baserom.dol", 0x49A9A4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn10grandtitle6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x49AB38, 0x8 @@ -6041,7 +6041,7 @@ $$248870: lbl_80560004: .incbin "baserom.dol", 0x49AB44, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$248862 $$248862: .incbin "baserom.dol", 0x49AD30, 0x4 @@ -6049,7 +6049,7 @@ $$248862: lbl_805601F4: .incbin "baserom.dol", 0x49AD34, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250163 $$250163: .incbin "baserom.dol", 0x49B928, 0x4 @@ -6057,7 +6057,7 @@ $$250163: lbl_80560DEC: .incbin "baserom.dol", 0x49B92C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_PTCL_INFOS__Q43scn9grandmenu6effect19$$2unnamed$$2Table_cpp$$2 T_PTCL_INFOS__Q43scn9grandmenu6effect19$$2unnamed$$2Table_cpp$$2: .incbin "baserom.dol", 0x49ED70, 0x8 diff --git a/asm/src/TagProcessor.s b/asm/src/TagProcessor.s index 5b43e801..40ad9d99 100644 --- a/asm/src/TagProcessor.s +++ b/asm/src/TagProcessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Process__Q23lyt12TagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1 Process__Q23lyt12TagProcessorFUsPQ34nw4r2ut15PrintContext$$0w$$1: /* 801AFC70 001ABAB0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -120,7 +120,7 @@ setUseButtonPushedChar__Q23lyt12TagProcessorFb: /* 801AFDEC 001ABC2C 38 63 00 14 */ addi r3, r3, 0x14 /* 801AFDF0 001ABC30 48 00 13 E0 */ b setUsePrivateCharButtonPushed__Q23lyt16UserTagProcessorFb -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23lyt12TagProcessor __vt__Q23lyt12TagProcessor: .incbin "baserom.dol", 0x453EA0, 0x18 diff --git a/asm/src/TagUtil.s b/asm/src/TagUtil.s index e7a6d4cb..fac98025 100644 --- a/asm/src/TagUtil.s +++ b/asm/src/TagUtil.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global scan__Q33lyt7TagUtil14StringIteratorFPCw scan__Q33lyt7TagUtil14StringIteratorFPCw: /* 801AFDF4 001ABC34 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -267,7 +267,7 @@ onEndTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUs: onStartTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUsUsPUc: /* 801B0128 001ABF68 4B FF FF F0 */ b onEndTag__Q33lyt7TagUtil25Iterator$48809TagUtil_cppFPCwUlUsUs -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q33lyt7TagUtil25Iterator$48859TagUtil_cpp __vt__Q33lyt7TagUtil25Iterator$48859TagUtil_cpp: .incbin "baserom.dol", 0x453EB8, 0x14 diff --git a/asm/src/TalkManager.s b/asm/src/TalkManager.s index e3574de7..e93a05b2 100644 --- a/asm/src/TalkManager.s +++ b/asm/src/TalkManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step7gimmick11TalkManagerFRQ33scn4step9Component __ct__Q43scn4step7gimmick11TalkManagerFRQ33scn4step9Component: /* 802F8084 002F3EC4 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -189,7 +189,7 @@ lbl_802F82FC: /* 802F830C 002F414C 38 21 00 20 */ addi r1, r1, 0x20 /* 802F8310 002F4150 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252113 $$252113: .incbin "baserom.dol", 0x47B0B0, 0x1C @@ -197,7 +197,7 @@ $$252113: $$252114: .incbin "baserom.dol", 0x47B0CC, 0x24 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252115 $$252115: .incbin "baserom.dol", 0x49D118, 0x4 diff --git a/asm/src/Target.s b/asm/src/Target.s index 262938f1..86c0dc69 100644 --- a/asm/src/Target.s +++ b/asm/src/Target.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24gobj6TargetFRCQ24gobj10TargetDesc __ct__Q24gobj6TargetFRCQ24gobj10TargetDesc: /* 8019C094 00197ED4 88 04 00 00 */ lbz r0, 0(r4) @@ -61,7 +61,7 @@ invert__Q24gobj6TargetFv: /* 8019C144 00197F84 98 03 00 00 */ stb r0, 0(r3) /* 8019C148 00197F88 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250757 $$250757: .incbin "baserom.dol", 0x49A2F0, 0x4 diff --git a/asm/src/TargetDesc.s b/asm/src/TargetDesc.s index 03db5150..15ffc288 100644 --- a/asm/src/TargetDesc.s +++ b/asm/src/TargetDesc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Create__Q24gobj10TargetDescFb Create__Q24gobj10TargetDescFb: /* 8019C14C 00197F8C 54 60 06 3E */ clrlwi r0, r3, 0x18 diff --git a/asm/src/TargetScorePanel.s b/asm/src/TargetScorePanel.s index 68a22d7a..446c774b 100644 --- a/asm/src/TargetScorePanel.s +++ b/asm/src/TargetScorePanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info5lvmap16TargetScorePanelFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component __ct__Q53scn4step4info5lvmap16TargetScorePanelFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component: /* 803BFD88 003BBBC8 94 21 FF 30 */ stwu r1, -0xd0(r1) @@ -475,7 +475,7 @@ lbl_803C03F0: /* 803C0410 003BC250 38 21 03 F0 */ addi r1, r1, 0x3f0 /* 803C0414 003BC254 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251706 $$251706: .incbin "baserom.dol", 0x41C200, 0x18 @@ -483,7 +483,7 @@ $$251706: $$252072: .incbin "baserom.dol", 0x41C218, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251701 $$251701: .incbin "baserom.dol", 0x48DC70, 0x10 @@ -527,7 +527,7 @@ $$252772: $$252773: .incbin "baserom.dol", 0x48DD48, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252734 $$252734: .incbin "baserom.dol", 0x4980F8, 0x8 diff --git a/asm/src/TexBuffer.s b/asm/src/TexBuffer.s index 4a880a9e..5555090c 100644 --- a/asm/src/TexBuffer.s +++ b/asm/src/TexBuffer.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23gfx9TexBufferFRQ23mem10IAllocatorUsUs9_GXTexFmt __ct__Q23gfx9TexBufferFRQ23mem10IAllocatorUsUs9_GXTexFmt: /* 80196E2C 00192C6C 94 21 FF C0 */ stwu r1, -0x40(r1) diff --git a/asm/src/Text.s b/asm/src/Text.s index 732a044e..ecd03d8b 100644 --- a/asm/src/Text.s +++ b/asm/src/Text.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail4TextFRQ23mem10IAllocator __ct__Q43scn7history6detail4TextFRQ23mem10IAllocator: /* 8021A7D8 00216618 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -779,12 +779,12 @@ hideAllText__Q43scn7history6detail4TextFv: /* 8021B2D8 00217118 38 21 00 20 */ addi r1, r1, 0x20 /* 8021B2DC 0021711C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global COPYRIGHT_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2 COPYRIGHT_TABLE__Q43scn7history6detail18$$2unnamed$$2Text_cpp$$2: .incbin "baserom.dol", 0x412188, 0xE8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251808 $$251808: .incbin "baserom.dol", 0x45F0E8, 0xC @@ -933,7 +933,7 @@ $$2STRING$$2SetTexSRT__Q34nw4r3lyt8MaterialFUlRCQ34nw4r3lyt6TexSRT$$20: $$2STRING$$2SetTexSRT__Q34nw4r3lyt8MaterialFUlRCQ34nw4r3lyt6TexSRT: .incbin "baserom.dol", 0x45F608, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251800 $$251800: .incbin "baserom.dol", 0x494FE8, 0x8 diff --git a/asm/src/Thread.s b/asm/src/Thread.s index 75c37e0b..3b6f3262 100644 --- a/asm/src/Thread.s +++ b/asm/src/Thread.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetCurrentThreadPriority__Q24util6ThreadFv GetCurrentThreadPriority__Q24util6ThreadFv: /* 80405F14 00401D54 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/ThreadCtrl.s b/asm/src/ThreadCtrl.s index 681049a3..679e60f4 100644 --- a/asm/src/ThreadCtrl.s +++ b/asm/src/ThreadCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q53scn4step6weapon10comothread6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q53scn4step6weapon10comothread6Custom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 802A85F8 002A4438 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -581,7 +581,7 @@ lbl_802A8E30: /* 802A8E40 002A4C80 38 21 00 30 */ addi r1, r1, 0x30 /* 802A8E44 002A4C84 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258039 $$258039: .incbin "baserom.dol", 0x49C118, 0x4 diff --git a/asm/src/Ticker.s b/asm/src/Ticker.s index 11dbc8aa..b18fe48b 100644 --- a/asm/src/Ticker.s +++ b/asm/src/Ticker.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info6ticker6TickerFRCQ34info6ticker13TickerContext __ct__Q34info6ticker6TickerFRCQ34info6ticker13TickerContext: /* 801ABA4C 001A788C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -443,7 +443,7 @@ scrollWindowWidth__Q34info6ticker6TickerFv: /* 801AC050 001A7E90 38 21 00 10 */ addi r1, r1, 0x10 /* 801AC054 001A7E94 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252326 $$252326: .incbin "baserom.dol", 0x49A4A8, 0x4 diff --git a/asm/src/TickerContext.s b/asm/src/TickerContext.s index 327559af..dcb18ac1 100644 --- a/asm/src/TickerContext.s +++ b/asm/src/TickerContext.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global DefaultScrollSpeed__Q34info6ticker13TickerContextFv DefaultScrollSpeed__Q34info6ticker13TickerContextFv: /* 801AC058 001A7E98 C0 22 99 F8 */ lfs f1, $$252069-_SDA2_BASE_(r2) @@ -42,7 +42,7 @@ __ct__Q34info6ticker13TickerContextFQ23lyt12PaneAccessorQ23lyt12PaneAccessorfUlU /* 801AC0D0 001A7F10 38 21 00 30 */ addi r1, r1, 0x30 /* 801AC0D4 001A7F14 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$252069 $$252069: .incbin "baserom.dol", 0x49A4B8, 0x8 diff --git a/asm/src/Time.s b/asm/src/Time.s index 1b32d71e..0fb5a237 100644 --- a/asm/src/Time.s +++ b/asm/src/Time.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge4TimeFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge4TimeFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B5888 003B16C8 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -133,7 +133,7 @@ set__Q53scn4step4info9challenge4TimeFUl: /* 803B5A5C 003B189C 38 21 04 E0 */ addi r1, r1, 0x4e0 /* 803B5A60 003B18A0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252024 $$252024: .incbin "baserom.dol", 0x48C998, 0x14 @@ -141,7 +141,7 @@ $$252024: $$252084: .incbin "baserom.dol", 0x48C9AC, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252025 $$252025: .incbin "baserom.dol", 0x497C90, 0x8 diff --git a/asm/src/TimeString.s b/asm/src/TimeString.s index e47aeec5..c7815a90 100644 --- a/asm/src/TimeString.s +++ b/asm/src/TimeString.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn15challengeresult4info10TimeStringFPCwiii __ct__Q43scn15challengeresult4info10TimeStringFPCwiii: /* 801F4FB4 001F0DF4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -214,7 +214,7 @@ onEndTag__Q43scn15challengeresult4info10TimeStringFPCwUlUsUs: onNormalChar__Q43scn15challengeresult4info10TimeStringFw: /* 801F52A8 001F10E8 4B FB 05 5C */ b onNormalChar__Q24info22Iterator$52705Util_cppFw -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249497 $$249497: .incbin "baserom.dol", 0x45B810, 0xC @@ -225,7 +225,7 @@ $$249499: __vt__Q43scn15challengeresult4info10TimeString: .incbin "baserom.dol", 0x45B828, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249495 $$249495: .incbin "baserom.dol", 0x494368, 0x8 diff --git a/asm/src/TimeUp.s b/asm/src/TimeUp.s index 19958322..273926ac 100644 --- a/asm/src/TimeUp.s +++ b/asm/src/TimeUp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4info9challenge6TimeUpFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q53scn4step4info9challenge6TimeUpFRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803B5A64 003B18A4 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -116,12 +116,12 @@ lbl_803B5BEC: /* 803B5BF8 003B1A38 38 21 00 10 */ addi r1, r1, 0x10 /* 803B5BFC 003B1A3C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251948 $$251948: .incbin "baserom.dol", 0x48C9B8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251949 $$251949: .incbin "baserom.dol", 0x497CB8, 0x8 diff --git a/asm/src/TitleInfo.s b/asm/src/TitleInfo.s index b62a16dc..63b63c0c 100644 --- a/asm/src/TitleInfo.s +++ b/asm/src/TitleInfo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn14challengetitle9TitleInfoFRQ33scn14challengetitle9Component __ct__Q33scn14challengetitle9TitleInfoFRQ33scn14challengetitle9Component: /* 801EFDE8 001EBC28 94 21 FE 60 */ stwu r1, -0x1a0(r1) @@ -457,7 +457,7 @@ lbl_801F03C8: /* 801F0454 001EC294 38 21 00 80 */ addi r1, r1, 0x80 /* 801F0458 001EC298 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn10grandtitle9TitleInfoFRQ33scn10grandtitle9Component __ct__Q33scn10grandtitle9TitleInfoFRQ33scn10grandtitle9Component: /* 80206658 00202498 94 21 FE 80 */ stwu r1, -0x180(r1) @@ -952,7 +952,7 @@ lbl_80206D3C: /* 80206D48 00202B88 38 21 00 10 */ addi r1, r1, 0x10 /* 80206D4C 00202B8C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252920 $$252920: .incbin "baserom.dol", 0x45AF88, 0x14 @@ -981,7 +981,7 @@ $$253793: $$253794: .incbin "baserom.dol", 0x45AFFC, 0x3C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252919 $$252919: .incbin "baserom.dol", 0x45CB98, 0x10 @@ -1007,7 +1007,7 @@ $$253844: $$253845: .incbin "baserom.dol", 0x45CBFC, 0x3C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253700 $$253700: .incbin "baserom.dol", 0x494188, 0x8 @@ -1027,7 +1027,7 @@ $$253765: $$253795: .incbin "baserom.dol", 0x4941B0, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253746 $$253746: .incbin "baserom.dol", 0x494828, 0x8 @@ -1047,7 +1047,7 @@ $$253812: $$253846: .incbin "baserom.dol", 0x494850, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn14challengetitle23$$2unnamed$$2TitleInfo_cpp$$2 T_LYT_RES_PATH__Q33scn14challengetitle23$$2unnamed$$2TitleInfo_cpp$$2: .incbin "baserom.dol", 0x49A958, 0x4 @@ -1055,7 +1055,7 @@ T_LYT_RES_PATH__Q33scn14challengetitle23$$2unnamed$$2TitleInfo_cpp$$2: $$253755: .incbin "baserom.dol", 0x49A95C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_LYT_RES_PATH__Q33scn10grandtitle23$$2unnamed$$2TitleInfo_cpp$$2 T_LYT_RES_PATH__Q33scn10grandtitle23$$2unnamed$$2TitleInfo_cpp$$2: .incbin "baserom.dol", 0x49AB30, 0x4 diff --git a/asm/src/TotalScore.s b/asm/src/TotalScore.s index a036fc20..7d4251b4 100644 --- a/asm/src/TotalScore.s +++ b/asm/src/TotalScore.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global hideAllPane__Q34info6common24$$2unnamed$$2TotalScore_cpp$$2FRQ23lyt6Layout hideAllPane__Q34info6common24$$2unnamed$$2TotalScore_cpp$$2FRQ23lyt6Layout: /* 801AA56C 001A63AC 94 21 FC B0 */ stwu r1, -0x350(r1) @@ -417,7 +417,7 @@ lbl_801AAB40: /* 801AAB50 001A6990 38 21 03 B0 */ addi r1, r1, 0x3b0 /* 801AAB54 001A6994 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn15challengeresult4info10TotalScore5BonusFRQ23mem10IAllocatorQ23lyt12PaneAccessor __ct__Q53scn15challengeresult4info10TotalScore5BonusFRQ23mem10IAllocatorQ23lyt12PaneAccessor: /* 801F52AC 001F10EC 94 21 FE 90 */ stwu r1, -0x170(r1) @@ -1878,7 +1878,7 @@ lbl_801F6768: /* 801F6778 001F25B8 38 21 07 E0 */ addi r1, r1, 0x7e0 /* 801F677C 001F25BC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q73scn4step4info9challenge12masterresult10TotalScore5BonusFRQ23mem10IAllocatorQ23lyt12PaneAccessor __ct__Q73scn4step4info9challenge12masterresult10TotalScore5BonusFRQ23mem10IAllocatorQ23lyt12PaneAccessor: /* 803B84F8 003B4338 94 21 FE 90 */ stwu r1, -0x170(r1) @@ -3290,7 +3290,7 @@ lbl_803B991C: /* 803B992C 003B576C 38 21 07 E0 */ addi r1, r1, 0x7e0 /* 803B9930 003B5770 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global NAMES__Q34info6common24$$2unnamed$$2TotalScore_cpp$$2 NAMES__Q34info6common24$$2unnamed$$2TotalScore_cpp$$2: .incbin "baserom.dol", 0x453740, 0x18 @@ -3310,7 +3310,7 @@ $$252629: $$252630: .incbin "baserom.dol", 0x453794, 0x3C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256054 $$256054: .incbin "baserom.dol", 0x45B840, 0x18 @@ -3372,7 +3372,7 @@ $$256527: $$256530: .incbin "baserom.dol", 0x45B93C, 0x4C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256014 $$256014: .incbin "baserom.dol", 0x48CE70, 0x14 @@ -3434,7 +3434,7 @@ $$256440: $$256443: .incbin "baserom.dol", 0x48CF68, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251545 $$251545: .incbin "baserom.dol", 0x4934B0, 0x8 @@ -3454,7 +3454,7 @@ $$252572: $$252573: .incbin "baserom.dol", 0x4934D8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256057 $$256057: .incbin "baserom.dol", 0x494388, 0x8 @@ -3495,7 +3495,7 @@ $$256522: $$256523: .incbin "baserom.dol", 0x4943D8, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$256017 $$256017: .incbin "baserom.dol", 0x497DD0, 0x8 @@ -3536,7 +3536,7 @@ $$256435: $$256436: .incbin "baserom.dol", 0x497E20, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256157 $$256157: .incbin "baserom.dol", 0x49A9B0, 0x4 @@ -3565,7 +3565,7 @@ $$256520: $$256521: .incbin "baserom.dol", 0x49A9D0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256117 $$256117: .incbin "baserom.dol", 0x49E4A8, 0x4 diff --git a/asm/src/TotalScorePanel.s b/asm/src/TotalScorePanel.s index fec0c822..243c992c 100644 --- a/asm/src/TotalScorePanel.s +++ b/asm/src/TotalScorePanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info15TotalScorePanelFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor __ct__Q43scn4step4info15TotalScorePanelFRQ33scn4step9ComponentRQ23mem10IAllocatorRCQ23lyt12PaneAccessor: /* 803AFAE0 003AB920 94 21 FE D0 */ stwu r1, -0x130(r1) @@ -439,7 +439,7 @@ lbl_803B00E8: /* 803B00F8 003ABF38 38 21 00 50 */ addi r1, r1, 0x50 /* 803B00FC 003ABF3C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252167 $$252167: .incbin "baserom.dol", 0x41BEF8, 0x18 @@ -447,7 +447,7 @@ $$252167: $$252187: .incbin "baserom.dol", 0x41BF10, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252619 $$252619: .incbin "baserom.dol", 0x48C0F8, 0x20 @@ -482,7 +482,7 @@ $$252185: $$252186: .incbin "baserom.dol", 0x48C198, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252624 $$252624: .incbin "baserom.dol", 0x497AB8, 0x8 diff --git a/asm/src/Trophy.s b/asm/src/Trophy.s index 00b2e3d9..777a1090 100644 --- a/asm/src/Trophy.s +++ b/asm/src/Trophy.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q33scn19challengefileselect6TrophyFRQ23mem10IAllocatorRQ23g3d17ResFileRepositoryRQ23g3d4RootUl __ct__Q33scn19challengefileselect6TrophyFRQ23mem10IAllocatorRQ23g3d17ResFileRepositoryRQ23g3d4RootUl: /* 801E9478 001E52B8 94 21 FB 80 */ stwu r1, -0x480(r1) @@ -861,15 +861,15 @@ __sinit_$$3Trophy_cpp: /* 801EA0C8 001E5F08 C0 62 9E 08 */ lfs f3, $$254071-_SDA2_BASE_(r2) /* 801EA0CC 001E5F0C 4B ED 3F F4 */ b __ct__Q34nw4r4math4VEC3Ffff -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402448, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$252758 $$252758: .incbin "baserom.dol", 0x4116F8, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252317 $$252317: .incbin "baserom.dol", 0x45A978, 0x10 @@ -898,7 +898,7 @@ $$253903: $$253908: .incbin "baserom.dol", 0x45AA1C, 0x4C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253905 $$253905: .incbin "baserom.dol", 0x494060, 0x4 @@ -909,7 +909,7 @@ $$253906: $$253909: .incbin "baserom.dol", 0x49406C, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global LAYER_DEPTH__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2 LAYER_DEPTH__Q33scn19challengefileselect20$$2unnamed$$2Trophy_cpp$$2: .incbin "baserom.dol", 0x49A898, 0x4 diff --git a/asm/src/Tutorial.s b/asm/src/Tutorial.s index 8eb570c9..98a928cc 100644 --- a/asm/src/Tutorial.s +++ b/asm/src/Tutorial.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn17challengetutorial4info8TutorialFRQ43scn17challengetutorial4info7ManagerRQ23mem10IAllocatorRQ23lyt6Layout __ct__Q43scn17challengetutorial4info8TutorialFRQ43scn17challengetutorial4info7ManagerRQ23mem10IAllocatorRQ23lyt6Layout: /* 801F9D28 001F5B68 94 21 FC D0 */ stwu r1, -0x330(r1) @@ -3570,12 +3570,12 @@ lbl_801FD0B0: /* 801FD0C0 001F8F00 42 00 FF F0 */ bdnz lbl_801FD0B0 /* 801FD0C4 001F8F04 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_PageDataNormal__Q33scn17challengetutorial4info T_PageDataNormal__Q33scn17challengetutorial4info: .incbin "baserom.dol", 0x411B18, 0xC0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258272 $$258272: .incbin "baserom.dol", 0x45BDF8, 0x18 @@ -3778,7 +3778,7 @@ $$259100: $$259119: .incbin "baserom.dol", 0x45C298, 0x50 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258281 $$258281: .incbin "baserom.dol", 0x494550, 0x8 diff --git a/asm/src/UIntAABBox.s b/asm/src/UIntAABBox.s index 624dc3a4..62ec82db 100644 --- a/asm/src/UIntAABBox.s +++ b/asm/src/UIntAABBox.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q24util10UIntAABBoxFv __ct__Q24util10UIntAABBoxFv: /* 8040603C 00401E7C 38 00 FF FF */ li r0, -1 @@ -155,7 +155,7 @@ getContract__Q24util10UIntAABBoxCFRCQ24util10UIntAABBox: /* 80406258 00402098 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8040625C 0040209C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250237 $$250237: .incbin "baserom.dol", 0x49EEE8, 0x4 diff --git a/asm/src/UnitHeapMapUser.s b/asm/src/UnitHeapMapUser.s index 4a0d1175..35526ffc 100644 --- a/asm/src/UnitHeapMapUser.s +++ b/asm/src/UnitHeapMapUser.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23mem15UnitHeapMapUserFRCQ23mem8HeapUnit __ct__Q23mem15UnitHeapMapUserFRCQ23mem8HeapUnit: /* 801BF7AC 001BB5EC 3C A0 80 46 */ lis r5, __vt__Q23mem15UnitHeapMapUser@ha @@ -192,12 +192,12 @@ drawUsedBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nre drawFragmentBlocks__Q23mem15UnitHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer: /* 801BFA2C 001BB86C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23mem15UnitHeapMapUser __vt__Q23mem15UnitHeapMapUser: .incbin "baserom.dol", 0x455E80, 0x30 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249027 $$249027: .incbin "baserom.dol", 0x49A700, 0x8 diff --git a/asm/src/Updater.s b/asm/src/Updater.s index a7745dd9..31323fa8 100644 --- a/asm/src/Updater.s +++ b/asm/src/Updater.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4core7UpdaterFRQ33scn4step9Component __ct__Q43scn4step4core7UpdaterFRQ33scn4step9Component: /* 802795F4 00275434 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/UserTagProcessor.s b/asm/src/UserTagProcessor.s index 62d5601d..50cd847b 100644 --- a/asm/src/UserTagProcessor.s +++ b/asm/src/UserTagProcessor.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global toPrivateChar__30$$2unnamed$$2UserTagProcessor_cpp$$2FPCcbbUl toPrivateChar__30$$2unnamed$$2UserTagProcessor_cpp$$2FPCcbbUl: /* 801B012C 001ABF6C 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1174,7 +1174,7 @@ setUsePrivateCharButtonPushed__Q23lyt16UserTagProcessorFb: /* 801B11D0 001AD010 98 83 00 09 */ stb r4, 9(r3) /* 801B11D4 001AD014 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global RANDOM_BUTTON_TABLE__30$$2unnamed$$2UserTagProcessor_cpp$$2 RANDOM_BUTTON_TABLE__30$$2unnamed$$2UserTagProcessor_cpp$$2: .incbin "baserom.dol", 0x410C70, 0x20 @@ -1182,7 +1182,7 @@ RANDOM_BUTTON_TABLE__30$$2unnamed$$2UserTagProcessor_cpp$$2: privateCharMap__30$$2unnamed$$2UserTagProcessor_cpp$$2: .incbin "baserom.dol", 0x410C90, 0xA0 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249204 $$249204: .incbin "baserom.dol", 0x453EE0, 0xC @@ -1277,7 +1277,7 @@ $$2STRING$$2GetGradationEndColor__Q34nw4r2ut10CharWriterCFv$$20: $$2STRING$$2GetGradationEndColor__Q34nw4r2ut10CharWriterCFv: .incbin "baserom.dol", 0x454168, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249205 $$249205: .incbin "baserom.dol", 0x493550, 0x4 diff --git a/asm/src/Util.s b/asm/src/Util.s index 9a5ceed6..f6e914fb 100644 --- a/asm/src/Util.s +++ b/asm/src/Util.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Normalized__8dynamicsFRCQ33hel4math7Vector3 Normalized__8dynamicsFRCQ33hel4math7Vector3: /* 8017D880 001796C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -404,7 +404,7 @@ lbl_8017DDF8: /* 8017DE00 00179C40 38 21 00 10 */ addi r1, r1, 0x10 /* 8017DE04 00179C44 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global equals__18$$2unnamed$$2Util_cpp$$2FPCcPCc equals__18$$2unnamed$$2Util_cpp$$2FPCcPCc: /* 801A4810 001A0650 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1788,7 +1788,7 @@ lbl_801A5B40: /* 801A5B50 001A1990 38 21 00 20 */ addi r1, r1, 0x20 /* 801A5B54 001A1994 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InScreen__Q43scn4step7gimmick4UtilFRQ33scn4step9ComponentRCQ33hel4math7Vector2f InScreen__Q43scn4step7gimmick4UtilFRQ33scn4step9ComponentRCQ33hel4math7Vector2f: /* 802F8314 002F4154 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -1833,12 +1833,12 @@ InScreen__Q43scn4step7gimmick4UtilFRQ33scn4step9ComponentRCQ33hel4math7Vector2f: /* 802F83B0 002F41F0 38 21 00 30 */ addi r1, r1, 0x30 /* 802F83B4 002F41F4 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$251998 $$251998: .incbin "baserom.dol", 0x410C40, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2AsinRad__Q24nw4r4mathFf$$20 $$2STRING$$2AsinRad__Q24nw4r4mathFf$$20: .incbin "baserom.dol", 0x44F268, 0x28 @@ -1846,7 +1846,7 @@ $$2STRING$$2AsinRad__Q24nw4r4mathFf$$20: $$2STRING$$2AsinRad__Q24nw4r4mathFf: .incbin "baserom.dol", 0x44F290, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global T_HERO_PANE_NAMES__18$$2unnamed$$2Util_cpp$$2 T_HERO_PANE_NAMES__18$$2unnamed$$2Util_cpp$$2: .incbin "baserom.dol", 0x453080, 0x1C @@ -1911,7 +1911,7 @@ $$2STRING$$2SetLineSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff$$20: $$2STRING$$2SetLineSpace__Q34nw4r2ut17TextWriterBase$$0w$$1Ff: .incbin "baserom.dol", 0x4532D4, 0x14 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251913 $$251913: .incbin "baserom.dol", 0x493288, 0x8 @@ -1961,7 +1961,7 @@ $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc$$20: $$2STRING$$2onStartTag__Q24info22Iterator$52503Util_cppFPCwUlUsUsUsPUc: .incbin "baserom.dol", 0x493300, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251710 $$251710: .incbin "baserom.dol", 0x49A148, 0x4 @@ -1993,7 +1993,7 @@ $$251845: $$251853: .incbin "baserom.dol", 0x49A16C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253983 $$253983: .incbin "baserom.dol", 0x49A478, 0x8 diff --git a/asm/src/Utility.s b/asm/src/Utility.s index 2b1cf001..4c24acaf 100644 --- a/asm/src/Utility.s +++ b/asm/src/Utility.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_path__Q24file21$$2unnamed$$2Utility_cpp$$2FPCc t_path__Q24file21$$2unnamed$$2Utility_cpp$$2FPCc: /* 80188BF4 00184A34 94 21 FF 40 */ stwu r1, -0xc0(r1) @@ -418,7 +418,7 @@ UncompressedFile__Q24file7UtilityFRCQ23mem8MemBlockRQ23mem10IAllocator: /* 80189174 00184FB4 38 21 00 20 */ addi r1, r1, 0x20 /* 80189178 00184FB8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SetupGXForLayout2D__Q23gfx7UtilityFff SetupGXForLayout2D__Q23gfx7UtilityFff: /* 801974C0 00193300 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -772,7 +772,7 @@ SetRenderType__Q23gfx7UtilityFQ33gfx13RenderSetting4Type: /* 801979A4 001937E4 38 21 00 10 */ addi r1, r1, 0x10 /* 801979A8 001937E8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Near__Q23lyt7UtilityFv Near__Q23lyt7UtilityFv: /* 801B11D8 001AD018 C0 22 9A 40 */ lfs f1, $$251538-_SDA2_BASE_(r2) @@ -915,7 +915,7 @@ SetupGX__Q23lyt7UtilityFv: /* 801B13A8 001AD1E8 38 21 00 60 */ addi r1, r1, 0x60 /* 801B13AC 001AD1EC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global MemSetU32__Q23mem7UtilityFRCQ23mem8MemBlockUl MemSetU32__Q23mem7UtilityFRCQ23mem8MemBlockUl: /* 801BFA30 001BB870 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -966,7 +966,7 @@ lbl_801BFACC: /* 801BFACC 001BB90C 38 21 00 10 */ addi r1, r1, 0x10 /* 801BFAD0 001BB910 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global RuntimeTypeInfoImpl$$0Q43scn4step5enemy7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo RuntimeTypeInfoImpl$$0Q43scn4step5enemy7ICustom$$1__Q23hel6commonFv_RCQ33hel6common15RuntimeTypeInfo: /* 80234818 00230658 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2443,7 +2443,7 @@ lbl_80235C28: /* 80235C50 00231A90 38 21 00 70 */ addi r1, r1, 0x70 /* 80235C54 00231A94 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetModelScaleBySizeType__Q43scn4step5enemy7UtilityFRCQ43scn4step5enemy5Enemy GetModelScaleBySizeType__Q43scn4step5enemy7UtilityFRCQ43scn4step5enemy5Enemy: /* 8028E0D4 00289F14 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -4573,7 +4573,7 @@ lbl_8028FE24: /* 8028FE4C 0028BC8C 38 21 00 60 */ addi r1, r1, 0x60 /* 8028FE50 0028BC90 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OnCapturedStart__Q53scn4step5enemy8captured7UtilityFPQ43scn4step5enemy5Enemy OnCapturedStart__Q53scn4step5enemy8captured7UtilityFPQ43scn4step5enemy5Enemy: /* 802A5068 002A0EA8 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -4822,7 +4822,7 @@ ConstraintPos__Q53scn4step5enemy8captured7UtilityFPQ43scn4step5enemy5Enemyf: /* 802A5408 002A1248 38 21 00 A0 */ addi r1, r1, 0xa0 /* 802A540C 002A124C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global EmDamageUtility_InitTarget__Q53scn4step5enemy6damage7UtilityFPQ43scn4step5enemy5Enemy EmDamageUtility_InitTarget__Q53scn4step5enemy6damage7UtilityFPQ43scn4step5enemy5Enemy: /* 802AC250 002A8090 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -5576,7 +5576,7 @@ lbl_802ACCD4: /* 802ACCFC 002A8B3C 38 21 00 20 */ addi r1, r1, 0x20 /* 802ACD00 002A8B40 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Generate3Waddledee__Q53scn4step5enemy9waddledee7UtilityFRQ43scn4step5enemy5EnemybQ43scn4step3map17BinEnemyVariation Generate3Waddledee__Q53scn4step5enemy9waddledee7UtilityFRQ43scn4step5enemy5EnemybQ43scn4step3map17BinEnemyVariation: /* 802EF2C4 002EB104 94 21 FE C0 */ stwu r1, -0x140(r1) @@ -5928,7 +5928,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1Fv: /* 802EF7C8 002EB608 4B F3 EE D8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global SceneChangeDead__Q43scn4step4hero7UtilityFRQ43scn4step4hero4Hero SceneChangeDead__Q43scn4step4hero7UtilityFRQ43scn4step4hero4Hero: /* 803561AC 00351FEC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -8762,7 +8762,7 @@ create__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9Sta __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1Fv: /* 80358900 00354740 4B ED 5D A0 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ChkCannotInProduce__Q53scn4step4hero8inactive7UtilityFRQ43scn4step4hero12InactiveHero ChkCannotInProduce__Q53scn4step4hero8inactive7UtilityFRQ43scn4step4hero12InactiveHero: /* 8035E2B4 0035A0F4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -8828,7 +8828,7 @@ lbl_8035E380: /* 8035E38C 0035A1CC 38 21 00 10 */ addi r1, r1, 0x10 /* 8035E390 0035A1D0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global InitTarget__Q53scn4step4hero6damage7UtilityFRQ43scn4step4hero4Hero InitTarget__Q53scn4step4hero6damage7UtilityFRQ43scn4step4hero4Hero: /* 803784F8 00374338 94 21 FF 60 */ stwu r1, -0xa0(r1) @@ -9153,7 +9153,7 @@ lbl_8037897C: /* 8037899C 003747DC 38 21 00 70 */ addi r1, r1, 0x70 /* 803789A0 003747E0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LeaveDoor__Q53scn4step4hero7gimmick7UtilityFRQ43scn4step4hero4HeroRCQ33hel4math7Vector3RCQ33hel4math7Vector3RCQ24util12FrameCounter LeaveDoor__Q53scn4step4hero7gimmick7UtilityFRQ43scn4step4hero4HeroRCQ33hel4math7Vector3RCQ33hel4math7Vector3RCQ24util12FrameCounter: /* 80383CD8 0037FB18 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -9241,7 +9241,7 @@ lbl_80383D68: /* 80383E1C 0037FC5C 38 21 00 50 */ addi r1, r1, 0x50 /* 80383E20 0037FC60 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CheckMapColl__Q53scn4step4hero5spark7UtilityFRQ43scn4step4hero4HeroRCQ33hel4math7Vector2RCQ33hel4math7Vector2 CheckMapColl__Q53scn4step4hero5spark7UtilityFRQ43scn4step4hero4HeroRCQ33hel4math7Vector2RCQ33hel4math7Vector2: /* 8038F54C 0038B38C 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -9520,7 +9520,7 @@ lbl_8038F90C: /* 8038F940 0038B780 38 21 07 00 */ addi r1, r1, 0x700 /* 8038F944 0038B784 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OnStateStartChange__Q53scn4step4hero5stone7UtilityFRQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context OnStateStartChange__Q53scn4step4hero5stone7UtilityFRQ43scn4step4hero4HeroRQ53scn4step4hero5stone7Context: /* 80391B5C 0038D99C 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -9932,7 +9932,7 @@ lbl_80392104: /* 80392114 0038DF54 38 21 00 10 */ addi r1, r1, 0x10 /* 80392118 0038DF58 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global IsInLand__Q43scn4step4item7UtilityFRQ43scn4step4item4Item IsInLand__Q43scn4step4item7UtilityFRQ43scn4step4item4Item: /* 803C5430 003C1270 94 21 FF A0 */ stwu r1, -0x60(r1) @@ -10025,7 +10025,7 @@ lbl_803C5568: /* 803C557C 003C13BC 38 21 00 60 */ addi r1, r1, 0x60 /* 803C5580 003C13C0 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ReqInterruptEffect__Q43scn4step6vacuum7UtilityFRQ43scn4step4core10PermEffectQ24util41ObjRefHandle$$0Q43scn4step6vacuum8Attacker$$1RCQ33hel4math7Vector3Ul ReqInterruptEffect__Q43scn4step6vacuum7UtilityFRQ43scn4step4core10PermEffectQ24util41ObjRefHandle$$0Q43scn4step6vacuum8Attacker$$1RCQ33hel4math7Vector3Ul: /* 803D342C 003CF26C 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -10198,7 +10198,7 @@ lbl_803D368C: /* 803D36A8 003CF4E8 38 21 00 B0 */ addi r1, r1, 0xb0 /* 803D36AC 003CF4EC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GenerateStarEffect__Q43scn4step6weapon7UtilityFRQ43scn4step6weapon6WeaponRCQ33hel4math7Vector2RCQ33hel4math7Vector2Q43scn4step3map17BinEnemyVariation GenerateStarEffect__Q43scn4step6weapon7UtilityFRQ43scn4step6weapon6WeaponRCQ33hel4math7Vector2RCQ33hel4math7Vector2Q43scn4step3map17BinEnemyVariation: /* 803D9004 003D4E44 38 E0 00 00 */ li r7, 0 @@ -10454,7 +10454,7 @@ IsExtra__Q43scn4step6weapon7UtilityFRQ43scn4step6weapon6Weapon: /* 803D9378 003D51B8 38 21 00 10 */ addi r1, r1, 0x10 /* 803D937C 003D51BC 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Rotate__Q53scn4step6weapon10spearspear7UtilityFRQ43scn4step6weapon6Weapon Rotate__Q53scn4step6weapon10spearspear7UtilityFRQ43scn4step6weapon6Weapon: /* 803E5244 003E1084 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -10530,7 +10530,7 @@ lbl_803E533C: /* 803E5348 003E1188 38 21 00 10 */ addi r1, r1, 0x10 /* 803E534C 003E118C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global Rotate__Q53scn4step6weapon8deespear7UtilityFRQ43scn4step6weapon6Weapon Rotate__Q53scn4step6weapon8deespear7UtilityFRQ43scn4step6weapon6Weapon: /* 803EE190 003E9FD0 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -10606,7 +10606,7 @@ lbl_803EE288: /* 803EE294 003EA0D4 38 21 00 10 */ addi r1, r1, 0x10 /* 803EE298 003EA0D8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global CaptureEFB__Q23sfx7UtilityFRQ23gfx9TexBuffer9_GXTexFmtb CaptureEFB__Q23sfx7UtilityFRQ23gfx9TexBuffer9_GXTexFmtb: /* 80401A64 003FD8A4 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -10826,7 +10826,7 @@ lbl_80401D7C: /* 80401D88 003FDBC8 38 21 00 40 */ addi r1, r1, 0x40 /* 80401D8C 003FDBCC 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$259919 $$259919: .incbin "baserom.dol", 0x412590, 0x6C @@ -10834,7 +10834,7 @@ $$259919: $$259947: .incbin "baserom.dol", 0x4125FC, 0x6C -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$20 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut81LinkList$$0Q24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util60ObjListNode$$0Q43scn4step4item4Item$$4Q24util16ObjListDummyType$$1$$20: .incbin "baserom.dol", 0x460970, 0x24 @@ -10848,7 +10848,7 @@ $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q4 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut83LinkList$$0Q24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util62ObjListNode$$0Q43scn4step5enemy5Enemy$$4Q24util16ObjListDummyType$$1: .incbin "baserom.dol", 0x4609C4, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$261649 $$261649: .incbin "baserom.dol", 0x46ED78, 0x28 @@ -10856,12 +10856,12 @@ $$261649: $$261690: .incbin "baserom.dol", 0x46EDA0, 0x28 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step5enemy9waddledee12StateSmashed$$4PQ43scn4step5enemy5Enemy$$1: .incbin "baserom.dol", 0x47A458, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$264675 $$264675: .incbin "baserom.dol", 0x481720, 0x28 @@ -10869,12 +10869,12 @@ $$264675: __vt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common9StateSwim$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x481748, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249660 $$249660: .incbin "baserom.dol", 0x493100, 0x8 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$260100 $$260100: .incbin "baserom.dol", 0x4952D0, 0x4 @@ -10888,7 +10888,7 @@ $$260103: $$260104: .incbin "baserom.dol", 0x4952DC, 0x4 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$259859 $$259859: .incbin "baserom.dol", 0x495A18, 0x4 @@ -10902,7 +10902,7 @@ $$259862: $$259863: .incbin "baserom.dol", 0x495A24, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251743 $$251743: .incbin "baserom.dol", 0x49A298, 0x8 @@ -10919,7 +10919,7 @@ $$251796: $$251797: .incbin "baserom.dol", 0x49A2AC, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251538 $$251538: .incbin "baserom.dol", 0x49A500, 0x4 @@ -10939,7 +10939,7 @@ $$251552: $$251553: .incbin "baserom.dol", 0x49A51C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259635 $$259635: .incbin "baserom.dol", 0x49AED0, 0x4 @@ -10980,7 +10980,7 @@ $$261515: $$261516: .incbin "baserom.dol", 0x49AF00, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$261487 $$261487: .incbin "baserom.dol", 0x49BA38, 0x4 @@ -11081,7 +11081,7 @@ $$262007: $$262008: .incbin "baserom.dol", 0x49BAB8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256724 $$256724: .incbin "baserom.dol", 0x49C058, 0x4 @@ -11089,7 +11089,7 @@ $$256724: $$256725: .incbin "baserom.dol", 0x49C05C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258292 $$258292: .incbin "baserom.dol", 0x49C298, 0x4 @@ -11139,7 +11139,7 @@ $$258395: $$258481: .incbin "baserom.dol", 0x49C2D4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257104 $$257104: .incbin "baserom.dol", 0x49D050, 0x4 @@ -11156,7 +11156,7 @@ $$257107: $$257110: .incbin "baserom.dol", 0x49D060, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global T_WATERPISTOL_VARIATION_TABLE_STRONG__Q43scn4step4hero21$$2unnamed$$2Utility_cpp$$2 T_WATERPISTOL_VARIATION_TABLE_STRONG__Q43scn4step4hero21$$2unnamed$$2Utility_cpp$$2: .incbin "baserom.dol", 0x49D9F8, 0x8 @@ -11203,7 +11203,7 @@ $$265000: $$265003: .incbin "baserom.dol", 0x49DA38, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253894 $$253894: .incbin "baserom.dol", 0x49DEE0, 0x4 @@ -11211,7 +11211,7 @@ $$253894: $$253895: .incbin "baserom.dol", 0x49DEE4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250538 $$250538: .incbin "baserom.dol", 0x49E018, 0x4 @@ -11231,7 +11231,7 @@ $$250542: $$250549: .incbin "baserom.dol", 0x49E030, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253722 $$253722: .incbin "baserom.dol", 0x49E0F0, 0x4 @@ -11242,7 +11242,7 @@ $$253723: $$253724: .incbin "baserom.dol", 0x49E0F8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258122 $$258122: .incbin "baserom.dol", 0x49E128, 0x4 @@ -11268,12 +11268,12 @@ $$258180: $$258198: .incbin "baserom.dol", 0x49E148, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253795 $$253795: .incbin "baserom.dol", 0x49E590, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251819 $$251819: .incbin "baserom.dol", 0x49E828, 0x4 @@ -11287,7 +11287,7 @@ $$251821: $$251826: .incbin "baserom.dol", 0x49E838, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255686 $$255686: .incbin "baserom.dol", 0x49EA88, 0x4 @@ -11295,7 +11295,7 @@ $$255686: $$255687: .incbin "baserom.dol", 0x49EA8C, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255686 $$255686: .incbin "baserom.dol", 0x49EC70, 0x4 @@ -11303,7 +11303,7 @@ $$255686: $$255687: .incbin "baserom.dol", 0x49EC74, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251502 $$251502: .incbin "baserom.dol", 0x49EE58, 0x4 diff --git a/asm/src/VISetting.s b/asm/src/VISetting.s index 1f8cae82..5b9cca63 100644 --- a/asm/src/VISetting.s +++ b/asm/src/VISetting.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23gfx9VISettingFv __ct__Q23gfx9VISettingFv: /* 801979AC 001937EC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -278,7 +278,7 @@ getDimming__Q23gfx9VISettingCFv: /* 80197D48 00193B88 88 63 00 10 */ lbz r3, 0x10(r3) /* 80197D4C 00193B8C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global NtscInt4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 NtscInt4x3__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: .incbin "baserom.dol", 0x4106B8, 0x44 @@ -322,12 +322,12 @@ Pal60Int16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: Pal60Prog16x9__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: .incbin "baserom.dol", 0x410A2C, 0x44 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global StandardRenderModeSets__Q23gfx23$$2unnamed$$2VISetting_cpp$$2 StandardRenderModeSets__Q23gfx23$$2unnamed$$2VISetting_cpp$$2: .incbin "baserom.dol", 0x450AA8, 0x38 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249284 $$249284: .incbin "baserom.dol", 0x49A2B0, 0x8 diff --git a/asm/src/VMCore.s b/asm/src/VMCore.s index 63d0ce1f..8c881442 100644 --- a/asm/src/VMCore.s +++ b/asm/src/VMCore.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm6VMCoreFUi __ct__Q26mintvm6VMCoreFUi: /* 801C9D5C 001C5B9C 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -3568,7 +3568,7 @@ deallocate__Q26mintvm215STLAllocator$$0Q33std187__tree_deleter$$0Q23std25pair$$0 /* 801CCE28 001C8C68 7D 89 03 A6 */ mtctr r12 /* 801CCE2C 001C8C6C 4E 80 04 20 */ bctr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258575 $$258575: .incbin "baserom.dol", 0x458680, 0x1C @@ -3774,7 +3774,7 @@ $$2STRING$$2divide__Q26mintvm9TmpSymbolFi$$20: $$2STRING$$2divide__Q26mintvm9TmpSymbolFi: .incbin "baserom.dol", 0x458B90, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258399 $$258399: .incbin "baserom.dol", 0x493958, 0x4 diff --git a/asm/src/VMFunction.s b/asm/src/VMFunction.s index 1dd8c6d2..717a2c73 100644 --- a/asm/src/VMFunction.s +++ b/asm/src/VMFunction.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setup__Q26mintvm10VMFunctionFv setup__Q26mintvm10VMFunctionFv: /* 801CCE30 001C8C70 48 00 00 04 */ b parseName__Q26mintvm10VMFunctionFv @@ -105,7 +105,7 @@ lbl_801CCF78: /* 801CCF88 001C8DC8 38 60 FF FF */ li r3, -1 /* 801CCF8C 001C8DCC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250536 $$250536: .incbin "baserom.dol", 0x458BD0, 0x1C diff --git a/asm/src/VMFunctionList.s b/asm/src/VMFunctionList.s index 817d5172..cb348626 100644 --- a/asm/src/VMFunctionList.s +++ b/asm/src/VMFunctionList.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm14VMFunctionListFRCQ25mintx5XDataPCQ26mintvm14BCFunctionList __ct__Q26mintvm14VMFunctionListFRCQ25mintx5XDataPCQ26mintvm14BCFunctionList: /* 801CCF90 001C8DD0 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -165,7 +165,7 @@ lbl_801CD1B8: /* 801CD1D8 001C9018 38 21 00 20 */ addi r1, r1, 0x20 /* 801CD1DC 001C901C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q26mintvm14VMFunctionList __vt__Q26mintvm14VMFunctionList: .incbin "baserom.dol", 0x458C68, 0xC diff --git a/asm/src/VMModule.s b/asm/src/VMModule.s index 072caa85..b9f05e3b 100644 --- a/asm/src/VMModule.s +++ b/asm/src/VMModule.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm8VMModuleFPCv __ct__Q26mintvm8VMModuleFPCv: /* 801CD1E0 001C9020 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -138,7 +138,7 @@ lbl_801CD3AC: /* 801CD3CC 001C920C 38 21 00 20 */ addi r1, r1, 0x20 /* 801CD3D0 001C9210 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q26mintvm8VMModule __vt__Q26mintvm8VMModule: .incbin "baserom.dol", 0x458CA0, 0xC diff --git a/asm/src/VMObjectType.s b/asm/src/VMObjectType.s index fd49a0d8..74e5ab28 100644 --- a/asm/src/VMObjectType.s +++ b/asm/src/VMObjectType.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm12VMObjectTypeFPCc __ct__Q26mintvm12VMObjectTypeFPCc: /* 801CD3D4 001C9214 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -259,7 +259,7 @@ lbl_801CD758: /* 801CD778 001C95B8 38 21 00 30 */ addi r1, r1, 0x30 /* 801CD77C 001C95BC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q26mintvm12VMObjectType __vt__Q26mintvm12VMObjectType: .incbin "baserom.dol", 0x458CC8, 0xC diff --git a/asm/src/VMObjectTypeList.s b/asm/src/VMObjectTypeList.s index 9f618a5a..303da81c 100644 --- a/asm/src/VMObjectTypeList.s +++ b/asm/src/VMObjectTypeList.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm16VMObjectTypeListFPCc __ct__Q26mintvm16VMObjectTypeListFPCc: /* 801CD780 001C95C0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -319,7 +319,7 @@ lbl_801CDBBC: /* 801CDBCC 001C9A0C 38 21 00 20 */ addi r1, r1, 0x20 /* 801CDBD0 001C9A10 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$250880 $$250880: .incbin "baserom.dol", 0x458D28, 0x18 diff --git a/asm/src/VMSymbolTable.s b/asm/src/VMSymbolTable.s index ec594b55..4ac49e57 100644 --- a/asm/src/VMSymbolTable.s +++ b/asm/src/VMSymbolTable.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q26mintvm13VMSymbolTableFRCQ25mintx5XDataPCQ26mintvm13BCSymbolTable __ct__Q26mintvm13VMSymbolTableFRCQ25mintx5XDataPCQ26mintvm13BCSymbolTable: /* 801CDBD4 001C9A14 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -137,7 +137,7 @@ lbl_801CDD80: /* 801CDDA0 001C9BE0 38 21 00 30 */ addi r1, r1, 0x30 /* 801CDDA4 001C9BE4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1FUl$$20 $$2STRING$$2at__Q26mintvm11MArray$$0PCc$$1FUl$$20: .incbin "baserom.dol", 0x458D80, 0x18 diff --git a/asm/src/VMVariable.s b/asm/src/VMVariable.s index ed0bb01d..88898799 100644 --- a/asm/src/VMVariable.s +++ b/asm/src/VMVariable.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global sizeOf__Q26mintvm10VMVariableCFRCQ26mintvm6VMCore sizeOf__Q26mintvm10VMVariableCFRCQ26mintvm6VMCore: /* 801CDDA8 001C9BE8 7C 65 1B 78 */ mr r5, r3 diff --git a/asm/src/VMVariableList.s b/asm/src/VMVariableList.s index 17789b9f..b6ca72db 100644 --- a/asm/src/VMVariableList.s +++ b/asm/src/VMVariableList.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global offsetOf__Q26mintvm14VMVariableListCFRCQ26mintvm6VMCorei offsetOf__Q26mintvm14VMVariableListCFRCQ26mintvm6VMCorei: /* 801CDDB8 001C9BF8 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/VacuumAttackerCallback.s b/asm/src/VacuumAttackerCallback.s index 42b36ca6..4a49dd74 100644 --- a/asm/src/VacuumAttackerCallback.s +++ b/asm/src/VacuumAttackerCallback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero22VacuumAttackerCallbackFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero22VacuumAttackerCallbackFRQ43scn4step4hero4Hero: /* 80358904 00354744 3C A0 80 48 */ lis r5, __vt__Q43scn4step4hero22VacuumAttackerCallback@ha @@ -193,17 +193,17 @@ onReceivedCure__Q43scn4step4hero22VacuumAttackerCallbackFRCQ43scn4step6vacuum8At /* 80358B94 003549D4 38 21 00 10 */ addi r1, r1, 0x10 /* 80358B98 003549D8 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global SOUND_TABLE__36$$2unnamed$$2VacuumAttackerCallback_cpp$$2 SOUND_TABLE__36$$2unnamed$$2VacuumAttackerCallback_cpp$$2: .incbin "baserom.dol", 0x416428, 0x38 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step4hero22VacuumAttackerCallback __vt__Q43scn4step4hero22VacuumAttackerCallback: .incbin "baserom.dol", 0x481758, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256925 $$256925: .incbin "baserom.dol", 0x49DA40, 0x8 diff --git a/asm/src/VacuumReceiver.s b/asm/src/VacuumReceiver.s index 0a446867..8cedfe6f 100644 --- a/asm/src/VacuumReceiver.s +++ b/asm/src/VacuumReceiver.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4boss14VacuumReceiverFRQ43scn4step4boss4Boss __ct__Q43scn4step4boss14VacuumReceiverFRQ43scn4step4boss4Boss: /* 80235C58 00231A98 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -722,7 +722,7 @@ create__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18St __dt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1Fv: /* 80236588 002323C8 4B FF 81 18 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy14VacuumReceiverFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy14VacuumReceiverFRQ43scn4step5enemy5Enemy: /* 8028FE54 0028BC94 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1595,7 +1595,7 @@ create__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18 __dt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1Fv: /* 80290A58 0028C898 4B F9 DC 48 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero14VacuumReceiverFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero14VacuumReceiverFRQ43scn4step4hero4Hero: /* 80358B9C 003549DC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -2941,7 +2941,7 @@ lbl_80359E18: __dt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv: /* 80359E34 00355C74 4B ED 48 6C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4item14VacuumReceiverFRQ43scn4step4item4Item __ct__Q43scn4step4item14VacuumReceiverFRQ43scn4step4item4Item: /* 803C5584 003C13C4 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3401,7 +3401,7 @@ create__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18St __dt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1Fv: /* 803C5BE4 003C1A24 4B E6 8A BC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFRQ43scn4step6weapon6Weapon __ct__Q53scn4step6weapon13vacuumedblock14VacuumReceiverFRQ43scn4step6weapon6Weapon: /* 803EF218 003EB058 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -3686,7 +3686,7 @@ create__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuum __dt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1Fv: /* 803EF5E8 003EB428 4B E3 F0 B8 */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1 __vt__Q24util99StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common18StateVacuumReceive$$4PQ43scn4step4boss4Boss$$1: .incbin "baserom.dol", 0x4609D0, 0x10 @@ -3706,7 +3706,7 @@ $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q4 $$2STRING$$2GetNodeFromPointer__Q34nw4r2ut87LinkList$$0Q24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1$$40$$1FPQ24util66ObjListNode$$0Q43scn4step6vacuum8Attacker$$4Q24util16ObjListDummyType$$1: .incbin "baserom.dol", 0x460A7C, 0xC -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1 __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18StateVacuumReceive$$4PQ43scn4step5enemy5Enemy$$4Ul$$1: .incbin "baserom.dol", 0x46EDC8, 0x10 @@ -3714,7 +3714,7 @@ __vt__Q24util105StateFactoryArg2$$0Q24util6IState$$4Q53scn4step5enemy6common18St __vt__Q43scn4step5enemy14VacuumReceiver: .incbin "baserom.dol", 0x46EDD8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util109StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero12interference18StateVacuumReceive$$4PQ43scn4step4hero4Hero$$4Ul$$1: .incbin "baserom.dol", 0x481778, 0x10 @@ -3728,7 +3728,7 @@ __vt__Q24util98StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero12interferenc __vt__Q43scn4step4hero14VacuumReceiver: .incbin "baserom.dol", 0x4817A8, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1 __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18StateVacuumReceive$$4PQ43scn4step4item4Item$$4Ul$$1: .incbin "baserom.dol", 0x48E048, 0x10 @@ -3736,7 +3736,7 @@ __vt__Q24util101StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4item5state18Stat __vt__Q43scn4step4item14VacuumReceiver: .incbin "baserom.dol", 0x48E058, 0x48 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1 __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumedblock18StateVacuumReceive$$4PQ43scn4step6weapon6Weapon$$4Ul$$1: .incbin "baserom.dol", 0x491348, 0x10 @@ -3744,7 +3744,7 @@ __vt__Q24util116StateFactoryArg2$$0Q24util6IState$$4Q53scn4step6weapon13vacuumed __vt__Q53scn4step6weapon13vacuumedblock14VacuumReceiver: .incbin "baserom.dol", 0x491358, 0x48 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$256314 $$256314: .incbin "baserom.dol", 0x49AF08, 0x4 @@ -3758,7 +3758,7 @@ $$256316: $$256317: .incbin "baserom.dol", 0x49AF14, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255809 $$255809: .incbin "baserom.dol", 0x49BAC0, 0x4 @@ -3778,7 +3778,7 @@ $$258167: $$258375: .incbin "baserom.dol", 0x49BAD4, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257113 $$257113: .incbin "baserom.dol", 0x49DA48, 0x4 @@ -3807,7 +3807,7 @@ $$259532: $$259533: .incbin "baserom.dol", 0x49DA68, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255562 $$255562: .incbin "baserom.dol", 0x49E598, 0x4 diff --git a/asm/src/VacuumSoundCtrl.s b/asm/src/VacuumSoundCtrl.s index 96d87b8b..26a4b77e 100644 --- a/asm/src/VacuumSoundCtrl.s +++ b/asm/src/VacuumSoundCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero15VacuumSoundCtrlFv __ct__Q43scn4step4hero15VacuumSoundCtrlFv: /* 80359E38 00355C78 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -407,12 +407,12 @@ lbl_8035A388: /* 8035A3A0 003561E0 38 21 00 20 */ addi r1, r1, 0x20 /* 8035A3A4 003561E4 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$250536 $$250536: .incbin "baserom.dol", 0x496E20, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251157 $$251157: .incbin "baserom.dol", 0x49DA70, 0x4 diff --git a/asm/src/VariationDemo.s b/asm/src/VariationDemo.s index 40e6fd25..f14739da 100644 --- a/asm/src/VariationDemo.s +++ b/asm/src/VariationDemo.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ORDER_SET_WIDEHEIGHT__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2FUsf ORDER_SET_WIDEHEIGHT__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2FUsf: /* 8030378C 002FF5CC 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -753,10 +753,10 @@ __sinit_$$3VariationDemo_cpp: /* 80304228 00300068 38 21 00 80 */ addi r1, r1, 0x80 /* 8030422C 0030006C 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x4025A4, 0x4 -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$254361 $$254361: .incbin "baserom.dol", 0x4159F8, 0xC @@ -785,7 +785,7 @@ $$254563: $$254574: .incbin "baserom.dol", 0x415A58, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global datTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2 datTbl__Q53scn4step7gimmick10cameralock27$$2unnamed$$2VariationDemo_cpp$$2: .incbin "baserom.dol", 0x47C3E8, 0x30 @@ -799,7 +799,7 @@ $$255233: __vt__Q53scn4step7gimmick10cameralock13VariationDemo: .incbin "baserom.dol", 0x47C4A0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255183 $$255183: .incbin "baserom.dol", 0x49D240, 0x4 diff --git a/asm/src/VariationDownside.s b/asm/src/VariationDownside.s index 880ae2ad..4024469a 100644 --- a/asm/src/VariationDownside.s +++ b/asm/src/VariationDownside.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock17VariationDownsideFv __ct__Q53scn4step7gimmick10cameralock17VariationDownsideFv: /* 80304230 00300070 3C 80 80 48 */ lis r4, __vt__Q53scn4step7gimmick10cameralock17VariationDownside@ha @@ -72,12 +72,12 @@ updateLockNonStop__Q53scn4step7gimmick10cameralock17VariationDownsideFRQ53scn4st setIsPose__Q53scn4step7gimmick10cameralock17VariationDownsideFb: /* 80304300 00300140 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock17VariationDownside __vt__Q53scn4step7gimmick10cameralock17VariationDownside: .incbin "baserom.dol", 0x47C4C0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253413 $$253413: .incbin "baserom.dol", 0x49D270, 0x4 diff --git a/asm/src/VariationLoose.s b/asm/src/VariationLoose.s index d14f6266..b8699a04 100644 --- a/asm/src/VariationLoose.s +++ b/asm/src/VariationLoose.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_CreateLockRect__Q53scn4step7gimmick10cameralock28$$2unnamed$$2VariationLoose_cpp$$2FffRCQ33hel4math7Vector2 t_CreateLockRect__Q53scn4step7gimmick10cameralock28$$2unnamed$$2VariationLoose_cpp$$2FffRCQ33hel4math7Vector2: /* 80304304 00300144 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -645,17 +645,17 @@ lbl_80304BF4: /* 80304C04 00300A44 38 21 00 10 */ addi r1, r1, 0x10 /* 80304C08 00300A48 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_SPACEJUMP_FRAME__Q53scn4step7gimmick10cameralock28$$2unnamed$$2VariationLoose_cpp$$2 T_SPACEJUMP_FRAME__Q53scn4step7gimmick10cameralock28$$2unnamed$$2VariationLoose_cpp$$2: .incbin "baserom.dol", 0x415A68, 0x40 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock14VariationLoose __vt__Q53scn4step7gimmick10cameralock14VariationLoose: .incbin "baserom.dol", 0x47C4E0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255250 $$255250: .incbin "baserom.dol", 0x49D278, 0x4 diff --git a/asm/src/VariationMove.s b/asm/src/VariationMove.s index 28cb4e06..ebced014 100644 --- a/asm/src/VariationMove.s +++ b/asm/src/VariationMove.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock13VariationMoveFf __ct__Q53scn4step7gimmick10cameralock13VariationMoveFf: /* 80304C0C 00300A4C 3C 80 80 48 */ lis r4, __vt__Q53scn4step7gimmick10cameralock13VariationMove@ha @@ -54,7 +54,7 @@ updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationMoveFRQ53scn4step7g setIsPose__Q53scn4step7gimmick10cameralock13VariationMoveFb: /* 80304C94 00300AD4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock13VariationMove __vt__Q53scn4step7gimmick10cameralock13VariationMove: .incbin "baserom.dol", 0x47C500, 0x20 diff --git a/asm/src/VariationNpc.s b/asm/src/VariationNpc.s index d7425efb..75d7835a 100644 --- a/asm/src/VariationNpc.s +++ b/asm/src/VariationNpc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global t_isEqualsLoose__26$$2unnamed$$2VariationNpc_cpp$$2Fff t_isEqualsLoose__26$$2unnamed$$2VariationNpc_cpp$$2Fff: /* 80314314 00310154 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1477,7 +1477,7 @@ lbl_8031572C: objCollRect__Q53scn4step7gimmick7mahoroa12VariationNpcFRQ53scn4step7gimmick7mahoroa7Mahoroa: /* 80315740 00311580 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258009 $$258009: .incbin "baserom.dol", 0x47D9B8, 0xC @@ -1557,7 +1557,7 @@ __vt__Q53scn4step7gimmick7mahoroa12VariationNpc: __vt__Q53scn4step7gimmick7mahoroa10IVariation: .incbin "baserom.dol", 0x47DB44, 0x1C -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$257896 $$257896: .incbin "baserom.dol", 0x49D458, 0x4 diff --git a/asm/src/VariationPerm.s b/asm/src/VariationPerm.s index 68762c9f..49c0e09e 100644 --- a/asm/src/VariationPerm.s +++ b/asm/src/VariationPerm.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock13VariationPermFf __ct__Q53scn4step7gimmick10cameralock13VariationPermFf: /* 80304C98 00300AD8 3C 80 80 48 */ lis r4, __vt__Q53scn4step7gimmick10cameralock13VariationPerm@ha @@ -98,12 +98,12 @@ updateLockNonStop__Q53scn4step7gimmick10cameralock13VariationPermFRQ53scn4step7g setIsPose__Q53scn4step7gimmick10cameralock13VariationPermFb: /* 80304DD0 00300C10 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock13VariationPerm __vt__Q53scn4step7gimmick10cameralock13VariationPerm: .incbin "baserom.dol", 0x47C520, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254287 $$254287: .incbin "baserom.dol", 0x49D288, 0x4 diff --git a/asm/src/VariationShooting.s b/asm/src/VariationShooting.s index 1ea07e46..4bed14d4 100644 --- a/asm/src/VariationShooting.s +++ b/asm/src/VariationShooting.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock17VariationShootingFv __ct__Q53scn4step7gimmick10cameralock17VariationShootingFv: /* 80304DD4 00300C14 3C 80 80 48 */ lis r4, __vt__Q53scn4step7gimmick10cameralock17VariationShooting@ha @@ -165,12 +165,12 @@ updateLockNonStop__Q53scn4step7gimmick10cameralock17VariationShootingFRQ53scn4st setIsPose__Q53scn4step7gimmick10cameralock17VariationShootingFb: /* 80305010 00300E50 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock17VariationShooting __vt__Q53scn4step7gimmick10cameralock17VariationShooting: .incbin "baserom.dol", 0x47C540, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255517 $$255517: .incbin "baserom.dol", 0x49D298, 0x4 diff --git a/asm/src/VariationSphere.s b/asm/src/VariationSphere.s index a210bf49..2b8d00cd 100644 --- a/asm/src/VariationSphere.s +++ b/asm/src/VariationSphere.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock15VariationSphereFv __ct__Q53scn4step7gimmick10cameralock15VariationSphereFv: /* 80305014 00300E54 3C 80 80 48 */ lis r4, __vt__Q53scn4step7gimmick10cameralock15VariationSphere@ha @@ -303,12 +303,12 @@ updateLockNonStop__Q53scn4step7gimmick10cameralock15VariationSphereFRQ53scn4step setIsPose__Q53scn4step7gimmick10cameralock15VariationSphereFb: /* 80305464 003012A4 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock15VariationSphere __vt__Q53scn4step7gimmick10cameralock15VariationSphere: .incbin "baserom.dol", 0x47C560, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$255509 $$255509: .incbin "baserom.dol", 0x49D2B0, 0x4 diff --git a/asm/src/VariationStill.s b/asm/src/VariationStill.s index 3df4a751..b370cd46 100644 --- a/asm/src/VariationStill.s +++ b/asm/src/VariationStill.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock14VariationStillFQ33scn4step11ContextMode __ct__Q53scn4step7gimmick10cameralock14VariationStillFQ33scn4step11ContextMode: /* 80305468 003012A8 3C A0 80 48 */ lis r5, __vt__Q53scn4step7gimmick10cameralock14VariationStill@ha @@ -169,12 +169,12 @@ updateLockNonStop__Q53scn4step7gimmick10cameralock14VariationStillFRQ53scn4step7 setIsPose__Q53scn4step7gimmick10cameralock14VariationStillFb: /* 803056B0 003014F0 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock14VariationStill __vt__Q53scn4step7gimmick10cameralock14VariationStill: .incbin "baserom.dol", 0x47C580, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254589 $$254589: .incbin "baserom.dol", 0x49D2B8, 0x4 diff --git a/asm/src/VariationUpside.s b/asm/src/VariationUpside.s index b4080222..263a0acb 100644 --- a/asm/src/VariationUpside.s +++ b/asm/src/VariationUpside.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10cameralock15VariationUpsideFv __ct__Q53scn4step7gimmick10cameralock15VariationUpsideFv: /* 803056B4 003014F4 3C 80 80 48 */ lis r4, __vt__Q53scn4step7gimmick10cameralock15VariationUpside@ha @@ -70,12 +70,12 @@ updateLockNonStop__Q53scn4step7gimmick10cameralock15VariationUpsideFRQ53scn4step setIsPose__Q53scn4step7gimmick10cameralock15VariationUpsideFb: /* 8030577C 003015BC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q53scn4step7gimmick10cameralock15VariationUpside __vt__Q53scn4step7gimmick10cameralock15VariationUpside: .incbin "baserom.dol", 0x47C5A0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253413 $$253413: .incbin "baserom.dol", 0x49D2C8, 0x4 diff --git a/asm/src/Vector2.s b/asm/src/Vector2.s index debeb1a2..b1644c5c 100644 --- a/asm/src/Vector2.s +++ b/asm/src/Vector2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global length__Q33hel4math7Vector2CFv length__Q33hel4math7Vector2CFv: /* 8019EF58 0019AD98 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -443,10 +443,10 @@ __sinit_$$3Vector2_cpp: /* 8019F504 0019B344 38 21 00 10 */ addi r1, r1, 0x10 /* 8019F508 0019B348 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402420, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250690 $$250690: .incbin "baserom.dol", 0x49A3A8, 0x4 diff --git a/asm/src/Vector3.s b/asm/src/Vector3.s index 68e6b0fa..78409a2e 100644 --- a/asm/src/Vector3.s +++ b/asm/src/Vector3.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global normalizedCross__Q33hel4math7Vector3CFRCQ33hel4math7Vector3 normalizedCross__Q33hel4math7Vector3CFRCQ33hel4math7Vector3: /* 8019F50C 0019B34C 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -610,10 +610,10 @@ __sinit_$$3Vector3_cpp: /* 8019FD44 0019BB84 38 21 00 10 */ addi r1, r1, 0x10 /* 8019FD48 0019BB88 4E 80 00 20 */ blr -.section .data2, "wa" # 0x80406260 - 0x80406540 +.section .ctors, "wa" # 0x80406260 - 0x80406540 .incbin "baserom.dol", 0x402424, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251176 $$251176: .incbin "baserom.dol", 0x49A3C0, 0x4 diff --git a/asm/src/VolatileData2.s b/asm/src/VolatileData2.s index 78f768b3..750381f6 100644 --- a/asm/src/VolatileData2.s +++ b/asm/src/VolatileData2.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global init__Q27storage13VolatileData2Fv init__Q27storage13VolatileData2Fv: /* 80405194 00400FD4 38 80 00 00 */ li r4, 0 @@ -272,7 +272,7 @@ setLevelKind__Q27storage13VolatileData2FQ33scn4step9LevelKind: /* 8040550C 0040134C 90 83 10 54 */ stw r4, 0x1054(r3) /* 80405510 00401350 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249921 $$249921: .incbin "baserom.dol", 0x49EEB0, 0x8 diff --git a/asm/src/Warp.s b/asm/src/Warp.s index 7b6b3e63..b4a0d044 100644 --- a/asm/src/Warp.s +++ b/asm/src/Warp.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global beginDrawWarpImage__Q23sfx4WarpFv beginDrawWarpImage__Q23sfx4WarpFv: /* 80401D90 003FDBD0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -325,7 +325,7 @@ setupDrawOriginal__Q23sfx4WarpFv: /* 80402240 003FE080 38 21 00 40 */ addi r1, r1, 0x40 /* 80402244 003FE084 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251724 $$251724: .incbin "baserom.dol", 0x49EE70, 0x4 diff --git a/asm/src/WarpStar.s b/asm/src/WarpStar.s index eabcaeea..48fe0f08 100644 --- a/asm/src/WarpStar.s +++ b/asm/src/WarpStar.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global GetStartAnimName__Q53scn4step7gimmick8warpstar22$$2unnamed$$2WarpStar_cpp$$2FQ33scn4step9LevelKind GetStartAnimName__Q53scn4step7gimmick8warpstar22$$2unnamed$$2WarpStar_cpp$$2FQ33scn4step9LevelKind: /* 80328CA4 00324AE4 2C 03 00 00 */ cmpwi r3, 0 @@ -1014,7 +1014,7 @@ lbl_80329AB8: /* 80329AC4 00325904 38 21 00 10 */ addi r1, r1, 0x10 /* 80329AC8 00325908 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253974 $$253974: .incbin "baserom.dol", 0x47E6A0, 0xC @@ -1049,7 +1049,7 @@ $$254131: $$254132: .incbin "baserom.dol", 0x47E75C, 0x74 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253966 $$253966: .incbin "baserom.dol", 0x496D70, 0x8 @@ -1084,7 +1084,7 @@ $$254113: $$254114: .incbin "baserom.dol", 0x496DC0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254115 $$254115: .incbin "baserom.dol", 0x49D5E8, 0x4 diff --git a/asm/src/WarpStarPanel.s b/asm/src/WarpStarPanel.s index dd9d15b7..d8ca6e39 100644 --- a/asm/src/WarpStarPanel.s +++ b/asm/src/WarpStarPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4info13WarpStarPanelFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component __ct__Q43scn4step4info13WarpStarPanelFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorRQ33scn4step9Component: /* 803B0100 003ABF40 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -1044,7 +1044,7 @@ isOpenAreaDemoEnd__Q53scn4step4info13WarpStarPanel19WarpStarPanelIndiviCFv: /* 803B0F3C 003ACD7C 38 21 00 10 */ addi r1, r1, 0x10 /* 803B0F40 003ACD80 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$258551 $$258551: .incbin "baserom.dol", 0x48C1D8, 0x10 @@ -1064,7 +1064,7 @@ $$258601: $$258602: .incbin "baserom.dol", 0x48C220, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$258555 $$258555: .incbin "baserom.dol", 0x497B00, 0x4 @@ -1078,7 +1078,7 @@ $$258646: $$258649: .incbin "baserom.dol", 0x497B14, 0x4 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$258553 $$258553: .incbin "baserom.dol", 0x49E448, 0x4 diff --git a/asm/src/Water.s b/asm/src/Water.s index d82bc27b..c29ac4b5 100644 --- a/asm/src/Water.s +++ b/asm/src/Water.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara5WaterFRQ33scn4step9ComponentRQ24gobj8LocationRCQ33hel4math7Vector2 __ct__Q43scn4step5chara5WaterFRQ33scn4step9ComponentRQ24gobj8LocationRCQ33hel4math7Vector2: /* 80272FC4 0026EE04 94 21 FF D0 */ stwu r1, -0x30(r1) @@ -355,7 +355,7 @@ setForbidEffect__Q43scn4step5chara5WaterFb: /* 802734D8 0026F318 98 83 00 1F */ stb r4, 0x1f(r3) /* 802734DC 0026F31C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero5WaterFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero5WaterFRQ43scn4step4hero4Hero: /* 8035A3A8 003561E8 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -1593,12 +1593,12 @@ __dt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15Stat __dt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1Fv: /* 8035B524 00357364 4B ED 31 7C */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global CHECK_DEEP_OFFS_ARRAY__19$$2unnamed$$2Water_cpp$$2 CHECK_DEEP_OFFS_ARRAY__19$$2unnamed$$2Water_cpp$$2: .incbin "baserom.dol", 0x416460, 0x60 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1 __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9StateJump$$4PQ43scn4step4hero4Hero$$4Ul$$1: .incbin "baserom.dol", 0x4817F0, 0x10 @@ -1606,12 +1606,12 @@ __vt__Q24util92StateFactoryArg2$$0Q24util6IState$$4Q53scn4step4hero6common9State __vt__Q24util96StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4hero6common15StateWaterFloat$$4PQ43scn4step4hero4Hero$$1: .incbin "baserom.dol", 0x481800, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253564 $$253564: .incbin "baserom.dol", 0x49B8A8, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$259702 $$259702: .incbin "baserom.dol", 0x49DA80, 0x4 diff --git a/asm/src/WaterCallback.s b/asm/src/WaterCallback.s index d48b93a1..a1c1a4b7 100644 --- a/asm/src/WaterCallback.s +++ b/asm/src/WaterCallback.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5enemy13WaterCallbackFRQ43scn4step5enemy5Enemy __ct__Q43scn4step5enemy13WaterCallbackFRQ43scn4step5enemy5Enemy: /* 80290A5C 0028C89C 3C A0 80 47 */ lis r5, __vt__Q43scn4step5enemy13WaterCallback@ha @@ -59,7 +59,7 @@ lbl_80290B04: /* 80290B10 0028C950 38 21 00 10 */ addi r1, r1, 0x10 /* 80290B14 0028C954 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q43scn4step5enemy13WaterCallback __vt__Q43scn4step5enemy13WaterCallback: .incbin "baserom.dol", 0x46EE20, 0x18 diff --git a/asm/src/WaterFlow.s b/asm/src/WaterFlow.s index 9a63394f..30d2df96 100644 --- a/asm/src/WaterFlow.s +++ b/asm/src/WaterFlow.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick9waterflow9WaterFlowFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRQ43scn4step7gimmick21FlowEffectManager$$032$$1 __ct__Q53scn4step7gimmick9waterflow9WaterFlowFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9ComponentRQ43scn4step7gimmick21FlowEffectManager$$032$$1: /* 8032A508 00326348 94 21 FF C0 */ stwu r1, -0x40(r1) @@ -890,22 +890,22 @@ lbl_8032B1A8: /* 8032B1C8 00327008 38 21 00 20 */ addi r1, r1, 0x20 /* 8032B1CC 0032700C 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global DIR_ROTATION__Q53scn4step7gimmick9waterflow23$$2unnamed$$2WaterFlow_cpp$$2 DIR_ROTATION__Q53scn4step7gimmick9waterflow23$$2unnamed$$2WaterFlow_cpp$$2: .incbin "baserom.dol", 0x415CA0, 0x20 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$253562 $$253562: .incbin "baserom.dol", 0x47E7F8, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$253723 $$253723: .incbin "baserom.dol", 0x496DD0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$253563 $$253563: .incbin "baserom.dol", 0x49D5F8, 0x4 diff --git a/asm/src/WaveHandle.s b/asm/src/WaveHandle.s index 7b7e4bb0..85c67c49 100644 --- a/asm/src/WaveHandle.s +++ b/asm/src/WaveHandle.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WavePacketCallback__3sndFQ44nw4r3snd10WavePlayer24WavePacketCallbackStatusPQ34nw4r3snd10WavePlayerPQ44nw4r3snd10WavePlayer10WavePacketPv WavePacketCallback__3sndFQ44nw4r3snd10WavePlayer24WavePacketCallbackStatusPQ34nw4r3snd10WavePlayerPQ44nw4r3snd10WavePlayer10WavePacketPv: /* 80403D0C 003FFB4C 2C 03 00 00 */ cmpwi r3, 0 @@ -403,7 +403,7 @@ setParam__Q23snd10WaveHandleFUlUlQ34nw4r3snd12SampleFormat: /* 80404294 004000D4 38 21 00 50 */ addi r1, r1, 0x50 /* 80404298 004000D8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q23snd10WaveHandle __vt__Q23snd10WaveHandle: .incbin "baserom.dol", 0x4927B8, 0xC @@ -411,7 +411,7 @@ __vt__Q23snd10WaveHandle: __vt__Q33snd10WaveHandle10WavePacket: .incbin "baserom.dol", 0x4927C4, 0xC -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249104 $$249104: .incbin "baserom.dol", 0x49EEA0, 0x8 diff --git a/asm/src/WeakPointCtrl.s b/asm/src/WeakPointCtrl.s index eccc34cb..ab9c3cbb 100644 --- a/asm/src/WeakPointCtrl.s +++ b/asm/src/WeakPointCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __dt__Q43scn4step4boss13WeakPointCtrlFv __dt__Q43scn4step4boss13WeakPointCtrlFv: /* 8023658C 002323CC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -91,7 +91,7 @@ __vc__Q33hel6common62MutableArray$$0Q53scn4step4boss13WeakPointCtrl13WeakPointDa /* 802366B4 002324F4 38 21 00 10 */ addi r1, r1, 0x10 /* 802366B8 002324F8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249046 $$249046: .incbin "baserom.dol", 0x49AF18, 0x8 diff --git a/asm/src/Weapon.s b/asm/src/Weapon.s index ef446a1f..5cb467d4 100644 --- a/asm/src/Weapon.s +++ b/asm/src/Weapon.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6weapon6WeaponFRQ33scn4step9ComponentRQ23mem12HeapExpArrayRCQ43scn4step6weapon4Desc __ct__Q43scn4step6weapon6WeaponFRQ33scn4step9ComponentRQ23mem12HeapExpArrayRCQ43scn4step6weapon4Desc: /* 803D9380 003D51C0 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -2199,7 +2199,7 @@ create__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNo __dt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1Fv: /* 803DB1B4 003D6FF4 4B E5 34 EC */ b __dt__Q24util89StateFactoryArg1$$0Q24util6IState$$4Q53scn4step4boss6common9StateWait$$4PQ43scn4step4boss4Boss$$1Fv -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1 __vt__Q24util91StateFactoryArg1$$0Q24util6IState$$4Q43scn4step6weapon11StateNormal$$4PQ43scn4step6weapon6Weapon$$1: .incbin "baserom.dol", 0x48FEF8, 0x10 @@ -2225,7 +2225,7 @@ $$2STRING$$2GetBack__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6w $$2STRING$$2GetBack__Q34nw4r2ut85LinkList$$0Q24util64ObjListNode$$0Q43scn4step6weapon6Weapon$$4Q24util16ObjListDummyType$$1$$40$$1Fv: .incbin "baserom.dol", 0x48FF98, 0x10 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$266105 $$266105: .incbin "baserom.dol", 0x49E878, 0x4 diff --git a/asm/src/WeaponCtrl.s b/asm/src/WeaponCtrl.s index 5d912a5a..47ad9522 100644 --- a/asm/src/WeaponCtrl.s +++ b/asm/src/WeaponCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global addReqData__Q53scn4step4boss13watergalboros10WeaponCtrlFRCQ63scn4step4boss13watergalboros10WeaponCtrl7ReqData addReqData__Q53scn4step4boss13watergalboros10WeaponCtrlFRCQ63scn4step4boss13watergalboros10WeaponCtrl7ReqData: /* 8025ACD8 00256B18 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/WearBack.s b/asm/src/WearBack.s index 920bd720..c84f06b9 100644 --- a/asm/src/WearBack.s +++ b/asm/src/WearBack.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global setBack__Q43scn4step4hero8WearBackFv setBack__Q43scn4step4hero8WearBackFv: /* 8035B528 00357368 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -226,7 +226,7 @@ lbl_8035B840: /* 8035B850 00357690 38 21 00 20 */ addi r1, r1, 0x20 /* 8035B854 00357694 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$255703 $$255703: .incbin "baserom.dol", 0x481810, 0x90 diff --git a/asm/src/Whip.s b/asm/src/Whip.s index 121d75bf..4462c60f 100644 --- a/asm/src/Whip.s +++ b/asm/src/Whip.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global HatPath__Q53scn4step4hero9modeldesc4WhipFv HatPath__Q53scn4step4hero9modeldesc4WhipFv: /* 8035CE68 00358CA8 3C 60 80 49 */ lis r3, $$248821@ha @@ -64,7 +64,7 @@ WhipAnim__Q53scn4step4hero9modeldesc4WhipFv: /* 8035CF28 00358D68 90 03 00 08 */ stw r0, 8(r3) /* 8035CF2C 00358D6C 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4whip4WhipFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q53scn4step4hero4whip4WhipFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 8038C79C 003885DC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -439,12 +439,12 @@ lbl_8038CCC0: /* 8038CCCC 00388B0C 38 21 00 10 */ addi r1, r1, 0x10 /* 8038CCD0 00388B10 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2WhipAnim__Q53scn4step4hero9modeldesc4WhipFv$$2entries$$21 $$2LOCAL$$2WhipAnim__Q53scn4step4hero9modeldesc4WhipFv$$2entries$$21: .incbin "baserom.dol", 0x41BB70, 0x90 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$248821 $$248821: .incbin "baserom.dol", 0x4876D8, 0x20 @@ -515,7 +515,7 @@ $$248767: $$248768: .incbin "baserom.dol", 0x487848, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256579 $$256579: .incbin "baserom.dol", 0x4897B0, 0x20 @@ -526,7 +526,7 @@ $$256580: __vt__Q53scn4step4hero4whip4Whip: .incbin "baserom.dol", 0x4897F4, 0x5C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$248735 $$248735: .incbin "baserom.dol", 0x4976B0, 0x8 diff --git a/asm/src/WhispyAppleUtility.s b/asm/src/WhispyAppleUtility.s index 3196d664..03290bbb 100644 --- a/asm/src/WhispyAppleUtility.s +++ b/asm/src/WhispyAppleUtility.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global ReqFallSE__Q53scn4step5enemy11whispyapple18WhispyAppleUtilityFRQ43scn4step5enemy5Enemy ReqFallSE__Q53scn4step5enemy11whispyapple18WhispyAppleUtilityFRQ43scn4step5enemy5Enemy: /* 802F2214 002EE054 94 21 FF F0 */ stwu r1, -0x10(r1) diff --git a/asm/src/WiiButton.s b/asm/src/WiiButton.s index 845b2929..7eafc912 100644 --- a/asm/src/WiiButton.s +++ b/asm/src/WiiButton.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q34info6common9WiiButtonFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ44info6common9WiiButton4Kind __ct__Q34info6common9WiiButtonFRQ23mem10IAllocatorRCQ23lyt12PaneAccessorQ44info6common9WiiButton4Kind: /* 801AAB58 001A6998 94 21 FE 80 */ stwu r1, -0x180(r1) @@ -410,7 +410,7 @@ lbl_801AB108: /* 801AB114 001A6F54 38 21 00 10 */ addi r1, r1, 0x10 /* 801AB118 001A6F58 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252511 $$252511: .incbin "baserom.dol", 0x4537D0, 0xC @@ -436,7 +436,7 @@ $$252517: $$252518: .incbin "baserom.dol", 0x453828, 0x40 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252558 $$252558: .incbin "baserom.dol", 0x4934E0, 0x8 diff --git a/asm/src/WindCtrl.s b/asm/src/WindCtrl.s index c86a90cf..7dc58876 100644 --- a/asm/src/WindCtrl.s +++ b/asm/src/WindCtrl.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4boss6whispy8WindCtrlFRQ43scn4step4boss4Boss __ct__Q53scn4step4boss6whispy8WindCtrlFRQ43scn4step4boss4Boss: /* 8025F310 0025B150 94 21 FF B0 */ stwu r1, -0x50(r1) @@ -161,12 +161,12 @@ clear__Q53scn4step4boss6whispy8WindCtrlFv: /* 8025F538 0025B378 FC 60 08 90 */ fmr f3, f1 /* 8025F53C 0025B37C 4B FF FF E4 */ b set__Q53scn4step4boss6whispy8WindCtrlFfff -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global T_AREA_RATE__Q53scn4step4boss6whispy22$$2unnamed$$2WindCtrl_cpp$$2 T_AREA_RATE__Q53scn4step4boss6whispy22$$2unnamed$$2WindCtrl_cpp$$2: .incbin "baserom.dol", 0x4137E0, 0x20 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250595 $$250595: .incbin "baserom.dol", 0x49B578, 0x4 diff --git a/asm/src/WindowPanel.s b/asm/src/WindowPanel.s index 5d77da04..0d5ecf81 100644 --- a/asm/src/WindowPanel.s +++ b/asm/src/WindowPanel.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q25pause11WindowPanelFRQ25pause9ComponentRCQ23lyt12PaneAccessorb __ct__Q25pause11WindowPanelFRQ25pause9ComponentRCQ23lyt12PaneAccessorb: /* 801DF304 001DB144 94 21 FF 50 */ stwu r1, -0xb0(r1) @@ -59,7 +59,7 @@ __ct__Q25pause11WindowPanelFRQ25pause9ComponentRCQ23lyt12PaneAccessorb: /* 801DF3D8 001DB218 38 21 00 B0 */ addi r1, r1, 0xb0 /* 801DF3DC 001DB21C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252028 $$252028: .incbin "baserom.dol", 0x459C70, 0xC @@ -67,7 +67,7 @@ $$252028: $$252029: .incbin "baserom.dol", 0x459C7C, 0xC -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$252027 $$252027: .incbin "baserom.dol", 0x493D08, 0x8 diff --git a/asm/src/Wing.s b/asm/src/Wing.s index 21b4dba1..cdf3a3da 100644 --- a/asm/src/Wing.s +++ b/asm/src/Wing.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global T_PARAM__Q53scn4step4hero9modeldesc18$$2unnamed$$2Wing_cpp$$2Fv T_PARAM__Q53scn4step4hero9modeldesc18$$2unnamed$$2Wing_cpp$$2Fv: /* 8035CF30 00358D70 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -238,7 +238,7 @@ lbl_8035D224: /* 8035D260 003590A0 38 21 00 60 */ addi r1, r1, 0x60 /* 8035D264 003590A4 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step4hero4wing4WingFRQ33scn4step9ComponentRQ43scn4step4hero4Hero __ct__Q53scn4step4hero4wing4WingFRQ33scn4step9ComponentRQ43scn4step4hero4Hero: /* 8039AFD4 00396E14 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -441,12 +441,12 @@ lbl_8039B290: /* 8039B29C 003970DC 38 21 00 10 */ addi r1, r1, 0x10 /* 8039B2A0 003970E0 4E 80 00 20 */ blr -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc4WingFv$$2entries$$21 $$2LOCAL$$2HatAnim__Q53scn4step4hero9modeldesc4WingFv$$2entries$$21: .incbin "baserom.dol", 0x41BC00, 0xC8 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$249847 $$249847: .incbin "baserom.dol", 0x487858, 0x1C @@ -529,7 +529,7 @@ $$249562: $$249563: .incbin "baserom.dol", 0x487A48, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$256289 $$256289: .incbin "baserom.dol", 0x48A250, 0x20 @@ -540,7 +540,7 @@ $$256290: __vt__Q53scn4step4hero4wing4Wing: .incbin "baserom.dol", 0x48A294, 0x5C -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$249532 $$249532: .incbin "baserom.dol", 0x4976F0, 0x8 diff --git a/asm/src/Wipe.s b/asm/src/Wipe.s index 1ffcb2dc..28af22d4 100644 --- a/asm/src/Wipe.s +++ b/asm/src/Wipe.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global tWipeFilePath__Q43scn4step3sfx18$$2unnamed$$2Wipe_cpp$$2FQ43scn4step3sfx8WipeKind tWipeFilePath__Q43scn4step3sfx18$$2unnamed$$2Wipe_cpp$$2FQ43scn4step3sfx8WipeKind: /* 803D090C 003CC74C 54 60 10 3A */ slwi r0, r3, 2 @@ -199,7 +199,7 @@ lbl_803D0B88: /* 803D0B94 003CC9D4 38 21 00 10 */ addi r1, r1, 0x10 /* 803D0B98 003CC9D8 4E 80 00 20 */ blr -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23sfx4WipeFv __ct__Q23sfx4WipeFv: /* 80402248 003FE088 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -447,7 +447,7 @@ lbl_80402564: /* 80402574 003FE3B4 38 21 00 20 */ addi r1, r1, 0x20 /* 80402578 003FE3B8 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251702 $$251702: .incbin "baserom.dol", 0x48EE40, 0x14 @@ -461,7 +461,7 @@ $$251704: T_WIPE_FILE_PATH_TABLE__Q43scn4step3sfx18$$2unnamed$$2Wipe_cpp$$2: .incbin "baserom.dol", 0x48EE80, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251793 $$251793: .incbin "baserom.dol", 0x498AA0, 0x8 @@ -469,12 +469,12 @@ $$251793: $$251832: .incbin "baserom.dol", 0x498AA8, 0x18 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251871 $$251871: .incbin "baserom.dol", 0x49E808, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251799 $$251799: .incbin "baserom.dol", 0x49EE88, 0x8 diff --git a/asm/src/WorldCage.s b/asm/src/WorldCage.s index 273cdb94..a8c0d048 100644 --- a/asm/src/WorldCage.s +++ b/asm/src/WorldCage.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step5chara9WorldCageFRQ33scn4step9ComponentRQ24gobj8Locationff __ct__Q43scn4step5chara9WorldCageFRQ33scn4step9ComponentRQ24gobj8Locationff: /* 802734E0 0026F320 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -352,7 +352,7 @@ changePadding__Q43scn4step5chara9WorldCageFff: /* 802739D8 0026F818 D0 43 00 10 */ stfs f2, 0x10(r3) /* 802739DC 0026F81C 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$254475 $$254475: .incbin "baserom.dol", 0x49B8B0, 0x4 diff --git a/asm/src/XFBManager.s b/asm/src/XFBManager.s index d074abea..b1c2b3e7 100644 --- a/asm/src/XFBManager.s +++ b/asm/src/XFBManager.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q23gfx10XFBManagerFRCQ23gfx9VISetting __ct__Q23gfx10XFBManagerFRCQ23gfx9VISetting: /* 80197D50 00193B90 94 21 FF E0 */ stwu r1, -0x20(r1) diff --git a/asm/src/XFBRestore.s b/asm/src/XFBRestore.s index 310b8587..47ab6c2f 100644 --- a/asm/src/XFBRestore.s +++ b/asm/src/XFBRestore.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global copyXFB__24$$2unnamed$$2XFBRestore_cpp$$2FPUcPUcUl copyXFB__24$$2unnamed$$2XFBRestore_cpp$$2FPUcPUcUl: /* 8018B57C 001873BC 39 20 00 00 */ li r9, 0 diff --git a/asm/src/Year.s b/asm/src/Year.s index 8b89b4e1..2e6cb506 100644 --- a/asm/src/Year.s +++ b/asm/src/Year.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn7history6detail4YearFRQ23mem10IAllocatorQ23lyt12PaneAccessori __ct__Q43scn7history6detail4YearFRQ23mem10IAllocatorQ23lyt12PaneAccessori: /* 8021B2E0 00217120 94 21 F9 20 */ stwu r1, -0x6e0(r1) @@ -235,7 +235,7 @@ lbl_8021B600: /* 8021B640 00217480 38 21 03 80 */ addi r1, r1, 0x380 /* 8021B644 00217484 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$252314 $$252314: .incbin "baserom.dol", 0x45F618, 0x10 diff --git a/asm/src/ZNururi.s b/asm/src/ZNururi.s index d85aaa53..ae0b56e4 100644 --- a/asm/src/ZNururi.s +++ b/asm/src/ZNururi.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step4hero7ZNururiFRQ43scn4step4hero4Hero __ct__Q43scn4step4hero7ZNururiFRQ43scn4step4hero4Hero: /* 8035B858 00357698 90 83 00 00 */ stw r4, 0(r3) @@ -240,12 +240,12 @@ lbl_8035BB94: /* 8035BBA4 003579E4 38 21 00 40 */ addi r1, r1, 0x40 /* 8035BBA8 003579E8 4E 80 00 20 */ blr -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$251249 $$251249: .incbin "baserom.dol", 0x496E28, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251504 $$251504: .incbin "baserom.dol", 0x49DAC0, 0x4 diff --git a/asm/src/ZoneSwitch.s b/asm/src/ZoneSwitch.s index 6fe9e745..78d25eae 100644 --- a/asm/src/ZoneSwitch.s +++ b/asm/src/ZoneSwitch.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q53scn4step7gimmick10zoneswitch10ZoneSwitchFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component __ct__Q53scn4step7gimmick10zoneswitch10ZoneSwitchFRCQ43scn4step3map18BinGmkGeneralEntryRQ33scn4step9Component: /* 8032B4B0 003272F0 94 21 FF D0 */ stwu r1, -0x30(r1) diff --git a/asm/src/ZoomController.s b/asm/src/ZoomController.s index 3332eaaf..79b24cb1 100644 --- a/asm/src/ZoomController.s +++ b/asm/src/ZoomController.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera14ZoomControllerFv __ct__Q43scn4step6camera14ZoomControllerFv: /* 802678C8 00263708 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -555,7 +555,7 @@ lbl_80267FDC: /* 80267FF0 00263E30 38 21 00 20 */ addi r1, r1, 0x20 /* 80267FF4 00263E34 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$250412 $$250412: .incbin "baserom.dol", 0x49B718, 0x4 diff --git a/asm/src/ZoomControllerData.s b/asm/src/ZoomControllerData.s index 0de70c76..fb56f653 100644 --- a/asm/src/ZoomControllerData.s +++ b/asm/src/ZoomControllerData.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera18ZoomControllerDataFv __ct__Q43scn4step6camera18ZoomControllerDataFv: /* 80267FF8 00263E38 38 00 00 00 */ li r0, 0 @@ -56,7 +56,7 @@ __ct__Q43scn4step6camera18ZoomControllerDataFRQ43scn4step6camera14ZoomController /* 802680B4 00263EF4 38 21 00 40 */ addi r1, r1, 0x40 /* 802680B8 00263EF8 4E 80 00 20 */ blr -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$249761 $$249761: .incbin "baserom.dol", 0x49B720, 0x8 diff --git a/asm/src/ZoomQuake.s b/asm/src/ZoomQuake.s index db70240b..caee20d8 100644 --- a/asm/src/ZoomQuake.s +++ b/asm/src/ZoomQuake.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __ct__Q43scn4step6camera9ZoomQuakeFRQ33scn4step9Component __ct__Q43scn4step6camera9ZoomQuakeFRQ33scn4step9Component: /* 802680BC 00263EFC 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -108,7 +108,7 @@ execute__Q43scn4step6camera9ZoomQuakeFv: /* 8026821C 0026405C 38 21 00 10 */ addi r1, r1, 0x10 /* 80268220 00264060 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$251535 $$251535: .incbin "baserom.dol", 0x467240, 0x10 @@ -137,7 +137,7 @@ T_QUAKE_NAME_TABLE__Q43scn4step6camera23$$2unnamed$$2ZoomQuake_cpp$$2: $$251699: .incbin "baserom.dol", 0x46731C, 0x24 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$251687 $$251687: .incbin "baserom.dol", 0x49B728, 0x8 diff --git a/asm/tpl/TPL.s b/asm/tpl/TPL.s index a2c910f9..6bdb0531 100644 --- a/asm/tpl/TPL.s +++ b/asm/tpl/TPL.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global TPLBind TPLBind: /* 800A1E00 0009DC40 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -151,17 +151,17 @@ TPLGetGXTexObjFromPalette: /* 800A2018 0009DE58 38 21 00 30 */ addi r1, r1, 0x30 /* 800A201C 0009DE5C 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$2773 $$2773: .incbin "baserom.dol", 0x43C130, 0x30 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$2772 $$2772: .incbin "baserom.dol", 0x492D20, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$2795 $$2795: .incbin "baserom.dol", 0x4994A0, 0x8 diff --git a/asm/usb/usb.s b/asm/usb/usb.s index 8e34f3c2..518068d2 100644 --- a/asm/usb/usb.s +++ b/asm/usb/usb.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global USB_LOG USB_LOG: /* 80073250 0006F090 94 21 FF 80 */ stwu r1, -0x80(r1) @@ -1477,7 +1477,7 @@ IUSB_WriteCtrlMsgAsync: /* 80074788 000705C8 4E 80 00 20 */ blr /* 8007478C 000705CC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$22524 $$22524: .incbin "baserom.dol", 0x436138, 0xC @@ -1677,7 +1677,7 @@ $$23004: $$23016: .incbin "baserom.dol", 0x436950, 0x18 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global hId hId: .incbin "baserom.dol", 0x492C70, 0x4 diff --git a/asm/vi/i2c.s b/asm/vi/i2c.s index 77aa8870..3b6a5ea1 100644 --- a/asm/vi/i2c.s +++ b/asm/vi/i2c.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WaitMicroTime WaitMicroTime: /* 8002E490 0002A2D0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -638,7 +638,7 @@ lbl_8002ED8C: /* 8002EDA8 0002ABE8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8002EDAC 0002ABEC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __i2c_ident_flag __i2c_ident_flag: .incbin "baserom.dol", 0x492928, 0x8 diff --git a/asm/vi/vi.s b/asm/vi/vi.s index 1c8658db..001835fa 100644 --- a/asm/vi/vi.s +++ b/asm/vi/vi.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global OnShutdown OnShutdown: /* 8002BAD0 00027910 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -2945,7 +2945,7 @@ __VIResetSIIdle: /* 8002E488 0002A2C8 38 60 00 01 */ li r3, 1 /* 8002E48C 0002A2CC 4E 80 00 20 */ blr -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21 $$21: .incbin "baserom.dol", 0x42BD90, 0x48 @@ -3004,7 +3004,7 @@ $$24121: $$24441: .incbin "baserom.dol", 0x42C2C4, 0x24 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __VIVersion __VIVersion: .incbin "baserom.dol", 0x492908, 0x4 diff --git a/asm/vi/vi3in1.s b/asm/vi/vi3in1.s index 31b8ce6d..d7a69e83 100644 --- a/asm/vi/vi3in1.s +++ b/asm/vi/vi3in1.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __VISetYUVSEL __VISetYUVSEL: /* 8002EDB0 0002ABF0 94 21 FF F0 */ stwu r1, -0x10(r1) @@ -1565,7 +1565,7 @@ lbl_8003047C: /* 800304D8 0002C318 4E 80 00 20 */ blr /* 800304DC 0002C31C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global gammaSet gammaSet: .incbin "baserom.dol", 0x42C2E8, 0x420 @@ -1615,7 +1615,7 @@ $$23404: $$23405: .incbin "baserom.dol", 0x42C880, 0x80 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __tvType __tvType: .incbin "baserom.dol", 0x492930, 0x4 diff --git a/asm/wenc/wenc.s b/asm/wenc/wenc.s index 9bf1ad5b..7ba2812a 100644 --- a/asm/wenc/wenc.s +++ b/asm/wenc/wenc.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WENCGetEncodeData WENCGetEncodeData: /* 8004D474 000492B4 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -201,12 +201,12 @@ lbl_8004D718: /* 8004D748 00049588 4E 80 00 20 */ blr /* 8004D74C 0004958C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global $$21993 $$21993: .incbin "baserom.dol", 0x403DA8, 0x40 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22084 $$22084: .incbin "baserom.dol", 0x499280, 0x8 diff --git a/asm/wpad/WPAD.s b/asm/wpad/WPAD.s index ab84d96c..f9b20edb 100644 --- a/asm/wpad/WPAD.s +++ b/asm/wpad/WPAD.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __wpadNoAlloc __wpadNoAlloc: /* 80053DF0 0004FC30 38 60 00 00 */ li r3, 0 @@ -12049,7 +12049,7 @@ lbl_8005EC6C: /* 8005EC88 0005AAC8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8005EC8C 0005AACC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global certn certn: .incbin "baserom.dol", 0x403DE8, 0x48 @@ -12063,7 +12063,7 @@ $$2LOCAL$$2WPADControlDpd__FlUlPFll_v$$2cfg1: $$2LOCAL$$2WPADControlDpd__FlUlPFll_v$$2cfg2$$20: .incbin "baserom.dol", 0x403EA8, 0x10 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21504 $$21504: .incbin "baserom.dol", 0x434688, 0x48 @@ -12101,7 +12101,7 @@ $$29220: $$29559: .incbin "baserom.dol", 0x4348E8, 0x30 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global __WPADVersion __WPADVersion: .incbin "baserom.dol", 0x492BC0, 0x4 @@ -12115,7 +12115,7 @@ _wpad_diff_count_threshold: _wpad_hyst_count_threshold: .incbin "baserom.dol", 0x492BD0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$22723 $$22723: .incbin "baserom.dol", 0x499288, 0x4 diff --git a/asm/wpad/WPADEncrypt.s b/asm/wpad/WPADEncrypt.s index 6d2e9d31..c6cbb2fa 100644 --- a/asm/wpad/WPADEncrypt.s +++ b/asm/wpad/WPADEncrypt.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WPADiCreateKey WPADiCreateKey: /* 80063F00 0005FD40 94 21 FF 70 */ stwu r1, -0x90(r1) @@ -960,7 +960,7 @@ lbl_80064D9C: /* 80064DB8 00060BF8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80064DBC 00060BFC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global base base: .incbin "baserom.dol", 0x434A18, 0x30 diff --git a/asm/wpad/WPADHIDParser.s b/asm/wpad/WPADHIDParser.s index 34f2cd17..e313dc51 100644 --- a/asm/wpad/WPADHIDParser.s +++ b/asm/wpad/WPADHIDParser.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global __wpadAbortInitExtension __wpadAbortInitExtension: /* 8005EC90 0005AAD0 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -5694,7 +5694,7 @@ __a1_unused_report: /* 80063EF8 0005FD38 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 80063EFC 0005FD3C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data4, "wa" # 0x80406560 - 0x80421040 +.section .rodata, "wa" # 0x80406560 - 0x80421040 .global _cExtInvalidData _cExtInvalidData: .incbin "baserom.dol", 0x403EB8, 0x18 @@ -5702,7 +5702,7 @@ _cExtInvalidData: _cExtInvalidData2: .incbin "baserom.dol", 0x403ED0, 0x18 -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global __a1_input_reports_array __a1_input_reports_array: .incbin "baserom.dol", 0x434918, 0x80 @@ -5713,7 +5713,7 @@ $$25371: $$25370: .incbin "baserom.dol", 0x4349C8, 0x50 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23033 $$23033: .incbin "baserom.dol", 0x499290, 0x4 diff --git a/asm/wpad/WPADMem.s b/asm/wpad/WPADMem.s index 779d2428..21c0eab8 100644 --- a/asm/wpad/WPADMem.s +++ b/asm/wpad/WPADMem.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WPADiClearMemBlock WPADiClearMemBlock: /* 80064DC0 00060C00 3C 80 80 4C */ lis r4, __rvl_p_wpadcb@ha diff --git a/asm/wpad/WUD.s b/asm/wpad/WUD.s index a17f7d56..698d73a4 100644 --- a/asm/wpad/WUD.s +++ b/asm/wpad/WUD.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WUDIsLinkedWBC WUDIsLinkedWBC: /* 80065740 00061580 80 6D EA 20 */ lwz r3, _linkedWBC-_SDA_BASE_(r13) @@ -6334,7 +6334,7 @@ WUDiSetNotAckNumForHandle: /* 8006AE38 00066C78 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8006AE3C 00066C7C 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global _wudWiiRemoteDescriptor _wudWiiRemoteDescriptor: .incbin "baserom.dol", 0x435C78, 0xDC @@ -6378,7 +6378,7 @@ $$27558: $$27592: .incbin "baserom.dol", 0x435FB0, 0x10 -.section .data6, "wa" # 0x80556420 - 0x8055C6E0 +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 .global $$26790 $$26790: .incbin "baserom.dol", 0x492BD8, 0x8 @@ -6386,7 +6386,7 @@ $$26790: $$26791: .incbin "baserom.dol", 0x492BE0, 0x8 -.section .data7, "wa" # 0x8055DF80 - 0x805643C0 +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 .global $$23808 $$23808: .incbin "baserom.dol", 0x499308, 0x4 diff --git a/asm/wpad/WUDHidHost.s b/asm/wpad/WUDHidHost.s index c90cde89..d8416c73 100644 --- a/asm/wpad/WUDHidHost.s +++ b/asm/wpad/WUDHidHost.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global WUDiHidHostEventCallback WUDiHidHostEventCallback: /* 8006AE40 00066C80 94 21 FF E0 */ stwu r1, -0x20(r1) @@ -308,7 +308,7 @@ bta_hh_co_data: /* 8006B278 000670B8 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ /* 8006B27C 000670BC 00 00 00 00 */ .4byte 0x00000000 /* unknown instruction */ -.section .data5, "wa" # 0x80421040 - 0x80496700 +.section .data, "wa" # 0x80421040 - 0x80496700 .global $$21502 $$21502: .incbin "baserom.dol", 0x435FC0, 0x14 diff --git a/asm/wpad/lint.s b/asm/wpad/lint.s index a22d215a..da086fb5 100644 --- a/asm/wpad/lint.s +++ b/asm/wpad/lint.s @@ -1,6 +1,6 @@ .include "macros.inc" -.section .text1, "ax" # 0x80006A00 - 0x80406260 +.section .text, "ax" # 0x80006A00 - 0x80406260 .global LINTCmp LINTCmp: /* 80064ED0 00060D10 80 A3 00 00 */ lwz r5, 0(r3) diff --git a/deincbin-in-place.sh b/deincbin-in-place.sh new file mode 100755 index 00000000..43698287 --- /dev/null +++ b/deincbin-in-place.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +tmpfile=`mktemp` + +./deincbin.py "$1" > $tmpfile +mv $tmpfile "$1" +echo "deincbin: $1" diff --git a/deincbin.py b/deincbin.py new file mode 100755 index 00000000..36201c35 --- /dev/null +++ b/deincbin.py @@ -0,0 +1,134 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 +# +# Usage: dump_common_data.py file.s +# Dumps all incbin data and prints the revised file to stdout. + +import os +import re +import sys + +# Reads a bytearray from baserom.dol +def read_baserom(start, size): + with open('baserom.dol', 'rb') as f: + f.seek(start, os.SEEK_SET) + return bytearray(f.read(size)) + +if len(sys.argv) != 2: + print('Usage: %s ASM_FILE' % sys.argv[0]) + exit() + +# reads a 32-bit big endian value starting at pos +def read_u32(data, pos): + return (data[pos]<<24) | (data[pos+1]<<16) | (data[pos+2]<<8) | (data[pos+3]) + +def is_ascii(code): + if code >= 0x20 and code <= 0x7E: # normal characters + return True + if code in [0x09, 0x0A]: # tab, newline + return True + return False + +# reads a string starting at pos +def read_string(data, pos): + text = '' + while pos < len(data) and is_ascii(data[pos]): + text += chr(data[pos]) + pos += 1 + if pos < len(data) and data[pos] == 0: + return text + return '' + +# escapes special characters in the string for use in a C string literal +def escape_string(text): + return text.replace('\\','\\\\').replace('"','\\"').replace('\n','\\n').replace('\t','\\t') + +# returns True if value is 4-byte aligned +def is_aligned(num): + return num % 4 == 0 + +# returns True if value is a possible pointer +def is_pointer(num): + return num >= 0x80003100 and num <= 0x802F6C80 + +# returns True if all elements are zero +def is_all_zero(arr): + for val in arr: + if val != 0: + return False + return True + +# returns string of comma-separated hex bytes +def hex_bytes(data): + return ', '.join('0x%02X' % n for n in data) + +def convert_data(data, offset): + text = '' + size = len(data) + pos = 0 + + if size == 1: + return f'\t.byte {hex_bytes(data[:1])}\n' + + while pos < size: + # pad unaligned + pad = [] + while not is_aligned(offset + pos) and pos < size: + pad.append(data[pos]) + pos += 1 + if len(pad) > 0: + if is_all_zero(pad): + text += '\t.balign 4\n' + else: + text += '\t.byte %s\n' % hex_bytes(pad) + + # string? + string = read_string(data, pos) + if len(string) > 3: + text += '\t.asciz "%s"\n' % escape_string(string) + pos += len(string) + 1 + continue + + assert(is_aligned(offset + pos)) + + if pos + 1 == size: + text += f'\t.byte {hex_bytes(data[pos:pos+1])}\n' + break + if pos + 2 == size: + text += f'\t.byte {hex_bytes(data[pos:pos+2])}\n' + break + if pos + 3 == size: + text += f'\t.byte {hex_bytes(data[pos:pos+3])}\n' + break + + if pos + 4 <= size: + val = read_u32(data, pos) + if is_pointer(val): + text += '\t.4byte 0x%08X ;# ptr\n' % val + elif val == 0: + text += '\t.4byte 0\n' + else: + text += '\t.4byte 0x%08X\n' % val + pos += 4 + return text + +currSection = '' + +with open(sys.argv[1], 'rt') as f: + for line in f.readlines(): + line = line.rstrip('\n') + # Section directive + m = re.match(r'\s*\.section\s+([\._A-Za-z0-9]+)', line) + if m: + currSection = m.groups()[0] + elif currSection in ['.rodata', '.data', '.sdata', '..ctors', '.ctors', '.dtors', 'extab_', 'extabindex_']: + # Incbin directive + m = re.match(r'\s*\.incbin\s+"baserom.dol"\s*,\s*([^,]+),\s*([^,]+)', line) + if m: + g = m.groups() + start = int(g[0], 0) + size = int(g[1], 0) + data = read_baserom(start, size) + print(convert_data(data, start).rstrip()) + continue +# print(line) diff --git a/ldscript.lcf b/ldscript.lcf index 0a1dcae9..b18404e8 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -2,15 +2,15 @@ _SDA_BASE_ = 0x8055E420; _SDA2_BASE_ = 0x80565F80; SECTIONS { - .text0 BIND(0x80004000) : { *(.text0) } - .text1 BIND(0x80006A00) : { *(.text1) } - .data0 BIND(0x80006740) : { *(.data0) } - .data1 BIND(0x800068E0) : { *(.data1) } - .data2 BIND(0x80406260) : { *(.data2) } - .data3 BIND(0x80406540) : { *(.data3) } - .data4 BIND(0x80406560) : { *(.data4) } - .data5 BIND(0x80421040) : { *(.data5) } - .data6 BIND(0x80556420) : { *(.data6) } - .data7 BIND(0x8055DF80) : { *(.data7) } + .init BIND(0x80004000) : { *(.init) } + .text BIND(0x80006A00) : { *(.text) } + extab BIND(0x80006740) : { *(extab) } + extabindex BIND(0x800068E0) : { *(extabindex) } + .ctors BIND(0x80406260) : { *(.ctors) } + .dtors BIND(0x80406540) : { *(.dtors) } + .rodata BIND(0x80406560) : { *(.rodata) } + .data BIND(0x80421040) : { *(.data) } + .sdata BIND(0x80556420) : { *(.sdata) } + .sdata2 BIND(0x8055DF80) : { *(.sdata2) } .bss BIND(0x80496700) : { *(.bss) } } diff --git a/ldscript.ld b/ldscript.ld index f7f08d0c..88dea08a 100644 --- a/ldscript.ld +++ b/ldscript.ld @@ -3,29 +3,29 @@ _SDA_BASE_ = 0x8055E420; _SDA2_BASE_ = 0x80565F80; PHDRS { - text0 PT_LOAD; - text1 PT_LOAD; - data0 PT_LOAD; - data1 PT_LOAD; - data2 PT_LOAD; - data3 PT_LOAD; - data4 PT_LOAD; - data5 PT_LOAD; - data6 PT_LOAD; - data7 PT_LOAD; + .init PT_LOAD; + .text PT_LOAD; + extab PT_LOAD; + extabindex PT_LOAD; + .ctors PT_LOAD; + .dtors PT_LOAD; + .rodata PT_LOAD; + .data PT_LOAD; + .sdata PT_LOAD; + .sdata2 PT_LOAD; bss PT_LOAD; } SECTIONS { - .text0 0x80004000 : { *(.text0) } : text0 - .text1 0x80006A00 : { *(.text1) } : text1 - .data0 0x80006740 : { *(.data0) } : data0 - .data1 0x800068E0 : { *(.data1) } : data1 - .data2 0x80406260 : { *(.data2) } : data2 - .data3 0x80406540 : { *(.data3) } : data3 - .data4 0x80406560 : { *(.data4) } : data4 - .data5 0x80421040 : { *(.data5) } : data5 - .data6 0x80556420 : { *(.data6) } : data6 - .data7 0x8055DF80 : { *(.data7) } : data7 + .init 0x80004000 : { *(.init) } :.init + .text 0x80006A00 : { *(.text) } :.text + extab 0x80006740 : { *(extab) } :extab + extabindex 0x800068E0 : { *(extabindex) } :extabindex + .ctors 0x80406260 : { *(.ctors) } :.ctors + .dtors 0x80406540 : { *(.dtors) } :.dtors + .rodata 0x80406560 : { *(.rodata) } :.rodata + .data 0x80421040 : { *(.data) } :.data + .sdata 0x80556420 : { *(.sdata) } :.sdata + .sdata2 0x8055DF80 : { *(.sdata2) } :.sdata2 .bss 0x80496700 (NOLOAD) : { *(.bss) } : bss } diff --git a/macros.inc b/macros.inc index 9e47a1c3..2b067f4e 100644 --- a/macros.inc +++ b/macros.inc @@ -1,16 +1,16 @@ /* Code sections: - .text0: 0x00000100 0x80004000 0x80006740 - .text1: 0x00002840 0x80006A00 0x80406260 + .init: 0x00000100 0x80004000 0x80006740 + .text: 0x00002840 0x80006A00 0x80406260 Data sections: - .data0: 0x004020A0 0x80006740 0x800068E0 - .data1: 0x00402240 0x800068E0 0x80006A00 - .data2: 0x00402360 0x80406260 0x80406540 - .data3: 0x00402640 0x80406540 0x80406560 - .data4: 0x00402660 0x80406560 0x80421040 - .data5: 0x0041D140 0x80421040 0x80496700 - .data6: 0x00492800 0x80556420 0x8055C6E0 - .data7: 0x00498AC0 0x8055DF80 0x805643C0 + extab: 0x004020A0 0x80006740 0x800068E0 + extabindex: 0x00402240 0x800068E0 0x80006A00 + .ctors: 0x00402360 0x80406260 0x80406540 + .dtors: 0x00402640 0x80406540 0x80406560 + .rodata: 0x00402660 0x80406560 0x80421040 + .data: 0x0041D140 0x80421040 0x80496700 + .sdata: 0x00492800 0x80556420 0x8055C6E0 + .sdata2: 0x00498AC0 0x8055DF80 0x805643C0 BSS section: .bss: 0x00000000 0x80496700 0x805643FC Entry Point: 0x80006310